Fixes for search tests