improved CountryRestTest