Geo-location
Fixed tests