Fixed conflict for tests.py