add generic/country to test cases