diff --git a/core/modules/action/lib/Drupal/action/Tests/ConfigurationTest.php b/core/modules/action/lib/Drupal/action/Tests/ConfigurationTest.php
index 4052c6d1df325997344e1539ab36f5f0a39e96eb..570e7e55d7b9912b1e4179e7321722747e93f847 100644
--- a/core/modules/action/lib/Drupal/action/Tests/ConfigurationTest.php
+++ b/core/modules/action/lib/Drupal/action/Tests/ConfigurationTest.php
@@ -30,8 +30,7 @@ public static function getInfo() {
   }
 
   /**
-   * Test the configuration of advanced actions through the administration
-   * interface.
+   * Tests configuration of advanced actions through administration interface.
    */
   function testActionConfiguration() {
     // Create a user with permission to view the actions administration pages.
diff --git a/core/modules/action/lib/Drupal/action/Tests/LoopTest.php b/core/modules/action/lib/Drupal/action/Tests/LoopTest.php
index a381f7451bb80263076768368f8be6850df36afd..87fa08e566f7178d481a1a00b0c1b9ebf7f4bbe5 100644
--- a/core/modules/action/lib/Drupal/action/Tests/LoopTest.php
+++ b/core/modules/action/lib/Drupal/action/Tests/LoopTest.php
@@ -10,7 +10,7 @@
 use Drupal\simpletest\WebTestBase;
 
 /**
- * Test actions executing in a potential loop, and make sure they abort properly.
+ * Tests aborting of actions executing in a potential loop.
  */
 class LoopTest extends WebTestBase {
 
@@ -32,7 +32,7 @@ public static function getInfo() {
   }
 
   /**
-   * Set up a loop with 3 - 12 recursions, and see if it aborts properly.
+   * Sets up a loop with 3 - 12 recursions, and sees if it aborts properly.
    */
   function testActionLoop() {
     $user = $this->drupalCreateUser(array('administer actions'));
@@ -55,7 +55,9 @@ function testActionLoop() {
   }
 
   /**
-   * Create an infinite loop by causing a watchdog message to be set,
+   * Loops watchdog messages up to actions_max_stack times.
+   *
+   * Creates an infinite loop by causing a watchdog message to be set,
    * which causes the actions to be triggered again, up to action_max_stack
    * times.
    */
diff --git a/core/modules/system/lib/Drupal/system/Tests/Ajax/AjaxTestBase.php b/core/modules/system/lib/Drupal/system/Tests/Ajax/AjaxTestBase.php
index 1aef68a4a760f3a21e390b619819ecfeb8110b11..dd3ef467f058828d88c6e8ffaaeca47f56d4f636 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Ajax/AjaxTestBase.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Ajax/AjaxTestBase.php
@@ -22,7 +22,7 @@ abstract class AjaxTestBase extends WebTestBase {
   public static $modules = array('ajax_test', 'ajax_forms_test');
 
   /**
-   * Assert that a command with the required properties exists within the array of Ajax commands returned by the server.
+   * Asserts the array of Ajax commands contains the searched command.
    *
    * The Ajax framework, via the ajax_render() function, returns an array of
    * commands. This array sometimes includes commands automatically provided by
diff --git a/core/modules/system/lib/Drupal/system/Tests/Ajax/CommandsTest.php b/core/modules/system/lib/Drupal/system/Tests/Ajax/CommandsTest.php
index e7c8d7c4e7797e4c543f82322ab4aa7e74bd8cb2..5a455b7458ba48b614be047d20a6e99273026e49 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Ajax/CommandsTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Ajax/CommandsTest.php
@@ -20,7 +20,7 @@ public static function getInfo() {
   }
 
   /**
-   * Test the various Ajax Commands.
+   * Tests the various Ajax Commands.
    */
   function testAjaxCommands() {
     $form_path = 'ajax_forms_test_ajax_commands_form';
diff --git a/core/modules/system/lib/Drupal/system/Tests/Ajax/ElementValidationTest.php b/core/modules/system/lib/Drupal/system/Tests/Ajax/ElementValidationTest.php
index 89c1809e9cf608455426eed028eff0c1e80ce54b..33cf0406ee1658533ec7c444bf1237d70a21d204 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Ajax/ElementValidationTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Ajax/ElementValidationTest.php
@@ -8,7 +8,7 @@
 namespace Drupal\system\Tests\Ajax;
 
 /**
- * Miscellaneous Ajax tests using ajax_test module.
+ * Tests using ajax_test module.
  */
 class ElementValidationTest extends AjaxTestBase {
   public static function getInfo() {
@@ -20,7 +20,7 @@ public static function getInfo() {
   }
 
   /**
-   * Try to post an Ajax change to a form that has a validated element.
+   * Tries to post an Ajax change to a form that has a validated element.
    *
    * The drivertext field is Ajax-enabled. An additional field is not, but
    * is set to be a required field. In this test the required field is not
diff --git a/core/modules/system/lib/Drupal/system/Tests/Ajax/FormValuesTest.php b/core/modules/system/lib/Drupal/system/Tests/Ajax/FormValuesTest.php
index 7950e599880bb19149bdb017a0f0dd7e720c2164..0ea8abf0b6e59d41ec239bc7a5780c0eb4eaa2b9 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Ajax/FormValuesTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Ajax/FormValuesTest.php
@@ -8,7 +8,7 @@
 namespace Drupal\system\Tests\Ajax;
 
 /**
- * Test that $form_state['values'] is properly delivered to $ajax['callback'].
+ * Tests that $form_state['values'] is properly delivered to $ajax['callback'].
  */
 class FormValuesTest extends AjaxTestBase {
   public static function getInfo() {
@@ -27,7 +27,7 @@ function setUp() {
   }
 
   /**
-   * Create a simple form, then POST to system/ajax to change to it.
+   * Submits forms with select and checkbox elements via AJAX.
    */
   function testSimpleAjaxFormValue() {
     // Verify form values of a select element.
diff --git a/core/modules/system/lib/Drupal/system/Tests/Ajax/FrameworkTest.php b/core/modules/system/lib/Drupal/system/Tests/Ajax/FrameworkTest.php
index bd5e5ced5a078a6b0c736230d4255da4634179b4..204701f1222b0ed394e36015eb394fdfea0cde92 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Ajax/FrameworkTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Ajax/FrameworkTest.php
@@ -20,7 +20,7 @@ public static function getInfo() {
   }
 
   /**
-   * Test that ajax_render() returns JavaScript settings generated during the page request.
+   * Ensures ajax_render() returns JavaScript settings from the page request.
    *
    * @todo Add tests to ensure that ajax_render() returns commands for new CSS
    *   and JavaScript files to be loaded by the page. See
@@ -45,7 +45,7 @@ function testAJAXRender() {
   }
 
   /**
-   * Test behavior of ajax_render_error().
+   * Tests behavior of ajax_render_error().
    */
   function testAJAXRenderError() {
     // Verify default error message.
@@ -69,7 +69,7 @@ function testAJAXRenderError() {
   }
 
   /**
-   * Test that new JavaScript and CSS files added during an AJAX request are returned.
+   * Tests that new JavaScript and CSS files are returned on an AJAX request.
    */
   function testLazyLoad() {
     $expected = array(
diff --git a/core/modules/system/lib/Drupal/system/Tests/Ajax/MultiFormTest.php b/core/modules/system/lib/Drupal/system/Tests/Ajax/MultiFormTest.php
index cffa6b77a663593efcaadf401e7dde950e950855..cf3adaac1c5e85fb75133fb7a2e04f77495d16d9 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Ajax/MultiFormTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Ajax/MultiFormTest.php
@@ -53,7 +53,7 @@ function setUp() {
   }
 
   /**
-   * Test that a page with the 'page_node_form' included twice works correctly.
+   * Tests that pages with the 'page_node_form' included twice works correctly.
    */
   function testMultiForm() {
     // HTML IDs for elements within the field are potentially modified with
diff --git a/core/modules/system/lib/Drupal/system/Tests/Batch/PercentagesUnitTest.php b/core/modules/system/lib/Drupal/system/Tests/Batch/PercentagesUnitTest.php
index 8ba9f799cbc31a0b0eb214def063922f6cdc6cfc..5b92b195d7e57964e27d2bd85d564c084d9e6bf8 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Batch/PercentagesUnitTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Batch/PercentagesUnitTest.php
@@ -81,7 +81,7 @@ function setUp() {
   }
 
   /**
-   * Test the _batch_api_percentage() function.
+   * Tests the _batch_api_percentage() function.
    */
   function testBatchPercentages() {
     foreach ($this->testCases as $expected_result => $arguments) {
diff --git a/core/modules/system/lib/Drupal/system/Tests/Batch/ProcessingTest.php b/core/modules/system/lib/Drupal/system/Tests/Batch/ProcessingTest.php
index bad7d95e7ff580edc6e3a1c438ad04b2a4ba400e..2f56ecd2b2d7b7f31ea66cc8038e7ce252e248e7 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Batch/ProcessingTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Batch/ProcessingTest.php
@@ -30,7 +30,7 @@ public static function getInfo() {
   }
 
   /**
-   * Test batches triggered outside of form submission.
+   * Tests batches triggered outside of form submission.
    */
   function testBatchNoForm() {
     // Displaying the page triggers batch 1.
@@ -41,7 +41,7 @@ function testBatchNoForm() {
   }
 
   /**
-   * Test batches defined in a form submit handler.
+   * Tests batches defined in a form submit handler.
    */
   function testBatchForm() {
     // Batch 0: no operation.
@@ -80,7 +80,7 @@ function testBatchForm() {
   }
 
   /**
-   * Test batches defined in a multistep form.
+   * Tests batches defined in a multistep form.
    */
   function testBatchFormMultistep() {
     $this->drupalGet('batch-test/multistep');
@@ -100,7 +100,7 @@ function testBatchFormMultistep() {
   }
 
   /**
-   * Test batches defined in different submit handlers on the same form.
+   * Tests batches defined in different submit handlers on the same form.
    */
   function testBatchFormMultipleBatches() {
     // Batches 1, 2 and 3 are triggered in sequence by different submit
@@ -117,7 +117,7 @@ function testBatchFormMultipleBatches() {
   }
 
   /**
-   * Test batches defined in a programmatically submitted form.
+   * Tests batches defined in a programmatically submitted form.
    *
    * Same as above, but the form is submitted through drupal_form_execute().
    */
@@ -135,7 +135,7 @@ function testBatchFormProgrammatic() {
   }
 
   /**
-   * Test that drupal_form_submit() can run within a batch operation.
+   * Tests that drupal_form_submit() can run within a batch operation.
    */
   function testDrupalFormSubmitInBatch() {
     // Displaying the page triggers a batch that programmatically submits a
@@ -146,8 +146,9 @@ function testDrupalFormSubmitInBatch() {
   }
 
   /**
-   * Test batches that return $context['finished'] > 1 do in fact complete.
-   * See http://drupal.org/node/600836
+   * Tests batches that return $context['finished'] > 1 do in fact complete.
+   *
+   * @see http://drupal.org/node/600836
    */
   function testBatchLargePercentage() {
     // Displaying the page triggers batch 5.
@@ -159,7 +160,7 @@ function testBatchLargePercentage() {
 
 
   /**
-   * Will trigger a pass if the texts were found in order in the raw content.
+   * Triggers a pass if the texts were found in order in the raw content.
    *
    * @param $texts
    *   Array of raw strings to look for .
@@ -174,7 +175,7 @@ function assertBatchMessages($texts, $message) {
   }
 
   /**
-   * Helper function: return expected execution stacks for the test batches.
+   * Returns expected execution stacks for the test batches.
    */
   function _resultStack($id, $value = 0) {
     $stack = array();
@@ -241,7 +242,7 @@ function _resultStack($id, $value = 0) {
   }
 
   /**
-   * Helper function: return expected result messages for the test batches.
+   * Returns expected result messages for the test batches.
    */
   function _resultMessages($id) {
     $messages = array();
diff --git a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/GetFilenameUnitTest.php b/core/modules/system/lib/Drupal/system/Tests/Bootstrap/GetFilenameUnitTest.php
index 3cc05b283d4b645713ea8f6dd07386b5e845789d..ae9a1628626f064fbe4a9ed8a4aad7583d30157e 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/GetFilenameUnitTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Bootstrap/GetFilenameUnitTest.php
@@ -23,7 +23,7 @@ public static function getInfo() {
   }
 
   /**
-   * Test that drupal_get_filename() works correctly when the file is not found in the database.
+   * Tests that drupal_get_filename() works when the file is not in database.
    */
   function testDrupalGetFilename() {
     // Reset the static cache so we can test the "db is not active" code of
diff --git a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/HookBootExitTest.php b/core/modules/system/lib/Drupal/system/Tests/Bootstrap/HookBootExitTest.php
index b90370cd6a5f4bd5b597fc88cf0fbabd82a46488..e9eff7a3de9f3e5219c3f08396b622866142eabf 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/HookBootExitTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Bootstrap/HookBootExitTest.php
@@ -30,7 +30,7 @@ public static function getInfo() {
   }
 
   /**
-   * Test calling of hook_boot() and hook_exit().
+   * Tests calling of hook_boot() and hook_exit().
    */
   function testHookBootExit() {
     // Test with cache disabled. Boot and exit should always fire.
diff --git a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/IpAddressTest.php b/core/modules/system/lib/Drupal/system/Tests/Bootstrap/IpAddressTest.php
index 76689490d0c975648d582c359061690446235232..a6f87ef8ef12944f130893085ac2762435fb7b1b 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/IpAddressTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Bootstrap/IpAddressTest.php
@@ -48,7 +48,7 @@ function tearDown() {
   }
 
   /**
-   * test IP Address and hostname
+   * Tests IP address and hostname.
    */
   function testIPAddressHost() {
     // Test the normal IP address.
diff --git a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/MiscUnitTest.php b/core/modules/system/lib/Drupal/system/Tests/Bootstrap/MiscUnitTest.php
index 18e8925b9cf8b42a5a1b78482bffafee9fbed785..88b9ebb9252cce3eef3aa249d7dc24b5353b08c4 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/MiscUnitTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Bootstrap/MiscUnitTest.php
@@ -23,7 +23,7 @@ public static function getInfo() {
   }
 
   /**
-   * Test miscellaneous functions in bootstrap.inc.
+   * Tests miscellaneous functions in bootstrap.inc.
    */
   function testMisc() {
     // Test drupal_array_merge_deep().
diff --git a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/OverrideServerVariablesUnitTest.php b/core/modules/system/lib/Drupal/system/Tests/Bootstrap/OverrideServerVariablesUnitTest.php
index c14a6bf1854a2ce668bbb03d8b5b8cef1d3c1f8b..0717b105aac84bc844dce53b40efb8eb8c24dadc 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/OverrideServerVariablesUnitTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Bootstrap/OverrideServerVariablesUnitTest.php
@@ -22,7 +22,7 @@ public static function getInfo() {
   }
 
   /**
-   * Test providing a direct URL to to drupal_override_server_variables().
+   * Tests providing a direct URL to to drupal_override_server_variables().
    */
   function testDrupalOverrideServerVariablesProvidedURL() {
     $tests = array(
diff --git a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/PageCacheTest.php b/core/modules/system/lib/Drupal/system/Tests/Bootstrap/PageCacheTest.php
index 0f00baf67ba4dfe3bbff92b043fe111f3cb5156f..09dc690039ea052ad414f9bd54543f5a54ff01fc 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/PageCacheTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Bootstrap/PageCacheTest.php
@@ -39,7 +39,7 @@ function setUp() {
   }
 
   /**
-   * Test support for requests containing If-Modified-Since and If-None-Match headers.
+   * Tests support of requests with If-Modified-Since and If-None-Match headers.
    */
   function testConditionalRequests() {
     $config = config('system.performance');
@@ -83,7 +83,7 @@ function testConditionalRequests() {
   }
 
   /**
-   * Test cache headers.
+   * Tests cache headers.
    */
   function testPageCache() {
     $config = config('system.performance');
@@ -125,7 +125,7 @@ function testPageCache() {
   }
 
   /**
-   * Test page compression.
+   * Tests page compression.
    *
    * The test should pass even if zlib.output_compression is enabled in php.ini,
    * .htaccess or similar, or if compression is done outside PHP, e.g. by the
diff --git a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/ResettableStaticUnitTest.php b/core/modules/system/lib/Drupal/system/Tests/Bootstrap/ResettableStaticUnitTest.php
index 345c61786182d0e8af03a427f08b5f212225c366..23a84b8a5eb0d8ae1d0b3c1159877fa6bb1a294f 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/ResettableStaticUnitTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Bootstrap/ResettableStaticUnitTest.php
@@ -23,7 +23,9 @@ public static function getInfo() {
   }
 
   /**
-   * Test that a variable reference returned by drupal_static() gets reset when
+   * Tests drupal_static() function.
+   *
+   * Tests that a variable reference returned by drupal_static() gets reset when
    * drupal_static_reset() is called.
    */
   function testDrupalStatic() {
diff --git a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/TimerUnitTest.php b/core/modules/system/lib/Drupal/system/Tests/Bootstrap/TimerUnitTest.php
index e41fc1778f7ae758248353b923e976a914d59088..ab100e265f0e115d97fceb07c81615c3f4f427fe 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/TimerUnitTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Bootstrap/TimerUnitTest.php
@@ -23,9 +23,7 @@ public static function getInfo() {
   }
 
   /**
-   * Test timer_read() to ensure it properly accumulates time when the timer
-   * started and stopped multiple times.
-   * @return
+   * Tests timer_read() time accumulation accuracy across multiple restarts.
    */
   function testTimer() {
     timer_start('test');
diff --git a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/VariableTest.php b/core/modules/system/lib/Drupal/system/Tests/Bootstrap/VariableTest.php
index 137f2a5e129934345c7fbc414d86f6237dd584f5..9729ea39df3bd8e07c6c0373ed3c5de96f775f9b 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/VariableTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Bootstrap/VariableTest.php
@@ -30,7 +30,7 @@ public static function getInfo() {
   }
 
   /**
-   * testVariable
+   * Tests variables then deletes them.
    */
   function testVariable() {
     // Setting and retrieving values.
diff --git a/core/modules/system/lib/Drupal/system/Tests/Cache/CacheTestBase.php b/core/modules/system/lib/Drupal/system/Tests/Cache/CacheTestBase.php
index e4b275eefe7d8f7fed16211d92807640de15e0b1..6f9c2699d785ab939bcdfb556c910834c3cc0be8 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Cache/CacheTestBase.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Cache/CacheTestBase.php
@@ -19,7 +19,7 @@ abstract class CacheTestBase extends WebTestBase {
   protected $default_value = 'CacheTest';
 
   /**
-   * Check whether or not a cache entry exists.
+   * Checks whether or not a cache entry exists.
    *
    * @param $cid
    *   The cache id.
@@ -89,7 +89,8 @@ function assertCacheRemoved($message, $cid = NULL, $bin = NULL) {
   }
 
   /**
-   * Perform the general wipe.
+   * Performs a general wipe of the bin.
+   *
    * @param $bin
    *   The bin to perform the wipe on.
    */
diff --git a/core/modules/system/lib/Drupal/system/Tests/Cache/ClearTest.php b/core/modules/system/lib/Drupal/system/Tests/Cache/ClearTest.php
index c91f1db148419cd5b42ae7c012c2b793e9160fdf..2c03b8b2a92159d8a64cd05e96830cdada05aa79 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Cache/ClearTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Cache/ClearTest.php
@@ -28,7 +28,7 @@ function setUp() {
   }
 
   /**
-   * Test drupal_flush_all_caches().
+   * Tests drupal_flush_all_caches().
    */
   function testFlushAllCaches() {
     // Create cache entries for each flushed cache bin.
diff --git a/core/modules/system/lib/Drupal/system/Tests/Cache/GenericCacheBackendUnitTestBase.php b/core/modules/system/lib/Drupal/system/Tests/Cache/GenericCacheBackendUnitTestBase.php
index 760d3ca36f2af9b82bb263f02636db44afc8817b..c54943f5626cbffca43aa20ae5e8cf941baf42a6 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Cache/GenericCacheBackendUnitTestBase.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Cache/GenericCacheBackendUnitTestBase.php
@@ -128,8 +128,7 @@ public function tearDown() {
   }
 
   /**
-   * Test Drupal\Core\Cache\CacheBackendInterface::get() and
-   * Drupal\Core\Cache\CacheBackendInterface::set().
+   * Tests the get and set methods of Drupal\Core\Cache\CacheBackendInterface.
    */
   public function testSetGet() {
     $backend = $this->getCacheBackend();
@@ -150,7 +149,7 @@ public function testSetGet() {
   }
 
   /**
-   * Test Drupal\Core\Cache\CacheBackendInterface::delete().
+   * Tests Drupal\Core\Cache\CacheBackendInterface::delete().
    */
   public function testDelete() {
     $backend = $this->getCacheBackend();
@@ -174,7 +173,7 @@ public function testDelete() {
   }
 
   /**
-   * Test data type perservation.
+   * Tests data type preservation.
    */
   public function testValueTypeIsKept() {
     $backend = $this->getCacheBackend();
@@ -202,7 +201,7 @@ public function testValueTypeIsKept() {
   }
 
   /**
-   * Test Drupal\Core\Cache\CacheBackendInterface::getMultiple().
+   * Tests Drupal\Core\Cache\CacheBackendInterface::getMultiple().
    */
   public function testGetMultiple() {
     $backend = $this->getCacheBackend();
@@ -281,7 +280,7 @@ public function testGetMultiple() {
   }
 
   /**
-   * Test Drupal\Core\Cache\CacheBackendInterface::isEmpty().
+   * Tests Drupal\Core\Cache\CacheBackendInterface::isEmpty().
    */
   public function testIsEmpty() {
     $backend = $this->getCacheBackend();
@@ -296,7 +295,7 @@ public function testIsEmpty() {
   }
 
   /**
-   * Test Drupal\Core\Cache\CacheBackendInterface::deleteMultiple().
+   * Tests Drupal\Core\Cache\CacheBackendInterface::deleteMultiple().
    */
   public function testDeleteMultiple() {
     $backend = $this->getCacheBackend();
@@ -354,7 +353,7 @@ public function testFlush() {
   }
 
   /**
-   * Check whether or not a cache entry exists.
+   * Checks whether or not a cache entry exists.
    *
    * @param $cid
    *   The cache id.
@@ -370,7 +369,7 @@ protected function checkCacheExists($cid, $bin = null) {
   }
 
   /**
-   * Test Drupal\Core\Cache\CacheBackendInterface::invalidateTags().
+   * Tests Drupal\Core\Cache\CacheBackendInterface::invalidateTags().
    */
   function testClearTags() {
     $backend = $this->getCacheBackend();
diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/AddFeedTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/AddFeedTest.php
index a1f543effae7e2b252c7d454cfaf5cc1c293f24f..87e1731a625a7e2564e7646aabb4006cb5151bc4 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Common/AddFeedTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Common/AddFeedTest.php
@@ -10,7 +10,7 @@
 use Drupal\simpletest\WebTestBase;
 
 /**
- * Basic tests for drupal_add_feed().
+ * Tests drupal_add_feed().
  */
 class AddFeedTest extends WebTestBase {
   public static function getInfo() {
@@ -22,7 +22,7 @@ public static function getInfo() {
   }
 
   /**
-   * Test drupal_add_feed() with paths, URLs, and titles.
+   * Tests drupal_add_feed() with paths, URLs, and titles.
    */
   function testBasicFeedAddNoTitle() {
     $path = $this->randomName(12);
@@ -81,7 +81,7 @@ function testBasicFeedAddNoTitle() {
   }
 
   /**
-   * Create a pattern representing the RSS feed in the page.
+   * Creates a pattern representing the RSS feed in the page.
    */
   function urlToRSSLinkPattern($url, $title = '') {
     // Escape any regular expression characters in the URL ('?' is the worst).
diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/AlterTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/AlterTest.php
index 9f731537f6cbeeccab7d795d70a1de1763ba27f4..c2f1595936d27ceff9d66eca1df5bd935d5ac68f 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Common/AlterTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Common/AlterTest.php
@@ -30,6 +30,9 @@ public static function getInfo() {
     );
   }
 
+  /**
+   * Tests if the theme has been altered.
+   */
   function testDrupalAlter() {
     // This test depends on Bartik, so make sure that it is always the current
     // active theme.
diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/AutocompleteTagsUnitTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/AutocompleteTagsUnitTest.php
index 512440533032659862b57f0c1cf802da6df46315..82405361f00d9d063edfe9d33f695d4b7e0a3cee 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Common/AutocompleteTagsUnitTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Common/AutocompleteTagsUnitTest.php
@@ -29,7 +29,7 @@ public static function getInfo() {
   }
 
   /**
-   * Explode a series of tags.
+   * Explodes a series of tags.
    */
   function testDrupalExplodeTags() {
     $string = implode(', ', array_keys($this->validTags));
@@ -38,7 +38,7 @@ function testDrupalExplodeTags() {
   }
 
   /**
-   * Implode a series of tags.
+   * Implodes a series of tags.
    */
   function testDrupalImplodeTags() {
     $tags = array_values($this->validTags);
diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/CascadingStylesheetsTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/CascadingStylesheetsTest.php
index 0268756ff9171f1df374aa2751a6c375108316d4..db0303c26f15fd79503a4ed98391cafac09449a6 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Common/CascadingStylesheetsTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Common/CascadingStylesheetsTest.php
@@ -36,14 +36,14 @@ function setUp() {
   }
 
   /**
-   * Check default stylesheets as empty.
+   * Checks that default stylesheets are empty.
    */
   function testDefault() {
     $this->assertEqual(array(), drupal_add_css(), 'Default CSS is empty.');
   }
 
   /**
-   * Test that stylesheets in module .info files are loaded.
+   * Tests that stylesheets in module .info files are loaded.
    */
   function testModuleInfo() {
     $this->drupalGet('');
@@ -172,7 +172,7 @@ function testRenderInlineFullPage() {
   }
 
   /**
-   * Test CSS ordering.
+   * Tests CSS ordering.
    */
   function testRenderOrder() {
     // A module CSS file.
@@ -203,7 +203,7 @@ function testRenderOrder() {
   }
 
   /**
-   * Test CSS override.
+   * Tests CSS override.
    */
   function testRenderOverride() {
     $system = drupal_get_path('module', 'system');
@@ -244,8 +244,7 @@ function testAlter() {
   }
 
   /**
-   * Tests that the query string remains intact when adding CSS files that have
-   * query string parameters.
+   * Tests that CSS query string remains intact when added to file.
    */
   function testAddCssFileWithQueryString() {
     $this->drupalGet('common-test/query-string');
diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/CascadingStylesheetsUnitTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/CascadingStylesheetsUnitTest.php
index 15376a32d45bbdd28532bfd6bd9e480815894b6d..5ab3c0a163728d26cf480216e4c756b9fd5124f9 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Common/CascadingStylesheetsUnitTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Common/CascadingStylesheetsUnitTest.php
@@ -10,7 +10,7 @@
 use Drupal\simpletest\UnitTestBase;
 
 /**
- * CSS Unit Tests.
+ * Tests CSS functions.
  */
 class CascadingStylesheetsUnitTest extends UnitTestBase {
   public static function getInfo() {
@@ -22,8 +22,9 @@ public static function getInfo() {
   }
 
   /**
-   * Tests basic CSS loading with and without optimization via drupal_load_stylesheet().
+   * Tests CSS loading via drupal_load_stylesheet().
    *
+   * This test loads CSS files with and without CSS optimization.
    * Known tests:
    * - Retain white-space in selectors. (http://drupal.org/node/472820)
    * - Proper URLs in imported files. (http://drupal.org/node/265719)
diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/FormatDateTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/FormatDateTest.php
index b61987e7417b528b167f00abbba616d1928d40c4..87d97b6b72261cff982f9d4dfb6ed3ac1f23e881 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Common/FormatDateTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Common/FormatDateTest.php
@@ -48,7 +48,7 @@ function setUp() {
   }
 
   /**
-   * Test admin-defined formats in format_date().
+   * Tests admin-defined formats in format_date().
    */
   function testAdminDefinedFormatDate() {
     // Create an admin user.
diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/GotoTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/GotoTest.php
index c00af03c0151b5e470f2eae73a038922c45c4db4..c353e69a91ae07fcb950d8b2c32c57122d0f15ec 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Common/GotoTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Common/GotoTest.php
@@ -30,7 +30,7 @@ public static function getInfo() {
   }
 
   /**
-   * Test drupal_goto().
+   * Tests drupal_goto().
    */
   function testDrupalGoto() {
     $this->drupalGet('common-test/drupal_goto/redirect');
@@ -56,7 +56,7 @@ function testDrupalGoto() {
   }
 
   /**
-   * Test hook_drupal_goto_alter().
+   * Tests hook_drupal_goto_alter().
    */
   function testDrupalGotoAlter() {
     $this->drupalGet('common-test/drupal_goto/redirect_fail');
@@ -66,7 +66,7 @@ function testDrupalGotoAlter() {
   }
 
   /**
-   * Test drupal_get_destination().
+   * Tests drupal_get_destination().
    */
   function testDrupalGetDestination() {
     $query = $this->randomName(10);
diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/HttpRequestTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/HttpRequestTest.php
index 005d3d32b5098cf8a6cbbe5cbef70acd5e9c347f..a4cabd669ae859c1cb4090ef468ac2f202c7fb3b 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Common/HttpRequestTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Common/HttpRequestTest.php
@@ -30,6 +30,9 @@ public static function getInfo() {
     );
   }
 
+  /**
+   * Checks HTTP requests.
+   */
   function testDrupalHTTPRequest() {
     global $is_https;
 
@@ -73,6 +76,9 @@ function testDrupalHTTPRequest() {
     }
   }
 
+  /**
+   * Tests HTTP basic authorization.
+   */
   function testDrupalHTTPRequestBasicAuth() {
     $username = $this->randomName();
     $password = $this->randomName();
@@ -86,6 +92,9 @@ function testDrupalHTTPRequestBasicAuth() {
     $this->assertRaw($password, '$_SERVER["PHP_AUTH_PW"] is passed correctly.');
   }
 
+  /**
+   * Tests HTTP redirect requests.
+   */
   function testDrupalHTTPRequestRedirect() {
     $redirect_301 = drupal_http_request(url('system-test/redirect/301', array('absolute' => TRUE)), array('max_redirects' => 1));
     $this->assertEqual($redirect_301->redirect_code, 301, 'drupal_http_request follows the 301 redirect.');
diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/JavaScriptTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/JavaScriptTest.php
index 21ea3de631fb2d5f30bde77e244f6621f9f36efe..c30147f1554f7ccf8df16adf883f910b180595f8 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Common/JavaScriptTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Common/JavaScriptTest.php
@@ -22,7 +22,7 @@ class JavaScriptTest extends WebTestBase {
   public static $modules = array('language', 'simpletest', 'common_test', 'path');
 
   /**
-   * Store configured value for JavaScript preprocessing.
+   * Stores configured value for JavaScript preprocessing.
    */
   protected $preprocess_js = NULL;
 
@@ -57,14 +57,14 @@ function tearDown() {
   }
 
   /**
-   * Test default JavaScript is empty.
+   * Tests that default JavaScript is empty.
    */
   function testDefault() {
     $this->assertEqual(array(), drupal_add_js(), 'Default JavaScript is empty.');
   }
 
   /**
-   * Test adding a JavaScript file.
+   * Tests adding a JavaScript file.
    */
   function testAddFile() {
     $javascript = drupal_add_js('core/misc/collapse.js');
@@ -72,7 +72,7 @@ function testAddFile() {
   }
 
   /**
-   * Test adding settings.
+   * Tests adding settings.
    */
   function testAddSetting() {
     // Add a file in order to test default settings.
@@ -133,7 +133,7 @@ function testDeferAttribute() {
   }
 
   /**
-   * Test drupal_get_js() for JavaScript settings.
+   * Tests drupal_get_js() for JavaScript settings.
    */
   function testHeaderSetting() {
     drupal_add_library('system', 'drupalSettings');
@@ -179,7 +179,7 @@ function testHeaderSetting() {
   }
 
   /**
-   * Test to see if resetting the JavaScript empties the cache.
+   * Tests to see if resetting the JavaScript empties the cache.
    */
   function testReset() {
     drupal_add_library('system', 'drupal');
@@ -189,7 +189,7 @@ function testReset() {
   }
 
   /**
-   * Test adding inline scripts.
+   * Tests adding inline scripts.
    */
   function testAddInline() {
     drupal_add_library('system', 'drupal');
@@ -201,7 +201,7 @@ function testAddInline() {
   }
 
   /**
-   * Test rendering an external JavaScript file.
+   * Tests rendering an external JavaScript file.
    */
   function testRenderExternal() {
     drupal_add_library('system', 'drupal');
@@ -213,7 +213,7 @@ function testRenderExternal() {
   }
 
   /**
-   * Test drupal_get_js() with a footer scope.
+   * Tests drupal_get_js() with a footer scope.
    */
   function testFooterHTML() {
     drupal_add_library('system', 'drupal');
@@ -224,7 +224,7 @@ function testFooterHTML() {
   }
 
   /**
-   * Test drupal_add_js() sets preproccess to false when cache is set to false.
+   * Tests drupal_add_js() sets preproccess to FALSE when cache is also FALSE.
    */
   function testNoCache() {
     drupal_add_library('system', 'drupal');
@@ -233,7 +233,7 @@ function testNoCache() {
   }
 
   /**
-   * Test adding a JavaScript file with a different group.
+   * Tests adding a JavaScript file with a different group.
    */
   function testDifferentGroup() {
     drupal_add_library('system', 'drupal');
@@ -242,7 +242,7 @@ function testDifferentGroup() {
   }
 
   /**
-   * Test adding a JavaScript file with a different weight.
+   * Tests adding a JavaScript file with a different weight.
    */
   function testDifferentWeight() {
     $javascript = drupal_add_js('core/misc/collapse.js', array('weight' => 2));
@@ -250,7 +250,7 @@ function testDifferentWeight() {
   }
 
   /**
-   * Test adding JavaScript within conditional comments.
+   * Tests adding JavaScript within conditional comments.
    *
    * @see drupal_pre_render_conditional_comments()
    */
@@ -270,7 +270,7 @@ function testBrowserConditionalComments() {
   }
 
   /**
-   * Test JavaScript versioning.
+   * Tests JavaScript versioning.
    */
   function testVersionQueryString() {
     drupal_add_library('system', 'drupal');
@@ -281,7 +281,7 @@ function testVersionQueryString() {
   }
 
   /**
-   * Test JavaScript grouping and aggregation.
+   * Tests JavaScript grouping and aggregation.
    */
   function testAggregation() {
     $default_query_string = variable_get('css_js_query_string', '0');
@@ -369,7 +369,7 @@ function testAggregationOrder() {
   }
 
   /**
-   * Test JavaScript ordering.
+   * Tests JavaScript ordering.
    */
   function testRenderOrder() {
     // Add a bunch of JavaScript in strange ordering.
@@ -411,7 +411,7 @@ function testRenderOrder() {
   }
 
   /**
-   * Test rendering the JavaScript with a file's weight above jQuery's.
+   * Tests rendering the JavaScript with a file's weight above jQuery's.
    */
   function testRenderDifferentWeight() {
     // JavaScript files are sorted first by group, then by the 'every_page'
@@ -424,7 +424,7 @@ function testRenderDifferentWeight() {
   }
 
   /**
-   * Test altering a JavaScript's weight via hook_js_alter().
+   * Tests altering a JavaScript's weight via hook_js_alter().
    *
    * @see simpletest_js_alter()
    */
@@ -523,8 +523,7 @@ function testGetLibrary() {
   }
 
   /**
-   * Tests that the query string remains intact when adding JavaScript files
-   *  that have query string parameters.
+   * Tests JavaScript files that have querystrings attached get added right.
    */
   function testAddJsFileWithQueryString() {
     $this->drupalGet('common-test/query-string');
diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/ParseInfoFileUnitTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/ParseInfoFileUnitTest.php
index 1efd9e75705e1ed507208fd36b931a9aef1e4262..e4cb0f3a82d49eda5f4ea76a6400c61340e1f64f 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Common/ParseInfoFileUnitTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Common/ParseInfoFileUnitTest.php
@@ -22,7 +22,7 @@ public static function getInfo() {
   }
 
   /**
-   * Parse an example .info file an verify the results.
+   * Parses an example .info file and verifies the results.
    */
   function testParseInfoFile() {
     $info_values = drupal_parse_info_file(drupal_get_path('module', 'system') . '/tests/common_test_info.txt');
diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/RegionContentTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/RegionContentTest.php
index a64dfc444f7687600c4cd5f6edc39febcc825930..e8b8201e03d36046e9912e65b6dcd2dbb947b252 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Common/RegionContentTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Common/RegionContentTest.php
@@ -22,7 +22,7 @@ public static function getInfo() {
   }
 
   /**
-   * Test setting and retrieving content for theme regions.
+   * Tests setting and retrieving content for theme regions.
    */
   function testRegions() {
     global $theme_key;
diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/RenderTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/RenderTest.php
index 7786d28cdb288aa02a048225b280b2f762173a7c..adc35ba0bf783a0ec84af46c8d62af1a953b80cf 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Common/RenderTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Common/RenderTest.php
@@ -30,7 +30,7 @@ public static function getInfo() {
   }
 
   /**
-   * Test sorting by weight.
+   * Tests sorting by weight.
    */
   function testDrupalRenderSorting() {
     $first = $this->randomName();
@@ -81,7 +81,7 @@ function testDrupalRenderSorting() {
   }
 
   /**
-   * Test #attached functionality in children elements.
+   * Tests #attached functionality in children elements.
    */
   function testDrupalRenderChildrenAttached() {
     // The cache system is turned off for POST requests.
@@ -131,7 +131,7 @@ function testDrupalRenderChildrenAttached() {
   }
 
   /**
-   * Test passing arguments to the theme function.
+   * Tests passing arguments to the theme function.
    */
   function testDrupalRenderThemeArguments() {
     $element = array(
@@ -144,12 +144,12 @@ function testDrupalRenderThemeArguments() {
       '#foo' => $this->randomName(),
       '#bar' => $this->randomName(),
     );
-    // Test that passing arguments to the theme function works.
+    // Tests that passing arguments to the theme function works.
     $this->assertEqual(drupal_render($element), $element['#foo'] . $element['#bar'], 'Passing arguments to theme functions works');
   }
 
   /**
-   * Test rendering form elements without passing through form_builder().
+   * Tests rendering form elements without passing through form_builder().
    */
   function testDrupalRenderFormElements() {
     // Define a series of form elements.
@@ -268,7 +268,7 @@ function testDrupalRenderFormElements() {
   }
 
   /**
-   * Test rendering elements with invalid keys.
+   * Tests rendering elements with invalid keys.
    */
   function testDrupalRenderInvalidKeys() {
     $error = array(
@@ -284,6 +284,9 @@ function testDrupalRenderInvalidKeys() {
     $this->assertRaw($message, format_string('Found error message: !message.', array('!message' => $message)));
   }
 
+  /**
+   * Tests that elements are rendered properly.
+   */
   protected function assertRenderedElement(array $element, $xpath, array $xpath_args = array()) {
     $original_element = $element;
     $this->drupalSetContent(drupal_render($element));
diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/SimpleTestErrorCollectorTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/SimpleTestErrorCollectorTest.php
index f37cb9753a99880959fc880bca02b05bd5f3f03e..c8a08baea5849c7ed27b7bf18ab8d93d7f2ecde4 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Common/SimpleTestErrorCollectorTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Common/SimpleTestErrorCollectorTest.php
@@ -40,7 +40,7 @@ public static function getInfo() {
   }
 
   /**
-   * Test that simpletest collects errors from the tested site.
+   * Tests that simpletest collects errors from the tested site.
    */
   function testErrorCollect() {
     $this->collectedErrors = array();
@@ -91,7 +91,7 @@ protected function error($message = '', $group = 'Other', array $caller = NULL)
   }
 
   /**
-   * Assert that a collected error matches what we are expecting.
+   * Asserts that a collected error matches what we are expecting.
    */
   function assertError($error, $group, $function, $file, $message = NULL) {
     $this->assertEqual($error['group'], $group, format_string("Group was %group", array('%group' => $group)));
diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/SizeUnitTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/SizeUnitTest.php
index c804d617ee5118f7e2be9686322d4d4b692c5dfd..a8a2662672adf5148e61e7ffa984d2e8a883e9f7 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Common/SizeUnitTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Common/SizeUnitTest.php
@@ -48,7 +48,7 @@ function setUp() {
   }
 
   /**
-   * Check that format_size() returns the expected string.
+   * Checks that format_size() returns the expected string.
    */
   function testCommonFormatSize() {
     foreach (array($this->exact_test_cases, $this->rounded_test_cases) as $test_cases) {
@@ -63,7 +63,7 @@ function testCommonFormatSize() {
   }
 
   /**
-   * Check that parse_size() returns the proper byte sizes.
+   * Checks that parse_size() returns the proper byte sizes.
    */
   function testCommonParseSize() {
     foreach ($this->exact_test_cases as $string => $size) {
@@ -96,7 +96,7 @@ function testCommonParseSize() {
   }
 
   /**
-   * Cross-test parse_size() and format_size().
+   * Cross-tests parse_size() and format_size().
    */
   function testCommonParseSizeFormatSize() {
     foreach ($this->exact_test_cases as $size) {
diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/SystemListingTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/SystemListingTest.php
index 5c57009b07c1bb688c58d74cd22d76cc10a316ed..523a20bee69109bc25c48c8253920b579eba7387 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Common/SystemListingTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Common/SystemListingTest.php
@@ -22,7 +22,7 @@ public static function getInfo() {
   }
 
   /**
-   * Test that files in different directories take precedence as expected.
+   * Tests that files in different directories take precedence as expected.
    */
   function testDirectoryPrecedence() {
     // Define the module files we will search for, and the directory precedence
diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/UrlTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/UrlTest.php
index d178709d84ea468da5ed161d13a473bee7591f63..473e352159105278c1a401a2a9b62fdce62a1bf7 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Common/UrlTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Common/UrlTest.php
@@ -25,7 +25,7 @@ public static function getInfo() {
   }
 
   /**
-   * Confirm that invalid text given as $path is filtered.
+   * Confirms that invalid URLs are filtered.
    */
   function testLXSS() {
     $text = $this->randomName();
@@ -58,7 +58,7 @@ private function hasClass($link, $class) {
   }
 
   /**
-   * Test drupal_get_query_parameters().
+   * Tests drupal_get_query_parameters().
    */
   function testDrupalGetQueryParameters() {
     $original = array(
@@ -94,7 +94,7 @@ function testDrupalGetQueryParameters() {
   }
 
   /**
-   * Test drupal_http_build_query().
+   * Tests drupal_http_build_query().
    */
   function testDrupalHttpBuildQuery() {
     $this->assertEqual(drupal_http_build_query(array('a' => ' &#//+%20@۞')), 'a=%20%26%23//%2B%2520%40%DB%9E', 'Value was properly encoded.');
@@ -104,7 +104,7 @@ function testDrupalHttpBuildQuery() {
   }
 
   /**
-   * Test drupal_parse_url().
+   * Tests drupal_parse_url().
    */
   function testDrupalParseUrl() {
     // Relative, absolute, and external URLs, without/with explicit script path,
@@ -142,8 +142,10 @@ function testDrupalParseUrl() {
   }
 
   /**
-   * Test url() with/without query, with/without fragment, absolute on/off and
-   * assert all that works when clean URLs are on and off.
+   * Tests url() functionality.
+   *
+   * Tests url() with/without query, with/without fragment, absolute on/off and
+   * asserts all that works when clean URLs are on and off.
    */
   function testUrl() {
     global $base_url, $script_path;
@@ -184,7 +186,7 @@ function testUrl() {
   }
 
   /**
-   * Test external URL handling.
+   * Tests external URL handling.
    */
   function testExternalUrls() {
     $test_url = 'http://drupal.org/';
diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/ValidUrlUnitTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/ValidUrlUnitTest.php
index bc9b6a908f4743288c0f94555dca682735947e44..6750d27e24e187c5ccaddd444cb9cdcec6e31d90 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Common/ValidUrlUnitTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Common/ValidUrlUnitTest.php
@@ -22,7 +22,7 @@ public static function getInfo() {
   }
 
   /**
-   * Test valid absolute URLs.
+   * Tests valid absolute URLs.
    */
   function testValidAbsolute() {
     $url_schemes = array('http', 'https', 'ftp');
@@ -57,7 +57,7 @@ function testValidAbsolute() {
   }
 
   /**
-   * Test invalid absolute URLs.
+   * Tests invalid absolute URLs.
    */
   function testInvalidAbsolute() {
     $url_schemes = array('http', 'https', 'ftp');
@@ -77,7 +77,7 @@ function testInvalidAbsolute() {
   }
 
   /**
-   * Test valid relative URLs.
+   * Tests valid relative URLs.
    */
   function testValidRelative() {
     $valid_relative_urls = array(
@@ -98,7 +98,7 @@ function testValidRelative() {
   }
 
   /**
-   * Test invalid relative URLs.
+   * Tests invalid relative URLs.
    */
   function testInvalidRelative() {
     $invalid_relative_urls = array(
diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/WriteRecordTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/WriteRecordTest.php
index 8aee0efbefbadaf3845748b59d19a337ef04ec20..628dad9a8970118c77029ad5b8fa49bc3ea01baf 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Common/WriteRecordTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Common/WriteRecordTest.php
@@ -31,7 +31,7 @@ public static function getInfo() {
   }
 
   /**
-   * Test the drupal_write_record() API function.
+   * Tests the drupal_write_record() API function.
    */
   function testDrupalWriteRecord() {
     // Insert a record with no columns populated.
diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/XssUnitTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/XssUnitTest.php
index 008491dbccfec1792fae1c2bd7bee316242fb1b1..85416653ec1cd69db9f9e506b10bcf81a86ed950 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Common/XssUnitTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Common/XssUnitTest.php
@@ -23,7 +23,7 @@ public static function getInfo() {
   }
 
   /**
-   * Check that invalid multi-byte sequences are rejected.
+   * Checks that invalid multi-byte sequences are rejected.
    */
   function testInvalidMultiByte() {
      // Ignore PHP 5.3+ invalid multibyte sequence warning.
@@ -41,7 +41,7 @@ function testInvalidMultiByte() {
   }
 
   /**
-   * Check that special characters are escaped.
+   * Checks that special characters are escaped.
    */
   function testEscaping() {
      $text = check_plain("<script>");
@@ -51,7 +51,7 @@ function testEscaping() {
   }
 
   /**
-   * Test t() and format_string() replacement functionality.
+   * Tests t() and format_string() replacement functionality.
    */
   function testFormatStringAndT() {
     foreach (array('format_string', 't') as $function) {
@@ -67,7 +67,7 @@ function testFormatStringAndT() {
   }
 
   /**
-   * Check that harmful protocols are stripped.
+   * Checks that harmful protocols are stripped.
    */
   function testBadProtocolStripping() {
     // Ensure that check_url() strips out harmful protocols, and encodes for
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/AlterTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/AlterTest.php
index 3324a35c925e2397ef51fafee16046d986a0f52b..a5d08e8ca2e720f23c4c8530d343ea7f64c4d46e 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/AlterTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/AlterTest.php
@@ -8,7 +8,7 @@
 namespace Drupal\system\Tests\Database;
 
 /**
- * Select alter tests.
+ * Tests alter queries.
  *
  * @see database_test_query_alter()
  */
@@ -23,7 +23,7 @@ public static function getInfo() {
   }
 
   /**
-   * Test that we can do basic alters.
+   * Tests that we can do basic alters.
    */
   function testSimpleAlter() {
     $query = db_select('test');
@@ -42,7 +42,7 @@ function testSimpleAlter() {
   }
 
   /**
-   * Test that we can alter the joins on a query.
+   * Tests that we can alter the joins on a query.
    */
   function testAlterWithJoin() {
     $query = db_select('test_task');
@@ -66,7 +66,7 @@ function testAlterWithJoin() {
   }
 
   /**
-   * Test that we can alter a query's conditionals.
+   * Tests that we can alter a query's conditionals.
    */
   function testAlterChangeConditional() {
     $query = db_select('test_task');
@@ -91,7 +91,7 @@ function testAlterChangeConditional() {
   }
 
   /**
-   * Test that we can alter the fields of a query.
+   * Tests that we can alter the fields of a query.
    */
   function testAlterChangeFields() {
     $query = db_select('test');
@@ -106,7 +106,7 @@ function testAlterChangeFields() {
   }
 
   /**
-   * Test that we can alter expressions in the query.
+   * Tests that we can alter expressions in the query.
    */
   function testAlterExpression() {
     $query = db_select('test');
@@ -124,7 +124,9 @@ function testAlterExpression() {
   }
 
   /**
-   * Test that we can remove a range() value from a query. This also tests hook_query_TAG_alter().
+   * Tests that we can remove a range() value from a query.
+   *
+   * This also tests hook_query_TAG_alter().
    */
   function testAlterRemoveRange() {
     $query = db_select('test');
@@ -139,7 +141,7 @@ function testAlterRemoveRange() {
   }
 
   /**
-   * Test that we can do basic alters on subqueries.
+   * Tests that we can do basic alters on subqueries.
    */
   function testSimpleAlterSubquery() {
     // Create a sub-query with an alter tag.
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/BasicSyntaxTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/BasicSyntaxTest.php
index f75502f0a6562ad5a747e5fd792fd3f16901f74f..67286c51ec4ceebfa161f0c67ea6e4e99d77d5e6 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/BasicSyntaxTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/BasicSyntaxTest.php
@@ -8,7 +8,7 @@
 namespace Drupal\system\Tests\Database;
 
 /**
- * Test how the current database driver interprets the SQL syntax.
+ * Tests how the current database driver interprets the SQL syntax.
  *
  * In order to ensure consistent SQL handling throughout Drupal
  * across multiple kinds of database systems, we test that the
@@ -24,7 +24,7 @@ public static function getInfo() {
   }
 
   /**
-   * Test for string concatenation.
+   * Tests string concatenation.
    */
   function testBasicConcat() {
     $result = db_query('SELECT CONCAT(:a1, CONCAT(:a2, CONCAT(:a3, CONCAT(:a4, :a5))))', array(
@@ -38,7 +38,7 @@ function testBasicConcat() {
   }
 
   /**
-   * Test for string concatenation with field values.
+   * Tests string concatenation with field values.
    */
   function testFieldConcat() {
     $result = db_query('SELECT CONCAT(:a1, CONCAT(name, CONCAT(:a2, CONCAT(age, :a3)))) FROM {test} WHERE age = :age', array(
@@ -51,7 +51,7 @@ function testFieldConcat() {
   }
 
   /**
-   * Test escaping of LIKE wildcards.
+   * Tests escaping of LIKE wildcards.
    */
   function testLikeEscape() {
     db_insert('test')
@@ -77,7 +77,7 @@ function testLikeEscape() {
   }
 
   /**
-   * Test LIKE query containing a backslash.
+   * Tests a LIKE query containing a backslash.
    */
   function testLikeBackslash() {
     db_insert('test')
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/CaseSensitivityTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/CaseSensitivityTest.php
index 2d97e0374345e0c0318c1aedcaf45815c52edfa0..57855e245a02db02c6d7a1a1a7dd6cf1acb55c6d 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/CaseSensitivityTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/CaseSensitivityTest.php
@@ -8,7 +8,7 @@
 namespace Drupal\system\Tests\Database;
 
 /**
- * Test case sensitivity handling.
+ * Tests case sensitivity handling.
  */
 class CaseSensitivityTest extends DatabaseTestBase {
   public static function getInfo() {
@@ -20,7 +20,7 @@ public static function getInfo() {
   }
 
   /**
-   * Test BINARY collation in MySQL.
+   * Tests BINARY collation in MySQL.
    */
   function testCaseSensitiveInsert() {
     $num_records_before = db_query('SELECT COUNT(*) FROM {test}')->fetchField();
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/ConnectionTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/ConnectionTest.php
index 21232478343b7339518b949a204727179485fda5..8bdc45e2c820641abb17b7ca3642b1d3efb26038 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/ConnectionTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/ConnectionTest.php
@@ -10,7 +10,7 @@
 use Drupal\Core\Database\Database;
 
 /**
- * Test connection management.
+ * Tests connection management.
  */
 class ConnectionTest extends DatabaseTestBase {
 
@@ -23,7 +23,7 @@ public static function getInfo() {
   }
 
   /**
-   * Test that connections return appropriate connection objects.
+   * Tests that connections return appropriate connection objects.
    */
   function testConnectionRouting() {
     // Clone the master credentials to a slave connection.
@@ -57,7 +57,7 @@ function testConnectionRouting() {
   }
 
   /**
-   * Test that connections return appropriate connection objects.
+   * Tests that connections return appropriate connection objects.
    */
   function testConnectionRoutingOverride() {
     // Clone the master credentials to a slave connection.
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/DatabaseTestBase.php b/core/modules/system/lib/Drupal/system/Tests/Database/DatabaseTestBase.php
index f507c290c14ad1213a6bab5039134ff62a500fe0..977dc8d944033fd15f3f19aff5fd169b713f12d0 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/DatabaseTestBase.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/DatabaseTestBase.php
@@ -10,7 +10,7 @@
 use Drupal\simpletest\WebTestBase;
 
 /**
- * Base test class for databases.
+ * Tests for databases.
  *
  * Because all database tests share the same test data, we can centralize that
  * here.
@@ -39,7 +39,7 @@ function setUp() {
   }
 
   /**
-   * Set up several tables needed by a certain test.
+   * Sets up several tables needed by a certain test.
    *
    * @param $schema
    *   An array of table definitions to install.
@@ -59,7 +59,7 @@ function installTables($schema) {
   }
 
   /**
-   * Set up tables for NULL handling.
+   * Sets up tables for NULL handling.
    */
   function ensureSampleDataNull() {
     $schema['test_null'] = drupal_get_schema('test_null');
@@ -83,7 +83,7 @@ function ensureSampleDataNull() {
   }
 
   /**
-   * Setup our sample data.
+   * Sets up our sample data.
    *
    * These are added using db_query(), since we're not trying to test the
    * INSERT operations here, just populate.
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/DeleteTruncateTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/DeleteTruncateTest.php
index 36d5516591b0437d385ecb79be38577f983f98a4..e31ac2c1e8fe64c7d7d2e63fafa8b7a83a2701fc 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/DeleteTruncateTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/DeleteTruncateTest.php
@@ -29,7 +29,7 @@ public static function getInfo() {
   }
 
   /**
-   * Confirm that we can use a subselect in a delete successfully.
+   * Confirms that we can use a subselect in a delete successfully.
    */
   function testSubselectDelete() {
     $num_records_before = db_query('SELECT COUNT(*) FROM {test_task}')->fetchField();
@@ -50,7 +50,7 @@ function testSubselectDelete() {
   }
 
   /**
-   * Confirm that we can delete a single record successfully.
+   * Confirms that we can delete a single record successfully.
    */
   function testSimpleDelete() {
     $num_records_before = db_query('SELECT COUNT(*) FROM {test}')->fetchField();
@@ -65,7 +65,7 @@ function testSimpleDelete() {
   }
 
   /**
-   * Confirm that we can truncate a whole table successfully.
+   * Confirms that we can truncate a whole table successfully.
    */
   function testTruncate() {
     $num_records_before = db_query("SELECT COUNT(*) FROM {test}")->fetchField();
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/EmptyStatementTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/EmptyStatementTest.php
index 12289f6b65c4ed7e60241e565e946b3ca887c890..b54f7058a8d260b0229a2609aa947702ae103e56 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/EmptyStatementTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/EmptyStatementTest.php
@@ -24,7 +24,7 @@ public static function getInfo() {
   }
 
   /**
-   * Test that the empty result set behaves as empty.
+   * Tests that the empty result set behaves as empty.
    */
   function testEmpty() {
     $result = new StatementEmpty();
@@ -34,7 +34,7 @@ function testEmpty() {
   }
 
   /**
-   * Test that the empty result set iterates safely.
+   * Tests that the empty result set iterates safely.
    */
   function testEmptyIteration() {
     $result = new StatementEmpty();
@@ -48,7 +48,7 @@ function testEmptyIteration() {
   }
 
   /**
-   * Test that the empty result set mass-fetches in an expected way.
+   * Tests that the empty result set mass-fetches in an expected way.
    */
   function testEmptyFetchAll() {
     $result = new StatementEmpty();
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/FakeRecord.php b/core/modules/system/lib/Drupal/system/Tests/Database/FakeRecord.php
index 80419b7e9a7b3836ff073ab46da0fa662f7a9207..89babd555887e781700354a9e430f4d1f68e363c 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/FakeRecord.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/FakeRecord.php
@@ -7,9 +7,8 @@
 
 namespace Drupal\system\Tests\Database;
 
-
 /**
- * Dummy class for fetching into a class.
+ * Fetches into a class.
  *
  * PDO supports using a new instance of an arbitrary class for records
  * rather than just a stdClass or array. This class is for testing that
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/FetchTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/FetchTest.php
index 6d01eaf9ba83631dda4d0471b051871df8e2fb35..db24ba935eb1023af02faa54722208f12d2a1c5f 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/FetchTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/FetchTest.php
@@ -11,7 +11,7 @@
 use PDO;
 
 /**
- * Test fetch actions, part 1.
+ * Tests fetch actions.
  *
  * We get timeout errors if we try to run too many tests at once.
  */
@@ -26,7 +26,7 @@ public static function getInfo() {
   }
 
   /**
-   * Confirm that we can fetch a record properly in default object mode.
+   * Confirms that we can fetch a record properly in default object mode.
    */
   function testQueryFetchDefault() {
     $records = array();
@@ -42,7 +42,7 @@ function testQueryFetchDefault() {
   }
 
   /**
-   * Confirm that we can fetch a record to an object explicitly.
+   * Confirms that we can fetch a record to an object explicitly.
    */
   function testQueryFetchObject() {
     $records = array();
@@ -57,7 +57,7 @@ function testQueryFetchObject() {
   }
 
   /**
-   * Confirm that we can fetch a record to an array associative explicitly.
+   * Confirms that we can fetch a record to an associative array explicitly.
    */
   function testQueryFetchArray() {
     $records = array();
@@ -73,7 +73,7 @@ function testQueryFetchArray() {
   }
 
   /**
-   * Confirm that we can fetch a record into a new instance of a custom class.
+   * Confirms that we can fetch a record into a new instance of a custom class.
    *
    * @see Drupal\system\Tests\Database\FakeRecord
    */
@@ -90,7 +90,9 @@ function testQueryFetchClass() {
     $this->assertIdentical(count($records), 1, 'There is only one record.');
   }
 
-  // Confirm that we can fetch a record into an indexed array explicitly.
+  /**
+   * Confirms that we can fetch a record into an indexed array explicitly.
+   */
   function testQueryFetchNum() {
     $records = array();
     $result = db_query('SELECT name FROM {test} WHERE age = :age', array(':age' => 25), array('fetch' => PDO::FETCH_NUM));
@@ -105,7 +107,7 @@ function testQueryFetchNum() {
   }
 
   /**
-   * Confirm that we can fetch a record into a doubly-keyed array explicitly.
+   * Confirms that we can fetch a record into a doubly-keyed array explicitly.
    */
   function testQueryFetchBoth() {
     $records = array();
@@ -122,7 +124,7 @@ function testQueryFetchBoth() {
   }
 
   /**
-   * Confirm that we can fetch an entire column of a result set at once.
+   * Confirms that we can fetch an entire column of a result set at once.
    */
   function testQueryFetchCol() {
     $records = array();
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/InsertDefaultsTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/InsertDefaultsTest.php
index 72af33e8fcbf2ec83172f849a4fb6ec28f9d176e..7282071d7f430f9d67159b97867aca2ae9b4db21 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/InsertDefaultsTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/InsertDefaultsTest.php
@@ -10,7 +10,7 @@
 use Drupal\Core\Database\Query\NoFieldsException;
 
 /**
- * Insert tests for "database default" values.
+ * Tests insertion for database default values.
  */
 class InsertDefaultsTest extends DatabaseTestBase {
 
@@ -23,7 +23,7 @@ public static function getInfo() {
   }
 
   /**
-   * Test that we can run a query that is "default values for everything".
+   * Tests that we can run a query that uses default values for everything.
    */
   function testDefaultInsert() {
     $query = db_insert('test')->useDefaults(array('job'));
@@ -36,7 +36,7 @@ function testDefaultInsert() {
   }
 
   /**
-   * Test that no action will be preformed if no fields are specified.
+   * Tests that no action will be preformed if no fields are specified.
    */
   function testDefaultEmptyInsert() {
     $num_records_before = (int) db_query('SELECT COUNT(*) FROM {test}')->fetchField();
@@ -54,7 +54,7 @@ function testDefaultEmptyInsert() {
   }
 
   /**
-   * Test that we can insert fields with values and defaults in the same query.
+   * Tests that we can insert fields with values and defaults in the same query.
    */
   function testDefaultInsertWithFields() {
     $query = db_insert('test')
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/InsertLobTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/InsertLobTest.php
index 70e6fa082cb7cb9a91968a9a5df6f0659b4fa852..36fd72b68f69c6e8de8e17bd70a82504290c552f 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/InsertLobTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/InsertLobTest.php
@@ -21,7 +21,7 @@ public static function getInfo() {
   }
 
   /**
-   * Test that we can insert a single blob field successfully.
+   * Tests that we can insert a single blob field successfully.
    */
   function testInsertOneBlob() {
     $data = "This is\000a test.";
@@ -34,7 +34,7 @@ function testInsertOneBlob() {
   }
 
   /**
-   * Test that we can insert multiple blob fields in the same query.
+   * Tests that we can insert multiple blob fields in the same query.
    */
   function testInsertMultipleBlob() {
     $id = db_insert('test_two_blobs')
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/InsertTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/InsertTest.php
index dcf4c14460a8acc6ce16b3e07e1270912795446e..ffaeee0fbb351c11f03273e3c525fc5f3cdeace3 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/InsertTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/InsertTest.php
@@ -8,7 +8,7 @@
 namespace Drupal\system\Tests\Database;
 
 /**
- * Test the insert builder.
+ * Tests the insert builder.
  */
 class InsertTest extends DatabaseTestBase {
 
@@ -21,7 +21,7 @@ public static function getInfo() {
   }
 
   /**
-   * Test the very basic insert functionality.
+   * Tests very basic insert functionality.
    */
   function testSimpleInsert() {
     $num_records_before = db_query('SELECT COUNT(*) FROM {test}')->fetchField();
@@ -40,7 +40,7 @@ function testSimpleInsert() {
   }
 
   /**
-   * Test that we can insert multiple records in one query object.
+   * Tests that we can insert multiple records in one query object.
    */
   function testMultiInsert() {
     $num_records_before = (int) db_query('SELECT COUNT(*) FROM {test}')->fetchField();
@@ -73,7 +73,7 @@ function testMultiInsert() {
   }
 
   /**
-   * Test that an insert object can be reused with new data after it executes.
+   * Tests that an insert object can be reused with new data after it executes.
    */
   function testRepeatedInsert() {
     $num_records_before = db_query('SELECT COUNT(*) FROM {test}')->fetchField();
@@ -108,7 +108,7 @@ function testRepeatedInsert() {
   }
 
   /**
-   * Test that we can specify fields without values and specify values later.
+   * Tests that we can specify fields without values and specify values later.
    */
   function testInsertFieldOnlyDefinintion() {
     // This is useful for importers, when we want to create a query and define
@@ -142,7 +142,7 @@ function testInsertLastInsertID() {
   }
 
   /**
-   * Test that the INSERT INTO ... SELECT ... syntax works.
+   * Tests that the INSERT INTO ... SELECT ... syntax works.
    */
   function testInsertSelect() {
     $query = db_select('test_people', 'tp');
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/InvalidDataTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/InvalidDataTest.php
index 7cbe9ec213457b6c9adfada7ce2011141bc4634d..90a9e18a150d53e1a521f1355cf8897423076604 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/InvalidDataTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/InvalidDataTest.php
@@ -10,7 +10,7 @@
 use Exception;
 
 /**
- * Test invalid data handling.
+ * Tests invalid data handling.
  */
 class InvalidDataTest extends DatabaseTestBase {
   public static function getInfo() {
@@ -22,7 +22,7 @@ public static function getInfo() {
   }
 
   /**
-   * Traditional SQL database systems abort inserts when invalid data is encountered.
+   * Tests aborting of traditional SQL database systems with invalid data.
    */
   function testInsertDuplicateData() {
     // Try to insert multiple records where at least one has bad data.
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/LoggingTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/LoggingTest.php
index 3ae3cd46c3c0fbcd7bca7d9b89aebf0ced7f32dd..ad3c3c8e4c6816126964234ee659de0b4364bb5e 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/LoggingTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/LoggingTest.php
@@ -10,7 +10,7 @@
 use Drupal\Core\Database\Database;
 
 /**
- * Query logging tests.
+ * Tests query logging.
  */
 class LoggingTest extends DatabaseTestBase {
 
@@ -23,7 +23,7 @@ public static function getInfo() {
   }
 
   /**
-   * Test that we can log the existence of a query.
+   * Tests that we can log the existence of a query.
    */
   function testEnableLogging() {
     $log = Database::startLog('testing');
@@ -44,7 +44,7 @@ function testEnableLogging() {
   }
 
   /**
-   * Test that we can run two logs in parallel.
+   * Tests that we can run two logs in parallel.
    */
   function testEnableMultiLogging() {
     Database::startLog('testing1');
@@ -63,7 +63,7 @@ function testEnableMultiLogging() {
   }
 
   /**
-   * Test that we can log queries against multiple targets on the same connection.
+   * Tests logging queries against multiple targets on the same connection.
    */
   function testEnableTargetLogging() {
     // Clone the master credentials to a slave connection and to another fake
@@ -85,7 +85,7 @@ function testEnableTargetLogging() {
   }
 
   /**
-   * Test that logs to separate targets collapse to the same connection properly.
+   * Tests that logs to separate targets utilize the same connection properly.
    *
    * This test is identical to the one above, except that it doesn't create
    * a fake target so the query should fall back to running on the default
@@ -111,7 +111,7 @@ function testEnableTargetLoggingNoTarget() {
   }
 
   /**
-   * Test that we can log queries separately on different connections.
+   * Tests that we can log queries separately on different connections.
    */
   function testEnableMultiConnectionLogging() {
     // Clone the master credentials to a fake connection.
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/MergeTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/MergeTest.php
index 1f732a3bc1d98f543dea8183a2f459501dbd8e37..c9e56371587e0d27a5bb9d7bf85e3098c8c7d395 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/MergeTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/MergeTest.php
@@ -11,7 +11,7 @@
 use Drupal\Core\Database\Query\InvalidMergeQueryException;
 
 /**
- * Test the MERGE query builder.
+ * Tests the MERGE query builder.
  */
 class MergeTest extends DatabaseTestBase {
 
@@ -24,7 +24,7 @@ public static function getInfo() {
   }
 
   /**
-   * Confirm that we can merge-insert a record successfully.
+   * Confirms that we can merge-insert a record successfully.
    */
   function testMergeInsert() {
     $num_records_before = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
@@ -49,7 +49,7 @@ function testMergeInsert() {
   }
 
   /**
-   * Confirm that we can merge-update a record successfully.
+   * Confirms that we can merge-update a record successfully.
    */
   function testMergeUpdate() {
     $num_records_before = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
@@ -74,7 +74,10 @@ function testMergeUpdate() {
   }
 
   /**
-   * Confirm that we can merge-update a record successfully, with different insert and update.
+   * Confirms that we can merge-update a record successfully.
+   *
+   * This test varies from the previous test because it manually defines which
+   * fields are inserted, and which fields are updated.
    */
   function testMergeUpdateExcept() {
     $num_records_before = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
@@ -95,7 +98,7 @@ function testMergeUpdateExcept() {
   }
 
   /**
-   * Confirm that we can merge-update a record successfully, with alternate replacement.
+   * Confirms that we can merge-update a record successfully, with alternate replacement.
    */
   function testMergeUpdateExplicit() {
     $num_records_before = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
@@ -121,7 +124,7 @@ function testMergeUpdateExplicit() {
   }
 
   /**
-   * Confirm that we can merge-update a record successfully, with expressions.
+   * Confirms that we can merge-update a record successfully, with expressions.
    */
   function testMergeUpdateExpression() {
     $num_records_before = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
@@ -150,7 +153,7 @@ function testMergeUpdateExpression() {
   }
 
   /**
-   * Test that we can merge-insert without any update fields.
+   * Tests that we can merge-insert without any update fields.
    */
   function testMergeInsertWithoutUpdate() {
     $num_records_before = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
@@ -169,7 +172,7 @@ function testMergeInsertWithoutUpdate() {
   }
 
   /**
-   * Confirm that we can merge-update without any update fields.
+   * Confirms that we can merge-update without any update fields.
    */
   function testMergeUpdateWithoutUpdate() {
     $num_records_before = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
@@ -201,7 +204,7 @@ function testMergeUpdateWithoutUpdate() {
   }
 
   /**
-   * Test that an invalid merge query throws an exception like it is supposed to.
+   * Tests that an invalid merge query throws an exception.
    */
   function testInvalidMerge() {
     try {
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/NextIdTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/NextIdTest.php
index db31a5cf960a44dd871e045a4c8c561e82c083f0..fc84e2bec064464faf6291c5390834f0d286c4a9 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/NextIdTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/NextIdTest.php
@@ -10,7 +10,7 @@
 use Drupal\simpletest\WebTestBase;
 
 /**
- * Check the sequences API.
+ * Checks the sequences API.
  */
 class NextIdTest extends WebTestBase {
   public static function getInfo() {
@@ -22,7 +22,7 @@ public static function getInfo() {
   }
 
   /**
-   * Test that the sequences API work.
+   * Tests that the sequences API works.
    */
   function testDbNextId() {
     $first = db_next_id();
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/QueryTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/QueryTest.php
index 034d7f32e87b23d88c113f0fd6f17551f04dc83b..157267e888b7ecd674e2b509a6cecc74eac17afc 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/QueryTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/QueryTest.php
@@ -8,7 +8,7 @@
 namespace Drupal\system\Tests\Database;
 
 /**
- * Drupal-specific SQL syntax tests.
+ * Tests Drupal-specific SQL syntax tests.
  */
 class QueryTest extends DatabaseTestBase {
   public static function getInfo() {
@@ -20,7 +20,7 @@ public static function getInfo() {
   }
 
   /**
-   * Test that we can specify an array of values in the query by simply passing in an array.
+   * Tests that we can pass an array of values directly in the query.
    */
   function testArraySubstitution() {
     $names = db_query('SELECT name FROM {test} WHERE age IN (:ages) ORDER BY age', array(':ages' => array(25, 26, 27)))->fetchAll();
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/RangeQueryTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/RangeQueryTest.php
index 60db2b3219e5cfa10597b168a757d1dd2f91ce5e..7821dbc665d78b8b6c864c25c4174d9531492d37 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/RangeQueryTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/RangeQueryTest.php
@@ -8,7 +8,7 @@
 namespace Drupal\system\Tests\Database;
 
 /**
- * Range query tests.
+ * Tests range queries.
  */
 class RangeQueryTest extends DatabaseTestBase {
 
@@ -28,7 +28,7 @@ public static function getInfo() {
   }
 
   /**
-   * Confirm that range query work and return correct result.
+   * Confirms that range queries work and return the correct result.
    */
   function testRangeQuery() {
     // Test if return correct number of rows.
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/RegressionTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/RegressionTest.php
index 5d2466e54569525adc6e7b45aaba2d5a9f74b32f..4e4f3645bee3bb8151ce2c383bd6438491cc9b93 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/RegressionTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/RegressionTest.php
@@ -8,7 +8,7 @@
 namespace Drupal\system\Tests\Database;
 
 /**
- * Regression tests.
+ * Tests for database regressions.
  */
 class RegressionTest extends DatabaseTestBase {
 
@@ -28,10 +28,7 @@ public static function getInfo() {
   }
 
   /**
-   * Regression test for #310447.
-   *
-   * Tries to insert non-ascii UTF-8 data in a database column and checks
-   * if its stored properly.
+   * Ensures that non-ASCII UTF-8 data is stored in the database properly.
    */
   function testRegression_310447() {
     // That's a 255 character UTF-8 string.
@@ -48,7 +45,7 @@ function testRegression_310447() {
   }
 
   /**
-   * Test the db_table_exists() function.
+   * Tests the db_table_exists() function.
    */
   function testDBTableExists() {
     $this->assertIdentical(TRUE, db_table_exists('node'), 'Returns true for existent table.');
@@ -56,7 +53,7 @@ function testDBTableExists() {
   }
 
   /**
-   * Test the db_field_exists() function.
+   * Tests the db_field_exists() function.
    */
   function testDBFieldExists() {
     $this->assertIdentical(TRUE, db_field_exists('node', 'nid'), 'Returns true for existent column.');
@@ -64,7 +61,7 @@ function testDBFieldExists() {
   }
 
   /**
-   * Test the db_index_exists() function.
+   * Tests the db_index_exists() function.
    */
   function testDBIndexExists() {
     $this->assertIdentical(TRUE, db_index_exists('node', 'node_created'), 'Returns true for existent index.');
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/SelectComplexTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/SelectComplexTest.php
index e8a1d1eac7770ae7a05bb79d0c0f81a0dd67dfc2..6476f1e3785c86a9c243f39a08df65e014b2c69e 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/SelectComplexTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/SelectComplexTest.php
@@ -8,7 +8,7 @@
 namespace Drupal\system\Tests\Database;
 
 /**
- * Test more complex select statements.
+ * Tests more complex select statements.
  */
 class SelectComplexTest extends DatabaseTestBase {
 
@@ -28,7 +28,7 @@ public static function getInfo() {
   }
 
   /**
-   * Test simple JOIN statements.
+   * Tests simple JOIN statements.
    */
   function testDefaultJoin() {
     $query = db_select('test_task', 't');
@@ -53,7 +53,7 @@ function testDefaultJoin() {
   }
 
   /**
-   * Test LEFT OUTER joins.
+   * Tests LEFT OUTER joins.
    */
   function testLeftOuterJoin() {
     $query = db_select('test', 'p');
@@ -78,7 +78,7 @@ function testLeftOuterJoin() {
   }
 
   /**
-   * Test GROUP BY clauses.
+   * Tests GROUP BY clauses.
    */
   function testGroupBy() {
     $query = db_select('test_task', 't');
@@ -114,7 +114,7 @@ function testGroupBy() {
   }
 
   /**
-   * Test GROUP BY and HAVING clauses together.
+   * Tests GROUP BY and HAVING clauses together.
    */
   function testGroupByAndHaving() {
     $query = db_select('test_task', 't');
@@ -148,7 +148,9 @@ function testGroupByAndHaving() {
   }
 
   /**
-   * Test range queries. The SQL clause varies with the database.
+   * Tests range queries.
+   *
+   * The SQL clause varies with the database.
    */
   function testRange() {
     $query = db_select('test');
@@ -166,7 +168,7 @@ function testRange() {
   }
 
   /**
-   * Test distinct queries.
+   * Tests distinct queries.
    */
   function testDistinct() {
     $query = db_select('test_task');
@@ -183,7 +185,7 @@ function testDistinct() {
   }
 
   /**
-   * Test that we can generate a count query from a built query.
+   * Tests that we can generate a count query from a built query.
    */
   function testCountQuery() {
     $query = db_select('test');
@@ -214,8 +216,7 @@ function testHavingCountQuery() {
   }
 
   /**
-   * Test that countQuery properly removes 'all_fields' statements and
-   * ordering clauses.
+   * Tests that countQuery removes 'all_fields' statements and ordering clauses.
    */
   function testCountQueryRemovals() {
     $query = db_select('test');
@@ -243,7 +244,7 @@ function testCountQueryRemovals() {
 
 
   /**
-   * Test that countQuery properly removes fields and expressions.
+   * Tests that countQuery properly removes fields and expressions.
    */
   function testCountQueryFieldRemovals() {
     // countQuery should remove all fields and expressions, so this can be
@@ -261,7 +262,7 @@ function testCountQueryFieldRemovals() {
   }
 
   /**
-   * Test that we can generate a count query from a query with distinct.
+   * Tests that we can generate a count query from a query with distinct.
    */
   function testCountQueryDistinct() {
     $query = db_select('test_task');
@@ -274,7 +275,7 @@ function testCountQueryDistinct() {
   }
 
   /**
-   * Test that we can generate a count query from a query with GROUP BY.
+   * Tests that we can generate a count query from a query with GROUP BY.
    */
   function testCountQueryGroupBy() {
     $query = db_select('test_task');
@@ -299,7 +300,7 @@ function testCountQueryGroupBy() {
   }
 
   /**
-   * Confirm that we can properly nest conditional clauses.
+   * Confirms that we can properly nest conditional clauses.
    */
   function testNestedConditions() {
     // This query should translate to:
@@ -316,7 +317,7 @@ function testNestedConditions() {
   }
 
   /**
-   * Confirm we can join on a single table twice with a dynamic alias.
+   * Confirms we can join on a single table twice with a dynamic alias.
    */
   function testJoinTwice() {
     $query = db_select('test')->fields('test');
@@ -330,7 +331,7 @@ function testJoinTwice() {
   }
 
   /**
-   * Test that we can join on a query.
+   * Tests that we can join on a query.
    */
   function testJoinSubquery() {
     $acct = $this->drupalCreateUser();
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/SelectOrderedTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/SelectOrderedTest.php
index 4d0cab10fb9bcf18eea088fc5befb5b4fbaafcae..54b03794066cdd4c1cb2cb01523f2cc64a485a69 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/SelectOrderedTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/SelectOrderedTest.php
@@ -10,7 +10,7 @@
 use PDO;
 
 /**
- * Test select with order by clauses.
+ * Tests SELECT with ORDER BY clauses.
  */
 class SelectOrderedTest extends DatabaseTestBase {
 
@@ -23,7 +23,7 @@ public static function getInfo() {
   }
 
   /**
-   * Test basic order by.
+   * Tests basic ORDER BY.
    */
   function testSimpleSelectOrdered() {
     $query = db_select('test');
@@ -44,7 +44,7 @@ function testSimpleSelectOrdered() {
   }
 
   /**
-   * Test multiple order by.
+   * Tests multiple ORDER BY.
    */
   function testSimpleSelectMultiOrdered() {
     $query = db_select('test');
@@ -75,7 +75,7 @@ function testSimpleSelectMultiOrdered() {
   }
 
   /**
-   * Test order by descending.
+   * Tests ORDER BY descending.
    */
   function testSimpleSelectOrderedDesc() {
     $query = db_select('test');
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/SelectPagerDefaultTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/SelectPagerDefaultTest.php
index d5888c9db2fa6b9f57772a223b9efb5e2bcb6a28..a8c3daff298ee243d4e4bab29af931ec0e8abb33 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/SelectPagerDefaultTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/SelectPagerDefaultTest.php
@@ -21,7 +21,7 @@ public static function getInfo() {
   }
 
   /**
-   * Confirm that a pager query returns the correct results.
+   * Confirms that a pager query returns the correct results.
    *
    * Note that we have to make an HTTP request to a test page handler
    * because the pager depends on GET parameters.
@@ -55,7 +55,7 @@ function testEvenPagerQuery() {
   }
 
   /**
-   * Confirm that a pager query returns the correct results.
+   * Confirms that a pager query returns the correct results.
    *
    * Note that we have to make an HTTP request to a test page handler
    * because the pager depends on GET parameters.
@@ -89,7 +89,7 @@ function testOddPagerQuery() {
   }
 
   /**
-   * Confirm that a pager query with inner pager query returns valid results.
+   * Confirms that a pager query results with an inner pager query are valid.
    *
    * This is a regression test for #467984.
    */
@@ -111,7 +111,7 @@ function testInnerPagerQuery() {
   }
 
   /**
-   * Confirm that a paging query with a having expression returns valid results.
+   * Confirms that a paging query results with a having expression are valid.
    *
    * This is a regression test for #467984.
    */
@@ -132,7 +132,7 @@ function testHavingPagerQuery() {
   }
 
   /**
-   * Confirm that every pager gets a valid non-overlaping element ID.
+   * Confirms that every pager gets a valid, non-overlaping element ID.
    */
   function testElementNumbers() {
     $_GET['page'] = '3, 2, 1, 0';
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/SelectSubqueryTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/SelectSubqueryTest.php
index 81fd01854cda8f8d5787d08febddb677c6c173e7..d36c9621e5533d9ad16471b85c55de808955f7f2 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/SelectSubqueryTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/SelectSubqueryTest.php
@@ -21,7 +21,7 @@ public static function getInfo() {
   }
 
   /**
-   * Test that we can use a subquery in a FROM clause.
+   * Tests that we can use a subquery in a FROM clause.
    */
   function testFromSubquerySelect() {
     // Create a subquery, which is just a normal query object.
@@ -55,7 +55,7 @@ function testFromSubquerySelect() {
   }
 
   /**
-   * Test that we can use a subquery in a FROM clause with a limit.
+   * Tests that we can use a subquery in a FROM clause with a LIMIT.
    */
   function testFromSubquerySelectWithLimit() {
     // Create a subquery, which is just a normal query object.
@@ -81,7 +81,7 @@ function testFromSubquerySelectWithLimit() {
   }
 
   /**
-   * Test that we can use a subquery in a WHERE clause.
+   * Tests that we can use a subquery in a WHERE clause.
    */
   function testConditionSubquerySelect() {
     // Create a subquery, which is just a normal query object.
@@ -104,7 +104,7 @@ function testConditionSubquerySelect() {
   }
 
   /**
-   * Test that we can use a subquery in a JOIN clause.
+   * Tests that we can use a subquery in a JOIN clause.
    */
   function testJoinSubquerySelect() {
     // Create a subquery, which is just a normal query object.
@@ -128,7 +128,7 @@ function testJoinSubquerySelect() {
   }
 
   /**
-   * Test EXISTS subquery conditionals on SELECT statements.
+   * Tests EXISTS subquery conditionals on SELECT statements.
    *
    * We essentially select all rows from the {test} table that have matching
    * rows in the {test_people} table based on the shared name column.
@@ -158,7 +158,7 @@ function testExistsSubquerySelect() {
   }
 
   /**
-   * Test NOT EXISTS subquery conditionals on SELECT statements.
+   * Tests NOT EXISTS subquery conditionals on SELECT statements.
    *
    * We essentially select all rows from the {test} table that don't have
    * matching rows in the {test_people} table based on the shared name column.
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/SelectTableSortDefaultTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/SelectTableSortDefaultTest.php
index ab611b4218d077c1a2bc7000c4fc0cde25810759..a84894710bf4f2da75ca1b460af1961279d59f86 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/SelectTableSortDefaultTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/SelectTableSortDefaultTest.php
@@ -21,7 +21,7 @@ public static function getInfo() {
   }
 
   /**
-   * Confirm that a tablesort query returns the correct results.
+   * Confirms that a tablesort query returns the correct results.
    *
    * Note that we have to make an HTTP request to a test page handler
    * because the pager depends on GET parameters.
@@ -49,8 +49,10 @@ function testTableSortQuery() {
   }
 
   /**
-   * Confirm that if a tablesort's orderByHeader is called before another orderBy, that the header happens first.
+   * Confirms precedence of tablesorts headers.
    *
+   * If a tablesort's orderByHeader is called before another orderBy, then its
+   * header happens first.
    */
   function testTableSortQueryFirst() {
     $sorts = array(
@@ -75,7 +77,7 @@ function testTableSortQueryFirst() {
   }
 
   /**
-   * Confirm that if a sort is not set in a tableselect form there is no error thrown when using the default.
+   * Confirms that no error is thrown if a sort is not set in a default tableselect.
    */
   function testTableSortDefaultSort() {
     $this->drupalGet('database_test/tablesort_default_sort');
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/SelectTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/SelectTest.php
index af4485de60ea3eb11c4c3c1ebf6e9e2430e4193f..802aef39e190d332f068bb5cc097c31e8a893e1c 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/SelectTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/SelectTest.php
@@ -8,7 +8,7 @@
 namespace Drupal\system\Tests\Database;
 
 /**
- * Test the SELECT builder.
+ * Tests the SELECT builder.
  */
 class SelectTest extends DatabaseTestBase {
 
@@ -21,7 +21,7 @@ public static function getInfo() {
   }
 
   /**
-   * Test rudimentary SELECT statements.
+   * Tests rudimentary SELECT statements.
    */
   function testSimpleSelect() {
     $query = db_select('test');
@@ -38,7 +38,7 @@ function testSimpleSelect() {
   }
 
   /**
-   * Test rudimentary SELECT statement with a COMMENT.
+   * Tests rudimentary SELECT statement with a COMMENT.
    */
   function testSimpleComment() {
     $query = db_select('test')->comment('Testing query comments');
@@ -59,7 +59,7 @@ function testSimpleComment() {
   }
 
   /**
-   * Test query COMMENT system against vulnerabilities.
+   * Tests query COMMENT system against vulnerabilities.
    */
   function testVulnerableComment() {
     $query = db_select('test')->comment('Testing query comments */ SELECT nid FROM {node}; --');
@@ -80,7 +80,7 @@ function testVulnerableComment() {
   }
 
   /**
-   * Test basic conditionals on SELECT statements.
+   * Tests basic conditionals on SELECT statements.
    */
   function testSimpleSelectConditional() {
     $query = db_select('test');
@@ -100,7 +100,7 @@ function testSimpleSelectConditional() {
   }
 
   /**
-   * Test SELECT statements with expressions.
+   * Tests SELECT statements with expressions.
    */
   function testSimpleSelectExpression() {
     $query = db_select('test');
@@ -120,7 +120,7 @@ function testSimpleSelectExpression() {
   }
 
   /**
-   * Test SELECT statements with multiple expressions.
+   * Tests SELECT statements with multiple expressions.
    */
   function testSimpleSelectExpressionMultiple() {
     $query = db_select('test');
@@ -142,7 +142,7 @@ function testSimpleSelectExpressionMultiple() {
   }
 
   /**
-   * Test adding multiple fields to a select statement at the same time.
+   * Tests adding multiple fields to a SELECT statement at the same time.
    */
   function testSimpleSelectMultipleFields() {
     $record = db_select('test')
@@ -165,7 +165,7 @@ function testSimpleSelectMultipleFields() {
   }
 
   /**
-   * Test adding all fields from a given table to a select statement.
+   * Tests adding all fields from a given table to a SELECT statement.
    */
   function testSimpleSelectAllFields() {
     $record = db_select('test')
@@ -188,7 +188,7 @@ function testSimpleSelectAllFields() {
   }
 
   /**
-   * Test that a comparison with NULL is always FALSE.
+   * Tests that a comparison with NULL is always FALSE.
    */
   function testNullCondition() {
     $this->ensureSampleDataNull();
@@ -202,7 +202,7 @@ function testNullCondition() {
   }
 
   /**
-   * Test that we can find a record with a NULL value.
+   * Tests that we can find a record with a NULL value.
    */
   function testIsNullCondition() {
     $this->ensureSampleDataNull();
@@ -217,7 +217,7 @@ function testIsNullCondition() {
   }
 
   /**
-   * Test that we can find a record without a NULL value.
+   * Tests that we can find a record without a NULL value.
    */
   function testIsNotNullCondition() {
     $this->ensureSampleDataNull();
@@ -234,8 +234,10 @@ function testIsNotNullCondition() {
   }
 
   /**
-   * Test that we can UNION multiple Select queries together. This is
-   * semantically equal to UNION DISTINCT, so we don't explicity test that.
+   * Tests that we can UNION multiple Select queries together.
+   *
+   * This is semantically equal to UNION DISTINCT, so we don't explicity test
+   * that.
    */
   function testUnion() {
     $query_1 = db_select('test', 't')
@@ -258,7 +260,7 @@ function testUnion() {
   }
 
   /**
-   * Test that we can UNION ALL multiple Select queries together.
+   * Tests that we can UNION ALL multiple SELECT queries together.
    */
   function testUnionAll() {
     $query_1 = db_select('test', 't')
@@ -304,7 +306,7 @@ function testUnionCount() {
   }
 
   /**
-   * Test that random ordering of queries works.
+   * Tests that random ordering of queries works.
    *
    * We take the approach of testing the Drupal layer only, rather than trying
    * to test that the database's random number generator actually produces
@@ -366,7 +368,7 @@ function testRandomOrder() {
   }
 
   /**
-   * Test that aliases are renamed when duplicates.
+   * Tests that aliases are renamed when duplicates.
    */
   function testSelectDuplicateAlias() {
     $query = db_select('test', 't');
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/SerializeQueryTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/SerializeQueryTest.php
index df0ffadf1a9b5b0ea8db84847c140522967091af..4d0727fa537320a6ad3efa19f852dba7e2f7ae7a 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/SerializeQueryTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/SerializeQueryTest.php
@@ -8,7 +8,7 @@
 namespace Drupal\system\Tests\Database;
 
 /**
- * Query serialization tests.
+ * Tests query serialization.
  */
 class SerializeQueryTest extends DatabaseTestBase {
   public static function getInfo() {
@@ -20,7 +20,7 @@ public static function getInfo() {
   }
 
   /**
-   * Confirm that a query can be serialized and unserialized.
+   * Confirms that a query can be serialized and unserialized.
    */
   function testSerializeQuery() {
     $query = db_select('test');
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/TaggingTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/TaggingTest.php
index 18844a1f9f2ea01891225fadab4bb017575c3e7a..d7352a0f14786f6f786673a8a3c584984c5ce373 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/TaggingTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/TaggingTest.php
@@ -8,7 +8,7 @@
 namespace Drupal\system\Tests\Database;
 
 /**
- * Select tagging tests.
+ * Tests SELECT query tagging.
  *
  * Tags are a way to flag queries for alter hooks so they know
  * what type of query it is, such as "node_access".
@@ -24,7 +24,7 @@ public static function getInfo() {
   }
 
   /**
-   * Confirm that a query has a "tag" added to it.
+   * Confirms that a query has a tag added to it.
    */
   function testHasTag() {
     $query = db_select('test');
@@ -38,7 +38,7 @@ function testHasTag() {
   }
 
   /**
-   * Test query tagging "has all of these tags" functionality.
+   * Tests query tagging "has all of these tags" functionality.
    */
   function testHasAllTags() {
     $query = db_select('test');
@@ -53,7 +53,7 @@ function testHasAllTags() {
   }
 
   /**
-   * Test query tagging "has at least one of these tags" functionality.
+   * Tests query tagging "has at least one of these tags" functionality.
    */
   function testHasAnyTag() {
     $query = db_select('test');
@@ -67,7 +67,7 @@ function testHasAnyTag() {
   }
 
   /**
-   * Test that we can attach meta data to a query object.
+   * Tests that we can attach metadata to a query object.
    *
    * This is how we pass additional context to alter hooks.
    */
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/TemporaryQueryTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/TemporaryQueryTest.php
index 7c2d0d0bbdb2f82146bb16713b042d699046bacb..529e218044a7962ce17b312042bf60ce569ea70d 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/TemporaryQueryTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/TemporaryQueryTest.php
@@ -8,7 +8,7 @@
 namespace Drupal\system\Tests\Database;
 
 /**
- * Temporary query tests.
+ * Tests temporary queries.
  */
 class TemporaryQueryTest extends DatabaseTestBase {
 
@@ -28,14 +28,14 @@ public static function getInfo() {
   }
 
   /**
-   * Return the number of rows of a table.
+   * Returns the number of rows of a table.
    */
   function countTableRows($table_name) {
     return db_select($table_name)->countQuery()->execute()->fetchField();
   }
 
   /**
-   * Confirm that temporary tables work and are limited to one request.
+   * Confirms that temporary tables work and are limited to one request.
    */
   function testTemporaryQuery() {
     $this->drupalGet('database_test/db_query_temporary');
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/TransactionTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/TransactionTest.php
index f8198bc3581e20bce29066b5ba5dabbdb62562ee..4d5ecf1d1cd5ccaf5e516af8a2aa8cc212ab939c 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/TransactionTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/TransactionTest.php
@@ -13,7 +13,7 @@
 use Exception;
 
 /**
- * Test transaction support, particularly nesting.
+ * Tests transaction support, particularly nesting.
  *
  * We test nesting by having two transaction layers, an outer and inner. The
  * outer layer encapsulates the inner layer. Our transaction nesting abstraction
@@ -43,12 +43,14 @@ public static function getInfo() {
   }
 
   /**
-   * Helper method for transaction unit test. This "outer layer" transaction
-   * starts and then encapsulates the "inner layer" transaction. This nesting
-   * is used to evaluate whether the the database transaction API properly
-   * supports nesting. By "properly supports," we mean the outer transaction
-   * continues to exist regardless of what functions are called and whether
-   * those functions start their own transactions.
+   * Encapsulates a transaction's "inner layer" with an "outer layer".
+   *
+   * This "outer layer" transaction starts and then encapsulates the "inner
+   * layer" transaction. This nesting is used to evaluate whether the the
+   * database transaction API properly supports nesting. By "properly supports,"
+   * we mean the outer transaction continues to exist regardless of what
+   * functions are called and whether those functions start their own
+   * transactions.
    *
    * In contrast, a typical database would commit the outer transaction, start
    * a new transaction for the inner layer, commit the inner layer transaction,
@@ -93,8 +95,10 @@ protected function transactionOuterLayer($suffix, $rollback = FALSE, $ddl_statem
   }
 
   /**
-   * Helper method for transaction unit tests. This "inner layer" transaction
-   * is either used alone or nested inside of the "outer layer" transaction.
+   * Creates an "inner layer" transaction.
+   *
+   * This "inner layer" transaction is either used alone or nested inside of the
+   * "outer layer" transaction.
    *
    * @param $suffix
    *   Suffix to add to field values to differentiate tests.
@@ -151,9 +155,10 @@ protected function transactionInnerLayer($suffix, $rollback = FALSE, $ddl_statem
   }
 
   /**
-   * Test transaction rollback on a database that supports transactions.
+   * Tests transaction rollback on a database that supports transactions.
    *
-   * If the active connection does not support transactions, this test does nothing.
+   * If the active connection does not support transactions, this test does
+   * nothing.
    */
   function testTransactionRollBackSupported() {
     // This test won't work right if transactions are not supported.
@@ -177,7 +182,7 @@ function testTransactionRollBackSupported() {
   }
 
   /**
-   * Test transaction rollback on a database that does not support transactions.
+   * Tests transaction rollback on a database that doesn't support transactions.
    *
    * If the active driver supports transactions, this test does nothing.
    */
@@ -203,7 +208,7 @@ function testTransactionRollBackNotSupported() {
   }
 
   /**
-   * Test committed transaction.
+   * Tests a committed transaction.
    *
    * The behavior of this test should be identical for connections that support
    * transactions and those that do not.
@@ -225,7 +230,7 @@ function testCommittedTransaction() {
   }
 
   /**
-   * Test the compatibility of transactions with DDL statements.
+   * Tests the compatibility of transactions with DDL statements.
    */
   function testTransactionWithDdlStatement() {
     // First, test that a commit works normally, even with DDL statements.
@@ -316,7 +321,7 @@ function testTransactionWithDdlStatement() {
   }
 
   /**
-   * Insert a single row into the testing table.
+   * Inserts a single row into the testing table.
    */
   protected function insertRow($name) {
     db_insert('test')
@@ -327,7 +332,7 @@ protected function insertRow($name) {
   }
 
   /**
-   * Execute a DDL statement.
+   * Executes a DDL statement.
    */
   protected function executeDDLStatement() {
     static $count = 0;
@@ -345,7 +350,7 @@ protected function executeDDLStatement() {
   }
 
   /**
-   * Start over for a new test.
+   * Starts over for a new test.
    */
   protected function cleanUp() {
     db_truncate('test')
@@ -353,7 +358,7 @@ protected function cleanUp() {
   }
 
   /**
-   * Assert that a given row is present in the test table.
+   * Asserts that a given row is present in the test table.
    *
    * @param $name
    *   The name of the row.
@@ -369,7 +374,7 @@ function assertRowPresent($name, $message = NULL) {
   }
 
   /**
-   * Assert that a given row is absent from the test table.
+   * Asserts that a given row is absent from the test table.
    *
    * @param $name
    *   The name of the row.
@@ -385,7 +390,7 @@ function assertRowAbsent($name, $message = NULL) {
   }
 
   /**
-   * Test transaction stacking and commit / rollback.
+   * Tests transaction stacking, commit, and rollback.
    */
   function testTransactionStacking() {
     // This test won't work right if transactions are not supported.
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/UpdateComplexTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/UpdateComplexTest.php
index 585751f0619bbb250fd1114d582ed5ae5a315feb..477836363bf56372dacb17c4d300b75c1d2071d0 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/UpdateComplexTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/UpdateComplexTest.php
@@ -21,7 +21,7 @@ public static function getInfo() {
   }
 
   /**
-   * Test updates with OR conditionals.
+   * Tests updates with OR conditionals.
    */
   function testOrConditionUpdate() {
     $update = db_update('test')
@@ -38,7 +38,7 @@ function testOrConditionUpdate() {
   }
 
   /**
-   * Test WHERE IN clauses.
+   * Tests WHERE IN clauses.
    */
   function testInConditionUpdate() {
     $num_updated = db_update('test')
@@ -52,7 +52,7 @@ function testInConditionUpdate() {
   }
 
   /**
-   * Test WHERE NOT IN clauses.
+   * Tests WHERE NOT IN clauses.
    */
   function testNotInConditionUpdate() {
     // The o is lowercase in the 'NoT IN' operator, to make sure the operators
@@ -68,7 +68,7 @@ function testNotInConditionUpdate() {
   }
 
   /**
-   * Test BETWEEN conditional clauses.
+   * Tests BETWEEN conditional clauses.
    */
   function testBetweenConditionUpdate() {
     $num_updated = db_update('test')
@@ -82,7 +82,7 @@ function testBetweenConditionUpdate() {
   }
 
   /**
-   * Test LIKE conditionals.
+   * Tests LIKE conditionals.
    */
   function testLikeConditionUpdate() {
     $num_updated = db_update('test')
@@ -96,7 +96,7 @@ function testLikeConditionUpdate() {
   }
 
   /**
-   * Test update with expression values.
+   * Tests UPDATE with expression values.
    */
   function testUpdateExpression() {
     $before_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Ringo'))->fetchField();
@@ -119,7 +119,7 @@ function testUpdateExpression() {
   }
 
   /**
-   * Test update with only expression values.
+   * Tests UPDATE with only expression values.
    */
   function testUpdateOnlyExpression() {
     $before_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Ringo'))->fetchField();
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/UpdateLobTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/UpdateLobTest.php
index 978be97963a02135958cdf9c73491d39fe8b22e3..88a98d0d55a61162ec1b64fd1b31d098a5755dbc 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/UpdateLobTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/UpdateLobTest.php
@@ -8,7 +8,7 @@
 namespace Drupal\system\Tests\Database;
 
 /**
- * Test update queries involving LOB values.
+ * Tests UPDATE queries involving LOB values.
  */
 class UpdateLobTest extends DatabaseTestBase {
 
@@ -21,7 +21,7 @@ public static function getInfo() {
   }
 
   /**
-   * Confirm that we can update a blob column.
+   * Confirms that we can update a blob column.
    */
   function testUpdateOneBlob() {
     $data = "This is\000a test.";
@@ -41,7 +41,7 @@ function testUpdateOneBlob() {
   }
 
   /**
-   * Confirm that we can update two blob columns in the same table.
+   * Confirms that we can update two blob columns in the same table.
    */
   function testUpdateMultipleBlob() {
     $id = db_insert('test_two_blobs')
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/UpdateTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/UpdateTest.php
index 97ec9488b9ada83fee32c35b183359e4d44dd806..1558a92b1c7ab89fc307e8086b8c0817f18e4f9c 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/UpdateTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/UpdateTest.php
@@ -8,7 +8,7 @@
 namespace Drupal\system\Tests\Database;
 
 /**
- * Update builder tests.
+ * Updates builder tests.
  */
 class UpdateTest extends DatabaseTestBase {
 
@@ -21,7 +21,7 @@ public static function getInfo() {
   }
 
   /**
-   * Confirm that we can update a single record successfully.
+   * Confirms that we can update a single record successfully.
    */
   function testSimpleUpdate() {
     $num_updated = db_update('test')
@@ -35,7 +35,7 @@ function testSimpleUpdate() {
   }
 
   /**
-   * Confirm updating to NULL.
+   * Confirms updating to NULL.
    */
   function testSimpleNullUpdate() {
     $this->ensureSampleDataNull();
@@ -50,7 +50,7 @@ function testSimpleNullUpdate() {
   }
 
   /**
-   * Confirm that we can update a multiple records successfully.
+   * Confirms that we can update multiple records successfully.
    */
   function testMultiUpdate() {
     $num_updated = db_update('test')
@@ -64,7 +64,7 @@ function testMultiUpdate() {
   }
 
   /**
-   * Confirm that we can update a multiple records with a non-equality condition.
+   * Confirms that we can update multiple records with a non-equality condition.
    */
   function testMultiGTUpdate() {
     $num_updated = db_update('test')
@@ -78,7 +78,7 @@ function testMultiGTUpdate() {
   }
 
   /**
-   * Confirm that we can update a multiple records with a where call.
+   * Confirms that we can update multiple records with a where call.
    */
   function testWhereUpdate() {
     $num_updated = db_update('test')
@@ -92,7 +92,7 @@ function testWhereUpdate() {
   }
 
   /**
-   * Confirm that we can stack condition and where calls.
+   * Confirms that we can stack condition and where calls.
    */
   function testWhereAndConditionUpdate() {
     $update = db_update('test')
@@ -107,7 +107,7 @@ function testWhereAndConditionUpdate() {
   }
 
   /**
-   * Test updating with expressions.
+   * Tests updating with expressions.
    */
   function testExpressionUpdate() {
     // Set age = 1 for a single row for this test to work.
diff --git a/core/modules/system/tests/modules/ajax_forms_test/ajax_forms_test.module b/core/modules/system/tests/modules/ajax_forms_test/ajax_forms_test.module
index 260d9112ed075fa032cf185ff24cc58b1e16674c..dfbd7f05096e93eb6fe641cb05972e284d0d7683 100644
--- a/core/modules/system/tests/modules/ajax_forms_test/ajax_forms_test.module
+++ b/core/modules/system/tests/modules/ajax_forms_test/ajax_forms_test.module
@@ -37,9 +37,8 @@ function ajax_forms_test_menu() {
   return $items;
 }
 
-
 /**
- * A basic form used to test form_state['values'] during callback.
+ * Tests form_state['values'] during callback.
  */
 function ajax_forms_test_simple_form($form, &$form_state) {
   $form = array();
@@ -71,7 +70,7 @@ function ajax_forms_test_simple_form($form, &$form_state) {
 }
 
 /**
- * Ajax callback triggered by select.
+ * Ajax form callback: Selects color.
  */
 function ajax_forms_test_simple_form_select_callback($form, $form_state) {
   $commands = array();
@@ -81,7 +80,7 @@ function ajax_forms_test_simple_form_select_callback($form, $form_state) {
 }
 
 /**
- * Ajax callback triggered by checkbox.
+ * Ajax form callback: Selects checkbox value.
  */
 function ajax_forms_test_simple_form_checkbox_callback($form, $form_state) {
   $commands = array();
@@ -90,9 +89,8 @@ function ajax_forms_test_simple_form_checkbox_callback($form, $form_state) {
   return array('#type' => 'ajax', '#commands' => $commands);
 }
 
-
 /**
- * Form to display the Ajax Commands.
+ * Form constructor for the Ajax Command display form.
  */
 function ajax_forms_test_ajax_commands_form($form, &$form_state) {
   $form = array();
@@ -272,7 +270,7 @@ function ajax_forms_test_ajax_commands_form($form, &$form_state) {
 }
 
 /**
- * Ajax callback for 'after'.
+ * Ajax form callback: Selects 'after'.
  */
 function ajax_forms_test_advanced_commands_after_callback($form, $form_state) {
   $selector = '#after_div';
@@ -283,7 +281,7 @@ function ajax_forms_test_advanced_commands_after_callback($form, $form_state) {
 }
 
 /**
- * Ajax callback for 'alert'.
+ * Ajax form callback: Selects 'alert'.
  */
 function ajax_forms_test_advanced_commands_alert_callback($form, $form_state) {
   $commands = array();
@@ -292,7 +290,7 @@ function ajax_forms_test_advanced_commands_alert_callback($form, $form_state) {
 }
 
 /**
- * Ajax callback for 'append'.
+ * Ajax form callback: Selects 'append'.
  */
 function ajax_forms_test_advanced_commands_append_callback($form, $form_state) {
   $selector = '#append_div';
@@ -302,7 +300,7 @@ function ajax_forms_test_advanced_commands_append_callback($form, $form_state) {
 }
 
 /**
- * Ajax callback for 'before'.
+ * Ajax form callback: Selects 'before'.
  */
 function ajax_forms_test_advanced_commands_before_callback($form, $form_state) {
   $selector = '#before_div';
@@ -313,14 +311,15 @@ function ajax_forms_test_advanced_commands_before_callback($form, $form_state) {
 }
 
 /**
- * Ajax callback for 'changed'.
+ * Ajax form callback: Selects 'changed'.
  */
 function ajax_forms_test_advanced_commands_changed_callback($form, $form_state) {
   $commands[] = ajax_command_changed('#changed_div');
   return array('#type' => 'ajax', '#commands' => $commands);
 }
+
 /**
- * Ajax callback for 'changed' with asterisk marking inner div.
+ * Ajax form callback: Selects 'changed' with asterisk marking inner div.
  */
 function ajax_forms_test_advanced_commands_changed_asterisk_callback($form, $form_state) {
   $commands = array();
@@ -329,7 +328,7 @@ function ajax_forms_test_advanced_commands_changed_asterisk_callback($form, $for
 }
 
 /**
- * Ajax callback for 'css'.
+ * Ajax form callback: Selects 'css'.
  */
 function ajax_forms_test_advanced_commands_css_callback($form, $form_state) {
   $selector = '#css_div';
@@ -341,7 +340,7 @@ function ajax_forms_test_advanced_commands_css_callback($form, $form_state) {
 }
 
 /**
- * Ajax callback for 'data'.
+ * Ajax form callback: Selects 'data'.
  */
 function ajax_forms_test_advanced_commands_data_callback($form, $form_state) {
   $selector = '#data_div';
@@ -352,7 +351,7 @@ function ajax_forms_test_advanced_commands_data_callback($form, $form_state) {
 }
 
 /**
- * Ajax callback for 'invoke'.
+ * Ajax form callback: Selects 'invoke'.
  */
 function ajax_forms_test_advanced_commands_invoke_callback($form, $form_state) {
   $commands = array();
@@ -361,7 +360,7 @@ function ajax_forms_test_advanced_commands_invoke_callback($form, $form_state) {
 }
 
 /**
- * Ajax callback for 'html'.
+ * Ajax form callback: Selects 'html'.
  */
 function ajax_forms_test_advanced_commands_html_callback($form, $form_state) {
   $commands = array();
@@ -370,7 +369,7 @@ function ajax_forms_test_advanced_commands_html_callback($form, $form_state) {
 }
 
 /**
- * Ajax callback for 'insert'.
+ * Ajax form callback: Selects 'insert'.
  */
 function ajax_forms_test_advanced_commands_insert_callback($form, $form_state) {
   $commands = array();
@@ -379,7 +378,7 @@ function ajax_forms_test_advanced_commands_insert_callback($form, $form_state) {
 }
 
 /**
- * Ajax callback for 'prepend'.
+ * Ajax form callback: Selects 'prepend'.
  */
 function ajax_forms_test_advanced_commands_prepend_callback($form, $form_state) {
   $commands = array();
@@ -388,7 +387,7 @@ function ajax_forms_test_advanced_commands_prepend_callback($form, $form_state)
 }
 
 /**
- * Ajax callback for 'remove'.
+ * Ajax form callback: Selects 'remove'.
  */
 function ajax_forms_test_advanced_commands_remove_callback($form, $form_state) {
   $commands = array();
@@ -397,7 +396,7 @@ function ajax_forms_test_advanced_commands_remove_callback($form, $form_state) {
 }
 
 /**
- * Ajax callback for 'restripe'.
+ * Ajax form callback: Selects 'restripe'.
  */
 function ajax_forms_test_advanced_commands_restripe_callback($form, $form_state) {
   $commands = array();
@@ -406,7 +405,7 @@ function ajax_forms_test_advanced_commands_restripe_callback($form, $form_state)
 }
 
 /**
- * Ajax callback for 'settings'.
+ * Ajax form callback: Selects 'settings'.
  */
 function ajax_forms_test_advanced_commands_settings_callback($form, $form_state) {
   $commands = array();
@@ -425,6 +424,8 @@ function ajax_forms_test_advanced_commands_add_css_callback($form, $form_state)
 }
 
 /**
+ * Form constructor for AJAX validation form.
+ *
  * This form and its related submit and callback functions demonstrate
  * not validating another form element when a single Ajax element is triggered.
  *
@@ -433,6 +434,8 @@ function ajax_forms_test_advanced_commands_add_css_callback($form, $form_state)
  *
  * The correct behavior is that the Ajax-enabled drivertext element should
  * be able to trigger without causing validation of the "required_field".
+ *
+ * @see ajax_forms_test_validation_form_submit()
  */
 function ajax_forms_test_validation_form($form, &$form_state) {
 
@@ -462,15 +465,18 @@ function ajax_forms_test_validation_form($form, &$form_state) {
 
   return $form;
 }
+
 /**
- * Submit handler for the validation form.
+ * Form submission handler for ajax_forms_test_validation_form().
+ *
+ * @see ajax_forms_test_validation_form()
  */
 function ajax_forms_test_validation_form_submit($form, $form_state) {
   drupal_set_message(t("Validation form submitted"));
 }
 
 /**
- * Ajax callback for the 'drivertext' element of the validation form.
+ * Ajax form callback: Selects the 'drivertext' element of the validation form.
  */
 function ajax_forms_test_validation_form_callback($form, $form_state) {
   drupal_set_message("ajax_forms_test_validation_form_callback invoked");
@@ -509,7 +515,7 @@ function ajax_forms_test_lazy_load_form_submit($form, &$form_state) {
 }
 
 /**
- * AJAX callback for the ajax_forms_test_lazy_load_form() form.
+ * AJAX form callback: Selects for the ajax_forms_test_lazy_load_form() form.
  *
  * This function returns nothing, because all we're interested in testing is
  * ajax_render() adding commands for JavaScript and CSS added during the page
diff --git a/core/modules/system/tests/modules/ajax_test/ajax_test.module b/core/modules/system/tests/modules/ajax_test/ajax_test.module
index c1d9f3e86f6f4c2073c38c61098e934fec4c3d45..c969d45e72a5840aa6bd95dd4beb5f46b4cf972e 100644
--- a/core/modules/system/tests/modules/ajax_test/ajax_test.module
+++ b/core/modules/system/tests/modules/ajax_test/ajax_test.module
@@ -50,7 +50,7 @@ function ajax_test_render() {
 }
 
 /**
- * Menu callback; Returns Ajax element with #error property set.
+ * Menu callback: Returns AJAX element with #error property set.
  */
 function ajax_test_error() {
   $message = '';
@@ -61,7 +61,7 @@ function ajax_test_error() {
 }
 
 /**
- * Menu callback; Renders a #type link with #ajax.
+ * Menu callback: Renders a #type link with #ajax.
  */
 function ajax_test_link() {
   $build['link'] = array(
@@ -74,4 +74,3 @@ function ajax_test_link() {
   );
   return $build;
 }
-
diff --git a/core/modules/system/tests/modules/batch_test/batch_test.callbacks.inc b/core/modules/system/tests/modules/batch_test/batch_test.callbacks.inc
index 75e665533e993a4d5a9e6ff5b1c2d36a2287865c..bd4ee5c0e8d678333cf22a6d86c85787d304eb64 100644
--- a/core/modules/system/tests/modules/batch_test/batch_test.callbacks.inc
+++ b/core/modules/system/tests/modules/batch_test/batch_test.callbacks.inc
@@ -1,13 +1,12 @@
 <?php
 
-
 /**
  * @file
  * Batch callbacks for the Batch API tests.
  */
 
 /**
- * Simple batch operation.
+ * Performs a simple batch operation.
  */
 function _batch_test_callback_1($id, $sleep, &$context) {
   // No-op, but ensure the batch take a couple iterations.
@@ -20,7 +19,7 @@ function _batch_test_callback_1($id, $sleep, &$context) {
 }
 
 /**
- * Multistep batch operation.
+ * Performs a multistep batch operation.
  */
 function _batch_test_callback_2($start, $total, $sleep, &$context) {
   // Initialize context with progress information.
@@ -53,7 +52,7 @@ function _batch_test_callback_2($start, $total, $sleep, &$context) {
 }
 
 /**
- * Simple batch operation.
+ * Performs a simple batch operation.
  */
 function _batch_test_callback_5($id, $sleep, &$context) {
   // No-op, but ensure the batch take a couple iterations.
@@ -68,7 +67,7 @@ function _batch_test_callback_5($id, $sleep, &$context) {
 }
 
 /**
- * Batch operation setting up its own batch.
+ * Performs a batch operation setting up its own batch.
  */
 function _batch_test_nested_batch_callback() {
   batch_test_stack('setting up batch 2');
@@ -76,7 +75,7 @@ function _batch_test_nested_batch_callback() {
 }
 
 /**
- * Common 'finished' callbacks for batches 1 to 4.
+ * Provides a common 'finished' callback for batches 1 to 4.
  */
 function _batch_test_finished_helper($batch_id, $success, $results, $operations) {
   $messages = array("results for batch $batch_id");
@@ -99,42 +98,42 @@ function _batch_test_finished_helper($batch_id, $success, $results, $operations)
 }
 
 /**
- * 'finished' callback for batch 0.
+ * Triggers 'finished' callback for batch 0.
  */
 function _batch_test_finished_0($success, $results, $operations) {
   _batch_test_finished_helper(0, $success, $results, $operations);
 }
 
 /**
- * 'finished' callback for batch 1.
+ * Triggers 'finished' callback for batch 1.
  */
 function _batch_test_finished_1($success, $results, $operations) {
   _batch_test_finished_helper(1, $success, $results, $operations);
 }
 
 /**
- * 'finished' callback for batch 2.
+ * Triggers 'finished' callback for batch 2.
  */
 function _batch_test_finished_2($success, $results, $operations) {
   _batch_test_finished_helper(2, $success, $results, $operations);
 }
 
 /**
- * 'finished' callback for batch 3.
+ * Triggers 'finished' callback for batch 3.
  */
 function _batch_test_finished_3($success, $results, $operations) {
   _batch_test_finished_helper(3, $success, $results, $operations);
 }
 
 /**
- * 'finished' callback for batch 4.
+ * Triggers 'finished' callback for batch 4.
  */
 function _batch_test_finished_4($success, $results, $operations) {
   _batch_test_finished_helper(4, $success, $results, $operations);
 }
 
 /**
- * 'finished' callback for batch 5.
+ * Triggers 'finished' callback for batch 5.
  */
 function _batch_test_finished_5($success, $results, $operations) {
   _batch_test_finished_helper(5, $success, $results, $operations);
diff --git a/core/modules/system/tests/modules/batch_test/batch_test.module b/core/modules/system/tests/modules/batch_test/batch_test.module
index 1200e767dd7d38ae96520ed2ef391576a6263daa..9852a1261daf6df8e655d81c3e110bc6d1ea12f8 100644
--- a/core/modules/system/tests/modules/batch_test/batch_test.module
+++ b/core/modules/system/tests/modules/batch_test/batch_test.module
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implement hook_menu().
+ * Implements hook_menu().
  */
 function batch_test_menu() {
   $items = array();
@@ -93,7 +93,9 @@ function batch_test_menu() {
 }
 
 /**
- * Simple form.
+ * Form constructor for a batch selection form.
+ *
+ * @see batch_test_simple_form_submit()
  */
 function batch_test_simple_form() {
   $form['batch'] = array(
@@ -116,7 +118,9 @@ function batch_test_simple_form() {
 }
 
 /**
- * Submit handler for the simple form.
+ * Form submission handler for batch_test_simple_form().
+ *
+ * @see batch_test_simple_form()
  */
 function batch_test_simple_form_submit($form, &$form_state) {
   batch_test_stack(NULL, TRUE);
@@ -129,7 +133,9 @@ function batch_test_simple_form_submit($form, &$form_state) {
 
 
 /**
- * Multistep form.
+ * Form constructor for a multistep form.
+ *
+ * @see batch_test_multistep_form_submit()
  */
 function batch_test_multistep_form($form, &$form_state) {
   if (empty($form_state['storage']['step'])) {
@@ -148,7 +154,9 @@ function batch_test_multistep_form($form, &$form_state) {
 }
 
 /**
- * Submit handler for the multistep form.
+ * Form submission handler for batch_test_multistep_form().
+ *
+ * @see batch_test_multistep_form()
  */
 function batch_test_multistep_form_submit($form, &$form_state) {
   batch_test_stack(NULL, TRUE);
@@ -172,7 +180,12 @@ function batch_test_multistep_form_submit($form, &$form_state) {
 }
 
 /**
- * Form with chained submit callbacks.
+ * Form constructor for a form with chained submit callbacks.
+ *
+ * @see batch_test_chained_form_submit_1()
+ * @see batch_test_chained_form_submit_3()
+ * @see batch_test_chained_form_submit_3()
+ * @see batch_test_chained_form_submit_4()
  */
 function batch_test_chained_form() {
   // This value is used to test that $form_state persists through batched
@@ -197,7 +210,9 @@ function batch_test_chained_form() {
 }
 
 /**
- * Submit handler #1 for the chained form.
+ * Form submission handler #1 for batch_test_chained_form().
+ *
+ * @see batch_test_chained_form()
  */
 function batch_test_chained_form_submit_1($form, &$form_state) {
   batch_test_stack(NULL, TRUE);
@@ -213,7 +228,9 @@ function batch_test_chained_form_submit_1($form, &$form_state) {
 }
 
 /**
- * Submit handler #2 for the chained form.
+ * Form submission handler #2 for batch_test_chained_form().
+ *
+ * @see batch_test_chained_form()
  */
 function batch_test_chained_form_submit_2($form, &$form_state) {
   batch_test_stack('submit handler 2');
@@ -227,7 +244,9 @@ function batch_test_chained_form_submit_2($form, &$form_state) {
 }
 
 /**
- * Submit handler #3 for the chained form.
+ * Form submission handler #3 for batch_test_chained_form().
+ *
+ * @see batch_test_chained_form()
  */
 function batch_test_chained_form_submit_3($form, &$form_state) {
   batch_test_stack('submit handler 3');
@@ -240,7 +259,9 @@ function batch_test_chained_form_submit_3($form, &$form_state) {
 }
 
 /**
- * Submit handler #4 for the chained form.
+ * Form submission handler #4 for batch_test_chained_form().
+ *
+ * @see batch_test_chained_form()
  */
 function batch_test_chained_form_submit_4($form, &$form_state) {
   batch_test_stack('submit handler 4');
@@ -254,7 +275,7 @@ function batch_test_chained_form_submit_4($form, &$form_state) {
 }
 
 /**
- * Menu callback: programmatically submits the 'Chained' form.
+ * Menu callback: Submits the 'Chained' form programmatically.
  */
 function batch_test_programmatic($value = 1) {
   $form_state = array(
@@ -265,7 +286,7 @@ function batch_test_programmatic($value = 1) {
 }
 
 /**
- * Menu callback: programmatically submits a form within a batch.
+ * Menu callback: Submits a form within a batch programmatically.
  */
 function batch_test_nested_drupal_form_submit($value = 1) {
   // Set the batch and process it.
@@ -277,7 +298,7 @@ function batch_test_nested_drupal_form_submit($value = 1) {
 }
 
 /**
- * Batch operation: submits form_test_mock_form using drupal_form_submit().
+ * Batch operation: Submits form_test_mock_form() using drupal_form_submit().
  */
 function _batch_test_nested_drupal_form_submit_callback($value) {
   $state['values']['test_value'] = $value;
@@ -285,7 +306,9 @@ function _batch_test_nested_drupal_form_submit_callback($value) {
 }
 
 /**
- * A simple form with a textfield and submit button.
+ * Form constructor for a simple form with a textfield and submit button.
+ *
+ * @see batch_test_mock_form_submit()
  */
 function batch_test_mock_form($form, $form_state) {
   $form['test_value'] = array(
@@ -300,14 +323,16 @@ function batch_test_mock_form($form, $form_state) {
 }
 
 /**
- * Submit handler for the batch_test_mock form.
+ * Form submission handler for batch_test_mock_form().
+ *
+ * @see batch_test_mock_form()
  */
 function batch_test_mock_form_submit($form, &$form_state) {
   batch_test_stack('mock form submitted with value = ' . $form_state['values']['test_value']);
 }
 
 /**
- * Menu callback: fire a batch process without a form submission.
+ * Menu callback: Fires a batch process without a form submission.
  */
 function batch_test_no_form() {
   batch_test_stack(NULL, TRUE);
@@ -317,7 +342,7 @@ function batch_test_no_form() {
 }
 
 /**
- * Menu callback: fire a batch process without a form submission.
+ * Menu callback: Fires a batch process without a form submission.
  */
 function batch_test_large_percentage() {
   batch_test_stack(NULL, TRUE);
@@ -327,14 +352,14 @@ function batch_test_large_percentage() {
 }
 
 /**
- * Menu callback: successful redirection.
+ * Menu callback: Redirects successfuly.
  */
 function batch_test_redirect_page() {
   return 'Redirection successful.';
 }
 
 /**
- * Batch 0: no operation.
+ * Batch 0: Does nothing.
  */
 function _batch_test_batch_0() {
   $batch = array(
@@ -346,7 +371,7 @@ function _batch_test_batch_0() {
 }
 
 /**
- * Batch 1: repeats a simple operation.
+ * Batch 1: Repeats a simple operation.
  *
  * Operations: op 1 from 1 to 10.
  */
@@ -368,7 +393,7 @@ function _batch_test_batch_1() {
 }
 
 /**
- * Batch 2: single multistep operation.
+ * Batch 2: Performs a single multistep operation.
  *
  * Operations: op 2 from 1 to 10.
  */
@@ -389,7 +414,7 @@ function _batch_test_batch_2() {
 }
 
 /**
- * Batch 3: both single and multistep operations.
+ * Batch 3: Performs both single and multistep operations.
  *
  * Operations:
  * - op 1 from 1 to 5,
@@ -420,7 +445,7 @@ function _batch_test_batch_3() {
 }
 
 /**
- * Batch 4: batch within a batch.
+ * Batch 4: Performs a batch within a batch.
  *
  * Operations:
  * - op 1 from 1 to 5,
@@ -449,7 +474,7 @@ function _batch_test_batch_4() {
 }
 
 /**
- * Batch 5: repeats a simple operation.
+ * Batch 5: Repeats a simple operation.
  *
  * Operations: op 1 from 1 to 10.
  */
@@ -471,7 +496,7 @@ function _batch_test_batch_5() {
 }
 
 /**
- * Menu callback: run a batch for testing theme used on the progress page.
+ * Menu callback: Runs a batch for testing theme used on the progress page.
  */
 function batch_test_theme_batch() {
   batch_test_stack(NULL, TRUE);
@@ -485,7 +510,7 @@ function batch_test_theme_batch() {
 }
 
 /**
- * Batch callback function for testing the theme used on the progress page.
+ * Tests the progress page theme by performing a batch callback.
  */
 function _batch_test_theme_callback() {
   // Because drupalGet() steps through the full progressive batch before
@@ -498,7 +523,7 @@ function _batch_test_theme_callback() {
 }
 
 /**
- * Helper function: store or retrieve traced execution data.
+ * Helper function: Stores or retrieves traced execution data.
  */
 function batch_test_stack($data = NULL, $reset = FALSE) {
   if ($reset) {
diff --git a/core/modules/system/tests/modules/common_test/common_test.module b/core/modules/system/tests/modules/common_test/common_test.module
index 37243cf14bbc7eaa6398d12a445697f102b080b8..0634e3b9f5ac59bffcada63b95cfa959786e9ac6 100644
--- a/core/modules/system/tests/modules/common_test/common_test.module
+++ b/core/modules/system/tests/modules/common_test/common_test.module
@@ -62,28 +62,32 @@ function common_test_menu() {
 }
 
 /**
- * Redirect using drupal_goto().
+ * Redirects using drupal_goto().
  */
 function common_test_drupal_goto_redirect() {
   drupal_goto('common-test/drupal_goto');
 }
 
 /**
- * Redirect using drupal_goto().
+ * Redirects using drupal_goto().
  */
 function common_test_drupal_goto_redirect_advanced() {
   drupal_goto('common-test/drupal_goto', array('query' => array('foo' => '123')), 301);
 }
 
 /**
- * Landing page for drupal_goto().
+ * Page callback: Provides a landing page for drupal_goto().
+ *
+ * @see common_test_menu()
  */
 function common_test_drupal_goto_land() {
   print "drupal_goto";
 }
 
 /**
- * Fail landing page for drupal_goto().
+ * Page callback: Provides a failure landing page for drupal_goto().
+ *
+ * @see common_test_menu()
  */
 function common_test_drupal_goto_land_fail() {
   print "drupal_goto_fail";
@@ -99,7 +103,7 @@ function common_test_drupal_goto_alter(&$path, &$options, &$http_response_code)
 }
 
 /**
- * Print destination query parameter.
+ * Prints a destination query parameter.
  */
 function common_test_destination() {
   $destination = drupal_get_destination();
@@ -107,7 +111,7 @@ function common_test_destination() {
 }
 
 /**
- * Render an element with an invalid render array key.
+ * Renders an element with an invalid render array key.
  */
 function common_test_drupal_render_invalid_keys() {
   define('SIMPLETEST_COLLECT_ERRORS', FALSE);
@@ -227,7 +231,7 @@ function common_test_theme() {
 }
 
 /**
- * Theme function for testing drupal_render() theming.
+ * Provides a theme function for drupal_render().
  */
 function theme_common_test_foo($variables) {
   return $variables['foo'] . $variables['bar'];
diff --git a/core/modules/system/tests/modules/common_test_cron_helper/common_test_cron_helper.module b/core/modules/system/tests/modules/common_test_cron_helper/common_test_cron_helper.module
index 94a2b2c43821ae8e8f41ff6a3a6a81fbc984868e..5cb41862cfdaee5c5dce51bb98baa3c1a787f715 100644
--- a/core/modules/system/tests/modules/common_test_cron_helper/common_test_cron_helper.module
+++ b/core/modules/system/tests/modules/common_test_cron_helper/common_test_cron_helper.module
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @file
  * Helper module for the testCronExceptions in addition to common_test module.
diff --git a/core/modules/system/tests/modules/database_test/database_test.module b/core/modules/system/tests/modules/database_test/database_test.module
index 339f1f9fed2d022dc826934e2499982d50356c52..dfb38f775e0c85b0ba7c9a4e49fd500926a62593 100644
--- a/core/modules/system/tests/modules/database_test/database_test.module
+++ b/core/modules/system/tests/modules/database_test/database_test.module
@@ -77,7 +77,7 @@ function database_test_menu() {
 }
 
 /**
- * Run a db_query_temporary and output the table name and its number of rows.
+ * Runs db_query_temporary() and outputs the table name and its number of rows.
  *
  * We need to test that the table created is temporary, so we run it here, in a
  * separate menu callback request; After this request is done, the temporary
@@ -92,7 +92,7 @@ function database_test_db_query_temporary() {
 }
 
 /**
- * Run a pager query and return the results.
+ * Runs a pager query and returns the results.
  *
  * This function does care about the page GET parameter, as set by the
  * simpletest HTTP call.
@@ -117,7 +117,7 @@ function database_test_even_pager_query($limit) {
 }
 
 /**
- * Run a pager query and return the results.
+ * Runs a pager query and returns the results.
  *
  * This function does care about the page GET parameter, as set by the
  * simpletest HTTP call.
@@ -142,7 +142,7 @@ function database_test_odd_pager_query($limit) {
 }
 
 /**
- * Run a tablesort query and return the results.
+ * Runs a tablesort query and returns the results.
  *
  * This function does care about the page GET parameter, as set by the
  * simpletest HTTP call.
@@ -172,7 +172,7 @@ function database_test_tablesort() {
 }
 
 /**
- * Run a tablesort query with a second order_by after and return the results.
+ * Runs a tablesort query with a second order_by after and returns the results.
  *
  * This function does care about the page GET parameter, as set by the
  * simpletest HTTP call.
@@ -203,7 +203,7 @@ function database_test_tablesort_first() {
 }
 
 /**
- * Output a form without setting a header sort.
+ * Outputs a form without setting a header sort.
  */
 function database_test_theme_tablesort($form, &$form_state) {
   $header = array(