This is no longer required for tests to pass.
Also geocoding which is not a dependency is not required for tests.