bla
added debug for tests
Criteria refactoring