diff --git a/core/modules/config/src/Tests/ConfigEntityNormalizeTest.php b/core/modules/config/src/Tests/ConfigEntityNormalizeTest.php
index 5e52cfe..d1b3a1a 100644
--- a/core/modules/config/src/Tests/ConfigEntityNormalizeTest.php
+++ b/core/modules/config/src/Tests/ConfigEntityNormalizeTest.php
@@ -11,6 +11,11 @@
  */
 class ConfigEntityNormalizeTest extends KernelTestBase {
 
+  /**
+   * Modules to install.
+   *
+   * @var array
+   */
   public static $modules = array('config_test');
 
   protected function setUp() {
diff --git a/core/modules/config/src/Tests/ConfigExportImportUITest.php b/core/modules/config/src/Tests/ConfigExportImportUITest.php
index 0c35736..8a18b9f 100644
--- a/core/modules/config/src/Tests/ConfigExportImportUITest.php
+++ b/core/modules/config/src/Tests/ConfigExportImportUITest.php
@@ -31,6 +31,42 @@ class ConfigExportImportUITest extends WebTestBase {
   protected $tarball;
 
   /**
+   * Holds the original 'site slogan' before testing.
+   *
+   * @var string
+   */
+  protected $originalSlogan;
+
+  /**
+   * Holds a randomly generated new 'site slogan' for testing.
+   *
+   * @var string
+   */
+  protected $newSlogan;
+
+
+  /**
+   * Holds a content type.
+   *
+   * @var \Drupal\node\NodeInterface
+   */
+  protected $contentType;
+
+  /**
+   * Holds the randomly-generated name of a field.
+   *
+   * @var string
+   */
+  protected $fieldName;
+
+  /**
+   * Holds the field storage entity for $fieldName.
+   *
+   * @var \Drupal\field\FieldStorageConfigInterface
+   */
+  protected $fieldStorage;
+
+  /**
    * Modules to enable.
    *
    * @var array
@@ -62,7 +98,7 @@ public function testExportImport() {
     $this->assertEqual(\Drupal::config('system.site')->get('slogan'), $this->newSlogan);
 
     // Create a content type.
-    $this->content_type = $this->drupalCreateContentType();
+    $this->contentType = $this->drupalCreateContentType();
 
     // Create a field.
     $this->fieldName = Unicode::strtolower($this->randomMachineName());
@@ -74,18 +110,18 @@ public function testExportImport() {
     $this->fieldStorage->save();
     entity_create('field_config', array(
       'field_storage' => $this->fieldStorage,
-      'bundle' => $this->content_type->type,
+      'bundle' => $this->contentType->type,
     ))->save();
-    entity_get_form_display('node', $this->content_type->type, 'default')
+    entity_get_form_display('node', $this->contentType->type, 'default')
       ->setComponent($this->fieldName, array(
         'type' => 'text_textfield',
       ))
       ->save();
-    entity_get_display('node', $this->content_type->type, 'full')
+    entity_get_display('node', $this->contentType->type, 'full')
       ->setComponent($this->fieldName)
       ->save();
 
-    $this->drupalGet('node/add/' . $this->content_type->type);
+    $this->drupalGet('node/add/' . $this->contentType->type);
     $this->assertFieldByName("{$this->fieldName}[0][value]", '', 'Widget is displayed');
 
     // Export the configuration.
@@ -110,7 +146,7 @@ public function testExportImport() {
         $field_storage->delete();
       }
     }
-    $this->drupalGet('node/add/' . $this->content_type->type);
+    $this->drupalGet('node/add/' . $this->contentType->type);
     $this->assertNoFieldByName("{$this->fieldName}[0][value]", '', 'Widget is not displayed');
 
     // Import the configuration.
diff --git a/core/modules/config/src/Tests/ConfigImportAllTest.php b/core/modules/config/src/Tests/ConfigImportAllTest.php
index b620ad8..c567808 100644
--- a/core/modules/config/src/Tests/ConfigImportAllTest.php
+++ b/core/modules/config/src/Tests/ConfigImportAllTest.php
@@ -21,6 +21,13 @@ class ConfigImportAllTest extends ModuleTestBase {
   use SchemaCheckTestTrait;
 
   /**
+   * A user with the 'synchronize configuration' permission.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $webUser;
+
+  /**
    * The profile to install as a basis for testing.
    *
    * Using the standard profile as this has a lot of additional configuration.
@@ -32,8 +39,8 @@ class ConfigImportAllTest extends ModuleTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->web_user = $this->drupalCreateUser(array('synchronize configuration'));
-    $this->drupalLogin($this->web_user);
+    $this->webUser = $this->drupalCreateUser(array('synchronize configuration'));
+    $this->drupalLogin($this->webUser);
   }
 
   /**
diff --git a/core/modules/config/src/Tests/ConfigImportUITest.php b/core/modules/config/src/Tests/ConfigImportUITest.php
index b868d35..0b757aa 100644
--- a/core/modules/config/src/Tests/ConfigImportUITest.php
+++ b/core/modules/config/src/Tests/ConfigImportUITest.php
@@ -18,15 +18,25 @@
  */
 class ConfigImportUITest extends WebTestBase {
 
-  // Enable the Options and Text modules to ensure dependencies are handled
-  // correctly.
+  /**
+   * Modules to install.
+   *
+   * @var array
+   */
   public static $modules = array('config', 'config_test', 'config_import_test', 'text', 'options');
 
+  /**
+   * A user with the 'synchronize configuration' permission.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $webUser;
+
   protected function setUp() {
     parent::setUp();
 
-    $this->web_user = $this->drupalCreateUser(array('synchronize configuration'));
-    $this->drupalLogin($this->web_user);
+    $this->webUser = $this->drupalCreateUser(array('synchronize configuration'));
+    $this->drupalLogin($this->webUser);
     $this->copyConfig($this->container->get('config.storage'), $this->container->get('config.storage.staging'));
   }
 
diff --git a/core/modules/config/src/Tests/ConfigImportUploadTest.php b/core/modules/config/src/Tests/ConfigImportUploadTest.php
index 9f453c2..d848afd 100644
--- a/core/modules/config/src/Tests/ConfigImportUploadTest.php
+++ b/core/modules/config/src/Tests/ConfigImportUploadTest.php
@@ -16,13 +16,25 @@
  */
 class ConfigImportUploadTest extends WebTestBase {
 
+  /**
+   * A user with the 'import configuration' permission.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $webUser;
+
+  /**
+   * Modules to install.
+   *
+   * @var array
+   */
   public static $modules = array('config');
 
   protected function setUp() {
     parent::setUp();
 
-    $this->web_user = $this->drupalCreateUser(array('import configuration'));
-    $this->drupalLogin($this->web_user);
+    $this->webUser = $this->drupalCreateUser(array('import configuration'));
+    $this->drupalLogin($this->webUser);
   }
 
   /**
diff --git a/core/modules/config/src/Tests/ConfigInstallTest.php b/core/modules/config/src/Tests/ConfigInstallTest.php
index 532d194..678ed73 100644
--- a/core/modules/config/src/Tests/ConfigInstallTest.php
+++ b/core/modules/config/src/Tests/ConfigInstallTest.php
@@ -16,6 +16,10 @@
  * @see \Drupal\Core\Config\ConfigInstaller
  */
 class ConfigInstallTest extends KernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp() {
     parent::setUp();
 
diff --git a/core/modules/config/src/Tests/ConfigInstallWebTest.php b/core/modules/config/src/Tests/ConfigInstallWebTest.php
index 190e752..687a364 100644
--- a/core/modules/config/src/Tests/ConfigInstallWebTest.php
+++ b/core/modules/config/src/Tests/ConfigInstallWebTest.php
@@ -18,6 +18,10 @@
  * @group config
  */
 class ConfigInstallWebTest extends WebTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp() {
     parent::setUp();
 
diff --git a/core/modules/config/src/Tests/ConfigLanguageOverrideTest.php b/core/modules/config/src/Tests/ConfigLanguageOverrideTest.php
index 2371a88..9de963c 100644
--- a/core/modules/config/src/Tests/ConfigLanguageOverrideTest.php
+++ b/core/modules/config/src/Tests/ConfigLanguageOverrideTest.php
@@ -24,6 +24,9 @@ class ConfigLanguageOverrideTest extends KernelTestBase {
    */
   public static $modules = array('user', 'language', 'config_test',  'system', 'field');
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp() {
     parent::setUp();
     $this->installConfig(array('config_test'));
diff --git a/core/modules/config/src/Tests/ConfigLanguageOverrideWebTest.php b/core/modules/config/src/Tests/ConfigLanguageOverrideWebTest.php
index be24fb9..48d3bfb 100644
--- a/core/modules/config/src/Tests/ConfigLanguageOverrideWebTest.php
+++ b/core/modules/config/src/Tests/ConfigLanguageOverrideWebTest.php
@@ -18,8 +18,16 @@
  */
 class ConfigLanguageOverrideWebTest extends WebTestBase {
 
+  /**
+   * Modules to install.
+   *
+   * @var array
+   */
   public static $modules = array('language', 'system');
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp() {
     parent::setUp();
   }
diff --git a/core/modules/config/src/Tests/ConfigModuleOverridesTest.php b/core/modules/config/src/Tests/ConfigModuleOverridesTest.php
index 3a663d5..106bdd1 100644
--- a/core/modules/config/src/Tests/ConfigModuleOverridesTest.php
+++ b/core/modules/config/src/Tests/ConfigModuleOverridesTest.php
@@ -16,6 +16,11 @@
  */
 class ConfigModuleOverridesTest extends KernelTestBase {
 
+  /**
+   * Modules to install.
+   *
+   * @var array
+   */
   public static $modules = array('system', 'config', 'config_override_test');
 
   public function testSimpleModuleOverrides() {
diff --git a/core/modules/config/src/Tests/ConfigOverridesPriorityTest.php b/core/modules/config/src/Tests/ConfigOverridesPriorityTest.php
index 52e865d..1fd05fa 100644
--- a/core/modules/config/src/Tests/ConfigOverridesPriorityTest.php
+++ b/core/modules/config/src/Tests/ConfigOverridesPriorityTest.php
@@ -18,6 +18,11 @@
  */
 class ConfigOverridesPriorityTest extends KernelTestBase {
 
+  /**
+   * Modules to install.
+   *
+   * @var array
+   */
   public static $modules = array('system', 'config', 'config_override_test', 'language');
 
   public function testOverridePriorities() {
diff --git a/core/modules/config/src/Tests/ConfigSchemaTest.php b/core/modules/config/src/Tests/ConfigSchemaTest.php
index 202b552..de43c7e 100644
--- a/core/modules/config/src/Tests/ConfigSchemaTest.php
+++ b/core/modules/config/src/Tests/ConfigSchemaTest.php
@@ -27,6 +27,9 @@ class ConfigSchemaTest extends KernelTestBase {
    */
   public static $modules = array('system', 'language', 'locale', 'field', 'image', 'config_schema_test');
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp() {
     parent::setUp();
     $this->installConfig(array('system', 'image', 'config_schema_test'));
diff --git a/core/modules/config/src/Tests/ConfigSnapshotTest.php b/core/modules/config/src/Tests/ConfigSnapshotTest.php
index b3789d6..3f8e498 100644
--- a/core/modules/config/src/Tests/ConfigSnapshotTest.php
+++ b/core/modules/config/src/Tests/ConfigSnapshotTest.php
@@ -24,6 +24,9 @@ class ConfigSnapshotTest extends KernelTestBase {
    */
   public static $modules = array('config_test', 'system');
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp() {
     parent::setUp();
     // Update the config snapshot. This allows the parent::setUp() to write
diff --git a/core/modules/config/src/Tests/Storage/CachedStorageTest.php b/core/modules/config/src/Tests/Storage/CachedStorageTest.php
index 11c3599..183ae03 100644
--- a/core/modules/config/src/Tests/Storage/CachedStorageTest.php
+++ b/core/modules/config/src/Tests/Storage/CachedStorageTest.php
@@ -32,12 +32,12 @@ class CachedStorageTest extends ConfigStorageTestBase {
    *
    * @var \Drupal\Core\Config\FileStorage
    */
-  protected $filestorage;
+  protected $fileStorage;
 
   protected function setUp() {
     parent::setUp();
-    $this->filestorage = new FileStorage($this->configDirectories[CONFIG_ACTIVE_DIRECTORY]);
-    $this->storage = new CachedStorage($this->filestorage, \Drupal::service('cache.config'));
+    $this->fileStorage = new FileStorage($this->configDirectories[CONFIG_ACTIVE_DIRECTORY]);
+    $this->storage = new CachedStorage($this->fileStorage, \Drupal::service('cache.config'));
     $this->cache = \Drupal::service('cache_factory')->get('config');
     // ::listAll() verifications require other configuration data to exist.
     $this->storage->write('system.performance', array());
@@ -56,14 +56,14 @@ public function testInvalidStorage() {
   protected function read($name) {
     $data = $this->cache->get($name);
     // Cache misses fall through to the underlying storage.
-    return $data ? $data->data : $this->filestorage->read($name);
+    return $data ? $data->data : $this->fileStorage->read($name);
   }
 
   /**
    * {@inheritdoc}
    */
   protected function insert($name, $data) {
-    $this->filestorage->write($name, $data);
+    $this->fileStorage->write($name, $data);
     $this->cache->set($name, $data);
   }
 
@@ -71,7 +71,7 @@ protected function insert($name, $data) {
    * {@inheritdoc}
    */
   protected function update($name, $data) {
-    $this->filestorage->write($name, $data);
+    $this->fileStorage->write($name, $data);
     $this->cache->set($name, $data);
   }
 
@@ -80,7 +80,7 @@ protected function update($name, $data) {
    */
   protected function delete($name) {
     $this->cache->delete($name);
-    unlink($this->filestorage->getFilePath($name));
+    unlink($this->fileStorage->getFilePath($name));
   }
 
   /**
diff --git a/core/modules/config/src/Tests/Storage/ConfigStorageTestBase.php b/core/modules/config/src/Tests/Storage/ConfigStorageTestBase.php
index 7f07483..cd39f6d 100644
--- a/core/modules/config/src/Tests/Storage/ConfigStorageTestBase.php
+++ b/core/modules/config/src/Tests/Storage/ConfigStorageTestBase.php
@@ -15,21 +15,21 @@
  * All configuration storages are expected to behave identically in
  * terms of reading, writing, listing, deleting, as well as error handling.
  *
- * Therefore, storage tests use a uncommon test case class structure;
- * the base class defines the test method(s) to execute, which are identical for
- * all storages. The storage specific test case classes
- * supply the necessary helper methods to interact with the raw/native storage
+ * Therefore, storage tests use an uncommon test case class structure;
+ * the base class defines the test method(s) to execute, which are identical
+ * for all storages. The storage specific test case classes supply the
+ * necessary helper methods to interact with the raw/native storage
  * directly.
  */
 abstract class ConfigStorageTestBase extends KernelTestBase {
 
   /**
-   * @var \Drupal\Core\Config\StorageInterface;
+   * @var \Drupal\Core\Config\StorageInterface
    */
   protected $storage;
 
   /**
-   * @var \Drupal\Core\Config\StorageInterface;
+   * @var \Drupal\Core\Config\StorageInterface
    */
   protected $invalidStorage;
 
diff --git a/core/modules/config/src/Tests/Storage/DatabaseStorageTest.php b/core/modules/config/src/Tests/Storage/DatabaseStorageTest.php
index 2255e3e..882b072 100644
--- a/core/modules/config/src/Tests/Storage/DatabaseStorageTest.php
+++ b/core/modules/config/src/Tests/Storage/DatabaseStorageTest.php
@@ -15,6 +15,10 @@
  * @group config
  */
 class DatabaseStorageTest extends ConfigStorageTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp() {
     parent::setUp();
 
diff --git a/core/modules/config/src/Tests/Storage/FileStorageTest.php b/core/modules/config/src/Tests/Storage/FileStorageTest.php
index 019aa34..f963a4e 100644
--- a/core/modules/config/src/Tests/Storage/FileStorageTest.php
+++ b/core/modules/config/src/Tests/Storage/FileStorageTest.php
@@ -16,6 +16,10 @@
  * @group config
  */
 class FileStorageTest extends ConfigStorageTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp() {
     parent::setUp();
     $this->storage = new FileStorage($this->configDirectories[CONFIG_ACTIVE_DIRECTORY]);