Renaming the test file

Mixing hyphens and underscores makes me cross-eyed
Updating the country mappings and lists

Fix the mappings, remove netherlands-antilles as the islands already appear
Merge pull request #740 from alphagov/check_uk_visa_fixes

Updating check uk visa smartanswer