fixed junit test failures due to changes to search criterion classes