restructured countries to make easier to test