More moving of RealFileSystem
Streamlining tests