Updated unit test
Query validation test.