Checked and cleaned up unit tests, and began adding the "line item-->order" logic