Update tests
Revert back to original re-ordering technique

It was better than mine!
Fix error in OrderedModel.save