Added more query test cases