Merge pull request #1 from Qwinix/country_testcase

[development country_testcase] Validation for Country
Merge pull request #2 from Qwinix/country_testcase

[development country_testcase] Resolved Merge conflict
refactored validation for Country