Initial addition of export/remove/import testing