uncommented out the 2-4 tests in query.c