WIP Refactoring search_controller_spec

(This is about 80% of the refactoring)