diff --git a/sudoers/_mapdata/init.sls b/sudoers/_mapdata/init.sls
index ff36d95..2eecccb 100644
--- a/sudoers/_mapdata/init.sls
+++ b/sudoers/_mapdata/init.sls
@@ -6,9 +6,7 @@
 {%- from tplroot ~ "/map.jinja" import sudoers with context %}
 
 {%- set _mapdata = {
-      "values": {
-        "sudoers": sudoers,
-      }
+      "values": sudoers,
     } %}
 {%- do salt["log.debug"]("### MAP.JINJA DUMP ###\n" ~ _mapdata | yaml(False)) %}
 
diff --git a/test/integration/default/files/_mapdata/amazonlinux-1.yaml b/test/integration/default/files/_mapdata/amazonlinux-1.yaml
index 772626a..a689dc0 100644
--- a/test/integration/default/files/_mapdata/amazonlinux-1.yaml
+++ b/test/integration/default/files/_mapdata/amazonlinux-1.yaml
@@ -2,70 +2,69 @@
 # Amazon Linux AMI-2018
 ---
 values:
-  sudoers:
-    aliases:
-      commands:
-        PROCESSES:
-        - /usr/bin/nice
-        - /bin/kill
-        - /usr/bin/renice
-        - /usr/bin/pkill
-        - /usr/bin/top
-      hosts:
-        WEBSERVERS:
-        - www1
-        - www2
-        - www3
-      users:
-        ADMINS:
-        - millert
-        - dowdy
-        - mikef
-    arch: amd64
-    configpath: /etc
-    defaults:
-      command_list:
-        PROCESSES: noexec
-      generic:
-      - env_reset
-      - mail_badpass
-      - secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-      host_list:
-        www1: log_year, logfile=/var/log/sudo.log
-      runas_list:
-        root: '!set_logname'
-      user_list:
-        ADMINS: '!lecture'
-        johndoe: '!requiretty'
-    execprefix: /usr/sbin
-    group: root
-    groups:
-      sudo:
-      - ALL=(ALL) ALL
-      - 'ALL=(nodejs) NOPASSWD: ALL'
-    included_files:
-      /etc/sudoers.d/extra-file:
-        users:
-          foo:
-          - ALL=(ALL) ALL
-      extra-file-2:
-        groups:
-          bargroup:
-          - 'ALL=(ALL) NOPASSWD: ALL'
-      extra-file-3:
-        netgroups:
-          other_netgroup:
-          - ALL=(ALL) ALL
-    includedir: /etc/sudoers.d
-    manage_main_config: true
-    netgroups:
-      sysadmins:
-      - ALL=(ALL) ALL
-    pkg: sudo
-    purge_includedir: false
+  aliases:
+    commands:
+      PROCESSES:
+      - /usr/bin/nice
+      - /bin/kill
+      - /usr/bin/renice
+      - /usr/bin/pkill
+      - /usr/bin/top
+    hosts:
+      WEBSERVERS:
+      - www1
+      - www2
+      - www3
     users:
-      johndoe:
-      - ALL=(ALL) ALL
-      - 'ALL=(root) NOPASSWD: /etc/init.d/httpd'
-      kitchen:
-      - 'ALL=(root) NOPASSWD: ALL'
+      ADMINS:
+      - millert
+      - dowdy
+      - mikef
+  arch: amd64
+  configpath: /etc
+  defaults:
+    command_list:
+      PROCESSES: noexec
+    generic:
+    - env_reset
+    - mail_badpass
+    - secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+    host_list:
+      www1: log_year, logfile=/var/log/sudo.log
+    runas_list:
+      root: '!set_logname'
+    user_list:
+      ADMINS: '!lecture'
+      johndoe: '!requiretty'
+  execprefix: /usr/sbin
+  group: root
+  groups:
+    sudo:
+    - ALL=(ALL) ALL
+    - 'ALL=(nodejs) NOPASSWD: ALL'
+  included_files:
+    /etc/sudoers.d/extra-file:
+      users:
+        foo:
+        - ALL=(ALL) ALL
+    extra-file-2:
+      groups:
+        bargroup:
+        - 'ALL=(ALL) NOPASSWD: ALL'
+    extra-file-3:
+      netgroups:
+        other_netgroup:
+        - ALL=(ALL) ALL
+  includedir: /etc/sudoers.d
+  manage_main_config: true
+  netgroups:
+    sysadmins:
+    - ALL=(ALL) ALL
+  pkg: sudo
+  purge_includedir: false
+  users:
+    johndoe:
+    - ALL=(ALL) ALL
+    - 'ALL=(root) NOPASSWD: /etc/init.d/httpd'
+    kitchen:
+    - 'ALL=(root) NOPASSWD: ALL'
diff --git a/test/integration/default/files/_mapdata/amazonlinux-2.yaml b/test/integration/default/files/_mapdata/amazonlinux-2.yaml
index 973c605..f519fc8 100644
--- a/test/integration/default/files/_mapdata/amazonlinux-2.yaml
+++ b/test/integration/default/files/_mapdata/amazonlinux-2.yaml
@@ -2,70 +2,69 @@
 # Amazon Linux-2
 ---
 values:
-  sudoers:
-    aliases:
-      commands:
-        PROCESSES:
-        - /usr/bin/nice
-        - /bin/kill
-        - /usr/bin/renice
-        - /usr/bin/pkill
-        - /usr/bin/top
-      hosts:
-        WEBSERVERS:
-        - www1
-        - www2
-        - www3
-      users:
-        ADMINS:
-        - millert
-        - dowdy
-        - mikef
-    arch: amd64
-    configpath: /etc
-    defaults:
-      command_list:
-        PROCESSES: noexec
-      generic:
-      - env_reset
-      - mail_badpass
-      - secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-      host_list:
-        www1: log_year, logfile=/var/log/sudo.log
-      runas_list:
-        root: '!set_logname'
-      user_list:
-        ADMINS: '!lecture'
-        johndoe: '!requiretty'
-    execprefix: /usr/sbin
-    group: root
-    groups:
-      sudo:
-      - ALL=(ALL) ALL
-      - 'ALL=(nodejs) NOPASSWD: ALL'
-    included_files:
-      /etc/sudoers.d/extra-file:
-        users:
-          foo:
-          - ALL=(ALL) ALL
-      extra-file-2:
-        groups:
-          bargroup:
-          - 'ALL=(ALL) NOPASSWD: ALL'
-      extra-file-3:
-        netgroups:
-          other_netgroup:
-          - ALL=(ALL) ALL
-    includedir: /etc/sudoers.d
-    manage_main_config: true
-    netgroups:
-      sysadmins:
-      - ALL=(ALL) ALL
-    pkg: sudo
-    purge_includedir: false
+  aliases:
+    commands:
+      PROCESSES:
+      - /usr/bin/nice
+      - /bin/kill
+      - /usr/bin/renice
+      - /usr/bin/pkill
+      - /usr/bin/top
+    hosts:
+      WEBSERVERS:
+      - www1
+      - www2
+      - www3
     users:
-      johndoe:
-      - ALL=(ALL) ALL
-      - 'ALL=(root) NOPASSWD: /etc/init.d/httpd'
-      kitchen:
-      - 'ALL=(root) NOPASSWD: ALL'
+      ADMINS:
+      - millert
+      - dowdy
+      - mikef
+  arch: amd64
+  configpath: /etc
+  defaults:
+    command_list:
+      PROCESSES: noexec
+    generic:
+    - env_reset
+    - mail_badpass
+    - secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+    host_list:
+      www1: log_year, logfile=/var/log/sudo.log
+    runas_list:
+      root: '!set_logname'
+    user_list:
+      ADMINS: '!lecture'
+      johndoe: '!requiretty'
+  execprefix: /usr/sbin
+  group: root
+  groups:
+    sudo:
+    - ALL=(ALL) ALL
+    - 'ALL=(nodejs) NOPASSWD: ALL'
+  included_files:
+    /etc/sudoers.d/extra-file:
+      users:
+        foo:
+        - ALL=(ALL) ALL
+    extra-file-2:
+      groups:
+        bargroup:
+        - 'ALL=(ALL) NOPASSWD: ALL'
+    extra-file-3:
+      netgroups:
+        other_netgroup:
+        - ALL=(ALL) ALL
+  includedir: /etc/sudoers.d
+  manage_main_config: true
+  netgroups:
+    sysadmins:
+    - ALL=(ALL) ALL
+  pkg: sudo
+  purge_includedir: false
+  users:
+    johndoe:
+    - ALL=(ALL) ALL
+    - 'ALL=(root) NOPASSWD: /etc/init.d/httpd'
+    kitchen:
+    - 'ALL=(root) NOPASSWD: ALL'
diff --git a/test/integration/default/files/_mapdata/arch-base-latest.yaml b/test/integration/default/files/_mapdata/arch-base-latest.yaml
index e94bddb..a2a9517 100644
--- a/test/integration/default/files/_mapdata/arch-base-latest.yaml
+++ b/test/integration/default/files/_mapdata/arch-base-latest.yaml
@@ -2,70 +2,69 @@
 # Arch
 ---
 values:
-  sudoers:
-    aliases:
-      commands:
-        PROCESSES:
-        - /usr/bin/nice
-        - /bin/kill
-        - /usr/bin/renice
-        - /usr/bin/pkill
-        - /usr/bin/top
-      hosts:
-        WEBSERVERS:
-        - www1
-        - www2
-        - www3
-      users:
-        ADMINS:
-        - millert
-        - dowdy
-        - mikef
-    arch: amd64
-    configpath: /etc
-    defaults:
-      command_list:
-        PROCESSES: noexec
-      generic:
-      - env_reset
-      - mail_badpass
-      - secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-      host_list:
-        www1: log_year, logfile=/var/log/sudo.log
-      runas_list:
-        root: '!set_logname'
-      user_list:
-        ADMINS: '!lecture'
-        johndoe: '!requiretty'
-    execprefix: /usr/sbin
-    group: root
-    groups:
-      sudo:
-      - ALL=(ALL) ALL
-      - 'ALL=(nodejs) NOPASSWD: ALL'
-    included_files:
-      /etc/sudoers.d/extra-file:
-        users:
-          foo:
-          - ALL=(ALL) ALL
-      extra-file-2:
-        groups:
-          bargroup:
-          - 'ALL=(ALL) NOPASSWD: ALL'
-      extra-file-3:
-        netgroups:
-          other_netgroup:
-          - ALL=(ALL) ALL
-    includedir: /etc/sudoers.d
-    manage_main_config: true
-    netgroups:
-      sysadmins:
-      - ALL=(ALL) ALL
-    pkg: sudo
-    purge_includedir: false
+  aliases:
+    commands:
+      PROCESSES:
+      - /usr/bin/nice
+      - /bin/kill
+      - /usr/bin/renice
+      - /usr/bin/pkill
+      - /usr/bin/top
+    hosts:
+      WEBSERVERS:
+      - www1
+      - www2
+      - www3
     users:
-      johndoe:
-      - ALL=(ALL) ALL
-      - 'ALL=(root) NOPASSWD: /etc/init.d/httpd'
-      kitchen:
-      - 'ALL=(root) NOPASSWD: ALL'
+      ADMINS:
+      - millert
+      - dowdy
+      - mikef
+  arch: amd64
+  configpath: /etc
+  defaults:
+    command_list:
+      PROCESSES: noexec
+    generic:
+    - env_reset
+    - mail_badpass
+    - secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+    host_list:
+      www1: log_year, logfile=/var/log/sudo.log
+    runas_list:
+      root: '!set_logname'
+    user_list:
+      ADMINS: '!lecture'
+      johndoe: '!requiretty'
+  execprefix: /usr/sbin
+  group: root
+  groups:
+    sudo:
+    - ALL=(ALL) ALL
+    - 'ALL=(nodejs) NOPASSWD: ALL'
+  included_files:
+    /etc/sudoers.d/extra-file:
+      users:
+        foo:
+        - ALL=(ALL) ALL
+    extra-file-2:
+      groups:
+        bargroup:
+        - 'ALL=(ALL) NOPASSWD: ALL'
+    extra-file-3:
+      netgroups:
+        other_netgroup:
+        - ALL=(ALL) ALL
+  includedir: /etc/sudoers.d
+  manage_main_config: true
+  netgroups:
+    sysadmins:
+    - ALL=(ALL) ALL
+  pkg: sudo
+  purge_includedir: false
+  users:
+    johndoe:
+    - ALL=(ALL) ALL
+    - 'ALL=(root) NOPASSWD: /etc/init.d/httpd'
+    kitchen:
+    - 'ALL=(root) NOPASSWD: ALL'
diff --git a/test/integration/default/files/_mapdata/centos-6.yaml b/test/integration/default/files/_mapdata/centos-6.yaml
index a905fb1..4238e45 100644
--- a/test/integration/default/files/_mapdata/centos-6.yaml
+++ b/test/integration/default/files/_mapdata/centos-6.yaml
@@ -2,70 +2,69 @@
 # CentOS-6
 ---
 values:
-  sudoers:
-    aliases:
-      commands:
-        PROCESSES:
-        - /usr/bin/nice
-        - /bin/kill
-        - /usr/bin/renice
-        - /usr/bin/pkill
-        - /usr/bin/top
-      hosts:
-        WEBSERVERS:
-        - www1
-        - www2
-        - www3
-      users:
-        ADMINS:
-        - millert
-        - dowdy
-        - mikef
-    arch: amd64
-    configpath: /etc
-    defaults:
-      command_list:
-        PROCESSES: noexec
-      generic:
-      - env_reset
-      - mail_badpass
-      - secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-      host_list:
-        www1: log_year, logfile=/var/log/sudo.log
-      runas_list:
-        root: '!set_logname'
-      user_list:
-        ADMINS: '!lecture'
-        johndoe: '!requiretty'
-    execprefix: /usr/sbin
-    group: root
-    groups:
-      sudo:
-      - ALL=(ALL) ALL
-      - 'ALL=(nodejs) NOPASSWD: ALL'
-    included_files:
-      /etc/sudoers.d/extra-file:
-        users:
-          foo:
-          - ALL=(ALL) ALL
-      extra-file-2:
-        groups:
-          bargroup:
-          - 'ALL=(ALL) NOPASSWD: ALL'
-      extra-file-3:
-        netgroups:
-          other_netgroup:
-          - ALL=(ALL) ALL
-    includedir: /etc/sudoers.d
-    manage_main_config: true
-    netgroups:
-      sysadmins:
-      - ALL=(ALL) ALL
-    pkg: sudo
-    purge_includedir: false
+  aliases:
+    commands:
+      PROCESSES:
+      - /usr/bin/nice
+      - /bin/kill
+      - /usr/bin/renice
+      - /usr/bin/pkill
+      - /usr/bin/top
+    hosts:
+      WEBSERVERS:
+      - www1
+      - www2
+      - www3
     users:
-      johndoe:
-      - ALL=(ALL) ALL
-      - 'ALL=(root) NOPASSWD: /etc/init.d/httpd'
-      kitchen:
-      - 'ALL=(root) NOPASSWD: ALL'
+      ADMINS:
+      - millert
+      - dowdy
+      - mikef
+  arch: amd64
+  configpath: /etc
+  defaults:
+    command_list:
+      PROCESSES: noexec
+    generic:
+    - env_reset
+    - mail_badpass
+    - secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+    host_list:
+      www1: log_year, logfile=/var/log/sudo.log
+    runas_list:
+      root: '!set_logname'
+    user_list:
+      ADMINS: '!lecture'
+      johndoe: '!requiretty'
+  execprefix: /usr/sbin
+  group: root
+  groups:
+    sudo:
+    - ALL=(ALL) ALL
+    - 'ALL=(nodejs) NOPASSWD: ALL'
+  included_files:
+    /etc/sudoers.d/extra-file:
+      users:
+        foo:
+        - ALL=(ALL) ALL
+    extra-file-2:
+      groups:
+        bargroup:
+        - 'ALL=(ALL) NOPASSWD: ALL'
+    extra-file-3:
+      netgroups:
+        other_netgroup:
+        - ALL=(ALL) ALL
+  includedir: /etc/sudoers.d
+  manage_main_config: true
+  netgroups:
+    sysadmins:
+    - ALL=(ALL) ALL
+  pkg: sudo
+  purge_includedir: false
+  users:
+    johndoe:
+    - ALL=(ALL) ALL
+    - 'ALL=(root) NOPASSWD: /etc/init.d/httpd'
+    kitchen:
+    - 'ALL=(root) NOPASSWD: ALL'
diff --git a/test/integration/default/files/_mapdata/centos-7.yaml b/test/integration/default/files/_mapdata/centos-7.yaml
index 2415e45..7b86d8e 100644
--- a/test/integration/default/files/_mapdata/centos-7.yaml
+++ b/test/integration/default/files/_mapdata/centos-7.yaml
@@ -2,70 +2,69 @@
 # CentOS Linux-7
 ---
 values:
-  sudoers:
-    aliases:
-      commands:
-        PROCESSES:
-        - /usr/bin/nice
-        - /bin/kill
-        - /usr/bin/renice
-        - /usr/bin/pkill
-        - /usr/bin/top
-      hosts:
-        WEBSERVERS:
-        - www1
-        - www2
-        - www3
-      users:
-        ADMINS:
-        - millert
-        - dowdy
-        - mikef
-    arch: amd64
-    configpath: /etc
-    defaults:
-      command_list:
-        PROCESSES: noexec
-      generic:
-      - env_reset
-      - mail_badpass
-      - secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-      host_list:
-        www1: log_year, logfile=/var/log/sudo.log
-      runas_list:
-        root: '!set_logname'
-      user_list:
-        ADMINS: '!lecture'
-        johndoe: '!requiretty'
-    execprefix: /usr/sbin
-    group: root
-    groups:
-      sudo:
-      - ALL=(ALL) ALL
-      - 'ALL=(nodejs) NOPASSWD: ALL'
-    included_files:
-      /etc/sudoers.d/extra-file:
-        users:
-          foo:
-          - ALL=(ALL) ALL
-      extra-file-2:
-        groups:
-          bargroup:
-          - 'ALL=(ALL) NOPASSWD: ALL'
-      extra-file-3:
-        netgroups:
-          other_netgroup:
-          - ALL=(ALL) ALL
-    includedir: /etc/sudoers.d
-    manage_main_config: true
-    netgroups:
-      sysadmins:
-      - ALL=(ALL) ALL
-    pkg: sudo
-    purge_includedir: false
+  aliases:
+    commands:
+      PROCESSES:
+      - /usr/bin/nice
+      - /bin/kill
+      - /usr/bin/renice
+      - /usr/bin/pkill
+      - /usr/bin/top
+    hosts:
+      WEBSERVERS:
+      - www1
+      - www2
+      - www3
     users:
-      johndoe:
-      - ALL=(ALL) ALL
-      - 'ALL=(root) NOPASSWD: /etc/init.d/httpd'
-      kitchen:
-      - 'ALL=(root) NOPASSWD: ALL'
+      ADMINS:
+      - millert
+      - dowdy
+      - mikef
+  arch: amd64
+  configpath: /etc
+  defaults:
+    command_list:
+      PROCESSES: noexec
+    generic:
+    - env_reset
+    - mail_badpass
+    - secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+    host_list:
+      www1: log_year, logfile=/var/log/sudo.log
+    runas_list:
+      root: '!set_logname'
+    user_list:
+      ADMINS: '!lecture'
+      johndoe: '!requiretty'
+  execprefix: /usr/sbin
+  group: root
+  groups:
+    sudo:
+    - ALL=(ALL) ALL
+    - 'ALL=(nodejs) NOPASSWD: ALL'
+  included_files:
+    /etc/sudoers.d/extra-file:
+      users:
+        foo:
+        - ALL=(ALL) ALL
+    extra-file-2:
+      groups:
+        bargroup:
+        - 'ALL=(ALL) NOPASSWD: ALL'
+    extra-file-3:
+      netgroups:
+        other_netgroup:
+        - ALL=(ALL) ALL
+  includedir: /etc/sudoers.d
+  manage_main_config: true
+  netgroups:
+    sysadmins:
+    - ALL=(ALL) ALL
+  pkg: sudo
+  purge_includedir: false
+  users:
+    johndoe:
+    - ALL=(ALL) ALL
+    - 'ALL=(root) NOPASSWD: /etc/init.d/httpd'
+    kitchen:
+    - 'ALL=(root) NOPASSWD: ALL'
diff --git a/test/integration/default/files/_mapdata/centos-8.yaml b/test/integration/default/files/_mapdata/centos-8.yaml
index 2671e08..9620af3 100644
--- a/test/integration/default/files/_mapdata/centos-8.yaml
+++ b/test/integration/default/files/_mapdata/centos-8.yaml
@@ -2,70 +2,69 @@
 # CentOS Linux-8
 ---
 values:
-  sudoers:
-    aliases:
-      commands:
-        PROCESSES:
-        - /usr/bin/nice
-        - /bin/kill
-        - /usr/bin/renice
-        - /usr/bin/pkill
-        - /usr/bin/top
-      hosts:
-        WEBSERVERS:
-        - www1
-        - www2
-        - www3
-      users:
-        ADMINS:
-        - millert
-        - dowdy
-        - mikef
-    arch: amd64
-    configpath: /etc
-    defaults:
-      command_list:
-        PROCESSES: noexec
-      generic:
-      - env_reset
-      - mail_badpass
-      - secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-      host_list:
-        www1: log_year, logfile=/var/log/sudo.log
-      runas_list:
-        root: '!set_logname'
-      user_list:
-        ADMINS: '!lecture'
-        johndoe: '!requiretty'
-    execprefix: /usr/sbin
-    group: root
-    groups:
-      sudo:
-      - ALL=(ALL) ALL
-      - 'ALL=(nodejs) NOPASSWD: ALL'
-    included_files:
-      /etc/sudoers.d/extra-file:
-        users:
-          foo:
-          - ALL=(ALL) ALL
-      extra-file-2:
-        groups:
-          bargroup:
-          - 'ALL=(ALL) NOPASSWD: ALL'
-      extra-file-3:
-        netgroups:
-          other_netgroup:
-          - ALL=(ALL) ALL
-    includedir: /etc/sudoers.d
-    manage_main_config: true
-    netgroups:
-      sysadmins:
-      - ALL=(ALL) ALL
-    pkg: sudo
-    purge_includedir: false
+  aliases:
+    commands:
+      PROCESSES:
+      - /usr/bin/nice
+      - /bin/kill
+      - /usr/bin/renice
+      - /usr/bin/pkill
+      - /usr/bin/top
+    hosts:
+      WEBSERVERS:
+      - www1
+      - www2
+      - www3
     users:
-      johndoe:
-      - ALL=(ALL) ALL
-      - 'ALL=(root) NOPASSWD: /etc/init.d/httpd'
-      kitchen:
-      - 'ALL=(root) NOPASSWD: ALL'
+      ADMINS:
+      - millert
+      - dowdy
+      - mikef
+  arch: amd64
+  configpath: /etc
+  defaults:
+    command_list:
+      PROCESSES: noexec
+    generic:
+    - env_reset
+    - mail_badpass
+    - secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+    host_list:
+      www1: log_year, logfile=/var/log/sudo.log
+    runas_list:
+      root: '!set_logname'
+    user_list:
+      ADMINS: '!lecture'
+      johndoe: '!requiretty'
+  execprefix: /usr/sbin
+  group: root
+  groups:
+    sudo:
+    - ALL=(ALL) ALL
+    - 'ALL=(nodejs) NOPASSWD: ALL'
+  included_files:
+    /etc/sudoers.d/extra-file:
+      users:
+        foo:
+        - ALL=(ALL) ALL
+    extra-file-2:
+      groups:
+        bargroup:
+        - 'ALL=(ALL) NOPASSWD: ALL'
+    extra-file-3:
+      netgroups:
+        other_netgroup:
+        - ALL=(ALL) ALL
+  includedir: /etc/sudoers.d
+  manage_main_config: true
+  netgroups:
+    sysadmins:
+    - ALL=(ALL) ALL
+  pkg: sudo
+  purge_includedir: false
+  users:
+    johndoe:
+    - ALL=(ALL) ALL
+    - 'ALL=(root) NOPASSWD: /etc/init.d/httpd'
+    kitchen:
+    - 'ALL=(root) NOPASSWD: ALL'
diff --git a/test/integration/default/files/_mapdata/debian-10.yaml b/test/integration/default/files/_mapdata/debian-10.yaml
index 35965e9..5c31c02 100644
--- a/test/integration/default/files/_mapdata/debian-10.yaml
+++ b/test/integration/default/files/_mapdata/debian-10.yaml
@@ -2,70 +2,69 @@
 # Debian-10
 ---
 values:
-  sudoers:
-    aliases:
-      commands:
-        PROCESSES:
-        - /usr/bin/nice
-        - /bin/kill
-        - /usr/bin/renice
-        - /usr/bin/pkill
-        - /usr/bin/top
-      hosts:
-        WEBSERVERS:
-        - www1
-        - www2
-        - www3
-      users:
-        ADMINS:
-        - millert
-        - dowdy
-        - mikef
-    arch: amd64
-    configpath: /etc
-    defaults:
-      command_list:
-        PROCESSES: noexec
-      generic:
-      - env_reset
-      - mail_badpass
-      - secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-      host_list:
-        www1: log_year, logfile=/var/log/sudo.log
-      runas_list:
-        root: '!set_logname'
-      user_list:
-        ADMINS: '!lecture'
-        johndoe: '!requiretty'
-    execprefix: /usr/sbin
-    group: root
-    groups:
-      sudo:
-      - ALL=(ALL) ALL
-      - 'ALL=(nodejs) NOPASSWD: ALL'
-    included_files:
-      /etc/sudoers.d/extra-file:
-        users:
-          foo:
-          - ALL=(ALL) ALL
-      extra-file-2:
-        groups:
-          bargroup:
-          - 'ALL=(ALL) NOPASSWD: ALL'
-      extra-file-3:
-        netgroups:
-          other_netgroup:
-          - ALL=(ALL) ALL
-    includedir: /etc/sudoers.d
-    manage_main_config: true
-    netgroups:
-      sysadmins:
-      - ALL=(ALL) ALL
-    pkg: sudo
-    purge_includedir: false
+  aliases:
+    commands:
+      PROCESSES:
+      - /usr/bin/nice
+      - /bin/kill
+      - /usr/bin/renice
+      - /usr/bin/pkill
+      - /usr/bin/top
+    hosts:
+      WEBSERVERS:
+      - www1
+      - www2
+      - www3
     users:
-      johndoe:
-      - ALL=(ALL) ALL
-      - 'ALL=(root) NOPASSWD: /etc/init.d/httpd'
-      kitchen:
-      - 'ALL=(root) NOPASSWD: ALL'
+      ADMINS:
+      - millert
+      - dowdy
+      - mikef
+  arch: amd64
+  configpath: /etc
+  defaults:
+    command_list:
+      PROCESSES: noexec
+    generic:
+    - env_reset
+    - mail_badpass
+    - secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+    host_list:
+      www1: log_year, logfile=/var/log/sudo.log
+    runas_list:
+      root: '!set_logname'
+    user_list:
+      ADMINS: '!lecture'
+      johndoe: '!requiretty'
+  execprefix: /usr/sbin
+  group: root
+  groups:
+    sudo:
+    - ALL=(ALL) ALL
+    - 'ALL=(nodejs) NOPASSWD: ALL'
+  included_files:
+    /etc/sudoers.d/extra-file:
+      users:
+        foo:
+        - ALL=(ALL) ALL
+    extra-file-2:
+      groups:
+        bargroup:
+        - 'ALL=(ALL) NOPASSWD: ALL'
+    extra-file-3:
+      netgroups:
+        other_netgroup:
+        - ALL=(ALL) ALL
+  includedir: /etc/sudoers.d
+  manage_main_config: true
+  netgroups:
+    sysadmins:
+    - ALL=(ALL) ALL
+  pkg: sudo
+  purge_includedir: false
+  users:
+    johndoe:
+    - ALL=(ALL) ALL
+    - 'ALL=(root) NOPASSWD: /etc/init.d/httpd'
+    kitchen:
+    - 'ALL=(root) NOPASSWD: ALL'
diff --git a/test/integration/default/files/_mapdata/debian-9.yaml b/test/integration/default/files/_mapdata/debian-9.yaml
index 867ff5c..0cda77d 100644
--- a/test/integration/default/files/_mapdata/debian-9.yaml
+++ b/test/integration/default/files/_mapdata/debian-9.yaml
@@ -2,70 +2,69 @@
 # Debian-9
 ---
 values:
-  sudoers:
-    aliases:
-      commands:
-        PROCESSES:
-        - /usr/bin/nice
-        - /bin/kill
-        - /usr/bin/renice
-        - /usr/bin/pkill
-        - /usr/bin/top
-      hosts:
-        WEBSERVERS:
-        - www1
-        - www2
-        - www3
-      users:
-        ADMINS:
-        - millert
-        - dowdy
-        - mikef
-    arch: amd64
-    configpath: /etc
-    defaults:
-      command_list:
-        PROCESSES: noexec
-      generic:
-      - env_reset
-      - mail_badpass
-      - secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-      host_list:
-        www1: log_year, logfile=/var/log/sudo.log
-      runas_list:
-        root: '!set_logname'
-      user_list:
-        ADMINS: '!lecture'
-        johndoe: '!requiretty'
-    execprefix: /usr/sbin
-    group: root
-    groups:
-      sudo:
-      - ALL=(ALL) ALL
-      - 'ALL=(nodejs) NOPASSWD: ALL'
-    included_files:
-      /etc/sudoers.d/extra-file:
-        users:
-          foo:
-          - ALL=(ALL) ALL
-      extra-file-2:
-        groups:
-          bargroup:
-          - 'ALL=(ALL) NOPASSWD: ALL'
-      extra-file-3:
-        netgroups:
-          other_netgroup:
-          - ALL=(ALL) ALL
-    includedir: /etc/sudoers.d
-    manage_main_config: true
-    netgroups:
-      sysadmins:
-      - ALL=(ALL) ALL
-    pkg: sudo
-    purge_includedir: false
+  aliases:
+    commands:
+      PROCESSES:
+      - /usr/bin/nice
+      - /bin/kill
+      - /usr/bin/renice
+      - /usr/bin/pkill
+      - /usr/bin/top
+    hosts:
+      WEBSERVERS:
+      - www1
+      - www2
+      - www3
     users:
-      johndoe:
-      - ALL=(ALL) ALL
-      - 'ALL=(root) NOPASSWD: /etc/init.d/httpd'
-      kitchen:
-      - 'ALL=(root) NOPASSWD: ALL'
+      ADMINS:
+      - millert
+      - dowdy
+      - mikef
+  arch: amd64
+  configpath: /etc
+  defaults:
+    command_list:
+      PROCESSES: noexec
+    generic:
+    - env_reset
+    - mail_badpass
+    - secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+    host_list:
+      www1: log_year, logfile=/var/log/sudo.log
+    runas_list:
+      root: '!set_logname'
+    user_list:
+      ADMINS: '!lecture'
+      johndoe: '!requiretty'
+  execprefix: /usr/sbin
+  group: root
+  groups:
+    sudo:
+    - ALL=(ALL) ALL
+    - 'ALL=(nodejs) NOPASSWD: ALL'
+  included_files:
+    /etc/sudoers.d/extra-file:
+      users:
+        foo:
+        - ALL=(ALL) ALL
+    extra-file-2:
+      groups:
+        bargroup:
+        - 'ALL=(ALL) NOPASSWD: ALL'
+    extra-file-3:
+      netgroups:
+        other_netgroup:
+        - ALL=(ALL) ALL
+  includedir: /etc/sudoers.d
+  manage_main_config: true
+  netgroups:
+    sysadmins:
+    - ALL=(ALL) ALL
+  pkg: sudo
+  purge_includedir: false
+  users:
+    johndoe:
+    - ALL=(ALL) ALL
+    - 'ALL=(root) NOPASSWD: /etc/init.d/httpd'
+    kitchen:
+    - 'ALL=(root) NOPASSWD: ALL'
diff --git a/test/integration/default/files/_mapdata/fedora-31.yaml b/test/integration/default/files/_mapdata/fedora-31.yaml
index 396216e..065c42e 100644
--- a/test/integration/default/files/_mapdata/fedora-31.yaml
+++ b/test/integration/default/files/_mapdata/fedora-31.yaml
@@ -2,70 +2,69 @@
 # Fedora-31
 ---
 values:
-  sudoers:
-    aliases:
-      commands:
-        PROCESSES:
-        - /usr/bin/nice
-        - /bin/kill
-        - /usr/bin/renice
-        - /usr/bin/pkill
-        - /usr/bin/top
-      hosts:
-        WEBSERVERS:
-        - www1
-        - www2
-        - www3
-      users:
-        ADMINS:
-        - millert
-        - dowdy
-        - mikef
-    arch: amd64
-    configpath: /etc
-    defaults:
-      command_list:
-        PROCESSES: noexec
-      generic:
-      - env_reset
-      - mail_badpass
-      - secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-      host_list:
-        www1: log_year, logfile=/var/log/sudo.log
-      runas_list:
-        root: '!set_logname'
-      user_list:
-        ADMINS: '!lecture'
-        johndoe: '!requiretty'
-    execprefix: /usr/sbin
-    group: root
-    groups:
-      sudo:
-      - ALL=(ALL) ALL
-      - 'ALL=(nodejs) NOPASSWD: ALL'
-    included_files:
-      /etc/sudoers.d/extra-file:
-        users:
-          foo:
-          - ALL=(ALL) ALL
-      extra-file-2:
-        groups:
-          bargroup:
-          - 'ALL=(ALL) NOPASSWD: ALL'
-      extra-file-3:
-        netgroups:
-          other_netgroup:
-          - ALL=(ALL) ALL
-    includedir: /etc/sudoers.d
-    manage_main_config: true
-    netgroups:
-      sysadmins:
-      - ALL=(ALL) ALL
-    pkg: sudo
-    purge_includedir: false
+  aliases:
+    commands:
+      PROCESSES:
+      - /usr/bin/nice
+      - /bin/kill
+      - /usr/bin/renice
+      - /usr/bin/pkill
+      - /usr/bin/top
+    hosts:
+      WEBSERVERS:
+      - www1
+      - www2
+      - www3
     users:
-      johndoe:
-      - ALL=(ALL) ALL
-      - 'ALL=(root) NOPASSWD: /etc/init.d/httpd'
-      kitchen:
-      - 'ALL=(root) NOPASSWD: ALL'
+      ADMINS:
+      - millert
+      - dowdy
+      - mikef
+  arch: amd64
+  configpath: /etc
+  defaults:
+    command_list:
+      PROCESSES: noexec
+    generic:
+    - env_reset
+    - mail_badpass
+    - secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+    host_list:
+      www1: log_year, logfile=/var/log/sudo.log
+    runas_list:
+      root: '!set_logname'
+    user_list:
+      ADMINS: '!lecture'
+      johndoe: '!requiretty'
+  execprefix: /usr/sbin
+  group: root
+  groups:
+    sudo:
+    - ALL=(ALL) ALL
+    - 'ALL=(nodejs) NOPASSWD: ALL'
+  included_files:
+    /etc/sudoers.d/extra-file:
+      users:
+        foo:
+        - ALL=(ALL) ALL
+    extra-file-2:
+      groups:
+        bargroup:
+        - 'ALL=(ALL) NOPASSWD: ALL'
+    extra-file-3:
+      netgroups:
+        other_netgroup:
+        - ALL=(ALL) ALL
+  includedir: /etc/sudoers.d
+  manage_main_config: true
+  netgroups:
+    sysadmins:
+    - ALL=(ALL) ALL
+  pkg: sudo
+  purge_includedir: false
+  users:
+    johndoe:
+    - ALL=(ALL) ALL
+    - 'ALL=(root) NOPASSWD: /etc/init.d/httpd'
+    kitchen:
+    - 'ALL=(root) NOPASSWD: ALL'
diff --git a/test/integration/default/files/_mapdata/fedora-32.yaml b/test/integration/default/files/_mapdata/fedora-32.yaml
index c40ee0b..eb0444f 100644
--- a/test/integration/default/files/_mapdata/fedora-32.yaml
+++ b/test/integration/default/files/_mapdata/fedora-32.yaml
@@ -2,70 +2,69 @@
 # Fedora-32
 ---
 values:
-  sudoers:
-    aliases:
-      commands:
-        PROCESSES:
-        - /usr/bin/nice
-        - /bin/kill
-        - /usr/bin/renice
-        - /usr/bin/pkill
-        - /usr/bin/top
-      hosts:
-        WEBSERVERS:
-        - www1
-        - www2
-        - www3
-      users:
-        ADMINS:
-        - millert
-        - dowdy
-        - mikef
-    arch: amd64
-    configpath: /etc
-    defaults:
-      command_list:
-        PROCESSES: noexec
-      generic:
-      - env_reset
-      - mail_badpass
-      - secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-      host_list:
-        www1: log_year, logfile=/var/log/sudo.log
-      runas_list:
-        root: '!set_logname'
-      user_list:
-        ADMINS: '!lecture'
-        johndoe: '!requiretty'
-    execprefix: /usr/sbin
-    group: root
-    groups:
-      sudo:
-      - ALL=(ALL) ALL
-      - 'ALL=(nodejs) NOPASSWD: ALL'
-    included_files:
-      /etc/sudoers.d/extra-file:
-        users:
-          foo:
-          - ALL=(ALL) ALL
-      extra-file-2:
-        groups:
-          bargroup:
-          - 'ALL=(ALL) NOPASSWD: ALL'
-      extra-file-3:
-        netgroups:
-          other_netgroup:
-          - ALL=(ALL) ALL
-    includedir: /etc/sudoers.d
-    manage_main_config: true
-    netgroups:
-      sysadmins:
-      - ALL=(ALL) ALL
-    pkg: sudo
-    purge_includedir: false
+  aliases:
+    commands:
+      PROCESSES:
+      - /usr/bin/nice
+      - /bin/kill
+      - /usr/bin/renice
+      - /usr/bin/pkill
+      - /usr/bin/top
+    hosts:
+      WEBSERVERS:
+      - www1
+      - www2
+      - www3
     users:
-      johndoe:
-      - ALL=(ALL) ALL
-      - 'ALL=(root) NOPASSWD: /etc/init.d/httpd'
-      kitchen:
-      - 'ALL=(root) NOPASSWD: ALL'
+      ADMINS:
+      - millert
+      - dowdy
+      - mikef
+  arch: amd64
+  configpath: /etc
+  defaults:
+    command_list:
+      PROCESSES: noexec
+    generic:
+    - env_reset
+    - mail_badpass
+    - secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+    host_list:
+      www1: log_year, logfile=/var/log/sudo.log
+    runas_list:
+      root: '!set_logname'
+    user_list:
+      ADMINS: '!lecture'
+      johndoe: '!requiretty'
+  execprefix: /usr/sbin
+  group: root
+  groups:
+    sudo:
+    - ALL=(ALL) ALL
+    - 'ALL=(nodejs) NOPASSWD: ALL'
+  included_files:
+    /etc/sudoers.d/extra-file:
+      users:
+        foo:
+        - ALL=(ALL) ALL
+    extra-file-2:
+      groups:
+        bargroup:
+        - 'ALL=(ALL) NOPASSWD: ALL'
+    extra-file-3:
+      netgroups:
+        other_netgroup:
+        - ALL=(ALL) ALL
+  includedir: /etc/sudoers.d
+  manage_main_config: true
+  netgroups:
+    sysadmins:
+    - ALL=(ALL) ALL
+  pkg: sudo
+  purge_includedir: false
+  users:
+    johndoe:
+    - ALL=(ALL) ALL
+    - 'ALL=(root) NOPASSWD: /etc/init.d/httpd'
+    kitchen:
+    - 'ALL=(root) NOPASSWD: ALL'
diff --git a/test/integration/default/files/_mapdata/opensuse-15.yaml b/test/integration/default/files/_mapdata/opensuse-15.yaml
index e22f89b..cea5d34 100644
--- a/test/integration/default/files/_mapdata/opensuse-15.yaml
+++ b/test/integration/default/files/_mapdata/opensuse-15.yaml
@@ -2,70 +2,69 @@
 # Leap-15
 ---
 values:
-  sudoers:
-    aliases:
-      commands:
-        PROCESSES:
-        - /usr/bin/nice
-        - /bin/kill
-        - /usr/bin/renice
-        - /usr/bin/pkill
-        - /usr/bin/top
-      hosts:
-        WEBSERVERS:
-        - www1
-        - www2
-        - www3
-      users:
-        ADMINS:
-        - millert
-        - dowdy
-        - mikef
-    arch: amd64
-    configpath: /etc
-    defaults:
-      command_list:
-        PROCESSES: noexec
-      generic:
-      - env_reset
-      - mail_badpass
-      - secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-      host_list:
-        www1: log_year, logfile=/var/log/sudo.log
-      runas_list:
-        root: '!set_logname'
-      user_list:
-        ADMINS: '!lecture'
-        johndoe: '!requiretty'
-    execprefix: /usr/sbin
-    group: root
-    groups:
-      sudo:
-      - ALL=(ALL) ALL
-      - 'ALL=(nodejs) NOPASSWD: ALL'
-    included_files:
-      /etc/sudoers.d/extra-file:
-        users:
-          foo:
-          - ALL=(ALL) ALL
-      extra-file-2:
-        groups:
-          bargroup:
-          - 'ALL=(ALL) NOPASSWD: ALL'
-      extra-file-3:
-        netgroups:
-          other_netgroup:
-          - ALL=(ALL) ALL
-    includedir: /etc/sudoers.d
-    manage_main_config: true
-    netgroups:
-      sysadmins:
-      - ALL=(ALL) ALL
-    pkg: sudo
-    purge_includedir: false
+  aliases:
+    commands:
+      PROCESSES:
+      - /usr/bin/nice
+      - /bin/kill
+      - /usr/bin/renice
+      - /usr/bin/pkill
+      - /usr/bin/top
+    hosts:
+      WEBSERVERS:
+      - www1
+      - www2
+      - www3
     users:
-      johndoe:
-      - ALL=(ALL) ALL
-      - 'ALL=(root) NOPASSWD: /etc/init.d/httpd'
-      kitchen:
-      - 'ALL=(root) NOPASSWD: ALL'
+      ADMINS:
+      - millert
+      - dowdy
+      - mikef
+  arch: amd64
+  configpath: /etc
+  defaults:
+    command_list:
+      PROCESSES: noexec
+    generic:
+    - env_reset
+    - mail_badpass
+    - secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+    host_list:
+      www1: log_year, logfile=/var/log/sudo.log
+    runas_list:
+      root: '!set_logname'
+    user_list:
+      ADMINS: '!lecture'
+      johndoe: '!requiretty'
+  execprefix: /usr/sbin
+  group: root
+  groups:
+    sudo:
+    - ALL=(ALL) ALL
+    - 'ALL=(nodejs) NOPASSWD: ALL'
+  included_files:
+    /etc/sudoers.d/extra-file:
+      users:
+        foo:
+        - ALL=(ALL) ALL
+    extra-file-2:
+      groups:
+        bargroup:
+        - 'ALL=(ALL) NOPASSWD: ALL'
+    extra-file-3:
+      netgroups:
+        other_netgroup:
+        - ALL=(ALL) ALL
+  includedir: /etc/sudoers.d
+  manage_main_config: true
+  netgroups:
+    sysadmins:
+    - ALL=(ALL) ALL
+  pkg: sudo
+  purge_includedir: false
+  users:
+    johndoe:
+    - ALL=(ALL) ALL
+    - 'ALL=(root) NOPASSWD: /etc/init.d/httpd'
+    kitchen:
+    - 'ALL=(root) NOPASSWD: ALL'
diff --git a/test/integration/default/files/_mapdata/ubuntu-16.yaml b/test/integration/default/files/_mapdata/ubuntu-16.yaml
index ddc982a..c845ce1 100644
--- a/test/integration/default/files/_mapdata/ubuntu-16.yaml
+++ b/test/integration/default/files/_mapdata/ubuntu-16.yaml
@@ -2,70 +2,69 @@
 # Ubuntu-16.04
 ---
 values:
-  sudoers:
-    aliases:
-      commands:
-        PROCESSES:
-        - /usr/bin/nice
-        - /bin/kill
-        - /usr/bin/renice
-        - /usr/bin/pkill
-        - /usr/bin/top
-      hosts:
-        WEBSERVERS:
-        - www1
-        - www2
-        - www3
-      users:
-        ADMINS:
-        - millert
-        - dowdy
-        - mikef
-    arch: amd64
-    configpath: /etc
-    defaults:
-      command_list:
-        PROCESSES: noexec
-      generic:
-      - env_reset
-      - mail_badpass
-      - secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-      host_list:
-        www1: log_year, logfile=/var/log/sudo.log
-      runas_list:
-        root: '!set_logname'
-      user_list:
-        ADMINS: '!lecture'
-        johndoe: '!requiretty'
-    execprefix: /usr/sbin
-    group: root
-    groups:
-      sudo:
-      - ALL=(ALL) ALL
-      - 'ALL=(nodejs) NOPASSWD: ALL'
-    included_files:
-      /etc/sudoers.d/extra-file:
-        users:
-          foo:
-          - ALL=(ALL) ALL
-      extra-file-2:
-        groups:
-          bargroup:
-          - 'ALL=(ALL) NOPASSWD: ALL'
-      extra-file-3:
-        netgroups:
-          other_netgroup:
-          - ALL=(ALL) ALL
-    includedir: /etc/sudoers.d
-    manage_main_config: true
-    netgroups:
-      sysadmins:
-      - ALL=(ALL) ALL
-    pkg: sudo
-    purge_includedir: false
+  aliases:
+    commands:
+      PROCESSES:
+      - /usr/bin/nice
+      - /bin/kill
+      - /usr/bin/renice
+      - /usr/bin/pkill
+      - /usr/bin/top
+    hosts:
+      WEBSERVERS:
+      - www1
+      - www2
+      - www3
     users:
-      johndoe:
-      - ALL=(ALL) ALL
-      - 'ALL=(root) NOPASSWD: /etc/init.d/httpd'
-      kitchen:
-      - 'ALL=(root) NOPASSWD: ALL'
+      ADMINS:
+      - millert
+      - dowdy
+      - mikef
+  arch: amd64
+  configpath: /etc
+  defaults:
+    command_list:
+      PROCESSES: noexec
+    generic:
+    - env_reset
+    - mail_badpass
+    - secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+    host_list:
+      www1: log_year, logfile=/var/log/sudo.log
+    runas_list:
+      root: '!set_logname'
+    user_list:
+      ADMINS: '!lecture'
+      johndoe: '!requiretty'
+  execprefix: /usr/sbin
+  group: root
+  groups:
+    sudo:
+    - ALL=(ALL) ALL
+    - 'ALL=(nodejs) NOPASSWD: ALL'
+  included_files:
+    /etc/sudoers.d/extra-file:
+      users:
+        foo:
+        - ALL=(ALL) ALL
+    extra-file-2:
+      groups:
+        bargroup:
+        - 'ALL=(ALL) NOPASSWD: ALL'
+    extra-file-3:
+      netgroups:
+        other_netgroup:
+        - ALL=(ALL) ALL
+  includedir: /etc/sudoers.d
+  manage_main_config: true
+  netgroups:
+    sysadmins:
+    - ALL=(ALL) ALL
+  pkg: sudo
+  purge_includedir: false
+  users:
+    johndoe:
+    - ALL=(ALL) ALL
+    - 'ALL=(root) NOPASSWD: /etc/init.d/httpd'
+    kitchen:
+    - 'ALL=(root) NOPASSWD: ALL'
diff --git a/test/integration/default/files/_mapdata/ubuntu-18.yaml b/test/integration/default/files/_mapdata/ubuntu-18.yaml
index 6069a03..a5daca6 100644
--- a/test/integration/default/files/_mapdata/ubuntu-18.yaml
+++ b/test/integration/default/files/_mapdata/ubuntu-18.yaml
@@ -2,70 +2,69 @@
 # Ubuntu-18.04
 ---
 values:
-  sudoers:
-    aliases:
-      commands:
-        PROCESSES:
-        - /usr/bin/nice
-        - /bin/kill
-        - /usr/bin/renice
-        - /usr/bin/pkill
-        - /usr/bin/top
-      hosts:
-        WEBSERVERS:
-        - www1
-        - www2
-        - www3
-      users:
-        ADMINS:
-        - millert
-        - dowdy
-        - mikef
-    arch: amd64
-    configpath: /etc
-    defaults:
-      command_list:
-        PROCESSES: noexec
-      generic:
-      - env_reset
-      - mail_badpass
-      - secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-      host_list:
-        www1: log_year, logfile=/var/log/sudo.log
-      runas_list:
-        root: '!set_logname'
-      user_list:
-        ADMINS: '!lecture'
-        johndoe: '!requiretty'
-    execprefix: /usr/sbin
-    group: root
-    groups:
-      sudo:
-      - ALL=(ALL) ALL
-      - 'ALL=(nodejs) NOPASSWD: ALL'
-    included_files:
-      /etc/sudoers.d/extra-file:
-        users:
-          foo:
-          - ALL=(ALL) ALL
-      extra-file-2:
-        groups:
-          bargroup:
-          - 'ALL=(ALL) NOPASSWD: ALL'
-      extra-file-3:
-        netgroups:
-          other_netgroup:
-          - ALL=(ALL) ALL
-    includedir: /etc/sudoers.d
-    manage_main_config: true
-    netgroups:
-      sysadmins:
-      - ALL=(ALL) ALL
-    pkg: sudo
-    purge_includedir: false
+  aliases:
+    commands:
+      PROCESSES:
+      - /usr/bin/nice
+      - /bin/kill
+      - /usr/bin/renice
+      - /usr/bin/pkill
+      - /usr/bin/top
+    hosts:
+      WEBSERVERS:
+      - www1
+      - www2
+      - www3
     users:
-      johndoe:
-      - ALL=(ALL) ALL
-      - 'ALL=(root) NOPASSWD: /etc/init.d/httpd'
-      kitchen:
-      - 'ALL=(root) NOPASSWD: ALL'
+      ADMINS:
+      - millert
+      - dowdy
+      - mikef
+  arch: amd64
+  configpath: /etc
+  defaults:
+    command_list:
+      PROCESSES: noexec
+    generic:
+    - env_reset
+    - mail_badpass
+    - secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+    host_list:
+      www1: log_year, logfile=/var/log/sudo.log
+    runas_list:
+      root: '!set_logname'
+    user_list:
+      ADMINS: '!lecture'
+      johndoe: '!requiretty'
+  execprefix: /usr/sbin
+  group: root
+  groups:
+    sudo:
+    - ALL=(ALL) ALL
+    - 'ALL=(nodejs) NOPASSWD: ALL'
+  included_files:
+    /etc/sudoers.d/extra-file:
+      users:
+        foo:
+        - ALL=(ALL) ALL
+    extra-file-2:
+      groups:
+        bargroup:
+        - 'ALL=(ALL) NOPASSWD: ALL'
+    extra-file-3:
+      netgroups:
+        other_netgroup:
+        - ALL=(ALL) ALL
+  includedir: /etc/sudoers.d
+  manage_main_config: true
+  netgroups:
+    sysadmins:
+    - ALL=(ALL) ALL
+  pkg: sudo
+  purge_includedir: false
+  users:
+    johndoe:
+    - ALL=(ALL) ALL
+    - 'ALL=(root) NOPASSWD: /etc/init.d/httpd'
+    kitchen:
+    - 'ALL=(root) NOPASSWD: ALL'
diff --git a/test/integration/default/files/_mapdata/ubuntu-20.yaml b/test/integration/default/files/_mapdata/ubuntu-20.yaml
index 7cde531..57da8ab 100644
--- a/test/integration/default/files/_mapdata/ubuntu-20.yaml
+++ b/test/integration/default/files/_mapdata/ubuntu-20.yaml
@@ -2,70 +2,69 @@
 # Ubuntu-20.04
 ---
 values:
-  sudoers:
-    aliases:
-      commands:
-        PROCESSES:
-        - /usr/bin/nice
-        - /bin/kill
-        - /usr/bin/renice
-        - /usr/bin/pkill
-        - /usr/bin/top
-      hosts:
-        WEBSERVERS:
-        - www1
-        - www2
-        - www3
-      users:
-        ADMINS:
-        - millert
-        - dowdy
-        - mikef
-    arch: amd64
-    configpath: /etc
-    defaults:
-      command_list:
-        PROCESSES: noexec
-      generic:
-      - env_reset
-      - mail_badpass
-      - secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-      host_list:
-        www1: log_year, logfile=/var/log/sudo.log
-      runas_list:
-        root: '!set_logname'
-      user_list:
-        ADMINS: '!lecture'
-        johndoe: '!requiretty'
-    execprefix: /usr/sbin
-    group: root
-    groups:
-      sudo:
-      - ALL=(ALL) ALL
-      - 'ALL=(nodejs) NOPASSWD: ALL'
-    included_files:
-      /etc/sudoers.d/extra-file:
-        users:
-          foo:
-          - ALL=(ALL) ALL
-      extra-file-2:
-        groups:
-          bargroup:
-          - 'ALL=(ALL) NOPASSWD: ALL'
-      extra-file-3:
-        netgroups:
-          other_netgroup:
-          - ALL=(ALL) ALL
-    includedir: /etc/sudoers.d
-    manage_main_config: true
-    netgroups:
-      sysadmins:
-      - ALL=(ALL) ALL
-    pkg: sudo
-    purge_includedir: false
+  aliases:
+    commands:
+      PROCESSES:
+      - /usr/bin/nice
+      - /bin/kill
+      - /usr/bin/renice
+      - /usr/bin/pkill
+      - /usr/bin/top
+    hosts:
+      WEBSERVERS:
+      - www1
+      - www2
+      - www3
     users:
-      johndoe:
-      - ALL=(ALL) ALL
-      - 'ALL=(root) NOPASSWD: /etc/init.d/httpd'
-      kitchen:
-      - 'ALL=(root) NOPASSWD: ALL'
+      ADMINS:
+      - millert
+      - dowdy
+      - mikef
+  arch: amd64
+  configpath: /etc
+  defaults:
+    command_list:
+      PROCESSES: noexec
+    generic:
+    - env_reset
+    - mail_badpass
+    - secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+    host_list:
+      www1: log_year, logfile=/var/log/sudo.log
+    runas_list:
+      root: '!set_logname'
+    user_list:
+      ADMINS: '!lecture'
+      johndoe: '!requiretty'
+  execprefix: /usr/sbin
+  group: root
+  groups:
+    sudo:
+    - ALL=(ALL) ALL
+    - 'ALL=(nodejs) NOPASSWD: ALL'
+  included_files:
+    /etc/sudoers.d/extra-file:
+      users:
+        foo:
+        - ALL=(ALL) ALL
+    extra-file-2:
+      groups:
+        bargroup:
+        - 'ALL=(ALL) NOPASSWD: ALL'
+    extra-file-3:
+      netgroups:
+        other_netgroup:
+        - ALL=(ALL) ALL
+  includedir: /etc/sudoers.d
+  manage_main_config: true
+  netgroups:
+    sysadmins:
+    - ALL=(ALL) ALL
+  pkg: sudo
+  purge_includedir: false
+  users:
+    johndoe:
+    - ALL=(ALL) ALL
+    - 'ALL=(root) NOPASSWD: /etc/init.d/httpd'
+    kitchen:
+    - 'ALL=(root) NOPASSWD: ALL'