Fixes to virtual file system testing.