revised search and controller tests