Added new tests for QueryBuilder