Refactored DSL unit tests to remove class_evals