Improved tests

- Can optionally inject Expression and ExpressionVisitor into QueryBuilder to allow for mocking.
- Fixed tests.