small fixes to search tests refactoring