Updated tests for new controller structure
Updated tests
Created omni search controller
Tidy
Fleshed out tests