OrderManager test and fix

Fixed Timeout issues in the OrderManager CFB