Adding better unit test for import/export
Finished import export tests
Fixed merge