Geocoder types fixes +unit tests