This fixes some assertions from using the same subscription shipping and
billing addresses, and distributor address.
One of the specs also pass because the subscription shipping address
matches the distributor address. This commit makes that scenario
clearer.