Old tests.py file
Merge conflicts