Add memory searcher, refactor tests