diff --git a/core/modules/file/src/Tests/FileFieldWidgetTest.php b/core/modules/file/src/Tests/FileFieldWidgetTest.php
deleted file mode 100644
index 3102bd744d..0000000000
--- a/core/modules/file/src/Tests/FileFieldWidgetTest.php
+++ /dev/null
@@ -1,601 +0,0 @@
-<?php
-
-namespace Drupal\file\Tests;
-
-use Drupal\comment\Entity\Comment;
-use Drupal\comment\Tests\CommentTestTrait;
-use Drupal\Core\Url;
-use Drupal\field\Entity\FieldConfig;
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\field_ui\Tests\FieldUiTestTrait;
-use Drupal\user\RoleInterface;
-use Drupal\file\Entity\File;
-use Drupal\user\Entity\User;
-use Drupal\user\UserInterface;
-
-/**
- * Tests the file field widget, single and multi-valued, with and without AJAX,
- * with public and private files.
- *
- * @group file
- */
-class FileFieldWidgetTest extends FileFieldTestBase {
-
-  use CommentTestTrait;
-  use FieldUiTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->drupalPlaceBlock('system_breadcrumb_block');
-  }
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['comment', 'block'];
-
-  /**
-   * Creates a temporary file, for a specific user.
-   *
-   * @param string $data
-   *   A string containing the contents of the file.
-   * @param \Drupal\user\UserInterface $user
-   *   The user of the file owner.
-   *
-   * @return \Drupal\file\FileInterface
-   *   A file object, or FALSE on error.
-   */
-  protected function createTemporaryFile($data, UserInterface $user = NULL) {
-    $file = file_save_data($data, NULL, NULL);
-
-    if ($file) {
-      if ($user) {
-        $file->setOwner($user);
-      }
-      else {
-        $file->setOwner($this->adminUser);
-      }
-      // Change the file status to be temporary.
-      $file->setTemporary();
-      // Save the changes.
-      $file->save();
-    }
-
-    return $file;
-  }
-
-  /**
-   * Tests upload and remove buttons for a single-valued File field.
-   */
-  public function testSingleValuedWidget() {
-    $node_storage = $this->container->get('entity.manager')->getStorage('node');
-    $type_name = 'article';
-    $field_name = strtolower($this->randomMachineName());
-    $this->createFileField($field_name, 'node', $type_name);
-
-    $test_file = $this->getTestFile('text');
-
-    foreach (['nojs', 'js'] as $type) {
-      // Create a new node with the uploaded file and ensure it got uploaded
-      // successfully.
-      // @todo This only tests a 'nojs' submission, because drupalPostAjaxForm()
-      //   does not yet support file uploads.
-      $nid = $this->uploadNodeFile($test_file, $field_name, $type_name);
-      $node_storage->resetCache([$nid]);
-      $node = $node_storage->load($nid);
-      $node_file = File::load($node->{$field_name}->target_id);
-      $this->assertFileExists($node_file, 'New file saved to disk on node creation.');
-
-      // Ensure the file can be downloaded.
-      $this->drupalGet(file_create_url($node_file->getFileUri()));
-      $this->assertResponse(200, 'Confirmed that the generated URL is correct by downloading the shipped file.');
-
-      // Ensure the edit page has a remove button instead of an upload button.
-      $this->drupalGet("node/$nid/edit");
-      $this->assertNoFieldByXPath('//input[@type="submit"]', t('Upload'), 'Node with file does not display the "Upload" button.');
-      $this->assertFieldByXpath('//input[@type="submit"]', t('Remove'), 'Node with file displays the "Remove" button.');
-
-      // "Click" the remove button (emulating either a nojs or js submission).
-      switch ($type) {
-        case 'nojs':
-          $this->drupalPostForm(NULL, [], t('Remove'));
-          break;
-        case 'js':
-          $button = $this->xpath('//input[@type="submit" and @value="' . t('Remove') . '"]');
-          $this->drupalPostAjaxForm(NULL, [], [(string) $button[0]['name'] => (string) $button[0]['value']]);
-          break;
-      }
-
-      // Ensure the page now has an upload button instead of a remove button.
-      $this->assertNoFieldByXPath('//input[@type="submit"]', t('Remove'), 'After clicking the "Remove" button, it is no longer displayed.');
-      $this->assertFieldByXpath('//input[@type="submit"]', t('Upload'), 'After clicking the "Remove" button, the "Upload" button is displayed.');
-      // Test label has correct 'for' attribute.
-      $input = $this->xpath('//input[@name="files[' . $field_name . '_0]"]');
-      $label = $this->xpath('//label[@for="' . (string) $input[0]['id'] . '"]');
-      $this->assertTrue(isset($label[0]), 'Label for upload found.');
-
-      // Save the node and ensure it does not have the file.
-      $this->drupalPostForm(NULL, [], t('Save'));
-      $node_storage->resetCache([$nid]);
-      $node = $node_storage->load($nid);
-      $this->assertTrue(empty($node->{$field_name}->target_id), 'File was successfully removed from the node.');
-    }
-  }
-
-  /**
-   * Tests upload and remove buttons for multiple multi-valued File fields.
-   */
-  public function testMultiValuedWidget() {
-    $node_storage = $this->container->get('entity.manager')->getStorage('node');
-    $type_name = 'article';
-    // Use explicit names instead of random names for those fields, because of a
-    // bug in drupalPostForm() with multiple file uploads in one form, where the
-    // order of uploads depends on the order in which the upload elements are
-    // added to the $form (which, in the current implementation of
-    // FileStorage::listAll(), comes down to the alphabetical order on field
-    // names).
-    $field_name = 'test_file_field_1';
-    $field_name2 = 'test_file_field_2';
-    $cardinality = 3;
-    $this->createFileField($field_name, 'node', $type_name, ['cardinality' => $cardinality]);
-    $this->createFileField($field_name2, 'node', $type_name, ['cardinality' => $cardinality]);
-
-    $test_file = $this->getTestFile('text');
-
-    foreach (['nojs', 'js'] as $type) {
-      // Visit the node creation form, and upload 3 files for each field. Since
-      // the field has cardinality of 3, ensure the "Upload" button is displayed
-      // until after the 3rd file, and after that, isn't displayed. Because
-      // SimpleTest triggers the last button with a given name, so upload to the
-      // second field first.
-      // @todo This is only testing a non-Ajax upload, because drupalPostAjaxForm()
-      //   does not yet emulate jQuery's file upload.
-      //
-      $this->drupalGet("node/add/$type_name");
-      foreach ([$field_name2, $field_name] as $each_field_name) {
-        for ($delta = 0; $delta < 3; $delta++) {
-          $edit = ['files[' . $each_field_name . '_' . $delta . '][]' => \Drupal::service('file_system')->realpath($test_file->getFileUri())];
-          // If the Upload button doesn't exist, drupalPostForm() will automatically
-          // fail with an assertion message.
-          $this->drupalPostForm(NULL, $edit, t('Upload'));
-        }
-      }
-      $this->assertNoFieldByXpath('//input[@type="submit"]', t('Upload'), 'After uploading 3 files for each field, the "Upload" button is no longer displayed.');
-
-      $num_expected_remove_buttons = 6;
-
-      foreach ([$field_name, $field_name2] as $current_field_name) {
-        // How many uploaded files for the current field are remaining.
-        $remaining = 3;
-        // Test clicking each "Remove" button. For extra robustness, test them out
-        // of sequential order. They are 0-indexed, and get renumbered after each
-        // iteration, so array(1, 1, 0) means:
-        // - First remove the 2nd file.
-        // - Then remove what is then the 2nd file (was originally the 3rd file).
-        // - Then remove the first file.
-        foreach ([1, 1, 0] as $delta) {
-          // Ensure we have the expected number of Remove buttons, and that they
-          // are numbered sequentially.
-          $buttons = $this->xpath('//input[@type="submit" and @value="Remove"]');
-          $this->assertTrue(is_array($buttons) && count($buttons) === $num_expected_remove_buttons, format_string('There are %n "Remove" buttons displayed (JSMode=%type).', ['%n' => $num_expected_remove_buttons, '%type' => $type]));
-          foreach ($buttons as $i => $button) {
-            $key = $i >= $remaining ? $i - $remaining : $i;
-            $check_field_name = $field_name2;
-            if ($current_field_name == $field_name && $i < $remaining) {
-              $check_field_name = $field_name;
-            }
-
-            $this->assertIdentical((string) $button['name'], $check_field_name . '_' . $key . '_remove_button');
-          }
-
-          // "Click" the remove button (emulating either a nojs or js submission).
-          $button_name = $current_field_name . '_' . $delta . '_remove_button';
-          switch ($type) {
-            case 'nojs':
-              // drupalPostForm() takes a $submit parameter that is the value of the
-              // button whose click we want to emulate. Since we have multiple
-              // buttons with the value "Remove", and want to control which one we
-              // use, we change the value of the other ones to something else.
-              // Since non-clicked buttons aren't included in the submitted POST
-              // data, and since drupalPostForm() will result in $this being updated
-              // with a newly rebuilt form, this doesn't cause problems.
-              foreach ($buttons as $button) {
-                if ($button['name'] != $button_name) {
-                  $button['value'] = 'DUMMY';
-                }
-              }
-              $this->drupalPostForm(NULL, [], t('Remove'));
-              break;
-            case 'js':
-              // drupalPostAjaxForm() lets us target the button precisely, so we don't
-              // require the workaround used above for nojs.
-              $this->drupalPostAjaxForm(NULL, [], [$button_name => t('Remove')]);
-              break;
-          }
-          $num_expected_remove_buttons--;
-          $remaining--;
-
-          // Ensure an "Upload" button for the current field is displayed with the
-          // correct name.
-          $upload_button_name = $current_field_name . '_' . $remaining . '_upload_button';
-          $buttons = $this->xpath('//input[@type="submit" and @value="Upload" and @name=:name]', [':name' => $upload_button_name]);
-          $this->assertTrue(is_array($buttons) && count($buttons) == 1, format_string('The upload button is displayed with the correct name (JSMode=%type).', ['%type' => $type]));
-
-          // Ensure only at most one button per field is displayed.
-          $buttons = $this->xpath('//input[@type="submit" and @value="Upload"]');
-          $expected = $current_field_name == $field_name ? 1 : 2;
-          $this->assertTrue(is_array($buttons) && count($buttons) == $expected, format_string('After removing a file, only one "Upload" button for each possible field is displayed (JSMode=%type).', ['%type' => $type]));
-        }
-      }
-
-      // Ensure the page now has no Remove buttons.
-      $this->assertNoFieldByXPath('//input[@type="submit"]', t('Remove'), format_string('After removing all files, there is no "Remove" button displayed (JSMode=%type).', ['%type' => $type]));
-
-      // Save the node and ensure it does not have any files.
-      $this->drupalPostForm(NULL, ['title[0][value]' => $this->randomMachineName()], t('Save'));
-      preg_match('/node\/([0-9]+)/', $this->getUrl(), $matches);
-      $nid = $matches[1];
-      $node_storage->resetCache([$nid]);
-      $node = $node_storage->load($nid);
-      $this->assertTrue(empty($node->{$field_name}->target_id), 'Node was successfully saved without any files.');
-    }
-
-    $upload_files_node_creation = [$test_file, $test_file];
-    // Try to upload multiple files, but fewer than the maximum.
-    $nid = $this->uploadNodeFiles($upload_files_node_creation, $field_name, $type_name);
-    $node_storage->resetCache([$nid]);
-    $node = $node_storage->load($nid);
-    $this->assertEqual(count($node->{$field_name}), count($upload_files_node_creation), 'Node was successfully saved with mulitple files.');
-
-    // Try to upload more files than allowed on revision.
-    $upload_files_node_revision = [$test_file, $test_file, $test_file, $test_file];
-    $this->uploadNodeFiles($upload_files_node_revision, $field_name, $nid, 1);
-    $args = [
-      '%field' => $field_name,
-      '@max' => $cardinality,
-      '@count' => count($upload_files_node_creation) + count($upload_files_node_revision),
-      '%list' => implode(', ', array_fill(0, 3, $test_file->getFilename())),
-    ];
-    $this->assertRaw(t('Field %field can only hold @max values but there were @count uploaded. The following files have been omitted as a result: %list.', $args));
-    $node_storage->resetCache([$nid]);
-    $node = $node_storage->load($nid);
-    $this->assertEqual(count($node->{$field_name}), $cardinality, 'More files than allowed could not be saved to node.');
-
-    // Try to upload exactly the allowed number of files on revision. Create an
-    // empty node first, to fill it in its first revision.
-    $node = $this->drupalCreateNode([
-      'type' => $type_name,
-    ]);
-    $this->uploadNodeFile($test_file, $field_name, $node->id(), 1);
-    $node_storage->resetCache([$nid]);
-    $node = $node_storage->load($nid);
-    $this->assertEqual(count($node->{$field_name}), $cardinality, 'Node was successfully revised to maximum number of files.');
-
-    // Try to upload exactly the allowed number of files, new node.
-    $upload_files = array_fill(0, $cardinality, $test_file);
-    $nid = $this->uploadNodeFiles($upload_files, $field_name, $type_name);
-    $node_storage->resetCache([$nid]);
-    $node = $node_storage->load($nid);
-    $this->assertEqual(count($node->{$field_name}), $cardinality, 'Node was successfully saved with maximum number of files.');
-
-    // Try to upload more files than allowed, new node.
-    $upload_files[] = $test_file;
-    $this->uploadNodeFiles($upload_files, $field_name, $type_name);
-
-    $args = [
-      '%field' => $field_name,
-      '@max' => $cardinality,
-      '@count' => count($upload_files),
-      '%list' => $test_file->getFileName(),
-    ];
-    $this->assertRaw(t('Field %field can only hold @max values but there were @count uploaded. The following files have been omitted as a result: %list.', $args));
-  }
-
-  /**
-   * Tests a file field with a "Private files" upload destination setting.
-   */
-  public function testPrivateFileSetting() {
-    $node_storage = $this->container->get('entity.manager')->getStorage('node');
-    // Grant the admin user required permissions.
-    user_role_grant_permissions($this->adminUser->roles[0]->target_id, ['administer node fields']);
-
-    $type_name = 'article';
-    $field_name = strtolower($this->randomMachineName());
-    $this->createFileField($field_name, 'node', $type_name);
-    $field = FieldConfig::loadByName('node', $type_name, $field_name);
-    $field_id = $field->id();
-
-    $test_file = $this->getTestFile('text');
-
-    // Change the field setting to make its files private, and upload a file.
-    $edit = ['settings[uri_scheme]' => 'private'];
-    $this->drupalPostForm("admin/structure/types/manage/$type_name/fields/$field_id/storage", $edit, t('Save field settings'));
-    $nid = $this->uploadNodeFile($test_file, $field_name, $type_name);
-    $node_storage->resetCache([$nid]);
-    $node = $node_storage->load($nid);
-    $node_file = File::load($node->{$field_name}->target_id);
-    $this->assertFileExists($node_file, 'New file saved to disk on node creation.');
-
-    // Ensure the private file is available to the user who uploaded it.
-    $this->drupalGet(file_create_url($node_file->getFileUri()));
-    $this->assertResponse(200, 'Confirmed that the generated URL is correct by downloading the shipped file.');
-
-    // Ensure we can't change 'uri_scheme' field settings while there are some
-    // entities with uploaded files.
-    $this->drupalGet("admin/structure/types/manage/$type_name/fields/$field_id/storage");
-    $this->assertFieldByXpath('//input[@id="edit-settings-uri-scheme-public" and @disabled="disabled"]', 'public', 'Upload destination setting disabled.');
-
-    // Delete node and confirm that setting could be changed.
-    $node->delete();
-    $this->drupalGet("admin/structure/types/manage/$type_name/fields/$field_id/storage");
-    $this->assertFieldByXpath('//input[@id="edit-settings-uri-scheme-public" and not(@disabled)]', 'public', 'Upload destination setting enabled.');
-  }
-
-  /**
-   * Tests that download restrictions on private files work on comments.
-   */
-  public function testPrivateFileComment() {
-    $user = $this->drupalCreateUser(['access comments']);
-
-    // Grant the admin user required comment permissions.
-    $roles = $this->adminUser->getRoles();
-    user_role_grant_permissions($roles[1], ['administer comment fields', 'administer comments']);
-
-    // Revoke access comments permission from anon user, grant post to
-    // authenticated.
-    user_role_revoke_permissions(RoleInterface::ANONYMOUS_ID, ['access comments']);
-    user_role_grant_permissions(RoleInterface::AUTHENTICATED_ID, ['post comments', 'skip comment approval']);
-
-    // Create a new field.
-    $this->addDefaultCommentField('node', 'article');
-
-    $name = strtolower($this->randomMachineName());
-    $label = $this->randomMachineName();
-    $storage_edit = ['settings[uri_scheme]' => 'private'];
-    $this->fieldUIAddNewField('admin/structure/comment/manage/comment', $name, $label, 'file', $storage_edit);
-
-    // Manually clear cache on the tester side.
-    \Drupal::entityManager()->clearCachedFieldDefinitions();
-
-    // Create node.
-    $edit = [
-      'title[0][value]' => $this->randomMachineName(),
-    ];
-    $this->drupalPostForm('node/add/article', $edit, t('Save'));
-    $node = $this->drupalGetNodeByTitle($edit['title[0][value]']);
-
-    // Add a comment with a file.
-    $text_file = $this->getTestFile('text');
-    $edit = [
-      'files[field_' . $name . '_' . 0 . ']' => \Drupal::service('file_system')->realpath($text_file->getFileUri()),
-      'comment_body[0][value]' => $comment_body = $this->randomMachineName(),
-    ];
-    $this->drupalPostForm('node/' . $node->id(), $edit, t('Save'));
-
-    // Get the comment ID.
-    preg_match('/comment-([0-9]+)/', $this->getUrl(), $matches);
-    $cid = $matches[1];
-
-    // Log in as normal user.
-    $this->drupalLogin($user);
-
-    $comment = Comment::load($cid);
-    $comment_file = $comment->{'field_' . $name}->entity;
-    $this->assertFileExists($comment_file, 'New file saved to disk on node creation.');
-    // Test authenticated file download.
-    $url = file_create_url($comment_file->getFileUri());
-    $this->assertNotEqual($url, NULL, 'Confirmed that the URL is valid');
-    $this->drupalGet(file_create_url($comment_file->getFileUri()));
-    $this->assertResponse(200, 'Confirmed that the generated URL is correct by downloading the shipped file.');
-
-    // Test anonymous file download.
-    $this->drupalLogout();
-    $this->drupalGet(file_create_url($comment_file->getFileUri()));
-    $this->assertResponse(403, 'Confirmed that access is denied for the file without the needed permission.');
-
-    // Unpublishes node.
-    $this->drupalLogin($this->adminUser);
-    $edit = ['status[value]' => FALSE];
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
-
-    // Ensures normal user can no longer download the file.
-    $this->drupalLogin($user);
-    $this->drupalGet(file_create_url($comment_file->getFileUri()));
-    $this->assertResponse(403, 'Confirmed that access is denied for the file without the needed permission.');
-  }
-
-  /**
-   * Tests validation with the Upload button.
-   */
-  public function testWidgetValidation() {
-    $type_name = 'article';
-    $field_name = strtolower($this->randomMachineName());
-    $this->createFileField($field_name, 'node', $type_name);
-    $this->updateFileField($field_name, $type_name, ['file_extensions' => 'txt']);
-
-    foreach (['nojs', 'js'] as $type) {
-      // Create node and prepare files for upload.
-      $node = $this->drupalCreateNode(['type' => 'article']);
-      $nid = $node->id();
-      $this->drupalGet("node/$nid/edit");
-      $test_file_text = $this->getTestFile('text');
-      $test_file_image = $this->getTestFile('image');
-      $name = 'files[' . $field_name . '_0]';
-
-      // Upload file with incorrect extension, check for validation error.
-      $edit[$name] = \Drupal::service('file_system')->realpath($test_file_image->getFileUri());
-      switch ($type) {
-        case 'nojs':
-          $this->drupalPostForm(NULL, $edit, t('Upload'));
-          break;
-        case 'js':
-          $button = $this->xpath('//input[@type="submit" and @value="' . t('Upload') . '"]');
-          $this->drupalPostAjaxForm(NULL, $edit, [(string) $button[0]['name'] => (string) $button[0]['value']]);
-          break;
-      }
-      $error_message = t('Only files with the following extensions are allowed: %files-allowed.', ['%files-allowed' => 'txt']);
-      $this->assertRaw($error_message, t('Validation error when file with wrong extension uploaded (JSMode=%type).', ['%type' => $type]));
-
-      // Upload file with correct extension, check that error message is removed.
-      $edit[$name] = \Drupal::service('file_system')->realpath($test_file_text->getFileUri());
-      switch ($type) {
-        case 'nojs':
-          $this->drupalPostForm(NULL, $edit, t('Upload'));
-          break;
-        case 'js':
-          $button = $this->xpath('//input[@type="submit" and @value="' . t('Upload') . '"]');
-          $this->drupalPostAjaxForm(NULL, $edit, [(string) $button[0]['name'] => (string) $button[0]['value']]);
-          break;
-      }
-      $this->assertNoRaw($error_message, t('Validation error removed when file with correct extension uploaded (JSMode=%type).', ['%type' => $type]));
-    }
-  }
-
-  /**
-   * Tests file widget element.
-   */
-  public function testWidgetElement() {
-    $field_name = mb_strtolower($this->randomMachineName());
-    $html_name = str_replace('_', '-', $field_name);
-    $this->createFileField($field_name, 'node', 'article', ['cardinality' => FieldStorageConfig::CARDINALITY_UNLIMITED]);
-    $file = $this->getTestFile('text');
-    $xpath = "//details[@data-drupal-selector='edit-$html_name']/div[@class='details-wrapper']/table";
-
-    $this->drupalGet('node/add/article');
-
-    $elements = $this->xpath($xpath);
-
-    // If the field has no item, the table should not be visible.
-    $this->assertIdentical(count($elements), 0);
-
-    // Upload a file.
-    $edit['files[' . $field_name . '_0][]'] = $this->container->get('file_system')->realpath($file->getFileUri());
-    $this->drupalPostAjaxForm(NULL, $edit, "{$field_name}_0_upload_button");
-
-    $elements = $this->xpath($xpath);
-
-    // If the field has at least a item, the table should be visible.
-    $this->assertIdentical(count($elements), 1);
-
-    // Test for AJAX error when using progress bar on file field widget
-    $key = $this->randomMachineName();
-    $this->drupalPost('file/progress/' . $key, 'application/json', []);
-    $this->assertNoResponse(500, t('No AJAX error when using progress bar on file field widget'));
-    $this->assertText('Starting upload...');
-  }
-
-  /**
-   * Tests exploiting the temporary file removal of another user using fid.
-   */
-  public function testTemporaryFileRemovalExploit() {
-    // Create a victim user.
-    $victim_user = $this->drupalCreateUser();
-
-    // Create an attacker user.
-    $attacker_user = $this->drupalCreateUser([
-      'access content',
-      'create article content',
-      'edit any article content',
-    ]);
-
-    // Log in as the attacker user.
-    $this->drupalLogin($attacker_user);
-
-    // Perform tests using the newly created users.
-    $this->doTestTemporaryFileRemovalExploit($victim_user, $attacker_user);
-  }
-
-  /**
-   * Tests exploiting the temporary file removal for anonymous users using fid.
-   */
-  public function testTemporaryFileRemovalExploitAnonymous() {
-    // Set up an anonymous victim user.
-    $victim_user = User::getAnonymousUser();
-
-    // Set up an anonymous attacker user.
-    $attacker_user = User::getAnonymousUser();
-
-    // Set up permissions for anonymous attacker user.
-    user_role_change_permissions(RoleInterface::ANONYMOUS_ID, [
-      'access content' => TRUE,
-      'create article content' => TRUE,
-      'edit any article content' => TRUE,
-    ]);
-
-    // Log out so as to be the anonymous attacker user.
-    $this->drupalLogout();
-
-    // Perform tests using the newly set up anonymous users.
-    $this->doTestTemporaryFileRemovalExploit($victim_user, $attacker_user);
-  }
-
-  /**
-   * Helper for testing exploiting the temporary file removal using fid.
-   *
-   * @param \Drupal\user\UserInterface $victim_user
-   *   The victim user.
-   * @param \Drupal\user\UserInterface $attacker_user
-   *   The attacker user.
-   */
-  protected function doTestTemporaryFileRemovalExploit(UserInterface $victim_user, UserInterface $attacker_user) {
-    $type_name = 'article';
-    $field_name = 'test_file_field';
-    $this->createFileField($field_name, 'node', $type_name);
-
-    $test_file = $this->getTestFile('text');
-    foreach (['nojs', 'js'] as $type) {
-      // Create a temporary file owned by the victim user. This will be as if
-      // they had uploaded the file, but not saved the node they were editing
-      // or creating.
-      $victim_tmp_file = $this->createTemporaryFile('some text', $victim_user);
-      $victim_tmp_file = File::load($victim_tmp_file->id());
-      $this->assertTrue($victim_tmp_file->isTemporary(), 'New file saved to disk is temporary.');
-      $this->assertFalse(empty($victim_tmp_file->id()), 'New file has an fid.');
-      $this->assertEqual($victim_user->id(), $victim_tmp_file->getOwnerId(), 'New file belongs to the victim.');
-
-      // Have attacker create a new node with a different uploaded file and
-      // ensure it got uploaded successfully.
-      $edit = [
-        'title[0][value]' => $type . '-title' ,
-      ];
-
-      // Attach a file to a node.
-      $edit['files[' . $field_name . '_0]'] = $this->container->get('file_system')->realpath($test_file->getFileUri());
-      $this->drupalPostForm(Url::fromRoute('node.add', ['node_type' => $type_name]), $edit, t('Save'));
-      $node = $this->drupalGetNodeByTitle($edit['title[0][value]']);
-
-      /** @var \Drupal\file\FileInterface $node_file */
-      $node_file = File::load($node->{$field_name}->target_id);
-      $this->assertFileExists($node_file, 'A file was saved to disk on node creation');
-      $this->assertEqual($attacker_user->id(), $node_file->getOwnerId(), 'New file belongs to the attacker.');
-
-      // Ensure the file can be downloaded.
-      $this->drupalGet(file_create_url($node_file->getFileUri()));
-      $this->assertResponse(200, 'Confirmed that the generated URL is correct by downloading the shipped file.');
-
-      // "Click" the remove button (emulating either a nojs or js submission).
-      // In this POST request, the attacker "guesses" the fid of the victim's
-      // temporary file and uses that to remove this file.
-      $this->drupalGet($node->toUrl('edit-form'));
-      switch ($type) {
-        case 'nojs':
-          $this->drupalPostForm(NULL, [$field_name . '[0][fids]' => (string) $victim_tmp_file->id()], 'Remove');
-          break;
-
-        case 'js':
-          $this->drupalPostAjaxForm(NULL, [$field_name . '[0][fids]' => (string) $victim_tmp_file->id()], ["{$field_name}_0_remove_button" => 'Remove']);
-          break;
-      }
-
-      // The victim's temporary file should not be removed by the attacker's
-      // POST request.
-      $this->assertFileExists($victim_tmp_file);
-    }
-  }
-
-}
diff --git a/core/modules/file/tests/src/Functional/FileFieldTestBase.php b/core/modules/file/tests/src/Functional/FileFieldTestBase.php
index 13f4d84148..8f569463cf 100644
--- a/core/modules/file/tests/src/Functional/FileFieldTestBase.php
+++ b/core/modules/file/tests/src/Functional/FileFieldTestBase.php
@@ -142,25 +142,30 @@ public function uploadNodeFiles(array $files, $field_name, $nid_or_type, $new_re
       $node = $node_storage->load($nid);
       $this->assertNotEqual($nid, $node->getRevisionId(), 'Node revision exists.');
     }
+    $this->drupalGet("node/$nid/edit");
+    $page = $this->getSession()->getPage();
 
     // Attach files to the node.
     $field_storage = FieldStorageConfig::loadByName('node', $field_name);
     // File input name depends on number of files already uploaded.
     $field_num = count($node->{$field_name});
-    $name = 'files[' . $field_name . "_$field_num]";
-    if ($field_storage->getCardinality() != 1) {
-      $name .= '[]';
-    }
-    foreach ($files as $file) {
+    foreach ($files as $i => $file) {
+      $delta = $field_num + $i;
       $file_path = $this->container->get('file_system')->realpath($file->getFileUri());
+      $name = 'files[' . $field_name . '_' . $delta . ']';
+      if ($field_storage->getCardinality() != 1) {
+        $name .= '[]';
+      }
       if (count($files) == 1) {
         $edit[$name] = $file_path;
       }
       else {
-        $edit[$name][] = $file_path;
+        $page->attachFileToField($name, $file_path);
+        $this->drupalPostForm(NULL, [], t('Upload'));
       }
     }
-    $this->drupalPostForm("node/$nid/edit", $edit, t('Save'));
+
+    $this->drupalPostForm(NULL, $edit, t('Save'));
 
     return $nid;
   }
diff --git a/core/modules/file/tests/src/Functional/FileFieldWidgetTest.php b/core/modules/file/tests/src/Functional/FileFieldWidgetTest.php
new file mode 100644
index 0000000000..93842c0ec2
--- /dev/null
+++ b/core/modules/file/tests/src/Functional/FileFieldWidgetTest.php
@@ -0,0 +1,539 @@
+<?php
+
+namespace Drupal\Tests\file\Functional;
+
+use Drupal\comment\Entity\Comment;
+use Drupal\comment\Tests\CommentTestTrait;
+use Drupal\Component\Serialization\Json;
+use Drupal\Core\Url;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\Tests\field_ui\Traits\FieldUiTestTrait;
+use Drupal\user\RoleInterface;
+use Drupal\file\Entity\File;
+use Drupal\user\Entity\User;
+use Drupal\user\UserInterface;
+
+/**
+ * Tests the file field widget, single and multi-valued, with and without AJAX,
+ * with public and private files.
+ *
+ * @group file
+ */
+class FileFieldWidgetTest extends FileFieldTestBase {
+
+  use CommentTestTrait;
+  use FieldUiTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->drupalPlaceBlock('system_breadcrumb_block');
+  }
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['comment', 'block'];
+
+  /**
+   * Creates a temporary file, for a specific user.
+   *
+   * @param string $data
+   *   A string containing the contents of the file.
+   * @param \Drupal\user\UserInterface $user
+   *   The user of the file owner.
+   *
+   * @return \Drupal\file\FileInterface
+   *   A file object, or FALSE on error.
+   */
+  protected function createTemporaryFile($data, UserInterface $user = NULL) {
+    $file = file_save_data($data, NULL, NULL);
+
+    if ($file) {
+      if ($user) {
+        $file->setOwner($user);
+      }
+      else {
+        $file->setOwner($this->adminUser);
+      }
+      // Change the file status to be temporary.
+      $file->setTemporary();
+      // Save the changes.
+      $file->save();
+    }
+
+    return $file;
+  }
+
+  /**
+   * Tests upload and remove buttons for a single-valued File field.
+   */
+  public function testSingleValuedWidget() {
+    $node_storage = $this->container->get('entity.manager')->getStorage('node');
+    $type_name = 'article';
+    $field_name = strtolower($this->randomMachineName());
+    $this->createFileField($field_name, 'node', $type_name);
+
+    $test_file = $this->getTestFile('text');
+
+    $type = 'no-js';
+    // Create a new node with the uploaded file and ensure it got uploaded
+    // successfully.
+    // @todo This only tests a 'nojs' submission, because drupalPostAjaxForm()
+    //   does not yet support file uploads.
+    $nid = $this->uploadNodeFile($test_file, $field_name, $type_name);
+    $node_storage->resetCache([$nid]);
+    $node = $node_storage->load($nid);
+    $node_file = File::load($node->{$field_name}->target_id);
+    $this->assertFileExists($node_file, 'New file saved to disk on node creation.');
+
+    // Ensure the file can be downloaded.
+    $this->drupalGet(file_create_url($node_file->getFileUri()));
+    $this->assertResponse(200, 'Confirmed that the generated URL is correct by downloading the shipped file.');
+
+    // Ensure the edit page has a remove button instead of an upload button.
+    $this->drupalGet("node/$nid/edit");
+    $this->assertNoFieldByXPath('//input[@type="submit"]', t('Upload'), 'Node with file does not display the "Upload" button.');
+    $this->assertFieldByXpath('//input[@type="submit"]', t('Remove'), 'Node with file displays the "Remove" button.');
+    $this->drupalPostForm(NULL, [], t('Remove'));
+
+    // Ensure the page now has an upload button instead of a remove button.
+    $this->assertNoFieldByXPath('//input[@type="submit"]', t('Remove'), 'After clicking the "Remove" button, it is no longer displayed.');
+    $this->assertFieldByXpath('//input[@type="submit"]', t('Upload'), 'After clicking the "Remove" button, the "Upload" button is displayed.');
+    // Test label has correct 'for' attribute.
+    $input = $this->xpath('//input[@name="files[' . $field_name . '_0]"]');
+    $label = $this->xpath('//label[@for="' . $input[0]->getAttribute('id') . '"]');
+    $this->assertTrue(isset($label[0]), 'Label for upload found.');
+
+    // Save the node and ensure it does not have the file.
+    $this->drupalPostForm(NULL, [], t('Save'));
+    $node_storage->resetCache([$nid]);
+    $node = $node_storage->load($nid);
+    $this->assertTrue(empty($node->{$field_name}->target_id), 'File was successfully removed from the node.');
+  }
+
+  /**
+   * Tests upload and remove buttons for multiple multi-valued File fields.
+   */
+  public function testMultiValuedWidget() {
+    $node_storage = $this->container->get('entity.manager')->getStorage('node');
+    $type_name = 'article';
+    // Use explicit names instead of random names for those fields, because of a
+    // bug in drupalPostForm() with multiple file uploads in one form, where the
+    // order of uploads depends on the order in which the upload elements are
+    // added to the $form (which, in the current implementation of
+    // FileStorage::listAll(), comes down to the alphabetical order on field
+    // names).
+    $field_name = 'test_file_field_1';
+    $field_name2 = 'test_file_field_2';
+    $cardinality = 3;
+    $this->createFileField($field_name, 'node', $type_name, ['cardinality' => $cardinality]);
+    $this->createFileField($field_name2, 'node', $type_name, ['cardinality' => $cardinality]);
+
+    $test_file = $this->getTestFile('text');
+
+    // Visit the node creation form, and upload 3 files for each field. Since
+    // the field has cardinality of 3, ensure the "Upload" button is displayed
+    // until after the 3rd file, and after that, isn't displayed. Because
+    // SimpleTest triggers the last button with a given name, so upload to the
+    // second field first.
+    $this->drupalGet("node/add/$type_name");
+    foreach ([$field_name2, $field_name] as $each_field_name) {
+      for ($delta = 0; $delta < 3; $delta++) {
+        $edit = ['files[' . $each_field_name . '_' . $delta . '][]' => drupal_realpath($test_file->getFileUri())];
+        // If the Upload button doesn't exist, drupalPostForm() will automatically
+        // fail with an assertion message.
+        $this->drupalPostForm(NULL, $edit, t('Upload'));
+      }
+    }
+    $this->assertNoFieldByXpath('//input[@type="submit"]', t('Upload'), 'After uploading 3 files for each field, the "Upload" button is no longer displayed.');
+
+    $num_expected_remove_buttons = 6;
+
+    foreach ([$field_name, $field_name2] as $current_field_name) {
+      // How many uploaded files for the current field are remaining.
+      $remaining = 3;
+      // Test clicking each "Remove" button. For extra robustness, test them out
+      // of sequential order. They are 0-indexed, and get renumbered after each
+      // iteration, so array(1, 1, 0) means:
+      // - First remove the 2nd file.
+      // - Then remove what is then the 2nd file (was originally the 3rd file).
+      // - Then remove the first file.
+      foreach ([1, 1, 0] as $delta) {
+        // Ensure we have the expected number of Remove buttons, and that they
+        // are numbered sequentially.
+        $buttons = $this->xpath('//input[@type="submit" and @value="Remove"]');
+        $this->assertTrue(is_array($buttons) && count($buttons) === $num_expected_remove_buttons, format_string('There are %n "Remove" buttons displayed.', ['%n' => $num_expected_remove_buttons]));
+        foreach ($buttons as $i => $button) {
+          $key = $i >= $remaining ? $i - $remaining : $i;
+          $check_field_name = $field_name2;
+          if ($current_field_name == $field_name && $i < $remaining) {
+            $check_field_name = $field_name;
+          }
+
+          $this->assertIdentical($button->getAttribute('name'), $check_field_name . '_' . $key . '_remove_button');
+        }
+
+        // "Click" the remove button (emulating either a nojs or js submission).
+        $button_name = $current_field_name . '_' . $delta . '_remove_button';
+        $this->getSession()->getPage()->findButton($button_name)->press();
+        $num_expected_remove_buttons--;
+        $remaining--;
+
+        // Ensure an "Upload" button for the current field is displayed with the
+        // correct name.
+        $upload_button_name = $current_field_name . '_' . $remaining . '_upload_button';
+        $buttons = $this->xpath('//input[@type="submit" and @value="Upload" and @name=:name]', [':name' => $upload_button_name]);
+        $this->assertTrue(is_array($buttons) && count($buttons) == 1, 'The upload button is displayed with the correct name.');
+
+        // Ensure only at most one button per field is displayed.
+        $buttons = $this->xpath('//input[@type="submit" and @value="Upload"]');
+        $expected = $current_field_name == $field_name ? 1 : 2;
+        $this->assertTrue(is_array($buttons) && count($buttons) == $expected, 'After removing a file, only one "Upload" button for each possible field is displayed.');
+      }
+    }
+
+    // Ensure the page now has no Remove buttons.
+    $this->assertNoFieldByXPath('//input[@type="submit"]', t('Remove'), 'After removing all files, there is no "Remove" button displayed.');
+
+    // Save the node and ensure it does not have any files.
+    $this->drupalPostForm(NULL, ['title[0][value]' => $this->randomMachineName()], t('Save'));
+    preg_match('/node\/([0-9])/', $this->getUrl(), $matches);
+    $nid = $matches[1];
+    $node_storage->resetCache([$nid]);
+    $node = $node_storage->load($nid);
+    $this->assertTrue(empty($node->{$field_name}->target_id), 'Node was successfully saved without any files.');
+
+    // Try to upload more files than allowed on revision.
+    $upload_files_node_revision = [$test_file, $test_file, $test_file, $test_file];
+    foreach ($upload_files_node_revision as $i => $file) {
+      $edit['files[test_file_field_1_0][' . $i . ']'] = drupal_realpath($test_file->getFileUri());
+    }
+
+    // @todo: Replace after https://www.drupal.org/project/drupal/issues/2917885
+    $this->drupalGet('node/' . $node->id() . '/edit');
+    $this->assertSession()->fieldExists('files[test_file_field_1_0][]');
+    $submit_xpath = $this->assertSession()->buttonExists('Save')->getXpath();
+    $client = $this->getSession()->getDriver()->getClient();
+    $form = $client->getCrawler()->filterXPath($submit_xpath)->form();
+    $client->request($form->getMethod(), $form->getUri(), $form->getPhpValues(), $edit);
+
+    $node_storage->resetCache([$nid]);
+    $node = $node_storage->load($nid);
+    $this->assertEqual(count($node->{$field_name}), $cardinality, 'More files than allowed could not be saved to node.');
+
+    $upload_files_node_creation = [$test_file, $test_file];
+    // Try to upload multiple files, but fewer than the maximum.
+    $nid = $this->uploadNodeFiles($upload_files_node_creation, $field_name, $type_name, TRUE, []);
+    $node_storage->resetCache([$nid]);
+    $node = $node_storage->load($nid);
+    $this->assertEqual(count($node->{$field_name}), count($upload_files_node_creation), 'Node was successfully saved with mulitple files.');
+
+    // Try to upload exactly the allowed number of files on revision.
+    $this->uploadNodeFile($test_file, $field_name, $node->id(), 1, [], TRUE);
+    $node_storage->resetCache([$nid]);
+    $node = $node_storage->load($nid);
+    $this->assertEqual(count($node->{$field_name}), $cardinality, 'Node was successfully revised to maximum number of files.');
+
+    // Try to upload exactly the allowed number of files, new node.
+    $upload_files = [$test_file, $test_file, $test_file];
+    $nid = $this->uploadNodeFiles($upload_files, $field_name, $type_name, TRUE, []);
+    $node_storage->resetCache([$nid]);
+    $node = $node_storage->load($nid);
+    $this->assertEqual(count($node->{$field_name}), $cardinality, 'Node was successfully saved with maximum number of files.');
+  }
+
+  /**
+   * Tests a file field with a "Private files" upload destination setting.
+   */
+  public function testPrivateFileSetting() {
+    $node_storage = $this->container->get('entity.manager')->getStorage('node');
+    // Grant the admin user required permissions.
+    user_role_grant_permissions($this->adminUser->roles[0]->target_id, ['administer node fields']);
+
+    $type_name = 'article';
+    $field_name = strtolower($this->randomMachineName());
+    $this->createFileField($field_name, 'node', $type_name);
+    $field = FieldConfig::loadByName('node', $type_name, $field_name);
+    $field_id = $field->id();
+
+    $test_file = $this->getTestFile('text');
+
+    // Change the field setting to make its files private, and upload a file.
+    $edit = ['settings[uri_scheme]' => 'private'];
+    $this->drupalPostForm("admin/structure/types/manage/$type_name/fields/$field_id/storage", $edit, t('Save field settings'));
+    $nid = $this->uploadNodeFile($test_file, $field_name, $type_name);
+    $node_storage->resetCache([$nid]);
+    $node = $node_storage->load($nid);
+    $node_file = File::load($node->{$field_name}->target_id);
+    $this->assertFileExists($node_file, 'New file saved to disk on node creation.');
+
+    // Ensure the private file is available to the user who uploaded it.
+    $this->drupalGet(file_create_url($node_file->getFileUri()));
+    $this->assertResponse(200, 'Confirmed that the generated URL is correct by downloading the shipped file.');
+
+    // Ensure we can't change 'uri_scheme' field settings while there are some
+    // entities with uploaded files.
+    $this->drupalGet("admin/structure/types/manage/$type_name/fields/$field_id/storage");
+    $this->assertFieldByXpath('//input[@id="edit-settings-uri-scheme-public" and @disabled="disabled"]', 'public', 'Upload destination setting disabled.');
+
+    // Delete node and confirm that setting could be changed.
+    $node->delete();
+    $this->drupalGet("admin/structure/types/manage/$type_name/fields/$field_id/storage");
+    $this->assertFieldByXpath('//input[@id="edit-settings-uri-scheme-public" and not(@disabled)]', 'public', 'Upload destination setting enabled.');
+  }
+
+  /**
+   * Tests that download restrictions on private files work on comments.
+   */
+  public function testPrivateFileComment() {
+    $user = $this->drupalCreateUser(['access comments']);
+
+    // Grant the admin user required comment permissions.
+    $roles = $this->adminUser->getRoles();
+    user_role_grant_permissions($roles[1], ['administer comment fields', 'administer comments']);
+
+    // Revoke access comments permission from anon user, grant post to
+    // authenticated.
+    user_role_revoke_permissions(RoleInterface::ANONYMOUS_ID, ['access comments']);
+    user_role_grant_permissions(RoleInterface::AUTHENTICATED_ID, ['post comments', 'skip comment approval']);
+
+    // Create a new field.
+    $this->addDefaultCommentField('node', 'article');
+
+    $name = strtolower($this->randomMachineName());
+    $label = $this->randomMachineName();
+    $storage_edit = ['settings[uri_scheme]' => 'private'];
+    $this->fieldUIAddNewField('admin/structure/comment/manage/comment', $name, $label, 'file', $storage_edit);
+
+    // Manually clear cache on the tester side.
+    \Drupal::entityManager()->clearCachedFieldDefinitions();
+
+    // Create node.
+    $edit = [
+      'title[0][value]' => $this->randomMachineName(),
+    ];
+    $this->drupalPostForm('node/add/article', $edit, t('Save'));
+    $node = $this->drupalGetNodeByTitle($edit['title[0][value]']);
+
+    // Add a comment with a file.
+    $text_file = $this->getTestFile('text');
+    $edit = [
+      'files[field_' . $name . '_' . 0 . ']' => \Drupal::service('file_system')->realpath($text_file->getFileUri()),
+      'comment_body[0][value]' => $comment_body = $this->randomMachineName(),
+    ];
+    $this->drupalPostForm('node/' . $node->id(), $edit, t('Save'));
+
+    // Get the comment ID.
+    preg_match('/comment-([0-9]+)/', $this->getUrl(), $matches);
+    $cid = $matches[1];
+
+    // Log in as normal user.
+    $this->drupalLogin($user);
+
+    $comment = Comment::load($cid);
+    $comment_file = $comment->{'field_' . $name}->entity;
+    $this->assertFileExists($comment_file, 'New file saved to disk on node creation.');
+    // Test authenticated file download.
+    $url = file_create_url($comment_file->getFileUri());
+    $this->assertNotEqual($url, NULL, 'Confirmed that the URL is valid');
+    $this->drupalGet(file_create_url($comment_file->getFileUri()));
+    $this->assertResponse(200, 'Confirmed that the generated URL is correct by downloading the shipped file.');
+
+    // Test anonymous file download.
+    $this->drupalLogout();
+    $this->drupalGet(file_create_url($comment_file->getFileUri()));
+    $this->assertResponse(403, 'Confirmed that access is denied for the file without the needed permission.');
+
+    // Unpublishes node.
+    $this->drupalLogin($this->adminUser);
+    $edit = ['status[value]' => FALSE];
+    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
+
+    // Ensures normal user can no longer download the file.
+    $this->drupalLogin($user);
+    $this->drupalGet(file_create_url($comment_file->getFileUri()));
+    $this->assertResponse(403, 'Confirmed that access is denied for the file without the needed permission.');
+  }
+
+  /**
+   * Tests validation with the Upload button.
+   */
+  public function testWidgetValidation() {
+    $type_name = 'article';
+    $field_name = strtolower($this->randomMachineName());
+    $this->createFileField($field_name, 'node', $type_name);
+    $this->updateFileField($field_name, $type_name, ['file_extensions' => 'txt']);
+
+    $type = 'nojs';
+    // Create node and prepare files for upload.
+    $node = $this->drupalCreateNode(['type' => 'article']);
+    $nid = $node->id();
+    $this->drupalGet("node/$nid/edit");
+    $test_file_text = $this->getTestFile('text');
+    $test_file_image = $this->getTestFile('image');
+    $name = 'files[' . $field_name . '_0]';
+
+    // Upload file with incorrect extension, check for validation error.
+    $edit[$name] = \Drupal::service('file_system')->realpath($test_file_image->getFileUri());
+    $this->drupalPostForm(NULL, $edit, t('Upload'));
+
+    $error_message = t('Only files with the following extensions are allowed: %files-allowed.', ['%files-allowed' => 'txt']);
+    $this->assertRaw($error_message, t('Validation error when file with wrong extension uploaded (JSMode=%type).', ['%type' => $type]));
+
+    // Upload file with correct extension, check that error message is removed.
+    $edit[$name] = \Drupal::service('file_system')->realpath($test_file_text->getFileUri());
+    $this->drupalPostForm(NULL, $edit, t('Upload'));
+    $this->assertNoRaw($error_message, t('Validation error removed when file with correct extension uploaded (JSMode=%type).', ['%type' => $type]));
+  }
+
+  /**
+   * Tests file widget element.
+   */
+  public function testWidgetElement() {
+    $field_name = mb_strtolower($this->randomMachineName());
+    $html_name = str_replace('_', '-', $field_name);
+    $this->createFileField($field_name, 'node', 'article', ['cardinality' => FieldStorageConfig::CARDINALITY_UNLIMITED]);
+    $file = $this->getTestFile('text');
+    $xpath = "//details[@data-drupal-selector='edit-$html_name']/div[@class='details-wrapper']/table";
+
+    $this->drupalGet('node/add/article');
+
+    $elements = $this->xpath($xpath);
+
+    // If the field has no item, the table should not be visible.
+    $this->assertIdentical(count($elements), 0);
+
+    // Upload a file.
+    $edit['files[' . $field_name . '_0][]'] = $this->container->get('file_system')->realpath($file->getFileUri());
+    $this->drupalPostForm(NULL, $edit, "{$field_name}_0_upload_button");
+
+    $elements = $this->xpath($xpath);
+
+    // If the field has at least a item, the table should be visible.
+    $this->assertIdentical(count($elements), 1);
+
+    // Test for AJAX error when using progress bar on file field widget
+    $http_client = $this->getHttpClient();
+    $key = $this->randomMachineName();
+    $post_request = $http_client->request('POST', $this->buildUrl('file/progress/' . $key), [
+      'headers' => [
+        'Accept' => 'application/json',
+        'Content-Type' => 'application/x-www-form-urlencoded',
+      ],
+      'http_errors' => FALSE,
+    ]);
+    $this->assertNotEquals(500, $post_request->getStatusCode());
+    $body = Json::decode($post_request->getBody());
+    $this->assertContains('Starting upload...', $body['message']);
+  }
+
+  /**
+   * Tests exploiting the temporary file removal of another user using fid.
+   */
+  public function testTemporaryFileRemovalExploit() {
+    // Create a victim user.
+    $victim_user = $this->drupalCreateUser();
+
+    // Create an attacker user.
+    $attacker_user = $this->drupalCreateUser([
+      'access content',
+      'create article content',
+      'edit any article content',
+    ]);
+
+    // Log in as the attacker user.
+    $this->drupalLogin($attacker_user);
+
+    // Perform tests using the newly created users.
+    $this->doTestTemporaryFileRemovalExploit($victim_user, $attacker_user);
+  }
+
+  /**
+   * Tests exploiting the temporary file removal for anonymous users using fid.
+   */
+  public function testTemporaryFileRemovalExploitAnonymous() {
+    // Set up an anonymous victim user.
+    $victim_user = User::getAnonymousUser();
+
+    // Set up an anonymous attacker user.
+    $attacker_user = User::getAnonymousUser();
+
+    // Set up permissions for anonymous attacker user.
+    user_role_change_permissions(RoleInterface::ANONYMOUS_ID, [
+      'access content' => TRUE,
+      'create article content' => TRUE,
+      'edit any article content' => TRUE,
+    ]);
+
+    // Log out so as to be the anonymous attacker user.
+    $this->drupalLogout();
+
+    // Perform tests using the newly set up anonymous users.
+    $this->doTestTemporaryFileRemovalExploit($victim_user, $attacker_user);
+  }
+
+  /**
+   * Helper for testing exploiting the temporary file removal using fid.
+   *
+   * @param \Drupal\user\UserInterface $victim_user
+   *   The victim user.
+   * @param \Drupal\user\UserInterface $attacker_user
+   *   The attacker user.
+   */
+  protected function doTestTemporaryFileRemovalExploit(UserInterface $victim_user, UserInterface $attacker_user) {
+    $type_name = 'article';
+    $field_name = 'test_file_field';
+    $this->createFileField($field_name, 'node', $type_name);
+
+    $test_file = $this->getTestFile('text');
+    $type = 'no-js';
+    // Create a temporary file owned by the victim user. This will be as if
+    // they had uploaded the file, but not saved the node they were editing
+    // or creating.
+    $victim_tmp_file = $this->createTemporaryFile('some text', $victim_user);
+    $victim_tmp_file = File::load($victim_tmp_file->id());
+    $this->assertTrue($victim_tmp_file->isTemporary(), 'New file saved to disk is temporary.');
+    $this->assertFalse(empty($victim_tmp_file->id()), 'New file has an fid.');
+    $this->assertEqual($victim_user->id(), $victim_tmp_file->getOwnerId(), 'New file belongs to the victim.');
+
+    // Have attacker create a new node with a different uploaded file and
+    // ensure it got uploaded successfully.
+    $edit = [
+      'title[0][value]' => $type . '-title' ,
+    ];
+
+    // Attach a file to a node.
+    $edit['files[' . $field_name . '_0]'] = $this->container->get('file_system')->realpath($test_file->getFileUri());
+    $this->drupalPostForm(Url::fromRoute('node.add', ['node_type' => $type_name]), $edit, t('Save'));
+    $node = $this->drupalGetNodeByTitle($edit['title[0][value]']);
+
+    /** @var \Drupal\file\FileInterface $node_file */
+    $node_file = File::load($node->{$field_name}->target_id);
+    $this->assertFileExists($node_file, 'A file was saved to disk on node creation');
+    $this->assertEqual($attacker_user->id(), $node_file->getOwnerId(), 'New file belongs to the attacker.');
+
+    // Ensure the file can be downloaded.
+    $this->drupalGet(file_create_url($node_file->getFileUri()));
+    $this->assertResponse(200, 'Confirmed that the generated URL is correct by downloading the shipped file.');
+
+    // "Click" the remove button (emulating either a nojs or js submission).
+    // In this POST request, the attacker "guesses" the fid of the victim's
+    // temporary file and uses that to remove this file.
+    $this->drupalGet($node->toUrl('edit-form'));
+
+    $file_id_field = $this->assertSession()->hiddenFieldExists($field_name . '[0][fids]');
+    $file_id_field->setValue((string) $victim_tmp_file->id());
+    $this->drupalPostForm(NULL, [], 'Remove');
+
+    // The victim's temporary file should not be removed by the attacker's
+    // POST request.
+    $this->assertFileExists($victim_tmp_file);
+  }
+
+}
diff --git a/core/modules/file/tests/src/FunctionalJavascript/FileFieldWidgetTest.php b/core/modules/file/tests/src/FunctionalJavascript/FileFieldWidgetTest.php
new file mode 100644
index 0000000000..cf82d0356d
--- /dev/null
+++ b/core/modules/file/tests/src/FunctionalJavascript/FileFieldWidgetTest.php
@@ -0,0 +1,136 @@
+<?php
+
+namespace Drupal\Tests\file\FunctionalJavascript;
+
+use Drupal\file\Entity\File;
+use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
+use Drupal\Tests\field_ui\Traits\FieldUiTestTrait;
+use Drupal\Tests\file\Functional\FileFieldCreationTrait;
+use Drupal\Tests\TestFileCreationTrait;
+
+/**
+ * Tests the file field widget, single and multi-valued, with and without AJAX,
+ * with public and private files.
+ *
+ * @group file
+ */
+class FileFieldWidgetTest extends WebDriverTestBase {
+
+  use FieldUiTestTrait;
+  use FileFieldCreationTrait;
+  use TestFileCreationTrait;
+
+  /**
+   * An user with administration permissions.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $adminUser;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $modules = ['node', 'file', 'file_module_test', 'field_ui'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->adminUser = $this->drupalCreateUser(['access content', 'access administration pages', 'administer site configuration', 'administer users', 'administer permissions', 'administer content types', 'administer node fields', 'administer node display', 'administer nodes', 'bypass node access']);
+    $this->drupalLogin($this->adminUser);
+    $this->drupalCreateContentType(['type' => 'article', 'name' => 'Article']);
+  }
+
+  /**
+   * Tests upload and remove buttons for multiple multi-valued File fields.
+   */
+  public function testMultiValuedWidget() {
+    $type_name = 'article';
+    $field_name = 'test_file_field_1';
+    $field_name2 = 'test_file_field_2';
+    $cardinality = 3;
+    $this->createFileField($field_name, 'node', $type_name, ['cardinality' => $cardinality]);
+    $this->createFileField($field_name2, 'node', $type_name, ['cardinality' => $cardinality]);
+
+    $page = $this->getSession()->getPage();
+    $assert_session = $this->assertSession();
+
+    $test_file = current($this->getTestFiles('text'));
+    $test_file_path = \Drupal::service('file_system')
+      ->realpath($test_file->uri);
+
+    $this->drupalGet("node/add/$type_name");
+    foreach ([$field_name2, $field_name] as $each_field_name) {
+      for ($delta = 0; $delta < 3; $delta++) {
+        $page->attachFileToField('files[' . $each_field_name . '_' . $delta . '][]', $test_file_path);
+        $this->assertNotNull($assert_session->waitForElementVisible('css', '[name="' . $each_field_name . '_' . $delta . '_remove_button"]'));
+        $this->assertNull($assert_session->waitForButton($each_field_name . '_' . $delta . '_upload_button'));
+      }
+    }
+
+    $num_expected_remove_buttons = 6;
+
+    foreach ([$field_name, $field_name2] as $current_field_name) {
+      // How many uploaded files for the current field are remaining.
+      $remaining = 3;
+      // Test clicking each "Remove" button. For extra robustness, test them out
+      // of sequential order. They are 0-indexed, and get renumbered after each
+      // iteration, so array(1, 1, 0) means:
+      // - First remove the 2nd file.
+      // - Then remove what is then the 2nd file (was originally the 3rd file).
+      // - Then remove the first file.
+      foreach ([1, 1, 0] as $delta) {
+        // Ensure we have the expected number of Remove buttons, and that they
+        // are numbered sequentially.
+        $buttons = $this->xpath('//input[@type="submit" and @value="Remove"]');
+        $this->assertTrue(is_array($buttons) && count($buttons) === $num_expected_remove_buttons, format_string('There are %n "Remove" buttons displayed.', ['%n' => $num_expected_remove_buttons]));
+        foreach ($buttons as $i => $button) {
+          $key = $i >= $remaining ? $i - $remaining : $i;
+          $check_field_name = $field_name2;
+          if ($current_field_name == $field_name && $i < $remaining) {
+            $check_field_name = $field_name;
+          }
+
+          $this->assertIdentical($button->getAttribute('name'), $check_field_name . '_' . $key . '_remove_button');
+        }
+
+        $button_name = $current_field_name . '_' . $delta . '_remove_button';
+        $remove_button = $assert_session->waitForButton($button_name);
+        $remove_button->click();
+
+        $num_expected_remove_buttons--;
+        $remaining--;
+
+        // Ensure an "Upload" button for the current field is displayed with the
+        // correct name.
+        $upload_button_name = $current_field_name . '_' . $remaining . '_upload_button';
+        $this->assertNotNull($assert_session->waitForButton($upload_button_name));
+        $buttons = $this->xpath('//input[@type="submit" and @value="Upload" and @name=:name]', [':name' => $upload_button_name]);
+        $this->assertTrue(is_array($buttons) && count($buttons) == 1, 'The upload button is displayed with the correct name.');
+
+        // Ensure only at most one button per field is displayed.
+        $buttons = $this->xpath('//input[@type="submit" and @value="Upload"]');
+        $expected = $current_field_name == $field_name ? 1 : 2;
+        $this->assertTrue(is_array($buttons) && count($buttons) == $expected, 'After removing a file, only one "Upload" button for each possible field is displayed.');
+      }
+    }
+  }
+
+  /**
+   * Retrieves a sample file of the specified type.
+   *
+   * @return \Drupal\file\FileInterface
+   */
+  public function getTestFile($type_name, $size = NULL) {
+    // Get a file to upload.
+    $file = current($this->getTestFiles($type_name, $size));
+
+    // Add a filesize property to files as would be read by
+    // \Drupal\file\Entity\File::load().
+    $file->filesize = filesize($file->uri);
+
+    return File::create((array) $file);
+  }
+
+}
diff --git a/core/modules/file/tests/src/Nightwatch/Tests/multipleFileUploadTest.js b/core/modules/file/tests/src/Nightwatch/Tests/multipleFileUploadTest.js
new file mode 100644
index 0000000000..35f90bf1f1
--- /dev/null
+++ b/core/modules/file/tests/src/Nightwatch/Tests/multipleFileUploadTest.js
@@ -0,0 +1,75 @@
+module.exports = {
+  '@tags': ['file'],
+  before(browser) {
+    browser.drupalInstall().drupalLoginAsAdmin(() => {
+      browser
+        .drupalRelativeURL('/admin/modules')
+        .setValue('input[type="search"]', 'file')
+        .waitForElementVisible('input[name="modules[file][enable]"]', 1000)
+        .pause(100) // because checkboxes can finicky about being checked
+        .click('input[name="modules[file][enable]"]')
+        .clearValue('input[type="search"]')
+        .setValue('input[type="search"]', 'field ui')
+        .waitForElementVisible('input[name="modules[field_ui][enable]"]', 1000)
+        .pause(500) // because checkboxes can finicky about being checked
+        .click('input[name="modules[field_ui][enable]"]')
+        .clearValue('input[type="search"]')
+        .setValue('input[type="search"]', 'node')
+        .waitForElementVisible('input[name="modules[node][enable]"]', 1000)
+        .pause(500) // because checkboxes can finicky about being checked
+        .click('input[name="modules[node][enable]"]')
+        .clearValue('input[type="search"]')
+        .setValue('input[type="search"]', 'image')
+        .waitForElementVisible('input[name="modules[image][enable]"]', 1000)
+        .pause(500) // because checkboxes can finicky about being checked
+        .click('input[name="modules[image][enable]"]')
+        .execute('window.scrollTo(0,document.body.scrollHeight);')
+        .waitForElementVisible('#edit-submit', 1000)
+        .click('#edit-submit') // Submit module form.
+        .waitForElementVisible('input[value="Continue"]', 10000)
+        .click('#edit-submit') // Confirm installation of dependencies.
+        .waitForElementVisible('input[type="search"]', 10000)
+    });
+  },
+  after(browser) {
+    browser.drupalUninstall();
+  },
+  'Test multiple file upload field': browser => {
+    browser
+      .drupalLoginAsAdmin(() => {
+        browser
+          .drupalRelativeURL('/admin/structure/types/add')
+          .waitForElementVisible('#edit-name', 1000)
+          .setValue('#edit-name', 'test')
+          .waitForElementVisible('.machine-name-value', 1000)
+          .click('#edit-save-continue')
+          .waitForElementVisible('#field-overview', 5000)
+          .drupalRelativeURL('/admin/structure/types/manage/test/fields/add-field')
+          .waitForElementVisible('#edit-new-storage-type', 5000)
+          .setValue('#edit-new-storage-type', 'image')
+          .waitForElementVisible('#edit-label', 5000)
+          .setValue('#edit-label', 'test image')
+          .waitForElementVisible('.machine-name-value', 1000)
+          .click('#edit-submit')
+          .waitForElementVisible('#edit-cardinality-number', 5000)
+          .clearValue('#edit-cardinality-number')
+          .setValue('#edit-cardinality-number', 3)
+          .click('#edit-submit')
+          .waitForElementVisible('#edit-label', 5000)
+          .click('#edit-submit')
+          .waitForElementVisible('#field-overview', 5000)
+          .drupalRelativeURL('/node/add/test')
+          .waitForElementVisible('#edit-field-test-image-0-upload', 5000)
+          .setValue('#edit-title-0-value', require('path').resolve(__dirname))
+          .execute('window.scrollTo(0,document.body.scrollHeight);')
+          .setValue('#edit-field-test-image-0-upload',
+            require('path').resolve(__dirname + '/test_image.png') + " \n " +
+            require('path').resolve(__dirname + '/test_image.png') + " \n " +
+            require('path').resolve(__dirname + '/test_image.png') + " \n " +
+            require('path').resolve(__dirname + '/test_image.png')
+          )
+          .waitForElementVisible('.messages.messages--warning', 5000)
+          .assert.containsText('.messages.messages--warning', 'Field field_test_image can only hold 3 values but there were 4 uploaded. The following files have been omitted as a result: test_image.png.');
+      });
+  },
+};
diff --git a/core/modules/file/tests/src/Nightwatch/Tests/test_image.png b/core/modules/file/tests/src/Nightwatch/Tests/test_image.png
new file mode 100644
index 0000000000..cd3c40dcb5
--- /dev/null
+++ b/core/modules/file/tests/src/Nightwatch/Tests/test_image.png
@@ -0,0 +1,30 @@
+�PNG
+
+
IHDR^d3��JiCCPICC ProfileH��WTS��[RIh�P���D)ҥ��"Hl�$�PBL"vY�."��誈������uQ��aAee],�Py���y���3w������̝;�NO*�Cu
ȗ�"CY��Y�@
X_.e���(C�?��5�(�ˮJ�o����	�r>H<ę9?�}�e|���/���(�*�d�
d0@��J���eJ����*���;
 �x<Y6ڭP�*�gC��Ib	:d���"��(�G��(1���_�d��3s������\TB˥y���g9����)�|��Fɢ�9ú��-�VbĽ���8��!~'��!F�"ET��5��9�f�	���
������>3K����X\�M��]$��'j8�d	qC8K�ak�6�d*�J���d����H��]"JJUnjQ��)�kC̔�&F�m0�'v�F�HP�o��P��Ǧf�"4��|�P��"����5���(
�N>O�1ĭB	;y�G(�3��@���(�$k�ź���	��/�y�{�*̋T�!6�%j��A�pA���Xia|�:N<3�7.^^b�
P��	
+@w����_��2�
��U������g"(
B$��y��Q!(��O�Z��d�F�T3r�c��A4ȃ��Y�ao)�Ԉ��·�����Vdž��F1����$�ÈQ��n��
x|�����~C��mOxL�$< \%tnN�ʾʇƃ.�!B�s�9�����!?�ƙ�)p��@Ol<���Z�&re�_s�#�/�����QP�%����Lmgm�aeM���:���r�G�������Gm�-��b��c�� �X��;�R��U�H����%��Ʌ<�o��4>����5���}T�
+���#�Hg��٢B��BW�5����wm�wD�M�b����ߺ��
+��������P��s8�#NW��"�W>���(`
l�#��x���8�@�
+�,��Yf��`
(�`9Xj�F�l?�=���o�����p�t�g��
��:�@LK�qA<_$	Gb�$
�@�	�@f#�!��J�ل4 � �c�����Gz���Ci�
j�ڣ�Q_��F�I�4����e�R��Gw���1�z�B�����0&f��b���ұ,L���*�*�k����|��z��8g�,���(<������ߎ7�'���}��L��.�0��M�A('T��N·����H$2�D�6�s���K�뉻�G��ć�~�dBr!��H<R!������t�t��MzG�"[�=��t��\J�"� &_"?!Pt)vJE@�IYF�Bi�\�tS�zTj 5��C]@��6QOR�P_iiiYk�iM�k�ת�ڭuZ��{�>͙ơM�)hKi�hGi7i��t�==��N/�/�7Џ����i3�Gis���k���/i?ס���u���T��չ�ӫKѵ����t����н�ۯ��s׋���[��C��S}���~��@�L��q���a��0���['�D�A�A���}���cS�
k
v11�=���c.c�a^c~027b	�5]2zk<�8�Xh\a������I�I��
+����������LO���00�?�bĞ��P3g��Yf��Λ��[�G�K�י7�`Z�X�X��8l�cɰ�[��<b�ː�f屪Y'X}VfVQV
+�MVV���ֻ֥���Pm|m�lV۴���Zڎ��m�h{ˎb�k'�[kw��}����-�O��%�w������8�|�r��;]tF���Eε�\Po��z�Α��~#%#�G^w���]�\]�b��U:�e��Ѷ��G�}j�g7/�<�-n����ǹ������p��{�z\�{Fx��l�|1�e�p̆17�^㽾�j�����-�n��������k������/�o��A�������{��
+p
�
��t��X��-cZ�7v��2�~�
+�
+��?�	�l
y�vb�w������B�����s�p��aa�aa�����5��"�#�##�"�"gE�"DEG����5��
ܾq>��;M�N���~�#�i��7~��;�v��ؖ8Ǎ[w7�!~z����'�Nx���0;�T"#qZ��7I�I˒n';&+��StR&�4��M
K]��5q��9ϥ����Z�I�)�[��'�OZ3�{�����צ8L)�rf��Լ����L�MۛA�H�ؑ�ǫ��gr3�2���Z�3A�`��G(\)|���2�iv`���Q��J�+�k�/r�r6�͍�ݖ;����+����@�/ɕ�(�((.蔺H˥]������'��m�#�)��Bx`?�pT,T�/
+*�-z7#e��b�bI����3�|RQ��,|V�l��fߟÞ�i.27sn�<�ye��G�߾�� w��n�+K_��][�y����#6�k��ʯ���E�"�Ş��-�\!�8[�VYU�q	�����api�Ҏe��6,'.�,��"x���z+KV>\5~U�j��կ�L[s�jL�ƵԵ��]�1խ�l�-_��FTs�6�vW�Y�⺷��/m�д�|c��?���)rSs�}}�f��͏��l9���O
[M�Vn��M��k{��
>

;�v,kD�=;'��s�ϭM�M�v1wU�����%�k{������۴�n_�~���f�yfs_����5������m
m��붃VkZv�z������#�G�G{�e{�>����ǯ��p��d��ӿE�v��ԑӁ���?s��ٖs���{�������;�;�/�\h��w��sl��K���]����sWc�v^K�v����]77��̻��Vѭ�����T�ս[u��^������˻������$>������#����e�鏫�X>ix���`OD��?&���L�l���O�?�;>��W�_��&�u���|��ɫm�Ǽn���&���ۊw&ﶿ�}�C�'3>�>Vr���9�����A)O�S0�Ь,^n���"<?LR��T���*�V�U�
@��u�Qv�f?r��<�'���s�iD���������+sHm|�
���{�����K����G�%f
���
~�,ǚj	pHYs%%
IR$�
�iTXtXML:com.adobe.xmp<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 5.4.0">
+   <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+      <rdf:Description rdf:about=""
+            xmlns:exif="http://ns.adobe.com/exif/1.0/">
+         <exif:PixelXDimension>94</exif:PixelXDimension>
+         <exif:PixelYDimension>100</exif:PixelYDimension>
+      </rdf:Description>
+   </rdf:RDF>
+</x:xmpmeta>
+��1iDOT2(22^�lT�*IDATx
�{PU��CE
Q����0%ӱ�1����Qi%
��29���(�5���j"m�t�4��)��W$�����m�̽�v���s����f����������={��;~�]�Y�����8s�C
�:�A��W��J�j��W��J�j��W��J�j��W��J�j��W��Jݚu�[����#� ��Nz�]P����~ܼ�Z�ݚx[k�3�;C؄��GOq�^s;�*�r�kAWZ�]摌5�m؁^�
��)�����5��^/|	���tX4R�Ǡ~��YwX<ŝŽHҨil�����k9��?�Ԗ��*�������}�X܇l��w���*dk�iأ�m�z	�1�]��3^nm.�����������1�}]`y�'x����ov��+���37���>ױ��U�#`M��a)�����_�cU,e
����p�x��4ܠSV�-����-+I�������k�Xp�g�d���`���u�D8�n��'/1;��g̡?��uql}s��m�	��##.����n�6��O~a*�|��YL)&���2a�k1s��+S=�ܘ��� ��s�i�L
����(&t��	�R.>��Ȼ@JT��b�x��A�eaL�o�?���Q
�sq�շ�>C )��S\��K����Kk3�b�'���h�2%���MHκ.�v���>B�˓�G��O
+��L�/t�
�|Xޛ�V��U��WD�u��|��?��_��%���8�.}Zn�����B�T�;��A���T�r��H
`�ժFY������ �i����LΗt��������6R�1�1��"��OA�~//xCw�`ζ\9�'⧁�CYmim���$�d����
U<���;!(!����_��`m���
+��+��D�6vR6xLza򋗵u<��M���zYX@^��cm�k���h1H�������$�y1�Ƀkގ<haT��������Er�Ŕ׾ȗTɒ~�K���u�u��{
�>���������
�,&f3iM2xL�b����,�KP}���<�����W}��4���d�yhh�+�K�����^�f��n��N�U��\[_�sH?�u>�l`m	�p�R5��d����cQ�Kq�M�9ޑ�D�o�8gر�Wv��k��>�I?�,!�7���J���T)���!��R�#�ͰQJe��4�9�j%&	�|�yL H��Q�Ѯ�a�c��4�_�$�������k�*�T�p�O^��t�?~�o�t����P��"Hu[�M
+Jq��)�R}Y��8�<���àD�5&��dR���p~l�(�u�����ܘ����ڥL
~��0H\4���*ɶ�դ�VK�V��
��
{I�Е�6��$q�ibG5x�&�t�xs2�x�|��H˻mT�|,��/eP��(y�9Ps������}�T��Wj�3j��H�i&�6)5�A)�Cn��Ima�1(5�fp�1f��S����hL����uP�yC(�@D�&�����"�>X�
k̨��L2{��w���-9�ƣ�5|3�7t%VF2����<����9�-dIDAT�Z
PTU>�!�$"(������"	�5�9��2�V؏�I ��!��X&����cf�SJ`����
��?�jȟ�u��:[���s߾�f���}���9���޽{α����'H���a`ݵ�͎Urʯ��mG;V0��us| hh/�'�-��<S�˜�'�W���
+:�v缇@�DO��-w����߳8����:�-���/������_?�{b�MM#L[�#�!��M|�ǣ� �Xg��_!��ZLM����ΐ8s$ɇ��������_͜y�9E���E�����X�A�<o�ΏlqŲE&$��}�P�9�]K��U��b�)K �X?d,Ev�����BH&>*�^�<XL�3>���SS��(H��&��~�)ؚ}NC2�S|���#��:���g⛫?�\�i��]�a��˂tH&���
6̥���`+!Kx%zk�Ψ�dO�=��A^��^&��Ν,� a"i����׍)�f�uC��t�sW��d�ё�f�����ln5�B�
+�t�	���,�[u1*�x5��C�D�ಈ�q�}ek1>Yc�Ĕ8~�#|5�dB�Y�����5���W�X�������%S���7����f����G���Q:��(pG
+�nC�'�p���#U�:X���������3O\����$��M�t�~�t���+O��Lk�dž{��j_��vH;.�&���ҖI�U��l*��uB*F�=�6�K��&.�I{�e���<��h�#��*���y�<>�� {9��R�h �;�O�AĻ;�@�Bұg�Vt	��}�4a�෧��1}I0xL��!*k$�D<�c��T�,�4l�<C�1h��Ё�|� �����&y���;t��mlջ�u�c�]])��H��#��n4���koݖ��ģ�g��âdž�2ؑ�ZF��©ƐY,�����yȺ�O�9�eC�����	R�����V�����b9��^���^7�^��ݴ��G���#U�0;9n���ݒܒ�G+8�w��k}o��l��*���m�ud`�t��=��X:�7Y��!B&��������
��A'�`P	�v����K���B<z��X�fv�F��!��2���rv-E����XX�����k���̍x�ܧύ���y��޹�
p���o4C��&m���vV�ң���lN6���(<S/|^H��J<z�7�!�M��(��OM���Ը�^'N�✩���;��%E�G�|ix)�~�6s@eloy��#2F��*F<����<��*�	k|Sp����CE�Goy��p��D@)�1�ڨ)N<Z��
+A�A�x���U��v���F!9�D�ܐ
��J�a�-Yg/�5�H�v0���<��<��(c*K�cBÐ؋\_�J��9)G�kJ
���b�Nͭ�ڥ�U�x�Ø���OM#������9�k�#}U��9Տ�V`1Q��^�Vw_���rO]�U]P���$��'؞����9AK>c�:���,�\�.�
+u23E<췇ar��;مʎaA7Gۮ��8�}G�������V��"�j) շi�k�&�X$�a�L��3�f��īĀJf�+�L�J�dּ��īĀJf�+�L�J�dּ�U"�/�U��<ժ�IEND�B`�
\ No newline at end of file