diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
index 7d26611..69ffbe6 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
@@ -286,7 +286,7 @@ public function __sleep() {
    * Implements the magic __wakeup() method.
    */
   public function __wakeup() {
-    // PHPUnit uses unserilalize() on a made up string as a trick when bypassing
+    // PHPUnit uses unserialize() on a made up string as a trick when bypassing
     // the contructor on mock object creation. Make sure we only run on objects
     // that have been serialized through our __sleep() method.
     if (isset($this->entityTypeId)) {
diff --git a/core/modules/editor/lib/Drupal/editor/Tests/EditorAdminTest.php b/core/modules/editor/lib/Drupal/editor/Tests/EditorAdminTest.php
index 177e050..bdeeed0 100644
--- a/core/modules/editor/lib/Drupal/editor/Tests/EditorAdminTest.php
+++ b/core/modules/editor/lib/Drupal/editor/Tests/EditorAdminTest.php
@@ -95,9 +95,11 @@ public function testAddEditorToNewFormat() {
       'name' => 'Monocerus',
       'format' => 'monocerus',
     );
-    $edit += $this->selectUnicornEditor();
     $this->drupalPostForm(NULL, $edit, t('Save configuration'));
-    $this->verifyUnicornEditorConfiguration($edit['format']);
+    $this->drupalGet('admin/config/content/formats/manage/monocerus');
+    $edit = $this->selectUnicornEditor();
+    $this->drupalPostForm(NULL, $edit, t('Save configuration'));
+    $this->verifyUnicornEditorConfiguration('monocerus');
   }
 
   /**