Improve FileSystem classes for unit tests