updating tests; removing old dsl