Refactoring searchPresenter and test helpers
Merging