diff --git a/android/PhoneNumberUtilsTest.cpp b/android/PhoneNumberUtilsTest.cpp
index beb9c82..ce90c0a 100644
--- a/android/PhoneNumberUtilsTest.cpp
+++ b/android/PhoneNumberUtilsTest.cpp
@@ -32,25 +32,33 @@
 
 using namespace android;
 
-TEST(PhoneNumberUtils, phone_number_compare_strict) {
+
+TEST(PhoneNumberUtils, compareStrictNullOrEmpty) {
     EXPECT_TRUE(phone_number_compare_strict(NULL, NULL));
     EXPECT_TRUE(phone_number_compare_strict("", NULL));
     EXPECT_TRUE(phone_number_compare_strict(NULL, ""));
     EXPECT_TRUE(phone_number_compare_strict("", ""));
+}
 
+TEST(PhoneNumberUtils, compareStrictDigitsSame) {
     EXPECT_TRUE(phone_number_compare_strict("999", "999"));
     EXPECT_TRUE(phone_number_compare_strict("119", "119"));
+}
 
+TEST(PhoneNumberUtils, compareStrictDigitsDifferent) {
     EXPECT_FALSE(phone_number_compare_strict("123456789", "923456789"));
     EXPECT_FALSE(phone_number_compare_strict("123456789", "123456781"));
     EXPECT_FALSE(phone_number_compare_strict("123456789", "1234567890"));
     EXPECT_FALSE(phone_number_compare_strict("123456789", "0123456789"));
+}
 
-    // Google, Inc.
+TEST(PhoneNumberUtils, compareStrictGoogle) {
     EXPECT_TRUE(phone_number_compare_strict("650-253-0000", "6502530000"));
     EXPECT_TRUE(phone_number_compare_strict("650-253-0000", "650 253 0000"));
     EXPECT_TRUE(phone_number_compare_strict("650 253 0000", "6502530000"));
+}
 
+TEST(PhoneNumberUtils, compareStrictTrunkPrefixUs) {
     // trunk (NDD) prefix must be properly handled in US
     EXPECT_TRUE(phone_number_compare_strict("650-253-0000", "1-650-253-0000"));
     EXPECT_TRUE(phone_number_compare_strict("650-253-0000", "   1-650-253-0000"));
@@ -61,70 +69,129 @@
     EXPECT_TRUE(phone_number_compare_strict("+1 650-253-0000", "6502530000"));
     EXPECT_TRUE(phone_number_compare_strict("001 650-253-0000", "6502530000"));
     EXPECT_TRUE(phone_number_compare_strict("0111 650-253-0000", "6502530000"));
+}
 
-    // Country code is different.
+TEST(PhoneNumberUtils, compareStrictDifferentCountryCode) {
     EXPECT_FALSE(phone_number_compare_strict("+19012345678", "+819012345678"));
+}
 
-    // Russian trunk digit
-    EXPECT_TRUE(phone_number_compare_strict("+79161234567", "89161234567"));
-
-    // French trunk digit
-    EXPECT_TRUE(phone_number_compare_strict("+33123456789", "0123456789"));
-
-    // Trunk digit for city codes in the Netherlands
+TEST(PhoneNumberUtils, compareStrictTrunkJapan) {
     EXPECT_TRUE(phone_number_compare_strict("+31771234567", "0771234567"));
-
-    // Japanese dial
     EXPECT_TRUE(phone_number_compare_strict("090-1234-5678", "+819012345678"));
     EXPECT_TRUE(phone_number_compare_strict("090(1234)5678", "+819012345678"));
     EXPECT_TRUE(phone_number_compare_strict("090-1234-5678", "+81-90-1234-5678"));
 
+    EXPECT_TRUE(phone_number_compare_strict("+819012345678", "090-1234-5678"));
+    EXPECT_TRUE(phone_number_compare_strict("+819012345678", "090(1234)5678"));
+    EXPECT_TRUE(phone_number_compare_strict("+81-90-1234-5678", "090-1234-5678"));
+}
+
+TEST(PhoneNumberUtils, compareStrictTrunkRussia) {
+    EXPECT_TRUE(phone_number_compare_strict("+79161234567", "89161234567"));
+}
+
+TEST(PhoneNumberUtils, compareStrictTrunkFrance) {
+    EXPECT_TRUE(phone_number_compare_strict("+33123456789", "0123456789"));
+}
+
+TEST(PhoneNumberUtils, compareStrictTrunkNetherlandsCities) {
+    EXPECT_TRUE(phone_number_compare_strict("+31771234567", "0771234567"));
+}
+
+// TODO: Two digit trunk prefixes are not handled
+//TEST(PhoneNumberUtils, compareStrictTrunkHungary) {
+//  EXPECT_TRUE(phone_number_compare_strict("+36 1 234 5678", "06 1234-5678"));
+//}
+
+// TODO: Two digit trunk prefixes are not handled
+//TEST(PhoneNumberUtils, compareStrictTrunkMexico) {
+//  EXPECT_TRUE(phone_number_compare_strict("+52 55 1234 5678", "01 55 1234 5678"));
+//}
+
+// TODO: Two digit trunk prefixes are not handled
+//TEST(PhoneNumberUtils, compareStrictTrunkMongolia) {
+//  EXPECT_TRUE(phone_number_compare_strict("+976 1 123 4567", "01 1 23 4567"));
+//  EXPECT_TRUE(phone_number_compare_strict("+976 2 234 5678", "02 2 34 5678"));
+//}
+
+TEST(PhoneNumberUtils, compareStrictTrunkIgnoreJapan) {
     // Trunk prefix must not be ignored in Japan
     EXPECT_FALSE(phone_number_compare_strict("090-1234-5678", "90-1234-5678"));
-
     EXPECT_FALSE(phone_number_compare_strict("090-1234-5678", "080-1234-5678"));
     EXPECT_FALSE(phone_number_compare_strict("090-1234-5678", "190-1234-5678"));
     EXPECT_FALSE(phone_number_compare_strict("090-1234-5678", "890-1234-5678"));
+    EXPECT_FALSE(phone_number_compare_strict("080-1234-5678", "+819012345678"));
     EXPECT_FALSE(phone_number_compare_strict("+81-90-1234-5678", "+81-090-1234-5678"));
+}
 
+TEST(PhoneNumberUtils, compareStrictInternationalNational) {
     EXPECT_TRUE(phone_number_compare_strict("+593(800)123-1234", "8001231234"));
+}
 
-    // Two continuous 0 at the beginieng of the phone string should not be
+TEST(PhoneNumberUtils, compareStrictTwoContinuousZeros) {
+    // Two continuous 0 at the begining of the phone string should not be
     // treated as trunk prefix.
     EXPECT_FALSE(phone_number_compare_strict("008001231234", "8001231234"));
+}
 
+TEST(PhoneNumberUtils, compareStrictCallerIdThailandUs) {
     // Test broken caller ID seen on call from Thailand to the US
     EXPECT_TRUE(phone_number_compare_strict("+66811234567", "166811234567"));
-
     // Confirm that the bug found before does not re-appear.
     EXPECT_FALSE(phone_number_compare_strict("080-1234-5678", "+819012345678"));
     EXPECT_TRUE(phone_number_compare_strict("650-000-3456", "16500003456"));
     EXPECT_TRUE(phone_number_compare_strict("011 1 7005554141", "+17005554141"));
     EXPECT_FALSE(phone_number_compare_strict("011 11 7005554141", "+17005554141"));
     EXPECT_FALSE(phone_number_compare_strict("+44 207 792 3490", "00 207 792 3490"));
+}
+
+TEST(PhoneNumberUtils, compareStrictNamp1661) {
     // This is not related to Thailand case. NAMP "1" + region code "661".
     EXPECT_TRUE(phone_number_compare_strict("16610001234", "6610001234"));
+}
 
+TEST(PhoneNumberUtils, compareStrictAlphaDifferent) {
     // We also need to compare two alpha addresses to make sure two different strings
     // aren't treated as the same addresses. This is relevant to SMS as SMS sender may
     // contain all alpha chars.
     EXPECT_FALSE(phone_number_compare_strict("abcd", "bcde"));
+}
 
+TEST(PhoneNumberUtils, compareStrictAlphaNumericSame) {
     // in the U.S. people often use alpha in the phone number to easily remember it
     // (e.g. 800-flowers would be dialed as 800-356-9377). Since we accept this form of
     // phone number in Contacts and others, we should make sure the comparison method
     // handle them.
     EXPECT_TRUE(phone_number_compare_strict("1-800-flowers", "800-flowers"));
+}
 
-    // TODO: we currently do not support this comparison. It maybe nice to support this
-    // TODO: in the future.
-    // EXPECT_TRUE("1-800-flowers", "1-800-356-9377")
-
+TEST(PhoneNumberUtils, compareStrictAlphaNumericDifferent) {
     EXPECT_FALSE(phone_number_compare_strict("1-800-flowers", "1-800-abcdefg"));
+}
 
+// TODO: we currently do not support this comparison.
+// TODO: It maybe be nice to support this in the future.
+//TEST(PhoneNumberUtils, compareStrictLettersToDigits) {
+//  EXPECT_TRUE("1-800-flowers", "1-800-356-9377")
+//}
+
+TEST(PhoneNumberUtils, compareStrictWrongPrefix) {
     // Currently we cannot get this test through (Japanese trunk prefix is 0,
     // but there is no sensible way to know it now (as of 2009-6-12)...
-    // EXPECT_FALSE("290-1234-5678", "+819012345678");
+    // EXPECT_FALSE(phone_number_compare_strict("290-1234-5678", "+819012345678"));
+    // EXPECT_FALSE(phone_number_compare_strict("+819012345678", "290-1234-5678"));
+
+    // USA
+    EXPECT_FALSE(phone_number_compare_strict("550-450-3605", "+14504503605"));
+
+    EXPECT_FALSE(phone_number_compare_strict("550-450-3605", "+15404503605"));
+    EXPECT_FALSE(phone_number_compare_strict("550-450-3605", "+15514503605"));
+    EXPECT_FALSE(phone_number_compare_strict("5504503605", "+14504503605"));
+
+    EXPECT_FALSE(phone_number_compare_strict("+14504503605", "550-450-3605"));
+    EXPECT_FALSE(phone_number_compare_strict("+15404503605", "550-450-3605"));
+    EXPECT_FALSE(phone_number_compare_strict("+15514503605", "550-450-3605"));
+    EXPECT_FALSE(phone_number_compare_strict("+14504503605", "5504503605"));
 }
 
 TEST(PhoneNumberUtils, phone_number_stripped_reversed_inter) {