Split up the query builder tests
Some aesthetic improvements