Fixing dsl v2 unit test

* Removing obsolete stuff

Change-Id: I8d82587a5ad5a45c90ee9070b71324f97731cb50
Merge "Fixing dsl v2 unit test"