Batch save refactor

Work to add tests of saving a batch spanning multiple orders