Extra credit: CountryService with tests, also brining back testem option