diff --git a/tests/views_test_config/config/views.view.test_access_dynamic.yml b/tests/views_test_config/config/views.view.test_access_dynamic.yml
index 87754f6..8b40c46 100644
--- a/tests/views_test_config/config/views.view.test_access_dynamic.yml
+++ b/tests/views_test_config/config/views.view.test_access_dynamic.yml
@@ -4,29 +4,29 @@ core: '8'
 description: ''
 disabled: '0'
 display:
-    default:
-        display_options:
-            access:
-                type: test_dynamic
-            cache:
-                type: none
-            exposed_form:
-                type: basic
-            pager:
-                type: full
-            row_plugin: fields
-            style_plugin: default
-        display_plugin: default
-        display_title: Master
-        id: default
-        position: '0'
-    page_1:
-        display_options:
-            path: test_access_dynamic
-        display_plugin: page
-        display_title: Page
-        id: page_1
-        position: '0'
+  default:
+    display_options:
+      access:
+        type: test_dynamic
+      cache:
+        type: none
+      exposed_form:
+        type: basic
+      pager:
+        type: full
+      row_plugin: fields
+      style_plugin: default
+    display_plugin: default
+    display_title: Master
+    id: default
+    position: '0'
+  page_1:
+    display_options:
+      path: test_access_dynamic
+    display_plugin: page
+    display_title: Page
+    id: page_1
+    position: '0'
 human_name: ''
 name: test_access_dynamic
 tag: ''
diff --git a/tests/views_test_config/config/views.view.test_access_none.yml b/tests/views_test_config/config/views.view.test_access_none.yml
index 1ed0796..f40fbf0 100644
--- a/tests/views_test_config/config/views.view.test_access_none.yml
+++ b/tests/views_test_config/config/views.view.test_access_none.yml
@@ -4,22 +4,22 @@ core: '8'
 description: ''
 disabled: '0'
 display:
-    default:
-        display_options:
-            access:
-                type: none
-            cache:
-                type: none
-            exposed_form:
-                type: basic
-            pager:
-                type: full
-            row_plugin: fields
-            style_plugin: default
-        display_plugin: default
-        display_title: Master
-        id: default
-        position: '0'
+  default:
+    display_options:
+      access:
+        type: none
+      cache:
+        type: none
+      exposed_form:
+        type: basic
+      pager:
+        type: full
+      row_plugin: fields
+      style_plugin: default
+    display_plugin: default
+    display_title: Master
+    id: default
+    position: '0'
 human_name: ''
 name: test_access_none
 tag: ''
diff --git a/tests/views_test_config/config/views.view.test_access_perm.yml b/tests/views_test_config/config/views.view.test_access_perm.yml
index f67edb1..acb93c9 100644
--- a/tests/views_test_config/config/views.view.test_access_perm.yml
+++ b/tests/views_test_config/config/views.view.test_access_perm.yml
@@ -4,23 +4,23 @@ core: '8'
 description: ''
 disabled: '0'
 display:
-    default:
-        display_options:
-            access:
-                perm: 'views_test test permission'
-                type: perm
-            cache:
-                type: none
-            exposed_form:
-                type: basic
-            pager:
-                type: full
-            row_plugin: fields
-            style_plugin: default
-        display_plugin: default
-        display_title: Master
-        id: default
-        position: '0'
+  default:
+    display_options:
+      access:
+        perm: 'views_test test permission'
+        type: perm
+      cache:
+        type: none
+      exposed_form:
+        type: basic
+      pager:
+        type: full
+      row_plugin: fields
+      style_plugin: default
+    display_plugin: default
+    display_title: Master
+    id: default
+    position: '0'
 human_name: ''
 name: test_access_perm
 tag: ''
diff --git a/tests/views_test_config/config/views.view.test_access_role.yml b/tests/views_test_config/config/views.view.test_access_role.yml
index c2da0f5..2ac737a 100644
--- a/tests/views_test_config/config/views.view.test_access_role.yml
+++ b/tests/views_test_config/config/views.view.test_access_role.yml
@@ -4,22 +4,22 @@ core: '8'
 description: ''
 disabled: '0'
 display:
-    default:
-        display_options:
-            access:
-                type: role
-            cache:
-                type: none
-            exposed_form:
-                type: basic
-            pager:
-                type: full
-            row_plugin: fields
-            style_plugin: default
-        display_plugin: default
-        display_title: Master
-        id: default
-        position: '0'
+  default:
+    display_options:
+      access:
+        type: role
+      cache:
+        type: none
+      exposed_form:
+        type: basic
+      pager:
+        type: full
+      row_plugin: fields
+      style_plugin: default
+    display_plugin: default
+    display_title: Master
+    id: default
+    position: '0'
 human_name: ''
 name: test_access_role
 tag: ''
diff --git a/tests/views_test_config/config/views.view.test_access_static.yml b/tests/views_test_config/config/views.view.test_access_static.yml
index d32bb76..c76e541 100644
--- a/tests/views_test_config/config/views.view.test_access_static.yml
+++ b/tests/views_test_config/config/views.view.test_access_static.yml
@@ -4,29 +4,29 @@ core: '8'
 description: ''
 disabled: '0'
 display:
-    default:
-        display_options:
-            access:
-                type: test_static
-            cache:
-                type: none
-            exposed_form:
-                type: basic
-            pager:
-                type: full
-            row_plugin: fields
-            style_plugin: default
-        display_plugin: default
-        display_title: Master
-        id: default
-        position: '0'
-    page_1:
-        display_options:
-            path: test_access_static
-        display_plugin: page
-        display_title: Page
-        id: page_1
-        position: '0'
+  default:
+    display_options:
+      access:
+        type: test_static
+      cache:
+        type: none
+      exposed_form:
+        type: basic
+      pager:
+        type: full
+      row_plugin: fields
+      style_plugin: default
+    display_plugin: default
+    display_title: Master
+    id: default
+    position: '0'
+  page_1:
+    display_options:
+      path: test_access_static
+    display_plugin: page
+    display_title: Page
+    id: page_1
+    position: '0'
 human_name: ''
 name: test_access_static
 tag: ''
diff --git a/tests/views_test_config/config/views.view.test_aggregate_count.yml b/tests/views_test_config/config/views.view.test_aggregate_count.yml
index 19cc0f3..ce2a725 100644
--- a/tests/views_test_config/config/views.view.test_aggregate_count.yml
+++ b/tests/views_test_config/config/views.view.test_aggregate_count.yml
@@ -4,52 +4,52 @@ core: '8'
 description: ''
 disabled: '0'
 display:
-    default:
-        display_options:
-            access:
-                type: none
-            arguments:
-                type:
-                    default_action: summary
-                    default_argument_type: fixed
-                    field: type
-                    id: type
-                    summary:
-                        format: default_summary
-                    table: node
-            cache:
-                type: none
-            exposed_form:
-                type: basic
-            fields:
-                nid:
-                    alter:
-                        alter_text: '0'
-                        ellipsis: '1'
-                        html: '0'
-                        make_link: '0'
-                        strip_tags: '0'
-                        trim: '0'
-                        word_boundary: '1'
-                    empty_zero: '0'
-                    field: title
-                    hide_empty: '0'
-                    id: nid
-                    link_to_node: '0'
-                    table: node
-            group_by: '1'
-            pager:
-                type: some
-            query:
-                options:
-                    query_comment: '0'
-                type: views_query
-            row_plugin: fields
-            style_plugin: default
-        display_plugin: default
-        display_title: Master
-        id: default
-        position: '0'
+  default:
+    display_options:
+      access:
+        type: none
+      arguments:
+        type:
+          default_action: summary
+          default_argument_type: fixed
+          field: type
+          id: type
+          summary:
+            format: default_summary
+          table: node
+      cache:
+        type: none
+      exposed_form:
+        type: basic
+      fields:
+        nid:
+          alter:
+            alter_text: '0'
+            ellipsis: '1'
+            html: '0'
+            make_link: '0'
+            strip_tags: '0'
+            trim: '0'
+            word_boundary: '1'
+          empty_zero: '0'
+          field: title
+          hide_empty: '0'
+          id: nid
+          link_to_node: '0'
+          table: node
+      group_by: '1'
+      pager:
+        type: some
+      query:
+        options:
+          query_comment: '0'
+        type: views_query
+      row_plugin: fields
+      style_plugin: default
+    display_plugin: default
+    display_title: Master
+    id: default
+    position: '0'
 human_name: ''
 name: test_aggregate_count
 tag: ''
diff --git a/tests/views_test_config/config/views.view.test_argument_default_fixed.yml b/tests/views_test_config/config/views.view.test_argument_default_fixed.yml
index a59a923..a0a4e57 100644
--- a/tests/views_test_config/config/views.view.test_argument_default_fixed.yml
+++ b/tests/views_test_config/config/views.view.test_argument_default_fixed.yml
@@ -4,51 +4,51 @@ core: '8'
 description: ''
 disabled: '0'
 display:
-    default:
-        display_options:
-            access:
-                type: none
-            arguments:
-                'null':
-                    default_action: default
-                    default_argument_type: fixed
-                    field: 'null'
-                    id: 'null'
-                    must_not_be: '0'
-                    style_plugin: default_summary
-                    table: views
-            cache:
-                type: none
-            exposed_form:
-                type: basic
-            fields:
-                title:
-                    alter:
-                        alter_text: '0'
-                        ellipsis: '1'
-                        html: '0'
-                        make_link: '0'
-                        strip_tags: '0'
-                        trim: '0'
-                        word_boundary: '1'
-                    empty_zero: '0'
-                    field: title
-                    hide_empty: '0'
-                    id: title
-                    link_to_node: '0'
-                    table: node
-            pager:
-                options:
-                    id: '0'
-                    items_per_page: '10'
-                    offset: '0'
-                type: full
-            row_plugin: fields
-            style_plugin: default
-        display_plugin: default
-        display_title: Master
-        id: default
-        position: '0'
+  default:
+    display_options:
+      access:
+        type: none
+      arguments:
+        'null':
+          default_action: default
+          default_argument_type: fixed
+          field: 'null'
+          id: 'null'
+          must_not_be: '0'
+          style_plugin: default_summary
+          table: views
+      cache:
+        type: none
+      exposed_form:
+        type: basic
+      fields:
+        title:
+          alter:
+            alter_text: '0'
+            ellipsis: '1'
+            html: '0'
+            make_link: '0'
+            strip_tags: '0'
+            trim: '0'
+            word_boundary: '1'
+          empty_zero: '0'
+          field: title
+          hide_empty: '0'
+          id: title
+          link_to_node: '0'
+          table: node
+      pager:
+        options:
+          id: '0'
+          items_per_page: '10'
+          offset: '0'
+        type: full
+      row_plugin: fields
+      style_plugin: default
+    display_plugin: default
+    display_title: Master
+    id: default
+    position: '0'
 human_name: ''
 name: test_argument_default_fixed
 tag: ''
diff --git a/tests/views_test_config/config/views.view.test_comment_user_uid.yml b/tests/views_test_config/config/views.view.test_comment_user_uid.yml
index c641af8..babe7fa 100644
--- a/tests/views_test_config/config/views.view.test_comment_user_uid.yml
+++ b/tests/views_test_config/config/views.view.test_comment_user_uid.yml
@@ -4,43 +4,43 @@ core: '8'
 description: ''
 disabled: '0'
 display:
-    default:
-        display_options:
-            access:
-                type: perm
-            arguments:
-                uid_touch:
-                    default_argument_skip_url: '0'
-                    default_argument_type: fixed
-                    field: uid_touch
-                    id: uid_touch
-                    summary:
-                        format: default_summary
-                        number_of_records: '0'
-                    summary_options:
-                        items_per_page: '25'
-                    table: node
-            cache:
-                type: none
-            exposed_form:
-                type: basic
-            fields:
-                nid:
-                    field: nid
-                    id: nid
-                    table: node
-            pager:
-                type: full
-            query:
-                options:
-                    query_comment: '0'
-                type: views_query
-            row_plugin: node
-            style_plugin: default
-        display_plugin: default
-        display_title: Master
-        id: default
-        position: '0'
+  default:
+    display_options:
+      access:
+        type: perm
+      arguments:
+        uid_touch:
+          default_argument_skip_url: '0'
+          default_argument_type: fixed
+          field: uid_touch
+          id: uid_touch
+          summary:
+            format: default_summary
+            number_of_records: '0'
+          summary_options:
+            items_per_page: '25'
+          table: node
+      cache:
+        type: none
+      exposed_form:
+        type: basic
+      fields:
+        nid:
+          field: nid
+          id: nid
+          table: node
+      pager:
+        type: full
+      query:
+        options:
+          query_comment: '0'
+        type: views_query
+      row_plugin: node
+      style_plugin: default
+    display_plugin: default
+    display_title: Master
+    id: default
+    position: '0'
 human_name: test_comment_user_uid
 name: test_comment_user_uid
 tag: default
diff --git a/tests/views_test_config/config/views.view.test_destroy.yml b/tests/views_test_config/config/views.view.test_destroy.yml
index 5531420..cf2b9df 100644
--- a/tests/views_test_config/config/views.view.test_destroy.yml
+++ b/tests/views_test_config/config/views.view.test_destroy.yml
@@ -4,153 +4,153 @@ core: '8'
 description: ''
 disabled: '0'
 display:
-    attachment_1:
-        display_options:
-            displays:
-                default: default
-                page_1: page_1
-            pager:
-                type: some
-        display_plugin: attachment
-        display_title: Attachment
-        id: attachment_1
-        position: '0'
-    attachment_2:
-        display_options:
-            displays:
-                default: default
-                page_1: page_1
-            pager:
-                type: some
-        display_plugin: attachment
-        display_title: Attachment
-        id: attachment_2
-        position: '0'
-    default:
-        display_options:
-            access:
-                type: none
-            arguments:
-                created_day:
-                    default_argument_type: fixed
-                    field: created_day
-                    id: created_day
-                    style_plugin: default_summary
-                    table: node
-                created_fulldate:
-                    default_argument_type: fixed
-                    field: created_fulldate
-                    id: created_fulldate
-                    style_plugin: default_summary
-                    table: node
-                created_month:
-                    default_argument_type: fixed
-                    field: created_month
-                    id: created_month
-                    style_plugin: default_summary
-                    table: node
-            cache:
-                type: none
-            empty:
-                area:
-                    empty: '0'
-                    field: area
-                    id: area
-                    table: views
-                area_1:
-                    empty: '0'
-                    field: area
-                    id: area_1
-                    table: views
-            exposed_form:
-                type: basic
-            fields:
-                created:
-                    field: created
-                    id: created
-                    table: node
-                nid:
-                    field: nid
-                    id: nid
-                    table: node
-                path:
-                    field: path
-                    id: path
-                    table: node
-            filters:
-                nid:
-                    field: nid
-                    id: nid
-                    table: node
-                status:
-                    field: status
-                    id: status
-                    table: node
-                title:
-                    field: title
-                    id: title
-                    table: node
-            footer:
-                area:
-                    empty: '0'
-                    field: area
-                    id: area
-                    table: views
-                area_1:
-                    empty: '0'
-                    field: area
-                    id: area_1
-                    table: views
-            header:
-                area:
-                    empty: '0'
-                    field: area
-                    id: area
-                    table: views
-                area_1:
-                    empty: '0'
-                    field: area
-                    id: area_1
-                    table: views
-            pager:
-                type: full
-            query:
-                type: views_query
-            relationships:
-                nid:
-                    field: nid
-                    id: nid
-                    table: comments
-                pid:
-                    field: pid
-                    id: pid
-                    table: comments
-                uid:
-                    field: uid
-                    id: uid
-                    table: comments
-            row_plugin: fields
-            sorts:
-                last_comment_name:
-                    field: last_comment_name
-                    id: last_comment_name
-                    table: node_comment_statistics
-                last_comment_timestamp:
-                    field: last_comment_timestamp
-                    id: last_comment_timestamp
-                    table: node_comment_statistics
-            style_plugin: default
-        display_plugin: default
-        display_title: Master
-        id: default
-        position: '0'
-    page_1:
-        display_options:
-            path: test_destroy
-        display_plugin: page
-        display_title: Page
-        id: page_1
-        position: '0'
+  attachment_1:
+    display_options:
+      displays:
+        default: default
+        page_1: page_1
+      pager:
+        type: some
+    display_plugin: attachment
+    display_title: Attachment
+    id: attachment_1
+    position: '0'
+  attachment_2:
+    display_options:
+      displays:
+        default: default
+        page_1: page_1
+      pager:
+        type: some
+    display_plugin: attachment
+    display_title: Attachment
+    id: attachment_2
+    position: '0'
+  default:
+    display_options:
+      access:
+        type: none
+      arguments:
+        created_day:
+          default_argument_type: fixed
+          field: created_day
+          id: created_day
+          style_plugin: default_summary
+          table: node
+        created_fulldate:
+          default_argument_type: fixed
+          field: created_fulldate
+          id: created_fulldate
+          style_plugin: default_summary
+          table: node
+        created_month:
+          default_argument_type: fixed
+          field: created_month
+          id: created_month
+          style_plugin: default_summary
+          table: node
+      cache:
+        type: none
+      empty:
+        area:
+          empty: '0'
+          field: area
+          id: area
+          table: views
+        area_1:
+          empty: '0'
+          field: area
+          id: area_1
+          table: views
+      exposed_form:
+        type: basic
+      fields:
+        created:
+          field: created
+          id: created
+          table: node
+        nid:
+          field: nid
+          id: nid
+          table: node
+        path:
+          field: path
+          id: path
+          table: node
+      filters:
+        nid:
+          field: nid
+          id: nid
+          table: node
+        status:
+          field: status
+          id: status
+          table: node
+        title:
+          field: title
+          id: title
+          table: node
+      footer:
+        area:
+          empty: '0'
+          field: area
+          id: area
+          table: views
+        area_1:
+          empty: '0'
+          field: area
+          id: area_1
+          table: views
+      header:
+        area:
+          empty: '0'
+          field: area
+          id: area
+          table: views
+        area_1:
+          empty: '0'
+          field: area
+          id: area_1
+          table: views
+      pager:
+        type: full
+      query:
+        type: views_query
+      relationships:
+        nid:
+          field: nid
+          id: nid
+          table: comments
+        pid:
+          field: pid
+          id: pid
+          table: comments
+        uid:
+          field: uid
+          id: uid
+          table: comments
+      row_plugin: fields
+      sorts:
+        last_comment_name:
+          field: last_comment_name
+          id: last_comment_name
+          table: node_comment_statistics
+        last_comment_timestamp:
+          field: last_comment_timestamp
+          id: last_comment_timestamp
+          table: node_comment_statistics
+      style_plugin: default
+    display_plugin: default
+    display_title: Master
+    id: default
+    position: '0'
+  page_1:
+    display_options:
+      path: test_destroy
+    display_plugin: page
+    display_title: Page
+    id: page_1
+    position: '0'
 human_name: ''
 name: test_destroy
 tag: ''
diff --git a/tests/views_test_config/config/views.view.test_filter_date_between.yml b/tests/views_test_config/config/views.view.test_filter_date_between.yml
index a2afce1..a2a268a 100644
--- a/tests/views_test_config/config/views.view.test_filter_date_between.yml
+++ b/tests/views_test_config/config/views.view.test_filter_date_between.yml
@@ -4,36 +4,36 @@ core: '8'
 description: ''
 disabled: '0'
 display:
-    default:
-        display_options:
-            access:
-                type: none
-            cache:
-                type: none
-            exposed_form:
-                type: basic
-            fields:
-                nid:
-                    field: nid
-                    id: nid
-                    table: node
-            filters:
-                created:
-                    field: created
-                    id: created
-                    table: node
-            pager:
-                type: full
-            query:
-                options:
-                    query_comment: '0'
-                type: views_query
-            row_plugin: fields
-            style_plugin: default
-        display_plugin: default
-        display_title: Master
-        id: default
-        position: '0'
+  default:
+    display_options:
+      access:
+        type: none
+      cache:
+        type: none
+      exposed_form:
+        type: basic
+      fields:
+        nid:
+          field: nid
+          id: nid
+          table: node
+      filters:
+        created:
+          field: created
+          id: created
+          table: node
+      pager:
+        type: full
+      query:
+        options:
+          query_comment: '0'
+        type: views_query
+      row_plugin: fields
+      style_plugin: default
+    display_plugin: default
+    display_title: Master
+    id: default
+    position: '0'
 human_name: ''
 name: test_filter_date_between
 tag: ''
diff --git a/tests/views_test_config/config/views.view.test_filter_group_override.yml b/tests/views_test_config/config/views.view.test_filter_group_override.yml
index 2d2c7c6..639edb7 100644
--- a/tests/views_test_config/config/views.view.test_filter_group_override.yml
+++ b/tests/views_test_config/config/views.view.test_filter_group_override.yml
@@ -4,49 +4,49 @@ core: '8'
 description: ''
 disabled: '0'
 display:
-    default:
-        display_options:
-            access:
-                type: perm
-            cache:
-                type: none
-            exposed_form:
-                type: basic
-            fields:
-                title:
-                    alter:
-                        ellipsis: '0'
-                        word_boundary: '0'
-                    field: title
-                    id: title
-                    label: ''
-                    table: node
-            filters:
-                status:
-                    expose:
-                        operator: '0'
-                    field: status
-                    group: '1'
-                    id: status
-                    table: node
-                    value: '1'
-            pager:
-                type: full
-            query:
-                type: views_query
-            row_plugin: fields
-            style_plugin: default
-        display_plugin: default
-        display_title: Master
-        id: default
-        position: '0'
-    page_1:
-        display_options:
-            path: test
-        display_plugin: page
-        display_title: Page
-        id: page_1
-        position: '0'
+  default:
+    display_options:
+      access:
+        type: perm
+      cache:
+        type: none
+      exposed_form:
+        type: basic
+      fields:
+        title:
+          alter:
+            ellipsis: '0'
+            word_boundary: '0'
+          field: title
+          id: title
+          label: ''
+          table: node
+      filters:
+        status:
+          expose:
+            operator: '0'
+          field: status
+          group: '1'
+          id: status
+          table: node
+          value: '1'
+      pager:
+        type: full
+      query:
+        type: views_query
+      row_plugin: fields
+      style_plugin: default
+    display_plugin: default
+    display_title: Master
+    id: default
+    position: '0'
+  page_1:
+    display_options:
+      path: test
+    display_plugin: page
+    display_title: Page
+    id: page_1
+    position: '0'
 human_name: test_filter_group_override
 name: test_filter_group_override
 tag: default
diff --git a/tests/views_test_config/config/views.view.test_filter_groups.yml b/tests/views_test_config/config/views.view.test_filter_groups.yml
index 52a4451..ecc4fde 100644
--- a/tests/views_test_config/config/views.view.test_filter_groups.yml
+++ b/tests/views_test_config/config/views.view.test_filter_groups.yml
@@ -4,106 +4,106 @@ core: '8'
 description: ''
 disabled: '0'
 display:
-    default:
-        display_options:
-            access:
-                type: perm
-            cache:
-                type: none
-            exposed_form:
-                type: basic
-            fields:
-                title:
-                    alter:
-                        ellipsis: '0'
-                        word_boundary: '0'
-                    field: title
-                    id: title
-                    label: ''
-                    table: node
-            filter_groups:
-                groups:
-                    1: AND
-                    2: AND
-            filters:
-                nid:
-                    field: nid
-                    group: '2'
-                    id: nid
-                    table: node
-                    value:
-                        value: '1'
-                nid_1:
-                    field: nid
-                    group: '2'
-                    id: nid_1
-                    table: node
-                    value:
-                        value: '2'
-                status:
-                    expose:
-                        operator: '0'
-                    field: status
-                    group: '1'
-                    id: status
-                    table: node
-                    value: '1'
-            pager:
-                options:
-                    items_per_page: '10'
-                type: full
-            query:
-                type: views_query
-            row_plugin: node
-            sorts:
-                created:
-                    field: created
-                    id: created
-                    order: DESC
-                    table: node
-            style_plugin: default
-            title: test_filter_groups
-        display_plugin: default
-        display_title: Master
-        id: default
-        position: '0'
-    page:
-        display_options:
-            defaults:
-                filters: '0'
-            filter_groups:
-                groups:
-                    1: OR
-                    2: OR
-                operator: OR
-            filters:
-                nid:
-                    field: nid
-                    group: '2'
-                    id: nid
-                    table: node
-                    value:
-                        value: '1'
-                nid_1:
-                    field: nid
-                    group: '2'
-                    id: nid_1
-                    table: node
-                    value:
-                        value: '2'
-                status:
-                    expose:
-                        operator: '0'
-                    field: status
-                    group: '1'
-                    id: status
-                    table: node
-                    value: '1'
-            path: test-filter-groups
-        display_plugin: page
-        display_title: Page
-        id: page
-        position: '0'
+  default:
+    display_options:
+      access:
+        type: perm
+      cache:
+        type: none
+      exposed_form:
+        type: basic
+      fields:
+        title:
+          alter:
+            ellipsis: '0'
+            word_boundary: '0'
+          field: title
+          id: title
+          label: ''
+          table: node
+      filter_groups:
+        groups:
+          1: AND
+          2: AND
+      filters:
+        nid:
+          field: nid
+          group: '2'
+          id: nid
+          table: node
+          value:
+            value: '1'
+        nid_1:
+          field: nid
+          group: '2'
+          id: nid_1
+          table: node
+          value:
+            value: '2'
+        status:
+          expose:
+            operator: '0'
+          field: status
+          group: '1'
+          id: status
+          table: node
+          value: '1'
+      pager:
+        options:
+          items_per_page: '10'
+        type: full
+      query:
+        type: views_query
+      row_plugin: node
+      sorts:
+        created:
+          field: created
+          id: created
+          order: DESC
+          table: node
+      style_plugin: default
+      title: test_filter_groups
+    display_plugin: default
+    display_title: Master
+    id: default
+    position: '0'
+  page:
+    display_options:
+      defaults:
+        filters: '0'
+      filter_groups:
+        groups:
+          1: OR
+          2: OR
+        operator: OR
+      filters:
+        nid:
+          field: nid
+          group: '2'
+          id: nid
+          table: node
+          value:
+            value: '1'
+        nid_1:
+          field: nid
+          group: '2'
+          id: nid_1
+          table: node
+          value:
+            value: '2'
+        status:
+          expose:
+            operator: '0'
+          field: status
+          group: '1'
+          id: status
+          table: node
+          value: '1'
+      path: test-filter-groups
+    display_plugin: page
+    display_title: Page
+    id: page
+    position: '0'
 human_name: test_filter_groups
 name: test_filter_groups
 tag: default
diff --git a/tests/views_test_config/config/views.view.test_glossary.yml b/tests/views_test_config/config/views.view.test_glossary.yml
index 9ba8a9e..648972f 100644
--- a/tests/views_test_config/config/views.view.test_glossary.yml
+++ b/tests/views_test_config/config/views.view.test_glossary.yml
@@ -4,43 +4,43 @@ core: '8'
 description: ''
 disabled: '0'
 display:
-    default:
-        display_options:
-            access:
-                type: perm
-            arguments:
-                title:
-                    default_argument_type: fixed
-                    field: title
-                    glossary: '1'
-                    id: title
-                    limit: '1'
-                    summary:
-                        format: default_summary
-                        number_of_records: '0'
-                    summary_options:
-                        items_per_page: '25'
-                    table: node
-            cache:
-                type: none
-            exposed_form:
-                type: basic
-            fields:
-                title:
-                    field: title
-                    id: title
-                    label: ''
-                    table: node
-            pager:
-                type: full
-            query:
-                type: views_query
-            row_plugin: fields
-            style_plugin: default
-        display_plugin: default
-        display_title: Master
-        id: default
-        position: '0'
+  default:
+    display_options:
+      access:
+        type: perm
+      arguments:
+        title:
+          default_argument_type: fixed
+          field: title
+          glossary: '1'
+          id: title
+          limit: '1'
+          summary:
+            format: default_summary
+            number_of_records: '0'
+          summary_options:
+            items_per_page: '25'
+          table: node
+      cache:
+        type: none
+      exposed_form:
+        type: basic
+      fields:
+        title:
+          field: title
+          id: title
+          label: ''
+          table: node
+      pager:
+        type: full
+      query:
+        type: views_query
+      row_plugin: fields
+      style_plugin: default
+    display_plugin: default
+    display_title: Master
+    id: default
+    position: '0'
 human_name: test_glossary
 name: test_glossary
 tag: default
diff --git a/tests/views_test_config/config/views.view.test_group_by_count.yml b/tests/views_test_config/config/views.view.test_group_by_count.yml
index 3ad53dc..ae3fe63 100644
--- a/tests/views_test_config/config/views.view.test_group_by_count.yml
+++ b/tests/views_test_config/config/views.view.test_group_by_count.yml
@@ -4,55 +4,55 @@ core: '8'
 description: ''
 disabled: '0'
 display:
-    default:
-        display_options:
-            access:
-                type: none
-            cache:
-                type: none
-            exposed_form:
-                type: basic
-            fields:
-                nid:
-                    alter:
-                        alter_text: '0'
-                        ellipsis: '1'
-                        html: '0'
-                        make_link: '0'
-                        strip_tags: '0'
-                        trim: '0'
-                        word_boundary: '1'
-                    empty_zero: '0'
-                    field: nid
-                    group_type: {  }
-                    hide_empty: '0'
-                    id: nid
-                    link_to_node: '0'
-                    table: node
-                type:
-                    alter:
-                        alter_text: '0'
-                        ellipsis: '1'
-                        html: '0'
-                        make_link: '0'
-                        strip_tags: '0'
-                        trim: '0'
-                        word_boundary: '1'
-                    empty_zero: '0'
-                    field: type
-                    hide_empty: '0'
-                    id: type
-                    link_to_node: '0'
-                    table: node
-            group_by: '1'
-            pager:
-                type: some
-            row_plugin: fields
-            style_plugin: default
-        display_plugin: default
-        display_title: Master
-        id: default
-        position: '0'
+  default:
+    display_options:
+      access:
+        type: none
+      cache:
+        type: none
+      exposed_form:
+        type: basic
+      fields:
+        nid:
+          alter:
+            alter_text: '0'
+            ellipsis: '1'
+            html: '0'
+            make_link: '0'
+            strip_tags: '0'
+            trim: '0'
+            word_boundary: '1'
+          empty_zero: '0'
+          field: nid
+          group_type: {  }
+          hide_empty: '0'
+          id: nid
+          link_to_node: '0'
+          table: node
+        type:
+          alter:
+            alter_text: '0'
+            ellipsis: '1'
+            html: '0'
+            make_link: '0'
+            strip_tags: '0'
+            trim: '0'
+            word_boundary: '1'
+          empty_zero: '0'
+          field: type
+          hide_empty: '0'
+          id: type
+          link_to_node: '0'
+          table: node
+      group_by: '1'
+      pager:
+        type: some
+      row_plugin: fields
+      style_plugin: default
+    display_plugin: default
+    display_title: Master
+    id: default
+    position: '0'
 human_name: ''
 name: test_group_by_count
 tag: ''
diff --git a/tests/views_test_config/config/views.view.test_group_by_in_filters.yml b/tests/views_test_config/config/views.view.test_group_by_in_filters.yml
index b32133f..e7fb952 100644
--- a/tests/views_test_config/config/views.view.test_group_by_in_filters.yml
+++ b/tests/views_test_config/config/views.view.test_group_by_in_filters.yml
@@ -4,48 +4,48 @@ core: '8'
 description: ''
 disabled: '0'
 display:
-    default:
-        display_options:
-            access:
-                type: none
-            cache:
-                type: none
-            exposed_form:
-                type: basic
-            fields:
-                type:
-                    alter:
-                        alter_text: '0'
-                        ellipsis: '1'
-                        html: '0'
-                        make_link: '0'
-                        strip_tags: '0'
-                        trim: '0'
-                        word_boundary: '1'
-                    empty_zero: '0'
-                    field: type
-                    hide_empty: '0'
-                    id: type
-                    link_to_node: '0'
-                    table: node
-            filters:
-                nid:
-                    field: nid
-                    group_type: count
-                    id: nid
-                    operator: '>'
-                    table: node
-                    value:
-                        value: '3'
-            group_by: '1'
-            pager:
-                type: some
-            row_plugin: fields
-            style_plugin: default
-        display_plugin: default
-        display_title: Master
-        id: default
-        position: '0'
+  default:
+    display_options:
+      access:
+        type: none
+      cache:
+        type: none
+      exposed_form:
+        type: basic
+      fields:
+        type:
+          alter:
+            alter_text: '0'
+            ellipsis: '1'
+            html: '0'
+            make_link: '0'
+            strip_tags: '0'
+            trim: '0'
+            word_boundary: '1'
+          empty_zero: '0'
+          field: type
+          hide_empty: '0'
+          id: type
+          link_to_node: '0'
+          table: node
+      filters:
+        nid:
+          field: nid
+          group_type: count
+          id: nid
+          operator: '>'
+          table: node
+          value:
+            value: '3'
+      group_by: '1'
+      pager:
+        type: some
+      row_plugin: fields
+      style_plugin: default
+    display_plugin: default
+    display_title: Master
+    id: default
+    position: '0'
 human_name: ''
 name: test_group_by_in_filters
 tag: ''
diff --git a/tests/views_test_config/config/views.view.test_pager_full.yml b/tests/views_test_config/config/views.view.test_pager_full.yml
index 32c1093..74b85a4 100644
--- a/tests/views_test_config/config/views.view.test_pager_full.yml
+++ b/tests/views_test_config/config/views.view.test_pager_full.yml
@@ -4,26 +4,26 @@ core: '8'
 description: ''
 disabled: '0'
 display:
-    default:
-        display_options:
-            access:
-                type: none
-            cache:
-                type: none
-            exposed_form:
-                type: basic
-            pager:
-                options:
-                    id: '0'
-                    items_per_page: '5'
-                    offset: '0'
-                type: full
-            row_plugin: node
-            style_plugin: default
-        display_plugin: default
-        display_title: Master
-        id: default
-        position: '0'
+  default:
+    display_options:
+      access:
+        type: none
+      cache:
+        type: none
+      exposed_form:
+        type: basic
+      pager:
+        options:
+          id: '0'
+          items_per_page: '5'
+          offset: '0'
+        type: full
+      row_plugin: node
+      style_plugin: default
+    display_plugin: default
+    display_title: Master
+    id: default
+    position: '0'
 human_name: ''
 name: test_pager_full
 tag: ''
diff --git a/tests/views_test_config/config/views.view.test_pager_none.yml b/tests/views_test_config/config/views.view.test_pager_none.yml
index 6826816..e69de29 100644
--- a/tests/views_test_config/config/views.view.test_pager_none.yml
+++ b/tests/views_test_config/config/views.view.test_pager_none.yml
@@ -1,25 +0,0 @@
-api_version: '3.0'
-base_table: node
-core: '8'
-description: ''
-disabled: '0'
-display:
-    default:
-        display_options:
-            access:
-                type: none
-            cache:
-                type: none
-            exposed_form:
-                type: basic
-            pager:
-                type: none
-            row_plugin: node
-            style_plugin: default
-        display_plugin: default
-        display_title: Master
-        id: default
-        position: '0'
-human_name: ''
-name: test_pager_none
-tag: ''
diff --git a/tests/views_test_config/config/views.view.test_pager_some.yml b/tests/views_test_config/config/views.view.test_pager_some.yml
index ac44377..cffa993 100644
--- a/tests/views_test_config/config/views.view.test_pager_some.yml
+++ b/tests/views_test_config/config/views.view.test_pager_some.yml
@@ -4,25 +4,25 @@ core: '8'
 description: ''
 disabled: '0'
 display:
-    default:
-        display_options:
-            access:
-                type: none
-            cache:
-                type: none
-            exposed_form:
-                type: basic
-            pager:
-                options:
-                    items_per_page: '5'
-                    offset: '0'
-                type: some
-            row_plugin: node
-            style_plugin: default
-        display_plugin: default
-        display_title: Master
-        id: default
-        position: '0'
+  default:
+    display_options:
+      access:
+        type: none
+      cache:
+        type: none
+      exposed_form:
+        type: basic
+      pager:
+        options:
+          items_per_page: '5'
+          offset: '0'
+        type: some
+      row_plugin: node
+      style_plugin: default
+    display_plugin: default
+    display_title: Master
+    id: default
+    position: '0'
 human_name: ''
 name: test_pager_some
 tag: ''
diff --git a/tests/views_test_config/config/views.view.test_plugin_argument_default_current_user.yml b/tests/views_test_config/config/views.view.test_plugin_argument_default_current_user.yml
index 302b4a8..7a713ae 100644
--- a/tests/views_test_config/config/views.view.test_plugin_argument_default_current_user.yml
+++ b/tests/views_test_config/config/views.view.test_plugin_argument_default_current_user.yml
@@ -4,51 +4,51 @@ core: '8'
 description: ''
 disabled: '0'
 display:
-    default:
-        display_options:
-            access:
-                type: none
-            arguments:
-                'null':
-                    default_action: default
-                    default_argument_type: current_user
-                    field: 'null'
-                    id: 'null'
-                    must_not_be: '0'
-                    style_plugin: default_summary
-                    table: views
-            cache:
-                type: none
-            exposed_form:
-                type: basic
-            fields:
-                title:
-                    alter:
-                        alter_text: '0'
-                        ellipsis: '1'
-                        html: '0'
-                        make_link: '0'
-                        strip_tags: '0'
-                        trim: '0'
-                        word_boundary: '1'
-                    empty_zero: '0'
-                    field: title
-                    hide_empty: '0'
-                    id: title
-                    link_to_node: '0'
-                    table: node
-            pager:
-                options:
-                    id: '0'
-                    items_per_page: '10'
-                    offset: '0'
-                type: full
-            row_plugin: fields
-            style_plugin: default
-        display_plugin: default
-        display_title: Master
-        id: default
-        position: '0'
+  default:
+    display_options:
+      access:
+        type: none
+      arguments:
+        'null':
+          default_action: default
+          default_argument_type: current_user
+          field: 'null'
+          id: 'null'
+          must_not_be: '0'
+          style_plugin: default_summary
+          table: views
+      cache:
+        type: none
+      exposed_form:
+        type: basic
+      fields:
+        title:
+          alter:
+            alter_text: '0'
+            ellipsis: '1'
+            html: '0'
+            make_link: '0'
+            strip_tags: '0'
+            trim: '0'
+            word_boundary: '1'
+          empty_zero: '0'
+          field: title
+          hide_empty: '0'
+          id: title
+          link_to_node: '0'
+          table: node
+      pager:
+        options:
+          id: '0'
+          items_per_page: '10'
+          offset: '0'
+        type: full
+      row_plugin: fields
+      style_plugin: default
+    display_plugin: default
+    display_title: Master
+    id: default
+    position: '0'
 human_name: ''
 name: test_plugin_argument_default_current_user
 tag: ''
diff --git a/tests/views_test_config/config/views.view.test_store_pager_settings.yml b/tests/views_test_config/config/views.view.test_store_pager_settings.yml
index d7f9b33..f885255 100644
--- a/tests/views_test_config/config/views.view.test_store_pager_settings.yml
+++ b/tests/views_test_config/config/views.view.test_store_pager_settings.yml
@@ -4,22 +4,22 @@ core: '8'
 description: ''
 disabled: '0'
 display:
-    default:
-        display_options:
-            access:
-                type: none
-            cache:
-                type: none
-            exposed_form:
-                type: basic
-            pager:
-                type: none
-            row_plugin: node
-            style_plugin: default
-        display_plugin: default
-        display_title: Master
-        id: default
-        position: '0'
+  default:
+    display_options:
+      access:
+        type: none
+      cache:
+        type: none
+      exposed_form:
+        type: basic
+      pager:
+        type: none
+      row_plugin: node
+      style_plugin: default
+    display_plugin: default
+    display_title: Master
+    id: default
+    position: '0'
 human_name: ''
 name: test_store_pager_settings
 tag: ''
diff --git a/tests/views_test_config/config/views.view.test_taxonomy_node_term_data.yml b/tests/views_test_config/config/views.view.test_taxonomy_node_term_data.yml
index 0c3b897..b3e4ef5 100644
--- a/tests/views_test_config/config/views.view.test_taxonomy_node_term_data.yml
+++ b/tests/views_test_config/config/views.view.test_taxonomy_node_term_data.yml
@@ -4,62 +4,62 @@ core: '8'
 description: ''
 disabled: '0'
 display:
-    default:
-        display_options:
-            access:
-                type: perm
-            arguments:
-                tid:
-                    default_argument_type: fixed
-                    field: tid
-                    id: tid
-                    relationship: term_node_tid
-                    summary:
-                        format: default_summary
-                        number_of_records: '0'
-                    summary_options:
-                        items_per_page: '25'
-                    table: taxonomy_term_data
-                tid_1:
-                    default_argument_type: fixed
-                    field: tid
-                    id: tid_1
-                    relationship: term_node_tid_1
-                    summary:
-                        format: default_summary
-                        number_of_records: '0'
-                    summary_options:
-                        items_per_page: '25'
-                    table: taxonomy_term_data
-            cache:
-                type: none
-            exposed_form:
-                type: basic
-            pager:
-                type: full
-            query:
-                type: views_query
-            relationships:
-                term_node_tid:
-                    field: term_node_tid
-                    id: term_node_tid
-                    label: 'Term #1'
-                    table: node
-                    vocabularies:
-                        tags: '0'
-                term_node_tid_1:
-                    field: term_node_tid
-                    id: term_node_tid_1
-                    label: 'Term #2'
-                    table: node
-                    vocabularies:
-                        tags: '0'
-            row_plugin: node
-            style_plugin: default
-        display_plugin: default
-        display_title: Master
-        id: default
-        position: '0'
+  default:
+    display_options:
+      access:
+        type: perm
+      arguments:
+        tid:
+          default_argument_type: fixed
+          field: tid
+          id: tid
+          relationship: term_node_tid
+          summary:
+            format: default_summary
+            number_of_records: '0'
+          summary_options:
+            items_per_page: '25'
+          table: taxonomy_term_data
+        tid_1:
+          default_argument_type: fixed
+          field: tid
+          id: tid_1
+          relationship: term_node_tid_1
+          summary:
+            format: default_summary
+            number_of_records: '0'
+          summary_options:
+            items_per_page: '25'
+          table: taxonomy_term_data
+      cache:
+        type: none
+      exposed_form:
+        type: basic
+      pager:
+        type: full
+      query:
+        type: views_query
+      relationships:
+        term_node_tid:
+          field: term_node_tid
+          id: term_node_tid
+          label: 'Term #1'
+          table: node
+          vocabularies:
+            tags: '0'
+        term_node_tid_1:
+          field: term_node_tid
+          id: term_node_tid_1
+          label: 'Term #2'
+          table: node
+          vocabularies:
+            tags: '0'
+      row_plugin: node
+      style_plugin: default
+    display_plugin: default
+    display_title: Master
+    id: default
+    position: '0'
 human_name: test_taxonomy_node_term_data
 name: test_taxonomy_node_term_data
 tag: ''
diff --git a/tests/views_test_config/config/views.view.test_user_relationship.yml b/tests/views_test_config/config/views.view.test_user_relationship.yml
index e37718a..66a9c03 100644
--- a/tests/views_test_config/config/views.view.test_user_relationship.yml
+++ b/tests/views_test_config/config/views.view.test_user_relationship.yml
@@ -4,97 +4,97 @@ core: '8'
 description: ''
 disabled: '0'
 display:
-    default:
-        display_options:
-            access:
-                type: perm
-            cache:
-                type: none
-            exposed_form:
-                type: basic
-            fields:
-                name:
-                    alter:
-                        absolute: '0'
-                        alter_text: '0'
-                        ellipsis: '1'
-                        external: '0'
-                        html: '0'
-                        make_link: '0'
-                        nl2br: '0'
-                        replace_spaces: '0'
-                        strip_tags: '0'
-                        trim: '0'
-                        trim_whitespace: '0'
-                        word_boundary: '1'
-                    element_default_classes: '1'
-                    element_label_colon: '1'
-                    empty_zero: '0'
-                    field: name
-                    hide_alter_empty: '0'
-                    hide_empty: '0'
-                    id: name
-                    link_to_user: '1'
-                    overwrite_anonymous: '0'
-                    table: users
-                title:
-                    alter:
-                        absolute: '0'
-                        alter_text: '0'
-                        ellipsis: '0'
-                        html: '0'
-                        make_link: '0'
-                        strip_tags: '0'
-                        trim: '0'
-                        word_boundary: '0'
-                    empty_zero: '0'
-                    field: title
-                    hide_empty: '0'
-                    id: title
-                    label: ''
-                    link_to_node: '1'
-                    table: node
-                uid:
-                    alter:
-                        absolute: '0'
-                        alter_text: '0'
-                        ellipsis: '1'
-                        external: '0'
-                        html: '0'
-                        make_link: '0'
-                        nl2br: '0'
-                        replace_spaces: '0'
-                        strip_tags: '0'
-                        trim: '0'
-                        trim_whitespace: '0'
-                        word_boundary: '1'
-                    element_default_classes: '1'
-                    element_label_colon: '1'
-                    empty_zero: '0'
-                    field: uid
-                    hide_alter_empty: '0'
-                    hide_empty: '0'
-                    id: uid
-                    link_to_user: '1'
-                    table: users
-            pager:
-                options:
-                    items_per_page: '10'
-                type: full
-            query:
-                options:
-                    query_comment: '0'
-                type: views_query
-            row_options:
-                default_field_elements: '1'
-                hide_empty: '0'
-            row_plugin: fields
-            style_plugin: default
-            title: test_user_relationship
-        display_plugin: default
-        display_title: Master
-        id: default
-        position: '0'
+  default:
+    display_options:
+      access:
+        type: perm
+      cache:
+        type: none
+      exposed_form:
+        type: basic
+      fields:
+        name:
+          alter:
+            absolute: '0'
+            alter_text: '0'
+            ellipsis: '1'
+            external: '0'
+            html: '0'
+            make_link: '0'
+            nl2br: '0'
+            replace_spaces: '0'
+            strip_tags: '0'
+            trim: '0'
+            trim_whitespace: '0'
+            word_boundary: '1'
+          element_default_classes: '1'
+          element_label_colon: '1'
+          empty_zero: '0'
+          field: name
+          hide_alter_empty: '0'
+          hide_empty: '0'
+          id: name
+          link_to_user: '1'
+          overwrite_anonymous: '0'
+          table: users
+        title:
+          alter:
+            absolute: '0'
+            alter_text: '0'
+            ellipsis: '0'
+            html: '0'
+            make_link: '0'
+            strip_tags: '0'
+            trim: '0'
+            word_boundary: '0'
+          empty_zero: '0'
+          field: title
+          hide_empty: '0'
+          id: title
+          label: ''
+          link_to_node: '1'
+          table: node
+        uid:
+          alter:
+            absolute: '0'
+            alter_text: '0'
+            ellipsis: '1'
+            external: '0'
+            html: '0'
+            make_link: '0'
+            nl2br: '0'
+            replace_spaces: '0'
+            strip_tags: '0'
+            trim: '0'
+            trim_whitespace: '0'
+            word_boundary: '1'
+          element_default_classes: '1'
+          element_label_colon: '1'
+          empty_zero: '0'
+          field: uid
+          hide_alter_empty: '0'
+          hide_empty: '0'
+          id: uid
+          link_to_user: '1'
+          table: users
+      pager:
+        options:
+          items_per_page: '10'
+        type: full
+      query:
+        options:
+          query_comment: '0'
+        type: views_query
+      row_options:
+        default_field_elements: '1'
+        hide_empty: '0'
+      row_plugin: fields
+      style_plugin: default
+      title: test_user_relationship
+    display_plugin: default
+    display_title: Master
+    id: default
+    position: '0'
 human_name: test_user_relationship
 name: test_user_relationship
 tag: default
diff --git a/tests/views_test_config/config/views.view.test_view.yml b/tests/views_test_config/config/views.view.test_view.yml
index 821b50c..81035cf 100644
--- a/tests/views_test_config/config/views.view.test_view.yml
+++ b/tests/views_test_config/config/views.view.test_view.yml
@@ -4,45 +4,45 @@ core: '8'
 description: ''
 disabled: '0'
 display:
-    default:
-        display_options:
-            defaults:
-                fields: '0'
-                pager: '0'
-                pager_options: '0'
-                sorts: '0'
-            fields:
-                age:
-                    field: age
-                    id: age
-                    relationship: none
-                    table: views_test
-                id:
-                    field: id
-                    id: id
-                    relationship: none
-                    table: views_test
-                name:
-                    field: name
-                    id: name
-                    relationship: none
-                    table: views_test
-            pager:
-                options:
-                    offset: '0'
-                type: none
-            pager_options: {  }
-            sorts:
-                id:
-                    field: id
-                    id: id
-                    order: ASC
-                    relationship: none
-                    table: views_test
-        display_plugin: default
-        display_title: Master
-        id: default
-        position: '0'
+  default:
+    display_options:
+      defaults:
+        fields: '0'
+        pager: '0'
+        pager_options: '0'
+        sorts: '0'
+      fields:
+        age:
+          field: age
+          id: age
+          relationship: none
+          table: views_test
+        id:
+          field: id
+          id: id
+          relationship: none
+          table: views_test
+        name:
+          field: name
+          id: name
+          relationship: none
+          table: views_test
+      pager:
+        options:
+          offset: '0'
+        type: none
+      pager_options: {  }
+      sorts:
+        id:
+          field: id
+          id: id
+          order: ASC
+          relationship: none
+          table: views_test
+    display_plugin: default
+    display_title: Master
+    id: default
+    position: '0'
 human_name: ''
 name: test_view
 tag: ''
diff --git a/tests/views_test_config/config/views.view.test_view_argument_validate_numeric.yml b/tests/views_test_config/config/views.view.test_view_argument_validate_numeric.yml
index 1207664..13c4d2c 100644
--- a/tests/views_test_config/config/views.view.test_view_argument_validate_numeric.yml
+++ b/tests/views_test_config/config/views.view.test_view_argument_validate_numeric.yml
@@ -4,32 +4,32 @@ core: '8'
 description: ''
 disabled: '0'
 display:
-    default:
-        display_options:
-            access:
-                type: none
-            arguments:
-                'null':
-                    default_argument_type: fixed
-                    field: 'null'
-                    id: 'null'
-                    must_not_be: '0'
-                    style_plugin: default_summary
-                    table: views
-                    validate:
-                        type: numeric
-            cache:
-                type: none
-            exposed_form:
-                type: basic
-            pager:
-                type: full
-            row_plugin: fields
-            style_plugin: default
-        display_plugin: default
-        display_title: Master
-        id: default
-        position: '0'
+  default:
+    display_options:
+      access:
+        type: none
+      arguments:
+        'null':
+          default_argument_type: fixed
+          field: 'null'
+          id: 'null'
+          must_not_be: '0'
+          style_plugin: default_summary
+          table: views
+          validate:
+            type: numeric
+      cache:
+        type: none
+      exposed_form:
+        type: basic
+      pager:
+        type: full
+      row_plugin: fields
+      style_plugin: default
+    display_plugin: default
+    display_title: Master
+    id: default
+    position: '0'
 human_name: ''
 name: test_view_argument_validate_numeric
 tag: ''
diff --git a/tests/views_test_config/config/views.view.test_view_argument_validate_php.yml b/tests/views_test_config/config/views.view.test_view_argument_validate_php.yml
index 477cc22..4a0cf1e 100644
--- a/tests/views_test_config/config/views.view.test_view_argument_validate_php.yml
+++ b/tests/views_test_config/config/views.view.test_view_argument_validate_php.yml
@@ -4,32 +4,32 @@ core: '8'
 description: ''
 disabled: '0'
 display:
-    default:
-        display_options:
-            access:
-                type: none
-            arguments:
-                'null':
-                    default_argument_type: fixed
-                    field: 'null'
-                    id: 'null'
-                    must_not_be: '0'
-                    style_plugin: default_summary
-                    table: views
-                    validate:
-                        type: php
-            cache:
-                type: none
-            exposed_form:
-                type: basic
-            pager:
-                type: full
-            row_plugin: fields
-            style_plugin: default
-        display_plugin: default
-        display_title: Master
-        id: default
-        position: '0'
+  default:
+    display_options:
+      access:
+        type: none
+      arguments:
+        'null':
+          default_argument_type: fixed
+          field: 'null'
+          id: 'null'
+          must_not_be: '0'
+          style_plugin: default_summary
+          table: views
+          validate:
+            type: php
+      cache:
+        type: none
+      exposed_form:
+        type: basic
+      pager:
+        type: full
+      row_plugin: fields
+      style_plugin: default
+    display_plugin: default
+    display_title: Master
+    id: default
+    position: '0'
 human_name: ''
 name: test_view_argument_validate_numeric
 tag: ''
diff --git a/tests/views_test_config/config/views.view.test_view_argument_validate_user.yml b/tests/views_test_config/config/views.view.test_view_argument_validate_user.yml
index fecba82..ac98d90 100644
--- a/tests/views_test_config/config/views.view.test_view_argument_validate_user.yml
+++ b/tests/views_test_config/config/views.view.test_view_argument_validate_user.yml
@@ -4,32 +4,32 @@ core: '8'
 description: ''
 disabled: '0'
 display:
-    default:
-        display_options:
-            access:
-                type: none
-            arguments:
-                'null':
-                    default_argument_type: fixed
-                    field: 'null'
-                    id: 'null'
-                    must_not_be: '0'
-                    style_plugin: default_summary
-                    table: views
-                    validate:
-                        type: user
-            cache:
-                type: none
-            exposed_form:
-                type: basic
-            pager:
-                type: full
-            row_plugin: fields
-            style_plugin: default
-        display_plugin: default
-        display_title: Master
-        id: default
-        position: '0'
+  default:
+    display_options:
+      access:
+        type: none
+      arguments:
+        'null':
+          default_argument_type: fixed
+          field: 'null'
+          id: 'null'
+          must_not_be: '0'
+          style_plugin: default_summary
+          table: views
+          validate:
+            type: user
+      cache:
+        type: none
+      exposed_form:
+        type: basic
+      pager:
+        type: full
+      row_plugin: fields
+      style_plugin: default
+    display_plugin: default
+    display_title: Master
+    id: default
+    position: '0'
 human_name: ''
 name: test_view_argument_validate_user
 tag: ''
diff --git a/tests/views_test_config/config/views.view.test_view_delete.yml b/tests/views_test_config/config/views.view.test_view_delete.yml
index ea6dd9e..7b19ccf 100644
--- a/tests/views_test_config/config/views.view.test_view_delete.yml
+++ b/tests/views_test_config/config/views.view.test_view_delete.yml
@@ -4,24 +4,24 @@ core: '8'
 description: ''
 disabled: '0'
 display:
-    default:
-        display_options:
-            access:
-                type: none
-            cache:
-                type: none
-            exposed_form:
-                type: basic
-            pager:
-                type: full
-            query:
-                type: views_query
-            row_plugin: fields
-            style_plugin: default
-        display_plugin: default
-        display_title: Defaults
-        id: default
-        position: '0'
+  default:
+    display_options:
+      access:
+        type: none
+      cache:
+        type: none
+      exposed_form:
+        type: basic
+      pager:
+        type: full
+      query:
+        type: views_query
+      row_plugin: fields
+      style_plugin: default
+    display_plugin: default
+    display_title: Defaults
+    id: default
+    position: '0'
 human_name: test_view_delete
 name: test_view_delete
 tag: ''
diff --git a/tests/views_test_config/config/views.view.test_view_fieldapi.yml b/tests/views_test_config/config/views.view.test_view_fieldapi.yml
index d82dab1..0d9acbb 100644
--- a/tests/views_test_config/config/views.view.test_view_fieldapi.yml
+++ b/tests/views_test_config/config/views.view.test_view_fieldapi.yml
@@ -4,34 +4,34 @@ core: '8'
 description: ''
 disabled: '0'
 display:
-    default:
-        display_options:
-            access:
-                type: perm
-            fields:
-                nid:
-                    field: nid
-                    id: nid
-                    table: node
-            cache:
-                type: none
-            exposed_form:
-                type: basic
-            fields:
-                nid:
-                    field: nid
-                    id: nid
-                    table: node
-            pager:
-                type: full
-            query:
-                type: views_query
-            row_plugin: fields
-            style_plugin: default
-        display_plugin: default
-        display_title: Master
-        id: default
-        position: '0'
+  default:
+    display_options:
+      access:
+        type: perm
+      fields:
+        nid:
+          field: nid
+          id: nid
+          table: node
+      cache:
+        type: none
+      exposed_form:
+        type: basic
+      fields:
+        nid:
+          field: nid
+          id: nid
+          table: node
+      pager:
+        type: full
+      query:
+        type: views_query
+      row_plugin: fields
+      style_plugin: default
+    display_plugin: default
+    display_title: Master
+    id: default
+    position: '0'
 human_name: test_view_fieldapi
 name: test_view_fieldapi
 tag: default
diff --git a/tests/views_test_config/config/views.view.test_view_pager_full_zero_items_per_page.yml b/tests/views_test_config/config/views.view.test_view_pager_full_zero_items_per_page.yml
index a8149c8..b0dc441 100644
--- a/tests/views_test_config/config/views.view.test_view_pager_full_zero_items_per_page.yml
+++ b/tests/views_test_config/config/views.view.test_view_pager_full_zero_items_per_page.yml
@@ -4,42 +4,42 @@ core: '8'
 description: ''
 disabled: '0'
 display:
-    default:
-        display_options:
-            access:
-                type: none
-            cache:
-                type: none
-            exposed_form:
-                type: basic
-            fields:
-                title:
-                    alter:
-                        alter_text: '0'
-                        ellipsis: '1'
-                        html: '0'
-                        make_link: '0'
-                        strip_tags: '0'
-                        trim: '0'
-                        word_boundary: '1'
-                    empty_zero: '0'
-                    field: title
-                    hide_empty: '0'
-                    id: title
-                    link_to_node: '0'
-                    table: node
-            pager:
-                options:
-                    id: '0'
-                    items_per_page: '0'
-                    offset: '0'
-                type: full
-            row_plugin: fields
-            style_plugin: default
-        display_plugin: default
-        display_title: Master
-        id: default
-        position: '0'
+  default:
+    display_options:
+      access:
+        type: none
+      cache:
+        type: none
+      exposed_form:
+        type: basic
+      fields:
+        title:
+          alter:
+            alter_text: '0'
+            ellipsis: '1'
+            html: '0'
+            make_link: '0'
+            strip_tags: '0'
+            trim: '0'
+            word_boundary: '1'
+          empty_zero: '0'
+          field: title
+          hide_empty: '0'
+          id: title
+          link_to_node: '0'
+          table: node
+      pager:
+        options:
+          id: '0'
+          items_per_page: '0'
+          offset: '0'
+        type: full
+      row_plugin: fields
+      style_plugin: default
+    display_plugin: default
+    display_title: Master
+    id: default
+    position: '0'
 human_name: ''
 name: test_view_pager_full_zero_items_per_page
 tag: ''
diff --git a/tests/views_test_config/config/views.view.test_view_unpack_translatable.yml b/tests/views_test_config/config/views.view.test_view_unpack_translatable.yml
index 1c38165..9435787 100644
--- a/tests/views_test_config/config/views.view.test_view_unpack_translatable.yml
+++ b/tests/views_test_config/config/views.view.test_view_unpack_translatable.yml
@@ -4,77 +4,77 @@ core: '8'
 description: ''
 disabled: '0'
 display:
-    default:
-        display_options:
-            access:
-                type: none
-            cache:
-                type: none
-            exposed_form:
-                options:
-                    exposed_sorts_label: 'Sort By1'
-                    reset_button: '1'
-                    reset_button_label: Reset1
-                    sort_asc_label: Asc1
-                    sort_desc_label: Desc1
-                    submit_button: Apply1
-                type: basic
-            fields:
-                nid:
-                    alter:
-                        alter_text: '0'
-                        ellipsis: '1'
-                        html: '0'
-                        make_link: '0'
-                        strip_tags: '0'
-                        trim: '0'
-                        word_boundary: '1'
-                    empty_zero: '0'
-                    field: nid
-                    hide_empty: '0'
-                    id: nid
-                    label: fieldlabel1
-                    link_to_node: '0'
-                    table: node
-            filters:
-                nid:
-                    expose:
-                        identifier: nid
-                        label: filterlabel1
-                        multiple: '1'
-                        operator_id: nid_op
-                        reduce: '0'
-                    exposed: '1'
-                    field: nid
-                    id: nid
-                    table: node
-            pager:
-                options:
-                    expose:
-                        items_per_page: '1'
-                        items_per_page_label: 'Items per page1'
-                        offset: '1'
-                        offset_label: Offset1
-                    id: '0'
-                    items_per_page: '10'
-                    offset: '0'
-                    quantity: '9'
-                    tags:
-                        first: 'Tag first1'
-                        last: 'Tag last1'
-                        next: 'Tag next1'
-                        previous: 'Tag prev1'
-                type: full
-            query:
-                type: views_query
-            row_plugin: fields
-            style_plugin: default
-            title: title1
-            use_more_text: more1
-        display_plugin: default
-        display_title: Master1
-        id: default
-        position: '0'
+  default:
+    display_options:
+      access:
+        type: none
+      cache:
+        type: none
+      exposed_form:
+        options:
+          exposed_sorts_label: 'Sort By1'
+          reset_button: '1'
+          reset_button_label: Reset1
+          sort_asc_label: Asc1
+          sort_desc_label: Desc1
+          submit_button: Apply1
+        type: basic
+      fields:
+        nid:
+          alter:
+            alter_text: '0'
+            ellipsis: '1'
+            html: '0'
+            make_link: '0'
+            strip_tags: '0'
+            trim: '0'
+            word_boundary: '1'
+          empty_zero: '0'
+          field: nid
+          hide_empty: '0'
+          id: nid
+          label: fieldlabel1
+          link_to_node: '0'
+          table: node
+      filters:
+        nid:
+          expose:
+            identifier: nid
+            label: filterlabel1
+            multiple: '1'
+            operator_id: nid_op
+            reduce: '0'
+          exposed: '1'
+          field: nid
+          id: nid
+          table: node
+      pager:
+        options:
+          expose:
+            items_per_page: '1'
+            items_per_page_label: 'Items per page1'
+            offset: '1'
+            offset_label: Offset1
+          id: '0'
+          items_per_page: '10'
+          offset: '0'
+          quantity: '9'
+          tags:
+            first: 'Tag first1'
+            last: 'Tag last1'
+            next: 'Tag next1'
+            previous: 'Tag prev1'
+        type: full
+      query:
+        type: views_query
+      row_plugin: fields
+      style_plugin: default
+      title: title1
+      use_more_text: more1
+    display_plugin: default
+    display_title: Master1
+    id: default
+    position: '0'
 human_name: ''
 name: test_view_unpack_translatable
 tag: ''
diff --git a/tests/views_test_config/config/views.view.test_views_handler_field_user_name.yml b/tests/views_test_config/config/views.view.test_views_handler_field_user_name.yml
index a3dd693..b3f1718 100644
--- a/tests/views_test_config/config/views.view.test_views_handler_field_user_name.yml
+++ b/tests/views_test_config/config/views.view.test_views_handler_field_user_name.yml
@@ -4,45 +4,45 @@ core: '8'
 description: ''
 disabled: '0'
 display:
-    default:
-        display_options:
-            access:
-                type: none
-            cache:
-                type: none
-            exposed_form:
-                type: basic
-            fields:
-                name:
-                    alter:
-                        absolute: '0'
-                        alter_text: '0'
-                        ellipsis: '0'
-                        html: '0'
-                        make_link: '0'
-                        strip_tags: '0'
-                        trim: '0'
-                        word_boundary: '0'
-                    empty_zero: '0'
-                    field: name
-                    hide_empty: '0'
-                    id: name
-                    label: ''
-                    link_to_user: '1'
-                    overwrite_anonymous: '0'
-                    table: users
-            pager:
-                type: full
-            query:
-                options:
-                    query_comment: '0'
-                type: views_query
-            row_plugin: fields
-            style_plugin: default
-        display_plugin: default
-        display_title: Master
-        id: default
-        position: '0'
+  default:
+    display_options:
+      access:
+        type: none
+      cache:
+        type: none
+      exposed_form:
+        type: basic
+      fields:
+        name:
+          alter:
+            absolute: '0'
+            alter_text: '0'
+            ellipsis: '0'
+            html: '0'
+            make_link: '0'
+            strip_tags: '0'
+            trim: '0'
+            word_boundary: '0'
+          empty_zero: '0'
+          field: name
+          hide_empty: '0'
+          id: name
+          label: ''
+          link_to_user: '1'
+          overwrite_anonymous: '0'
+          table: users
+      pager:
+        type: full
+      query:
+        options:
+          query_comment: '0'
+        type: views_query
+      row_plugin: fields
+      style_plugin: default
+    display_plugin: default
+    display_title: Master
+    id: default
+    position: '0'
 human_name: test_views_handler_field_user_name
 name: test_views_handler_field_user_name
 tag: default
diff --git a/tests/views_test_config/config/views.view.test_views_move_to_field.yml b/tests/views_test_config/config/views.view.test_views_move_to_field.yml
index 6d8509a..a84e015 100644
--- a/tests/views_test_config/config/views.view.test_views_move_to_field.yml
+++ b/tests/views_test_config/config/views.view.test_views_move_to_field.yml
@@ -4,17 +4,17 @@ core: '8'
 description: ''
 disabled: '0'
 display:
-    default:
-        display_options:
-            fields:
-                old_field_1:
-                    field: old_field_1
-                    id: old_field_1
-                    table: views_test
-        display_plugin: default
-        display_title: Master
-        id: default
-        position: '0'
+  default:
+    display_options:
+      fields:
+        old_field_1:
+          field: old_field_1
+          id: old_field_1
+          table: views_test
+    display_plugin: default
+    display_title: Master
+    id: default
+    position: '0'
 human_name: ''
 name: test_views_move_to_field
 tag: ''
diff --git a/tests/views_test_config/config/views.view.test_views_move_to_handler.yml b/tests/views_test_config/config/views.view.test_views_move_to_handler.yml
index b33937e..a7d0e76 100644
--- a/tests/views_test_config/config/views.view.test_views_move_to_handler.yml
+++ b/tests/views_test_config/config/views.view.test_views_move_to_handler.yml
@@ -4,22 +4,22 @@ core: '8'
 description: ''
 disabled: '0'
 display:
-    default:
-        display_options:
-            fields:
-                old_field_2:
-                    field: old_field_2
-                    id: old_field_2
-                    table: views_test
-            filters:
-                old_field_3:
-                    field: old_field_3
-                    id: old_field_3
-                    table: views_test
-        display_plugin: default
-        display_title: Master
-        id: default
-        position: '0'
+  default:
+    display_options:
+      fields:
+        old_field_2:
+          field: old_field_2
+          id: old_field_2
+          table: views_test
+      filters:
+        old_field_3:
+          field: old_field_3
+          id: old_field_3
+          table: views_test
+    display_plugin: default
+    display_title: Master
+    id: default
+    position: '0'
 human_name: ''
 name: test_views_move_to_handler
 tag: ''
diff --git a/tests/views_test_config/config/views.view.test_views_move_to_table.yml b/tests/views_test_config/config/views.view.test_views_move_to_table.yml
index 2a2637a..956a7f0 100644
--- a/tests/views_test_config/config/views.view.test_views_move_to_table.yml
+++ b/tests/views_test_config/config/views.view.test_views_move_to_table.yml
@@ -4,17 +4,17 @@ core: '8'
 description: ''
 disabled: '0'
 display:
-    default:
-        display_options:
-            fields:
-                id:
-                    field: id
-                    id: id
-                    table: views_old_table
-        display_plugin: default
-        display_title: Master
-        id: default
-        position: '0'
+  default:
+    display_options:
+      fields:
+        id:
+          field: id
+          id: id
+          table: views_old_table
+    display_plugin: default
+    display_title: Master
+    id: default
+    position: '0'
 human_name: ''
 name: test_views_move_to_table
 tag: ''
