Change tests to reflect new search