Correct for change in Address#to_s. #3785.

Change was in 4e31c23e.

These tests should probably not use Address#to_s — they should use
an address custom matcher, or something else.