wip
some improvements
...
testcases
included license texts, completed for new query builder test
test organisation