Fixes in Query\Builder, enabling more tests