Update Shipment
Merging
Merged with Vu Nguyen & Tuan Nguyen
more tests