Restored functionality to Test.py