Adjusted templates and tests according to new DDD DSL version