Updated tests.py to reflect new functionality