Rework how addresses are cleaned

Plus reorganise tests
Adjust error message for invalid postcode for country