minor DSL addition and unit test mods