Adding tests for list/search, moving Criteria logic