adding query validators and respective test cases