Add flexibility in query tests.