fixed DSL Builder template, added comments in composition tests