Merge "Extended/Updated tests for PHONE_NUMBERS_EQUAL"