diff --git a/tests/Contacts/PhoneNumberTest.m b/tests/Contacts/PhoneNumberTest.m
index d920bf9d1..0206deb64 100644
--- a/tests/Contacts/PhoneNumberTest.m
+++ b/tests/Contacts/PhoneNumberTest.m
@@ -16,6 +16,15 @@
     XCTAssertEqualObjects(@"+19025555555", [[PhoneNumber tryParsePhoneNumberFromText:@"1 (902) 555-5555" fromRegion:@"US"] toE164]);
     XCTAssertEqualObjects(@"+19025555555", [[PhoneNumber tryParsePhoneNumberFromText:@"1-902-555-5555" fromRegion:@"US"] toE164]);
     XCTAssertEqualObjects(@"+19025555555", [[PhoneNumber tryParsePhoneNumberFromText:@"1-902-５５５-5555" fromRegion:@"US"] toE164]);
+
+    // Phone numbers missing a calling code.
+    XCTAssertEqualObjects(@"+19025555555", [[PhoneNumber tryParsePhoneNumberFromText:@"9025555555" fromRegion:@"US"] toE164]);
+
+    // Phone numbers with a calling code but without a plus
+    XCTAssertEqualObjects(@"+19025555555", [[PhoneNumber tryParsePhoneNumberFromText:@"19025555555" fromRegion:@"US"] toE164]);
+
+    // Empty input.
+    XCTAssertEqualObjects(nil, [[PhoneNumber tryParsePhoneNumberFromText:@"" fromRegion:@"US"] toE164]);
 }
 
 - (void)testTryParsePhoneNumberFromUserSpecifiedTextAssumesLocalRegion {
diff --git a/tests/Contacts/PhoneNumberUtilTest.m b/tests/Contacts/PhoneNumberUtilTest.m
index 25f5033ca..188d1c391 100644
--- a/tests/Contacts/PhoneNumberUtilTest.m
+++ b/tests/Contacts/PhoneNumberUtilTest.m
@@ -13,7 +13,10 @@
 
 - (void)testQueryMatching
 {
+    XCTAssertTrue([PhoneNumberUtil name:@"dave" matchesQuery:@"dave"]);
     XCTAssertTrue([PhoneNumberUtil name:@"big dave" matchesQuery:@"big dave"]);
+    XCTAssertTrue([PhoneNumberUtil name:@"big dave" matchesQuery:@"big dave dave"]);
+    XCTAssertTrue([PhoneNumberUtil name:@"big big dave" matchesQuery:@"big dave"]);
     XCTAssertTrue([PhoneNumberUtil name:@"big dave" matchesQuery:@"dave big"]);
     XCTAssertTrue([PhoneNumberUtil name:@"big dave" matchesQuery:@"dave"]);
     XCTAssertTrue([PhoneNumberUtil name:@"big dave" matchesQuery:@"big"]);
@@ -27,7 +30,6 @@
     XCTAssertFalse([PhoneNumberUtil name:@"big dave" matchesQuery:@"ave"]);
     XCTAssertFalse([PhoneNumberUtil name:@"big dave" matchesQuery:@"dare"]);
     XCTAssertFalse([PhoneNumberUtil name:@"big dave" matchesQuery:@"mike"]);
-    XCTAssertFalse([PhoneNumberUtil name:@"big dave" matchesQuery:@"mike"]);
     XCTAssertFalse([PhoneNumberUtil name:@"dave" matchesQuery:@"big"]);
 }