Adds code to test for AddressPairs