Fix NewOrderProcedure and test accordingly