make geolocation model stronger + unit test