Updated helper method and CreateOrderShipment test case