Added ability to test import/export