Fixed failing search tests.
Merged.