diff --git a/testing/tests/timezone/5020-updatecheck.result b/testing/tests/timezone/5020-updatecheck.result
index 37545c87..9332aa35 100644
--- a/testing/tests/timezone/5020-updatecheck.result
+++ b/testing/tests/timezone/5020-updatecheck.result
@@ -1,421 +1,594 @@
-Writing new zone for 'zones.h'
-Writing new zone for 'Europe/Budapest'
-Writing new zone for 'Europe/Podgorica'
-Writing new zone for 'Europe/Mariehamn'
-Writing new zone for 'Europe/Copenhagen'
-Writing new zone for 'Europe/Lisbon'
-Writing new zone for 'Europe/Moscow'
-Writing new zone for 'Europe/Vienna'
-Writing new zone for 'Europe/Andorra'
-Writing updated zone for 'Europe/Prague'
-Writing new zone for 'Europe/Simferopol'
-Writing new zone for 'Europe/Amsterdam'
-Writing new zone for 'Europe/Minsk'
-Writing new zone for 'Europe/Monaco'
-Writing new zone for 'Europe/Zaporozhye'
-Writing new zone for 'Europe/Sofia'
-Writing new zone for 'Europe/Tirane'
-Writing new zone for 'Europe/Kiev'
-Writing new zone for 'Europe/Jersey'
-Writing updated zone for 'Europe/Helsinki'
-Writing new zone for 'Europe/Istanbul'
-Writing new zone for 'Europe/Sarajevo'
-Writing new zone for 'Europe/Zurich'
-Writing new zone for 'Europe/Riga'
-Writing new zone for 'Europe/Guernsey'
-Writing new zone for 'Europe/Bucharest'
-Writing new zone for 'Europe/Tallinn'
-Writing new zone for 'Europe/Vatican'
-Writing new zone for 'Europe/Berlin'
-Writing new zone for 'Europe/Oslo'
-Writing new zone for 'Europe/Stockholm'
-Writing new zone for 'Europe/Belgrade'
-Writing new zone for 'Europe/Ljubljana'
-Writing new zone for 'Europe/Athens'
-Writing new zone for 'Europe/Madrid'
-Writing new zone for 'Europe/Gibraltar'
-Writing new zone for 'Europe/Bratislava'
-Writing new zone for 'Europe/Warsaw'
-Writing new zone for 'Europe/Brussels'
-Writing new zone for 'Europe/Uzhgorod'
-Writing new zone for 'Europe/London'
-Writing new zone for 'Europe/Volgograd'
-Writing new zone for 'Europe/San_Marino'
-Writing new zone for 'Europe/Dublin'
-Writing new zone for 'Europe/Isle_of_Man'
-Writing new zone for 'Europe/Rome'
-Writing new zone for 'Europe/Vilnius'
-Writing new zone for 'Europe/Skopje'
-Writing new zone for 'Europe/Vaduz'
-Writing updated zone for 'Europe/Zagreb'
-Writing new zone for 'Europe/Paris'
-Writing new zone for 'Europe/Luxembourg'
-Writing new zone for 'Europe/Kaliningrad'
-Writing new zone for 'Europe/Nicosia'
-Writing new zone for 'Europe/Chisinau'
-Writing new zone for 'Europe/Malta'
-Writing new zone for 'Europe/Samara'
-Writing new zone for 'Atlantic/St_Helena'
-Writing new zone for 'Atlantic/Madeira'
-Writing new zone for 'Atlantic/Cape_Verde'
-Writing new zone for 'Atlantic/Canary'
-Writing new zone for 'Atlantic/Azores'
-Writing new zone for 'Atlantic/Reykjavik'
-Writing new zone for 'Atlantic/Faroe'
-Writing new zone for 'Atlantic/Stanley'
-Writing new zone for 'Atlantic/South_Georgia'
-Writing new zone for 'Atlantic/Bermuda'
-Writing new zone for 'Pacific/Norfolk'
-Writing new zone for 'Pacific/Funafuti'
-Writing new zone for 'Pacific/Tahiti'
-Writing new zone for 'Pacific/Majuro'
-Writing new zone for 'Pacific/Wake'
-Writing new zone for 'Pacific/Pago_Pago'
-Writing new zone for 'Pacific/Palau'
-Writing new zone for 'Pacific/Marquesas'
-Writing new zone for 'Pacific/Fakaofo'
-Writing new zone for 'Pacific/Efate'
-Writing new zone for 'Pacific/Noumea'
-Writing new zone for 'Pacific/Guadalcanal'
-Writing new zone for 'Pacific/Chatham'
-Writing new zone for 'Pacific/Gambier'
-Writing new zone for 'Pacific/Tarawa'
-Writing new zone for 'Pacific/Pitcairn'
-Writing new zone for 'Pacific/Nauru'
-Writing new zone for 'Pacific/Easter'
-Writing new zone for 'Pacific/Johnston'
-Writing new zone for 'Pacific/Rarotonga'
-Writing new zone for 'Pacific/Galapagos'
-Writing new zone for 'Pacific/Pohnpei'
-Writing new zone for 'Pacific/Tongatapu'
-Writing new zone for 'Pacific/Fiji'
-Writing new zone for 'Pacific/Kwajalein'
-Writing new zone for 'Pacific/Guam'
-Writing new zone for 'Pacific/Wallis'
-Writing new zone for 'Pacific/Kosrae'
-Writing new zone for 'Pacific/Port_Moresby'
-Writing new zone for 'Pacific/Niue'
-Writing new zone for 'Pacific/Enderbury'
-Writing new zone for 'Pacific/Kiritimati'
-Writing new zone for 'Pacific/Honolulu'
-Writing new zone for 'Pacific/Midway'
-Writing updated zone for 'Pacific/Auckland'
-Writing new zone for 'Pacific/Saipan'
-Writing new zone for 'Pacific/Chuuk'
-Writing new zone for 'Pacific/Apia'
-Writing new zone for 'Australia/Sydney'
-Writing new zone for 'Australia/Hobart'
-Writing new zone for 'Australia/Currie'
-Writing new zone for 'Australia/Adelaide'
-Writing new zone for 'Australia/Broken_Hill'
-Writing new zone for 'Australia/Eucla'
-Writing new zone for 'Australia/Darwin'
-Writing new zone for 'Australia/Brisbane'
-Writing new zone for 'Australia/Melbourne'
-Writing new zone for 'Australia/Perth'
-Writing new zone for 'Australia/Lindeman'
-Writing new zone for 'Australia/Lord_Howe'
-Writing new zone for 'Africa/Casablanca'
-Writing new zone for 'Africa/Ndjamena'
-Writing new zone for 'Africa/Addis_Ababa'
-Writing new zone for 'Africa/Windhoek'
-Writing new zone for 'Africa/Nouakchott'
-Writing new zone for 'Africa/Tunis'
-Writing new zone for 'Africa/Algiers'
-Writing new zone for 'Africa/Johannesburg'
-Writing new zone for 'Africa/Cairo'
-Writing new zone for 'Africa/Bamako'
Writing new zone for 'Africa/Abidjan'
-Writing new zone for 'Africa/Mbabane'
-Writing new zone for 'Africa/Maseru'
-Writing new zone for 'Africa/Mogadishu'
-Writing new zone for 'Africa/Banjul'
-Writing new zone for 'Africa/Freetown'
-Writing new zone for 'Africa/Luanda'
-Writing new zone for 'Africa/Dakar'
-Writing new zone for 'Africa/Kampala'
-Writing new zone for 'Africa/Dar_es_Salaam'
-Writing new zone for 'Africa/Malabo'
-Writing new zone for 'Africa/Kinshasa'
-Writing new zone for 'Africa/Kigali'
-Writing new zone for 'Africa/Bujumbura'
-Writing new zone for 'Africa/Conakry'
-Writing new zone for 'Africa/Blantyre'
-Writing new zone for 'Africa/Niamey'
-Writing new zone for 'Africa/Djibouti'
-Writing new zone for 'Africa/Lagos'
-Writing new zone for 'Africa/Brazzaville'
-Writing new zone for 'Africa/Tripoli'
-Writing new zone for 'Africa/Lusaka'
-Writing new zone for 'Africa/Ouagadougou'
-Writing new zone for 'Africa/Bangui'
-Writing new zone for 'Africa/El_Aaiun'
-Writing new zone for 'Africa/Lubumbashi'
-Writing new zone for 'Africa/Bissau'
-Writing new zone for 'Africa/Libreville'
-Writing new zone for 'Africa/Harare'
-Writing new zone for 'Africa/Porto-Novo'
-Writing new zone for 'Africa/Monrovia'
-Writing new zone for 'Africa/Juba'
-Writing new zone for 'Africa/Ceuta'
-Writing new zone for 'Africa/Nairobi'
-Writing new zone for 'Africa/Douala'
-Writing new zone for 'Africa/Khartoum'
-Writing new zone for 'Africa/Maputo'
Writing new zone for 'Africa/Accra'
-Writing new zone for 'Africa/Lome'
-Writing new zone for 'Africa/Sao_Tome'
+Writing new zone for 'Africa/Addis_Ababa'
+Writing new zone for 'Africa/Algiers'
Writing new zone for 'Africa/Asmara'
+Writing new zone for 'Africa/Asmera'
+Writing new zone for 'Africa/Bamako'
+Writing new zone for 'Africa/Bangui'
+Writing new zone for 'Africa/Banjul'
+Writing new zone for 'Africa/Bissau'
+Writing new zone for 'Africa/Blantyre'
+Writing new zone for 'Africa/Brazzaville'
+Writing new zone for 'Africa/Bujumbura'
+Writing new zone for 'Africa/Cairo'
+Writing new zone for 'Africa/Casablanca'
+Writing new zone for 'Africa/Ceuta'
+Writing new zone for 'Africa/Conakry'
+Writing new zone for 'Africa/Dakar'
+Writing new zone for 'Africa/Dar_es_Salaam'
+Writing new zone for 'Africa/Djibouti'
+Writing new zone for 'Africa/Douala'
+Writing new zone for 'Africa/El_Aaiun'
+Writing new zone for 'Africa/Freetown'
Writing new zone for 'Africa/Gaborone'
-Writing new zone for 'zones.tab'
-Writing new zone for 'Arctic/Longyearbyen'
-Writing new zone for 'Antarctica/Rothera'
-Writing new zone for 'Antarctica/South_Pole'
-Writing new zone for 'Antarctica/Mawson'
-Writing new zone for 'Antarctica/Casey'
-Writing new zone for 'Antarctica/Palmer'
-Writing new zone for 'Antarctica/Vostok'
-Writing new zone for 'Antarctica/Macquarie'
-Writing new zone for 'Antarctica/Syowa'
-Writing new zone for 'Antarctica/McMurdo'
-Writing new zone for 'Antarctica/DumontDUrville'
-Writing new zone for 'Antarctica/Davis'
-Writing new zone for 'America/Caracas'
-Writing new zone for 'America/Chihuahua'
-Writing new zone for 'America/Eirunepe'
+Writing new zone for 'Africa/Harare'
+Writing new zone for 'Africa/Johannesburg'
+Writing new zone for 'Africa/Juba'
+Writing new zone for 'Africa/Kampala'
+Writing new zone for 'Africa/Khartoum'
+Writing new zone for 'Africa/Kigali'
+Writing new zone for 'Africa/Kinshasa'
+Writing new zone for 'Africa/Lagos'
+Writing new zone for 'Africa/Libreville'
+Writing new zone for 'Africa/Lome'
+Writing new zone for 'Africa/Luanda'
+Writing new zone for 'Africa/Lubumbashi'
+Writing new zone for 'Africa/Lusaka'
+Writing new zone for 'Africa/Malabo'
+Writing new zone for 'Africa/Maputo'
+Writing new zone for 'Africa/Maseru'
+Writing new zone for 'Africa/Mbabane'
+Writing new zone for 'Africa/Mogadishu'
+Writing new zone for 'Africa/Monrovia'
+Writing new zone for 'Africa/Nairobi'
+Writing new zone for 'Africa/Ndjamena'
+Writing new zone for 'Africa/Niamey'
+Writing new zone for 'Africa/Nouakchott'
+Writing new zone for 'Africa/Ouagadougou'
+Writing new zone for 'Africa/Porto-Novo'
+Writing new zone for 'Africa/Sao_Tome'
+Writing new zone for 'Africa/Timbuktu'
+Writing new zone for 'Africa/Tripoli'
+Writing new zone for 'Africa/Tunis'
+Writing new zone for 'Africa/Windhoek'
+Writing new zone for 'America/Adak'
+Writing new zone for 'America/Anchorage'
+Writing new zone for 'America/Anguilla'
+Writing new zone for 'America/Antigua'
+Writing new zone for 'America/Araguaina'
+Writing new zone for 'America/Argentina/Buenos_Aires'
+Writing new zone for 'America/Argentina/Catamarca'
+Writing new zone for 'America/Argentina/ComodRivadavia'
+Writing new zone for 'America/Argentina/Cordoba'
+Writing new zone for 'America/Argentina/Jujuy'
+Writing new zone for 'America/Argentina/La_Rioja'
+Writing new zone for 'America/Argentina/Mendoza'
+Writing new zone for 'America/Argentina/Rio_Gallegos'
+Writing new zone for 'America/Argentina/Salta'
+Writing new zone for 'America/Argentina/San_Juan'
+Writing new zone for 'America/Argentina/San_Luis'
+Writing new zone for 'America/Argentina/Tucuman'
+Writing new zone for 'America/Argentina/Ushuaia'
+Writing new zone for 'America/Aruba'
+Writing new zone for 'America/Asuncion'
+Writing new zone for 'America/Atikokan'
+Writing new zone for 'America/Atka'
+Writing new zone for 'America/Bahia'
+Writing new zone for 'America/Bahia_Banderas'
+Writing new zone for 'America/Barbados'
Writing new zone for 'America/Belem'
-Writing new zone for 'America/Cambridge_Bay'
-Writing new zone for 'America/St_Johns'
-Writing new zone for 'America/Cancun'
-Writing new zone for 'America/Santarem'
-Writing new zone for 'America/Toronto'
-Writing new zone for 'America/Chicago'
-Writing new zone for 'America/Metlakatla'
-Writing new zone for 'America/Winnipeg'
+Writing new zone for 'America/Belize'
+Writing new zone for 'America/Blanc-Sablon'
Writing new zone for 'America/Boa_Vista'
+Writing new zone for 'America/Bogota'
+Writing new zone for 'America/Boise'
+Writing new zone for 'America/Buenos_Aires'
+Writing new zone for 'America/Cambridge_Bay'
+Writing new zone for 'America/Campo_Grande'
+Writing new zone for 'America/Cancun'
+Writing new zone for 'America/Caracas'
+Writing new zone for 'America/Catamarca'
+Writing new zone for 'America/Cayenne'
+Writing new zone for 'America/Cayman'
+Writing new zone for 'America/Chicago'
+Writing new zone for 'America/Chihuahua'
+Writing new zone for 'America/Coral_Harbour'
+Writing new zone for 'America/Cordoba'
+Writing new zone for 'America/Costa_Rica'
+Writing new zone for 'America/Creston'
Writing new zone for 'America/Cuiaba'
+Writing new zone for 'America/Curacao'
+Writing new zone for 'America/Danmarkshavn'
+Writing new zone for 'America/Dawson'
+Writing new zone for 'America/Dawson_Creek'
+Writing new zone for 'America/Denver'
+Writing new zone for 'America/Detroit'
+Writing new zone for 'America/Dominica'
+Writing new zone for 'America/Edmonton'
+Writing new zone for 'America/Eirunepe'
+Writing new zone for 'America/El_Salvador'
+Writing new zone for 'America/Ensenada'
+Writing new zone for 'America/Fort_Nelson'
+Writing new zone for 'America/Fort_Wayne'
+Writing new zone for 'America/Fortaleza'
+Writing new zone for 'America/Glace_Bay'
+Writing new zone for 'America/Godthab'
+Writing new zone for 'America/Goose_Bay'
+Writing new zone for 'America/Grand_Turk'
+Writing new zone for 'America/Grenada'
+Writing new zone for 'America/Guadeloupe'
+Writing new zone for 'America/Guatemala'
Writing new zone for 'America/Guayaquil'
+Writing new zone for 'America/Guyana'
+Writing new zone for 'America/Halifax'
+Writing new zone for 'America/Havana'
+Writing new zone for 'America/Hermosillo'
+Writing new zone for 'America/Indiana/Indianapolis'
+Writing new zone for 'America/Indiana/Knox'
+Writing new zone for 'America/Indiana/Marengo'
+Writing new zone for 'America/Indiana/Petersburg'
+Writing new zone for 'America/Indiana/Tell_City'
+Writing new zone for 'America/Indiana/Vevay'
+Writing new zone for 'America/Indiana/Vincennes'
+Writing new zone for 'America/Indiana/Winamac'
+Writing new zone for 'America/Indianapolis'
+Writing new zone for 'America/Inuvik'
+Writing new zone for 'America/Iqaluit'
+Writing new zone for 'America/Jamaica'
+Writing new zone for 'America/Jujuy'
+Writing new zone for 'America/Juneau'
+Writing new zone for 'America/Kentucky/Louisville'
+Writing new zone for 'America/Kentucky/Monticello'
+Writing new zone for 'America/Knox_IN'
+Writing new zone for 'America/Kralendijk'
+Writing new zone for 'America/La_Paz'
+Writing new zone for 'America/Lima'
+Writing new zone for 'America/Los_Angeles'
+Writing new zone for 'America/Louisville'
+Writing new zone for 'America/Lower_Princes'
+Writing new zone for 'America/Maceio'
+Writing new zone for 'America/Managua'
+Writing new zone for 'America/Manaus'
+Writing new zone for 'America/Marigot'
+Writing new zone for 'America/Martinique'
+Writing new zone for 'America/Matamoros'
+Writing new zone for 'America/Mazatlan'
+Writing new zone for 'America/Mendoza'
+Writing new zone for 'America/Menominee'
+Writing new zone for 'America/Merida'
+Writing new zone for 'America/Metlakatla'
+Writing new zone for 'America/Mexico_City'
+Writing new zone for 'America/Miquelon'
+Writing new zone for 'America/Moncton'
+Writing new zone for 'America/Monterrey'
+Writing new zone for 'America/Montevideo'
+Writing new zone for 'America/Montreal'
+Writing new zone for 'America/Montserrat'
+Writing new zone for 'America/Nassau'
+Writing new zone for 'America/New_York'
+Writing new zone for 'America/Nipigon'
+Writing new zone for 'America/Nome'
+Writing new zone for 'America/Noronha'
Writing new zone for 'America/North_Dakota/Beulah'
Writing new zone for 'America/North_Dakota/Center'
Writing new zone for 'America/North_Dakota/New_Salem'
-Writing new zone for 'America/Cayenne'
-Writing new zone for 'America/Barbados'
-Writing new zone for 'America/Moncton'
-Writing new zone for 'America/Montevideo'
-Writing new zone for 'America/Mazatlan'
-Writing new zone for 'America/Anguilla'
-Writing new zone for 'America/Tortola'
-Writing new zone for 'America/Juneau'
-Writing new zone for 'America/Asuncion'
-Writing new zone for 'America/St_Vincent'
-Writing new zone for 'America/Inuvik'
-Writing new zone for 'America/Blanc-Sablon'
-Writing new zone for 'America/Iqaluit'
-Writing new zone for 'America/Swift_Current'
-Writing new zone for 'America/Bogota'
-Writing new zone for 'America/Rainy_River'
-Writing new zone for 'America/Recife'
-Writing new zone for 'America/Lima'
-Writing new zone for 'America/Porto_Velho'
-Writing new zone for 'America/Scoresbysund'
-Writing new zone for 'America/Costa_Rica'
-Writing new zone for 'America/Fortaleza'
-Writing new zone for 'America/Dominica'
-Writing new zone for 'America/Tegucigalpa'
-Writing new zone for 'America/El_Salvador'
-Writing new zone for 'America/Grand_Turk'
-Writing new zone for 'America/Nome'
+Writing new zone for 'America/Nuuk'
Writing new zone for 'America/Ojinaga'
-Writing new zone for 'America/Creston'
-Writing new zone for 'America/Tijuana'
-Writing new zone for 'America/Campo_Grande'
-Writing new zone for 'America/Jamaica'
-Writing new zone for 'America/Mexico_City'
-Writing new zone for 'America/La_Paz'
-Writing new zone for 'America/Guatemala'
-Writing new zone for 'America/Santa_Isabel'
-Writing new zone for 'America/Nassau'
-Writing new zone for 'America/Shiprock'
-Writing new zone for 'America/St_Lucia'
-Writing new zone for 'America/Marigot'
-Writing new zone for 'America/Rio_Branco'
-Writing new zone for 'America/Grenada'
-Writing new zone for 'America/Port-au-Prince'
-Writing new zone for 'America/Guyana'
-Writing new zone for 'America/St_Kitts'
-Writing new zone for 'America/Atikokan'
-Writing new zone for 'America/Miquelon'
-Writing new zone for 'America/Anchorage'
-Writing new zone for 'America/Hermosillo'
-Writing new zone for 'America/Managua'
-Writing new zone for 'America/Antigua'
-Writing new zone for 'America/Godthab'
-Writing new zone for 'America/Phoenix'
-Writing new zone for 'America/Cayman'
-Writing new zone for 'America/Sitka'
-Writing new zone for 'America/Thule'
-Writing new zone for 'America/Montserrat'
-Writing new zone for 'America/Martinique'
-Writing new zone for 'America/Araguaina'
-Writing new zone for 'America/Puerto_Rico'
-Writing new zone for 'America/Adak'
-Writing new zone for 'America/Dawson'
-Writing updated zone for 'America/New_York'
-Writing new zone for 'America/Monterrey'
-Writing new zone for 'America/Curacao'
-Writing new zone for 'America/Whitehorse'
-Writing new zone for 'America/Argentina/Ushuaia'
-Writing new zone for 'America/Argentina/Jujuy'
-Writing new zone for 'America/Argentina/Salta'
-Writing new zone for 'America/Argentina/Rio_Gallegos'
-Writing new zone for 'America/Argentina/San_Juan'
-Writing new zone for 'America/Argentina/Mendoza'
-Writing new zone for 'America/Argentina/Cordoba'
-Writing new zone for 'America/Argentina/San_Luis'
-Writing new zone for 'America/Argentina/Catamarca'
-Writing new zone for 'America/Argentina/La_Rioja'
-Writing new zone for 'America/Argentina/Tucuman'
-Writing new zone for 'America/Argentina/Buenos_Aires'
-Writing new zone for 'America/Kralendijk'
-Writing new zone for 'America/Paramaribo'
-Writing new zone for 'America/Goose_Bay'
-Writing new zone for 'America/Guadeloupe'
-Writing new zone for 'America/Dawson_Creek'
-Writing new zone for 'America/Resolute'
-Writing new zone for 'America/Belize'
-Writing new zone for 'America/Denver'
-Writing new zone for 'America/Brasilia'
-Writing new zone for 'America/Merida'
-Writing new zone for 'America/Lower_Princes'
-Writing updated zone for 'America/Los_Angeles'
-Writing new zone for 'America/Halifax'
-Writing new zone for 'America/Noronha'
-Writing new zone for 'America/Regina'
-Writing new zone for 'America/St_Barthelemy'
-Writing new zone for 'America/Santiago'
-Writing new zone for 'America/Bahia_Banderas'
-Writing new zone for 'America/Indiana/Winamac'
-Writing new zone for 'America/Indiana/Tell_City'
-Writing new zone for 'America/Indiana/Vincennes'
-Writing new zone for 'America/Indiana/Indianapolis'
-Writing new zone for 'America/Indiana/Petersburg'
-Writing new zone for 'America/Indiana/Knox'
-Writing new zone for 'America/Indiana/Marengo'
-Writing new zone for 'America/Indiana/Vevay'
-Writing new zone for 'America/Kentucky/Louisville'
-Writing new zone for 'America/Kentucky/Monticello'
-Writing new zone for 'America/Rankin_Inlet'
-Writing new zone for 'America/Glace_Bay'
-Writing new zone for 'America/Yakutat'
-Writing new zone for 'America/Boise'
-Writing new zone for 'America/Edmonton'
-Writing new zone for 'America/Yellowknife'
-Writing new zone for 'America/Maceio'
-Writing new zone for 'America/St_Thomas'
-Writing new zone for 'America/Montreal'
-Writing new zone for 'America/Pangnirtung'
-Writing new zone for 'America/Detroit'
-Writing new zone for 'America/Port_of_Spain'
-Writing new zone for 'America/Manaus'
-Writing new zone for 'America/Vancouver'
-Writing new zone for 'America/Matamoros'
-Writing new zone for 'America/Nipigon'
-Writing new zone for 'America/Havana'
-Writing new zone for 'America/Menominee'
-Writing new zone for 'America/Thunder_Bay'
-Writing new zone for 'America/Santo_Domingo'
-Writing new zone for 'America/Aruba'
-Writing new zone for 'America/Danmarkshavn'
Writing new zone for 'America/Panama'
+Writing new zone for 'America/Pangnirtung'
+Writing new zone for 'America/Paramaribo'
+Writing new zone for 'America/Phoenix'
+Writing new zone for 'America/Port-au-Prince'
+Writing new zone for 'America/Port_of_Spain'
+Writing new zone for 'America/Porto_Acre'
+Writing new zone for 'America/Porto_Velho'
+Writing new zone for 'America/Puerto_Rico'
+Writing new zone for 'America/Punta_Arenas'
+Writing new zone for 'America/Rainy_River'
+Writing new zone for 'America/Rankin_Inlet'
+Writing new zone for 'America/Recife'
+Writing new zone for 'America/Regina'
+Writing new zone for 'America/Resolute'
+Writing new zone for 'America/Rio_Branco'
+Writing new zone for 'America/Rosario'
+Writing new zone for 'America/Santa_Isabel'
+Writing new zone for 'America/Santarem'
+Writing new zone for 'America/Santiago'
+Writing new zone for 'America/Santo_Domingo'
Writing new zone for 'America/Sao_Paulo'
-Writing new zone for 'America/Bahia'
-Writing new zone for 'Indian/Chagos'
-Writing new zone for 'Indian/Comoro'
-Writing new zone for 'Indian/Mayotte'
-Writing new zone for 'Indian/Kerguelen'
-Writing new zone for 'Indian/Mauritius'
-Writing new zone for 'Indian/Mahe'
-Writing new zone for 'Indian/Antananarivo'
-Writing new zone for 'Indian/Maldives'
-Writing new zone for 'Indian/Reunion'
-Writing new zone for 'Indian/Christmas'
-Writing new zone for 'Indian/Cocos'
-Writing new zone for 'Asia/Seoul'
-Writing new zone for 'Asia/Sakhalin'
-Writing new zone for 'Asia/Tehran'
+Writing new zone for 'America/Scoresbysund'
+Writing new zone for 'America/Shiprock'
+Writing new zone for 'America/Sitka'
+Writing new zone for 'America/St_Barthelemy'
+Writing new zone for 'America/St_Johns'
+Writing new zone for 'America/St_Kitts'
+Writing new zone for 'America/St_Lucia'
+Writing new zone for 'America/St_Thomas'
+Writing new zone for 'America/St_Vincent'
+Writing new zone for 'America/Swift_Current'
+Writing new zone for 'America/Tegucigalpa'
+Writing new zone for 'America/Thule'
+Writing new zone for 'America/Thunder_Bay'
+Writing new zone for 'America/Tijuana'
+Writing new zone for 'America/Toronto'
+Writing new zone for 'America/Tortola'
+Writing new zone for 'America/Vancouver'
+Writing new zone for 'America/Virgin'
+Writing new zone for 'America/Whitehorse'
+Writing new zone for 'America/Winnipeg'
+Writing new zone for 'America/Yakutat'
+Writing new zone for 'America/Yellowknife'
+Writing new zone for 'Antarctica/Casey'
+Writing new zone for 'Antarctica/Davis'
+Writing new zone for 'Antarctica/DumontDUrville'
+Writing new zone for 'Antarctica/Macquarie'
+Writing new zone for 'Antarctica/Mawson'
+Writing new zone for 'Antarctica/McMurdo'
+Writing new zone for 'Antarctica/Palmer'
+Writing new zone for 'Antarctica/Rothera'
+Writing new zone for 'Antarctica/South_Pole'
+Writing new zone for 'Antarctica/Syowa'
+Writing new zone for 'Antarctica/Troll'
+Writing new zone for 'Antarctica/Vostok'
+Writing new zone for 'Arctic/Longyearbyen'
Writing new zone for 'Asia/Aden'
-Writing new zone for 'Asia/Macau'
-Writing new zone for 'Asia/Bishkek'
-Writing new zone for 'Asia/Kabul'
-Writing new zone for 'Asia/Hovd'
+Writing new zone for 'Asia/Almaty'
+Writing new zone for 'Asia/Amman'
Writing new zone for 'Asia/Anadyr'
-Writing new zone for 'Asia/Kuwait'
-Writing new zone for 'Asia/Omsk'
-Writing new zone for 'Asia/Manila'
-Writing new zone for 'Asia/Makassar'
-Writing new zone for 'Asia/Vientiane'
-Writing new zone for 'Asia/Oral'
-Writing new zone for 'Asia/Kashgar'
-Writing new zone for 'Asia/Yekaterinburg'
-Writing new zone for 'Asia/Kamchatka'
-Writing new zone for 'Asia/Harbin'
+Writing new zone for 'Asia/Aqtau'
Writing new zone for 'Asia/Aqtobe'
+Writing new zone for 'Asia/Ashgabat'
+Writing new zone for 'Asia/Ashkhabad'
+Writing new zone for 'Asia/Atyrau'
+Writing new zone for 'Asia/Baghdad'
+Writing new zone for 'Asia/Bahrain'
+Writing new zone for 'Asia/Baku'
+Writing new zone for 'Asia/Bangkok'
+Writing new zone for 'Asia/Barnaul'
+Writing new zone for 'Asia/Beirut'
+Writing new zone for 'Asia/Bishkek'
+Writing new zone for 'Asia/Brunei'
+Writing new zone for 'Asia/Calcutta'
+Writing new zone for 'Asia/Chita'
+Writing new zone for 'Asia/Choibalsan'
Writing new zone for 'Asia/Chongqing'
-Writing new zone for 'Asia/Samarkand'
+Writing new zone for 'Asia/Chungking'
+Writing new zone for 'Asia/Colombo'
+Writing new zone for 'Asia/Dacca'
+Writing new zone for 'Asia/Damascus'
+Writing new zone for 'Asia/Dhaka'
+Writing new zone for 'Asia/Dili'
+Writing new zone for 'Asia/Dubai'
+Writing new zone for 'Asia/Dushanbe'
+Writing new zone for 'Asia/Famagusta'
+Writing new zone for 'Asia/Gaza'
+Writing new zone for 'Asia/Harbin'
+Writing new zone for 'Asia/Hebron'
+Writing new zone for 'Asia/Ho_Chi_Minh'
+Writing new zone for 'Asia/Hong_Kong'
+Writing new zone for 'Asia/Hovd'
+Writing new zone for 'Asia/Irkutsk'
+Writing new zone for 'Asia/Istanbul'
+Writing new zone for 'Asia/Jakarta'
+Writing new zone for 'Asia/Jayapura'
+Writing new zone for 'Asia/Jerusalem'
+Writing new zone for 'Asia/Kabul'
+Writing new zone for 'Asia/Kamchatka'
+Writing new zone for 'Asia/Karachi'
+Writing new zone for 'Asia/Kashgar'
+Writing new zone for 'Asia/Kathmandu'
+Writing new zone for 'Asia/Katmandu'
+Writing new zone for 'Asia/Khandyga'
+Writing new zone for 'Asia/Kolkata'
+Writing new zone for 'Asia/Krasnoyarsk'
Writing new zone for 'Asia/Kuala_Lumpur'
-Writing new zone for 'Asia/Taipei'
+Writing new zone for 'Asia/Kuching'
+Writing new zone for 'Asia/Kuwait'
+Writing new zone for 'Asia/Macao'
+Writing new zone for 'Asia/Macau'
+Writing new zone for 'Asia/Magadan'
+Writing new zone for 'Asia/Makassar'
+Writing new zone for 'Asia/Manila'
+Writing new zone for 'Asia/Muscat'
+Writing new zone for 'Asia/Nicosia'
+Writing new zone for 'Asia/Novokuznetsk'
+Writing new zone for 'Asia/Novosibirsk'
+Writing new zone for 'Asia/Omsk'
+Writing new zone for 'Asia/Oral'
+Writing new zone for 'Asia/Phnom_Penh'
+Writing new zone for 'Asia/Pontianak'
+Writing new zone for 'Asia/Pyongyang'
+Writing new zone for 'Asia/Qatar'
+Writing new zone for 'Asia/Qostanay'
+Writing new zone for 'Asia/Qyzylorda'
+Writing new zone for 'Asia/Rangoon'
+Writing new zone for 'Asia/Riyadh'
+Writing new zone for 'Asia/Saigon'
+Writing new zone for 'Asia/Sakhalin'
+Writing new zone for 'Asia/Samarkand'
+Writing new zone for 'Asia/Seoul'
Writing new zone for 'Asia/Shanghai'
Writing new zone for 'Asia/Singapore'
-Writing new zone for 'Asia/Kuching'
-Writing new zone for 'Asia/Tbilisi'
-Writing new zone for 'Asia/Dhaka'
-Writing new zone for 'Asia/Krasnoyarsk'
-Writing new zone for 'Asia/Istanbul'
+Writing new zone for 'Asia/Srednekolymsk'
+Writing new zone for 'Asia/Taipei'
Writing new zone for 'Asia/Tashkent'
-Writing new zone for 'Asia/Jerusalem'
-Writing new zone for 'Asia/Ulaanbaatar'
-Writing new zone for 'Asia/Beirut'
-Writing new zone for 'Asia/Jayapura'
-Writing new zone for 'Asia/Tokyo'
-Writing new zone for 'Asia/Bangkok'
-Writing new zone for 'Asia/Kolkata'
-Writing new zone for 'Asia/Baku'
-Writing new zone for 'Asia/Karachi'
-Writing new zone for 'Asia/Muscat'
-Writing new zone for 'Asia/Kathmandu'
-Writing new zone for 'Asia/Gaza'
-Writing new zone for 'Asia/Yerevan'
-Writing new zone for 'Asia/Colombo'
-Writing new zone for 'Asia/Phnom_Penh'
-Writing new zone for 'Asia/Vladivostok'
-Writing new zone for 'Asia/Almaty'
-Writing new zone for 'Asia/Riyadh'
+Writing new zone for 'Asia/Tbilisi'
+Writing new zone for 'Asia/Tehran'
+Writing new zone for 'Asia/Tel_Aviv'
+Writing new zone for 'Asia/Thimbu'
Writing new zone for 'Asia/Thimphu'
-Writing new zone for 'Asia/Dubai'
-Writing new zone for 'Asia/Qyzylorda'
-Writing new zone for 'Asia/Aqtau'
-Writing new zone for 'Asia/Hong_Kong'
-Writing new zone for 'Asia/Novosibirsk'
-Writing new zone for 'Asia/Dushanbe'
-Writing new zone for 'Asia/Ashgabat'
-Writing new zone for 'Asia/Brunei'
-Writing new zone for 'Asia/Novokuznetsk'
-Writing new zone for 'Asia/Pyongyang'
-Writing new zone for 'Asia/Magadan'
-Writing new zone for 'Asia/Bahrain'
-Writing new zone for 'Asia/Hebron'
-Writing new zone for 'Asia/Damascus'
-Writing new zone for 'Asia/Qatar'
-Writing new zone for 'Asia/Choibalsan'
-Writing new zone for 'Asia/Ho_Chi_Minh'
-Writing new zone for 'Asia/Yakutsk'
-Writing new zone for 'Asia/Irkutsk'
-Writing new zone for 'Asia/Dili'
+Writing new zone for 'Asia/Tokyo'
+Writing new zone for 'Asia/Tomsk'
+Writing new zone for 'Asia/Ujung_Pandang'
+Writing new zone for 'Asia/Ulaanbaatar'
+Writing new zone for 'Asia/Ulan_Bator'
Writing new zone for 'Asia/Urumqi'
-Writing new zone for 'Asia/Nicosia'
-Writing new zone for 'Asia/Pontianak'
-Writing new zone for 'Asia/Amman'
-Writing new zone for 'Asia/Jakarta'
-Writing new zone for 'Asia/Baghdad'
-Writing new zone for 'Asia/Rangoon'
-Added 414 new zones, updated data for 6 zones and added 0 new aliases
+Writing new zone for 'Asia/Ust-Nera'
+Writing new zone for 'Asia/Vientiane'
+Writing new zone for 'Asia/Vladivostok'
+Writing new zone for 'Asia/Yakutsk'
+Writing new zone for 'Asia/Yangon'
+Writing new zone for 'Asia/Yekaterinburg'
+Writing new zone for 'Asia/Yerevan'
+Writing new zone for 'Atlantic/Azores'
+Writing new zone for 'Atlantic/Bermuda'
+Writing new zone for 'Atlantic/Canary'
+Writing new zone for 'Atlantic/Cape_Verde'
+Writing new zone for 'Atlantic/Faeroe'
+Writing new zone for 'Atlantic/Faroe'
+Writing new zone for 'Atlantic/Jan_Mayen'
+Writing new zone for 'Atlantic/Madeira'
+Writing new zone for 'Atlantic/Reykjavik'
+Writing new zone for 'Atlantic/South_Georgia'
+Writing new zone for 'Atlantic/St_Helena'
+Writing new zone for 'Atlantic/Stanley'
+Writing new zone for 'Australia/ACT'
+Writing new zone for 'Australia/Adelaide'
+Writing new zone for 'Australia/Brisbane'
+Writing new zone for 'Australia/Broken_Hill'
+Writing new zone for 'Australia/Canberra'
+Writing new zone for 'Australia/Currie'
+Writing new zone for 'Australia/Darwin'
+Writing new zone for 'Australia/Eucla'
+Writing new zone for 'Australia/Hobart'
+Writing new zone for 'Australia/LHI'
+Writing new zone for 'Australia/Lindeman'
+Writing new zone for 'Australia/Lord_Howe'
+Writing new zone for 'Australia/Melbourne'
+Writing new zone for 'Australia/NSW'
+Writing new zone for 'Australia/North'
+Writing new zone for 'Australia/Perth'
+Writing new zone for 'Australia/Queensland'
+Writing new zone for 'Australia/South'
+Writing new zone for 'Australia/Sydney'
+Writing new zone for 'Australia/Tasmania'
+Writing new zone for 'Australia/Victoria'
+Writing new zone for 'Australia/West'
+Writing new zone for 'Australia/Yancowinna'
+Writing new zone for 'Brazil/Acre'
+Writing new zone for 'Brazil/DeNoronha'
+Writing new zone for 'Brazil/East'
+Writing new zone for 'Brazil/West'
+Writing new zone for 'CET'
+Writing new zone for 'CST6CDT'
+Writing new zone for 'Canada/Atlantic'
+Writing new zone for 'Canada/Central'
+Writing new zone for 'Canada/Eastern'
+Writing new zone for 'Canada/Mountain'
+Writing new zone for 'Canada/Newfoundland'
+Writing new zone for 'Canada/Pacific'
+Writing new zone for 'Canada/Saskatchewan'
+Writing new zone for 'Canada/Yukon'
+Writing new zone for 'Chile/Continental'
+Writing new zone for 'Chile/EasterIsland'
+Writing new zone for 'Cuba'
+Writing new zone for 'EET'
+Writing new zone for 'EST'
+Writing new zone for 'EST5EDT'
+Writing new zone for 'Egypt'
+Writing new zone for 'Eire'
+Writing new zone for 'Etc/GMT+0'
+Writing new zone for 'Etc/GMT+1'
+Writing new zone for 'Etc/GMT+10'
+Writing new zone for 'Etc/GMT+11'
+Writing new zone for 'Etc/GMT+12'
+Writing new zone for 'Etc/GMT+2'
+Writing new zone for 'Etc/GMT+3'
+Writing new zone for 'Etc/GMT+4'
+Writing new zone for 'Etc/GMT+5'
+Writing new zone for 'Etc/GMT+6'
+Writing new zone for 'Etc/GMT+7'
+Writing new zone for 'Etc/GMT+8'
+Writing new zone for 'Etc/GMT+9'
+Writing new zone for 'Etc/GMT-0'
+Writing new zone for 'Etc/GMT-1'
+Writing new zone for 'Etc/GMT-10'
+Writing new zone for 'Etc/GMT-11'
+Writing new zone for 'Etc/GMT-12'
+Writing new zone for 'Etc/GMT-13'
+Writing new zone for 'Etc/GMT-14'
+Writing new zone for 'Etc/GMT-2'
+Writing new zone for 'Etc/GMT-3'
+Writing new zone for 'Etc/GMT-4'
+Writing new zone for 'Etc/GMT-5'
+Writing new zone for 'Etc/GMT-6'
+Writing new zone for 'Etc/GMT-7'
+Writing new zone for 'Etc/GMT-8'
+Writing new zone for 'Etc/GMT-9'
+Writing new zone for 'Etc/GMT'
+Writing new zone for 'Etc/GMT0'
+Writing new zone for 'Etc/Greenwich'
+Writing new zone for 'Etc/UCT'
+Writing new zone for 'Etc/UTC'
+Writing new zone for 'Etc/Universal'
+Writing new zone for 'Etc/Zulu'
+Writing new zone for 'Europe/Amsterdam'
+Writing new zone for 'Europe/Andorra'
+Writing new zone for 'Europe/Astrakhan'
+Writing new zone for 'Europe/Athens'
+Writing new zone for 'Europe/Belfast'
+Writing new zone for 'Europe/Belgrade'
+Writing new zone for 'Europe/Berlin'
+Writing new zone for 'Europe/Bratislava'
+Writing new zone for 'Europe/Brussels'
+Writing new zone for 'Europe/Bucharest'
+Writing new zone for 'Europe/Budapest'
+Writing new zone for 'Europe/Busingen'
+Writing new zone for 'Europe/Chisinau'
+Writing new zone for 'Europe/Copenhagen'
+Writing new zone for 'Europe/Dublin'
+Writing new zone for 'Europe/Gibraltar'
+Writing new zone for 'Europe/Guernsey'
+Writing new zone for 'Europe/Helsinki'
+Writing new zone for 'Europe/Isle_of_Man'
+Writing new zone for 'Europe/Istanbul'
+Writing new zone for 'Europe/Jersey'
+Writing new zone for 'Europe/Kaliningrad'
+Writing new zone for 'Europe/Kiev'
+Writing new zone for 'Europe/Kirov'
+Writing new zone for 'Europe/Lisbon'
+Writing new zone for 'Europe/Ljubljana'
+Writing new zone for 'Europe/London'
+Writing new zone for 'Europe/Luxembourg'
+Writing new zone for 'Europe/Madrid'
+Writing new zone for 'Europe/Malta'
+Writing new zone for 'Europe/Mariehamn'
+Writing new zone for 'Europe/Minsk'
+Writing new zone for 'Europe/Monaco'
+Writing new zone for 'Europe/Moscow'
+Writing new zone for 'Europe/Nicosia'
+Writing new zone for 'Europe/Oslo'
+Writing new zone for 'Europe/Paris'
+Writing new zone for 'Europe/Podgorica'
+Writing new zone for 'Europe/Prague'
+Writing new zone for 'Europe/Riga'
+Writing new zone for 'Europe/Rome'
+Writing new zone for 'Europe/Samara'
+Writing new zone for 'Europe/San_Marino'
+Writing new zone for 'Europe/Sarajevo'
+Writing new zone for 'Europe/Saratov'
+Writing new zone for 'Europe/Simferopol'
+Writing new zone for 'Europe/Skopje'
+Writing new zone for 'Europe/Sofia'
+Writing new zone for 'Europe/Stockholm'
+Writing new zone for 'Europe/Tallinn'
+Writing new zone for 'Europe/Tirane'
+Writing new zone for 'Europe/Tiraspol'
+Writing new zone for 'Europe/Ulyanovsk'
+Writing new zone for 'Europe/Uzhgorod'
+Writing new zone for 'Europe/Vaduz'
+Writing new zone for 'Europe/Vatican'
+Writing new zone for 'Europe/Vienna'
+Writing new zone for 'Europe/Vilnius'
+Writing new zone for 'Europe/Volgograd'
+Writing new zone for 'Europe/Warsaw'
+Writing new zone for 'Europe/Zagreb'
+Writing new zone for 'Europe/Zaporozhye'
+Writing new zone for 'Europe/Zurich'
+Writing new zone for 'GB-Eire'
+Writing new zone for 'GB'
+Writing new zone for 'GMT+0'
+Writing new zone for 'GMT-0'
+Writing new zone for 'GMT'
+Writing new zone for 'GMT0'
+Writing new zone for 'Greenwich'
+Writing new zone for 'HST'
+Writing new zone for 'Hongkong'
+Writing new zone for 'Iceland'
+Writing new zone for 'Indian/Antananarivo'
+Writing new zone for 'Indian/Chagos'
+Writing new zone for 'Indian/Christmas'
+Writing new zone for 'Indian/Cocos'
+Writing new zone for 'Indian/Comoro'
+Writing new zone for 'Indian/Kerguelen'
+Writing new zone for 'Indian/Mahe'
+Writing new zone for 'Indian/Maldives'
+Writing new zone for 'Indian/Mauritius'
+Writing new zone for 'Indian/Mayotte'
+Writing new zone for 'Indian/Reunion'
+Writing new zone for 'Iran'
+Writing new zone for 'Israel'
+Writing new zone for 'Jamaica'
+Writing new zone for 'Japan'
+Writing new zone for 'Kwajalein'
+Writing new zone for 'Libya'
+Writing new zone for 'MET'
+Writing new zone for 'MST'
+Writing new zone for 'MST7MDT'
+Writing new zone for 'Mexico/BajaNorte'
+Writing new zone for 'Mexico/BajaSur'
+Writing new zone for 'Mexico/General'
+Writing new zone for 'NZ-CHAT'
+Writing new zone for 'NZ'
+Writing new zone for 'Navajo'
+Writing new zone for 'PRC'
+Writing new zone for 'PST8PDT'
+Writing new zone for 'Pacific/Apia'
+Writing new zone for 'Pacific/Auckland'
+Writing new zone for 'Pacific/Bougainville'
+Writing new zone for 'Pacific/Chatham'
+Writing new zone for 'Pacific/Chuuk'
+Writing new zone for 'Pacific/Easter'
+Writing new zone for 'Pacific/Efate'
+Writing new zone for 'Pacific/Enderbury'
+Writing new zone for 'Pacific/Fakaofo'
+Writing new zone for 'Pacific/Fiji'
+Writing new zone for 'Pacific/Funafuti'
+Writing new zone for 'Pacific/Galapagos'
+Writing new zone for 'Pacific/Gambier'
+Writing new zone for 'Pacific/Guadalcanal'
+Writing new zone for 'Pacific/Guam'
+Writing new zone for 'Pacific/Honolulu'
+Writing new zone for 'Pacific/Johnston'
+Writing new zone for 'Pacific/Kiritimati'
+Writing new zone for 'Pacific/Kosrae'
+Writing new zone for 'Pacific/Kwajalein'
+Writing new zone for 'Pacific/Majuro'
+Writing new zone for 'Pacific/Marquesas'
+Writing new zone for 'Pacific/Midway'
+Writing new zone for 'Pacific/Nauru'
+Writing new zone for 'Pacific/Niue'
+Writing new zone for 'Pacific/Norfolk'
+Writing new zone for 'Pacific/Noumea'
+Writing new zone for 'Pacific/Pago_Pago'
+Writing new zone for 'Pacific/Palau'
+Writing new zone for 'Pacific/Pitcairn'
+Writing new zone for 'Pacific/Pohnpei'
+Writing new zone for 'Pacific/Ponape'
+Writing new zone for 'Pacific/Port_Moresby'
+Writing new zone for 'Pacific/Rarotonga'
+Writing new zone for 'Pacific/Saipan'
+Writing new zone for 'Pacific/Samoa'
+Writing new zone for 'Pacific/Tahiti'
+Writing new zone for 'Pacific/Tarawa'
+Writing new zone for 'Pacific/Tongatapu'
+Writing new zone for 'Pacific/Truk'
+Writing new zone for 'Pacific/Wake'
+Writing new zone for 'Pacific/Wallis'
+Writing new zone for 'Pacific/Yap'
+Writing new zone for 'Poland'
+Writing new zone for 'Portugal'
+Writing new zone for 'ROC'
+Writing new zone for 'ROK'
+Writing new zone for 'Singapore'
+Writing new zone for 'Turkey'
+Writing new zone for 'UCT'
+Writing new zone for 'US/Alaska'
+Writing new zone for 'US/Aleutian'
+Writing new zone for 'US/Arizona'
+Writing new zone for 'US/Central'
+Writing new zone for 'US/East-Indiana'
+Writing new zone for 'US/Eastern'
+Writing new zone for 'US/Hawaii'
+Writing new zone for 'US/Indiana-Starke'
+Writing new zone for 'US/Michigan'
+Writing new zone for 'US/Mountain'
+Writing new zone for 'US/Pacific'
+Writing new zone for 'US/Samoa'
+Writing new zone for 'UTC'
+Writing new zone for 'Universal'
+Writing new zone for 'W-SU'
+Writing new zone for 'WET'
+Writing new zone for 'Zulu'
+Added 593 new zones, updated data for 0 zones and added 0 new aliases
diff --git a/testing/tests/timezone/5021-list.result b/testing/tests/timezone/5021-list.result
index b01df768..b53d950e 100644
--- a/testing/tests/timezone/5021-list.result
+++ b/testing/tests/timezone/5021-list.result
@@ -30,6 +30,11 @@ Content-Type: application/xml; charset="utf-8"
all good
Africa/Asmara
+
+ Africa/Asmera
+ all good
+ Africa/Asmera
+
Africa/Bamako
all good
@@ -250,6 +255,11 @@ Content-Type: application/xml; charset="utf-8"
all good
Africa/Sao_Tome
+
+ Africa/Timbuktu
+ all good
+ Africa/Timbuktu
+
Africa/Tripoli
all good
@@ -300,6 +310,11 @@ Content-Type: application/xml; charset="utf-8"
all good
America/Argentina/Catamarca
+
+ America/Argentina/ComodRivadavia
+ all good
+ America/Argentina/ComodRivadavia
+
America/Argentina/Cordoba
all good
@@ -365,6 +380,11 @@ Content-Type: application/xml; charset="utf-8"
all good
America/Atikokan
+
+ America/Atka
+ all good
+ America/Atka
+
America/Bahia
all good
@@ -411,9 +431,9 @@ Content-Type: application/xml; charset="utf-8"
America/Boise
- America/Brasilia
+ America/Buenos_Aires
all good
- America/Brasilia
+ America/Buenos_Aires
America/Cambridge_Bay
@@ -435,6 +455,11 @@ Content-Type: application/xml; charset="utf-8"
all good
America/Caracas
+
+ America/Catamarca
+ all good
+ America/Catamarca
+
America/Cayenne
all good
@@ -455,6 +480,16 @@ Content-Type: application/xml; charset="utf-8"
all good
America/Chihuahua
+
+ America/Coral_Harbour
+ all good
+ America/Coral_Harbour
+
+
+ America/Cordoba
+ all good
+ America/Cordoba
+
America/Costa_Rica
all good
@@ -520,11 +555,26 @@ Content-Type: application/xml; charset="utf-8"
all good
America/El_Salvador
+
+ America/Ensenada
+ all good
+ America/Ensenada
+
America/Fortaleza
all good
America/Fortaleza
+
+ America/Fort_Nelson
+ all good
+ America/Fort_Nelson
+
+
+ America/Fort_Wayne
+ all good
+ America/Fort_Wayne
+
America/Glace_Bay
all good
@@ -605,6 +655,11 @@ Content-Type: application/xml; charset="utf-8"
all good
America/Indiana/Petersburg
+
+ America/Indianapolis
+ all good
+ America/Indianapolis
+
America/Indiana/Tell_City
all good
@@ -640,6 +695,11 @@ Content-Type: application/xml; charset="utf-8"
all good
America/Jamaica
+
+ America/Jujuy
+ all good
+ America/Jujuy
+
America/Juneau
all good
@@ -655,6 +715,11 @@ Content-Type: application/xml; charset="utf-8"
all good
America/Kentucky/Monticello
+
+ America/Knox_IN
+ all good
+ America/Knox_IN
+
America/Kralendijk
all good
@@ -675,6 +740,11 @@ Content-Type: application/xml; charset="utf-8"
all good
America/Los_Angeles
+
+ America/Louisville
+ all good
+ America/Louisville
+
America/Lower_Princes
all good
@@ -715,6 +785,11 @@ Content-Type: application/xml; charset="utf-8"
all good
America/Mazatlan
+
+ America/Mendoza
+ all good
+ America/Mendoza
+
America/Menominee
all good
@@ -805,6 +880,11 @@ Content-Type: application/xml; charset="utf-8"
all good
America/North_Dakota/New_Salem
+
+ America/Nuuk
+ all good
+ America/Nuuk
+
America/Ojinaga
all good
@@ -835,6 +915,11 @@ Content-Type: application/xml; charset="utf-8"
all good
America/Port-au-Prince
+
+ America/Porto_Acre
+ all good
+ America/Porto_Acre
+
America/Port_of_Spain
all good
@@ -850,6 +935,11 @@ Content-Type: application/xml; charset="utf-8"
all good
America/Puerto_Rico
+
+ America/Punta_Arenas
+ all good
+ America/Punta_Arenas
+
America/Rainy_River
all good
@@ -880,6 +970,11 @@ Content-Type: application/xml; charset="utf-8"
all good
America/Rio_Branco
+
+ America/Rosario
+ all good
+ America/Rosario
+
America/Santa_Isabel
all good
@@ -990,6 +1085,11 @@ Content-Type: application/xml; charset="utf-8"
all good
America/Vancouver
+
+ America/Virgin
+ all good
+ America/Virgin
+
America/Whitehorse
all good
@@ -1060,6 +1160,11 @@ Content-Type: application/xml; charset="utf-8"
all good
Antarctica/Syowa
+
+ Antarctica/Troll
+ all good
+ Antarctica/Troll
+
Antarctica/Vostok
all good
@@ -1105,6 +1210,16 @@ Content-Type: application/xml; charset="utf-8"
all good
Asia/Ashgabat
+
+ Asia/Ashkhabad
+ all good
+ Asia/Ashkhabad
+
+
+ Asia/Atyrau
+ all good
+ Asia/Atyrau
+
Asia/Baghdad
all good
@@ -1125,6 +1240,11 @@ Content-Type: application/xml; charset="utf-8"
all good
Asia/Bangkok
+
+ Asia/Barnaul
+ all good
+ Asia/Barnaul
+
Asia/Beirut
all good
@@ -1140,6 +1260,16 @@ Content-Type: application/xml; charset="utf-8"
all good
Asia/Brunei
+
+ Asia/Calcutta
+ all good
+ Asia/Calcutta
+
+
+ Asia/Chita
+ all good
+ Asia/Chita
+
Asia/Choibalsan
all good
@@ -1150,11 +1280,21 @@ Content-Type: application/xml; charset="utf-8"
all good
Asia/Chongqing
+
+ Asia/Chungking
+ all good
+ Asia/Chungking
+
Asia/Colombo
all good
Asia/Colombo
+
+ Asia/Dacca
+ all good
+ Asia/Dacca
+
Asia/Damascus
all good
@@ -1180,6 +1320,11 @@ Content-Type: application/xml; charset="utf-8"
all good
Asia/Dushanbe
+
+ Asia/Famagusta
+ all good
+ Asia/Famagusta
+
Asia/Gaza
all good
@@ -1260,6 +1405,16 @@ Content-Type: application/xml; charset="utf-8"
all good
Asia/Kathmandu
+
+ Asia/Katmandu
+ all good
+ Asia/Katmandu
+
+
+ Asia/Khandyga
+ all good
+ Asia/Khandyga
+
Asia/Kolkata
all good
@@ -1285,6 +1440,11 @@ Content-Type: application/xml; charset="utf-8"
all good
Asia/Kuwait
+
+ Asia/Macao
+ all good
+ Asia/Macao
+
Asia/Macau
all good
@@ -1355,6 +1515,11 @@ Content-Type: application/xml; charset="utf-8"
all good
Asia/Qatar
+
+ Asia/Qostanay
+ all good
+ Asia/Qostanay
+
Asia/Qyzylorda
all good
@@ -1370,6 +1535,11 @@ Content-Type: application/xml; charset="utf-8"
all good
Asia/Riyadh
+
+ Asia/Saigon
+ all good
+ Asia/Saigon
+
Asia/Sakhalin
all good
@@ -1395,6 +1565,11 @@ Content-Type: application/xml; charset="utf-8"
all good
Asia/Singapore
+
+ Asia/Srednekolymsk
+ all good
+ Asia/Srednekolymsk
+
Asia/Taipei
all good
@@ -1415,6 +1590,16 @@ Content-Type: application/xml; charset="utf-8"
all good
Asia/Tehran
+
+ Asia/Tel_Aviv
+ all good
+ Asia/Tel_Aviv
+
+
+ Asia/Thimbu
+ all good
+ Asia/Thimbu
+
Asia/Thimphu
all good
@@ -1425,16 +1610,36 @@ Content-Type: application/xml; charset="utf-8"
all good
Asia/Tokyo
+
+ Asia/Tomsk
+ all good
+ Asia/Tomsk
+
+
+ Asia/Ujung_Pandang
+ all good
+ Asia/Ujung_Pandang
+
Asia/Ulaanbaatar
all good
Asia/Ulaanbaatar
+
+ Asia/Ulan_Bator
+ all good
+ Asia/Ulan_Bator
+
Asia/Urumqi
all good
Asia/Urumqi
+
+ Asia/Ust-Nera
+ all good
+ Asia/Ust-Nera
+
Asia/Vientiane
all good
@@ -1450,6 +1655,11 @@ Content-Type: application/xml; charset="utf-8"
all good
Asia/Yakutsk
+
+ Asia/Yangon
+ all good
+ Asia/Yangon
+
Asia/Yekaterinburg
all good
@@ -1480,11 +1690,21 @@ Content-Type: application/xml; charset="utf-8"
all good
Atlantic/Cape_Verde
+
+ Atlantic/Faeroe
+ all good
+ Atlantic/Faeroe
+
Atlantic/Faroe
all good
Atlantic/Faroe
+
+ Atlantic/Jan_Mayen
+ all good
+ Atlantic/Jan_Mayen
+
Atlantic/Madeira
all good
@@ -1510,6 +1730,11 @@ Content-Type: application/xml; charset="utf-8"
all good
Atlantic/St_Helena
+
+ Australia/ACT
+ all good
+ Australia/ACT
+
Australia/Adelaide
all good
@@ -1525,6 +1750,11 @@ Content-Type: application/xml; charset="utf-8"
all good
Australia/Broken_Hill
+
+ Australia/Canberra
+ all good
+ Australia/Canberra
+
Australia/Currie
all good
@@ -1545,6 +1775,11 @@ Content-Type: application/xml; charset="utf-8"
all good
Australia/Hobart
+
+ Australia/LHI
+ all good
+ Australia/LHI
+
Australia/Lindeman
all good
@@ -1560,16 +1795,341 @@ Content-Type: application/xml; charset="utf-8"
all good
Australia/Melbourne
+
+ Australia/North
+ all good
+ Australia/North
+
+
+ Australia/NSW
+ all good
+ Australia/NSW
+
Australia/Perth
all good
Australia/Perth
+
+ Australia/Queensland
+ all good
+ Australia/Queensland
+
+
+ Australia/South
+ all good
+ Australia/South
+
Australia/Sydney
all good
Australia/Sydney
+
+ Australia/Tasmania
+ all good
+ Australia/Tasmania
+
+
+ Australia/Victoria
+ all good
+ Australia/Victoria
+
+
+ Australia/West
+ all good
+ Australia/West
+
+
+ Australia/Yancowinna
+ all good
+ Australia/Yancowinna
+
+
+ Brazil/Acre
+ all good
+ Brazil/Acre
+
+
+ Brazil/DeNoronha
+ all good
+ Brazil/DeNoronha
+
+
+ Brazil/East
+ all good
+ Brazil/East
+
+
+ Brazil/West
+ all good
+ Brazil/West
+
+
+ Canada/Atlantic
+ all good
+ Canada/Atlantic
+
+
+ Canada/Central
+ all good
+ Canada/Central
+
+
+ Canada/Eastern
+ all good
+ Canada/Eastern
+
+
+ Canada/Mountain
+ all good
+ Canada/Mountain
+
+
+ Canada/Newfoundland
+ all good
+ Canada/Newfoundland
+
+
+ Canada/Pacific
+ all good
+ Canada/Pacific
+
+
+ Canada/Saskatchewan
+ all good
+ Canada/Saskatchewan
+
+
+ Canada/Yukon
+ all good
+ Canada/Yukon
+
+
+ CET
+ all good
+ CET
+
+
+ Chile/Continental
+ all good
+ Chile/Continental
+
+
+ Chile/EasterIsland
+ all good
+ Chile/EasterIsland
+
+
+ CST6CDT
+ all good
+ CST6CDT
+
+
+ Cuba
+ all good
+ Cuba
+
+
+ EET
+ all good
+ EET
+
+
+ Egypt
+ all good
+ Egypt
+
+
+ Eire
+ all good
+ Eire
+
+
+ EST
+ all good
+ EST
+
+
+ EST5EDT
+ all good
+ EST5EDT
+
+
+ Etc/GMT
+ all good
+ Etc/GMT
+
+
+ Etc/GMT+0
+ all good
+ Etc/GMT+0
+
+
+ Etc/GMT-0
+ all good
+ Etc/GMT-0
+
+
+ Etc/GMT0
+ all good
+ Etc/GMT0
+
+
+ Etc/GMT+1
+ all good
+ Etc/GMT+1
+
+
+ Etc/GMT-1
+ all good
+ Etc/GMT-1
+
+
+ Etc/GMT+10
+ all good
+ Etc/GMT+10
+
+
+ Etc/GMT-10
+ all good
+ Etc/GMT-10
+
+
+ Etc/GMT+11
+ all good
+ Etc/GMT+11
+
+
+ Etc/GMT-11
+ all good
+ Etc/GMT-11
+
+
+ Etc/GMT+12
+ all good
+ Etc/GMT+12
+
+
+ Etc/GMT-12
+ all good
+ Etc/GMT-12
+
+
+ Etc/GMT-13
+ all good
+ Etc/GMT-13
+
+
+ Etc/GMT-14
+ all good
+ Etc/GMT-14
+
+
+ Etc/GMT+2
+ all good
+ Etc/GMT+2
+
+
+ Etc/GMT-2
+ all good
+ Etc/GMT-2
+
+
+ Etc/GMT+3
+ all good
+ Etc/GMT+3
+
+
+ Etc/GMT-3
+ all good
+ Etc/GMT-3
+
+
+ Etc/GMT+4
+ all good
+ Etc/GMT+4
+
+
+ Etc/GMT-4
+ all good
+ Etc/GMT-4
+
+
+ Etc/GMT+5
+ all good
+ Etc/GMT+5
+
+
+ Etc/GMT-5
+ all good
+ Etc/GMT-5
+
+
+ Etc/GMT+6
+ all good
+ Etc/GMT+6
+
+
+ Etc/GMT-6
+ all good
+ Etc/GMT-6
+
+
+ Etc/GMT+7
+ all good
+ Etc/GMT+7
+
+
+ Etc/GMT-7
+ all good
+ Etc/GMT-7
+
+
+ Etc/GMT+8
+ all good
+ Etc/GMT+8
+
+
+ Etc/GMT-8
+ all good
+ Etc/GMT-8
+
+
+ Etc/GMT+9
+ all good
+ Etc/GMT+9
+
+
+ Etc/GMT-9
+ all good
+ Etc/GMT-9
+
+
+ Etc/Greenwich
+ all good
+ Etc/Greenwich
+
+
+ Etc/UCT
+ all good
+ Etc/UCT
+
+
+ Etc/Universal
+ all good
+ Etc/Universal
+
+
+ Etc/UTC
+ all good
+ Etc/UTC
+
+
+ Etc/Zulu
+ all good
+ Etc/Zulu
+
Europe/Amsterdam
all good
@@ -1580,11 +2140,21 @@ Content-Type: application/xml; charset="utf-8"
all good
Europe/Andorra
+
+ Europe/Astrakhan
+ all good
+ Europe/Astrakhan
+
Europe/Athens
all good
Europe/Athens
+
+ Europe/Belfast
+ all good
+ Europe/Belfast
+
Europe/Belgrade
all good
@@ -1615,6 +2185,11 @@ Content-Type: application/xml; charset="utf-8"
all good
Europe/Budapest
+
+ Europe/Busingen
+ all good
+ Europe/Busingen
+
Europe/Chisinau
all good
@@ -1670,6 +2245,11 @@ Content-Type: application/xml; charset="utf-8"
all good
Europe/Kiev
+
+ Europe/Kirov
+ all good
+ Europe/Kirov
+
Europe/Lisbon
all good
@@ -1770,6 +2350,11 @@ Content-Type: application/xml; charset="utf-8"
all good
Europe/Sarajevo
+
+ Europe/Saratov
+ all good
+ Europe/Saratov
+
Europe/Simferopol
all good
@@ -1800,6 +2385,16 @@ Content-Type: application/xml; charset="utf-8"
all good
Europe/Tirane
+
+ Europe/Tiraspol
+ all good
+ Europe/Tiraspol
+
+
+ Europe/Ulyanovsk
+ all good
+ Europe/Ulyanovsk
+
Europe/Uzhgorod
all good
@@ -1850,6 +2445,56 @@ Content-Type: application/xml; charset="utf-8"
all good
Europe/Zurich
+
+ GB
+ all good
+ GB
+
+
+ GB-Eire
+ all good
+ GB-Eire
+
+
+ GMT
+ all good
+ GMT
+
+
+ GMT+0
+ all good
+ GMT+0
+
+
+ GMT-0
+ all good
+ GMT-0
+
+
+ GMT0
+ all good
+ GMT0
+
+
+ Greenwich
+ all good
+ Greenwich
+
+
+ Hongkong
+ all good
+ Hongkong
+
+
+ HST
+ all good
+ HST
+
+
+ Iceland
+ all good
+ Iceland
+
Indian/Antananarivo
all good
@@ -1905,6 +2550,81 @@ Content-Type: application/xml; charset="utf-8"
all good
Indian/Reunion
+
+ Iran
+ all good
+ Iran
+
+
+ Israel
+ all good
+ Israel
+
+
+ Jamaica
+ all good
+ Jamaica
+
+
+ Japan
+ all good
+ Japan
+
+
+ Kwajalein
+ all good
+ Kwajalein
+
+
+ Libya
+ all good
+ Libya
+
+
+ MET
+ all good
+ MET
+
+
+ Mexico/BajaNorte
+ all good
+ Mexico/BajaNorte
+
+
+ Mexico/BajaSur
+ all good
+ Mexico/BajaSur
+
+
+ Mexico/General
+ all good
+ Mexico/General
+
+
+ MST
+ all good
+ MST
+
+
+ MST7MDT
+ all good
+ MST7MDT
+
+
+ Navajo
+ all good
+ Navajo
+
+
+ NZ
+ all good
+ NZ
+
+
+ NZ-CHAT
+ all good
+ NZ-CHAT
+
Pacific/Apia
all good
@@ -1915,6 +2635,11 @@ Content-Type: application/xml; charset="utf-8"
all good
Pacific/Auckland
+
+ Pacific/Bougainville
+ all good
+ Pacific/Bougainville
+
Pacific/Chatham
all good
@@ -2055,6 +2780,11 @@ Content-Type: application/xml; charset="utf-8"
all good
Pacific/Pohnpei
+
+ Pacific/Ponape
+ all good
+ Pacific/Ponape
+
Pacific/Port_Moresby
all good
@@ -2070,6 +2800,11 @@ Content-Type: application/xml; charset="utf-8"
all good
Pacific/Saipan
+
+ Pacific/Samoa
+ all good
+ Pacific/Samoa
+
Pacific/Tahiti
all good
@@ -2085,6 +2820,11 @@ Content-Type: application/xml; charset="utf-8"
all good
Pacific/Tongatapu
+
+ Pacific/Truk
+ all good
+ Pacific/Truk
+
Pacific/Wake
all good
@@ -2096,13 +2836,138 @@ Content-Type: application/xml; charset="utf-8"
Pacific/Wallis
- zones.h
+ Pacific/Yap
all good
- zones.h
+ Pacific/Yap
- zones.tab
+ Poland
all good
- zones.tab
+ Poland
+
+
+ Portugal
+ all good
+ Portugal
+
+
+ PRC
+ all good
+ PRC
+
+
+ PST8PDT
+ all good
+ PST8PDT
+
+
+ ROC
+ all good
+ ROC
+
+
+ ROK
+ all good
+ ROK
+
+
+ Singapore
+ all good
+ Singapore
+
+
+ Turkey
+ all good
+ Turkey
+
+
+ UCT
+ all good
+ UCT
+
+
+ Universal
+ all good
+ Universal
+
+
+ US/Alaska
+ all good
+ US/Alaska
+
+
+ US/Aleutian
+ all good
+ US/Aleutian
+
+
+ US/Arizona
+ all good
+ US/Arizona
+
+
+ US/Central
+ all good
+ US/Central
+
+
+ US/Eastern
+ all good
+ US/Eastern
+
+
+ US/East-Indiana
+ all good
+ US/East-Indiana
+
+
+ US/Hawaii
+ all good
+ US/Hawaii
+
+
+ US/Indiana-Starke
+ all good
+ US/Indiana-Starke
+
+
+ US/Michigan
+ all good
+ US/Michigan
+
+
+ US/Mountain
+ all good
+ US/Mountain
+
+
+ US/Pacific
+ all good
+ US/Pacific
+
+
+ US/Samoa
+ all good
+ US/Samoa
+
+
+ UTC
+ all good
+ UTC
+
+
+ WET
+ all good
+ WET
+
+
+ W-SU
+ all good
+ W-SU
+
+
+ Zulu
+ all good
+ Zulu