Adding in some tests, cleaning up searcher implementation