Improve File and Directory Delete tests.