mashupTemplateGenerator cleanup
Improve test_build_template_from_workspace