diff --git a/tests/zones/africa/juba.js b/tests/zones/africa/juba.js
index bba2b569..d1ce32dc 100644
--- a/tests/zones/africa/juba.js
+++ b/tests/zones/africa/juba.js
@@ -4,9 +4,9 @@ var helpers = require("../../helpers/helpers");
 
 exports["Africa/Juba"] = {
 
-	"guess:by:offset" : helpers.makeTestGuess("Africa/Juba", { offset: true }),
+	"guess:by:offset" : helpers.makeTestGuess("Africa/Juba", { offset: true, expect: "Africa/Johannesburg" }),
 
-	"guess:by:abbr" : helpers.makeTestGuess("Africa/Juba", { abbr: true }),
+	"guess:by:abbr" : helpers.makeTestGuess("Africa/Juba", { abbr: true, expect: "Africa/Khartoum" }),
 
 	"1930" : helpers.makeTestYear("Africa/Juba", [
 		["1930-12-31T21:53:31+00:00", "23:59:59", "LMT", -7588 / 60],
diff --git a/tests/zones/asia/anadyr.js b/tests/zones/asia/anadyr.js
index f3a30268..48a70c66 100644
--- a/tests/zones/asia/anadyr.js
+++ b/tests/zones/asia/anadyr.js
@@ -4,9 +4,9 @@ var helpers = require("../../helpers/helpers");
 
 exports["Asia/Anadyr"] = {
 
-	"guess:by:offset" : helpers.makeTestGuess("Asia/Anadyr", { offset: true, expect: "Asia/Kamchatka" }),
+	"guess:by:offset" : helpers.makeTestGuess("Asia/Anadyr", { offset: true, expect: "Pacific/Fiji" }),
 
-	"guess:by:abbr" : helpers.makeTestGuess("Asia/Anadyr", { abbr: true, expect: "Asia/Kamchatka" }),
+	"guess:by:abbr" : helpers.makeTestGuess("Asia/Anadyr", { abbr: true, expect: "Pacific/Fiji" }),
 
 	"1924" : helpers.makeTestYear("Asia/Anadyr", [
 		["1924-05-01T12:10:03+00:00", "23:59:59", "LMT", -42596 / 60],
diff --git a/tests/zones/asia/kamchatka.js b/tests/zones/asia/kamchatka.js
index 1a98040a..735e0f0d 100644
--- a/tests/zones/asia/kamchatka.js
+++ b/tests/zones/asia/kamchatka.js
@@ -4,9 +4,9 @@ var helpers = require("../../helpers/helpers");
 
 exports["Asia/Kamchatka"] = {
 
-	"guess:by:offset" : helpers.makeTestGuess("Asia/Kamchatka", { offset: true }),
+	"guess:by:offset" : helpers.makeTestGuess("Asia/Kamchatka", { offset: true, expect: "Pacific/Fiji" }),
 
-	"guess:by:abbr" : helpers.makeTestGuess("Asia/Kamchatka", { abbr: true }),
+	"guess:by:abbr" : helpers.makeTestGuess("Asia/Kamchatka", { abbr: true, expect: "Pacific/Fiji" }),
 
 	"1922" : helpers.makeTestYear("Asia/Kamchatka", [
 		["1922-11-09T13:25:23+00:00", "23:59:59", "LMT", -38076 / 60],
diff --git a/tests/zones/etc/gmt-12.js b/tests/zones/etc/gmt-12.js
index 7cffc8d0..07841093 100644
--- a/tests/zones/etc/gmt-12.js
+++ b/tests/zones/etc/gmt-12.js
@@ -4,9 +4,9 @@ var helpers = require("../../helpers/helpers");
 
 exports["Etc/GMT-12"] = {
 
-	"guess:by:offset" : helpers.makeTestGuess("Etc/GMT-12", { offset: true, expect: "Asia/Kamchatka" }),
+	"guess:by:offset" : helpers.makeTestGuess("Etc/GMT-12", { offset: true, expect: "Pacific/Fiji" }),
 
-	"guess:by:abbr" : helpers.makeTestGuess("Etc/GMT-12", { abbr: true, expect: "Asia/Kamchatka" }),
+	"guess:by:abbr" : helpers.makeTestGuess("Etc/GMT-12", { abbr: true, expect: "Pacific/Fiji" }),
 
 	"1970" : helpers.makeTestYear("Etc/GMT-12", [
 		["1970-01-01T00:00:00+00:00", "12:00:00", "+12", -720]
diff --git a/tests/zones/kwajalein.js b/tests/zones/kwajalein.js
index 65c0cbbe..cba8674e 100644
--- a/tests/zones/kwajalein.js
+++ b/tests/zones/kwajalein.js
@@ -4,9 +4,9 @@ var helpers = require("../helpers/helpers");
 
 exports["Kwajalein"] = {
 
-	"guess:by:offset" : helpers.makeTestGuess("Kwajalein", { offset: true, expect: "Asia/Kamchatka" }),
+	"guess:by:offset" : helpers.makeTestGuess("Kwajalein", { offset: true, expect: "Pacific/Fiji" }),
 
-	"guess:by:abbr" : helpers.makeTestGuess("Kwajalein", { abbr: true, expect: "Asia/Kamchatka" }),
+	"guess:by:abbr" : helpers.makeTestGuess("Kwajalein", { abbr: true, expect: "Pacific/Fiji" }),
 
 	"1900" : helpers.makeTestYear("Kwajalein", [
 		["1900-12-31T12:50:39+00:00", "23:59:59", "LMT", -40160 / 60],
diff --git a/tests/zones/pacific/apia.js b/tests/zones/pacific/apia.js
index 3903fdcc..27409b2d 100644
--- a/tests/zones/pacific/apia.js
+++ b/tests/zones/pacific/apia.js
@@ -4,9 +4,9 @@ var helpers = require("../../helpers/helpers");
 
 exports["Pacific/Apia"] = {
 
-	"guess:by:offset" : helpers.makeTestGuess("Pacific/Apia", { offset: true }),
+	"guess:by:offset" : helpers.makeTestGuess("Pacific/Apia", { offset: true, expect: "Pacific/Tongatapu" }),
 
-	"guess:by:abbr" : helpers.makeTestGuess("Pacific/Apia", { abbr: true }),
+	"guess:by:abbr" : helpers.makeTestGuess("Pacific/Apia", { abbr: true, expect: "Pacific/Tongatapu" }),
 
 	"1892" : helpers.makeTestYear("Pacific/Apia", [
 		["1892-07-04T11:26:55+00:00", "23:59:59", "LMT", -45184 / 60],
diff --git a/tests/zones/pacific/funafuti.js b/tests/zones/pacific/funafuti.js
index 1ff16dd4..5474f74b 100644
--- a/tests/zones/pacific/funafuti.js
+++ b/tests/zones/pacific/funafuti.js
@@ -4,9 +4,9 @@ var helpers = require("../../helpers/helpers");
 
 exports["Pacific/Funafuti"] = {
 
-	"guess:by:offset" : helpers.makeTestGuess("Pacific/Funafuti", { offset: true, expect: "Asia/Kamchatka" }),
+	"guess:by:offset" : helpers.makeTestGuess("Pacific/Funafuti", { offset: true, expect: "Pacific/Fiji" }),
 
-	"guess:by:abbr" : helpers.makeTestGuess("Pacific/Funafuti", { abbr: true, expect: "Asia/Kamchatka" }),
+	"guess:by:abbr" : helpers.makeTestGuess("Pacific/Funafuti", { abbr: true, expect: "Pacific/Fiji" }),
 
 	"1900" : helpers.makeTestYear("Pacific/Funafuti", [
 		["1900-12-31T12:27:55+00:00", "23:59:59", "LMT", -41524 / 60],
diff --git a/tests/zones/pacific/kwajalein.js b/tests/zones/pacific/kwajalein.js
index 20e15145..315a9227 100644
--- a/tests/zones/pacific/kwajalein.js
+++ b/tests/zones/pacific/kwajalein.js
@@ -4,9 +4,9 @@ var helpers = require("../../helpers/helpers");
 
 exports["Pacific/Kwajalein"] = {
 
-	"guess:by:offset" : helpers.makeTestGuess("Pacific/Kwajalein", { offset: true, expect: "Asia/Kamchatka" }),
+	"guess:by:offset" : helpers.makeTestGuess("Pacific/Kwajalein", { offset: true, expect: "Pacific/Fiji" }),
 
-	"guess:by:abbr" : helpers.makeTestGuess("Pacific/Kwajalein", { abbr: true, expect: "Asia/Kamchatka" }),
+	"guess:by:abbr" : helpers.makeTestGuess("Pacific/Kwajalein", { abbr: true, expect: "Pacific/Fiji" }),
 
 	"1900" : helpers.makeTestYear("Pacific/Kwajalein", [
 		["1900-12-31T12:50:39+00:00", "23:59:59", "LMT", -40160 / 60],
diff --git a/tests/zones/pacific/majuro.js b/tests/zones/pacific/majuro.js
index 683f44e7..91633eb0 100644
--- a/tests/zones/pacific/majuro.js
+++ b/tests/zones/pacific/majuro.js
@@ -4,9 +4,9 @@ var helpers = require("../../helpers/helpers");
 
 exports["Pacific/Majuro"] = {
 
-	"guess:by:offset" : helpers.makeTestGuess("Pacific/Majuro", { offset: true, expect: "Asia/Kamchatka" }),
+	"guess:by:offset" : helpers.makeTestGuess("Pacific/Majuro", { offset: true, expect: "Pacific/Fiji" }),
 
-	"guess:by:abbr" : helpers.makeTestGuess("Pacific/Majuro", { abbr: true, expect: "Asia/Kamchatka" }),
+	"guess:by:abbr" : helpers.makeTestGuess("Pacific/Majuro", { abbr: true, expect: "Pacific/Fiji" }),
 
 	"1900" : helpers.makeTestYear("Pacific/Majuro", [
 		["1900-12-31T12:27:55+00:00", "23:59:59", "LMT", -41524 / 60],
diff --git a/tests/zones/pacific/nauru.js b/tests/zones/pacific/nauru.js
index a9b38122..9f7b87dc 100644
--- a/tests/zones/pacific/nauru.js
+++ b/tests/zones/pacific/nauru.js
@@ -4,9 +4,9 @@ var helpers = require("../../helpers/helpers");
 
 exports["Pacific/Nauru"] = {
 
-	"guess:by:offset" : helpers.makeTestGuess("Pacific/Nauru", { offset: true, expect: "Asia/Kamchatka" }),
+	"guess:by:offset" : helpers.makeTestGuess("Pacific/Nauru", { offset: true, expect: "Pacific/Fiji" }),
 
-	"guess:by:abbr" : helpers.makeTestGuess("Pacific/Nauru", { abbr: true, expect: "Asia/Kamchatka" }),
+	"guess:by:abbr" : helpers.makeTestGuess("Pacific/Nauru", { abbr: true, expect: "Pacific/Fiji" }),
 
 	"1921" : helpers.makeTestYear("Pacific/Nauru", [
 		["1921-01-14T12:52:19+00:00", "23:59:59", "LMT", -40060 / 60],
diff --git a/tests/zones/pacific/tarawa.js b/tests/zones/pacific/tarawa.js
index 89246cef..9f8931a7 100644
--- a/tests/zones/pacific/tarawa.js
+++ b/tests/zones/pacific/tarawa.js
@@ -4,9 +4,9 @@ var helpers = require("../../helpers/helpers");
 
 exports["Pacific/Tarawa"] = {
 
-	"guess:by:offset" : helpers.makeTestGuess("Pacific/Tarawa", { offset: true, expect: "Asia/Kamchatka" }),
+	"guess:by:offset" : helpers.makeTestGuess("Pacific/Tarawa", { offset: true, expect: "Pacific/Fiji" }),
 
-	"guess:by:abbr" : helpers.makeTestGuess("Pacific/Tarawa", { abbr: true, expect: "Asia/Kamchatka" }),
+	"guess:by:abbr" : helpers.makeTestGuess("Pacific/Tarawa", { abbr: true, expect: "Pacific/Fiji" }),
 
 	"1900" : helpers.makeTestYear("Pacific/Tarawa", [
 		["1900-12-31T12:27:55+00:00", "23:59:59", "LMT", -41524 / 60],
diff --git a/tests/zones/pacific/wake.js b/tests/zones/pacific/wake.js
index 9d562c3c..3da8e143 100644
--- a/tests/zones/pacific/wake.js
+++ b/tests/zones/pacific/wake.js
@@ -4,9 +4,9 @@ var helpers = require("../../helpers/helpers");
 
 exports["Pacific/Wake"] = {
 
-	"guess:by:offset" : helpers.makeTestGuess("Pacific/Wake", { offset: true, expect: "Asia/Kamchatka" }),
+	"guess:by:offset" : helpers.makeTestGuess("Pacific/Wake", { offset: true, expect: "Pacific/Fiji" }),
 
-	"guess:by:abbr" : helpers.makeTestGuess("Pacific/Wake", { abbr: true, expect: "Asia/Kamchatka" }),
+	"guess:by:abbr" : helpers.makeTestGuess("Pacific/Wake", { abbr: true, expect: "Pacific/Fiji" }),
 
 	"1900" : helpers.makeTestYear("Pacific/Wake", [
 		["1900-12-31T12:27:55+00:00", "23:59:59", "LMT", -41524 / 60],
diff --git a/tests/zones/pacific/wallis.js b/tests/zones/pacific/wallis.js
index 9ff44544..32429bdb 100644
--- a/tests/zones/pacific/wallis.js
+++ b/tests/zones/pacific/wallis.js
@@ -4,9 +4,9 @@ var helpers = require("../../helpers/helpers");
 
 exports["Pacific/Wallis"] = {
 
-	"guess:by:offset" : helpers.makeTestGuess("Pacific/Wallis", { offset: true, expect: "Asia/Kamchatka" }),
+	"guess:by:offset" : helpers.makeTestGuess("Pacific/Wallis", { offset: true, expect: "Pacific/Fiji" }),
 
-	"guess:by:abbr" : helpers.makeTestGuess("Pacific/Wallis", { abbr: true, expect: "Asia/Kamchatka" }),
+	"guess:by:abbr" : helpers.makeTestGuess("Pacific/Wallis", { abbr: true, expect: "Pacific/Fiji" }),
 
 	"1900" : helpers.makeTestYear("Pacific/Wallis", [
 		["1900-12-31T12:27:55+00:00", "23:59:59", "LMT", -41524 / 60],