Refactoring searchPresenter and test helpers
Merging
Update with 12-dec material