Refactored Shipper model, tests pass