fixup some tests
remove old query command
Merge branch 'tests'