Add tests to test geolocation rewrite by upstream