reverted:
--- b/core/modules/block/lib/Drupal/block/Tests/BlockDemonstrateRegionsTest.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\block\Tests\BlockDemonstrateRegionsTest.
- */
-
-namespace Drupal\block\Tests;
-
-use Drupal\simpletest\WebTestBase;
-
-/**
- * Tests the Demonstrate block regions functionality.
- */
-class BlockDemonstrateRegionsTest extends WebTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('block');
-
-  /**
-   * An administrative user to configure the test environment.
-   */
-  protected $adminUser;
-
-  public static function getInfo() {
-    return array(
-      'name' => 'Block Demonstrate block regions',
-      'description' => 'Tests functionality of "Demonstrate block regions".',
-      'group' => 'Block',
-    );
-  }
-
-  function setUp() {
-    parent::setUp();
-    // Create and log in an administrative user.
-    $this->adminUser = $this->drupalCreateUser(array(
-      'administer blocks',
-      'access administration pages',
-    ));
-    $this->drupalLogin($this->adminUser);
-
-    $theme = 'seven';
-    theme_enable(array($theme));
-    \Drupal::service('router.builder')->rebuild();
-    menu_router_rebuild();
-
-    // Place Help block on the page.
-    $this->drupalPlaceBlock('system_help_block');
-  }
-
-  /**
-   * Test Demonstrate block admin page exists and functions correctly.
-   */
-  function testDemonstrateSeven() {
-    $this->drupalGet('admin/structure/block/demo/seven');
-    // Visit the blocks admin ui.
-    $this->drupalGet('admin/structure/block');
-
-    $this->clickLink(t('Seven'));
-    $this->clickLink(t('Demonstrate block regions (Seven)'));
-    $this->clickLink(t('Exit block region demonstration'));
-
-    $this->assertResponse(200, 'Came back to block regions of Seven theme');
-  }
-}
only in patch2:
unchanged:
--- /dev/null
+++ b/core/modules/block/src/Tests/BlockDemonstrateRegionsTest.php
@@ -0,0 +1,68 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\block\Tests\BlockDemonstrateRegionsTest.
+ */
+
+namespace Drupal\block\Tests;
+
+use Drupal\simpletest\WebTestBase;
+
+/**
+ * Tests the Demonstrate block regions functionality.
+ */
+class BlockDemonstrateRegionsTest extends WebTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('block');
+
+  /**
+   * An administrative user to configure the test environment.
+   */
+  protected $adminUser;
+
+  public static function getInfo() {
+    return array(
+      'name' => 'Block Demonstrate block regions',
+      'description' => 'Tests functionality of "Demonstrate block regions".',
+      'group' => 'Block',
+    );
+  }
+
+  function setUp() {
+    parent::setUp();
+    // Create and log in an administrative user.
+    $this->adminUser = $this->drupalCreateUser(array(
+      'administer blocks',
+      'access administration pages',
+    ));
+    $this->drupalLogin($this->adminUser);
+
+    $theme = 'seven';
+    \Drupal::service('theme_handler')->enable(array($theme));
+    \Drupal::service('router.builder')->rebuild();
+
+    // Place Help block on the page.
+    $this->drupalPlaceBlock('system_help_block');
+  }
+
+  /**
+   * Test Demonstrate block admin page exists and functions correctly.
+   */
+  function testDemonstrateSeven() {
+    $this->drupalGet('admin/structure/block/demo/seven');
+    // Visit the blocks admin ui.
+    $this->drupalGet('admin/structure/block');
+
+    $this->clickLink(t('Seven'));
+    $this->clickLink(t('Demonstrate block regions (Seven)'));
+    $this->clickLink(t('Exit block region demonstration'));
+
+    $this->assertResponse(200, 'Came back to block regions of Seven theme');
+  }
+}