Fixes to the queryservice test.