Better tests, added search_by_name_in_sf