consistent transaction order in exports; clean up tests