Cleaned up CreateOrderShipmentTestCases