Dev: few changes in query tests

added one test for query and rewrite some it statements to make them clearer