queryservice_test: better cleanup of schema
Merge branch 'vtocc'