[development country_testcase] Refactored Validation for Country