Whitespace cleanup. No functional changes
Fortify the async nature of the FilesTest tests.

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