Added testing for deleted files

  Out old code was only checking for dleeted folders but not files. This
  change fixes that but the implementation still needs to be fixed.
Fixed the exceptions when deleting regular files
Merge branch 'master' into eos2