Fix tests after merge of QueryBuilder#addCriteria changes.