(COMMIT-81) AddressBuilder fix, AddressBuilder tests