diff -u b/core/modules/contact/contact.views.inc b/core/modules/contact/contact.views.inc
--- b/core/modules/contact/contact.views.inc
+++ b/core/modules/contact/contact.views.inc
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Provide views data and handlers for contact.module.
+ * Provide views data for contact.module.
  *
  * @ingroup views_module_handlers
  */
diff -u b/core/modules/contact/lib/Drupal/contact/Plugin/views/field/ContactLink.php b/core/modules/contact/lib/Drupal/contact/Plugin/views/field/ContactLink.php
--- b/core/modules/contact/lib/Drupal/contact/Plugin/views/field/ContactLink.php
+++ b/core/modules/contact/lib/Drupal/contact/Plugin/views/field/ContactLink.php
@@ -12,7 +12,7 @@
 use Drupal\Core\Annotation\Plugin;
 
 /**
- * A field that links to the user contact page, if access is permitted.
+ * Defines a field that links to the user contact page, if access is permitted.
  *
  * @ingroup views_field_handlers
  *
reverted:
--- b/core/modules/contact/tests/contact_test_views/contact_test_views.info
+++ /dev/null
@@ -1,8 +0,0 @@
-name = Contact test views
-description = Provides default views for views contact tests.
-package = Testing
-version = VERSION
-core = 8.x
-dependencies[] = contact
-dependencies[] = views
-hidden = TRUE
reverted:
--- b/core/modules/contact/tests/contact_test_views/contact_test_views.module
+++ /dev/null
@@ -1 +0,0 @@
-<?php
reverted:
--- b/core/modules/contact/tests/contact_test_views/test_views/views.view.test_contact_link.yml
+++ /dev/null
@@ -1,122 +0,0 @@
-api_version: '3.0'
-base_field: uid
-base_table: users
-core: 8.x
-description: ''
-disabled: '0'
-display:
-  default:
-    display_plugin: default
-    id: default
-    display_title: Master
-    position: ''
-    display_options:
-      access:
-        type: perm
-        perm: 'access user profiles'
-      cache:
-        type: none
-      query:
-        type: views_query
-      exposed_form:
-        type: basic
-      pager:
-        type: full
-      style:
-        type: default
-      row:
-        type: fields
-      fields:
-        name:
-          id: name
-          table: users
-          field: name
-          label: ''
-          alter:
-            alter_text: '0'
-            make_link: '0'
-            absolute: '0'
-            trim: '0'
-            word_boundary: '0'
-            ellipsis: '0'
-            strip_tags: '0'
-            html: '0'
-          hide_empty: '0'
-          empty_zero: '0'
-          link_to_user: '1'
-          overwrite_anonymous: '0'
-        contact:
-          id: contact
-          table: users
-          field: contact
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: 'Link to contact page'
-          exclude: '0'
-          alter:
-            alter_text: '0'
-            text: ''
-            make_link: '0'
-            path: ''
-            absolute: '0'
-            external: '0'
-            replace_spaces: '0'
-            path_case: none
-            trim_whitespace: '0'
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: '0'
-            max_length: ''
-            word_boundary: '1'
-            ellipsis: '1'
-            more_link: '0'
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: '0'
-            trim: '0'
-            preserve_tags: ''
-            html: '0'
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: '1'
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: '1'
-          empty: ''
-          hide_empty: '0'
-          empty_zero: '0'
-          hide_alter_empty: '1'
-          text: ''
-      filters:
-        status:
-          value: '1'
-          table: users
-          field: status
-          id: status
-          expose:
-            operator: '0'
-          group: '1'
-      sorts:
-        created:
-          id: created
-          table: users
-          field: created
-          order: DESC
-  page_1:
-    display_plugin: page
-    id: page_1
-    display_title: Page
-    position: ''
-    display_options:
-      path: test-contact-link
-human_name: test_contact_link
-module: views
-name: test_contact_link
-tag: ''
only in patch2:
unchanged:
--- /dev/null
+++ b/core/modules/contact/tests/modules/contact_test_views/contact_test_views.info
@@ -0,0 +1,8 @@
+name = Contact test views
+description = Provides default views for views contact tests.
+package = Testing
+version = VERSION
+core = 8.x
+dependencies[] = contact
+dependencies[] = views
+hidden = TRUE
only in patch2:
unchanged:
--- /dev/null
+++ b/core/modules/contact/tests/modules/contact_test_views/contact_test_views.module
@@ -0,0 +1 @@
+<?php
only in patch2:
unchanged:
--- /dev/null
+++ b/core/modules/contact/tests/modules/contact_test_views/test_views/views.view.test_contact_link.yml
@@ -0,0 +1,118 @@
+base_field: uid
+base_table: users
+core: 8.x
+description: ''
+disabled: '0'
+display:
+  default:
+    display_plugin: default
+    id: default
+    display_title: Master
+    position: ''
+    display_options:
+      access:
+        type: perm
+        perm: 'access user profiles'
+      cache:
+        type: none
+      query:
+        type: views_query
+      exposed_form:
+        type: basic
+      pager:
+        type: full
+      style:
+        type: default
+      row:
+        type: fields
+      fields:
+        name:
+          id: name
+          table: users
+          field: name
+          label: ''
+          alter:
+            alter_text: '0'
+            make_link: '0'
+            absolute: '0'
+            trim: '0'
+            word_boundary: '0'
+            ellipsis: '0'
+            strip_tags: '0'
+            html: '0'
+          hide_empty: '0'
+          empty_zero: '0'
+          link_to_user: '1'
+          overwrite_anonymous: '0'
+          plugin_id: 'user_name'
+        contact:
+          id: contact
+          table: users
+          field: contact
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'Link to contact page'
+          exclude: '0'
+          alter:
+            alter_text: '0'
+            text: ''
+            make_link: '0'
+            path: ''
+            absolute: '0'
+            external: '0'
+            replace_spaces: '0'
+            path_case: none
+            trim_whitespace: '0'
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: '0'
+            max_length: ''
+            word_boundary: '1'
+            ellipsis: '1'
+            more_link: '0'
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: '0'
+            trim: '0'
+            preserve_tags: ''
+            html: '0'
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: '1'
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: '1'
+          empty: ''
+          hide_empty: '0'
+          empty_zero: '0'
+          hide_alter_empty: '1'
+          text: ''
+          plugin_id: 'contact_link'
+      filters:
+        status:
+          value: '1'
+          table: users
+          field: status
+          id: status
+          expose:
+            operator: '0'
+          group: '1'
+          plugin_id: boolean
+  page_1:
+    display_plugin: page
+    id: page_1
+    display_title: Page
+    position: ''
+    display_options:
+      path: test-contact-link
+human_name: test_contact_link
+module: views
+id: test_contact_link
+tag: ''