Clean up and spec the rest of the SearchHelper.