fixed search+tests