Some more fixed test cases
Fix search test