diff --git a/core/modules/system/lib/Drupal/system/Tests/System/DateTimeTest.php b/core/modules/system/lib/Drupal/system/Tests/System/DateTimeTest.php
index cfc6855..4a4b28a 100644
--- a/core/modules/system/lib/Drupal/system/Tests/System/DateTimeTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/System/DateTimeTest.php
@@ -75,10 +75,6 @@ function testTimeZoneHandling() {
    * Test date format configuration.
    */
   function testDateFormatConfiguration() {
-    // Confirm 'no custom date formats available' message appears.
-    $this->drupalGet('admin/config/regional/date-time/formats');
-    $this->assertText(t('No custom date formats available.'), 'No custom date formats message appears.');
-
     // Add custom date format.
     $this->clickLink(t('Add format'));
     $date_format_id = strtolower($this->randomName(8));
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index b482219..7bc6ca9 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -3051,7 +3051,7 @@ function system_system_info_alter(&$info, $file, $type) {
 }
 
 /**
- * Get the name of the default region for a given theme.
+ * Gets the name of the default region for a given theme.
  *
  * @param $theme
  *   The name of a theme.
@@ -3606,7 +3606,7 @@ function system_date_formats() {
 }
 
 /**
- * Get the list of defined date formats and attributes.
+ * Gets the list of defined date formats and attributes.
  *
  * @param $date_format_id
  *   (optional) The date type name.
@@ -3619,7 +3619,7 @@ function system_date_formats() {
  *   - pattern: The pattern that will modify the format of the date
 
  *   If $date_format_id was defined, only the date formats associated with the
- *   given machine name are returned, in a single associative array keyed by 
+ *   given machine name are returned, in a single associative array keyed by
  *   format string.
  */
 function system_get_date_formats($date_format_id = NULL) {
@@ -3630,7 +3630,7 @@ function system_get_date_formats($date_format_id = NULL) {
 }
 
 /**
- * Get the appropriate date format pattern for this server's php configuration.
+ * Gets the appropriate date format pattern for this server's php configuration.
  *
  * @param array $pattern
  *   The date pattern information that is stored in configuration
@@ -3643,19 +3643,21 @@ function system_get_date_format_pattern($pattern) {
 }
 
 /**
- * Get the appropriate date format pattern type.
+ * Gets the appropriate date format pattern type.
  *
  * For now this function defaults to php.
  *
  * @return string
  *   The format type.
+ *
+ * @todo: extend function to provide the appropriate key for alternate date formats
  */
 function system_get_date_format_pattern_type() {
   return 'php';
 }
 
 /**
- * Get the appropriate date format string for a date type and locale.
+ * Gets the appropriate date format string for a date type and locale.
  *
  * @param $langcode
  *   (optional) Language code for the current locale. This can be a 2 character
@@ -3665,9 +3667,9 @@ function system_get_date_format_pattern_type() {
  *   (optional) The machine name for the date format.
  *
  * @return
- *   If $date_format_id and $langcode are specified, returns the corresponding 
- *   date format string. If only $langcode is specified, returns an array of 
- *   all date format strings for that locale, keyed by the date type. If 
+ *   If $date_format_id and $langcode are specified, returns the corresponding
+ *   date format string. If only $langcode is specified, returns an array of
+ *   all date format strings for that locale, keyed by the date type. If
  *   neither is specified.
  */
 function system_date_format_locale($langcode = NULL, $date_format_id = NULL) {