Further updates.

1. Check for relevant ClOrdId
2. End test on ESC (prob still needs work)