got query parser to work and 2 out 7 tests are refactored
got 6 out of 7