Fix country code tests that were missed.

When the CountryCodes code was changed I missed fixing the tests somehow.