Cleanup in DSL file
fix failing XCTest