Added ShipmentTests (Partial)