diff --git a/core/lib/Drupal/Core/Cache/CacheCollector.php b/core/lib/Drupal/Core/Cache/CacheCollector.php
index 9c4a74f..b3bcb14 100644
--- a/core/lib/Drupal/Core/Cache/CacheCollector.php
+++ b/core/lib/Drupal/Core/Cache/CacheCollector.php
@@ -76,7 +76,7 @@
   protected $storage = array();
 
   /**
-   * Constructs a CacheArray object.
+   * Constructs a CacheCollector object.
    *
    * @param string $cid
    *   The cid for the array being cached.
@@ -149,7 +149,7 @@ public function delete($key) {
    * @param string $key
    *   The key that was request.
    * @param bool $persist
-   *   (ptional) Whether the offset should be persisted or not, defaults to
+   *   (optional) Whether the offset should be persisted or not, defaults to
    *   TRUE. When called with $persist = FALSE the offset will be unflagged so
    *   that it will not written at the end of the request.
    */
diff --git a/core/modules/file/tests/file_test/file_test.module b/core/modules/file/tests/file_test/file_test.module
index 1d924de..2c3467d 100644
--- a/core/modules/file/tests/file_test/file_test.module
+++ b/core/modules/file/tests/file_test/file_test.module
@@ -249,6 +249,7 @@ function file_test_set_return($op, $value) {
   $return = state()->get('file_test.return') ?: array();
   $return[$op] = $value;
   state()->set('file_test.return', $return);
+  state()->reset();
 }
 
 /**