Added some query builder tests