diff --git a/core/modules/system/tests/modules/batch_test/batch_test.routing.yml b/core/modules/system/tests/modules/batch_test/batch_test.routing.yml
index 38e279d..d955bd0 100644
--- a/core/modules/system/tests/modules/batch_test/batch_test.routing.yml
+++ b/core/modules/system/tests/modules/batch_test/batch_test.routing.yml
@@ -1,40 +1,40 @@
 batch_test_redirect:
-  pattern: 'batch-test/redirect'
+  pattern: '/batch-test/redirect'
   defaults:
     _content: '\Drupal\batch_test\Controller\BatchTestController::testRedirect'
   requirements:
     _access:  'TRUE'
 
 batch_test_large_percentage:
-  pattern: 'batch-test/large-percentage'
+  pattern: '/batch-test/large-percentage'
   defaults:
     _content: '\Drupal\batch_test\Controller\BatchTestController::testLargePercentage'
   requirements:
     _access:  'TRUE'
 
 batch_test_nested_programmatic:
-  pattern: 'batch-test/nested-programmatic/{value}'
+  pattern: '/batch-test/nested-programmatic/{value}'
   defaults:
     _content: '\Drupal\batch_test\Controller\BatchTestController::testNestedDrupalFormSubmit'
   requirements:
     _access: 'TRUE'
 
 batch_test_no_form:
-  pattern: 'batch-test/no-form'
+  pattern: '/batch-test/no-form'
   defaults:
     _content: '\Drupal\batch_test\Controller\BatchTestController::testNoForm'
   requirements:
     _access: 'TRUE'
 
 batch_test_programmatic:
-  pattern: 'batch-test/programmatic/{value}'
+  pattern: '/batch-test/programmatic/{value}'
   defaults:
     _content: '\Drupal\batch_test\Controller\BatchTestController::testProgrammatic'
   requirements:
     _access: 'TRUE'
 
 batch_test_test_theme:
-  pattern: 'admin/batch-test/test-theme'
+  pattern: '/admin/batch-test/test-theme'
   defaults:
     _content: '\Drupal\batch_test\Controller\BatchTestController::testThemeBatch'
   requirements:
diff --git a/core/modules/system/tests/modules/batch_test/lib/Drupal/batch_test/Controller/BatchTestController.php b/core/modules/system/tests/modules/batch_test/lib/Drupal/batch_test/Controller/BatchTestController.php
index 405e88d..d9a3b1d 100644
--- a/core/modules/system/tests/modules/batch_test/lib/Drupal/batch_test/Controller/BatchTestController.php
+++ b/core/modules/system/tests/modules/batch_test/lib/Drupal/batch_test/Controller/BatchTestController.php
@@ -6,23 +6,14 @@
 
 namespace Drupal\batch_test\Controller;
 
-use Drupal\Core\Controller\ControllerInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Controller routines for batch tests.
  */
-class BatchTestController implements ControllerInterface {
+class BatchTestController {
 
   /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static();
-  }
-
-  /**
-   * Menu callback: Redirects successfuly.
+   * Redirects successfuly.
    */
   public function testRedirect() {
     return array(
@@ -44,7 +35,7 @@ public function testLargePercentage() {
   }
 
   /**
-   * Menu callback: Submits a form within a batch programmatically.
+   * Submits a form within a batch programmatically.
    */
   public function testNestedDrupalFormSubmit($value = 1) {
     // Set the batch and process it.
@@ -56,7 +47,7 @@ public function testNestedDrupalFormSubmit($value = 1) {
   }
 
   /**
-   * Menu callback: Fires a batch process without a form submission.
+   * Fires a batch process without a form submission.
    */
   public function testNoForm() {
     batch_test_stack(NULL, TRUE);
@@ -67,7 +58,7 @@ public function testNoForm() {
   }
 
   /**
-   * Menu callback: Submits the 'Chained' form programmatically.
+   * Submits the 'Chained' form programmatically.
    *
    * Programmatic form: the page submits the 'Chained' form through
    * drupal_form_submit().
@@ -86,7 +77,7 @@ function testProgrammatic($value = 1) {
   }
 
   /**
-   * Menu callback: Runs a batch for testing theme used on the progress page.
+   * Runs a batch for testing theme used on the progress page.
    */
   public function testThemeBatch() {
     batch_test_stack(NULL, TRUE);