Adjust gps mocks and streamline geolocation
release 0.7.3