|#1256| +Manan| Merging Insert, Update methods in ShipmentRepository into save method, changed the test accordingly