Cleaned up the tests for the new query parser
Cleaned up the tests and added some more for the new functionality