diff --git a/core/modules/views/tests/Drupal/views/Tests/Controller/ViewAjaxControllerTest.php b/core/modules/views/tests/Drupal/views/Tests/Controller/ViewAjaxControllerTest.php
index 3b08a92..14bb3c3 100644
--- a/core/modules/views/tests/Drupal/views/Tests/Controller/ViewAjaxControllerTest.php
+++ b/core/modules/views/tests/Drupal/views/Tests/Controller/ViewAjaxControllerTest.php
@@ -12,7 +12,8 @@
 use Drupal\views\Controller\ViewAjaxController;
 use Symfony\Component\HttpFoundation\Request;
 
-// @todo Remove this once the constant has been converted.
+// @todo Remove this once the constant has been converted, see
+//   https://drupal.org/node/2067017.
 if (!defined('DRUPAL_CORE_COMPATIBILITY')) {
   define('DRUPAL_CORE_COMPATIBILITY', '8.x');
 }
@@ -144,7 +145,7 @@ public function testAjaxView() {
   }
 
   /**
-   * Setups a bunch of valid mocks like the view entity and executable.
+   * Sets up a bunch of valid mocks like the view entity and executable.
    */
   protected function setupValidMocks() {
     $view = $this->getMockBuilder('Drupal\views\Entity\View')
@@ -179,13 +180,14 @@ protected function setupValidMocks() {
 }
 
 namespace {
-  // @todo Remove once drupal_static got converted to something else.
+  // @todo Remove once drupal_render got converted to a autoloadable code.
   if (!function_exists('drupal_static')) {
     function drupal_static($key) {
       return $key;
     }
   }
 
+  // @todo Remove once drupal_render got converted to a autoloadable code.
   if (!function_exists('drupal_render')) {
     function drupal_render($array) {
       return isset($array['#markup']) ? $array['#markup'] : (string) $array;