Fix geocode tests
Beautify