Use FileSystemHelpers.Instance for FileSystem singleton.
Removed function calls directly using IFileSystem singleton.
Fixed Delete issue and merged from master.