Changed interface for searcher, updated tests/code.