Fix the merge conflicts in tests/unit/pydsl_test.py