Updated DSL unit tests