Updated expected exception message
Updated tests to expect ISO3 country codes