Additions and fixes for Workflow/Modules/test
Merge pull request #2170 from andresailer/FixModulesTest

[v6r11] Additions and fixes for Workflow/Modules/test