Re #945 Modify query tests.