Completed tests for contact address fields

Also tidied out more html code from validator