Complete Criteria.matches unit tests