Revised geocoding and fixed integration tests