fixup! Add tests of cross-modulestore import/export