use new query builder in tests