query simplifications in FunctionalTestSuite