Amend country test data and add tests