Updates on shutil_test.py