Fix issues with the DSL

Add specs.