Add unit tests for Query and Builder
Modify QueryResult class