cleanup Country related tests that utilized old 2char code-as-pk