Updating Dsl classes and adding 2 new test cases to the suite