continuing to refactor controllers and services, and rewriting controller tests to actually test the way the functions work now; up to search controllers