diff --git a/core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestController.php b/core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestController.php
index 4bdf220..6c8298c 100644
--- a/core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestController.php
+++ b/core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestController.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @file
  * Contains \Drupal\config_test\ConfigTestController.
@@ -7,10 +8,10 @@
 namespace Drupal\config_test;
 
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\HttpFoundation\RedirectResponse;
 use Drupal\Core\ControllerInterface;
 use Drupal\config_test\Plugin\Core\Entity\ConfigTest;
-use Symfony\Component\HttpFoundation\RedirectResponse;
-use Drupal\Core\Entity\EntityManager;
+use Drupal\Component\Utility\String;
 
 /**
  * Route controller class for the config_test module.
@@ -18,50 +19,27 @@
 class ConfigTestController implements ControllerInterface {
 
   /**
-   * Stores the Entity manager.
-   *
-   * @var \Drupal\Core\Entity\EntityManager
-   */
-  protected $entityManager;
-
-  /**
-   * Constructs a \Drupal\config_test\ConfigTestController object.
-   *
-   * @param \Drupal\Core\Entity\EntityManager $entity_manager
-   *   The Entity manager.
-   */
-  public function __construct(EntityManager $entity_manager) {
-    $this->entityManager = $entity_manager;
-  }
-
-  /**
-   * {inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static($container->get('plugin.manager.entity'));
-  }
-
-  /**
-   * Page callback: Presents the ConfigTest edit form.
+   * Presents the ConfigTest edit form.
    *
-   * @param Drupal\config_test\Plugin\Core\Entity\ConfigTest $config_test
+   * @param \Drupal\config_test\Plugin\Core\Entity\ConfigTest $config_test
    *   The ConfigTest object to edit.
    *
    * @return array
    *   A form array as expected by drupal_render().
    */
   public function edit(ConfigTest $config_test) {
-    drupal_set_title(format_string('Edit %label', array('%label' => $config_test->label())), PASS_THROUGH);
+    drupal_set_title(String::format('Edit %label', array('%label' => $config_test->label())), PASS_THROUGH);
     return entity_get_form($config_test);
   }
 
   /**
    * Enables a ConfigTest object.
    *
-   * @param Drupal\config_test\ConfigTest $config_test
+   * @param \Drupal\config_test\ConfigTest $config_test
    *   The ConfigTest object to enable.
    *
-   * @return \Symfony\Component\HttpFoundation\RedirectResponse.
+   * @return \Symfony\Component\HttpFoundation\RedirectResponse
+   *   A redirect response to the config_test listing page.
    */
   function enable(ConfigTest $config_test) {
     $config_test->enable()->save();
@@ -71,10 +49,11 @@ function enable(ConfigTest $config_test) {
   /**
    * Disables a ConfigTest object.
    *
-   * @param Drupal\config_test\ConfigTest $config_test
+   * @param \Drupal\config_test\ConfigTest $config_test
    *   The ConfigTest object to disable.
    *
-   * @return \Symfony\Component\HttpFoundation\RedirectResponse.
+   * @return \Symfony\Component\HttpFoundation\RedirectResponse
+   *   A redirect response to the config_test listing page.
    */
   function disable(ConfigTest $config_test) {
     $config_test->disable()->save();
diff --git a/core/modules/config/tests/config_test/lib/Drupal/config_test/Form/DeleteForm.php b/core/modules/config/tests/config_test/lib/Drupal/config_test/Form/DeleteForm.php
index e69824a..8758bac 100644
--- a/core/modules/config/tests/config_test/lib/Drupal/config_test/Form/DeleteForm.php
+++ b/core/modules/config/tests/config_test/lib/Drupal/config_test/Form/DeleteForm.php
@@ -9,6 +9,9 @@
 use Drupal\Core\Form\ConfirmFormBase;
 use Drupal\config_test\Plugin\Core\Entity\ConfigTest;
 
+/**
+ * Delete confirmation form for config_test entities.
+ */
 class DeleteForm extends ConfirmFormBase {
 
   /**
@@ -50,7 +53,7 @@ public function getFormID() {
   /**
    * {@inheritdoc}
    */
-  public function buildForm(array $form, array &$form_state, ConfigTest $config_test = NULL) {
+  public function buildForm(array $form, array &$form_state, ConfigTest $config_test) {
     $this->configTest = $config_test;
 
     return parent::buildForm($form, $form_state);