Added tests in test_erasaf_mkimport.tar.gz. Minor script updates