Fix SEARCH including test cases