diff --git a/core/modules/views/src/Tests/DefaultViewsTest.php b/core/modules/views/src/Tests/DefaultViewsTest.php
index 43aae1f..31c34ee 100644
--- a/core/modules/views/src/Tests/DefaultViewsTest.php
+++ b/core/modules/views/src/Tests/DefaultViewsTest.php
@@ -40,13 +40,20 @@ class DefaultViewsTest extends ViewTestBase {
     'glossary' => array('all'),
   );
 
+  /**
+   * Name of a field for testing.
+   *
+   * @var string
+   */
+  protected $field_name;
+
   protected function setUp() {
     parent::setUp();
 
     // Create Basic page node type.
     $this->drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page'));
 
-    $this->vocabulary = entity_create('taxonomy_vocabulary', array(
+    $vocabulary = entity_create('taxonomy_vocabulary', array(
       'name' => $this->randomMachineName(),
       'description' => $this->randomMachineName(),
       'vid' => Unicode::strtolower($this->randomMachineName()),
@@ -55,7 +62,7 @@ protected function setUp() {
       'nodes' => array('page' => 'page'),
       'weight' => mt_rand(0, 10),
     ));
-    $this->vocabulary->save();
+    $vocabulary->save();
 
     // Create a field.
     $this->field_name = Unicode::strtolower($this->randomMachineName());
@@ -66,7 +73,7 @@ protected function setUp() {
       'settings' => array(
         'allowed_values' => array(
           array(
-            'vocabulary' => $this->vocabulary->id(),
+            'vocabulary' => $vocabulary->id(),
             'parent' => '0',
           ),
         ),
@@ -87,7 +94,7 @@ protected function setUp() {
 
     for ($i = 0; $i <= 10; $i++) {
       $user = $this->drupalCreateUser();
-      $term = $this->createTerm($this->vocabulary);
+      $term = $this->createTerm($vocabulary);
 
       $values = array('created' => $time, 'type' => 'page');
       $values[$this->field_name][]['target_id'] = $term->id();
diff --git a/core/modules/views/src/Tests/Handler/FieldUnitTest.php b/core/modules/views/src/Tests/Handler/FieldUnitTest.php
index f7bb932..5ddd05e 100644
--- a/core/modules/views/src/Tests/Handler/FieldUnitTest.php
+++ b/core/modules/views/src/Tests/Handler/FieldUnitTest.php
@@ -28,7 +28,12 @@ class FieldUnitTest extends ViewUnitTestBase {
    */
   public static $testViews = array('test_view', 'test_field_tokens', 'test_field_output');
 
-  protected $column_map = array(
+  /**
+   * Map column names.
+   *
+   * @var array
+   */
+  protected $columnMap = array(
     'views_test_data_name' => 'name',
   );
 
@@ -265,7 +270,7 @@ function _testHideIfEmpty() {
     $view->initDisplay();
     $this->executeView($view);
 
-    $column_map_reversed = array_flip($this->column_map);
+    $column_map_reversed = array_flip($this->columnMap);
     $view->row_index = 0;
     $random_name = $this->randomMachineName();
     $random_value = $this->randomMachineName();
@@ -483,7 +488,7 @@ function _testEmptyText() {
     $view->initDisplay();
     $this->executeView($view);
 
-    $column_map_reversed = array_flip($this->column_map);
+    $column_map_reversed = array_flip($this->columnMap);
     $view->row_index = 0;
 
     $empty_text = $view->field['name']->options['empty'] = $this->randomMachineName();
diff --git a/core/modules/views/src/Tests/Handler/FieldWebTest.php b/core/modules/views/src/Tests/Handler/FieldWebTest.php
index cd11a52..ceb8881 100644
--- a/core/modules/views/src/Tests/Handler/FieldWebTest.php
+++ b/core/modules/views/src/Tests/Handler/FieldWebTest.php
@@ -32,7 +32,12 @@ class FieldWebTest extends HandlerTestBase {
    */
   public static $modules = ['node'];
 
-  protected $column_map = array(
+  /**
+   * Maps between the key in the expected result and the query result.
+   *
+   * @var array
+   */
+  protected $columnMap = array(
     'views_test_data_name' => 'name',
   );
 
diff --git a/core/modules/views/src/Tests/Handler/FilterBooleanOperatorStringTest.php b/core/modules/views/src/Tests/Handler/FilterBooleanOperatorStringTest.php
index 1d6f4c8..b82b240 100644
--- a/core/modules/views/src/Tests/Handler/FilterBooleanOperatorStringTest.php
+++ b/core/modules/views/src/Tests/Handler/FilterBooleanOperatorStringTest.php
@@ -33,7 +33,12 @@ class FilterBooleanOperatorStringTest extends ViewUnitTestBase {
    */
   public static $testViews = array('test_view');
 
-  protected $column_map = array(
+  /**
+   * Map column names.
+   *
+   * @var array
+   */
+  protected $columnMap = array(
     'views_test_data_id' => 'id',
   );
 
@@ -117,7 +122,7 @@ public function testFilterBooleanOperatorString() {
     );
 
     $this->assertEqual(2, count($view->result));
-    $this->assertIdenticalResultset($view, $expected_result, $this->column_map);
+    $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
 
     $view->destroy();
     $view->setDisplay();
@@ -140,7 +145,7 @@ public function testFilterBooleanOperatorString() {
     );
 
     $this->assertEqual(3, count($view->result));
-    $this->assertIdenticalResultset($view, $expected_result, $this->column_map);
+    $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
   }
 
   /**
@@ -163,7 +168,7 @@ public function testFilterGroupedExposed() {
     );
 
     $this->assertEqual(3, count($view->result));
-    $this->assertIdenticalResultset($view, $expected_result, $this->column_map);
+    $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
     $view->destroy();
 
     $view->setExposedInput(array('status' => 2));
@@ -178,7 +183,7 @@ public function testFilterGroupedExposed() {
     );
 
     $this->assertEqual(2, count($view->result));
-    $this->assertIdenticalResultset($view, $expected_result, $this->column_map);
+    $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
   }
 
   /**
diff --git a/core/modules/views/src/Tests/Handler/FilterBooleanOperatorTest.php b/core/modules/views/src/Tests/Handler/FilterBooleanOperatorTest.php
index f999886..fc43f50 100644
--- a/core/modules/views/src/Tests/Handler/FilterBooleanOperatorTest.php
+++ b/core/modules/views/src/Tests/Handler/FilterBooleanOperatorTest.php
@@ -32,7 +32,12 @@ class FilterBooleanOperatorTest extends ViewUnitTestBase {
    */
   public static $testViews = array('test_view');
 
-  protected $column_map = array(
+  /**
+   * Map column names.
+   *
+   * @var array
+   */
+  protected $columnMap = array(
     'views_test_data_id' => 'id',
   );
 
@@ -66,7 +71,7 @@ public function testFilterBooleanOperator() {
     );
 
     $this->assertEqual(2, count($view->result));
-    $this->assertIdenticalResultset($view, $expected_result, $this->column_map);
+    $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
 
     $view->destroy();
     $view->setDisplay();
@@ -89,7 +94,7 @@ public function testFilterBooleanOperator() {
     );
 
     $this->assertEqual(3, count($view->result));
-    $this->assertIdenticalResultset($view, $expected_result, $this->column_map);
+    $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
   }
 
   /**
@@ -112,7 +117,7 @@ public function testFilterGroupedExposed() {
     );
 
     $this->assertEqual(3, count($view->result));
-    $this->assertIdenticalResultset($view, $expected_result, $this->column_map);
+    $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
     $view->destroy();
 
     $view->setExposedInput(array('status' => 2));
@@ -127,7 +132,7 @@ public function testFilterGroupedExposed() {
     );
 
     $this->assertEqual(2, count($view->result));
-    $this->assertIdenticalResultset($view, $expected_result, $this->column_map);
+    $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
   }
 
   /**
diff --git a/core/modules/views/src/Tests/Handler/FilterCombineTest.php b/core/modules/views/src/Tests/Handler/FilterCombineTest.php
index 516c773..be54946 100644
--- a/core/modules/views/src/Tests/Handler/FilterCombineTest.php
+++ b/core/modules/views/src/Tests/Handler/FilterCombineTest.php
@@ -24,7 +24,12 @@ class FilterCombineTest extends ViewUnitTestBase {
    */
   public static $testViews = array('test_view');
 
-  protected $column_map = array(
+  /**
+   * Map column names.
+   *
+   * @var array
+   */
+  protected $columnMap = array(
     'views_test_data_name' => 'name',
     'views_test_data_job' => 'job',
   );
@@ -78,7 +83,7 @@ public function testFilterCombineContains() {
         'job' => NULL,
       ),
     );
-    $this->assertIdenticalResultset($view, $resultset, $this->column_map);
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
   /**
diff --git a/core/modules/views/src/Tests/Handler/FilterEqualityTest.php b/core/modules/views/src/Tests/Handler/FilterEqualityTest.php
index 2a59e9f..0af387f 100644
--- a/core/modules/views/src/Tests/Handler/FilterEqualityTest.php
+++ b/core/modules/views/src/Tests/Handler/FilterEqualityTest.php
@@ -26,7 +26,12 @@ class FilterEqualityTest extends ViewUnitTestBase {
    */
   public static $testViews = array('test_view');
 
-  protected $column_map = array(
+  /**
+   * Map column names.
+   *
+   * @var array
+   */
+  protected $columnMap = array(
     'views_test_data_name' => 'name',
   );
 
@@ -64,7 +69,7 @@ function testEqual() {
         'name' => 'Ringo',
       ),
     );
-    $this->assertIdenticalResultset($view, $resultset, $this->column_map);
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
   public function testEqualGroupedExposed() {
@@ -83,7 +88,7 @@ public function testEqualGroupedExposed() {
         'name' => 'Ringo',
       ),
     );
-    $this->assertIdenticalResultset($view, $resultset, $this->column_map);
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
   function testNotEqual() {
@@ -117,7 +122,7 @@ function testNotEqual() {
         'name' => 'Meredith',
       ),
     );
-    $this->assertIdenticalResultset($view, $resultset, $this->column_map);
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
   public function testEqualGroupedNotExposed() {
@@ -145,7 +150,7 @@ public function testEqualGroupedNotExposed() {
         'name' => 'Meredith',
       ),
     );
-    $this->assertIdenticalResultset($view, $resultset, $this->column_map);
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
 
diff --git a/core/modules/views/src/Tests/Handler/FilterInOperatorTest.php b/core/modules/views/src/Tests/Handler/FilterInOperatorTest.php
index 39ea116..89e471c 100644
--- a/core/modules/views/src/Tests/Handler/FilterInOperatorTest.php
+++ b/core/modules/views/src/Tests/Handler/FilterInOperatorTest.php
@@ -26,7 +26,12 @@ class FilterInOperatorTest extends ViewUnitTestBase {
    */
   public static $testViews = array('test_view');
 
-  protected $column_map = array(
+  /**
+   * Map column names.
+   *
+   * @var array
+   */
+  protected $columnMap = array(
     'views_test_data_name' => 'name',
     'views_test_data_age' => 'age',
   );
@@ -72,7 +77,7 @@ public function testFilterInOperatorSimple() {
     );
 
     $this->assertEqual(2, count($view->result));
-    $this->assertIdenticalResultset($view, $expected_result, $this->column_map);
+    $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
 
     $view->destroy();
     $view->setDisplay();
@@ -106,7 +111,7 @@ public function testFilterInOperatorSimple() {
     );
 
     $this->assertEqual(3, count($view->result));
-    $this->assertIdenticalResultset($view, $expected_result, $this->column_map);
+    $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
   }
 
   public function testFilterInOperatorGroupedExposedSimple() {
@@ -132,7 +137,7 @@ public function testFilterInOperatorGroupedExposedSimple() {
     );
 
     $this->assertEqual(2, count($view->result));
-    $this->assertIdenticalResultset($view, $expected_result, $this->column_map);
+    $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
   }
 
   public function testFilterNotInOperatorGroupedExposedSimple() {
@@ -162,7 +167,7 @@ public function testFilterNotInOperatorGroupedExposedSimple() {
     );
 
     $this->assertEqual(3, count($view->result));
-    $this->assertIdenticalResultset($view, $expected_result, $this->column_map);
+    $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
   }
 
   protected function getGroupedExposedFilters() {
diff --git a/core/modules/views/src/Tests/Handler/FilterNumericTest.php b/core/modules/views/src/Tests/Handler/FilterNumericTest.php
index 9277da5..21115d3 100644
--- a/core/modules/views/src/Tests/Handler/FilterNumericTest.php
+++ b/core/modules/views/src/Tests/Handler/FilterNumericTest.php
@@ -26,7 +26,12 @@ class FilterNumericTest extends ViewUnitTestBase {
    */
   public static $testViews = array('test_view');
 
-  protected $column_map = array(
+  /**
+   * Map column names.
+   *
+   * @var array
+   */
+  protected $columnMap = array(
     'views_test_data_name' => 'name',
     'views_test_data_age' => 'age',
   );
@@ -68,7 +73,7 @@ public function testFilterNumericSimple() {
         'age' => 28,
       ),
     );
-    $this->assertIdenticalResultset($view, $resultset, $this->column_map);
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
   public function testFilterNumericExposedGroupedSimple() {
@@ -88,7 +93,7 @@ public function testFilterNumericExposedGroupedSimple() {
         'age' => 28,
       ),
     );
-    $this->assertIdenticalResultset($view, $resultset, $this->column_map);
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
   public function testFilterNumericBetween() {
@@ -125,7 +130,7 @@ public function testFilterNumericBetween() {
         'age' => 26,
       ),
     );
-    $this->assertIdenticalResultset($view, $resultset, $this->column_map);
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
 
     // test not between
     $view->destroy();
@@ -161,7 +166,7 @@ public function testFilterNumericBetween() {
         'age' => 30,
       ),
     );
-    $this->assertIdenticalResultset($view, $resultset, $this->column_map);
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
   public function testFilterNumericExposedGroupedBetween() {
@@ -189,7 +194,7 @@ public function testFilterNumericExposedGroupedBetween() {
         'age' => 26,
       ),
     );
-    $this->assertIdenticalResultset($view, $resultset, $this->column_map);
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
   public function testFilterNumericExposedGroupedNotBetween() {
@@ -217,7 +222,7 @@ public function testFilterNumericExposedGroupedNotBetween() {
         'age' => 30,
       ),
     );
-    $this->assertIdenticalResultset($view, $resultset, $this->column_map);
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
   public function testFilterNumericEmpty() {
@@ -238,7 +243,7 @@ public function testFilterNumericEmpty() {
     $this->executeView($view);
     $resultset = array(
     );
-    $this->assertIdenticalResultset($view, $resultset, $this->column_map);
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
 
     $view->destroy();
     $view->setDisplay();
@@ -277,7 +282,7 @@ public function testFilterNumericEmpty() {
         'age' => 30,
       ),
     );
-    $this->assertIdenticalResultset($view, $resultset, $this->column_map);
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
   public function testFilterNumericExposedGroupedEmpty() {
@@ -293,7 +298,7 @@ public function testFilterNumericExposedGroupedEmpty() {
     $this->executeView($view);
     $resultset = array(
     );
-    $this->assertIdenticalResultset($view, $resultset, $this->column_map);
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
   public function testFilterNumericExposedGroupedNotEmpty() {
@@ -329,7 +334,7 @@ public function testFilterNumericExposedGroupedNotEmpty() {
         'age' => 30,
       ),
     );
-    $this->assertIdenticalResultset($view, $resultset, $this->column_map);
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
   public function testAllowEmpty() {
diff --git a/core/modules/views/src/Tests/Handler/FilterStringTest.php b/core/modules/views/src/Tests/Handler/FilterStringTest.php
index baa3489..0c7844f 100644
--- a/core/modules/views/src/Tests/Handler/FilterStringTest.php
+++ b/core/modules/views/src/Tests/Handler/FilterStringTest.php
@@ -26,7 +26,12 @@ class FilterStringTest extends ViewUnitTestBase {
    */
   public static $testViews = array('test_view');
 
-  protected $column_map = array(
+  /**
+   * Map column names.
+   *
+   * @var array
+   */
+  protected $columnMap = array(
     'views_test_data_name' => 'name',
   );
 
@@ -109,7 +114,7 @@ function testFilterStringEqual() {
         'name' => 'Ringo',
       ),
     );
-    $this->assertIdenticalResultset($view, $resultset, $this->column_map);
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
   function testFilterStringGroupedExposedEqual() {
@@ -129,7 +134,7 @@ function testFilterStringGroupedExposedEqual() {
       ),
     );
 
-    $this->assertIdenticalResultset($view, $resultset, $this->column_map);
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
   function testFilterStringNotEqual() {
@@ -163,7 +168,7 @@ function testFilterStringNotEqual() {
         'name' => 'Meredith',
       ),
     );
-    $this->assertIdenticalResultset($view, $resultset, $this->column_map);
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
   function testFilterStringGroupedExposedNotEqual() {
@@ -193,7 +198,7 @@ function testFilterStringGroupedExposedNotEqual() {
       ),
     );
 
-    $this->assertIdenticalResultset($view, $resultset, $this->column_map);
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
   function testFilterStringContains() {
@@ -218,7 +223,7 @@ function testFilterStringContains() {
         'name' => 'Ringo',
       ),
     );
-    $this->assertIdenticalResultset($view, $resultset, $this->column_map);
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
 
@@ -239,7 +244,7 @@ function testFilterStringGroupedExposedContains() {
       ),
     );
 
-    $this->assertIdenticalResultset($view, $resultset, $this->column_map);
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
 
@@ -268,7 +273,7 @@ function testFilterStringWord() {
         'name' => 'Ringo',
       ),
     );
-    $this->assertIdenticalResultset($view, $resultset, $this->column_map);
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
     $view->destroy();
 
     $view = Views::getView('test_view');
@@ -292,7 +297,7 @@ function testFilterStringWord() {
         'name' => 'Ringo',
       ),
     );
-    $this->assertIdenticalResultset($view, $resultset, $this->column_map);
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
 
@@ -313,7 +318,7 @@ function testFilterStringGroupedExposedWord() {
       ),
     );
 
-    $this->assertIdenticalResultset($view, $resultset, $this->column_map);
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
     $view->destroy();
 
     $filters = $this->getGroupedExposedFilters();
@@ -333,7 +338,7 @@ function testFilterStringGroupedExposedWord() {
         'name' => 'Ringo',
       ),
     );
-    $this->assertIdenticalResultset($view, $resultset, $this->column_map);
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
   function testFilterStringStarts() {
@@ -358,7 +363,7 @@ function testFilterStringStarts() {
         'name' => 'George',
       ),
     );
-    $this->assertIdenticalResultset($view, $resultset, $this->column_map);
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
   function testFilterStringGroupedExposedStarts() {
@@ -377,7 +382,7 @@ function testFilterStringGroupedExposedStarts() {
         'name' => 'George',
       ),
     );
-    $this->assertIdenticalResultset($view, $resultset, $this->column_map);
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
   function testFilterStringNotStarts() {
@@ -409,7 +414,7 @@ function testFilterStringNotStarts() {
       ),
       // There is no Meredith returned because his description is empty
     );
-    $this->assertIdenticalResultset($view, $resultset, $this->column_map);
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
   function testFilterStringGroupedExposedNotStarts() {
@@ -435,7 +440,7 @@ function testFilterStringGroupedExposedNotStarts() {
       ),
       // There is no Meredith returned because his description is empty
     );
-    $this->assertIdenticalResultset($view, $resultset, $this->column_map);
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
   function testFilterStringEnds() {
@@ -463,7 +468,7 @@ function testFilterStringEnds() {
         'name' => 'Ringo',
       ),
     );
-    $this->assertIdenticalResultset($view, $resultset, $this->column_map);
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
   function testFilterStringGroupedExposedEnds() {
@@ -485,7 +490,7 @@ function testFilterStringGroupedExposedEnds() {
         'name' => 'Ringo',
       ),
     );
-    $this->assertIdenticalResultset($view, $resultset, $this->column_map);
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
   function testFilterStringNotEnds() {
@@ -514,7 +519,7 @@ function testFilterStringNotEnds() {
       ),
       // There is no Meredith returned because his description is empty
     );
-    $this->assertIdenticalResultset($view, $resultset, $this->column_map);
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
   function testFilterStringGroupedExposedNotEnds() {
@@ -537,7 +542,7 @@ function testFilterStringGroupedExposedNotEnds() {
       ),
       // There is no Meredith returned because his description is empty
     );
-    $this->assertIdenticalResultset($view, $resultset, $this->column_map);
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
   function testFilterStringNot() {
@@ -566,7 +571,7 @@ function testFilterStringNot() {
       ),
       // There is no Meredith returned because his description is empty
     );
-    $this->assertIdenticalResultset($view, $resultset, $this->column_map);
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
 
@@ -590,7 +595,7 @@ function testFilterStringGroupedExposedNot() {
       ),
       // There is no Meredith returned because his description is empty
     );
-    $this->assertIdenticalResultset($view, $resultset, $this->column_map);
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
 
   }
 
@@ -619,7 +624,7 @@ function testFilterStringShorter() {
         'name' => 'Paul',
       ),
     );
-    $this->assertIdenticalResultset($view, $resultset, $this->column_map);
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
   function testFilterStringGroupedExposedShorter() {
@@ -640,7 +645,7 @@ function testFilterStringGroupedExposedShorter() {
         'name' => 'Paul',
       ),
     );
-    $this->assertIdenticalResultset($view, $resultset, $this->column_map);
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
   function testFilterStringLonger() {
@@ -665,7 +670,7 @@ function testFilterStringLonger() {
         'name' => 'Meredith',
       ),
     );
-    $this->assertIdenticalResultset($view, $resultset, $this->column_map);
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
   function testFilterStringGroupedExposedLonger() {
@@ -683,7 +688,7 @@ function testFilterStringGroupedExposedLonger() {
         'name' => 'Meredith',
       ),
     );
-    $this->assertIdenticalResultset($view, $resultset, $this->column_map);
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
 
@@ -708,7 +713,7 @@ function testFilterStringEmpty() {
         'name' => 'Meredith',
       ),
     );
-    $this->assertIdenticalResultset($view, $resultset, $this->column_map);
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
   function testFilterStringGroupedExposedEmpty() {
@@ -726,7 +731,7 @@ function testFilterStringGroupedExposedEmpty() {
         'name' => 'Meredith',
       ),
     );
-    $this->assertIdenticalResultset($view, $resultset, $this->column_map);
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
   protected function getGroupedExposedFilters() {
diff --git a/core/modules/views/src/Tests/Plugin/AccessTest.php b/core/modules/views/src/Tests/Plugin/AccessTest.php
index 0bdec9e..4bc77db 100644
--- a/core/modules/views/src/Tests/Plugin/AccessTest.php
+++ b/core/modules/views/src/Tests/Plugin/AccessTest.php
@@ -33,6 +33,20 @@ class AccessTest extends PluginTestBase {
    */
   public static $modules = array('node');
 
+  /**
+   * Web user for testing.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $webUser;
+
+  /**
+   * Normal user for testing.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $normalUser;
+
   protected function setUp() {
     parent::setUp();
 
@@ -40,13 +54,11 @@ protected function setUp() {
 
     ViewTestData::createTestViews(get_class($this), array('views_test_data'));
 
-    $this->web_user = $this->drupalCreateUser();
-    $roles = $this->web_user->getRoles();
-    $this->web_role = $roles[0];
+    $this->webUser = $this->drupalCreateUser();
 
-    $this->normal_role = $this->drupalCreateRole(array());
-    $this->normal_user = $this->drupalCreateUser(array('views_test_data test permission'));
-    $this->normal_user->addRole($this->normal_role);
+    $normal_role = $this->drupalCreateRole(array());
+    $this->normalUser = $this->drupalCreateUser(array('views_test_data test permission'));
+    $this->normalUser->addRole($normal_role);
     // @todo when all the plugin information is cached make a reset function and
     // call it here.
   }
@@ -58,8 +70,8 @@ function testAccessNone() {
     $view = Views::getView('test_access_none');
     $view->setDisplay();
 
-    $this->assertTrue($view->display_handler->access($this->web_user));
-    $this->assertTrue($view->display_handler->access($this->normal_user));
+    $this->assertTrue($view->display_handler->access($this->webUser));
+    $this->assertTrue($view->display_handler->access($this->normalUser));
   }
 
   /**
@@ -77,7 +89,7 @@ function testStaticAccessPlugin() {
 
     $access_plugin = $view->display_handler->getPlugin('access');
 
-    $this->assertFalse($access_plugin->access($this->normal_user));
+    $this->assertFalse($access_plugin->access($this->normalUser));
     $this->drupalGet('test_access_static');
     $this->assertResponse(403);
 
@@ -89,7 +101,7 @@ function testStaticAccessPlugin() {
     // termination event fires. Simulate that here.
     $this->container->get('router.builder')->rebuildIfNeeded();
 
-    $this->assertTrue($access_plugin->access($this->normal_user));
+    $this->assertTrue($access_plugin->access($this->normalUser));
 
     $this->drupalGet('test_access_static');
     $this->assertResponse(200);
diff --git a/core/modules/views/src/Tests/Plugin/RelationshipJoinTestBase.php b/core/modules/views/src/Tests/Plugin/RelationshipJoinTestBase.php
index 9f45e8d..85bc3d0 100644
--- a/core/modules/views/src/Tests/Plugin/RelationshipJoinTestBase.php
+++ b/core/modules/views/src/Tests/Plugin/RelationshipJoinTestBase.php
@@ -25,7 +25,7 @@
   public static $modules = array('system', 'user', 'field');
 
   /**
-   * @var \Drupal\user\Entity\User
+   * @var \Drupal\user\UserInterface
    */
   protected $root_user;
 
diff --git a/core/modules/views/src/Tests/ViewStorageTest.php b/core/modules/views/src/Tests/ViewStorageTest.php
index 4fbbd90..d952375 100644
--- a/core/modules/views/src/Tests/ViewStorageTest.php
+++ b/core/modules/views/src/Tests/ViewStorageTest.php
@@ -29,7 +29,7 @@ class ViewStorageTest extends ViewUnitTestBase {
    *
    * @var array
    */
-  protected $config_properties = array(
+  protected $configProperties = array(
     'status',
     'module',
     'id',
@@ -92,7 +92,7 @@ protected function loadTests() {
     // Confirm that an actual view object is loaded and that it returns all of
     // expected properties.
     $this->assertTrue($view instanceof View, 'Single View instance loaded.');
-    foreach ($this->config_properties as $property) {
+    foreach ($this->configProperties as $property) {
       $this->assertTrue($view->get($property) !== NULL, format_string('Property: @property loaded onto View.', array('@property' => $property)));
     }
 
@@ -127,7 +127,7 @@ protected function createTests() {
 
     $this->assertTrue($created instanceof View, 'Created object is a View.');
     // Check that the View contains all of the properties.
-    foreach ($this->config_properties as $property) {
+    foreach ($this->configProperties as $property) {
       $this->assertTrue(property_exists($created, $property), format_string('Property: @property created on View.', array('@property' => $property)));
     }
 
@@ -139,7 +139,7 @@ protected function createTests() {
 
     $this->assertTrue($created instanceof View, 'Created object is a View.');
     // Check that the View contains all of the properties.
-    $properties = $this->config_properties;
+    $properties = $this->configProperties;
     // Remove display from list.
     array_pop($properties);
 
diff --git a/core/modules/views/src/Tests/Wizard/TaggedWithTest.php b/core/modules/views/src/Tests/Wizard/TaggedWithTest.php
index cf7f380..e44fe59 100644
--- a/core/modules/views/src/Tests/Wizard/TaggedWithTest.php
+++ b/core/modules/views/src/Tests/Wizard/TaggedWithTest.php
@@ -23,70 +23,102 @@ class TaggedWithTest extends WizardTestBase {
    */
   public static $modules = array('taxonomy');
 
-  protected $node_type_with_tags;
+  /**
+   * Node type with an autocomplete tagging field.
+   *
+   * @var \Drupal\node\NodeTypeInterface
+   */
+  protected $nodeTypeWithTags;
+
+  /**
+   * Node type without an autocomplete tagging field.
+   *
+   * @var \Drupal\node\NodeTypeInterface
+   */
+  protected $nodeTypeWithoutTags;
 
-  protected $node_type_without_tags;
+  /**
+   * Node type without an autocomplete tagging field.
+   *
+   * @var \Drupal\taxonomy\VocabularyInterface
+   */
+  protected $tagVocabulary;
 
-  protected $tag_vocabulary;
+  /**
+   * Node type without an autocomplete tagging field.
+   *
+   * @var \Drupal\field\FieldStorageConfigInterface
+   */
+  protected $tagFieldStorage;
 
-  protected $tag_field_storage;
+  /**
+   * Name of the test tag field.
+   *
+   * @var string
+   */
+  protected $tagFieldName;
 
-  protected $tag_field;
+  /**
+   * Field definition for the test tag field.
+   *
+   * @var array
+   */
+  protected $tagField;
 
   protected function setUp() {
     parent::setUp();
 
     // Create two content types. One will have an autocomplete tagging field,
     // and one won't.
-    $this->node_type_with_tags = $this->drupalCreateContentType();
-    $this->node_type_without_tags = $this->drupalCreateContentType();
+    $this->nodeTypeWithTags = $this->drupalCreateContentType();
+    $this->nodeTypeWithoutTags = $this->drupalCreateContentType();
 
     // Create the vocabulary for the tag field.
-    $this->tag_vocabulary = entity_create('taxonomy_vocabulary',  array(
+    $this->tagVocabulary = entity_create('taxonomy_vocabulary',  array(
       'name' => 'Views testing tags',
       'vid' => 'views_testing_tags',
     ));
-    $this->tag_vocabulary->save();
+    $this->tagVocabulary->save();
 
     // Create the tag field itself.
-    $this->tag_field_name = 'field_views_testing_tags';
-    $this->tag_field_storage = entity_create('field_storage_config', array(
-      'field_name' => $this->tag_field_name,
+    $this->tagFieldName = 'field_views_testing_tags';
+    $this->tagFieldStorage = entity_create('field_storage_config', array(
+      'field_name' => $this->tagFieldName,
       'entity_type' => 'node',
       'type' => 'taxonomy_term_reference',
       'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
       'settings' => array(
         'allowed_values' => array(
           array(
-            'vocabulary' => $this->tag_vocabulary->id(),
+            'vocabulary' => $this->tagVocabulary->id(),
             'parent' => 0,
           ),
         ),
       ),
     ));
-    $this->tag_field_storage->save();
+    $this->tagFieldStorage->save();
 
     // Create an instance of the tag field on one of the content types, and
     // configure it to display an autocomplete widget.
-    $this->tag_field = array(
-      'field_storage' => $this->tag_field_storage,
-      'bundle' => $this->node_type_with_tags->id(),
+    $this->tagField = array(
+      'field_storage' => $this->tagFieldStorage,
+      'bundle' => $this->nodeTypeWithTags->id(),
     );
-    entity_create('field_config', $this->tag_field)->save();
+    entity_create('field_config', $this->tagField)->save();
 
-    entity_get_form_display('node', $this->node_type_with_tags->id(), 'default')
+    entity_get_form_display('node', $this->nodeTypeWithTags->id(), 'default')
       ->setComponent('field_views_testing_tags', array(
         'type' => 'taxonomy_autocomplete',
       ))
       ->save();
 
-    entity_get_display('node', $this->node_type_with_tags->id(), 'default')
+    entity_get_display('node', $this->nodeTypeWithTags->id(), 'default')
       ->setComponent('field_views_testing_tags', array(
         'type' => 'taxonomy_term_reference_link',
         'weight' => 10,
       ))
       ->save();
-    entity_get_display('node', $this->node_type_with_tags->id(), 'teaser')
+    entity_get_display('node', $this->nodeTypeWithTags->id(), 'teaser')
       ->setComponent('field_views_testing_tags', array(
         'type' => 'taxonomy_term_reference_link',
         'weight' => 10,
@@ -100,16 +132,16 @@ protected function setUp() {
   function testTaggedWith() {
     // In this test we will only create nodes that have an instance of the tag
     // field.
-    $node_add_path = 'node/add/' . $this->node_type_with_tags->id();
+    $node_add_path = 'node/add/' . $this->nodeTypeWithTags->id();
 
     // Create three nodes, with different tags.
     $edit = array();
     $edit['title[0][value]'] = $node_tag1_title = $this->randomMachineName();
-    $edit[$this->tag_field_name] = 'tag1';
+    $edit[$this->tagFieldName] = 'tag1';
     $this->drupalPostForm($node_add_path, $edit, t('Save'));
     $edit = array();
     $edit['title[0][value]'] = $node_tag1_tag2_title = $this->randomMachineName();
-    $edit[$this->tag_field_name] = 'tag1, tag2';
+    $edit[$this->tagFieldName] = 'tag1, tag2';
     $this->drupalPostForm($node_add_path, $edit, t('Save'));
     $edit = array();
     $edit['title[0][value]'] = $node_no_tags_title = $this->randomMachineName();
@@ -120,7 +152,7 @@ function testTaggedWith() {
     $view1 = array();
     // First select the node type and update the form so the correct tag field
     // is used.
-    $view1['show[type]'] = $this->node_type_with_tags->id();
+    $view1['show[type]'] = $this->nodeTypeWithTags->id();
     $this->drupalPostForm('admin/structure/views/add', $view1, t('Update "of type" choice'));
     // Now resubmit the entire form to the same URL.
     $view1['label'] = $this->randomMachineName(16);
@@ -142,7 +174,7 @@ function testTaggedWith() {
     // Create a view that filters by taxonomy term "tag2". It should show only
     // the one node from above that is tagged with "tag2".
     $view2 = array();
-    $view2['show[type]'] = $this->node_type_with_tags->id();
+    $view2['show[type]'] = $this->nodeTypeWithTags->id();
     $this->drupalPostForm('admin/structure/views/add', $view2, t('Update "of type" choice'));
     $this->assertResponse(200);
     $view2['label'] = $this->randomMachineName(16);
@@ -172,28 +204,28 @@ function testTaggedWithByNodeType() {
     $tags_xpath = '//input[@name="show[tagged_with]"]';
     $this->drupalGet('admin/structure/views/add');
     $this->assertFieldByXpath($tags_xpath);
-    $view['show[type]'] = $this->node_type_with_tags->id();
+    $view['show[type]'] = $this->nodeTypeWithTags->id();
     $this->drupalPostForm('admin/structure/views/add', $view, t('Update "of type" choice'));
     $this->assertFieldByXpath($tags_xpath);
-    $view['show[type]'] = $this->node_type_without_tags->id();
+    $view['show[type]'] = $this->nodeTypeWithoutTags->id();
     $this->drupalPostForm(NULL, $view, t('Update "of type" choice'));
     $this->assertNoFieldByXpath($tags_xpath);
 
     // If we add an instance of the tagging field to the second node type, the
     // "tagged with" form element should not appear for it too.
-    $field = $this->tag_field;
-    $field['bundle'] = $this->node_type_without_tags->id();
+    $field = $this->tagField;
+    $field['bundle'] = $this->nodeTypeWithoutTags->id();
     entity_create('field_config', $field)->save();
-    entity_get_form_display('node', $this->node_type_without_tags->id(), 'default')
+    entity_get_form_display('node', $this->nodeTypeWithoutTags->id(), 'default')
       ->setComponent('field_views_testing_tags', array(
         'type' => 'taxonomy_autocomplete',
       ))
       ->save();
 
-    $view['show[type]'] = $this->node_type_with_tags->id();
+    $view['show[type]'] = $this->nodeTypeWithTags->id();
     $this->drupalPostForm('admin/structure/views/add', $view, t('Update "of type" choice'));
     $this->assertFieldByXpath($tags_xpath);
-    $view['show[type]'] = $this->node_type_without_tags->id();
+    $view['show[type]'] = $this->nodeTypeWithoutTags->id();
     $this->drupalPostForm(NULL, $view, t('Update "of type" choice'));
     $this->assertFieldByXpath($tags_xpath);
   }