Activate Search
modified tests