Some changes to tests.py