- updated Criteria tests
- cleanups