New SearchCriteriaTest and fix comments test to use right filter