Added searcher mock, tests