diff --git a/core/modules/simpletest/lib/Drupal/simpletest/DrupalUnitTestBase.php b/core/modules/simpletest/lib/Drupal/simpletest/DrupalUnitTestBase.php
index 1ba2fbb..318eb94 100644
--- a/core/modules/simpletest/lib/Drupal/simpletest/DrupalUnitTestBase.php
+++ b/core/modules/simpletest/lib/Drupal/simpletest/DrupalUnitTestBase.php
@@ -18,8 +18,7 @@
  * Additional modules needed in a test may be loaded and added to the fixed
  * module list.
  *
- * @see \DrupalUnitTestBase::$modules
- * @see \DrupalUnitTestBase::enableModules()
+ * @deprecated since version 8.x-dev.Use \Drupal\simpletest\KerneltestBase
  */
 abstract class DrupalUnitTestBase extends KernelTestBase {
 }
diff --git a/core/modules/simpletest/lib/Drupal/simpletest/KernelTestBase.php b/core/modules/simpletest/lib/Drupal/simpletest/KernelTestBase.php
index fe1b9bd..ae2b417 100644
--- a/core/modules/simpletest/lib/Drupal/simpletest/KernelTestBase.php
+++ b/core/modules/simpletest/lib/Drupal/simpletest/KernelTestBase.php
@@ -26,8 +26,8 @@
  * Additional modules needed in a test may be loaded and added to the fixed
  * module list.
  *
- * @see \DrupalUnitTestBase::$modules
- * @see \DrupalUnitTestBase::enableModules()
+ * @see \KernelTestBase::$modules
+ * @see \KernelTestBase::enableModules()
  */
 abstract class KernelTestBase extends UnitTestBase {
 
@@ -45,8 +45,8 @@
    * Unlike WebTestBase::setUp(), the specified modules are loaded only, but not
    * automatically installed. Modules need to be installed manually, if needed.
    *
-   * @see \DrupalUnitTestBase::enableModules()
-   * @see \DrupalUnitTestBase::setUp()
+   * @see \KernelTestBase::enableModules()
+   * @see \KernelTestBase::setUp()
    *
    * @var array
    */
@@ -72,7 +72,7 @@
   /**
    * A list of stream wrappers that have been registered for this test.
    *
-   * @see \Drupal\simpletest\DrupalUnitTestBase::registerStreamWrapper()
+   * @see \Drupal\simpletest\KernelTestBase::registerStreamWrapper()
    *
    * @var array
    */
@@ -81,7 +81,7 @@
   /**
    * {@inheritdoc}
    */
-  public function __construct($test_id = NULL) {
+  function __construct($test_id = NULL) {
     parent::__construct($test_id);
     $this->skipClasses[__CLASS__] = TRUE;
   }
@@ -216,9 +216,9 @@
    * that need to persist a DrupalKernel reboot. This method is called whenever
    * the kernel is rebuilt.
    *
-   * @see \DrupalUnitTestBase::setUp()
-   * @see \DrupalUnitTestBase::enableModules()
-   * @see \DrupalUnitTestBase::disableModules()
+   * @see \KernelTestBase::setUp()
+   * @see \KernelTestBase::enableModules()
+   * @see \KernelTestBase::disableModules()
    */
   public function containerBuild(ContainerBuilder $container) {
     // Keep the container object around for tests.
@@ -352,7 +352,7 @@
 
     // Write directly to active storage to avoid early instantiation of
     // the event dispatcher which can prevent modules from registering events.
-    $active_storage = \Drupal::service('config.storage');
+    $active_storage =  \Drupal::service('config.storage');
     $extensions = $active_storage->read('core.extension');
 
     foreach ($modules as $module) {
@@ -447,7 +447,7 @@
   /**
    * Unregisters a stream wrapper previously registered by this test.
    *
-   * DrupalUnitTestBase::tearDown() automatically cleans up all registered
+   * KernelTestBase::tearDown() automatically cleans up all registered
    * stream wrappers, so this usually does not have to be called manually.
    *
    * @param string $scheme