Dry the search method, tests now passing