Refactored save tests; fixed Order/InternationalOrder 1-1 CF definition