Refactored: test dsl