Merge "Adding tests merging file deletions through team"