Added more query tests.