TestFileSystem: Bug fixed + ENH