refactoring around ImportModule
updated test-module
added test-fs script