removed search and reviewed tests