diff --git a/.htaccess b/.htaccess
index 0ad7be3..5a88345 100644
--- a/.htaccess
+++ b/.htaccess
@@ -110,7 +110,7 @@ DirectoryIndex index.php index.html index.htm
   #
   # If your site is running in a VirtualDocumentRoot at http://example.com/,
   # uncomment the following line:
-  # RewriteBase /
+  RewriteBase /
 
   # Redirect common PHP files to their new locations.
   RewriteCond %{REQUEST_URI} ^(.*)?/(install.php) [OR]
diff --git a/core/modules/block/tests/src/Unit/Plugin/DisplayVariant/FullPageVariantTest.php b/core/modules/block/tests/src/Unit/Plugin/DisplayVariant/FullPageVariantTest.php
index 1cbcfe5..91c0697 100644
--- a/core/modules/block/tests/src/Unit/Plugin/DisplayVariant/FullPageVariantTest.php
+++ b/core/modules/block/tests/src/Unit/Plugin/DisplayVariant/FullPageVariantTest.php
@@ -108,12 +108,14 @@ public function testBuild() {
         ->method('access')
         ->will($this->returnValue($block_config[0]));
       $block->expects($this->any())
-        ->method('get')
-        ->will($this->returnValueMap(array(
-          array('region', $block_config[1]),
-          array('weight', $block_config[2]),
-          array('status', TRUE),
-        )));
+        ->method('getRegion')
+        ->willReturn($block_config[1]);
+      $block->expects($this->any())
+        ->method('getWeight')
+        ->willReturn($block_config[2]);
+      $block->expects($this->any())
+        ->method('status')
+        ->willReturn(TRUE);
       $blocks[$block_id] = $block;
     }