Fortify the async nature of the FilesTest tests.

We should null-ify the file/folder to be deleted so it is eligible for GC.

(cherry picked from commit 649f9d2538f30677d7231afb749d509383989f2b)
Use 6.x in the file/folder names