diff --git a/core/core.services.yml b/core/core.services.yml
index 59532ab..444d9de 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -902,6 +902,8 @@ services:
     class: Drupal\Core\Template\TwigExtension
     tags:
       - { name: twig.extension, priority: 100 }
+    calls:
+      - [setGenerators, ['@url_generator']]
   # @todo Figure out what to do about debugging functions.
   # @see http://drupal.org/node/1804998
   twig.extension.debug:
diff --git a/core/lib/Drupal/Core/KeyValueStore/KeyValueFactory.php b/core/lib/Drupal/Core/KeyValueStore/KeyValueFactory.php
index 055eac8..5ed35cd 100644
--- a/core/lib/Drupal/Core/KeyValueStore/KeyValueFactory.php
+++ b/core/lib/Drupal/Core/KeyValueStore/KeyValueFactory.php
@@ -29,7 +29,7 @@ class KeyValueFactory implements KeyValueFactoryInterface {
    * This is a setting name that will be used if the specific setting does not
    * exist. The setting value will be the id of a service.
    */
-  const DEFAULT_SETTING = 'keyvalue_default';
+  const DEFAULT_SETTING = 'default';
 
   /**
    * The default service id.
@@ -78,8 +78,8 @@ public function get($collection) {
       if (isset($this->options[$collection])) {
         $service_id = $this->options[$collection];
       }
-      elseif (isset($this->options['default'])) {
-        $service_id = $this->options['default'];
+      elseif (isset($this->options[static::DEFAULT_SETTING])) {
+        $service_id = $this->options[static::DEFAULT_SETTING];
       }
       else {
         $service_id = static::DEFAULT_SERVICE;
diff --git a/core/modules/simpletest/src/TestBase.php b/core/modules/simpletest/src/TestBase.php
index afe1feb..f7c1c03 100644
--- a/core/modules/simpletest/src/TestBase.php
+++ b/core/modules/simpletest/src/TestBase.php
@@ -1298,6 +1298,18 @@ protected function settingsSet($name, $value) {
   }
 
   /**
+   * Changes parameters in the services.yml file.
+   *
+   * @param $name
+   *   The name of the parameter.
+   * @param $value
+   *   The value of the parameter.
+   */
+  protected function containerParameterSet($name, $value) {
+
+  }
+
+  /**
    * Generates a unique random string of ASCII characters of codes 32 to 126.
    *
    * Do not use this method when special characters are not possible (e.g., in
diff --git a/core/modules/simpletest/src/WebTestBase.php b/core/modules/simpletest/src/WebTestBase.php
index 956080a..59167f3 100644
--- a/core/modules/simpletest/src/WebTestBase.php
+++ b/core/modules/simpletest/src/WebTestBase.php
@@ -815,6 +815,7 @@ protected function setUp() {
     // Not using File API; a potential error must trigger a PHP warning.
     $directory = DRUPAL_ROOT . '/' . $this->siteDirectory;
     copy(DRUPAL_ROOT . '/sites/default/default.settings.php', $directory . '/settings.php');
+    copy(DRUPAL_ROOT . '/sites/default/default.services.yml', $directory . '/services.yml');
 
     // All file system paths are created by System module during installation.
     // @see system_requirements()
diff --git a/core/modules/system/src/Tests/KeyValueStore/DatabaseStorageExpirableTest.php b/core/modules/system/src/Tests/KeyValueStore/DatabaseStorageExpirableTest.php
index 115ad3b..b89f6a7 100644
--- a/core/modules/system/src/Tests/KeyValueStore/DatabaseStorageExpirableTest.php
+++ b/core/modules/system/src/Tests/KeyValueStore/DatabaseStorageExpirableTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\system\Tests\KeyValueStore;
 
+use Drupal\Core\KeyValueStore\KeyValueFactory;
 use Symfony\Component\DependencyInjection\Reference;
 
 /**
@@ -33,7 +34,8 @@ protected function setUp() {
       ->addArgument(new Reference('database'));
     $this->container
       ->register('serialization.phpserialize', 'Drupal\Component\Serialization\PhpSerialize');
-    $this->settingsSet('keyvalue_expirable_default', 'keyvalue.expirable.database');
+    $parameter = $this->container->getParameter('factory.keyvalue.expirable');
+    $parameter[KeyValueFactory::DEFAULT_SETTING] = 'keyvalue.expirable.database';
   }
 
   protected function tearDown() {
diff --git a/core/modules/system/src/Tests/KeyValueStore/DatabaseStorageTest.php b/core/modules/system/src/Tests/KeyValueStore/DatabaseStorageTest.php
index f3f61be..9834d1e 100644
--- a/core/modules/system/src/Tests/KeyValueStore/DatabaseStorageTest.php
+++ b/core/modules/system/src/Tests/KeyValueStore/DatabaseStorageTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\system\Tests\KeyValueStore;
 
+use Drupal\Core\KeyValueStore\KeyValueFactory;
 use Symfony\Component\DependencyInjection\Reference;
 
 /**
@@ -32,7 +33,8 @@ protected function setUp() {
       ->addArgument(new Reference('database'));
     $this->container
       ->register('serialization.phpserialize', 'Drupal\Component\Serialization\PhpSerialize');
-    $this->settingsSet('keyvalue_default', 'keyvalue.database');
+    $parameter = $this->container->getParameter('factory.keyvalue');
+    $parameter[KeyValueFactory::DEFAULT_SETTING] = 'keyvalue.database';
   }
 
   protected function tearDown() {
diff --git a/core/modules/system/src/Tests/KeyValueStore/MemoryStorageTest.php b/core/modules/system/src/Tests/KeyValueStore/MemoryStorageTest.php
index 10b2a15..981269e 100644
--- a/core/modules/system/src/Tests/KeyValueStore/MemoryStorageTest.php
+++ b/core/modules/system/src/Tests/KeyValueStore/MemoryStorageTest.php
@@ -6,6 +6,7 @@
  */
 
 namespace Drupal\system\Tests\KeyValueStore;
+use Drupal\Core\KeyValueStore\KeyValueFactory;
 
 /**
  * Tests the key-value memory storage.
@@ -25,7 +26,12 @@ protected function setUp() {
     parent::setUp();
     $this->container
       ->register('keyvalue.memory', 'Drupal\Core\KeyValueStore\KeyValueMemoryFactory');
-    $this->settingsSet('keyvalue_default', 'keyvalue.memory');
+    $parameter = array();
+    if ($this->container->getParameterBag()->has('factory.keyvalue')) {
+      $parameter = $this->container->getParameterBag()->get('factory.keyvalue');
+    }
+    $parameter[KeyValueFactory::DEFAULT_SETTING] = 'keyvalue.memory';
+    $this->container->setParameter('factory.keyvalue', $parameter);
   }
 
 }
diff --git a/core/modules/system/src/Tests/KeyValueStore/StorageTestBase.php b/core/modules/system/src/Tests/KeyValueStore/StorageTestBase.php
index 396f028..a966aa7 100644
--- a/core/modules/system/src/Tests/KeyValueStore/StorageTestBase.php
+++ b/core/modules/system/src/Tests/KeyValueStore/StorageTestBase.php
@@ -9,6 +9,7 @@
 
 use Drupal\simpletest\UnitTestBase;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Parameter;
 use Symfony\Component\DependencyInjection\Reference;
 
 /**
@@ -58,11 +59,11 @@ protected function setUp() {
     $this->container
       ->register('keyvalue', 'Drupal\Core\KeyValueStore\KeyValueFactory')
       ->addArgument(new Reference('service_container'))
-      ->addArgument(new Reference('settings'));
+      ->addArgument($this->container->getParameter('factory.keyvalue'));
     $this->container
       ->register('keyvalue.expirable', 'Drupal\Core\KeyValueStore\KeyValueExpirableFactory')
       ->addArgument(new Reference('service_container'))
-      ->addArgument(new Reference('settings'));
+      ->addArgument($this->container->getParameter('factory.keyvalue.expirable'));
     // Define two data collections,
     $this->collections = array(0 => 'zero', 1 => 'one');