Merge "Fix search test"