Merge "Minor Telephony Unit test cleanup fixes" into main