affiliation's address and country code passed from Cermine to Avro
fixing test code after recent Affiliation.avdl refactoring and adding countryCode field, renaming contry to countryName