enhanced DSL + test model