fixed dsl configuration, add tests