Refactored Criterion QueryBuilder API tests
Added more Criterion tests