Revert pull request #30.
Merge pull request #182 from GERey/fix-query-validator-tests

Revert pull request #30.