moved conditionGrammar into query.js
moved QueryTest.js into query.js