refactoring, improving test coverage on CountryEntry