Fix tests and geocoder