Adapted Test.py to isolate & task versions