Simplify queryservice tests.