Partially fix the failing search tests.