CreateOrderShipment is now a smoke test
Fixed helper methods and tests