Adding more tests, fleshing out Criteria a bit