Fixed tests to agree with the simplification in the search namespace