TEMP: Refactor tests to use a common search service