Fixing one test by adding back in Path.GetFileName.
Restoring FileSystem so all tests pass.