Fix search test error
Problem with file separator fixed
fix merge issue