Add test cases for constructing query
Remove redundant Query base class

Since we are not using polymorphism