Added test for PR #387
Merge pull request #388 from goranche/fix-countrycode-notexits

Added test for PR #387