Finished rescue tests and Searcher classes
Merged conflicts, please don't change the Searcher classes