MT collection refactoring - update OrderItemCriteria and repair associated unit tests