add tests with new style queries