Brian: More work on OrderProcessor.
Brian: Fixed pattern matching test after changing order-related classes.