Clean up integration tests, cut down geocoding waits
Prepare to add a second volunteer to the integration tests