Add spec for Shipper
Make Address more concise