Fixes DSL unit test failures.