refactor etl assignment and fix  module/import for test runner
Merge pull request #1117 from wilmoore/fix-etl-for-test-runner

refactor etl assignment and fix  module/import for test runner