diff --git a/core/modules/block/src/Tests/BlockXssTest.php b/core/modules/block/src/Tests/BlockXssTest.php
index a6df297..97a4559 100644
--- a/core/modules/block/src/Tests/BlockXssTest.php
+++ b/core/modules/block/src/Tests/BlockXssTest.php
@@ -31,7 +31,7 @@ class BlockXssTest extends WebTestBase {
   /**
    * Test XSS in title.
    */
-  public function _testXSSInTitle() {
+  public function testXSSInTitle() {
     $this->drupalPlaceBlock('test_xss_title', array('label' => '<script>alert("XSS label");</script>'));
 
     \Drupal::state()->set('block_test.content', $this->randomMachineName());
diff --git a/interdiff-test-fix.txt b/interdiff-test-fix.txt
deleted file mode 100644
index 2c874ee..0000000
--- a/interdiff-test-fix.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/core/modules/block/src/Controller/BlockLibraryController.php b/core/modules/block/src/Controller/BlockLibraryController.php
-index 187fe7b..703089c 100644
---- a/core/modules/block/src/Controller/BlockLibraryController.php
-+++ b/core/modules/block/src/Controller/BlockLibraryController.php
-@@ -7,6 +7,7 @@
- 
- namespace Drupal\block\Controller;
- 
-+use Drupal\Component\Utility\SafeMarkup;
- use Drupal\Core\Block\BlockManagerInterface;
- use Drupal\Core\Controller\ControllerBase;
- use Drupal\Core\Url;
-@@ -74,7 +75,7 @@ public function listBlocks($theme = NULL) {
-         '#prefix' => '<div class="block-filter-text-source">',
-         '#suffix' => '</div>',
-       ];
--      $row['category']['data'] = $plugin_definition['category'];
-+      $row['category']['data'] = SafeMarkup::checkPlain($plugin_definition['category']);
-       $links['add'] = [
-         'title' => $this->t('Add block'),
-         'url' => Url::fromRoute('block.admin_add', ['plugin_id' => $plugin_id, 'theme' => $theme]),