[PATCH] Adding new templates and new scripts to support RHEL 7's switch to systemd. Also, adjusted the service and package names to reflect the currently available items in the RHEL 7 beta.

From: Maura Dailey <maura(a)eclipse.ncsc.mil&gt;


Signed-off-by: Maura Dailey <maura(a)eclipse.ncsc.mil&gt;
---
 .../input/checks/kernel_module_cramfs_disabled.xml |   31 ++++++
 .../7/input/checks/kernel_module_dccp_disabled.xml |   31 ++++++
 .../input/checks/kernel_module_jffs2_disabled.xml  |   31 ++++++
 RHEL/7/input/checks/kernel_module_rds_disabled.xml |   31 ++++++
 .../7/input/checks/kernel_module_sctp_disabled.xml |   31 ++++++
 .../checks/kernel_module_squashfs_disabled.xml     |   31 ++++++
 RHEL/7/input/checks/kernel_module_udf_disabled.xml |   31 ++++++
 .../checks/kernel_module_usb-storage_disabled.xml  |   31 ++++++
 RHEL/7/input/checks/package_abrt_removed.xml       |   26 +++++
 RHEL/7/input/checks/package_aide_installed.sh      |    1 +
 RHEL/7/input/checks/package_at_removed.xml         |   26 +++++
 RHEL/7/input/checks/package_audit_installed.sh     |    1 +
 RHEL/7/input/checks/package_audit_installed.xml    |   26 +++++
 RHEL/7/input/checks/package_bind_removed.xml       |   26 +++++
 RHEL/7/input/checks/package_cpuspeed_removed.xml   |   26 +++++
 RHEL/7/input/checks/package_cronie_installed.sh    |    1 +
 RHEL/7/input/checks/package_cronie_installed.xml   |   26 +++++
 RHEL/7/input/checks/package_cups_removed.xml       |   26 +++++
 RHEL/7/input/checks/package_cyrus-sasl_removed.xml |   26 +++++
 RHEL/7/input/checks/package_dbus_removed.xml       |   26 +++++
 RHEL/7/input/checks/package_dconf_installed.sh     |    1 +
 RHEL/7/input/checks/package_dconf_installed.xml    |   26 +++++
 RHEL/7/input/checks/package_dhcp_removed.xml       |   26 +++++
 RHEL/7/input/checks/package_dhcpd_removed.xml      |   26 +++++
 RHEL/7/input/checks/package_dovecot_removed.xml    |   26 +++++
 RHEL/7/input/checks/package_hal_removed.xml        |   26 +++++
 RHEL/7/input/checks/package_httpd_removed.xml      |   26 +++++
 .../checks/package_iptables-services_installed.sh  |    1 +
 .../checks/package_iptables-services_installed.xml |   26 +++++
 RHEL/7/input/checks/package_iptables_installed.sh  |    1 +
 RHEL/7/input/checks/package_iptables_installed.xml |   26 +++++
 RHEL/7/input/checks/package_iputils_removed.xml    |   26 +++++
 .../7/input/checks/package_irqbalance_installed.sh |    1 +
 .../input/checks/package_irqbalance_installed.xml  |   26 +++++
 .../7/input/checks/package_kexec-tools_removed.xml |   26 +++++
 RHEL/7/input/checks/package_libcgroup_removed.xml  |   26 +++++
 RHEL/7/input/checks/package_mdadm_removed.xml      |   26 +++++
 RHEL/7/input/checks/package_net-snmp_removed.xml   |   26 +++++
 RHEL/7/input/checks/package_nfs-utils_removed.xml  |   26 +++++
 RHEL/7/input/checks/package_ntp_installed.sh       |    1 +
 RHEL/7/input/checks/package_ntp_installed.xml      |   26 +++++
 RHEL/7/input/checks/package_oddjob_removed.xml     |   26 +++++
 .../checks/package_openldap-servers_removed.xml    |   26 +++++
 RHEL/7/input/checks/package_pam_ldap_removed.xml   |   26 +++++
 .../checks/package_policycoreutils_installed.sh    |    1 +
 .../checks/package_policycoreutils_installed.xml   |   26 +++++
 .../7/input/checks/package_portreserve_removed.xml |   26 +++++
 RHEL/7/input/checks/package_postfix_installed.sh   |    1 +
 RHEL/7/input/checks/package_postfix_installed.xml  |   26 +++++
 RHEL/7/input/checks/package_psacct_installed.sh    |    1 +
 RHEL/7/input/checks/package_psacct_installed.xml   |   26 +++++
 .../checks/package_qpid-cpp-server_removed.xml     |   26 +++++
 RHEL/7/input/checks/package_quota_removed.xml      |   26 +++++
 RHEL/7/input/checks/package_rhnsd_removed.xml      |   26 +++++
 RHEL/7/input/checks/package_rsh-server_removed.xml |   26 +++++
 RHEL/7/input/checks/package_rsyslog_installed.sh   |    1 +
 RHEL/7/input/checks/package_rsyslog_installed.xml  |   26 +++++
 .../input/checks/package_samba-common_removed.xml  |   26 +++++
 RHEL/7/input/checks/package_screen_installed.sh    |    1 +
 RHEL/7/input/checks/package_screen_installed.xml   |   26 +++++
 RHEL/7/input/checks/package_sendmail_removed.xml   |   26 +++++
 .../input/checks/package_smartmontools_removed.xml |   26 +++++
 RHEL/7/input/checks/package_squid_removed.xml      |   26 +++++
 .../package_subscription-manager_removed.xml       |   26 +++++
 RHEL/7/input/checks/package_sysstat_removed.xml    |   26 +++++
 .../7/input/checks/package_talk-server_removed.xml |   26 +++++
 .../input/checks/package_telnet-server_removed.xml |   26 +++++
 .../7/input/checks/package_tftp-server_removed.xml |   26 +++++
 RHEL/7/input/checks/package_vsftpd_installed.sh    |    1 +
 RHEL/7/input/checks/package_vsftpd_installed.xml   |   26 +++++
 RHEL/7/input/checks/package_vsftpd_removed.xml     |   26 +++++
 RHEL/7/input/checks/package_xinetd_removed.xml     |   26 +++++
 .../package_xorg-x11-server-common_removed.xml     |   26 +++++
 RHEL/7/input/checks/package_ypbind_removed.xml     |   26 +++++
 RHEL/7/input/checks/package_ypserv_removed.xml     |   26 +++++
 RHEL/7/input/checks/service_abrtd_disabled.xml     |   33 +++++++
 RHEL/7/input/checks/service_acpid_disabled.xml     |   32 +++++++
 RHEL/7/input/checks/service_atd_disabled.xml       |   33 +++++++
 RHEL/7/input/checks/service_auditd_enabled.xml     |   33 +++++++
 RHEL/7/input/checks/service_autofs_disabled.xml    |   32 +++++++
 .../input/checks/service_avahi-daemon_disabled.xml |   32 +++++++
 RHEL/7/input/checks/service_bluetooth_disabled.xml |   32 +++++++
 .../7/input/checks/service_certmonger_disabled.xml |   32 +++++++
 RHEL/7/input/checks/service_cgconfig_disabled.xml  |   33 +++++++
 RHEL/7/input/checks/service_crond_enabled.xml      |   33 +++++++
 RHEL/7/input/checks/service_cups_disabled.xml      |   33 +++++++
 RHEL/7/input/checks/service_dhcpd_disabled.xml     |   33 +++++++
 RHEL/7/input/checks/service_dovecot_disabled.xml   |   33 +++++++
 RHEL/7/input/checks/service_httpd_disabled.xml     |   33 +++++++
 RHEL/7/input/checks/service_ip6tables_enabled.xml  |   33 +++++++
 RHEL/7/input/checks/service_iptables_enabled.xml   |   33 +++++++
 RHEL/7/input/checks/service_irqbalance_enabled.xml |   33 +++++++
 RHEL/7/input/checks/service_kdump_disabled.xml     |   33 +++++++
 RHEL/7/input/checks/service_mdmonitor_disabled.xml |   33 +++++++
 RHEL/7/input/checks/service_named_disabled.xml     |   33 +++++++
 RHEL/7/input/checks/service_nfs-lock_disabled.xml  |   33 +++++++
 .../7/input/checks/service_nfs-server_disabled.xml |   33 +++++++
 RHEL/7/input/checks/service_ntpd_enabled.xml       |   33 +++++++
 RHEL/7/input/checks/service_oddjobd_disabled.xml   |   33 +++++++
 .../input/checks/service_portreserve_disabled.xml  |   33 +++++++
 RHEL/7/input/checks/service_postfix_enabled.xml    |   33 +++++++
 RHEL/7/input/checks/service_psacct_enabled.xml     |   33 +++++++
 RHEL/7/input/checks/service_qpidd_disabled.xml     |   33 +++++++
 RHEL/7/input/checks/service_quotaon_disabled.xml   |   32 +++++++
 RHEL/7/input/checks/service_rdisc_disabled.xml     |   33 +++++++
 RHEL/7/input/checks/service_rhnsd_disabled.xml     |   99 ++++++++++++++++++++
 RHEL/7/input/checks/service_rhsmcertd_disabled.xml |   33 +++++++
 RHEL/7/input/checks/service_rpcgssd_disabled.xml   |   33 +++++++
 RHEL/7/input/checks/service_rpcidmapd_disabled.xml |   33 +++++++
 .../7/input/checks/service_rpcsvcgssd_disabled.xml |   33 +++++++
 RHEL/7/input/checks/service_rsyslog_enabled.xml    |   32 +++++++
 RHEL/7/input/checks/service_saslauthd_disabled.xml |   33 +++++++
 RHEL/7/input/checks/service_smartd_disabled.xml    |   33 +++++++
 RHEL/7/input/checks/service_smb_disabled.xml       |   32 +++++++
 RHEL/7/input/checks/service_snmpd_disabled.xml     |   33 +++++++
 RHEL/7/input/checks/service_squid_disabled.xml     |   33 +++++++
 RHEL/7/input/checks/service_sshd_disabled.xml      |   25 ++---
 RHEL/7/input/checks/service_sysstat_disabled.xml   |   33 +++++++
 RHEL/7/input/checks/service_tftp_disabled.xml      |   33 +++++++
 RHEL/7/input/checks/service_vsftpd_disabled.xml    |   33 +++++++
 RHEL/7/input/checks/service_xinetd_disabled.xml    |   33 +++++++
 RHEL/7/input/checks/service_ypbind_disabled.xml    |   33 +++++++
 RHEL/7/input/checks/templates/Makefile             |   24 +++++
 .../templates/create_kernel_modules_disabled.py    |   40 ++++++++
 .../checks/templates/create_package_installed.py   |   46 +++++++++
 .../checks/templates/create_package_removed.py     |   39 ++++++++
 .../templates/create_services_systemd_disabled.py  |   44 +++++++++
 .../templates/create_services_systemd_enabled.py   |   44 +++++++++
 .../templates/create_services_sysv_disabled.py     |   45 +++++++++
 .../checks/templates/kernel_modules_disabled.csv   |    8 ++
 .../output/kernel_module_cramfs_disabled.xml       |   31 ++++++
 .../output/kernel_module_dccp_disabled.xml         |   31 ++++++
 .../output/kernel_module_jffs2_disabled.xml        |   31 ++++++
 .../output/kernel_module_rds_disabled.xml          |   31 ++++++
 .../output/kernel_module_sctp_disabled.xml         |   31 ++++++
 .../output/kernel_module_squashfs_disabled.xml     |   31 ++++++
 .../output/kernel_module_udf_disabled.xml          |   31 ++++++
 .../output/kernel_module_usb-storage_disabled.xml  |   31 ++++++
 .../templates/output/package_abrt_removed.xml      |   26 +++++
 .../templates/output/package_aide_installed.sh     |    1 +
 .../templates/output/package_aide_installed.xml    |   26 +++++
 .../checks/templates/output/package_at_removed.xml |   26 +++++
 .../templates/output/package_audit_installed.sh    |    1 +
 .../templates/output/package_audit_installed.xml   |   26 +++++
 .../templates/output/package_bind_removed.xml      |   26 +++++
 .../templates/output/package_cpuspeed_removed.xml  |   26 +++++
 .../templates/output/package_cronie_installed.sh   |    1 +
 .../templates/output/package_cronie_installed.xml  |   26 +++++
 .../templates/output/package_cups_removed.xml      |   26 +++++
 .../output/package_cyrus-sasl_removed.xml          |   26 +++++
 .../templates/output/package_dbus_removed.xml      |   26 +++++
 .../templates/output/package_dconf_installed.sh    |    1 +
 .../templates/output/package_dconf_installed.xml   |   26 +++++
 .../templates/output/package_dhcp_removed.xml      |   26 +++++
 .../templates/output/package_dhcpd_removed.xml     |   26 +++++
 .../templates/output/package_dovecot_removed.xml   |   26 +++++
 .../templates/output/package_hal_removed.xml       |   26 +++++
 .../templates/output/package_httpd_removed.xml     |   26 +++++
 .../output/package_iptables-services_installed.sh  |    1 +
 .../output/package_iptables-services_installed.xml |   26 +++++
 .../templates/output/package_iptables_installed.sh |    1 +
 .../output/package_iptables_installed.xml          |   26 +++++
 .../templates/output/package_iputils_removed.xml   |   26 +++++
 .../output/package_irqbalance_installed.sh         |    1 +
 .../output/package_irqbalance_installed.xml        |   26 +++++
 .../output/package_kexec-tools_removed.xml         |   26 +++++
 .../templates/output/package_libcgroup_removed.xml |   26 +++++
 .../templates/output/package_mdadm_removed.xml     |   26 +++++
 .../templates/output/package_net-snmp_removed.xml  |   26 +++++
 .../templates/output/package_nfs-utils_removed.xml |   26 +++++
 .../templates/output/package_ntp_installed.sh      |    1 +
 .../templates/output/package_ntp_installed.xml     |   26 +++++
 .../templates/output/package_oddjob_removed.xml    |   26 +++++
 .../output/package_openldap-servers_removed.xml    |   26 +++++
 .../output/package_openssh-server_removed.xml      |   26 +++++
 .../templates/output/package_pam_ldap_removed.xml  |   26 +++++
 .../output/package_policycoreutils_installed.sh    |    1 +
 .../output/package_policycoreutils_installed.xml   |   26 +++++
 .../output/package_portreserve_removed.xml         |   26 +++++
 .../templates/output/package_postfix_installed.sh  |    1 +
 .../templates/output/package_postfix_installed.xml |   26 +++++
 .../templates/output/package_psacct_installed.sh   |    1 +
 .../templates/output/package_psacct_installed.xml  |   26 +++++
 .../output/package_qpid-cpp-server_removed.xml     |   26 +++++
 .../templates/output/package_quota_removed.xml     |   26 +++++
 .../templates/output/package_rhnsd_removed.xml     |   26 +++++
 .../output/package_rsh-server_removed.xml          |   26 +++++
 .../templates/output/package_rsyslog_installed.sh  |    1 +
 .../templates/output/package_rsyslog_installed.xml |   26 +++++
 .../output/package_samba-common_removed.xml        |   26 +++++
 .../templates/output/package_screen_installed.sh   |    1 +
 .../templates/output/package_screen_installed.xml  |   26 +++++
 .../templates/output/package_sendmail_removed.xml  |   26 +++++
 .../output/package_smartmontools_removed.xml       |   26 +++++
 .../templates/output/package_squid_removed.xml     |   26 +++++
 .../package_subscription-manager_removed.xml       |   26 +++++
 .../templates/output/package_sysstat_removed.xml   |   26 +++++
 .../output/package_talk-server_removed.xml         |   26 +++++
 .../output/package_telnet-server_removed.xml       |   26 +++++
 .../output/package_tftp-server_removed.xml         |   26 +++++
 .../templates/output/package_vsftpd_installed.sh   |    1 +
 .../templates/output/package_vsftpd_installed.xml  |   26 +++++
 .../templates/output/package_vsftpd_removed.xml    |   26 +++++
 .../templates/output/package_xinetd_removed.xml    |   26 +++++
 .../package_xorg-x11-server-common_removed.xml     |   26 +++++
 .../templates/output/package_ypbind_removed.xml    |   26 +++++
 .../templates/output/package_ypserv_removed.xml    |   26 +++++
 .../templates/output/service_abrtd_disabled.xml    |   33 +++++++
 .../templates/output/service_acpid_disabled.xml    |   32 +++++++
 .../templates/output/service_atd_disabled.xml      |   33 +++++++
 .../templates/output/service_auditd_enabled.xml    |   33 +++++++
 .../templates/output/service_autofs_disabled.xml   |   32 +++++++
 .../output/service_avahi-daemon_disabled.xml       |   32 +++++++
 .../output/service_bluetooth_disabled.xml          |   32 +++++++
 .../output/service_certmonger_disabled.xml         |   32 +++++++
 .../templates/output/service_cgconfig_disabled.xml |   33 +++++++
 .../templates/output/service_crond_enabled.xml     |   33 +++++++
 .../templates/output/service_cups_disabled.xml     |   33 +++++++
 .../templates/output/service_dhcpd_disabled.xml    |   33 +++++++
 .../templates/output/service_dovecot_disabled.xml  |   33 +++++++
 .../templates/output/service_httpd_disabled.xml    |   33 +++++++
 .../templates/output/service_ip6tables_enabled.xml |   33 +++++++
 .../templates/output/service_iptables_enabled.xml  |   33 +++++++
 .../output/service_irqbalance_enabled.xml          |   33 +++++++
 .../templates/output/service_kdump_disabled.xml    |   33 +++++++
 .../output/service_mdmonitor_disabled.xml          |   33 +++++++
 .../templates/output/service_named_disabled.xml    |   33 +++++++
 .../templates/output/service_nfs-lock_disabled.xml |   33 +++++++
 .../output/service_nfs-server_disabled.xml         |   33 +++++++
 .../templates/output/service_ntpd_enabled.xml      |   33 +++++++
 .../templates/output/service_oddjobd_disabled.xml  |   33 +++++++
 .../output/service_portreserve_disabled.xml        |   33 +++++++
 .../templates/output/service_postfix_enabled.xml   |   33 +++++++
 .../templates/output/service_psacct_enabled.xml    |   33 +++++++
 .../templates/output/service_qpidd_disabled.xml    |   33 +++++++
 .../templates/output/service_quotaon_disabled.xml  |   32 +++++++
 .../templates/output/service_rdisc_disabled.xml    |   33 +++++++
 .../templates/output/service_rhnsd_disabled.xml    |   99 ++++++++++++++++++++
 .../output/service_rhsmcertd_disabled.xml          |   33 +++++++
 .../templates/output/service_rpcgssd_disabled.xml  |   33 +++++++
 .../output/service_rpcidmapd_disabled.xml          |   33 +++++++
 .../output/service_rpcsvcgssd_disabled.xml         |   33 +++++++
 .../templates/output/service_rsyslog_enabled.xml   |   32 +++++++
 .../output/service_saslauthd_disabled.xml          |   33 +++++++
 .../templates/output/service_smartd_disabled.xml   |   33 +++++++
 .../templates/output/service_smb_disabled.xml      |   32 +++++++
 .../templates/output/service_snmpd_disabled.xml    |   33 +++++++
 .../templates/output/service_squid_disabled.xml    |   33 +++++++
 .../templates/output/service_sshd_disabled.xml     |   33 +++++++
 .../templates/output/service_sysstat_disabled.xml  |   33 +++++++
 .../templates/output/service_tftp_disabled.xml     |   33 +++++++
 .../templates/output/service_vsftpd_disabled.xml   |   33 +++++++
 .../templates/output/service_xinetd_disabled.xml   |   33 +++++++
 .../templates/output/service_ypbind_disabled.xml   |   33 +++++++
 .../input/checks/templates/packages_installed.csv  |    5 +-
 RHEL/7/input/checks/templates/packages_removed.csv |   41 ++++++++
 .../checks/templates/services_systemd_disabled.csv |   37 +++++++
 .../checks/templates/services_systemd_enabled.csv  |    9 ++
 .../checks/templates/services_sysv_disabled.csv    |    1 +
 .../templates/template_BASH_package_installed      |    1 +
 .../templates/template_OVAL_package_installed      |   26 +++++
 .../templates/template_kernel_module_disabled      |   31 ++++++
 .../checks/templates/template_package_removed      |   26 +++++
 .../templates/template_service_systemd_disabled    |   33 +++++++
 .../templates/template_service_systemd_enabled     |   33 +++++++
 .../templates/template_service_sysv_disabled       |   99 ++++++++++++++++++++
 RHEL/7/input/fixes/bash/package_dconf_installed.sh |    1 +
 .../bash/package_iptables-services_installed.sh    |    1 +
 RHEL/7/transforms/idtranslate.pyc                  |  Bin 5149 -> 5160 bytes
 shared/oval/package_aide_installed.xml             |    3 +-
 shared/oval/package_openssh-server_removed.xml     |    1 -
 271 files changed, 7160 insertions(+), 20 deletions(-)
 create mode 100644 RHEL/7/input/checks/kernel_module_cramfs_disabled.xml
 create mode 100644 RHEL/7/input/checks/kernel_module_dccp_disabled.xml
 create mode 100644 RHEL/7/input/checks/kernel_module_jffs2_disabled.xml
 create mode 100644 RHEL/7/input/checks/kernel_module_rds_disabled.xml
 create mode 100644 RHEL/7/input/checks/kernel_module_sctp_disabled.xml
 create mode 100644 RHEL/7/input/checks/kernel_module_squashfs_disabled.xml
 create mode 100644 RHEL/7/input/checks/kernel_module_udf_disabled.xml
 create mode 100644 RHEL/7/input/checks/kernel_module_usb-storage_disabled.xml
 create mode 100644 RHEL/7/input/checks/package_abrt_removed.xml
 create mode 100644 RHEL/7/input/checks/package_aide_installed.sh
 create mode 100644 RHEL/7/input/checks/package_at_removed.xml
 create mode 100644 RHEL/7/input/checks/package_audit_installed.sh
 create mode 100644 RHEL/7/input/checks/package_audit_installed.xml
 create mode 100644 RHEL/7/input/checks/package_bind_removed.xml
 create mode 100644 RHEL/7/input/checks/package_cpuspeed_removed.xml
 create mode 100644 RHEL/7/input/checks/package_cronie_installed.sh
 create mode 100644 RHEL/7/input/checks/package_cronie_installed.xml
 create mode 100644 RHEL/7/input/checks/package_cups_removed.xml
 create mode 100644 RHEL/7/input/checks/package_cyrus-sasl_removed.xml
 create mode 100644 RHEL/7/input/checks/package_dbus_removed.xml
 create mode 100644 RHEL/7/input/checks/package_dconf_installed.sh
 create mode 100644 RHEL/7/input/checks/package_dconf_installed.xml
 create mode 100644 RHEL/7/input/checks/package_dhcp_removed.xml
 create mode 100644 RHEL/7/input/checks/package_dhcpd_removed.xml
 create mode 100644 RHEL/7/input/checks/package_dovecot_removed.xml
 create mode 100644 RHEL/7/input/checks/package_hal_removed.xml
 create mode 100644 RHEL/7/input/checks/package_httpd_removed.xml
 create mode 100644 RHEL/7/input/checks/package_iptables-services_installed.sh
 create mode 100644 RHEL/7/input/checks/package_iptables-services_installed.xml
 create mode 100644 RHEL/7/input/checks/package_iptables_installed.sh
 create mode 100644 RHEL/7/input/checks/package_iptables_installed.xml
 create mode 100644 RHEL/7/input/checks/package_iputils_removed.xml
 create mode 100644 RHEL/7/input/checks/package_irqbalance_installed.sh
 create mode 100644 RHEL/7/input/checks/package_irqbalance_installed.xml
 create mode 100644 RHEL/7/input/checks/package_kexec-tools_removed.xml
 create mode 100644 RHEL/7/input/checks/package_libcgroup_removed.xml
 create mode 100644 RHEL/7/input/checks/package_mdadm_removed.xml
 create mode 100644 RHEL/7/input/checks/package_net-snmp_removed.xml
 create mode 100644 RHEL/7/input/checks/package_nfs-utils_removed.xml
 create mode 100644 RHEL/7/input/checks/package_ntp_installed.sh
 create mode 100644 RHEL/7/input/checks/package_ntp_installed.xml
 create mode 100644 RHEL/7/input/checks/package_oddjob_removed.xml
 create mode 100644 RHEL/7/input/checks/package_openldap-servers_removed.xml
 create mode 100644 RHEL/7/input/checks/package_pam_ldap_removed.xml
 create mode 100644 RHEL/7/input/checks/package_policycoreutils_installed.sh
 create mode 100644 RHEL/7/input/checks/package_policycoreutils_installed.xml
 create mode 100644 RHEL/7/input/checks/package_portreserve_removed.xml
 create mode 100644 RHEL/7/input/checks/package_postfix_installed.sh
 create mode 100644 RHEL/7/input/checks/package_postfix_installed.xml
 create mode 100644 RHEL/7/input/checks/package_psacct_installed.sh
 create mode 100644 RHEL/7/input/checks/package_psacct_installed.xml
 create mode 100644 RHEL/7/input/checks/package_qpid-cpp-server_removed.xml
 create mode 100644 RHEL/7/input/checks/package_quota_removed.xml
 create mode 100644 RHEL/7/input/checks/package_rhnsd_removed.xml
 create mode 100644 RHEL/7/input/checks/package_rsh-server_removed.xml
 create mode 100644 RHEL/7/input/checks/package_rsyslog_installed.sh
 create mode 100644 RHEL/7/input/checks/package_rsyslog_installed.xml
 create mode 100644 RHEL/7/input/checks/package_samba-common_removed.xml
 create mode 100644 RHEL/7/input/checks/package_screen_installed.sh
 create mode 100644 RHEL/7/input/checks/package_screen_installed.xml
 create mode 100644 RHEL/7/input/checks/package_sendmail_removed.xml
 create mode 100644 RHEL/7/input/checks/package_smartmontools_removed.xml
 create mode 100644 RHEL/7/input/checks/package_squid_removed.xml
 create mode 100644 RHEL/7/input/checks/package_subscription-manager_removed.xml
 create mode 100644 RHEL/7/input/checks/package_sysstat_removed.xml
 create mode 100644 RHEL/7/input/checks/package_talk-server_removed.xml
 create mode 100644 RHEL/7/input/checks/package_telnet-server_removed.xml
 create mode 100644 RHEL/7/input/checks/package_tftp-server_removed.xml
 create mode 100644 RHEL/7/input/checks/package_vsftpd_installed.sh
 create mode 100644 RHEL/7/input/checks/package_vsftpd_installed.xml
 create mode 100644 RHEL/7/input/checks/package_vsftpd_removed.xml
 create mode 100644 RHEL/7/input/checks/package_xinetd_removed.xml
 create mode 100644 RHEL/7/input/checks/package_xorg-x11-server-common_removed.xml
 create mode 100644 RHEL/7/input/checks/package_ypbind_removed.xml
 create mode 100644 RHEL/7/input/checks/package_ypserv_removed.xml
 create mode 100644 RHEL/7/input/checks/service_abrtd_disabled.xml
 create mode 100644 RHEL/7/input/checks/service_acpid_disabled.xml
 create mode 100644 RHEL/7/input/checks/service_atd_disabled.xml
 create mode 100644 RHEL/7/input/checks/service_auditd_enabled.xml
 create mode 100644 RHEL/7/input/checks/service_autofs_disabled.xml
 create mode 100644 RHEL/7/input/checks/service_avahi-daemon_disabled.xml
 create mode 100644 RHEL/7/input/checks/service_bluetooth_disabled.xml
 create mode 100644 RHEL/7/input/checks/service_certmonger_disabled.xml
 create mode 100644 RHEL/7/input/checks/service_cgconfig_disabled.xml
 create mode 100644 RHEL/7/input/checks/service_crond_enabled.xml
 create mode 100644 RHEL/7/input/checks/service_cups_disabled.xml
 create mode 100644 RHEL/7/input/checks/service_dhcpd_disabled.xml
 create mode 100644 RHEL/7/input/checks/service_dovecot_disabled.xml
 create mode 100644 RHEL/7/input/checks/service_httpd_disabled.xml
 create mode 100644 RHEL/7/input/checks/service_ip6tables_enabled.xml
 create mode 100644 RHEL/7/input/checks/service_iptables_enabled.xml
 create mode 100644 RHEL/7/input/checks/service_irqbalance_enabled.xml
 create mode 100644 RHEL/7/input/checks/service_kdump_disabled.xml
 create mode 100644 RHEL/7/input/checks/service_mdmonitor_disabled.xml
 create mode 100644 RHEL/7/input/checks/service_named_disabled.xml
 create mode 100644 RHEL/7/input/checks/service_nfs-lock_disabled.xml
 create mode 100644 RHEL/7/input/checks/service_nfs-server_disabled.xml
 create mode 100644 RHEL/7/input/checks/service_ntpd_enabled.xml
 create mode 100644 RHEL/7/input/checks/service_oddjobd_disabled.xml
 create mode 100644 RHEL/7/input/checks/service_portreserve_disabled.xml
 create mode 100644 RHEL/7/input/checks/service_postfix_enabled.xml
 create mode 100644 RHEL/7/input/checks/service_psacct_enabled.xml
 create mode 100644 RHEL/7/input/checks/service_qpidd_disabled.xml
 create mode 100644 RHEL/7/input/checks/service_quotaon_disabled.xml
 create mode 100644 RHEL/7/input/checks/service_rdisc_disabled.xml
 create mode 100644 RHEL/7/input/checks/service_rhnsd_disabled.xml
 create mode 100644 RHEL/7/input/checks/service_rhsmcertd_disabled.xml
 create mode 100644 RHEL/7/input/checks/service_rpcgssd_disabled.xml
 create mode 100644 RHEL/7/input/checks/service_rpcidmapd_disabled.xml
 create mode 100644 RHEL/7/input/checks/service_rpcsvcgssd_disabled.xml
 create mode 100644 RHEL/7/input/checks/service_rsyslog_enabled.xml
 create mode 100644 RHEL/7/input/checks/service_saslauthd_disabled.xml
 create mode 100644 RHEL/7/input/checks/service_smartd_disabled.xml
 create mode 100644 RHEL/7/input/checks/service_smb_disabled.xml
 create mode 100644 RHEL/7/input/checks/service_snmpd_disabled.xml
 create mode 100644 RHEL/7/input/checks/service_squid_disabled.xml
 create mode 100644 RHEL/7/input/checks/service_sysstat_disabled.xml
 create mode 100644 RHEL/7/input/checks/service_tftp_disabled.xml
 create mode 100644 RHEL/7/input/checks/service_vsftpd_disabled.xml
 create mode 100644 RHEL/7/input/checks/service_xinetd_disabled.xml
 create mode 100644 RHEL/7/input/checks/service_ypbind_disabled.xml
 create mode 100644 RHEL/7/input/checks/templates/Makefile
 create mode 100755 RHEL/7/input/checks/templates/create_kernel_modules_disabled.py
 create mode 100755 RHEL/7/input/checks/templates/create_package_installed.py
 create mode 100755 RHEL/7/input/checks/templates/create_package_removed.py
 create mode 100755 RHEL/7/input/checks/templates/create_services_systemd_disabled.py
 create mode 100755 RHEL/7/input/checks/templates/create_services_systemd_enabled.py
 create mode 100755 RHEL/7/input/checks/templates/create_services_sysv_disabled.py
 create mode 100644 RHEL/7/input/checks/templates/kernel_modules_disabled.csv
 create mode 100644
RHEL/7/input/checks/templates/output/kernel_module_cramfs_disabled.xml
 create mode 100644 RHEL/7/input/checks/templates/output/kernel_module_dccp_disabled.xml
 create mode 100644 RHEL/7/input/checks/templates/output/kernel_module_jffs2_disabled.xml
 create mode 100644 RHEL/7/input/checks/templates/output/kernel_module_rds_disabled.xml
 create mode 100644 RHEL/7/input/checks/templates/output/kernel_module_sctp_disabled.xml
 create mode 100644
RHEL/7/input/checks/templates/output/kernel_module_squashfs_disabled.xml
 create mode 100644 RHEL/7/input/checks/templates/output/kernel_module_udf_disabled.xml
 create mode 100644
RHEL/7/input/checks/templates/output/kernel_module_usb-storage_disabled.xml
 create mode 100644 RHEL/7/input/checks/templates/output/package_abrt_removed.xml
 create mode 100644 RHEL/7/input/checks/templates/output/package_aide_installed.sh
 create mode 100644 RHEL/7/input/checks/templates/output/package_aide_installed.xml
 create mode 100644 RHEL/7/input/checks/templates/output/package_at_removed.xml
 create mode 100644 RHEL/7/input/checks/templates/output/package_audit_installed.sh
 create mode 100644 RHEL/7/input/checks/templates/output/package_audit_installed.xml
 create mode 100644 RHEL/7/input/checks/templates/output/package_bind_removed.xml
 create mode 100644 RHEL/7/input/checks/templates/output/package_cpuspeed_removed.xml
 create mode 100644 RHEL/7/input/checks/templates/output/package_cronie_installed.sh
 create mode 100644 RHEL/7/input/checks/templates/output/package_cronie_installed.xml
 create mode 100644 RHEL/7/input/checks/templates/output/package_cups_removed.xml
 create mode 100644 RHEL/7/input/checks/templates/output/package_cyrus-sasl_removed.xml
 create mode 100644 RHEL/7/input/checks/templates/output/package_dbus_removed.xml
 create mode 100644 RHEL/7/input/checks/templates/output/package_dconf_installed.sh
 create mode 100644 RHEL/7/input/checks/templates/output/package_dconf_installed.xml
 create mode 100644 RHEL/7/input/checks/templates/output/package_dhcp_removed.xml
 create mode 100644 RHEL/7/input/checks/templates/output/package_dhcpd_removed.xml
 create mode 100644 RHEL/7/input/checks/templates/output/package_dovecot_removed.xml
 create mode 100644 RHEL/7/input/checks/templates/output/package_hal_removed.xml
 create mode 100644 RHEL/7/input/checks/templates/output/package_httpd_removed.xml
 create mode 100644
RHEL/7/input/checks/templates/output/package_iptables-services_installed.sh
 create mode 100644
RHEL/7/input/checks/templates/output/package_iptables-services_installed.xml
 create mode 100644 RHEL/7/input/checks/templates/output/package_iptables_installed.sh
 create mode 100644 RHEL/7/input/checks/templates/output/package_iptables_installed.xml
 create mode 100644 RHEL/7/input/checks/templates/output/package_iputils_removed.xml
 create mode 100644 RHEL/7/input/checks/templates/output/package_irqbalance_installed.sh
 create mode 100644 RHEL/7/input/checks/templates/output/package_irqbalance_installed.xml
 create mode 100644 RHEL/7/input/checks/templates/output/package_kexec-tools_removed.xml
 create mode 100644 RHEL/7/input/checks/templates/output/package_libcgroup_removed.xml
 create mode 100644 RHEL/7/input/checks/templates/output/package_mdadm_removed.xml
 create mode 100644 RHEL/7/input/checks/templates/output/package_net-snmp_removed.xml
 create mode 100644 RHEL/7/input/checks/templates/output/package_nfs-utils_removed.xml
 create mode 100644 RHEL/7/input/checks/templates/output/package_ntp_installed.sh
 create mode 100644 RHEL/7/input/checks/templates/output/package_ntp_installed.xml
 create mode 100644 RHEL/7/input/checks/templates/output/package_oddjob_removed.xml
 create mode 100644
RHEL/7/input/checks/templates/output/package_openldap-servers_removed.xml
 create mode 100644
RHEL/7/input/checks/templates/output/package_openssh-server_removed.xml
 create mode 100644 RHEL/7/input/checks/templates/output/package_pam_ldap_removed.xml
 create mode 100644
RHEL/7/input/checks/templates/output/package_policycoreutils_installed.sh
 create mode 100644
RHEL/7/input/checks/templates/output/package_policycoreutils_installed.xml
 create mode 100644 RHEL/7/input/checks/templates/output/package_portreserve_removed.xml
 create mode 100644 RHEL/7/input/checks/templates/output/package_postfix_installed.sh
 create mode 100644 RHEL/7/input/checks/templates/output/package_postfix_installed.xml
 create mode 100644 RHEL/7/input/checks/templates/output/package_psacct_installed.sh
 create mode 100644 RHEL/7/input/checks/templates/output/package_psacct_installed.xml
 create mode 100644
RHEL/7/input/checks/templates/output/package_qpid-cpp-server_removed.xml
 create mode 100644 RHEL/7/input/checks/templates/output/package_quota_removed.xml
 create mode 100644 RHEL/7/input/checks/templates/output/package_rhnsd_removed.xml
 create mode 100644 RHEL/7/input/checks/templates/output/package_rsh-server_removed.xml
 create mode 100644 RHEL/7/input/checks/templates/output/package_rsyslog_installed.sh
 create mode 100644 RHEL/7/input/checks/templates/output/package_rsyslog_installed.xml
 create mode 100644 RHEL/7/input/checks/templates/output/package_samba-common_removed.xml
 create mode 100644 RHEL/7/input/checks/templates/output/package_screen_installed.sh
 create mode 100644 RHEL/7/input/checks/templates/output/package_screen_installed.xml
 create mode 100644 RHEL/7/input/checks/templates/output/package_sendmail_removed.xml
 create mode 100644
RHEL/7/input/checks/templates/output/package_smartmontools_removed.xml
 create mode 100644 RHEL/7/input/checks/templates/output/package_squid_removed.xml
 create mode 100644
RHEL/7/input/checks/templates/output/package_subscription-manager_removed.xml
 create mode 100644 RHEL/7/input/checks/templates/output/package_sysstat_removed.xml
 create mode 100644 RHEL/7/input/checks/templates/output/package_talk-server_removed.xml
 create mode 100644
RHEL/7/input/checks/templates/output/package_telnet-server_removed.xml
 create mode 100644 RHEL/7/input/checks/templates/output/package_tftp-server_removed.xml
 create mode 100644 RHEL/7/input/checks/templates/output/package_vsftpd_installed.sh
 create mode 100644 RHEL/7/input/checks/templates/output/package_vsftpd_installed.xml
 create mode 100644 RHEL/7/input/checks/templates/output/package_vsftpd_removed.xml
 create mode 100644 RHEL/7/input/checks/templates/output/package_xinetd_removed.xml
 create mode 100644
RHEL/7/input/checks/templates/output/package_xorg-x11-server-common_removed.xml
 create mode 100644 RHEL/7/input/checks/templates/output/package_ypbind_removed.xml
 create mode 100644 RHEL/7/input/checks/templates/output/package_ypserv_removed.xml
 create mode 100644 RHEL/7/input/checks/templates/output/service_abrtd_disabled.xml
 create mode 100644 RHEL/7/input/checks/templates/output/service_acpid_disabled.xml
 create mode 100644 RHEL/7/input/checks/templates/output/service_atd_disabled.xml
 create mode 100644 RHEL/7/input/checks/templates/output/service_auditd_enabled.xml
 create mode 100644 RHEL/7/input/checks/templates/output/service_autofs_disabled.xml
 create mode 100644
RHEL/7/input/checks/templates/output/service_avahi-daemon_disabled.xml
 create mode 100644 RHEL/7/input/checks/templates/output/service_bluetooth_disabled.xml
 create mode 100644 RHEL/7/input/checks/templates/output/service_certmonger_disabled.xml
 create mode 100644 RHEL/7/input/checks/templates/output/service_cgconfig_disabled.xml
 create mode 100644 RHEL/7/input/checks/templates/output/service_crond_enabled.xml
 create mode 100644 RHEL/7/input/checks/templates/output/service_cups_disabled.xml
 create mode 100644 RHEL/7/input/checks/templates/output/service_dhcpd_disabled.xml
 create mode 100644 RHEL/7/input/checks/templates/output/service_dovecot_disabled.xml
 create mode 100644 RHEL/7/input/checks/templates/output/service_httpd_disabled.xml
 create mode 100644 RHEL/7/input/checks/templates/output/service_ip6tables_enabled.xml
 create mode 100644 RHEL/7/input/checks/templates/output/service_iptables_enabled.xml
 create mode 100644 RHEL/7/input/checks/templates/output/service_irqbalance_enabled.xml
 create mode 100644 RHEL/7/input/checks/templates/output/service_kdump_disabled.xml
 create mode 100644 RHEL/7/input/checks/templates/output/service_mdmonitor_disabled.xml
 create mode 100644 RHEL/7/input/checks/templates/output/service_named_disabled.xml
 create mode 100644 RHEL/7/input/checks/templates/output/service_nfs-lock_disabled.xml
 create mode 100644 RHEL/7/input/checks/templates/output/service_nfs-server_disabled.xml
 create mode 100644 RHEL/7/input/checks/templates/output/service_ntpd_enabled.xml
 create mode 100644 RHEL/7/input/checks/templates/output/service_oddjobd_disabled.xml
 create mode 100644 RHEL/7/input/checks/templates/output/service_portreserve_disabled.xml
 create mode 100644 RHEL/7/input/checks/templates/output/service_postfix_enabled.xml
 create mode 100644 RHEL/7/input/checks/templates/output/service_psacct_enabled.xml
 create mode 100644 RHEL/7/input/checks/templates/output/service_qpidd_disabled.xml
 create mode 100644 RHEL/7/input/checks/templates/output/service_quotaon_disabled.xml
 create mode 100644 RHEL/7/input/checks/templates/output/service_rdisc_disabled.xml
 create mode 100644 RHEL/7/input/checks/templates/output/service_rhnsd_disabled.xml
 create mode 100644 RHEL/7/input/checks/templates/output/service_rhsmcertd_disabled.xml
 create mode 100644 RHEL/7/input/checks/templates/output/service_rpcgssd_disabled.xml
 create mode 100644 RHEL/7/input/checks/templates/output/service_rpcidmapd_disabled.xml
 create mode 100644 RHEL/7/input/checks/templates/output/service_rpcsvcgssd_disabled.xml
 create mode 100644 RHEL/7/input/checks/templates/output/service_rsyslog_enabled.xml
 create mode 100644 RHEL/7/input/checks/templates/output/service_saslauthd_disabled.xml
 create mode 100644 RHEL/7/input/checks/templates/output/service_smartd_disabled.xml
 create mode 100644 RHEL/7/input/checks/templates/output/service_smb_disabled.xml
 create mode 100644 RHEL/7/input/checks/templates/output/service_snmpd_disabled.xml
 create mode 100644 RHEL/7/input/checks/templates/output/service_squid_disabled.xml
 create mode 100644 RHEL/7/input/checks/templates/output/service_sshd_disabled.xml
 create mode 100644 RHEL/7/input/checks/templates/output/service_sysstat_disabled.xml
 create mode 100644 RHEL/7/input/checks/templates/output/service_tftp_disabled.xml
 create mode 100644 RHEL/7/input/checks/templates/output/service_vsftpd_disabled.xml
 create mode 100644 RHEL/7/input/checks/templates/output/service_xinetd_disabled.xml
 create mode 100644 RHEL/7/input/checks/templates/output/service_ypbind_disabled.xml
 create mode 100644 RHEL/7/input/checks/templates/packages_removed.csv
 create mode 100644 RHEL/7/input/checks/templates/services_systemd_disabled.csv
 create mode 100644 RHEL/7/input/checks/templates/services_systemd_enabled.csv
 create mode 100644 RHEL/7/input/checks/templates/services_sysv_disabled.csv
 create mode 100644 RHEL/7/input/checks/templates/template_BASH_package_installed
 create mode 100644 RHEL/7/input/checks/templates/template_OVAL_package_installed
 create mode 100644 RHEL/7/input/checks/templates/template_kernel_module_disabled
 create mode 100644 RHEL/7/input/checks/templates/template_package_removed
 create mode 100644 RHEL/7/input/checks/templates/template_service_systemd_disabled
 create mode 100644 RHEL/7/input/checks/templates/template_service_systemd_enabled
 create mode 100644 RHEL/7/input/checks/templates/template_service_sysv_disabled
 create mode 100644 RHEL/7/input/fixes/bash/package_dconf_installed.sh
 create mode 100644 RHEL/7/input/fixes/bash/package_iptables-services_installed.sh

diff --git a/RHEL/7/input/checks/kernel_module_cramfs_disabled.xml
b/RHEL/7/input/checks/kernel_module_cramfs_disabled.xml
new file mode 100644
index 0000000..611bb04
--- /dev/null
+++ b/RHEL/7/input/checks/kernel_module_cramfs_disabled.xml
@@ -0,0 +1,31 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_kernel_modules_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance"
+  id="kernel_module_cramfs_disabled" version="1">
+    <metadata>
+      <title>Disable cramfs Kernel Module</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The kernel module cramfs should be
disabled.</description>
+      <reference source="swells" ref_id="20130928"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria operator="AND">
+      <criterion test_ref="test_kernmod_cramfs_disabled"
comment="kernel module cramfs disabled in /etc/modprobe.d" />
+    </criteria>
+  </definition>
+
+  <ind:textfilecontent54_test id="test_kernmod_cramfs_disabled"
version="1" check="all"
+  comment="kernel module cramfs disabled">
+    <ind:object object_ref="obj_kernmod_cramfs_disabled" />
+  </ind:textfilecontent54_test>
+
+  <ind:textfilecontent54_object id="obj_kernmod_cramfs_disabled"
+  version="1" comment="kernel module cramfs disabled">
+    <ind:path>/etc/modprobe.d</ind:path>
+    <ind:filename operation="pattern
match">^.*\.conf$</ind:filename>
+    <ind:pattern operation="pattern
match">^\s*install\s+cramfs\s+(/bin/false|/bin/true)$</ind:pattern>
+    <ind:instance datatype="int">1</ind:instance>
+  </ind:textfilecontent54_object>
+
+</def-group>
diff --git a/RHEL/7/input/checks/kernel_module_dccp_disabled.xml
b/RHEL/7/input/checks/kernel_module_dccp_disabled.xml
new file mode 100644
index 0000000..0e7ea02
--- /dev/null
+++ b/RHEL/7/input/checks/kernel_module_dccp_disabled.xml
@@ -0,0 +1,31 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_kernel_modules_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance"
+  id="kernel_module_dccp_disabled" version="1">
+    <metadata>
+      <title>Disable dccp Kernel Module</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The kernel module dccp should be disabled.</description>
+      <reference source="swells" ref_id="20130928"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria operator="AND">
+      <criterion test_ref="test_kernmod_dccp_disabled" comment="kernel
module dccp disabled in /etc/modprobe.d" />
+    </criteria>
+  </definition>
+
+  <ind:textfilecontent54_test id="test_kernmod_dccp_disabled"
version="1" check="all"
+  comment="kernel module dccp disabled">
+    <ind:object object_ref="obj_kernmod_dccp_disabled" />
+  </ind:textfilecontent54_test>
+
+  <ind:textfilecontent54_object id="obj_kernmod_dccp_disabled"
+  version="1" comment="kernel module dccp disabled">
+    <ind:path>/etc/modprobe.d</ind:path>
+    <ind:filename operation="pattern
match">^.*\.conf$</ind:filename>
+    <ind:pattern operation="pattern
match">^\s*install\s+dccp\s+(/bin/false|/bin/true)$</ind:pattern>
+    <ind:instance datatype="int">1</ind:instance>
+  </ind:textfilecontent54_object>
+
+</def-group>
diff --git a/RHEL/7/input/checks/kernel_module_jffs2_disabled.xml
b/RHEL/7/input/checks/kernel_module_jffs2_disabled.xml
new file mode 100644
index 0000000..346adc5
--- /dev/null
+++ b/RHEL/7/input/checks/kernel_module_jffs2_disabled.xml
@@ -0,0 +1,31 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_kernel_modules_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance"
+  id="kernel_module_jffs2_disabled" version="1">
+    <metadata>
+      <title>Disable jffs2 Kernel Module</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The kernel module jffs2 should be disabled.</description>
+      <reference source="swells" ref_id="20130928"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria operator="AND">
+      <criterion test_ref="test_kernmod_jffs2_disabled" comment="kernel
module jffs2 disabled in /etc/modprobe.d" />
+    </criteria>
+  </definition>
+
+  <ind:textfilecontent54_test id="test_kernmod_jffs2_disabled"
version="1" check="all"
+  comment="kernel module jffs2 disabled">
+    <ind:object object_ref="obj_kernmod_jffs2_disabled" />
+  </ind:textfilecontent54_test>
+
+  <ind:textfilecontent54_object id="obj_kernmod_jffs2_disabled"
+  version="1" comment="kernel module jffs2 disabled">
+    <ind:path>/etc/modprobe.d</ind:path>
+    <ind:filename operation="pattern
match">^.*\.conf$</ind:filename>
+    <ind:pattern operation="pattern
match">^\s*install\s+jffs2\s+(/bin/false|/bin/true)$</ind:pattern>
+    <ind:instance datatype="int">1</ind:instance>
+  </ind:textfilecontent54_object>
+
+</def-group>
diff --git a/RHEL/7/input/checks/kernel_module_rds_disabled.xml
b/RHEL/7/input/checks/kernel_module_rds_disabled.xml
new file mode 100644
index 0000000..eecf0d7
--- /dev/null
+++ b/RHEL/7/input/checks/kernel_module_rds_disabled.xml
@@ -0,0 +1,31 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_kernel_modules_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance"
+  id="kernel_module_rds_disabled" version="1">
+    <metadata>
+      <title>Disable rds Kernel Module</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The kernel module rds should be disabled.</description>
+      <reference source="swells" ref_id="20130928"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria operator="AND">
+      <criterion test_ref="test_kernmod_rds_disabled" comment="kernel
module rds disabled in /etc/modprobe.d" />
+    </criteria>
+  </definition>
+
+  <ind:textfilecontent54_test id="test_kernmod_rds_disabled"
version="1" check="all"
+  comment="kernel module rds disabled">
+    <ind:object object_ref="obj_kernmod_rds_disabled" />
+  </ind:textfilecontent54_test>
+
+  <ind:textfilecontent54_object id="obj_kernmod_rds_disabled"
+  version="1" comment="kernel module rds disabled">
+    <ind:path>/etc/modprobe.d</ind:path>
+    <ind:filename operation="pattern
match">^.*\.conf$</ind:filename>
+    <ind:pattern operation="pattern
match">^\s*install\s+rds\s+(/bin/false|/bin/true)$</ind:pattern>
+    <ind:instance datatype="int">1</ind:instance>
+  </ind:textfilecontent54_object>
+
+</def-group>
diff --git a/RHEL/7/input/checks/kernel_module_sctp_disabled.xml
b/RHEL/7/input/checks/kernel_module_sctp_disabled.xml
new file mode 100644
index 0000000..aead401
--- /dev/null
+++ b/RHEL/7/input/checks/kernel_module_sctp_disabled.xml
@@ -0,0 +1,31 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_kernel_modules_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance"
+  id="kernel_module_sctp_disabled" version="1">
+    <metadata>
+      <title>Disable sctp Kernel Module</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The kernel module sctp should be disabled.</description>
+      <reference source="swells" ref_id="20130928"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria operator="AND">
+      <criterion test_ref="test_kernmod_sctp_disabled" comment="kernel
module sctp disabled in /etc/modprobe.d" />
+    </criteria>
+  </definition>
+
+  <ind:textfilecontent54_test id="test_kernmod_sctp_disabled"
version="1" check="all"
+  comment="kernel module sctp disabled">
+    <ind:object object_ref="obj_kernmod_sctp_disabled" />
+  </ind:textfilecontent54_test>
+
+  <ind:textfilecontent54_object id="obj_kernmod_sctp_disabled"
+  version="1" comment="kernel module sctp disabled">
+    <ind:path>/etc/modprobe.d</ind:path>
+    <ind:filename operation="pattern
match">^.*\.conf$</ind:filename>
+    <ind:pattern operation="pattern
match">^\s*install\s+sctp\s+(/bin/false|/bin/true)$</ind:pattern>
+    <ind:instance datatype="int">1</ind:instance>
+  </ind:textfilecontent54_object>
+
+</def-group>
diff --git a/RHEL/7/input/checks/kernel_module_squashfs_disabled.xml
b/RHEL/7/input/checks/kernel_module_squashfs_disabled.xml
new file mode 100644
index 0000000..32e4fd9
--- /dev/null
+++ b/RHEL/7/input/checks/kernel_module_squashfs_disabled.xml
@@ -0,0 +1,31 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_kernel_modules_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance"
+  id="kernel_module_squashfs_disabled" version="1">
+    <metadata>
+      <title>Disable squashfs Kernel Module</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The kernel module squashfs should be
disabled.</description>
+      <reference source="swells" ref_id="20130928"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria operator="AND">
+      <criterion test_ref="test_kernmod_squashfs_disabled"
comment="kernel module squashfs disabled in /etc/modprobe.d" />
+    </criteria>
+  </definition>
+
+  <ind:textfilecontent54_test id="test_kernmod_squashfs_disabled"
version="1" check="all"
+  comment="kernel module squashfs disabled">
+    <ind:object object_ref="obj_kernmod_squashfs_disabled" />
+  </ind:textfilecontent54_test>
+
+  <ind:textfilecontent54_object id="obj_kernmod_squashfs_disabled"
+  version="1" comment="kernel module squashfs disabled">
+    <ind:path>/etc/modprobe.d</ind:path>
+    <ind:filename operation="pattern
match">^.*\.conf$</ind:filename>
+    <ind:pattern operation="pattern
match">^\s*install\s+squashfs\s+(/bin/false|/bin/true)$</ind:pattern>
+    <ind:instance datatype="int">1</ind:instance>
+  </ind:textfilecontent54_object>
+
+</def-group>
diff --git a/RHEL/7/input/checks/kernel_module_udf_disabled.xml
b/RHEL/7/input/checks/kernel_module_udf_disabled.xml
new file mode 100644
index 0000000..78f46db
--- /dev/null
+++ b/RHEL/7/input/checks/kernel_module_udf_disabled.xml
@@ -0,0 +1,31 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_kernel_modules_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance"
+  id="kernel_module_udf_disabled" version="1">
+    <metadata>
+      <title>Disable udf Kernel Module</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The kernel module udf should be disabled.</description>
+      <reference source="swells" ref_id="20130928"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria operator="AND">
+      <criterion test_ref="test_kernmod_udf_disabled" comment="kernel
module udf disabled in /etc/modprobe.d" />
+    </criteria>
+  </definition>
+
+  <ind:textfilecontent54_test id="test_kernmod_udf_disabled"
version="1" check="all"
+  comment="kernel module udf disabled">
+    <ind:object object_ref="obj_kernmod_udf_disabled" />
+  </ind:textfilecontent54_test>
+
+  <ind:textfilecontent54_object id="obj_kernmod_udf_disabled"
+  version="1" comment="kernel module udf disabled">
+    <ind:path>/etc/modprobe.d</ind:path>
+    <ind:filename operation="pattern
match">^.*\.conf$</ind:filename>
+    <ind:pattern operation="pattern
match">^\s*install\s+udf\s+(/bin/false|/bin/true)$</ind:pattern>
+    <ind:instance datatype="int">1</ind:instance>
+  </ind:textfilecontent54_object>
+
+</def-group>
diff --git a/RHEL/7/input/checks/kernel_module_usb-storage_disabled.xml
b/RHEL/7/input/checks/kernel_module_usb-storage_disabled.xml
new file mode 100644
index 0000000..ec0033d
--- /dev/null
+++ b/RHEL/7/input/checks/kernel_module_usb-storage_disabled.xml
@@ -0,0 +1,31 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_kernel_modules_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance"
+  id="kernel_module_usb-storage_disabled" version="1">
+    <metadata>
+      <title>Disable usb-storage Kernel Module</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The kernel module usb-storage should be
disabled.</description>
+      <reference source="swells" ref_id="20130928"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria operator="AND">
+      <criterion test_ref="test_kernmod_usb-storage_disabled"
comment="kernel module usb-storage disabled in /etc/modprobe.d" />
+    </criteria>
+  </definition>
+
+  <ind:textfilecontent54_test id="test_kernmod_usb-storage_disabled"
version="1" check="all"
+  comment="kernel module usb-storage disabled">
+    <ind:object object_ref="obj_kernmod_usb-storage_disabled" />
+  </ind:textfilecontent54_test>
+
+  <ind:textfilecontent54_object id="obj_kernmod_usb-storage_disabled"
+  version="1" comment="kernel module usb-storage disabled">
+    <ind:path>/etc/modprobe.d</ind:path>
+    <ind:filename operation="pattern
match">^.*\.conf$</ind:filename>
+    <ind:pattern operation="pattern
match">^\s*install\s+usb-storage\s+(/bin/false|/bin/true)$</ind:pattern>
+    <ind:instance datatype="int">1</ind:instance>
+  </ind:textfilecontent54_object>
+
+</def-group>
diff --git a/RHEL/7/input/checks/package_abrt_removed.xml
b/RHEL/7/input/checks/package_abrt_removed.xml
new file mode 100644
index 0000000..8ad561e
--- /dev/null
+++ b/RHEL/7/input/checks/package_abrt_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_abrt_removed"
+  version="1">
+    <metadata>
+      <title>Package abrt Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package abrt should be removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package abrt is removed"
+      test_ref="test_package_abrt_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_abrt_removed" version="1"
+  comment="package abrt is removed">
+    <linux:object object_ref="obj_package_abrt_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_abrt_removed"
version="1">
+    <linux:name>abrt</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/package_aide_installed.sh
b/RHEL/7/input/checks/package_aide_installed.sh
new file mode 100644
index 0000000..ccca946
--- /dev/null
+++ b/RHEL/7/input/checks/package_aide_installed.sh
@@ -0,0 +1 @@
+yum -y install aide
diff --git a/RHEL/7/input/checks/package_at_removed.xml
b/RHEL/7/input/checks/package_at_removed.xml
new file mode 100644
index 0000000..98c357e
--- /dev/null
+++ b/RHEL/7/input/checks/package_at_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_at_removed"
+  version="1">
+    <metadata>
+      <title>Package at Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package at should be removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package at is removed"
+      test_ref="test_package_at_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_at_removed" version="1"
+  comment="package at is removed">
+    <linux:object object_ref="obj_package_at_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_at_removed"
version="1">
+    <linux:name>at</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/package_audit_installed.sh
b/RHEL/7/input/checks/package_audit_installed.sh
new file mode 100644
index 0000000..2d1f6ad
--- /dev/null
+++ b/RHEL/7/input/checks/package_audit_installed.sh
@@ -0,0 +1 @@
+yum -y install audit
diff --git a/RHEL/7/input/checks/package_audit_installed.xml
b/RHEL/7/input/checks/package_audit_installed.xml
new file mode 100644
index 0000000..9d4248b
--- /dev/null
+++ b/RHEL/7/input/checks/package_audit_installed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_installed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_audit_installed"
+  version="1">
+    <metadata>
+      <title>Package audit Installed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package audit should be installed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package audit is installed"
+      test_ref="test_package_audit_installed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="all_exist"
+  id="test_package_audit_installed" version="1"
+  comment="package audit is installed">
+    <linux:object object_ref="obj_package_audit_installed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_audit_installed"
version="1">
+    <linux:name>audit</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/package_bind_removed.xml
b/RHEL/7/input/checks/package_bind_removed.xml
new file mode 100644
index 0000000..45d40a4
--- /dev/null
+++ b/RHEL/7/input/checks/package_bind_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_bind_removed"
+  version="1">
+    <metadata>
+      <title>Package bind Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package bind should be removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package bind is removed"
+      test_ref="test_package_bind_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_bind_removed" version="1"
+  comment="package bind is removed">
+    <linux:object object_ref="obj_package_bind_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_bind_removed"
version="1">
+    <linux:name>bind</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/package_cpuspeed_removed.xml
b/RHEL/7/input/checks/package_cpuspeed_removed.xml
new file mode 100644
index 0000000..d60ba03
--- /dev/null
+++ b/RHEL/7/input/checks/package_cpuspeed_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_cpuspeed_removed"
+  version="1">
+    <metadata>
+      <title>Package cpuspeed Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package cpuspeed should be removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package cpuspeed is removed"
+      test_ref="test_package_cpuspeed_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_cpuspeed_removed" version="1"
+  comment="package cpuspeed is removed">
+    <linux:object object_ref="obj_package_cpuspeed_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_cpuspeed_removed"
version="1">
+    <linux:name>cpuspeed</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/package_cronie_installed.sh
b/RHEL/7/input/checks/package_cronie_installed.sh
new file mode 100644
index 0000000..43d3df0
--- /dev/null
+++ b/RHEL/7/input/checks/package_cronie_installed.sh
@@ -0,0 +1 @@
+yum -y install cronie
diff --git a/RHEL/7/input/checks/package_cronie_installed.xml
b/RHEL/7/input/checks/package_cronie_installed.xml
new file mode 100644
index 0000000..9cc6b9a
--- /dev/null
+++ b/RHEL/7/input/checks/package_cronie_installed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_installed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_cronie_installed"
+  version="1">
+    <metadata>
+      <title>Package cronie Installed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package cronie should be installed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package cronie is installed"
+      test_ref="test_package_cronie_installed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="all_exist"
+  id="test_package_cronie_installed" version="1"
+  comment="package cronie is installed">
+    <linux:object object_ref="obj_package_cronie_installed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_cronie_installed"
version="1">
+    <linux:name>cronie</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/package_cups_removed.xml
b/RHEL/7/input/checks/package_cups_removed.xml
new file mode 100644
index 0000000..a04320d
--- /dev/null
+++ b/RHEL/7/input/checks/package_cups_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_cups_removed"
+  version="1">
+    <metadata>
+      <title>Package cups Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package cups should be removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package cups is removed"
+      test_ref="test_package_cups_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_cups_removed" version="1"
+  comment="package cups is removed">
+    <linux:object object_ref="obj_package_cups_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_cups_removed"
version="1">
+    <linux:name>cups</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/package_cyrus-sasl_removed.xml
b/RHEL/7/input/checks/package_cyrus-sasl_removed.xml
new file mode 100644
index 0000000..1542768
--- /dev/null
+++ b/RHEL/7/input/checks/package_cyrus-sasl_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_cyrus-sasl_removed"
+  version="1">
+    <metadata>
+      <title>Package cyrus-sasl Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package cyrus-sasl should be
removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package cyrus-sasl is removed"
+      test_ref="test_package_cyrus-sasl_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_cyrus-sasl_removed" version="1"
+  comment="package cyrus-sasl is removed">
+    <linux:object object_ref="obj_package_cyrus-sasl_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_cyrus-sasl_removed"
version="1">
+    <linux:name>cyrus-sasl</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/package_dbus_removed.xml
b/RHEL/7/input/checks/package_dbus_removed.xml
new file mode 100644
index 0000000..5bd27d7
--- /dev/null
+++ b/RHEL/7/input/checks/package_dbus_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_dbus_removed"
+  version="1">
+    <metadata>
+      <title>Package dbus Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package dbus should be removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package dbus is removed"
+      test_ref="test_package_dbus_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_dbus_removed" version="1"
+  comment="package dbus is removed">
+    <linux:object object_ref="obj_package_dbus_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_dbus_removed"
version="1">
+    <linux:name>dbus</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/package_dconf_installed.sh
b/RHEL/7/input/checks/package_dconf_installed.sh
new file mode 100644
index 0000000..d276612
--- /dev/null
+++ b/RHEL/7/input/checks/package_dconf_installed.sh
@@ -0,0 +1 @@
+yum -y install dconf
diff --git a/RHEL/7/input/checks/package_dconf_installed.xml
b/RHEL/7/input/checks/package_dconf_installed.xml
new file mode 100644
index 0000000..d90c628
--- /dev/null
+++ b/RHEL/7/input/checks/package_dconf_installed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_installed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_dconf_installed"
+  version="1">
+    <metadata>
+      <title>Package dconf Installed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package dconf should be installed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package dconf is installed"
+      test_ref="test_package_dconf_installed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="all_exist"
+  id="test_package_dconf_installed" version="1"
+  comment="package dconf is installed">
+    <linux:object object_ref="obj_package_dconf_installed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_dconf_installed"
version="1">
+    <linux:name>dconf</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/package_dhcp_removed.xml
b/RHEL/7/input/checks/package_dhcp_removed.xml
new file mode 100644
index 0000000..4c9d73e
--- /dev/null
+++ b/RHEL/7/input/checks/package_dhcp_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_dhcp_removed"
+  version="1">
+    <metadata>
+      <title>Package dhcp Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package dhcp should be removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package dhcp is removed"
+      test_ref="test_package_dhcp_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_dhcp_removed" version="1"
+  comment="package dhcp is removed">
+    <linux:object object_ref="obj_package_dhcp_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_dhcp_removed"
version="1">
+    <linux:name>dhcp</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/package_dhcpd_removed.xml
b/RHEL/7/input/checks/package_dhcpd_removed.xml
new file mode 100644
index 0000000..c67f752
--- /dev/null
+++ b/RHEL/7/input/checks/package_dhcpd_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_dhcpd_removed"
+  version="1">
+    <metadata>
+      <title>Package dhcpd Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package dhcpd should be removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package dhcpd is removed"
+      test_ref="test_package_dhcpd_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_dhcpd_removed" version="1"
+  comment="package dhcpd is removed">
+    <linux:object object_ref="obj_package_dhcpd_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_dhcpd_removed"
version="1">
+    <linux:name>dhcpd</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/package_dovecot_removed.xml
b/RHEL/7/input/checks/package_dovecot_removed.xml
new file mode 100644
index 0000000..882e8c9
--- /dev/null
+++ b/RHEL/7/input/checks/package_dovecot_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_dovecot_removed"
+  version="1">
+    <metadata>
+      <title>Package dovecot Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package dovecot should be removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package dovecot is removed"
+      test_ref="test_package_dovecot_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_dovecot_removed" version="1"
+  comment="package dovecot is removed">
+    <linux:object object_ref="obj_package_dovecot_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_dovecot_removed"
version="1">
+    <linux:name>dovecot</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/package_hal_removed.xml
b/RHEL/7/input/checks/package_hal_removed.xml
new file mode 100644
index 0000000..3df8548
--- /dev/null
+++ b/RHEL/7/input/checks/package_hal_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_hal_removed"
+  version="1">
+    <metadata>
+      <title>Package hal Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package hal should be removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package hal is removed"
+      test_ref="test_package_hal_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_hal_removed" version="1"
+  comment="package hal is removed">
+    <linux:object object_ref="obj_package_hal_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_hal_removed"
version="1">
+    <linux:name>hal</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/package_httpd_removed.xml
b/RHEL/7/input/checks/package_httpd_removed.xml
new file mode 100644
index 0000000..bf0a73e
--- /dev/null
+++ b/RHEL/7/input/checks/package_httpd_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_httpd_removed"
+  version="1">
+    <metadata>
+      <title>Package httpd Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package httpd should be removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package httpd is removed"
+      test_ref="test_package_httpd_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_httpd_removed" version="1"
+  comment="package httpd is removed">
+    <linux:object object_ref="obj_package_httpd_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_httpd_removed"
version="1">
+    <linux:name>httpd</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/package_iptables-services_installed.sh
b/RHEL/7/input/checks/package_iptables-services_installed.sh
new file mode 100644
index 0000000..6c602dd
--- /dev/null
+++ b/RHEL/7/input/checks/package_iptables-services_installed.sh
@@ -0,0 +1 @@
+yum -y install iptables-services
diff --git a/RHEL/7/input/checks/package_iptables-services_installed.xml
b/RHEL/7/input/checks/package_iptables-services_installed.xml
new file mode 100644
index 0000000..98a161e
--- /dev/null
+++ b/RHEL/7/input/checks/package_iptables-services_installed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_installed.py.  DO NOT EDIT.  -->
+  <definition class="compliance"
id="package_iptables-services_installed"
+  version="1">
+    <metadata>
+      <title>Package iptables-services Installed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package iptables-services should be
installed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package iptables-services is installed"
+      test_ref="test_package_iptables-services_installed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="all_exist"
+  id="test_package_iptables-services_installed" version="1"
+  comment="package iptables-services is installed">
+    <linux:object object_ref="obj_package_iptables-services_installed"
/>
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_iptables-services_installed"
version="1">
+    <linux:name>iptables-services</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/package_iptables_installed.sh
b/RHEL/7/input/checks/package_iptables_installed.sh
new file mode 100644
index 0000000..5c45081
--- /dev/null
+++ b/RHEL/7/input/checks/package_iptables_installed.sh
@@ -0,0 +1 @@
+yum -y install iptables
diff --git a/RHEL/7/input/checks/package_iptables_installed.xml
b/RHEL/7/input/checks/package_iptables_installed.xml
new file mode 100644
index 0000000..f28deb5
--- /dev/null
+++ b/RHEL/7/input/checks/package_iptables_installed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_installed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_iptables_installed"
+  version="1">
+    <metadata>
+      <title>Package iptables Installed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package iptables should be
installed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package iptables is installed"
+      test_ref="test_package_iptables_installed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="all_exist"
+  id="test_package_iptables_installed" version="1"
+  comment="package iptables is installed">
+    <linux:object object_ref="obj_package_iptables_installed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_iptables_installed"
version="1">
+    <linux:name>iptables</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/package_iputils_removed.xml
b/RHEL/7/input/checks/package_iputils_removed.xml
new file mode 100644
index 0000000..6ccd8ee
--- /dev/null
+++ b/RHEL/7/input/checks/package_iputils_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_iputils_removed"
+  version="1">
+    <metadata>
+      <title>Package iputils Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package iputils should be removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package iputils is removed"
+      test_ref="test_package_iputils_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_iputils_removed" version="1"
+  comment="package iputils is removed">
+    <linux:object object_ref="obj_package_iputils_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_iputils_removed"
version="1">
+    <linux:name>iputils</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/package_irqbalance_installed.sh
b/RHEL/7/input/checks/package_irqbalance_installed.sh
new file mode 100644
index 0000000..a58dfb9
--- /dev/null
+++ b/RHEL/7/input/checks/package_irqbalance_installed.sh
@@ -0,0 +1 @@
+yum -y install irqbalance
diff --git a/RHEL/7/input/checks/package_irqbalance_installed.xml
b/RHEL/7/input/checks/package_irqbalance_installed.xml
new file mode 100644
index 0000000..3adb673
--- /dev/null
+++ b/RHEL/7/input/checks/package_irqbalance_installed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_installed.py.  DO NOT EDIT.  -->
+  <definition class="compliance"
id="package_irqbalance_installed"
+  version="1">
+    <metadata>
+      <title>Package irqbalance Installed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package irqbalance should be
installed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package irqbalance is installed"
+      test_ref="test_package_irqbalance_installed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="all_exist"
+  id="test_package_irqbalance_installed" version="1"
+  comment="package irqbalance is installed">
+    <linux:object object_ref="obj_package_irqbalance_installed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_irqbalance_installed"
version="1">
+    <linux:name>irqbalance</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/package_kexec-tools_removed.xml
b/RHEL/7/input/checks/package_kexec-tools_removed.xml
new file mode 100644
index 0000000..dd525f0
--- /dev/null
+++ b/RHEL/7/input/checks/package_kexec-tools_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_kexec-tools_removed"
+  version="1">
+    <metadata>
+      <title>Package kexec-tools Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package kexec-tools should be
removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package kexec-tools is removed"
+      test_ref="test_package_kexec-tools_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_kexec-tools_removed" version="1"
+  comment="package kexec-tools is removed">
+    <linux:object object_ref="obj_package_kexec-tools_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_kexec-tools_removed"
version="1">
+    <linux:name>kexec-tools</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/package_libcgroup_removed.xml
b/RHEL/7/input/checks/package_libcgroup_removed.xml
new file mode 100644
index 0000000..3045d95
--- /dev/null
+++ b/RHEL/7/input/checks/package_libcgroup_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_libcgroup_removed"
+  version="1">
+    <metadata>
+      <title>Package libcgroup Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package libcgroup should be
removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package libcgroup is removed"
+      test_ref="test_package_libcgroup_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_libcgroup_removed" version="1"
+  comment="package libcgroup is removed">
+    <linux:object object_ref="obj_package_libcgroup_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_libcgroup_removed"
version="1">
+    <linux:name>libcgroup</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/package_mdadm_removed.xml
b/RHEL/7/input/checks/package_mdadm_removed.xml
new file mode 100644
index 0000000..ab4c4d5
--- /dev/null
+++ b/RHEL/7/input/checks/package_mdadm_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_mdadm_removed"
+  version="1">
+    <metadata>
+      <title>Package mdadm Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package mdadm should be removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package mdadm is removed"
+      test_ref="test_package_mdadm_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_mdadm_removed" version="1"
+  comment="package mdadm is removed">
+    <linux:object object_ref="obj_package_mdadm_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_mdadm_removed"
version="1">
+    <linux:name>mdadm</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/package_net-snmp_removed.xml
b/RHEL/7/input/checks/package_net-snmp_removed.xml
new file mode 100644
index 0000000..33bc183
--- /dev/null
+++ b/RHEL/7/input/checks/package_net-snmp_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_net-snmp_removed"
+  version="1">
+    <metadata>
+      <title>Package net-snmp Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package net-snmp should be removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package net-snmp is removed"
+      test_ref="test_package_net-snmp_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_net-snmp_removed" version="1"
+  comment="package net-snmp is removed">
+    <linux:object object_ref="obj_package_net-snmp_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_net-snmp_removed"
version="1">
+    <linux:name>net-snmp</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/package_nfs-utils_removed.xml
b/RHEL/7/input/checks/package_nfs-utils_removed.xml
new file mode 100644
index 0000000..339861e
--- /dev/null
+++ b/RHEL/7/input/checks/package_nfs-utils_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_nfs-utils_removed"
+  version="1">
+    <metadata>
+      <title>Package nfs-utils Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package nfs-utils should be
removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package nfs-utils is removed"
+      test_ref="test_package_nfs-utils_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_nfs-utils_removed" version="1"
+  comment="package nfs-utils is removed">
+    <linux:object object_ref="obj_package_nfs-utils_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_nfs-utils_removed"
version="1">
+    <linux:name>nfs-utils</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/package_ntp_installed.sh
b/RHEL/7/input/checks/package_ntp_installed.sh
new file mode 100644
index 0000000..13c0e4f
--- /dev/null
+++ b/RHEL/7/input/checks/package_ntp_installed.sh
@@ -0,0 +1 @@
+yum -y install ntp
diff --git a/RHEL/7/input/checks/package_ntp_installed.xml
b/RHEL/7/input/checks/package_ntp_installed.xml
new file mode 100644
index 0000000..2495849
--- /dev/null
+++ b/RHEL/7/input/checks/package_ntp_installed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_installed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_ntp_installed"
+  version="1">
+    <metadata>
+      <title>Package ntp Installed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package ntp should be installed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package ntp is installed"
+      test_ref="test_package_ntp_installed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="all_exist"
+  id="test_package_ntp_installed" version="1"
+  comment="package ntp is installed">
+    <linux:object object_ref="obj_package_ntp_installed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_ntp_installed"
version="1">
+    <linux:name>ntp</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/package_oddjob_removed.xml
b/RHEL/7/input/checks/package_oddjob_removed.xml
new file mode 100644
index 0000000..17906f0
--- /dev/null
+++ b/RHEL/7/input/checks/package_oddjob_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_oddjob_removed"
+  version="1">
+    <metadata>
+      <title>Package oddjob Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package oddjob should be removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package oddjob is removed"
+      test_ref="test_package_oddjob_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_oddjob_removed" version="1"
+  comment="package oddjob is removed">
+    <linux:object object_ref="obj_package_oddjob_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_oddjob_removed"
version="1">
+    <linux:name>oddjob</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/package_openldap-servers_removed.xml
b/RHEL/7/input/checks/package_openldap-servers_removed.xml
new file mode 100644
index 0000000..ea0cd38
--- /dev/null
+++ b/RHEL/7/input/checks/package_openldap-servers_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance"
id="package_openldap-servers_removed"
+  version="1">
+    <metadata>
+      <title>Package openldap-servers Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package openldap-servers should be
removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package openldap-servers is removed"
+      test_ref="test_package_openldap-servers_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_openldap-servers_removed" version="1"
+  comment="package openldap-servers is removed">
+    <linux:object object_ref="obj_package_openldap-servers_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_openldap-servers_removed"
version="1">
+    <linux:name>openldap-servers</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/package_pam_ldap_removed.xml
b/RHEL/7/input/checks/package_pam_ldap_removed.xml
new file mode 100644
index 0000000..beec780
--- /dev/null
+++ b/RHEL/7/input/checks/package_pam_ldap_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_pam_ldap_removed"
+  version="1">
+    <metadata>
+      <title>Package pam_ldap Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package pam_ldap should be removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package pam_ldap is removed"
+      test_ref="test_package_pam_ldap_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_pam_ldap_removed" version="1"
+  comment="package pam_ldap is removed">
+    <linux:object object_ref="obj_package_pam_ldap_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_pam_ldap_removed"
version="1">
+    <linux:name>pam_ldap</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/package_policycoreutils_installed.sh
b/RHEL/7/input/checks/package_policycoreutils_installed.sh
new file mode 100644
index 0000000..88df025
--- /dev/null
+++ b/RHEL/7/input/checks/package_policycoreutils_installed.sh
@@ -0,0 +1 @@
+yum -y install policycoreutils
diff --git a/RHEL/7/input/checks/package_policycoreutils_installed.xml
b/RHEL/7/input/checks/package_policycoreutils_installed.xml
new file mode 100644
index 0000000..53add6a
--- /dev/null
+++ b/RHEL/7/input/checks/package_policycoreutils_installed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_installed.py.  DO NOT EDIT.  -->
+  <definition class="compliance"
id="package_policycoreutils_installed"
+  version="1">
+    <metadata>
+      <title>Package policycoreutils Installed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package policycoreutils should be
installed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package policycoreutils is installed"
+      test_ref="test_package_policycoreutils_installed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="all_exist"
+  id="test_package_policycoreutils_installed" version="1"
+  comment="package policycoreutils is installed">
+    <linux:object object_ref="obj_package_policycoreutils_installed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_policycoreutils_installed"
version="1">
+    <linux:name>policycoreutils</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/package_portreserve_removed.xml
b/RHEL/7/input/checks/package_portreserve_removed.xml
new file mode 100644
index 0000000..7811c41
--- /dev/null
+++ b/RHEL/7/input/checks/package_portreserve_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_portreserve_removed"
+  version="1">
+    <metadata>
+      <title>Package portreserve Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package portreserve should be
removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package portreserve is removed"
+      test_ref="test_package_portreserve_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_portreserve_removed" version="1"
+  comment="package portreserve is removed">
+    <linux:object object_ref="obj_package_portreserve_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_portreserve_removed"
version="1">
+    <linux:name>portreserve</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/package_postfix_installed.sh
b/RHEL/7/input/checks/package_postfix_installed.sh
new file mode 100644
index 0000000..a845fba
--- /dev/null
+++ b/RHEL/7/input/checks/package_postfix_installed.sh
@@ -0,0 +1 @@
+yum -y install postfix
diff --git a/RHEL/7/input/checks/package_postfix_installed.xml
b/RHEL/7/input/checks/package_postfix_installed.xml
new file mode 100644
index 0000000..64c8709
--- /dev/null
+++ b/RHEL/7/input/checks/package_postfix_installed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_installed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_postfix_installed"
+  version="1">
+    <metadata>
+      <title>Package postfix Installed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package postfix should be
installed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package postfix is installed"
+      test_ref="test_package_postfix_installed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="all_exist"
+  id="test_package_postfix_installed" version="1"
+  comment="package postfix is installed">
+    <linux:object object_ref="obj_package_postfix_installed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_postfix_installed"
version="1">
+    <linux:name>postfix</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/package_psacct_installed.sh
b/RHEL/7/input/checks/package_psacct_installed.sh
new file mode 100644
index 0000000..1e24902
--- /dev/null
+++ b/RHEL/7/input/checks/package_psacct_installed.sh
@@ -0,0 +1 @@
+yum -y install psacct
diff --git a/RHEL/7/input/checks/package_psacct_installed.xml
b/RHEL/7/input/checks/package_psacct_installed.xml
new file mode 100644
index 0000000..0d839ca
--- /dev/null
+++ b/RHEL/7/input/checks/package_psacct_installed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_installed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_psacct_installed"
+  version="1">
+    <metadata>
+      <title>Package psacct Installed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package psacct should be installed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package psacct is installed"
+      test_ref="test_package_psacct_installed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="all_exist"
+  id="test_package_psacct_installed" version="1"
+  comment="package psacct is installed">
+    <linux:object object_ref="obj_package_psacct_installed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_psacct_installed"
version="1">
+    <linux:name>psacct</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/package_qpid-cpp-server_removed.xml
b/RHEL/7/input/checks/package_qpid-cpp-server_removed.xml
new file mode 100644
index 0000000..ce7bf39
--- /dev/null
+++ b/RHEL/7/input/checks/package_qpid-cpp-server_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance"
id="package_qpid-cpp-server_removed"
+  version="1">
+    <metadata>
+      <title>Package qpid-cpp-server Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package qpid-cpp-server should be
removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package qpid-cpp-server is removed"
+      test_ref="test_package_qpid-cpp-server_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_qpid-cpp-server_removed" version="1"
+  comment="package qpid-cpp-server is removed">
+    <linux:object object_ref="obj_package_qpid-cpp-server_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_qpid-cpp-server_removed"
version="1">
+    <linux:name>qpid-cpp-server</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/package_quota_removed.xml
b/RHEL/7/input/checks/package_quota_removed.xml
new file mode 100644
index 0000000..fdc7573
--- /dev/null
+++ b/RHEL/7/input/checks/package_quota_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_quota_removed"
+  version="1">
+    <metadata>
+      <title>Package quota Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package quota should be removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package quota is removed"
+      test_ref="test_package_quota_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_quota_removed" version="1"
+  comment="package quota is removed">
+    <linux:object object_ref="obj_package_quota_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_quota_removed"
version="1">
+    <linux:name>quota</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/package_rhnsd_removed.xml
b/RHEL/7/input/checks/package_rhnsd_removed.xml
new file mode 100644
index 0000000..5cecc36
--- /dev/null
+++ b/RHEL/7/input/checks/package_rhnsd_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_rhnsd_removed"
+  version="1">
+    <metadata>
+      <title>Package rhnsd Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package rhnsd should be removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package rhnsd is removed"
+      test_ref="test_package_rhnsd_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_rhnsd_removed" version="1"
+  comment="package rhnsd is removed">
+    <linux:object object_ref="obj_package_rhnsd_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_rhnsd_removed"
version="1">
+    <linux:name>rhnsd</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/package_rsh-server_removed.xml
b/RHEL/7/input/checks/package_rsh-server_removed.xml
new file mode 100644
index 0000000..989201c
--- /dev/null
+++ b/RHEL/7/input/checks/package_rsh-server_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_rsh-server_removed"
+  version="1">
+    <metadata>
+      <title>Package rsh-server Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package rsh-server should be
removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package rsh-server is removed"
+      test_ref="test_package_rsh-server_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_rsh-server_removed" version="1"
+  comment="package rsh-server is removed">
+    <linux:object object_ref="obj_package_rsh-server_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_rsh-server_removed"
version="1">
+    <linux:name>rsh-server</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/package_rsyslog_installed.sh
b/RHEL/7/input/checks/package_rsyslog_installed.sh
new file mode 100644
index 0000000..5a28e09
--- /dev/null
+++ b/RHEL/7/input/checks/package_rsyslog_installed.sh
@@ -0,0 +1 @@
+yum -y install rsyslog
diff --git a/RHEL/7/input/checks/package_rsyslog_installed.xml
b/RHEL/7/input/checks/package_rsyslog_installed.xml
new file mode 100644
index 0000000..7e5ca6e
--- /dev/null
+++ b/RHEL/7/input/checks/package_rsyslog_installed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_installed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_rsyslog_installed"
+  version="1">
+    <metadata>
+      <title>Package rsyslog Installed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package rsyslog should be
installed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package rsyslog is installed"
+      test_ref="test_package_rsyslog_installed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="all_exist"
+  id="test_package_rsyslog_installed" version="1"
+  comment="package rsyslog is installed">
+    <linux:object object_ref="obj_package_rsyslog_installed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_rsyslog_installed"
version="1">
+    <linux:name>rsyslog</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/package_samba-common_removed.xml
b/RHEL/7/input/checks/package_samba-common_removed.xml
new file mode 100644
index 0000000..b59b5bb
--- /dev/null
+++ b/RHEL/7/input/checks/package_samba-common_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance"
id="package_samba-common_removed"
+  version="1">
+    <metadata>
+      <title>Package samba-common Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package samba-common should be
removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package samba-common is removed"
+      test_ref="test_package_samba-common_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_samba-common_removed" version="1"
+  comment="package samba-common is removed">
+    <linux:object object_ref="obj_package_samba-common_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_samba-common_removed"
version="1">
+    <linux:name>samba-common</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/package_screen_installed.sh
b/RHEL/7/input/checks/package_screen_installed.sh
new file mode 100644
index 0000000..cc566bf
--- /dev/null
+++ b/RHEL/7/input/checks/package_screen_installed.sh
@@ -0,0 +1 @@
+yum -y install screen
diff --git a/RHEL/7/input/checks/package_screen_installed.xml
b/RHEL/7/input/checks/package_screen_installed.xml
new file mode 100644
index 0000000..facf40b
--- /dev/null
+++ b/RHEL/7/input/checks/package_screen_installed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_installed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_screen_installed"
+  version="1">
+    <metadata>
+      <title>Package screen Installed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package screen should be installed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package screen is installed"
+      test_ref="test_package_screen_installed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="all_exist"
+  id="test_package_screen_installed" version="1"
+  comment="package screen is installed">
+    <linux:object object_ref="obj_package_screen_installed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_screen_installed"
version="1">
+    <linux:name>screen</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/package_sendmail_removed.xml
b/RHEL/7/input/checks/package_sendmail_removed.xml
new file mode 100644
index 0000000..4fd7333
--- /dev/null
+++ b/RHEL/7/input/checks/package_sendmail_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_sendmail_removed"
+  version="1">
+    <metadata>
+      <title>Package sendmail Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package sendmail should be removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package sendmail is removed"
+      test_ref="test_package_sendmail_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_sendmail_removed" version="1"
+  comment="package sendmail is removed">
+    <linux:object object_ref="obj_package_sendmail_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_sendmail_removed"
version="1">
+    <linux:name>sendmail</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/package_smartmontools_removed.xml
b/RHEL/7/input/checks/package_smartmontools_removed.xml
new file mode 100644
index 0000000..8dc867f
--- /dev/null
+++ b/RHEL/7/input/checks/package_smartmontools_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance"
id="package_smartmontools_removed"
+  version="1">
+    <metadata>
+      <title>Package smartmontools Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package smartmontools should be
removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package smartmontools is removed"
+      test_ref="test_package_smartmontools_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_smartmontools_removed" version="1"
+  comment="package smartmontools is removed">
+    <linux:object object_ref="obj_package_smartmontools_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_smartmontools_removed"
version="1">
+    <linux:name>smartmontools</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/package_squid_removed.xml
b/RHEL/7/input/checks/package_squid_removed.xml
new file mode 100644
index 0000000..ab5d62a
--- /dev/null
+++ b/RHEL/7/input/checks/package_squid_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_squid_removed"
+  version="1">
+    <metadata>
+      <title>Package squid Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package squid should be removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package squid is removed"
+      test_ref="test_package_squid_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_squid_removed" version="1"
+  comment="package squid is removed">
+    <linux:object object_ref="obj_package_squid_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_squid_removed"
version="1">
+    <linux:name>squid</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/package_subscription-manager_removed.xml
b/RHEL/7/input/checks/package_subscription-manager_removed.xml
new file mode 100644
index 0000000..1098014
--- /dev/null
+++ b/RHEL/7/input/checks/package_subscription-manager_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance"
id="package_subscription-manager_removed"
+  version="1">
+    <metadata>
+      <title>Package subscription-manager Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package subscription-manager should be
removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package subscription-manager is removed"
+      test_ref="test_package_subscription-manager_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_subscription-manager_removed" version="1"
+  comment="package subscription-manager is removed">
+    <linux:object object_ref="obj_package_subscription-manager_removed"
/>
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_subscription-manager_removed"
version="1">
+    <linux:name>subscription-manager</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/package_sysstat_removed.xml
b/RHEL/7/input/checks/package_sysstat_removed.xml
new file mode 100644
index 0000000..2ab6f03
--- /dev/null
+++ b/RHEL/7/input/checks/package_sysstat_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_sysstat_removed"
+  version="1">
+    <metadata>
+      <title>Package sysstat Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package sysstat should be removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package sysstat is removed"
+      test_ref="test_package_sysstat_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_sysstat_removed" version="1"
+  comment="package sysstat is removed">
+    <linux:object object_ref="obj_package_sysstat_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_sysstat_removed"
version="1">
+    <linux:name>sysstat</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/package_talk-server_removed.xml
b/RHEL/7/input/checks/package_talk-server_removed.xml
new file mode 100644
index 0000000..aa51025
--- /dev/null
+++ b/RHEL/7/input/checks/package_talk-server_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_talk-server_removed"
+  version="1">
+    <metadata>
+      <title>Package talk-server Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package talk-server should be
removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package talk-server is removed"
+      test_ref="test_package_talk-server_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_talk-server_removed" version="1"
+  comment="package talk-server is removed">
+    <linux:object object_ref="obj_package_talk-server_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_talk-server_removed"
version="1">
+    <linux:name>talk-server</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/package_telnet-server_removed.xml
b/RHEL/7/input/checks/package_telnet-server_removed.xml
new file mode 100644
index 0000000..4d24b0c
--- /dev/null
+++ b/RHEL/7/input/checks/package_telnet-server_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance"
id="package_telnet-server_removed"
+  version="1">
+    <metadata>
+      <title>Package telnet-server Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package telnet-server should be
removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package telnet-server is removed"
+      test_ref="test_package_telnet-server_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_telnet-server_removed" version="1"
+  comment="package telnet-server is removed">
+    <linux:object object_ref="obj_package_telnet-server_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_telnet-server_removed"
version="1">
+    <linux:name>telnet-server</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/package_tftp-server_removed.xml
b/RHEL/7/input/checks/package_tftp-server_removed.xml
new file mode 100644
index 0000000..7937f0c
--- /dev/null
+++ b/RHEL/7/input/checks/package_tftp-server_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_tftp-server_removed"
+  version="1">
+    <metadata>
+      <title>Package tftp-server Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package tftp-server should be
removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package tftp-server is removed"
+      test_ref="test_package_tftp-server_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_tftp-server_removed" version="1"
+  comment="package tftp-server is removed">
+    <linux:object object_ref="obj_package_tftp-server_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_tftp-server_removed"
version="1">
+    <linux:name>tftp-server</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/package_vsftpd_installed.sh
b/RHEL/7/input/checks/package_vsftpd_installed.sh
new file mode 100644
index 0000000..5d56d77
--- /dev/null
+++ b/RHEL/7/input/checks/package_vsftpd_installed.sh
@@ -0,0 +1 @@
+yum -y install vsftpd
diff --git a/RHEL/7/input/checks/package_vsftpd_installed.xml
b/RHEL/7/input/checks/package_vsftpd_installed.xml
new file mode 100644
index 0000000..e4153a1
--- /dev/null
+++ b/RHEL/7/input/checks/package_vsftpd_installed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_installed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_vsftpd_installed"
+  version="1">
+    <metadata>
+      <title>Package vsftpd Installed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package vsftpd should be installed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package vsftpd is installed"
+      test_ref="test_package_vsftpd_installed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="all_exist"
+  id="test_package_vsftpd_installed" version="1"
+  comment="package vsftpd is installed">
+    <linux:object object_ref="obj_package_vsftpd_installed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_vsftpd_installed"
version="1">
+    <linux:name>vsftpd</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/package_vsftpd_removed.xml
b/RHEL/7/input/checks/package_vsftpd_removed.xml
new file mode 100644
index 0000000..7dca7cb
--- /dev/null
+++ b/RHEL/7/input/checks/package_vsftpd_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_vsftpd_removed"
+  version="1">
+    <metadata>
+      <title>Package vsftpd Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package vsftpd should be removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package vsftpd is removed"
+      test_ref="test_package_vsftpd_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_vsftpd_removed" version="1"
+  comment="package vsftpd is removed">
+    <linux:object object_ref="obj_package_vsftpd_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_vsftpd_removed"
version="1">
+    <linux:name>vsftpd</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/package_xinetd_removed.xml
b/RHEL/7/input/checks/package_xinetd_removed.xml
new file mode 100644
index 0000000..b82c238
--- /dev/null
+++ b/RHEL/7/input/checks/package_xinetd_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_xinetd_removed"
+  version="1">
+    <metadata>
+      <title>Package xinetd Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package xinetd should be removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package xinetd is removed"
+      test_ref="test_package_xinetd_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_xinetd_removed" version="1"
+  comment="package xinetd is removed">
+    <linux:object object_ref="obj_package_xinetd_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_xinetd_removed"
version="1">
+    <linux:name>xinetd</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/package_xorg-x11-server-common_removed.xml
b/RHEL/7/input/checks/package_xorg-x11-server-common_removed.xml
new file mode 100644
index 0000000..308beab
--- /dev/null
+++ b/RHEL/7/input/checks/package_xorg-x11-server-common_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance"
id="package_xorg-x11-server-common_removed"
+  version="1">
+    <metadata>
+      <title>Package xorg-x11-server-common Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package xorg-x11-server-common should be
removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package xorg-x11-server-common is removed"
+      test_ref="test_package_xorg-x11-server-common_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_xorg-x11-server-common_removed" version="1"
+  comment="package xorg-x11-server-common is removed">
+    <linux:object object_ref="obj_package_xorg-x11-server-common_removed"
/>
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_xorg-x11-server-common_removed"
version="1">
+    <linux:name>xorg-x11-server-common</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/package_ypbind_removed.xml
b/RHEL/7/input/checks/package_ypbind_removed.xml
new file mode 100644
index 0000000..7370068
--- /dev/null
+++ b/RHEL/7/input/checks/package_ypbind_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_ypbind_removed"
+  version="1">
+    <metadata>
+      <title>Package ypbind Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package ypbind should be removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package ypbind is removed"
+      test_ref="test_package_ypbind_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_ypbind_removed" version="1"
+  comment="package ypbind is removed">
+    <linux:object object_ref="obj_package_ypbind_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_ypbind_removed"
version="1">
+    <linux:name>ypbind</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/package_ypserv_removed.xml
b/RHEL/7/input/checks/package_ypserv_removed.xml
new file mode 100644
index 0000000..62125fd
--- /dev/null
+++ b/RHEL/7/input/checks/package_ypserv_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_ypserv_removed"
+  version="1">
+    <metadata>
+      <title>Package ypserv Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package ypserv should be removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package ypserv is removed"
+      test_ref="test_package_ypserv_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_ypserv_removed" version="1"
+  comment="package ypserv is removed">
+    <linux:object object_ref="obj_package_ypserv_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_ypserv_removed"
version="1">
+    <linux:name>ypserv</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/service_abrtd_disabled.xml
b/RHEL/7/input/checks/service_abrtd_disabled.xml
new file mode 100644
index 0000000..76bcb87
--- /dev/null
+++ b/RHEL/7/input/checks/service_abrtd_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_abrtd_disabled"
+  version="1">
+    <metadata>
+      <title>Service abrtd Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The abrtd service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package abrt removed or service abrtd is not configured to
start" operator="OR">
+      <extend_definition comment="abrt removed"
definition_ref="package_abrt_removed" />
+      <criterion comment="service abrtd is not configured to start"
test_ref="test_target_abrtd" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="abrtd should not be in any target" id="test_target_abrtd"
version="1">
+    <unix:object object_ref="object_abrtd_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for abrtd in all targets"
+  id="object_abrtd_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/abrtd\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/service_acpid_disabled.xml
b/RHEL/7/input/checks/service_acpid_disabled.xml
new file mode 100644
index 0000000..4ca0bde
--- /dev/null
+++ b/RHEL/7/input/checks/service_acpid_disabled.xml
@@ -0,0 +1,32 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_acpid_disabled"
+  version="1">
+    <metadata>
+      <title>Service acpid Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The acpid service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="service acpid is not configured to start"
operator="AND">
+      <criterion comment="service acpid is not configured to start"
test_ref="test_target_acpid" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="acpid should not be in any target" id="test_target_acpid"
version="1">
+    <unix:object object_ref="object_acpid_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for acpid in all targets"
+  id="object_acpid_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/acpid\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/service_atd_disabled.xml
b/RHEL/7/input/checks/service_atd_disabled.xml
new file mode 100644
index 0000000..ade4c42
--- /dev/null
+++ b/RHEL/7/input/checks/service_atd_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_atd_disabled"
+  version="1">
+    <metadata>
+      <title>Service atd Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The atd service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package at removed or service atd is not configured to
start" operator="OR">
+      <extend_definition comment="at removed"
definition_ref="package_at_removed" />
+      <criterion comment="service atd is not configured to start"
test_ref="test_target_atd" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="atd should not be in any target" id="test_target_atd"
version="1">
+    <unix:object object_ref="object_atd_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for atd in all targets"
+  id="object_atd_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/atd\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/service_auditd_enabled.xml
b/RHEL/7/input/checks/service_auditd_enabled.xml
new file mode 100644
index 0000000..ff89e16
--- /dev/null
+++ b/RHEL/7/input/checks/service_auditd_enabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_enabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_auditd_enabled"
+  version="1">
+    <metadata>
+      <title>Service auditd Enabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The auditd service should be enabled if
possible.</description>
+    </metadata>
+    <criteria comment="package audit installed and service auditd is configured
to start" operator="AND">
+      <extend_definition comment="audit installed"
definition_ref="package_audit_installed" />
+      <criterion comment="service auditd is configured to start"
test_ref="test_target_auditd" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="any_exist"
+  comment="auditd should be in at least one target"
id="test_target_auditd" version="1">
+    <unix:object object_ref="object_auditd_enabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for auditd in all targets"
+  id="object_auditd_enabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/auditd\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/service_autofs_disabled.xml
b/RHEL/7/input/checks/service_autofs_disabled.xml
new file mode 100644
index 0000000..1e81683
--- /dev/null
+++ b/RHEL/7/input/checks/service_autofs_disabled.xml
@@ -0,0 +1,32 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_autofs_disabled"
+  version="1">
+    <metadata>
+      <title>Service autofs Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The autofs service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="service autofs is not configured to start"
operator="AND">
+      <criterion comment="service autofs is not configured to start"
test_ref="test_target_autofs" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="autofs should not be in any target"
id="test_target_autofs" version="1">
+    <unix:object object_ref="object_autofs_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for autofs in all targets"
+  id="object_autofs_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/autofs\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/service_avahi-daemon_disabled.xml
b/RHEL/7/input/checks/service_avahi-daemon_disabled.xml
new file mode 100644
index 0000000..7dca241
--- /dev/null
+++ b/RHEL/7/input/checks/service_avahi-daemon_disabled.xml
@@ -0,0 +1,32 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance"
id="service_avahi-daemon_disabled"
+  version="1">
+    <metadata>
+      <title>Service avahi-daemon Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The avahi-daemon service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="service avahi-daemon is not configured to start"
operator="AND">
+      <criterion comment="service avahi-daemon is not configured to start"
test_ref="test_target_avahi-daemon" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="avahi-daemon should not be in any target"
id="test_target_avahi-daemon" version="1">
+    <unix:object object_ref="object_avahi-daemon_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for avahi-daemon in all targets"
+  id="object_avahi-daemon_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/avahi-daemon\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/service_bluetooth_disabled.xml
b/RHEL/7/input/checks/service_bluetooth_disabled.xml
new file mode 100644
index 0000000..a0a8a66
--- /dev/null
+++ b/RHEL/7/input/checks/service_bluetooth_disabled.xml
@@ -0,0 +1,32 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_bluetooth_disabled"
+  version="1">
+    <metadata>
+      <title>Service bluetooth Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The bluetooth service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="service bluetooth is not configured to start"
operator="AND">
+      <criterion comment="service bluetooth is not configured to start"
test_ref="test_target_bluetooth" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="bluetooth should not be in any target"
id="test_target_bluetooth" version="1">
+    <unix:object object_ref="object_bluetooth_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for bluetooth in all targets"
+  id="object_bluetooth_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/bluetooth\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/service_certmonger_disabled.xml
b/RHEL/7/input/checks/service_certmonger_disabled.xml
new file mode 100644
index 0000000..5f32756
--- /dev/null
+++ b/RHEL/7/input/checks/service_certmonger_disabled.xml
@@ -0,0 +1,32 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_certmonger_disabled"
+  version="1">
+    <metadata>
+      <title>Service certmonger Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The certmonger service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="service certmonger is not configured to start"
operator="AND">
+      <criterion comment="service certmonger is not configured to start"
test_ref="test_target_certmonger" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="certmonger should not be in any target"
id="test_target_certmonger" version="1">
+    <unix:object object_ref="object_certmonger_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for certmonger in all targets"
+  id="object_certmonger_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/certmonger\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/service_cgconfig_disabled.xml
b/RHEL/7/input/checks/service_cgconfig_disabled.xml
new file mode 100644
index 0000000..2fca98b
--- /dev/null
+++ b/RHEL/7/input/checks/service_cgconfig_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_cgconfig_disabled"
+  version="1">
+    <metadata>
+      <title>Service cgconfig Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The cgconfig service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package libcgroup removed or service cgconfig is not
configured to start" operator="OR">
+      <extend_definition comment="libcgroup removed"
definition_ref="package_libcgroup_removed" />
+      <criterion comment="service cgconfig is not configured to start"
test_ref="test_target_cgconfig" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="cgconfig should not be in any target"
id="test_target_cgconfig" version="1">
+    <unix:object object_ref="object_cgconfig_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for cgconfig in all targets"
+  id="object_cgconfig_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/cgconfig\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/service_crond_enabled.xml
b/RHEL/7/input/checks/service_crond_enabled.xml
new file mode 100644
index 0000000..412f81a
--- /dev/null
+++ b/RHEL/7/input/checks/service_crond_enabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_enabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_crond_enabled"
+  version="1">
+    <metadata>
+      <title>Service crond Enabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The crond service should be enabled if
possible.</description>
+    </metadata>
+    <criteria comment="package cronie installed and service crond is configured
to start" operator="AND">
+      <extend_definition comment="cronie installed"
definition_ref="package_cronie_installed" />
+      <criterion comment="service crond is configured to start"
test_ref="test_target_crond" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="any_exist"
+  comment="crond should be in at least one target"
id="test_target_crond" version="1">
+    <unix:object object_ref="object_crond_enabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for crond in all targets"
+  id="object_crond_enabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/crond\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/service_cups_disabled.xml
b/RHEL/7/input/checks/service_cups_disabled.xml
new file mode 100644
index 0000000..cf4d3a5
--- /dev/null
+++ b/RHEL/7/input/checks/service_cups_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_cups_disabled"
+  version="1">
+    <metadata>
+      <title>Service cups Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The cups service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package cups removed or service cups is not configured to
start" operator="OR">
+      <extend_definition comment="cups removed"
definition_ref="package_cups_removed" />
+      <criterion comment="service cups is not configured to start"
test_ref="test_target_cups" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="cups should not be in any target" id="test_target_cups"
version="1">
+    <unix:object object_ref="object_cups_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for cups in all targets"
+  id="object_cups_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/cups\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/service_dhcpd_disabled.xml
b/RHEL/7/input/checks/service_dhcpd_disabled.xml
new file mode 100644
index 0000000..c86d7e0
--- /dev/null
+++ b/RHEL/7/input/checks/service_dhcpd_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_dhcpd_disabled"
+  version="1">
+    <metadata>
+      <title>Service dhcpd Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The dhcpd service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package dhcp removed or service dhcpd is not configured to
start" operator="OR">
+      <extend_definition comment="dhcp removed"
definition_ref="package_dhcp_removed" />
+      <criterion comment="service dhcpd is not configured to start"
test_ref="test_target_dhcpd" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="dhcpd should not be in any target" id="test_target_dhcpd"
version="1">
+    <unix:object object_ref="object_dhcpd_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for dhcpd in all targets"
+  id="object_dhcpd_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/dhcpd\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/service_dovecot_disabled.xml
b/RHEL/7/input/checks/service_dovecot_disabled.xml
new file mode 100644
index 0000000..dec4893
--- /dev/null
+++ b/RHEL/7/input/checks/service_dovecot_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_dovecot_disabled"
+  version="1">
+    <metadata>
+      <title>Service dovecot Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The dovecot service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package dovecot removed or service dovecot is not
configured to start" operator="OR">
+      <extend_definition comment="dovecot removed"
definition_ref="package_dovecot_removed" />
+      <criterion comment="service dovecot is not configured to start"
test_ref="test_target_dovecot" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="dovecot should not be in any target"
id="test_target_dovecot" version="1">
+    <unix:object object_ref="object_dovecot_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for dovecot in all targets"
+  id="object_dovecot_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/dovecot\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/service_httpd_disabled.xml
b/RHEL/7/input/checks/service_httpd_disabled.xml
new file mode 100644
index 0000000..9b690ea
--- /dev/null
+++ b/RHEL/7/input/checks/service_httpd_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_httpd_disabled"
+  version="1">
+    <metadata>
+      <title>Service httpd Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The httpd service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package httpd removed or service httpd is not configured
to start" operator="OR">
+      <extend_definition comment="httpd removed"
definition_ref="package_httpd_removed" />
+      <criterion comment="service httpd is not configured to start"
test_ref="test_target_httpd" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="httpd should not be in any target" id="test_target_httpd"
version="1">
+    <unix:object object_ref="object_httpd_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for httpd in all targets"
+  id="object_httpd_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/httpd\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/service_ip6tables_enabled.xml
b/RHEL/7/input/checks/service_ip6tables_enabled.xml
new file mode 100644
index 0000000..6172268
--- /dev/null
+++ b/RHEL/7/input/checks/service_ip6tables_enabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_enabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_ip6tables_enabled"
+  version="1">
+    <metadata>
+      <title>Service ip6tables Enabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The ip6tables service should be enabled if
possible.</description>
+    </metadata>
+    <criteria comment="package iptables-ipv6 installed and service ip6tables is
configured to start" operator="AND">
+      <extend_definition comment="iptables-ipv6 installed"
definition_ref="package_iptables-ipv6_installed" />
+      <criterion comment="service ip6tables is configured to start"
test_ref="test_target_ip6tables" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="any_exist"
+  comment="ip6tables should be in at least one target"
id="test_target_ip6tables" version="1">
+    <unix:object object_ref="object_ip6tables_enabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for ip6tables in all targets"
+  id="object_ip6tables_enabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/ip6tables\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/service_iptables_enabled.xml
b/RHEL/7/input/checks/service_iptables_enabled.xml
new file mode 100644
index 0000000..7258f52
--- /dev/null
+++ b/RHEL/7/input/checks/service_iptables_enabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_enabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_iptables_enabled"
+  version="1">
+    <metadata>
+      <title>Service iptables Enabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The iptables service should be enabled if
possible.</description>
+    </metadata>
+    <criteria comment="package iptables installed and service iptables is
configured to start" operator="AND">
+      <extend_definition comment="iptables installed"
definition_ref="package_iptables_installed" />
+      <criterion comment="service iptables is configured to start"
test_ref="test_target_iptables" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="any_exist"
+  comment="iptables should be in at least one target"
id="test_target_iptables" version="1">
+    <unix:object object_ref="object_iptables_enabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for iptables in all targets"
+  id="object_iptables_enabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/iptables\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/service_irqbalance_enabled.xml
b/RHEL/7/input/checks/service_irqbalance_enabled.xml
new file mode 100644
index 0000000..9185c72
--- /dev/null
+++ b/RHEL/7/input/checks/service_irqbalance_enabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_enabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_irqbalance_enabled"
+  version="1">
+    <metadata>
+      <title>Service irqbalance Enabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The irqbalance service should be enabled if
possible.</description>
+    </metadata>
+    <criteria comment="package irqbalance installed and service irqbalance is
configured to start" operator="AND">
+      <extend_definition comment="irqbalance installed"
definition_ref="package_irqbalance_installed" />
+      <criterion comment="service irqbalance is configured to start"
test_ref="test_target_irqbalance" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="any_exist"
+  comment="irqbalance should be in at least one target"
id="test_target_irqbalance" version="1">
+    <unix:object object_ref="object_irqbalance_enabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for irqbalance in all targets"
+  id="object_irqbalance_enabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/irqbalance\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/service_kdump_disabled.xml
b/RHEL/7/input/checks/service_kdump_disabled.xml
new file mode 100644
index 0000000..0ab104f
--- /dev/null
+++ b/RHEL/7/input/checks/service_kdump_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_kdump_disabled"
+  version="1">
+    <metadata>
+      <title>Service kdump Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The kdump service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package kexec-tools removed or service kdump is not
configured to start" operator="OR">
+      <extend_definition comment="kexec-tools removed"
definition_ref="package_kexec-tools_removed" />
+      <criterion comment="service kdump is not configured to start"
test_ref="test_target_kdump" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="kdump should not be in any target" id="test_target_kdump"
version="1">
+    <unix:object object_ref="object_kdump_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for kdump in all targets"
+  id="object_kdump_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/kdump\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/service_mdmonitor_disabled.xml
b/RHEL/7/input/checks/service_mdmonitor_disabled.xml
new file mode 100644
index 0000000..8bcc432
--- /dev/null
+++ b/RHEL/7/input/checks/service_mdmonitor_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_mdmonitor_disabled"
+  version="1">
+    <metadata>
+      <title>Service mdmonitor Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The mdmonitor service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package mdadm removed or service mdmonitor is not
configured to start" operator="OR">
+      <extend_definition comment="mdadm removed"
definition_ref="package_mdadm_removed" />
+      <criterion comment="service mdmonitor is not configured to start"
test_ref="test_target_mdmonitor" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="mdmonitor should not be in any target"
id="test_target_mdmonitor" version="1">
+    <unix:object object_ref="object_mdmonitor_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for mdmonitor in all targets"
+  id="object_mdmonitor_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/mdmonitor\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/service_named_disabled.xml
b/RHEL/7/input/checks/service_named_disabled.xml
new file mode 100644
index 0000000..2e8ed8c
--- /dev/null
+++ b/RHEL/7/input/checks/service_named_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_named_disabled"
+  version="1">
+    <metadata>
+      <title>Service named Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The named service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package bind removed or service named is not configured to
start" operator="OR">
+      <extend_definition comment="bind removed"
definition_ref="package_bind_removed" />
+      <criterion comment="service named is not configured to start"
test_ref="test_target_named" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="named should not be in any target" id="test_target_named"
version="1">
+    <unix:object object_ref="object_named_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for named in all targets"
+  id="object_named_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/named\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/service_nfs-lock_disabled.xml
b/RHEL/7/input/checks/service_nfs-lock_disabled.xml
new file mode 100644
index 0000000..b654b9c
--- /dev/null
+++ b/RHEL/7/input/checks/service_nfs-lock_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_nfs-lock_disabled"
+  version="1">
+    <metadata>
+      <title>Service nfs-lock Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The nfs-lock service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package nfs-utils removed or service nfs-lock is not
configured to start" operator="OR">
+      <extend_definition comment="nfs-utils removed"
definition_ref="package_nfs-utils_removed" />
+      <criterion comment="service nfs-lock is not configured to start"
test_ref="test_target_nfs-lock" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="nfs-lock should not be in any target"
id="test_target_nfs-lock" version="1">
+    <unix:object object_ref="object_nfs-lock_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for nfs-lock in all targets"
+  id="object_nfs-lock_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/nfs-lock\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/service_nfs-server_disabled.xml
b/RHEL/7/input/checks/service_nfs-server_disabled.xml
new file mode 100644
index 0000000..9ca4bc6
--- /dev/null
+++ b/RHEL/7/input/checks/service_nfs-server_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_nfs-server_disabled"
+  version="1">
+    <metadata>
+      <title>Service nfs-server Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The nfs-server service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package nfs-utils removed or service nfs-server is not
configured to start" operator="OR">
+      <extend_definition comment="nfs-utils removed"
definition_ref="package_nfs-utils_removed" />
+      <criterion comment="service nfs-server is not configured to start"
test_ref="test_target_nfs-server" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="nfs-server should not be in any target"
id="test_target_nfs-server" version="1">
+    <unix:object object_ref="object_nfs-server_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for nfs-server in all targets"
+  id="object_nfs-server_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/nfs-server\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/service_ntpd_enabled.xml
b/RHEL/7/input/checks/service_ntpd_enabled.xml
new file mode 100644
index 0000000..e5e9262
--- /dev/null
+++ b/RHEL/7/input/checks/service_ntpd_enabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_enabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_ntpd_enabled"
+  version="1">
+    <metadata>
+      <title>Service ntpd Enabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The ntpd service should be enabled if
possible.</description>
+    </metadata>
+    <criteria comment="package ntp installed and service ntpd is configured to
start" operator="AND">
+      <extend_definition comment="ntp installed"
definition_ref="package_ntp_installed" />
+      <criterion comment="service ntpd is configured to start"
test_ref="test_target_ntpd" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="any_exist"
+  comment="ntpd should be in at least one target"
id="test_target_ntpd" version="1">
+    <unix:object object_ref="object_ntpd_enabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for ntpd in all targets"
+  id="object_ntpd_enabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/ntpd\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/service_oddjobd_disabled.xml
b/RHEL/7/input/checks/service_oddjobd_disabled.xml
new file mode 100644
index 0000000..ae94a75
--- /dev/null
+++ b/RHEL/7/input/checks/service_oddjobd_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_oddjobd_disabled"
+  version="1">
+    <metadata>
+      <title>Service oddjobd Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The oddjobd service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package oddjob removed or service oddjobd is not
configured to start" operator="OR">
+      <extend_definition comment="oddjob removed"
definition_ref="package_oddjob_removed" />
+      <criterion comment="service oddjobd is not configured to start"
test_ref="test_target_oddjobd" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="oddjobd should not be in any target"
id="test_target_oddjobd" version="1">
+    <unix:object object_ref="object_oddjobd_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for oddjobd in all targets"
+  id="object_oddjobd_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/oddjobd\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/service_portreserve_disabled.xml
b/RHEL/7/input/checks/service_portreserve_disabled.xml
new file mode 100644
index 0000000..6c00b43
--- /dev/null
+++ b/RHEL/7/input/checks/service_portreserve_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance"
id="service_portreserve_disabled"
+  version="1">
+    <metadata>
+      <title>Service portreserve Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The portreserve service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package portreserve removed or service portreserve is not
configured to start" operator="OR">
+      <extend_definition comment="portreserve removed"
definition_ref="package_portreserve_removed" />
+      <criterion comment="service portreserve is not configured to start"
test_ref="test_target_portreserve" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="portreserve should not be in any target"
id="test_target_portreserve" version="1">
+    <unix:object object_ref="object_portreserve_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for portreserve in all targets"
+  id="object_portreserve_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/portreserve\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/service_postfix_enabled.xml
b/RHEL/7/input/checks/service_postfix_enabled.xml
new file mode 100644
index 0000000..4a70fc0
--- /dev/null
+++ b/RHEL/7/input/checks/service_postfix_enabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_enabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_postfix_enabled"
+  version="1">
+    <metadata>
+      <title>Service postfix Enabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The postfix service should be enabled if
possible.</description>
+    </metadata>
+    <criteria comment="package postfix installed and service postfix is
configured to start" operator="AND">
+      <extend_definition comment="postfix installed"
definition_ref="package_postfix_installed" />
+      <criterion comment="service postfix is configured to start"
test_ref="test_target_postfix" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="any_exist"
+  comment="postfix should be in at least one target"
id="test_target_postfix" version="1">
+    <unix:object object_ref="object_postfix_enabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for postfix in all targets"
+  id="object_postfix_enabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/postfix\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/service_psacct_enabled.xml
b/RHEL/7/input/checks/service_psacct_enabled.xml
new file mode 100644
index 0000000..fb81e63
--- /dev/null
+++ b/RHEL/7/input/checks/service_psacct_enabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_enabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_psacct_enabled"
+  version="1">
+    <metadata>
+      <title>Service psacct Enabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The psacct service should be enabled if
possible.</description>
+    </metadata>
+    <criteria comment="package psacct installed and service psacct is configured
to start" operator="AND">
+      <extend_definition comment="psacct installed"
definition_ref="package_psacct_installed" />
+      <criterion comment="service psacct is configured to start"
test_ref="test_target_psacct" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="any_exist"
+  comment="psacct should be in at least one target"
id="test_target_psacct" version="1">
+    <unix:object object_ref="object_psacct_enabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for psacct in all targets"
+  id="object_psacct_enabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/psacct\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/service_qpidd_disabled.xml
b/RHEL/7/input/checks/service_qpidd_disabled.xml
new file mode 100644
index 0000000..58c344e
--- /dev/null
+++ b/RHEL/7/input/checks/service_qpidd_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_qpidd_disabled"
+  version="1">
+    <metadata>
+      <title>Service qpidd Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The qpidd service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package qpid-cpp-server removed or service qpidd is not
configured to start" operator="OR">
+      <extend_definition comment="qpid-cpp-server removed"
definition_ref="package_qpid-cpp-server_removed" />
+      <criterion comment="service qpidd is not configured to start"
test_ref="test_target_qpidd" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="qpidd should not be in any target" id="test_target_qpidd"
version="1">
+    <unix:object object_ref="object_qpidd_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for qpidd in all targets"
+  id="object_qpidd_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/qpidd\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/service_quotaon_disabled.xml
b/RHEL/7/input/checks/service_quotaon_disabled.xml
new file mode 100644
index 0000000..5db9a9b
--- /dev/null
+++ b/RHEL/7/input/checks/service_quotaon_disabled.xml
@@ -0,0 +1,32 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_quotaon_disabled"
+  version="1">
+    <metadata>
+      <title>Service quotaon Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The quotaon service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="service quotaon is not configured to start"
operator="AND">
+      <criterion comment="service quotaon is not configured to start"
test_ref="test_target_quotaon" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="quotaon should not be in any target"
id="test_target_quotaon" version="1">
+    <unix:object object_ref="object_quotaon_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for quotaon in all targets"
+  id="object_quotaon_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/quotaon\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/service_rdisc_disabled.xml
b/RHEL/7/input/checks/service_rdisc_disabled.xml
new file mode 100644
index 0000000..2ad4119
--- /dev/null
+++ b/RHEL/7/input/checks/service_rdisc_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_rdisc_disabled"
+  version="1">
+    <metadata>
+      <title>Service rdisc Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The rdisc service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package iputils removed or service rdisc is not configured
to start" operator="OR">
+      <extend_definition comment="iputils removed"
definition_ref="package_iputils_removed" />
+      <criterion comment="service rdisc is not configured to start"
test_ref="test_target_rdisc" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="rdisc should not be in any target" id="test_target_rdisc"
version="1">
+    <unix:object object_ref="object_rdisc_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for rdisc in all targets"
+  id="object_rdisc_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/rdisc\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/service_rhnsd_disabled.xml
b/RHEL/7/input/checks/service_rhnsd_disabled.xml
new file mode 100644
index 0000000..969b6bb
--- /dev/null
+++ b/RHEL/7/input/checks/service_rhnsd_disabled.xml
@@ -0,0 +1,99 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_sysv_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_rhnsd_disabled"
+  version="1">
+    <metadata>
+      <title>Service rhnsd Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The rhnsd service should be disabled if
possible.</description>
+    </metadata>
+   <criteria comment="package rhnsd removed or service rhnsd is not configured to
start" operator="OR">
+    <extend_definition comment="rhnsd removed"
definition_ref="package_rhnsd_removed" />
+    <criteria operator="AND" comment="service rhnsd is not configured
to start">
+      <criterion comment="rhnsd runlevel 0"
test_ref="test_runlevel0_rhnsd" />
+      <criterion comment="rhnsd runlevel 1"
test_ref="test_runlevel1_rhnsd" />
+      <criterion comment="rhnsd runlevel 2"
test_ref="test_runlevel2_rhnsd" />
+      <criterion comment="rhnsd runlevel 3"
test_ref="test_runlevel3_rhnsd" />
+      <criterion comment="rhnsd runlevel 4"
test_ref="test_runlevel4_rhnsd" />
+      <criterion comment="rhnsd runlevel 5"
test_ref="test_runlevel5_rhnsd" />
+      <criterion comment="rhnsd runlevel 6"
test_ref="test_runlevel6_rhnsd" />
+    </criteria>
+    </criteria>
+  </definition>
+  <unix:runlevel_test check="all" check_existence="any_exist"
+  comment="Runlevel test" id="test_runlevel0_rhnsd"
+  version="2">
+    <unix:object object_ref="obj_runlevel0_rhnsd" />
+    <unix:state state_ref="state_service_rhnsd_off" />
+  </unix:runlevel_test>
+  <unix:runlevel_test check="all" check_existence="any_exist"
+  comment="Runlevel test" id="test_runlevel1_rhnsd"
+  version="2">
+    <unix:object object_ref="obj_runlevel1_rhnsd" />
+    <unix:state state_ref="state_service_rhnsd_off" />
+  </unix:runlevel_test>
+  <unix:runlevel_test check="all" check_existence="any_exist"
+  comment="Runlevel test" id="test_runlevel2_rhnsd"
+  version="2">
+    <unix:object object_ref="obj_runlevel2_rhnsd" />
+    <unix:state state_ref="state_service_rhnsd_off" />
+  </unix:runlevel_test>
+  <unix:runlevel_test check="all" check_existence="any_exist"
+  comment="Runlevel test" id="test_runlevel3_rhnsd"
+  version="2">
+    <unix:object object_ref="obj_runlevel3_rhnsd" />
+    <unix:state state_ref="state_service_rhnsd_off" />
+  </unix:runlevel_test>
+  <unix:runlevel_test check="all" check_existence="any_exist"
+  comment="Runlevel test" id="test_runlevel4_rhnsd"
+  version="2">
+    <unix:object object_ref="obj_runlevel4_rhnsd" />
+    <unix:state state_ref="state_service_rhnsd_off" />
+  </unix:runlevel_test>
+  <unix:runlevel_test check="all" check_existence="any_exist"
+  comment="Runlevel test" id="test_runlevel5_rhnsd"
+  version="2">
+    <unix:object object_ref="obj_runlevel5_rhnsd" />
+    <unix:state state_ref="state_service_rhnsd_off" />
+  </unix:runlevel_test>
+  <unix:runlevel_test check="all" check_existence="any_exist"
+  comment="Runlevel test" id="test_runlevel6_rhnsd"
+  version="2">
+    <unix:object object_ref="obj_runlevel6_rhnsd" />
+    <unix:state state_ref="state_service_rhnsd_off" />
+  </unix:runlevel_test>
+  <unix:runlevel_object id="obj_runlevel0_rhnsd" version="1">
+    <unix:service_name>rhnsd</unix:service_name>
+    <unix:runlevel operation="equals">0</unix:runlevel>
+  </unix:runlevel_object>
+  <unix:runlevel_object id="obj_runlevel1_rhnsd" version="1">
+    <unix:service_name>rhnsd</unix:service_name>
+    <unix:runlevel operation="equals">1</unix:runlevel>
+  </unix:runlevel_object>
+  <unix:runlevel_object id="obj_runlevel2_rhnsd" version="1">
+    <unix:service_name>rhnsd</unix:service_name>
+    <unix:runlevel operation="equals">2</unix:runlevel>
+  </unix:runlevel_object>
+  <unix:runlevel_object id="obj_runlevel3_rhnsd" version="1">
+    <unix:service_name>rhnsd</unix:service_name>
+    <unix:runlevel operation="equals">3</unix:runlevel>
+  </unix:runlevel_object>
+  <unix:runlevel_object id="obj_runlevel4_rhnsd" version="1">
+    <unix:service_name>rhnsd</unix:service_name>
+    <unix:runlevel operation="equals">4</unix:runlevel>
+  </unix:runlevel_object>
+  <unix:runlevel_object id="obj_runlevel5_rhnsd" version="1">
+    <unix:service_name>rhnsd</unix:service_name>
+    <unix:runlevel operation="equals">5</unix:runlevel>
+  </unix:runlevel_object>
+  <unix:runlevel_object id="obj_runlevel6_rhnsd" version="1">
+    <unix:service_name>rhnsd</unix:service_name>
+    <unix:runlevel operation="equals">6</unix:runlevel>
+  </unix:runlevel_object>
+  <unix:runlevel_state comment="not configured to start"
id="state_service_rhnsd_off" version="1">
+    <unix:start datatype="boolean">false</unix:start>
+    <unix:kill datatype="boolean">true</unix:kill>
+  </unix:runlevel_state>
+</def-group>
diff --git a/RHEL/7/input/checks/service_rhsmcertd_disabled.xml
b/RHEL/7/input/checks/service_rhsmcertd_disabled.xml
new file mode 100644
index 0000000..1b5011c
--- /dev/null
+++ b/RHEL/7/input/checks/service_rhsmcertd_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_rhsmcertd_disabled"
+  version="1">
+    <metadata>
+      <title>Service rhsmcertd Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The rhsmcertd service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package subscription-manager removed or service rhsmcertd
is not configured to start" operator="OR">
+      <extend_definition comment="subscription-manager removed"
definition_ref="package_subscription-manager_removed" />
+      <criterion comment="service rhsmcertd is not configured to start"
test_ref="test_target_rhsmcertd" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="rhsmcertd should not be in any target"
id="test_target_rhsmcertd" version="1">
+    <unix:object object_ref="object_rhsmcertd_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for rhsmcertd in all targets"
+  id="object_rhsmcertd_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/rhsmcertd\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/service_rpcgssd_disabled.xml
b/RHEL/7/input/checks/service_rpcgssd_disabled.xml
new file mode 100644
index 0000000..f1fc3aa
--- /dev/null
+++ b/RHEL/7/input/checks/service_rpcgssd_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_rpcgssd_disabled"
+  version="1">
+    <metadata>
+      <title>Service rpcgssd Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The rpcgssd service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package nfs-utils removed or service rpcgssd is not
configured to start" operator="OR">
+      <extend_definition comment="nfs-utils removed"
definition_ref="package_nfs-utils_removed" />
+      <criterion comment="service rpcgssd is not configured to start"
test_ref="test_target_rpcgssd" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="rpcgssd should not be in any target"
id="test_target_rpcgssd" version="1">
+    <unix:object object_ref="object_rpcgssd_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for rpcgssd in all targets"
+  id="object_rpcgssd_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/rpcgssd\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/service_rpcidmapd_disabled.xml
b/RHEL/7/input/checks/service_rpcidmapd_disabled.xml
new file mode 100644
index 0000000..799adb3
--- /dev/null
+++ b/RHEL/7/input/checks/service_rpcidmapd_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_rpcidmapd_disabled"
+  version="1">
+    <metadata>
+      <title>Service rpcidmapd Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The rpcidmapd service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package nfs-utils removed or service rpcidmapd is not
configured to start" operator="OR">
+      <extend_definition comment="nfs-utils removed"
definition_ref="package_nfs-utils_removed" />
+      <criterion comment="service rpcidmapd is not configured to start"
test_ref="test_target_rpcidmapd" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="rpcidmapd should not be in any target"
id="test_target_rpcidmapd" version="1">
+    <unix:object object_ref="object_rpcidmapd_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for rpcidmapd in all targets"
+  id="object_rpcidmapd_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/rpcidmapd\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/service_rpcsvcgssd_disabled.xml
b/RHEL/7/input/checks/service_rpcsvcgssd_disabled.xml
new file mode 100644
index 0000000..073e78f
--- /dev/null
+++ b/RHEL/7/input/checks/service_rpcsvcgssd_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_rpcsvcgssd_disabled"
+  version="1">
+    <metadata>
+      <title>Service rpcsvcgssd Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The rpcsvcgssd service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package nfs-utils removed or service rpcsvcgssd is not
configured to start" operator="OR">
+      <extend_definition comment="nfs-utils removed"
definition_ref="package_nfs-utils_removed" />
+      <criterion comment="service rpcsvcgssd is not configured to start"
test_ref="test_target_rpcsvcgssd" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="rpcsvcgssd should not be in any target"
id="test_target_rpcsvcgssd" version="1">
+    <unix:object object_ref="object_rpcsvcgssd_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for rpcsvcgssd in all targets"
+  id="object_rpcsvcgssd_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/rpcsvcgssd\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/service_rsyslog_enabled.xml
b/RHEL/7/input/checks/service_rsyslog_enabled.xml
new file mode 100644
index 0000000..9b29e3a
--- /dev/null
+++ b/RHEL/7/input/checks/service_rsyslog_enabled.xml
@@ -0,0 +1,32 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_enabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_rsyslog_enabled"
+  version="1">
+    <metadata>
+      <title>Service rsyslog Enabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The rsyslog service should be enabled if
possible.</description>
+    </metadata>
+    <criteria comment="service rsyslog is configured to start"
operator="AND">
+      <criterion comment="service rsyslog is configured to start"
test_ref="test_target_rsyslog" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="any_exist"
+  comment="rsyslog should be in at least one target"
id="test_target_rsyslog" version="1">
+    <unix:object object_ref="object_rsyslog_enabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for rsyslog in all targets"
+  id="object_rsyslog_enabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/rsyslog\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/service_saslauthd_disabled.xml
b/RHEL/7/input/checks/service_saslauthd_disabled.xml
new file mode 100644
index 0000000..e1571a7
--- /dev/null
+++ b/RHEL/7/input/checks/service_saslauthd_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_saslauthd_disabled"
+  version="1">
+    <metadata>
+      <title>Service saslauthd Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The saslauthd service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package cyrus-sasl removed or service saslauthd is not
configured to start" operator="OR">
+      <extend_definition comment="cyrus-sasl removed"
definition_ref="package_cyrus-sasl_removed" />
+      <criterion comment="service saslauthd is not configured to start"
test_ref="test_target_saslauthd" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="saslauthd should not be in any target"
id="test_target_saslauthd" version="1">
+    <unix:object object_ref="object_saslauthd_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for saslauthd in all targets"
+  id="object_saslauthd_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/saslauthd\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/service_smartd_disabled.xml
b/RHEL/7/input/checks/service_smartd_disabled.xml
new file mode 100644
index 0000000..f413711
--- /dev/null
+++ b/RHEL/7/input/checks/service_smartd_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_smartd_disabled"
+  version="1">
+    <metadata>
+      <title>Service smartd Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The smartd service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package smartmontools removed or service smartd is not
configured to start" operator="OR">
+      <extend_definition comment="smartmontools removed"
definition_ref="package_smartmontools_removed" />
+      <criterion comment="service smartd is not configured to start"
test_ref="test_target_smartd" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="smartd should not be in any target"
id="test_target_smartd" version="1">
+    <unix:object object_ref="object_smartd_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for smartd in all targets"
+  id="object_smartd_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/smartd\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/service_smb_disabled.xml
b/RHEL/7/input/checks/service_smb_disabled.xml
new file mode 100644
index 0000000..65a48c0
--- /dev/null
+++ b/RHEL/7/input/checks/service_smb_disabled.xml
@@ -0,0 +1,32 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_smb_disabled"
+  version="1">
+    <metadata>
+      <title>Service smb Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The smb service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="service smb is not configured to start"
operator="AND">
+      <criterion comment="service smb is not configured to start"
test_ref="test_target_smb" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="smb should not be in any target" id="test_target_smb"
version="1">
+    <unix:object object_ref="object_smb_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for smb in all targets"
+  id="object_smb_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/smb\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/service_snmpd_disabled.xml
b/RHEL/7/input/checks/service_snmpd_disabled.xml
new file mode 100644
index 0000000..d8837a3
--- /dev/null
+++ b/RHEL/7/input/checks/service_snmpd_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_snmpd_disabled"
+  version="1">
+    <metadata>
+      <title>Service snmpd Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The snmpd service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package net-snmp removed or service snmpd is not
configured to start" operator="OR">
+      <extend_definition comment="net-snmp removed"
definition_ref="package_net-snmp_removed" />
+      <criterion comment="service snmpd is not configured to start"
test_ref="test_target_snmpd" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="snmpd should not be in any target" id="test_target_snmpd"
version="1">
+    <unix:object object_ref="object_snmpd_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for snmpd in all targets"
+  id="object_snmpd_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/snmpd\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/service_squid_disabled.xml
b/RHEL/7/input/checks/service_squid_disabled.xml
new file mode 100644
index 0000000..33b3c77
--- /dev/null
+++ b/RHEL/7/input/checks/service_squid_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_squid_disabled"
+  version="1">
+    <metadata>
+      <title>Service squid Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The squid service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package squid removed or service squid is not configured
to start" operator="OR">
+      <extend_definition comment="squid removed"
definition_ref="package_squid_removed" />
+      <criterion comment="service squid is not configured to start"
test_ref="test_target_squid" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="squid should not be in any target" id="test_target_squid"
version="1">
+    <unix:object object_ref="object_squid_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for squid in all targets"
+  id="object_squid_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/squid\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/service_sshd_disabled.xml
b/RHEL/7/input/checks/service_sshd_disabled.xml
index 031d8ea..b5190e1 100644
--- a/RHEL/7/input/checks/service_sshd_disabled.xml
+++ b/RHEL/7/input/checks/service_sshd_disabled.xml
@@ -1,31 +1,28 @@
 <def-group>
-  <definition class="compliance" id="service_sshd_disabled"
version="1">
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_sshd_disabled"
+  version="1">
     <metadata>
       <title>Service sshd Disabled</title>
       <affected family="unix">
         <platform>Red Hat Enterprise Linux 7</platform>
       </affected>
-      <description>
-        The sshd service should be disabled.
-      </description>
+      <description>The sshd service should be disabled if
possible.</description>
     </metadata>
     <criteria comment="package openssh-server removed or service sshd is not
configured to start" operator="OR">
-    <extend_definition comment="openssh-server removed"
definition_ref="package_openssh-server_removed" />
-      <criterion comment="sshd disabled in multi-user.target"
test_ref="test_sshd_disabled_multi_user_target" />
+      <extend_definition comment="openssh-server removed"
definition_ref="package_openssh-server_removed" />
+      <criterion comment="service sshd is not configured to start"
test_ref="test_target_sshd" />
     </criteria>
   </definition>
 
   <unix:file_test check="all" check_existence="none_exist"
-   comment="look for sshd.service in
/etc/systemd/system/multi-user.target.wants"
-   id="test_sshd_disabled_multi_user_target" version="1">
-
-    <unix:object object_ref="object_sshd_disabled_multi_user_target" />
+  comment="sshd should not be in any target" id="test_target_sshd"
version="1">
+    <unix:object object_ref="object_sshd_disabled" />
   </unix:file_test>
 
-  <unix:file_object comment="look for sshd.service in
/etc/systemd/system/multi-user.target.wants"
-   id="object_sshd_disabled_multi_user_target" version="1">
-
-   
<unix:filepath>/etc/systemd/system/multi-user.target.wants/sshd.service</unix:filepath>
+  <unix:file_object comment="Look for sshd in all targets"
+  id="object_sshd_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/sshd\.service</unix:filepath>
     <filter action="include">state_symlink</filter>
   </unix:file_object>
 
diff --git a/RHEL/7/input/checks/service_sysstat_disabled.xml
b/RHEL/7/input/checks/service_sysstat_disabled.xml
new file mode 100644
index 0000000..07493cd
--- /dev/null
+++ b/RHEL/7/input/checks/service_sysstat_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_sysstat_disabled"
+  version="1">
+    <metadata>
+      <title>Service sysstat Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The sysstat service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package sysstat removed or service sysstat is not
configured to start" operator="OR">
+      <extend_definition comment="sysstat removed"
definition_ref="package_sysstat_removed" />
+      <criterion comment="service sysstat is not configured to start"
test_ref="test_target_sysstat" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="sysstat should not be in any target"
id="test_target_sysstat" version="1">
+    <unix:object object_ref="object_sysstat_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for sysstat in all targets"
+  id="object_sysstat_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/sysstat\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/service_tftp_disabled.xml
b/RHEL/7/input/checks/service_tftp_disabled.xml
new file mode 100644
index 0000000..008443f
--- /dev/null
+++ b/RHEL/7/input/checks/service_tftp_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_tftp_disabled"
+  version="1">
+    <metadata>
+      <title>Service tftp Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The tftp service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package tftp-server removed or service tftp is not
configured to start" operator="OR">
+      <extend_definition comment="tftp-server removed"
definition_ref="package_tftp-server_removed" />
+      <criterion comment="service tftp is not configured to start"
test_ref="test_target_tftp" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="tftp should not be in any target" id="test_target_tftp"
version="1">
+    <unix:object object_ref="object_tftp_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for tftp in all targets"
+  id="object_tftp_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/tftp\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/service_vsftpd_disabled.xml
b/RHEL/7/input/checks/service_vsftpd_disabled.xml
new file mode 100644
index 0000000..58b8ddb
--- /dev/null
+++ b/RHEL/7/input/checks/service_vsftpd_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_vsftpd_disabled"
+  version="1">
+    <metadata>
+      <title>Service vsftpd Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The vsftpd service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package vsftpd removed or service vsftpd is not configured
to start" operator="OR">
+      <extend_definition comment="vsftpd removed"
definition_ref="package_vsftpd_removed" />
+      <criterion comment="service vsftpd is not configured to start"
test_ref="test_target_vsftpd" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="vsftpd should not be in any target"
id="test_target_vsftpd" version="1">
+    <unix:object object_ref="object_vsftpd_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for vsftpd in all targets"
+  id="object_vsftpd_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/vsftpd\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/service_xinetd_disabled.xml
b/RHEL/7/input/checks/service_xinetd_disabled.xml
new file mode 100644
index 0000000..c65bbd7
--- /dev/null
+++ b/RHEL/7/input/checks/service_xinetd_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_xinetd_disabled"
+  version="1">
+    <metadata>
+      <title>Service xinetd Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The xinetd service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package xinetd removed or service xinetd is not configured
to start" operator="OR">
+      <extend_definition comment="xinetd removed"
definition_ref="package_xinetd_removed" />
+      <criterion comment="service xinetd is not configured to start"
test_ref="test_target_xinetd" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="xinetd should not be in any target"
id="test_target_xinetd" version="1">
+    <unix:object object_ref="object_xinetd_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for xinetd in all targets"
+  id="object_xinetd_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/xinetd\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/service_ypbind_disabled.xml
b/RHEL/7/input/checks/service_ypbind_disabled.xml
new file mode 100644
index 0000000..5799cb5
--- /dev/null
+++ b/RHEL/7/input/checks/service_ypbind_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_ypbind_disabled"
+  version="1">
+    <metadata>
+      <title>Service ypbind Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The ypbind service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package ypbind removed or service ypbind is not configured
to start" operator="OR">
+      <extend_definition comment="ypbind removed"
definition_ref="package_ypbind_removed" />
+      <criterion comment="service ypbind is not configured to start"
test_ref="test_target_ypbind" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="ypbind should not be in any target"
id="test_target_ypbind" version="1">
+    <unix:object object_ref="object_ypbind_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for ypbind in all targets"
+  id="object_ypbind_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/ypbind\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/Makefile
b/RHEL/7/input/checks/templates/Makefile
new file mode 100644
index 0000000..17c4735
--- /dev/null
+++ b/RHEL/7/input/checks/templates/Makefile
@@ -0,0 +1,24 @@
+templates: services packages kernel_modules
+
+services:
+	./create_services_sysv_disabled.py services_sysv_disabled.csv
+	./create_services_systemd_disabled.py services_systemd_disabled.csv
+	./create_services_systemd_enabled.py services_systemd_enabled.csv
+
+packages:
+	./create_package_installed.py packages_installed.csv
+	./create_package_removed.py packages_removed.csv
+
+kernel_modules:
+	./create_kernel_modules_disabled.py kernel_modules_disabled.csv
+
+compare:
+	diff output/ ../ | grep -v "Only in ../"
+
+copy:
+	cp output/*.xml ../
+	cp output/*.sh ../../fixes/bash/
+
+clean:
+	rm -f output/*.xml
+	rm -f output/*.sh
diff --git a/RHEL/7/input/checks/templates/create_kernel_modules_disabled.py
b/RHEL/7/input/checks/templates/create_kernel_modules_disabled.py
new file mode 100755
index 0000000..51dc812
--- /dev/null
+++ b/RHEL/7/input/checks/templates/create_kernel_modules_disabled.py
@@ -0,0 +1,40 @@
+#!/usr/bin/python
+
+#
+# create_kernel_modules_disabled.py
+#   automatically generate checks for disabled kernel modules
+#
+# NOTE: The file 'template_kernel_module_disabled' should be located in the
+# same working directory as this script. The template contains the following
+# tags that *must* be replaced successfully in order for the checks to work.
+#
+# KERNMODULE - the name of the kernel module that should be disabled
+#
+
+import sys, csv, re
+
+def output_checkfile(kerninfo):
+    # get the items out of the list
+    kernmod = kerninfo[0]
+    with open("./template_kernel_module_disabled", 'r') as
templatefile:
+        filestring = templatefile.read()
+        filestring = filestring.replace("KERNMODULE", kernmod)
+        with open("./output/kernel_module_" + kernmod +
"_disabled.xml", 'wb+') as outputfile:
+            outputfile.write(filestring)
+            outputfile.close()
+
+def main():
+    if len(sys.argv) < 2:
+        print "Provide a CSV file containing lines of the format: kernmod"
+        sys.exit(1)
+    with open(sys.argv[1], 'r') as f:
+        # put the CSV line's items into a list
+        lines = csv.reader(f)
+        for line in lines:
+            output_checkfile(line)
+
+    sys.exit(0)
+
+if __name__ == "__main__":
+    main()
+
diff --git a/RHEL/7/input/checks/templates/create_package_installed.py
b/RHEL/7/input/checks/templates/create_package_installed.py
new file mode 100755
index 0000000..b32e18c
--- /dev/null
+++ b/RHEL/7/input/checks/templates/create_package_installed.py
@@ -0,0 +1,46 @@
+#!/usr/bin/python
+
+#
+# create_package_installed.py
+#   automatically generate checks for installed packages
+#
+# NOTE: The file 'template_package_installed' should be located in the same
working directory as this script. The
+# template contains the following tags that *must* be replaced successfully in order for
the checks to work.
+#
+# PKGNAME - the name of the package that should be installed
+#
+
+import sys, csv, re
+
+def output_check(package_info):
+    pkgname = package_info[0]
+    if pkgname:
+        with open("./template_OVAL_package_installed", 'r') as
OVALtemplatefile:
+            filestring = OVALtemplatefile.read()
+            filestring = filestring.replace("PKGNAME", pkgname)
+            with open("./output/package_" + pkgname +
"_installed.xml", 'wb+') as OVALoutputfile:
+                OVALoutputfile.write(filestring)
+                OVALoutputfile.close()
+	with open("./template_BASH_package_installed", 'r') as
BASHtemplatefile:
+		filestring = BASHtemplatefile.read()
+		filestring = filestring.replace("PKGNAME", pkgname)
+		with open("./output/package_" + pkgname + "_installed.sh",
'wb+') as BASHoutputfile:
+			BASHoutputfile.write(filestring)
+			BASHoutputfile.close()
+    else:
+        print "ERROR: input violation: the package name must be defined"
+
+def main():
+    if len(sys.argv) < 2:
+        print("usage: %s <CSV_FILE_PATH>" % sys.argv[0])
+        print("   the csv file should contain lines of the format:")
+        print("   PACKAGE_NAME")
+        sys.exit(1)
+    with open(sys.argv[1], 'r') as csv_file:
+        csv_lines = csv.reader(csv_file)
+        for line in csv_lines:
+            output_check(line)
+    sys.exit(0)
+
+if __name__ == "__main__":
+    main()
diff --git a/RHEL/7/input/checks/templates/create_package_removed.py
b/RHEL/7/input/checks/templates/create_package_removed.py
new file mode 100755
index 0000000..f777cc1
--- /dev/null
+++ b/RHEL/7/input/checks/templates/create_package_removed.py
@@ -0,0 +1,39 @@
+#!/usr/bin/python
+
+#
+# create_package_removed.py
+#   automatically generate checks for removed packages
+#
+# NOTE: The file 'template_package_removed' should be located in the same working
directory as this script. The
+# template contains the following tags that *must* be replaced successfully in order for
the checks to work.
+#
+# PKGNAME - the name of the package that should be removed
+#
+
+import sys, csv, re
+
+def output_check(package_info):
+    pkgname = package_info[0]
+    if (pkgname):
+        with open("./template_package_removed", 'r') as templatefile:
+            filestring = templatefile.read()
+            filestring = filestring.replace("PKGNAME", pkgname)
+            with open("./output/package_" + pkgname + "_removed.xml",
'wb+') as outputfile:
+                outputfile.write(filestring)
+                outputfile.close()
+
+def main():
+    if len(sys.argv) < 2:
+        print("usage: %s <CSV_FILE_PATH>" % sys.argv[0])
+        print("   the csv file should contain lines of the format:")
+        print("   PACKAGE_NAME")
+        sys.exit(1)
+
+    with open(sys.argv[1], 'r') as csv_file:
+        csv_lines = csv.reader(csv_file)
+        for line in csv_lines:
+            output_check(line)
+    sys.exit(0)
+
+if __name__ == "__main__":
+    main()
diff --git a/RHEL/7/input/checks/templates/create_services_systemd_disabled.py
b/RHEL/7/input/checks/templates/create_services_systemd_disabled.py
new file mode 100755
index 0000000..3ae0505
--- /dev/null
+++ b/RHEL/7/input/checks/templates/create_services_systemd_disabled.py
@@ -0,0 +1,44 @@
+#!/usr/bin/python
+
+#
+# create_services_systemd_disabled.py
+#   automatically generate checks for disabled services
+#
+# NOTE: The file 'template_service_systemd_disabled' should be located in the
same working directory as this script. The
+# template contains the following tags that *must* be replaced successfully in order for
the checks to work.
+#
+# SERVICENAME - the name of the service that should be disabled
+# PACKAGENAME - the name of the package that installs the service
+#
+
+import sys, csv, re
+
+def output_checkfile(serviceinfo):
+    # get the items out of the list
+    servicename, packagename = serviceinfo
+    with open("./template_service_systemd_disabled", 'r') as
templatefile:
+        filestring = templatefile.read()
+        filestring = filestring.replace("SERVICENAME", servicename)
+        if packagename:
+            filestring = filestring.replace("PACKAGENAME", packagename)
+        else:
+            filestring =
re.sub("\n\s*<criteria.*>\n\s*<extend_definition.*/>", "\n   
<criteria comment=\"service " + servicename + " is not configured to
start\" operator=\"AND\">", filestring)
+        with open("./output/service_" + servicename +
"_disabled.xml", 'wb+') as outputfile:
+            outputfile.write(filestring)
+            outputfile.close()
+
+def main():
+    if len(sys.argv) < 2:
+        print "Provide a CSV file containing lines of the format:
servicename,packagename"
+        sys.exit(1)
+    with open(sys.argv[1], 'r') as f:
+        # put the CSV line's items into a list
+        servicelines = csv.reader(f)
+        for line in servicelines:
+            output_checkfile(line)
+
+    sys.exit(0)
+
+if __name__ == "__main__":
+    main()
+
diff --git a/RHEL/7/input/checks/templates/create_services_systemd_enabled.py
b/RHEL/7/input/checks/templates/create_services_systemd_enabled.py
new file mode 100755
index 0000000..fbd0647
--- /dev/null
+++ b/RHEL/7/input/checks/templates/create_services_systemd_enabled.py
@@ -0,0 +1,44 @@
+#!/usr/bin/python
+
+#
+# create_services_systemd_enabled.py
+#   automatically generate checks for enabled services
+#
+# NOTE: The file 'template_service_systemd_enabled' should be located in the same
working directory as this script. The
+# template contains the following tags that *must* be replaced successfully in order for
the checks to work.
+#
+# SERVICENAME - the name of the service that should be enabled
+# PACKAGENAME - the name of the package that installs the service
+#
+
+import sys, csv, re
+
+def output_checkfile(serviceinfo):
+    # get the items out of the list
+    servicename, packagename = serviceinfo
+    with open("./template_service_systemd_enabled", 'r') as
templatefile:
+        filestring = templatefile.read()
+        filestring = filestring.replace("SERVICENAME", servicename)
+        if packagename:
+            filestring = filestring.replace("PACKAGENAME", packagename)
+        else:
+            filestring =
re.sub("\n\s*<criteria.*>\n\s*<extend_definition.*/>", "\n   
<criteria comment=\"service " + servicename + " is configured to
start\" operator=\"AND\">", filestring)
+        with open("./output/service_" + servicename + "_enabled.xml",
'wb+') as outputfile:
+            outputfile.write(filestring)
+            outputfile.close()
+
+def main():
+    if len(sys.argv) < 2:
+        print "Provide a CSV file containing lines of the format:
servicename,packagename"
+        sys.exit(1)
+    with open(sys.argv[1], 'r') as f:
+        # put the CSV line's items into a list
+        servicelines = csv.reader(f)
+        for line in servicelines:
+            output_checkfile(line)
+
+    sys.exit(0)
+
+if __name__ == "__main__":
+    main()
+
diff --git a/RHEL/7/input/checks/templates/create_services_sysv_disabled.py
b/RHEL/7/input/checks/templates/create_services_sysv_disabled.py
new file mode 100755
index 0000000..5ddbd51
--- /dev/null
+++ b/RHEL/7/input/checks/templates/create_services_sysv_disabled.py
@@ -0,0 +1,45 @@
+#!/usr/bin/python
+
+#
+# create_services_sysv_disabled.py
+#   automatically generate checks for disabled services
+#
+# NOTE: The file 'template_service_sysv_disabled' should be located in the same
working directory as this script. The
+# template contains the following tags that *must* be replaced successfully in order for
the checks to work.
+#
+# SERVICENAME - the name of the service that should be disabled
+# PACKAGENAME - the name of the package that installs the service
+#
+
+import sys, csv, re
+
+def output_checkfile(serviceinfo):
+    # get the items out of the list
+    servicename, packagename = serviceinfo
+    with open("./template_service_sysv_disabled", 'r') as
templatefile:
+        filestring = templatefile.read()
+        filestring = filestring.replace("SERVICENAME", servicename)
+        if packagename:
+            filestring = filestring.replace("PACKAGENAME", packagename)
+        else:
+            filestring =
re.sub("\n\s*<criteria.*>\n\s*<extend_definition.*/>", "",
filestring)
+            filestring = re.sub("\s*</criteria>\n\s*</criteria>",
"\n    </criteria>", filestring)
+        with open("./output/service_" + servicename +
"_disabled.xml", 'wb+') as outputfile:
+            outputfile.write(filestring)
+            outputfile.close()
+
+def main():
+    if len(sys.argv) < 2:
+        print "Provide a CSV file containing lines of the format:
servicename,packagename"
+        sys.exit(1)
+    with open(sys.argv[1], 'r') as f:
+        # put the CSV line's items into a list
+        servicelines = csv.reader(f)
+        for line in servicelines:
+            output_checkfile(line)
+
+    sys.exit(0)
+
+if __name__ == "__main__":
+    main()
+
diff --git a/RHEL/7/input/checks/templates/kernel_modules_disabled.csv
b/RHEL/7/input/checks/templates/kernel_modules_disabled.csv
new file mode 100644
index 0000000..0c2df25
--- /dev/null
+++ b/RHEL/7/input/checks/templates/kernel_modules_disabled.csv
@@ -0,0 +1,8 @@
+cramfs
+dccp
+jffs2
+rds
+sctp
+squashfs
+udf
+usb-storage
diff --git a/RHEL/7/input/checks/templates/output/kernel_module_cramfs_disabled.xml
b/RHEL/7/input/checks/templates/output/kernel_module_cramfs_disabled.xml
new file mode 100644
index 0000000..611bb04
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/kernel_module_cramfs_disabled.xml
@@ -0,0 +1,31 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_kernel_modules_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance"
+  id="kernel_module_cramfs_disabled" version="1">
+    <metadata>
+      <title>Disable cramfs Kernel Module</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The kernel module cramfs should be
disabled.</description>
+      <reference source="swells" ref_id="20130928"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria operator="AND">
+      <criterion test_ref="test_kernmod_cramfs_disabled"
comment="kernel module cramfs disabled in /etc/modprobe.d" />
+    </criteria>
+  </definition>
+
+  <ind:textfilecontent54_test id="test_kernmod_cramfs_disabled"
version="1" check="all"
+  comment="kernel module cramfs disabled">
+    <ind:object object_ref="obj_kernmod_cramfs_disabled" />
+  </ind:textfilecontent54_test>
+
+  <ind:textfilecontent54_object id="obj_kernmod_cramfs_disabled"
+  version="1" comment="kernel module cramfs disabled">
+    <ind:path>/etc/modprobe.d</ind:path>
+    <ind:filename operation="pattern
match">^.*\.conf$</ind:filename>
+    <ind:pattern operation="pattern
match">^\s*install\s+cramfs\s+(/bin/false|/bin/true)$</ind:pattern>
+    <ind:instance datatype="int">1</ind:instance>
+  </ind:textfilecontent54_object>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/kernel_module_dccp_disabled.xml
b/RHEL/7/input/checks/templates/output/kernel_module_dccp_disabled.xml
new file mode 100644
index 0000000..0e7ea02
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/kernel_module_dccp_disabled.xml
@@ -0,0 +1,31 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_kernel_modules_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance"
+  id="kernel_module_dccp_disabled" version="1">
+    <metadata>
+      <title>Disable dccp Kernel Module</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The kernel module dccp should be disabled.</description>
+      <reference source="swells" ref_id="20130928"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria operator="AND">
+      <criterion test_ref="test_kernmod_dccp_disabled" comment="kernel
module dccp disabled in /etc/modprobe.d" />
+    </criteria>
+  </definition>
+
+  <ind:textfilecontent54_test id="test_kernmod_dccp_disabled"
version="1" check="all"
+  comment="kernel module dccp disabled">
+    <ind:object object_ref="obj_kernmod_dccp_disabled" />
+  </ind:textfilecontent54_test>
+
+  <ind:textfilecontent54_object id="obj_kernmod_dccp_disabled"
+  version="1" comment="kernel module dccp disabled">
+    <ind:path>/etc/modprobe.d</ind:path>
+    <ind:filename operation="pattern
match">^.*\.conf$</ind:filename>
+    <ind:pattern operation="pattern
match">^\s*install\s+dccp\s+(/bin/false|/bin/true)$</ind:pattern>
+    <ind:instance datatype="int">1</ind:instance>
+  </ind:textfilecontent54_object>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/kernel_module_jffs2_disabled.xml
b/RHEL/7/input/checks/templates/output/kernel_module_jffs2_disabled.xml
new file mode 100644
index 0000000..346adc5
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/kernel_module_jffs2_disabled.xml
@@ -0,0 +1,31 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_kernel_modules_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance"
+  id="kernel_module_jffs2_disabled" version="1">
+    <metadata>
+      <title>Disable jffs2 Kernel Module</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The kernel module jffs2 should be disabled.</description>
+      <reference source="swells" ref_id="20130928"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria operator="AND">
+      <criterion test_ref="test_kernmod_jffs2_disabled" comment="kernel
module jffs2 disabled in /etc/modprobe.d" />
+    </criteria>
+  </definition>
+
+  <ind:textfilecontent54_test id="test_kernmod_jffs2_disabled"
version="1" check="all"
+  comment="kernel module jffs2 disabled">
+    <ind:object object_ref="obj_kernmod_jffs2_disabled" />
+  </ind:textfilecontent54_test>
+
+  <ind:textfilecontent54_object id="obj_kernmod_jffs2_disabled"
+  version="1" comment="kernel module jffs2 disabled">
+    <ind:path>/etc/modprobe.d</ind:path>
+    <ind:filename operation="pattern
match">^.*\.conf$</ind:filename>
+    <ind:pattern operation="pattern
match">^\s*install\s+jffs2\s+(/bin/false|/bin/true)$</ind:pattern>
+    <ind:instance datatype="int">1</ind:instance>
+  </ind:textfilecontent54_object>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/kernel_module_rds_disabled.xml
b/RHEL/7/input/checks/templates/output/kernel_module_rds_disabled.xml
new file mode 100644
index 0000000..eecf0d7
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/kernel_module_rds_disabled.xml
@@ -0,0 +1,31 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_kernel_modules_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance"
+  id="kernel_module_rds_disabled" version="1">
+    <metadata>
+      <title>Disable rds Kernel Module</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The kernel module rds should be disabled.</description>
+      <reference source="swells" ref_id="20130928"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria operator="AND">
+      <criterion test_ref="test_kernmod_rds_disabled" comment="kernel
module rds disabled in /etc/modprobe.d" />
+    </criteria>
+  </definition>
+
+  <ind:textfilecontent54_test id="test_kernmod_rds_disabled"
version="1" check="all"
+  comment="kernel module rds disabled">
+    <ind:object object_ref="obj_kernmod_rds_disabled" />
+  </ind:textfilecontent54_test>
+
+  <ind:textfilecontent54_object id="obj_kernmod_rds_disabled"
+  version="1" comment="kernel module rds disabled">
+    <ind:path>/etc/modprobe.d</ind:path>
+    <ind:filename operation="pattern
match">^.*\.conf$</ind:filename>
+    <ind:pattern operation="pattern
match">^\s*install\s+rds\s+(/bin/false|/bin/true)$</ind:pattern>
+    <ind:instance datatype="int">1</ind:instance>
+  </ind:textfilecontent54_object>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/kernel_module_sctp_disabled.xml
b/RHEL/7/input/checks/templates/output/kernel_module_sctp_disabled.xml
new file mode 100644
index 0000000..aead401
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/kernel_module_sctp_disabled.xml
@@ -0,0 +1,31 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_kernel_modules_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance"
+  id="kernel_module_sctp_disabled" version="1">
+    <metadata>
+      <title>Disable sctp Kernel Module</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The kernel module sctp should be disabled.</description>
+      <reference source="swells" ref_id="20130928"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria operator="AND">
+      <criterion test_ref="test_kernmod_sctp_disabled" comment="kernel
module sctp disabled in /etc/modprobe.d" />
+    </criteria>
+  </definition>
+
+  <ind:textfilecontent54_test id="test_kernmod_sctp_disabled"
version="1" check="all"
+  comment="kernel module sctp disabled">
+    <ind:object object_ref="obj_kernmod_sctp_disabled" />
+  </ind:textfilecontent54_test>
+
+  <ind:textfilecontent54_object id="obj_kernmod_sctp_disabled"
+  version="1" comment="kernel module sctp disabled">
+    <ind:path>/etc/modprobe.d</ind:path>
+    <ind:filename operation="pattern
match">^.*\.conf$</ind:filename>
+    <ind:pattern operation="pattern
match">^\s*install\s+sctp\s+(/bin/false|/bin/true)$</ind:pattern>
+    <ind:instance datatype="int">1</ind:instance>
+  </ind:textfilecontent54_object>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/kernel_module_squashfs_disabled.xml
b/RHEL/7/input/checks/templates/output/kernel_module_squashfs_disabled.xml
new file mode 100644
index 0000000..32e4fd9
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/kernel_module_squashfs_disabled.xml
@@ -0,0 +1,31 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_kernel_modules_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance"
+  id="kernel_module_squashfs_disabled" version="1">
+    <metadata>
+      <title>Disable squashfs Kernel Module</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The kernel module squashfs should be
disabled.</description>
+      <reference source="swells" ref_id="20130928"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria operator="AND">
+      <criterion test_ref="test_kernmod_squashfs_disabled"
comment="kernel module squashfs disabled in /etc/modprobe.d" />
+    </criteria>
+  </definition>
+
+  <ind:textfilecontent54_test id="test_kernmod_squashfs_disabled"
version="1" check="all"
+  comment="kernel module squashfs disabled">
+    <ind:object object_ref="obj_kernmod_squashfs_disabled" />
+  </ind:textfilecontent54_test>
+
+  <ind:textfilecontent54_object id="obj_kernmod_squashfs_disabled"
+  version="1" comment="kernel module squashfs disabled">
+    <ind:path>/etc/modprobe.d</ind:path>
+    <ind:filename operation="pattern
match">^.*\.conf$</ind:filename>
+    <ind:pattern operation="pattern
match">^\s*install\s+squashfs\s+(/bin/false|/bin/true)$</ind:pattern>
+    <ind:instance datatype="int">1</ind:instance>
+  </ind:textfilecontent54_object>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/kernel_module_udf_disabled.xml
b/RHEL/7/input/checks/templates/output/kernel_module_udf_disabled.xml
new file mode 100644
index 0000000..78f46db
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/kernel_module_udf_disabled.xml
@@ -0,0 +1,31 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_kernel_modules_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance"
+  id="kernel_module_udf_disabled" version="1">
+    <metadata>
+      <title>Disable udf Kernel Module</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The kernel module udf should be disabled.</description>
+      <reference source="swells" ref_id="20130928"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria operator="AND">
+      <criterion test_ref="test_kernmod_udf_disabled" comment="kernel
module udf disabled in /etc/modprobe.d" />
+    </criteria>
+  </definition>
+
+  <ind:textfilecontent54_test id="test_kernmod_udf_disabled"
version="1" check="all"
+  comment="kernel module udf disabled">
+    <ind:object object_ref="obj_kernmod_udf_disabled" />
+  </ind:textfilecontent54_test>
+
+  <ind:textfilecontent54_object id="obj_kernmod_udf_disabled"
+  version="1" comment="kernel module udf disabled">
+    <ind:path>/etc/modprobe.d</ind:path>
+    <ind:filename operation="pattern
match">^.*\.conf$</ind:filename>
+    <ind:pattern operation="pattern
match">^\s*install\s+udf\s+(/bin/false|/bin/true)$</ind:pattern>
+    <ind:instance datatype="int">1</ind:instance>
+  </ind:textfilecontent54_object>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/kernel_module_usb-storage_disabled.xml
b/RHEL/7/input/checks/templates/output/kernel_module_usb-storage_disabled.xml
new file mode 100644
index 0000000..ec0033d
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/kernel_module_usb-storage_disabled.xml
@@ -0,0 +1,31 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_kernel_modules_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance"
+  id="kernel_module_usb-storage_disabled" version="1">
+    <metadata>
+      <title>Disable usb-storage Kernel Module</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The kernel module usb-storage should be
disabled.</description>
+      <reference source="swells" ref_id="20130928"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria operator="AND">
+      <criterion test_ref="test_kernmod_usb-storage_disabled"
comment="kernel module usb-storage disabled in /etc/modprobe.d" />
+    </criteria>
+  </definition>
+
+  <ind:textfilecontent54_test id="test_kernmod_usb-storage_disabled"
version="1" check="all"
+  comment="kernel module usb-storage disabled">
+    <ind:object object_ref="obj_kernmod_usb-storage_disabled" />
+  </ind:textfilecontent54_test>
+
+  <ind:textfilecontent54_object id="obj_kernmod_usb-storage_disabled"
+  version="1" comment="kernel module usb-storage disabled">
+    <ind:path>/etc/modprobe.d</ind:path>
+    <ind:filename operation="pattern
match">^.*\.conf$</ind:filename>
+    <ind:pattern operation="pattern
match">^\s*install\s+usb-storage\s+(/bin/false|/bin/true)$</ind:pattern>
+    <ind:instance datatype="int">1</ind:instance>
+  </ind:textfilecontent54_object>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/package_abrt_removed.xml
b/RHEL/7/input/checks/templates/output/package_abrt_removed.xml
new file mode 100644
index 0000000..8ad561e
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_abrt_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_abrt_removed"
+  version="1">
+    <metadata>
+      <title>Package abrt Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package abrt should be removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package abrt is removed"
+      test_ref="test_package_abrt_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_abrt_removed" version="1"
+  comment="package abrt is removed">
+    <linux:object object_ref="obj_package_abrt_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_abrt_removed"
version="1">
+    <linux:name>abrt</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/package_aide_installed.sh
b/RHEL/7/input/checks/templates/output/package_aide_installed.sh
new file mode 100644
index 0000000..ccca946
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_aide_installed.sh
@@ -0,0 +1 @@
+yum -y install aide
diff --git a/RHEL/7/input/checks/templates/output/package_aide_installed.xml
b/RHEL/7/input/checks/templates/output/package_aide_installed.xml
new file mode 100644
index 0000000..413bb7d
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_aide_installed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_installed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_aide_installed"
+  version="1">
+    <metadata>
+      <title>Package aide Installed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package aide should be installed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package aide is installed"
+      test_ref="test_package_aide_installed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="all_exist"
+  id="test_package_aide_installed" version="1"
+  comment="package aide is installed">
+    <linux:object object_ref="obj_package_aide_installed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_aide_installed"
version="1">
+    <linux:name>aide</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/package_at_removed.xml
b/RHEL/7/input/checks/templates/output/package_at_removed.xml
new file mode 100644
index 0000000..98c357e
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_at_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_at_removed"
+  version="1">
+    <metadata>
+      <title>Package at Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package at should be removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package at is removed"
+      test_ref="test_package_at_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_at_removed" version="1"
+  comment="package at is removed">
+    <linux:object object_ref="obj_package_at_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_at_removed"
version="1">
+    <linux:name>at</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/package_audit_installed.sh
b/RHEL/7/input/checks/templates/output/package_audit_installed.sh
new file mode 100644
index 0000000..2d1f6ad
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_audit_installed.sh
@@ -0,0 +1 @@
+yum -y install audit
diff --git a/RHEL/7/input/checks/templates/output/package_audit_installed.xml
b/RHEL/7/input/checks/templates/output/package_audit_installed.xml
new file mode 100644
index 0000000..9d4248b
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_audit_installed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_installed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_audit_installed"
+  version="1">
+    <metadata>
+      <title>Package audit Installed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package audit should be installed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package audit is installed"
+      test_ref="test_package_audit_installed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="all_exist"
+  id="test_package_audit_installed" version="1"
+  comment="package audit is installed">
+    <linux:object object_ref="obj_package_audit_installed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_audit_installed"
version="1">
+    <linux:name>audit</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/package_bind_removed.xml
b/RHEL/7/input/checks/templates/output/package_bind_removed.xml
new file mode 100644
index 0000000..45d40a4
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_bind_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_bind_removed"
+  version="1">
+    <metadata>
+      <title>Package bind Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package bind should be removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package bind is removed"
+      test_ref="test_package_bind_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_bind_removed" version="1"
+  comment="package bind is removed">
+    <linux:object object_ref="obj_package_bind_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_bind_removed"
version="1">
+    <linux:name>bind</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/package_cpuspeed_removed.xml
b/RHEL/7/input/checks/templates/output/package_cpuspeed_removed.xml
new file mode 100644
index 0000000..d60ba03
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_cpuspeed_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_cpuspeed_removed"
+  version="1">
+    <metadata>
+      <title>Package cpuspeed Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package cpuspeed should be removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package cpuspeed is removed"
+      test_ref="test_package_cpuspeed_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_cpuspeed_removed" version="1"
+  comment="package cpuspeed is removed">
+    <linux:object object_ref="obj_package_cpuspeed_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_cpuspeed_removed"
version="1">
+    <linux:name>cpuspeed</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/package_cronie_installed.sh
b/RHEL/7/input/checks/templates/output/package_cronie_installed.sh
new file mode 100644
index 0000000..43d3df0
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_cronie_installed.sh
@@ -0,0 +1 @@
+yum -y install cronie
diff --git a/RHEL/7/input/checks/templates/output/package_cronie_installed.xml
b/RHEL/7/input/checks/templates/output/package_cronie_installed.xml
new file mode 100644
index 0000000..9cc6b9a
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_cronie_installed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_installed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_cronie_installed"
+  version="1">
+    <metadata>
+      <title>Package cronie Installed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package cronie should be installed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package cronie is installed"
+      test_ref="test_package_cronie_installed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="all_exist"
+  id="test_package_cronie_installed" version="1"
+  comment="package cronie is installed">
+    <linux:object object_ref="obj_package_cronie_installed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_cronie_installed"
version="1">
+    <linux:name>cronie</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/package_cups_removed.xml
b/RHEL/7/input/checks/templates/output/package_cups_removed.xml
new file mode 100644
index 0000000..a04320d
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_cups_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_cups_removed"
+  version="1">
+    <metadata>
+      <title>Package cups Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package cups should be removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package cups is removed"
+      test_ref="test_package_cups_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_cups_removed" version="1"
+  comment="package cups is removed">
+    <linux:object object_ref="obj_package_cups_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_cups_removed"
version="1">
+    <linux:name>cups</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/package_cyrus-sasl_removed.xml
b/RHEL/7/input/checks/templates/output/package_cyrus-sasl_removed.xml
new file mode 100644
index 0000000..1542768
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_cyrus-sasl_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_cyrus-sasl_removed"
+  version="1">
+    <metadata>
+      <title>Package cyrus-sasl Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package cyrus-sasl should be
removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package cyrus-sasl is removed"
+      test_ref="test_package_cyrus-sasl_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_cyrus-sasl_removed" version="1"
+  comment="package cyrus-sasl is removed">
+    <linux:object object_ref="obj_package_cyrus-sasl_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_cyrus-sasl_removed"
version="1">
+    <linux:name>cyrus-sasl</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/package_dbus_removed.xml
b/RHEL/7/input/checks/templates/output/package_dbus_removed.xml
new file mode 100644
index 0000000..5bd27d7
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_dbus_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_dbus_removed"
+  version="1">
+    <metadata>
+      <title>Package dbus Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package dbus should be removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package dbus is removed"
+      test_ref="test_package_dbus_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_dbus_removed" version="1"
+  comment="package dbus is removed">
+    <linux:object object_ref="obj_package_dbus_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_dbus_removed"
version="1">
+    <linux:name>dbus</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/package_dconf_installed.sh
b/RHEL/7/input/checks/templates/output/package_dconf_installed.sh
new file mode 100644
index 0000000..d276612
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_dconf_installed.sh
@@ -0,0 +1 @@
+yum -y install dconf
diff --git a/RHEL/7/input/checks/templates/output/package_dconf_installed.xml
b/RHEL/7/input/checks/templates/output/package_dconf_installed.xml
new file mode 100644
index 0000000..d90c628
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_dconf_installed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_installed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_dconf_installed"
+  version="1">
+    <metadata>
+      <title>Package dconf Installed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package dconf should be installed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package dconf is installed"
+      test_ref="test_package_dconf_installed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="all_exist"
+  id="test_package_dconf_installed" version="1"
+  comment="package dconf is installed">
+    <linux:object object_ref="obj_package_dconf_installed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_dconf_installed"
version="1">
+    <linux:name>dconf</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/package_dhcp_removed.xml
b/RHEL/7/input/checks/templates/output/package_dhcp_removed.xml
new file mode 100644
index 0000000..4c9d73e
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_dhcp_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_dhcp_removed"
+  version="1">
+    <metadata>
+      <title>Package dhcp Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package dhcp should be removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package dhcp is removed"
+      test_ref="test_package_dhcp_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_dhcp_removed" version="1"
+  comment="package dhcp is removed">
+    <linux:object object_ref="obj_package_dhcp_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_dhcp_removed"
version="1">
+    <linux:name>dhcp</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/package_dhcpd_removed.xml
b/RHEL/7/input/checks/templates/output/package_dhcpd_removed.xml
new file mode 100644
index 0000000..c67f752
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_dhcpd_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_dhcpd_removed"
+  version="1">
+    <metadata>
+      <title>Package dhcpd Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package dhcpd should be removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package dhcpd is removed"
+      test_ref="test_package_dhcpd_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_dhcpd_removed" version="1"
+  comment="package dhcpd is removed">
+    <linux:object object_ref="obj_package_dhcpd_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_dhcpd_removed"
version="1">
+    <linux:name>dhcpd</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/package_dovecot_removed.xml
b/RHEL/7/input/checks/templates/output/package_dovecot_removed.xml
new file mode 100644
index 0000000..882e8c9
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_dovecot_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_dovecot_removed"
+  version="1">
+    <metadata>
+      <title>Package dovecot Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package dovecot should be removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package dovecot is removed"
+      test_ref="test_package_dovecot_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_dovecot_removed" version="1"
+  comment="package dovecot is removed">
+    <linux:object object_ref="obj_package_dovecot_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_dovecot_removed"
version="1">
+    <linux:name>dovecot</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/package_hal_removed.xml
b/RHEL/7/input/checks/templates/output/package_hal_removed.xml
new file mode 100644
index 0000000..3df8548
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_hal_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_hal_removed"
+  version="1">
+    <metadata>
+      <title>Package hal Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package hal should be removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package hal is removed"
+      test_ref="test_package_hal_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_hal_removed" version="1"
+  comment="package hal is removed">
+    <linux:object object_ref="obj_package_hal_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_hal_removed"
version="1">
+    <linux:name>hal</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/package_httpd_removed.xml
b/RHEL/7/input/checks/templates/output/package_httpd_removed.xml
new file mode 100644
index 0000000..bf0a73e
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_httpd_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_httpd_removed"
+  version="1">
+    <metadata>
+      <title>Package httpd Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package httpd should be removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package httpd is removed"
+      test_ref="test_package_httpd_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_httpd_removed" version="1"
+  comment="package httpd is removed">
+    <linux:object object_ref="obj_package_httpd_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_httpd_removed"
version="1">
+    <linux:name>httpd</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/package_iptables-services_installed.sh
b/RHEL/7/input/checks/templates/output/package_iptables-services_installed.sh
new file mode 100644
index 0000000..6c602dd
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_iptables-services_installed.sh
@@ -0,0 +1 @@
+yum -y install iptables-services
diff --git a/RHEL/7/input/checks/templates/output/package_iptables-services_installed.xml
b/RHEL/7/input/checks/templates/output/package_iptables-services_installed.xml
new file mode 100644
index 0000000..98a161e
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_iptables-services_installed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_installed.py.  DO NOT EDIT.  -->
+  <definition class="compliance"
id="package_iptables-services_installed"
+  version="1">
+    <metadata>
+      <title>Package iptables-services Installed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package iptables-services should be
installed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package iptables-services is installed"
+      test_ref="test_package_iptables-services_installed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="all_exist"
+  id="test_package_iptables-services_installed" version="1"
+  comment="package iptables-services is installed">
+    <linux:object object_ref="obj_package_iptables-services_installed"
/>
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_iptables-services_installed"
version="1">
+    <linux:name>iptables-services</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/package_iptables_installed.sh
b/RHEL/7/input/checks/templates/output/package_iptables_installed.sh
new file mode 100644
index 0000000..5c45081
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_iptables_installed.sh
@@ -0,0 +1 @@
+yum -y install iptables
diff --git a/RHEL/7/input/checks/templates/output/package_iptables_installed.xml
b/RHEL/7/input/checks/templates/output/package_iptables_installed.xml
new file mode 100644
index 0000000..f28deb5
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_iptables_installed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_installed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_iptables_installed"
+  version="1">
+    <metadata>
+      <title>Package iptables Installed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package iptables should be
installed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package iptables is installed"
+      test_ref="test_package_iptables_installed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="all_exist"
+  id="test_package_iptables_installed" version="1"
+  comment="package iptables is installed">
+    <linux:object object_ref="obj_package_iptables_installed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_iptables_installed"
version="1">
+    <linux:name>iptables</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/package_iputils_removed.xml
b/RHEL/7/input/checks/templates/output/package_iputils_removed.xml
new file mode 100644
index 0000000..6ccd8ee
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_iputils_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_iputils_removed"
+  version="1">
+    <metadata>
+      <title>Package iputils Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package iputils should be removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package iputils is removed"
+      test_ref="test_package_iputils_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_iputils_removed" version="1"
+  comment="package iputils is removed">
+    <linux:object object_ref="obj_package_iputils_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_iputils_removed"
version="1">
+    <linux:name>iputils</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/package_irqbalance_installed.sh
b/RHEL/7/input/checks/templates/output/package_irqbalance_installed.sh
new file mode 100644
index 0000000..a58dfb9
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_irqbalance_installed.sh
@@ -0,0 +1 @@
+yum -y install irqbalance
diff --git a/RHEL/7/input/checks/templates/output/package_irqbalance_installed.xml
b/RHEL/7/input/checks/templates/output/package_irqbalance_installed.xml
new file mode 100644
index 0000000..3adb673
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_irqbalance_installed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_installed.py.  DO NOT EDIT.  -->
+  <definition class="compliance"
id="package_irqbalance_installed"
+  version="1">
+    <metadata>
+      <title>Package irqbalance Installed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package irqbalance should be
installed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package irqbalance is installed"
+      test_ref="test_package_irqbalance_installed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="all_exist"
+  id="test_package_irqbalance_installed" version="1"
+  comment="package irqbalance is installed">
+    <linux:object object_ref="obj_package_irqbalance_installed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_irqbalance_installed"
version="1">
+    <linux:name>irqbalance</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/package_kexec-tools_removed.xml
b/RHEL/7/input/checks/templates/output/package_kexec-tools_removed.xml
new file mode 100644
index 0000000..dd525f0
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_kexec-tools_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_kexec-tools_removed"
+  version="1">
+    <metadata>
+      <title>Package kexec-tools Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package kexec-tools should be
removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package kexec-tools is removed"
+      test_ref="test_package_kexec-tools_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_kexec-tools_removed" version="1"
+  comment="package kexec-tools is removed">
+    <linux:object object_ref="obj_package_kexec-tools_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_kexec-tools_removed"
version="1">
+    <linux:name>kexec-tools</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/package_libcgroup_removed.xml
b/RHEL/7/input/checks/templates/output/package_libcgroup_removed.xml
new file mode 100644
index 0000000..3045d95
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_libcgroup_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_libcgroup_removed"
+  version="1">
+    <metadata>
+      <title>Package libcgroup Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package libcgroup should be
removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package libcgroup is removed"
+      test_ref="test_package_libcgroup_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_libcgroup_removed" version="1"
+  comment="package libcgroup is removed">
+    <linux:object object_ref="obj_package_libcgroup_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_libcgroup_removed"
version="1">
+    <linux:name>libcgroup</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/package_mdadm_removed.xml
b/RHEL/7/input/checks/templates/output/package_mdadm_removed.xml
new file mode 100644
index 0000000..ab4c4d5
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_mdadm_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_mdadm_removed"
+  version="1">
+    <metadata>
+      <title>Package mdadm Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package mdadm should be removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package mdadm is removed"
+      test_ref="test_package_mdadm_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_mdadm_removed" version="1"
+  comment="package mdadm is removed">
+    <linux:object object_ref="obj_package_mdadm_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_mdadm_removed"
version="1">
+    <linux:name>mdadm</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/package_net-snmp_removed.xml
b/RHEL/7/input/checks/templates/output/package_net-snmp_removed.xml
new file mode 100644
index 0000000..33bc183
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_net-snmp_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_net-snmp_removed"
+  version="1">
+    <metadata>
+      <title>Package net-snmp Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package net-snmp should be removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package net-snmp is removed"
+      test_ref="test_package_net-snmp_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_net-snmp_removed" version="1"
+  comment="package net-snmp is removed">
+    <linux:object object_ref="obj_package_net-snmp_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_net-snmp_removed"
version="1">
+    <linux:name>net-snmp</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/package_nfs-utils_removed.xml
b/RHEL/7/input/checks/templates/output/package_nfs-utils_removed.xml
new file mode 100644
index 0000000..339861e
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_nfs-utils_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_nfs-utils_removed"
+  version="1">
+    <metadata>
+      <title>Package nfs-utils Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package nfs-utils should be
removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package nfs-utils is removed"
+      test_ref="test_package_nfs-utils_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_nfs-utils_removed" version="1"
+  comment="package nfs-utils is removed">
+    <linux:object object_ref="obj_package_nfs-utils_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_nfs-utils_removed"
version="1">
+    <linux:name>nfs-utils</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/package_ntp_installed.sh
b/RHEL/7/input/checks/templates/output/package_ntp_installed.sh
new file mode 100644
index 0000000..13c0e4f
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_ntp_installed.sh
@@ -0,0 +1 @@
+yum -y install ntp
diff --git a/RHEL/7/input/checks/templates/output/package_ntp_installed.xml
b/RHEL/7/input/checks/templates/output/package_ntp_installed.xml
new file mode 100644
index 0000000..2495849
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_ntp_installed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_installed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_ntp_installed"
+  version="1">
+    <metadata>
+      <title>Package ntp Installed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package ntp should be installed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package ntp is installed"
+      test_ref="test_package_ntp_installed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="all_exist"
+  id="test_package_ntp_installed" version="1"
+  comment="package ntp is installed">
+    <linux:object object_ref="obj_package_ntp_installed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_ntp_installed"
version="1">
+    <linux:name>ntp</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/package_oddjob_removed.xml
b/RHEL/7/input/checks/templates/output/package_oddjob_removed.xml
new file mode 100644
index 0000000..17906f0
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_oddjob_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_oddjob_removed"
+  version="1">
+    <metadata>
+      <title>Package oddjob Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package oddjob should be removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package oddjob is removed"
+      test_ref="test_package_oddjob_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_oddjob_removed" version="1"
+  comment="package oddjob is removed">
+    <linux:object object_ref="obj_package_oddjob_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_oddjob_removed"
version="1">
+    <linux:name>oddjob</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/package_openldap-servers_removed.xml
b/RHEL/7/input/checks/templates/output/package_openldap-servers_removed.xml
new file mode 100644
index 0000000..ea0cd38
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_openldap-servers_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance"
id="package_openldap-servers_removed"
+  version="1">
+    <metadata>
+      <title>Package openldap-servers Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package openldap-servers should be
removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package openldap-servers is removed"
+      test_ref="test_package_openldap-servers_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_openldap-servers_removed" version="1"
+  comment="package openldap-servers is removed">
+    <linux:object object_ref="obj_package_openldap-servers_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_openldap-servers_removed"
version="1">
+    <linux:name>openldap-servers</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/package_openssh-server_removed.xml
b/RHEL/7/input/checks/templates/output/package_openssh-server_removed.xml
new file mode 100644
index 0000000..5455384
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_openssh-server_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance"
id="package_openssh-server_removed"
+  version="1">
+    <metadata>
+      <title>Package openssh-server Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package openssh-server should be
removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package openssh-server is removed"
+      test_ref="test_package_openssh-server_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_openssh-server_removed" version="1"
+  comment="package openssh-server is removed">
+    <linux:object object_ref="obj_package_openssh-server_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_openssh-server_removed"
version="1">
+    <linux:name>openssh-server</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/package_pam_ldap_removed.xml
b/RHEL/7/input/checks/templates/output/package_pam_ldap_removed.xml
new file mode 100644
index 0000000..beec780
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_pam_ldap_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_pam_ldap_removed"
+  version="1">
+    <metadata>
+      <title>Package pam_ldap Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package pam_ldap should be removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package pam_ldap is removed"
+      test_ref="test_package_pam_ldap_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_pam_ldap_removed" version="1"
+  comment="package pam_ldap is removed">
+    <linux:object object_ref="obj_package_pam_ldap_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_pam_ldap_removed"
version="1">
+    <linux:name>pam_ldap</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/package_policycoreutils_installed.sh
b/RHEL/7/input/checks/templates/output/package_policycoreutils_installed.sh
new file mode 100644
index 0000000..88df025
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_policycoreutils_installed.sh
@@ -0,0 +1 @@
+yum -y install policycoreutils
diff --git a/RHEL/7/input/checks/templates/output/package_policycoreutils_installed.xml
b/RHEL/7/input/checks/templates/output/package_policycoreutils_installed.xml
new file mode 100644
index 0000000..53add6a
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_policycoreutils_installed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_installed.py.  DO NOT EDIT.  -->
+  <definition class="compliance"
id="package_policycoreutils_installed"
+  version="1">
+    <metadata>
+      <title>Package policycoreutils Installed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package policycoreutils should be
installed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package policycoreutils is installed"
+      test_ref="test_package_policycoreutils_installed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="all_exist"
+  id="test_package_policycoreutils_installed" version="1"
+  comment="package policycoreutils is installed">
+    <linux:object object_ref="obj_package_policycoreutils_installed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_policycoreutils_installed"
version="1">
+    <linux:name>policycoreutils</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/package_portreserve_removed.xml
b/RHEL/7/input/checks/templates/output/package_portreserve_removed.xml
new file mode 100644
index 0000000..7811c41
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_portreserve_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_portreserve_removed"
+  version="1">
+    <metadata>
+      <title>Package portreserve Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package portreserve should be
removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package portreserve is removed"
+      test_ref="test_package_portreserve_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_portreserve_removed" version="1"
+  comment="package portreserve is removed">
+    <linux:object object_ref="obj_package_portreserve_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_portreserve_removed"
version="1">
+    <linux:name>portreserve</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/package_postfix_installed.sh
b/RHEL/7/input/checks/templates/output/package_postfix_installed.sh
new file mode 100644
index 0000000..a845fba
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_postfix_installed.sh
@@ -0,0 +1 @@
+yum -y install postfix
diff --git a/RHEL/7/input/checks/templates/output/package_postfix_installed.xml
b/RHEL/7/input/checks/templates/output/package_postfix_installed.xml
new file mode 100644
index 0000000..64c8709
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_postfix_installed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_installed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_postfix_installed"
+  version="1">
+    <metadata>
+      <title>Package postfix Installed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package postfix should be
installed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package postfix is installed"
+      test_ref="test_package_postfix_installed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="all_exist"
+  id="test_package_postfix_installed" version="1"
+  comment="package postfix is installed">
+    <linux:object object_ref="obj_package_postfix_installed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_postfix_installed"
version="1">
+    <linux:name>postfix</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/package_psacct_installed.sh
b/RHEL/7/input/checks/templates/output/package_psacct_installed.sh
new file mode 100644
index 0000000..1e24902
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_psacct_installed.sh
@@ -0,0 +1 @@
+yum -y install psacct
diff --git a/RHEL/7/input/checks/templates/output/package_psacct_installed.xml
b/RHEL/7/input/checks/templates/output/package_psacct_installed.xml
new file mode 100644
index 0000000..0d839ca
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_psacct_installed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_installed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_psacct_installed"
+  version="1">
+    <metadata>
+      <title>Package psacct Installed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package psacct should be installed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package psacct is installed"
+      test_ref="test_package_psacct_installed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="all_exist"
+  id="test_package_psacct_installed" version="1"
+  comment="package psacct is installed">
+    <linux:object object_ref="obj_package_psacct_installed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_psacct_installed"
version="1">
+    <linux:name>psacct</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/package_qpid-cpp-server_removed.xml
b/RHEL/7/input/checks/templates/output/package_qpid-cpp-server_removed.xml
new file mode 100644
index 0000000..ce7bf39
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_qpid-cpp-server_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance"
id="package_qpid-cpp-server_removed"
+  version="1">
+    <metadata>
+      <title>Package qpid-cpp-server Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package qpid-cpp-server should be
removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package qpid-cpp-server is removed"
+      test_ref="test_package_qpid-cpp-server_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_qpid-cpp-server_removed" version="1"
+  comment="package qpid-cpp-server is removed">
+    <linux:object object_ref="obj_package_qpid-cpp-server_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_qpid-cpp-server_removed"
version="1">
+    <linux:name>qpid-cpp-server</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/package_quota_removed.xml
b/RHEL/7/input/checks/templates/output/package_quota_removed.xml
new file mode 100644
index 0000000..fdc7573
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_quota_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_quota_removed"
+  version="1">
+    <metadata>
+      <title>Package quota Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package quota should be removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package quota is removed"
+      test_ref="test_package_quota_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_quota_removed" version="1"
+  comment="package quota is removed">
+    <linux:object object_ref="obj_package_quota_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_quota_removed"
version="1">
+    <linux:name>quota</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/package_rhnsd_removed.xml
b/RHEL/7/input/checks/templates/output/package_rhnsd_removed.xml
new file mode 100644
index 0000000..5cecc36
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_rhnsd_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_rhnsd_removed"
+  version="1">
+    <metadata>
+      <title>Package rhnsd Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package rhnsd should be removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package rhnsd is removed"
+      test_ref="test_package_rhnsd_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_rhnsd_removed" version="1"
+  comment="package rhnsd is removed">
+    <linux:object object_ref="obj_package_rhnsd_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_rhnsd_removed"
version="1">
+    <linux:name>rhnsd</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/package_rsh-server_removed.xml
b/RHEL/7/input/checks/templates/output/package_rsh-server_removed.xml
new file mode 100644
index 0000000..989201c
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_rsh-server_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_rsh-server_removed"
+  version="1">
+    <metadata>
+      <title>Package rsh-server Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package rsh-server should be
removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package rsh-server is removed"
+      test_ref="test_package_rsh-server_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_rsh-server_removed" version="1"
+  comment="package rsh-server is removed">
+    <linux:object object_ref="obj_package_rsh-server_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_rsh-server_removed"
version="1">
+    <linux:name>rsh-server</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/package_rsyslog_installed.sh
b/RHEL/7/input/checks/templates/output/package_rsyslog_installed.sh
new file mode 100644
index 0000000..5a28e09
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_rsyslog_installed.sh
@@ -0,0 +1 @@
+yum -y install rsyslog
diff --git a/RHEL/7/input/checks/templates/output/package_rsyslog_installed.xml
b/RHEL/7/input/checks/templates/output/package_rsyslog_installed.xml
new file mode 100644
index 0000000..7e5ca6e
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_rsyslog_installed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_installed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_rsyslog_installed"
+  version="1">
+    <metadata>
+      <title>Package rsyslog Installed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package rsyslog should be
installed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package rsyslog is installed"
+      test_ref="test_package_rsyslog_installed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="all_exist"
+  id="test_package_rsyslog_installed" version="1"
+  comment="package rsyslog is installed">
+    <linux:object object_ref="obj_package_rsyslog_installed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_rsyslog_installed"
version="1">
+    <linux:name>rsyslog</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/package_samba-common_removed.xml
b/RHEL/7/input/checks/templates/output/package_samba-common_removed.xml
new file mode 100644
index 0000000..b59b5bb
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_samba-common_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance"
id="package_samba-common_removed"
+  version="1">
+    <metadata>
+      <title>Package samba-common Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package samba-common should be
removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package samba-common is removed"
+      test_ref="test_package_samba-common_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_samba-common_removed" version="1"
+  comment="package samba-common is removed">
+    <linux:object object_ref="obj_package_samba-common_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_samba-common_removed"
version="1">
+    <linux:name>samba-common</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/package_screen_installed.sh
b/RHEL/7/input/checks/templates/output/package_screen_installed.sh
new file mode 100644
index 0000000..cc566bf
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_screen_installed.sh
@@ -0,0 +1 @@
+yum -y install screen
diff --git a/RHEL/7/input/checks/templates/output/package_screen_installed.xml
b/RHEL/7/input/checks/templates/output/package_screen_installed.xml
new file mode 100644
index 0000000..facf40b
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_screen_installed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_installed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_screen_installed"
+  version="1">
+    <metadata>
+      <title>Package screen Installed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package screen should be installed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package screen is installed"
+      test_ref="test_package_screen_installed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="all_exist"
+  id="test_package_screen_installed" version="1"
+  comment="package screen is installed">
+    <linux:object object_ref="obj_package_screen_installed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_screen_installed"
version="1">
+    <linux:name>screen</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/package_sendmail_removed.xml
b/RHEL/7/input/checks/templates/output/package_sendmail_removed.xml
new file mode 100644
index 0000000..4fd7333
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_sendmail_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_sendmail_removed"
+  version="1">
+    <metadata>
+      <title>Package sendmail Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package sendmail should be removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package sendmail is removed"
+      test_ref="test_package_sendmail_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_sendmail_removed" version="1"
+  comment="package sendmail is removed">
+    <linux:object object_ref="obj_package_sendmail_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_sendmail_removed"
version="1">
+    <linux:name>sendmail</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/package_smartmontools_removed.xml
b/RHEL/7/input/checks/templates/output/package_smartmontools_removed.xml
new file mode 100644
index 0000000..8dc867f
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_smartmontools_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance"
id="package_smartmontools_removed"
+  version="1">
+    <metadata>
+      <title>Package smartmontools Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package smartmontools should be
removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package smartmontools is removed"
+      test_ref="test_package_smartmontools_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_smartmontools_removed" version="1"
+  comment="package smartmontools is removed">
+    <linux:object object_ref="obj_package_smartmontools_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_smartmontools_removed"
version="1">
+    <linux:name>smartmontools</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/package_squid_removed.xml
b/RHEL/7/input/checks/templates/output/package_squid_removed.xml
new file mode 100644
index 0000000..ab5d62a
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_squid_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_squid_removed"
+  version="1">
+    <metadata>
+      <title>Package squid Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package squid should be removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package squid is removed"
+      test_ref="test_package_squid_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_squid_removed" version="1"
+  comment="package squid is removed">
+    <linux:object object_ref="obj_package_squid_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_squid_removed"
version="1">
+    <linux:name>squid</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/package_subscription-manager_removed.xml
b/RHEL/7/input/checks/templates/output/package_subscription-manager_removed.xml
new file mode 100644
index 0000000..1098014
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_subscription-manager_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance"
id="package_subscription-manager_removed"
+  version="1">
+    <metadata>
+      <title>Package subscription-manager Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package subscription-manager should be
removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package subscription-manager is removed"
+      test_ref="test_package_subscription-manager_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_subscription-manager_removed" version="1"
+  comment="package subscription-manager is removed">
+    <linux:object object_ref="obj_package_subscription-manager_removed"
/>
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_subscription-manager_removed"
version="1">
+    <linux:name>subscription-manager</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/package_sysstat_removed.xml
b/RHEL/7/input/checks/templates/output/package_sysstat_removed.xml
new file mode 100644
index 0000000..2ab6f03
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_sysstat_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_sysstat_removed"
+  version="1">
+    <metadata>
+      <title>Package sysstat Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package sysstat should be removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package sysstat is removed"
+      test_ref="test_package_sysstat_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_sysstat_removed" version="1"
+  comment="package sysstat is removed">
+    <linux:object object_ref="obj_package_sysstat_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_sysstat_removed"
version="1">
+    <linux:name>sysstat</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/package_talk-server_removed.xml
b/RHEL/7/input/checks/templates/output/package_talk-server_removed.xml
new file mode 100644
index 0000000..aa51025
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_talk-server_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_talk-server_removed"
+  version="1">
+    <metadata>
+      <title>Package talk-server Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package talk-server should be
removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package talk-server is removed"
+      test_ref="test_package_talk-server_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_talk-server_removed" version="1"
+  comment="package talk-server is removed">
+    <linux:object object_ref="obj_package_talk-server_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_talk-server_removed"
version="1">
+    <linux:name>talk-server</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/package_telnet-server_removed.xml
b/RHEL/7/input/checks/templates/output/package_telnet-server_removed.xml
new file mode 100644
index 0000000..4d24b0c
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_telnet-server_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance"
id="package_telnet-server_removed"
+  version="1">
+    <metadata>
+      <title>Package telnet-server Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package telnet-server should be
removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package telnet-server is removed"
+      test_ref="test_package_telnet-server_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_telnet-server_removed" version="1"
+  comment="package telnet-server is removed">
+    <linux:object object_ref="obj_package_telnet-server_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_telnet-server_removed"
version="1">
+    <linux:name>telnet-server</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/package_tftp-server_removed.xml
b/RHEL/7/input/checks/templates/output/package_tftp-server_removed.xml
new file mode 100644
index 0000000..7937f0c
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_tftp-server_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_tftp-server_removed"
+  version="1">
+    <metadata>
+      <title>Package tftp-server Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package tftp-server should be
removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package tftp-server is removed"
+      test_ref="test_package_tftp-server_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_tftp-server_removed" version="1"
+  comment="package tftp-server is removed">
+    <linux:object object_ref="obj_package_tftp-server_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_tftp-server_removed"
version="1">
+    <linux:name>tftp-server</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/package_vsftpd_installed.sh
b/RHEL/7/input/checks/templates/output/package_vsftpd_installed.sh
new file mode 100644
index 0000000..5d56d77
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_vsftpd_installed.sh
@@ -0,0 +1 @@
+yum -y install vsftpd
diff --git a/RHEL/7/input/checks/templates/output/package_vsftpd_installed.xml
b/RHEL/7/input/checks/templates/output/package_vsftpd_installed.xml
new file mode 100644
index 0000000..e4153a1
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_vsftpd_installed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_installed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_vsftpd_installed"
+  version="1">
+    <metadata>
+      <title>Package vsftpd Installed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package vsftpd should be installed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package vsftpd is installed"
+      test_ref="test_package_vsftpd_installed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="all_exist"
+  id="test_package_vsftpd_installed" version="1"
+  comment="package vsftpd is installed">
+    <linux:object object_ref="obj_package_vsftpd_installed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_vsftpd_installed"
version="1">
+    <linux:name>vsftpd</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/package_vsftpd_removed.xml
b/RHEL/7/input/checks/templates/output/package_vsftpd_removed.xml
new file mode 100644
index 0000000..7dca7cb
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_vsftpd_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_vsftpd_removed"
+  version="1">
+    <metadata>
+      <title>Package vsftpd Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package vsftpd should be removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package vsftpd is removed"
+      test_ref="test_package_vsftpd_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_vsftpd_removed" version="1"
+  comment="package vsftpd is removed">
+    <linux:object object_ref="obj_package_vsftpd_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_vsftpd_removed"
version="1">
+    <linux:name>vsftpd</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/package_xinetd_removed.xml
b/RHEL/7/input/checks/templates/output/package_xinetd_removed.xml
new file mode 100644
index 0000000..b82c238
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_xinetd_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_xinetd_removed"
+  version="1">
+    <metadata>
+      <title>Package xinetd Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package xinetd should be removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package xinetd is removed"
+      test_ref="test_package_xinetd_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_xinetd_removed" version="1"
+  comment="package xinetd is removed">
+    <linux:object object_ref="obj_package_xinetd_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_xinetd_removed"
version="1">
+    <linux:name>xinetd</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git
a/RHEL/7/input/checks/templates/output/package_xorg-x11-server-common_removed.xml
b/RHEL/7/input/checks/templates/output/package_xorg-x11-server-common_removed.xml
new file mode 100644
index 0000000..308beab
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_xorg-x11-server-common_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance"
id="package_xorg-x11-server-common_removed"
+  version="1">
+    <metadata>
+      <title>Package xorg-x11-server-common Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package xorg-x11-server-common should be
removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package xorg-x11-server-common is removed"
+      test_ref="test_package_xorg-x11-server-common_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_xorg-x11-server-common_removed" version="1"
+  comment="package xorg-x11-server-common is removed">
+    <linux:object object_ref="obj_package_xorg-x11-server-common_removed"
/>
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_xorg-x11-server-common_removed"
version="1">
+    <linux:name>xorg-x11-server-common</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/package_ypbind_removed.xml
b/RHEL/7/input/checks/templates/output/package_ypbind_removed.xml
new file mode 100644
index 0000000..7370068
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_ypbind_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_ypbind_removed"
+  version="1">
+    <metadata>
+      <title>Package ypbind Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package ypbind should be removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package ypbind is removed"
+      test_ref="test_package_ypbind_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_ypbind_removed" version="1"
+  comment="package ypbind is removed">
+    <linux:object object_ref="obj_package_ypbind_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_ypbind_removed"
version="1">
+    <linux:name>ypbind</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/package_ypserv_removed.xml
b/RHEL/7/input/checks/templates/output/package_ypserv_removed.xml
new file mode 100644
index 0000000..62125fd
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/package_ypserv_removed.xml
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_ypserv_removed"
+  version="1">
+    <metadata>
+      <title>Package ypserv Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package ypserv should be removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package ypserv is removed"
+      test_ref="test_package_ypserv_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_ypserv_removed" version="1"
+  comment="package ypserv is removed">
+    <linux:object object_ref="obj_package_ypserv_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_ypserv_removed"
version="1">
+    <linux:name>ypserv</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/service_abrtd_disabled.xml
b/RHEL/7/input/checks/templates/output/service_abrtd_disabled.xml
new file mode 100644
index 0000000..76bcb87
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/service_abrtd_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_abrtd_disabled"
+  version="1">
+    <metadata>
+      <title>Service abrtd Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The abrtd service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package abrt removed or service abrtd is not configured to
start" operator="OR">
+      <extend_definition comment="abrt removed"
definition_ref="package_abrt_removed" />
+      <criterion comment="service abrtd is not configured to start"
test_ref="test_target_abrtd" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="abrtd should not be in any target" id="test_target_abrtd"
version="1">
+    <unix:object object_ref="object_abrtd_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for abrtd in all targets"
+  id="object_abrtd_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/abrtd\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/service_acpid_disabled.xml
b/RHEL/7/input/checks/templates/output/service_acpid_disabled.xml
new file mode 100644
index 0000000..4ca0bde
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/service_acpid_disabled.xml
@@ -0,0 +1,32 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_acpid_disabled"
+  version="1">
+    <metadata>
+      <title>Service acpid Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The acpid service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="service acpid is not configured to start"
operator="AND">
+      <criterion comment="service acpid is not configured to start"
test_ref="test_target_acpid" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="acpid should not be in any target" id="test_target_acpid"
version="1">
+    <unix:object object_ref="object_acpid_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for acpid in all targets"
+  id="object_acpid_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/acpid\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/service_atd_disabled.xml
b/RHEL/7/input/checks/templates/output/service_atd_disabled.xml
new file mode 100644
index 0000000..ade4c42
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/service_atd_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_atd_disabled"
+  version="1">
+    <metadata>
+      <title>Service atd Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The atd service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package at removed or service atd is not configured to
start" operator="OR">
+      <extend_definition comment="at removed"
definition_ref="package_at_removed" />
+      <criterion comment="service atd is not configured to start"
test_ref="test_target_atd" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="atd should not be in any target" id="test_target_atd"
version="1">
+    <unix:object object_ref="object_atd_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for atd in all targets"
+  id="object_atd_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/atd\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/service_auditd_enabled.xml
b/RHEL/7/input/checks/templates/output/service_auditd_enabled.xml
new file mode 100644
index 0000000..ff89e16
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/service_auditd_enabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_enabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_auditd_enabled"
+  version="1">
+    <metadata>
+      <title>Service auditd Enabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The auditd service should be enabled if
possible.</description>
+    </metadata>
+    <criteria comment="package audit installed and service auditd is configured
to start" operator="AND">
+      <extend_definition comment="audit installed"
definition_ref="package_audit_installed" />
+      <criterion comment="service auditd is configured to start"
test_ref="test_target_auditd" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="any_exist"
+  comment="auditd should be in at least one target"
id="test_target_auditd" version="1">
+    <unix:object object_ref="object_auditd_enabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for auditd in all targets"
+  id="object_auditd_enabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/auditd\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/service_autofs_disabled.xml
b/RHEL/7/input/checks/templates/output/service_autofs_disabled.xml
new file mode 100644
index 0000000..1e81683
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/service_autofs_disabled.xml
@@ -0,0 +1,32 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_autofs_disabled"
+  version="1">
+    <metadata>
+      <title>Service autofs Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The autofs service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="service autofs is not configured to start"
operator="AND">
+      <criterion comment="service autofs is not configured to start"
test_ref="test_target_autofs" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="autofs should not be in any target"
id="test_target_autofs" version="1">
+    <unix:object object_ref="object_autofs_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for autofs in all targets"
+  id="object_autofs_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/autofs\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/service_avahi-daemon_disabled.xml
b/RHEL/7/input/checks/templates/output/service_avahi-daemon_disabled.xml
new file mode 100644
index 0000000..7dca241
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/service_avahi-daemon_disabled.xml
@@ -0,0 +1,32 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance"
id="service_avahi-daemon_disabled"
+  version="1">
+    <metadata>
+      <title>Service avahi-daemon Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The avahi-daemon service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="service avahi-daemon is not configured to start"
operator="AND">
+      <criterion comment="service avahi-daemon is not configured to start"
test_ref="test_target_avahi-daemon" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="avahi-daemon should not be in any target"
id="test_target_avahi-daemon" version="1">
+    <unix:object object_ref="object_avahi-daemon_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for avahi-daemon in all targets"
+  id="object_avahi-daemon_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/avahi-daemon\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/service_bluetooth_disabled.xml
b/RHEL/7/input/checks/templates/output/service_bluetooth_disabled.xml
new file mode 100644
index 0000000..a0a8a66
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/service_bluetooth_disabled.xml
@@ -0,0 +1,32 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_bluetooth_disabled"
+  version="1">
+    <metadata>
+      <title>Service bluetooth Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The bluetooth service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="service bluetooth is not configured to start"
operator="AND">
+      <criterion comment="service bluetooth is not configured to start"
test_ref="test_target_bluetooth" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="bluetooth should not be in any target"
id="test_target_bluetooth" version="1">
+    <unix:object object_ref="object_bluetooth_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for bluetooth in all targets"
+  id="object_bluetooth_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/bluetooth\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/service_certmonger_disabled.xml
b/RHEL/7/input/checks/templates/output/service_certmonger_disabled.xml
new file mode 100644
index 0000000..5f32756
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/service_certmonger_disabled.xml
@@ -0,0 +1,32 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_certmonger_disabled"
+  version="1">
+    <metadata>
+      <title>Service certmonger Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The certmonger service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="service certmonger is not configured to start"
operator="AND">
+      <criterion comment="service certmonger is not configured to start"
test_ref="test_target_certmonger" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="certmonger should not be in any target"
id="test_target_certmonger" version="1">
+    <unix:object object_ref="object_certmonger_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for certmonger in all targets"
+  id="object_certmonger_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/certmonger\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/service_cgconfig_disabled.xml
b/RHEL/7/input/checks/templates/output/service_cgconfig_disabled.xml
new file mode 100644
index 0000000..2fca98b
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/service_cgconfig_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_cgconfig_disabled"
+  version="1">
+    <metadata>
+      <title>Service cgconfig Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The cgconfig service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package libcgroup removed or service cgconfig is not
configured to start" operator="OR">
+      <extend_definition comment="libcgroup removed"
definition_ref="package_libcgroup_removed" />
+      <criterion comment="service cgconfig is not configured to start"
test_ref="test_target_cgconfig" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="cgconfig should not be in any target"
id="test_target_cgconfig" version="1">
+    <unix:object object_ref="object_cgconfig_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for cgconfig in all targets"
+  id="object_cgconfig_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/cgconfig\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/service_crond_enabled.xml
b/RHEL/7/input/checks/templates/output/service_crond_enabled.xml
new file mode 100644
index 0000000..412f81a
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/service_crond_enabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_enabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_crond_enabled"
+  version="1">
+    <metadata>
+      <title>Service crond Enabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The crond service should be enabled if
possible.</description>
+    </metadata>
+    <criteria comment="package cronie installed and service crond is configured
to start" operator="AND">
+      <extend_definition comment="cronie installed"
definition_ref="package_cronie_installed" />
+      <criterion comment="service crond is configured to start"
test_ref="test_target_crond" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="any_exist"
+  comment="crond should be in at least one target"
id="test_target_crond" version="1">
+    <unix:object object_ref="object_crond_enabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for crond in all targets"
+  id="object_crond_enabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/crond\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/service_cups_disabled.xml
b/RHEL/7/input/checks/templates/output/service_cups_disabled.xml
new file mode 100644
index 0000000..cf4d3a5
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/service_cups_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_cups_disabled"
+  version="1">
+    <metadata>
+      <title>Service cups Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The cups service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package cups removed or service cups is not configured to
start" operator="OR">
+      <extend_definition comment="cups removed"
definition_ref="package_cups_removed" />
+      <criterion comment="service cups is not configured to start"
test_ref="test_target_cups" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="cups should not be in any target" id="test_target_cups"
version="1">
+    <unix:object object_ref="object_cups_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for cups in all targets"
+  id="object_cups_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/cups\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/service_dhcpd_disabled.xml
b/RHEL/7/input/checks/templates/output/service_dhcpd_disabled.xml
new file mode 100644
index 0000000..c86d7e0
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/service_dhcpd_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_dhcpd_disabled"
+  version="1">
+    <metadata>
+      <title>Service dhcpd Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The dhcpd service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package dhcp removed or service dhcpd is not configured to
start" operator="OR">
+      <extend_definition comment="dhcp removed"
definition_ref="package_dhcp_removed" />
+      <criterion comment="service dhcpd is not configured to start"
test_ref="test_target_dhcpd" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="dhcpd should not be in any target" id="test_target_dhcpd"
version="1">
+    <unix:object object_ref="object_dhcpd_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for dhcpd in all targets"
+  id="object_dhcpd_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/dhcpd\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/service_dovecot_disabled.xml
b/RHEL/7/input/checks/templates/output/service_dovecot_disabled.xml
new file mode 100644
index 0000000..dec4893
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/service_dovecot_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_dovecot_disabled"
+  version="1">
+    <metadata>
+      <title>Service dovecot Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The dovecot service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package dovecot removed or service dovecot is not
configured to start" operator="OR">
+      <extend_definition comment="dovecot removed"
definition_ref="package_dovecot_removed" />
+      <criterion comment="service dovecot is not configured to start"
test_ref="test_target_dovecot" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="dovecot should not be in any target"
id="test_target_dovecot" version="1">
+    <unix:object object_ref="object_dovecot_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for dovecot in all targets"
+  id="object_dovecot_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/dovecot\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/service_httpd_disabled.xml
b/RHEL/7/input/checks/templates/output/service_httpd_disabled.xml
new file mode 100644
index 0000000..9b690ea
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/service_httpd_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_httpd_disabled"
+  version="1">
+    <metadata>
+      <title>Service httpd Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The httpd service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package httpd removed or service httpd is not configured
to start" operator="OR">
+      <extend_definition comment="httpd removed"
definition_ref="package_httpd_removed" />
+      <criterion comment="service httpd is not configured to start"
test_ref="test_target_httpd" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="httpd should not be in any target" id="test_target_httpd"
version="1">
+    <unix:object object_ref="object_httpd_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for httpd in all targets"
+  id="object_httpd_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/httpd\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/service_ip6tables_enabled.xml
b/RHEL/7/input/checks/templates/output/service_ip6tables_enabled.xml
new file mode 100644
index 0000000..6172268
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/service_ip6tables_enabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_enabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_ip6tables_enabled"
+  version="1">
+    <metadata>
+      <title>Service ip6tables Enabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The ip6tables service should be enabled if
possible.</description>
+    </metadata>
+    <criteria comment="package iptables-ipv6 installed and service ip6tables is
configured to start" operator="AND">
+      <extend_definition comment="iptables-ipv6 installed"
definition_ref="package_iptables-ipv6_installed" />
+      <criterion comment="service ip6tables is configured to start"
test_ref="test_target_ip6tables" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="any_exist"
+  comment="ip6tables should be in at least one target"
id="test_target_ip6tables" version="1">
+    <unix:object object_ref="object_ip6tables_enabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for ip6tables in all targets"
+  id="object_ip6tables_enabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/ip6tables\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/service_iptables_enabled.xml
b/RHEL/7/input/checks/templates/output/service_iptables_enabled.xml
new file mode 100644
index 0000000..7258f52
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/service_iptables_enabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_enabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_iptables_enabled"
+  version="1">
+    <metadata>
+      <title>Service iptables Enabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The iptables service should be enabled if
possible.</description>
+    </metadata>
+    <criteria comment="package iptables installed and service iptables is
configured to start" operator="AND">
+      <extend_definition comment="iptables installed"
definition_ref="package_iptables_installed" />
+      <criterion comment="service iptables is configured to start"
test_ref="test_target_iptables" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="any_exist"
+  comment="iptables should be in at least one target"
id="test_target_iptables" version="1">
+    <unix:object object_ref="object_iptables_enabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for iptables in all targets"
+  id="object_iptables_enabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/iptables\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/service_irqbalance_enabled.xml
b/RHEL/7/input/checks/templates/output/service_irqbalance_enabled.xml
new file mode 100644
index 0000000..9185c72
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/service_irqbalance_enabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_enabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_irqbalance_enabled"
+  version="1">
+    <metadata>
+      <title>Service irqbalance Enabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The irqbalance service should be enabled if
possible.</description>
+    </metadata>
+    <criteria comment="package irqbalance installed and service irqbalance is
configured to start" operator="AND">
+      <extend_definition comment="irqbalance installed"
definition_ref="package_irqbalance_installed" />
+      <criterion comment="service irqbalance is configured to start"
test_ref="test_target_irqbalance" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="any_exist"
+  comment="irqbalance should be in at least one target"
id="test_target_irqbalance" version="1">
+    <unix:object object_ref="object_irqbalance_enabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for irqbalance in all targets"
+  id="object_irqbalance_enabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/irqbalance\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/service_kdump_disabled.xml
b/RHEL/7/input/checks/templates/output/service_kdump_disabled.xml
new file mode 100644
index 0000000..0ab104f
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/service_kdump_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_kdump_disabled"
+  version="1">
+    <metadata>
+      <title>Service kdump Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The kdump service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package kexec-tools removed or service kdump is not
configured to start" operator="OR">
+      <extend_definition comment="kexec-tools removed"
definition_ref="package_kexec-tools_removed" />
+      <criterion comment="service kdump is not configured to start"
test_ref="test_target_kdump" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="kdump should not be in any target" id="test_target_kdump"
version="1">
+    <unix:object object_ref="object_kdump_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for kdump in all targets"
+  id="object_kdump_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/kdump\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/service_mdmonitor_disabled.xml
b/RHEL/7/input/checks/templates/output/service_mdmonitor_disabled.xml
new file mode 100644
index 0000000..8bcc432
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/service_mdmonitor_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_mdmonitor_disabled"
+  version="1">
+    <metadata>
+      <title>Service mdmonitor Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The mdmonitor service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package mdadm removed or service mdmonitor is not
configured to start" operator="OR">
+      <extend_definition comment="mdadm removed"
definition_ref="package_mdadm_removed" />
+      <criterion comment="service mdmonitor is not configured to start"
test_ref="test_target_mdmonitor" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="mdmonitor should not be in any target"
id="test_target_mdmonitor" version="1">
+    <unix:object object_ref="object_mdmonitor_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for mdmonitor in all targets"
+  id="object_mdmonitor_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/mdmonitor\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/service_named_disabled.xml
b/RHEL/7/input/checks/templates/output/service_named_disabled.xml
new file mode 100644
index 0000000..2e8ed8c
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/service_named_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_named_disabled"
+  version="1">
+    <metadata>
+      <title>Service named Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The named service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package bind removed or service named is not configured to
start" operator="OR">
+      <extend_definition comment="bind removed"
definition_ref="package_bind_removed" />
+      <criterion comment="service named is not configured to start"
test_ref="test_target_named" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="named should not be in any target" id="test_target_named"
version="1">
+    <unix:object object_ref="object_named_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for named in all targets"
+  id="object_named_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/named\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/service_nfs-lock_disabled.xml
b/RHEL/7/input/checks/templates/output/service_nfs-lock_disabled.xml
new file mode 100644
index 0000000..b654b9c
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/service_nfs-lock_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_nfs-lock_disabled"
+  version="1">
+    <metadata>
+      <title>Service nfs-lock Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The nfs-lock service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package nfs-utils removed or service nfs-lock is not
configured to start" operator="OR">
+      <extend_definition comment="nfs-utils removed"
definition_ref="package_nfs-utils_removed" />
+      <criterion comment="service nfs-lock is not configured to start"
test_ref="test_target_nfs-lock" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="nfs-lock should not be in any target"
id="test_target_nfs-lock" version="1">
+    <unix:object object_ref="object_nfs-lock_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for nfs-lock in all targets"
+  id="object_nfs-lock_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/nfs-lock\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/service_nfs-server_disabled.xml
b/RHEL/7/input/checks/templates/output/service_nfs-server_disabled.xml
new file mode 100644
index 0000000..9ca4bc6
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/service_nfs-server_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_nfs-server_disabled"
+  version="1">
+    <metadata>
+      <title>Service nfs-server Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The nfs-server service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package nfs-utils removed or service nfs-server is not
configured to start" operator="OR">
+      <extend_definition comment="nfs-utils removed"
definition_ref="package_nfs-utils_removed" />
+      <criterion comment="service nfs-server is not configured to start"
test_ref="test_target_nfs-server" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="nfs-server should not be in any target"
id="test_target_nfs-server" version="1">
+    <unix:object object_ref="object_nfs-server_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for nfs-server in all targets"
+  id="object_nfs-server_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/nfs-server\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/service_ntpd_enabled.xml
b/RHEL/7/input/checks/templates/output/service_ntpd_enabled.xml
new file mode 100644
index 0000000..e5e9262
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/service_ntpd_enabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_enabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_ntpd_enabled"
+  version="1">
+    <metadata>
+      <title>Service ntpd Enabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The ntpd service should be enabled if
possible.</description>
+    </metadata>
+    <criteria comment="package ntp installed and service ntpd is configured to
start" operator="AND">
+      <extend_definition comment="ntp installed"
definition_ref="package_ntp_installed" />
+      <criterion comment="service ntpd is configured to start"
test_ref="test_target_ntpd" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="any_exist"
+  comment="ntpd should be in at least one target"
id="test_target_ntpd" version="1">
+    <unix:object object_ref="object_ntpd_enabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for ntpd in all targets"
+  id="object_ntpd_enabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/ntpd\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/service_oddjobd_disabled.xml
b/RHEL/7/input/checks/templates/output/service_oddjobd_disabled.xml
new file mode 100644
index 0000000..ae94a75
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/service_oddjobd_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_oddjobd_disabled"
+  version="1">
+    <metadata>
+      <title>Service oddjobd Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The oddjobd service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package oddjob removed or service oddjobd is not
configured to start" operator="OR">
+      <extend_definition comment="oddjob removed"
definition_ref="package_oddjob_removed" />
+      <criterion comment="service oddjobd is not configured to start"
test_ref="test_target_oddjobd" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="oddjobd should not be in any target"
id="test_target_oddjobd" version="1">
+    <unix:object object_ref="object_oddjobd_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for oddjobd in all targets"
+  id="object_oddjobd_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/oddjobd\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/service_portreserve_disabled.xml
b/RHEL/7/input/checks/templates/output/service_portreserve_disabled.xml
new file mode 100644
index 0000000..6c00b43
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/service_portreserve_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance"
id="service_portreserve_disabled"
+  version="1">
+    <metadata>
+      <title>Service portreserve Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The portreserve service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package portreserve removed or service portreserve is not
configured to start" operator="OR">
+      <extend_definition comment="portreserve removed"
definition_ref="package_portreserve_removed" />
+      <criterion comment="service portreserve is not configured to start"
test_ref="test_target_portreserve" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="portreserve should not be in any target"
id="test_target_portreserve" version="1">
+    <unix:object object_ref="object_portreserve_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for portreserve in all targets"
+  id="object_portreserve_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/portreserve\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/service_postfix_enabled.xml
b/RHEL/7/input/checks/templates/output/service_postfix_enabled.xml
new file mode 100644
index 0000000..4a70fc0
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/service_postfix_enabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_enabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_postfix_enabled"
+  version="1">
+    <metadata>
+      <title>Service postfix Enabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The postfix service should be enabled if
possible.</description>
+    </metadata>
+    <criteria comment="package postfix installed and service postfix is
configured to start" operator="AND">
+      <extend_definition comment="postfix installed"
definition_ref="package_postfix_installed" />
+      <criterion comment="service postfix is configured to start"
test_ref="test_target_postfix" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="any_exist"
+  comment="postfix should be in at least one target"
id="test_target_postfix" version="1">
+    <unix:object object_ref="object_postfix_enabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for postfix in all targets"
+  id="object_postfix_enabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/postfix\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/service_psacct_enabled.xml
b/RHEL/7/input/checks/templates/output/service_psacct_enabled.xml
new file mode 100644
index 0000000..fb81e63
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/service_psacct_enabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_enabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_psacct_enabled"
+  version="1">
+    <metadata>
+      <title>Service psacct Enabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The psacct service should be enabled if
possible.</description>
+    </metadata>
+    <criteria comment="package psacct installed and service psacct is configured
to start" operator="AND">
+      <extend_definition comment="psacct installed"
definition_ref="package_psacct_installed" />
+      <criterion comment="service psacct is configured to start"
test_ref="test_target_psacct" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="any_exist"
+  comment="psacct should be in at least one target"
id="test_target_psacct" version="1">
+    <unix:object object_ref="object_psacct_enabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for psacct in all targets"
+  id="object_psacct_enabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/psacct\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/service_qpidd_disabled.xml
b/RHEL/7/input/checks/templates/output/service_qpidd_disabled.xml
new file mode 100644
index 0000000..58c344e
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/service_qpidd_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_qpidd_disabled"
+  version="1">
+    <metadata>
+      <title>Service qpidd Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The qpidd service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package qpid-cpp-server removed or service qpidd is not
configured to start" operator="OR">
+      <extend_definition comment="qpid-cpp-server removed"
definition_ref="package_qpid-cpp-server_removed" />
+      <criterion comment="service qpidd is not configured to start"
test_ref="test_target_qpidd" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="qpidd should not be in any target" id="test_target_qpidd"
version="1">
+    <unix:object object_ref="object_qpidd_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for qpidd in all targets"
+  id="object_qpidd_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/qpidd\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/service_quotaon_disabled.xml
b/RHEL/7/input/checks/templates/output/service_quotaon_disabled.xml
new file mode 100644
index 0000000..5db9a9b
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/service_quotaon_disabled.xml
@@ -0,0 +1,32 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_quotaon_disabled"
+  version="1">
+    <metadata>
+      <title>Service quotaon Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The quotaon service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="service quotaon is not configured to start"
operator="AND">
+      <criterion comment="service quotaon is not configured to start"
test_ref="test_target_quotaon" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="quotaon should not be in any target"
id="test_target_quotaon" version="1">
+    <unix:object object_ref="object_quotaon_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for quotaon in all targets"
+  id="object_quotaon_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/quotaon\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/service_rdisc_disabled.xml
b/RHEL/7/input/checks/templates/output/service_rdisc_disabled.xml
new file mode 100644
index 0000000..2ad4119
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/service_rdisc_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_rdisc_disabled"
+  version="1">
+    <metadata>
+      <title>Service rdisc Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The rdisc service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package iputils removed or service rdisc is not configured
to start" operator="OR">
+      <extend_definition comment="iputils removed"
definition_ref="package_iputils_removed" />
+      <criterion comment="service rdisc is not configured to start"
test_ref="test_target_rdisc" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="rdisc should not be in any target" id="test_target_rdisc"
version="1">
+    <unix:object object_ref="object_rdisc_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for rdisc in all targets"
+  id="object_rdisc_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/rdisc\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/service_rhnsd_disabled.xml
b/RHEL/7/input/checks/templates/output/service_rhnsd_disabled.xml
new file mode 100644
index 0000000..969b6bb
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/service_rhnsd_disabled.xml
@@ -0,0 +1,99 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_sysv_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_rhnsd_disabled"
+  version="1">
+    <metadata>
+      <title>Service rhnsd Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The rhnsd service should be disabled if
possible.</description>
+    </metadata>
+   <criteria comment="package rhnsd removed or service rhnsd is not configured to
start" operator="OR">
+    <extend_definition comment="rhnsd removed"
definition_ref="package_rhnsd_removed" />
+    <criteria operator="AND" comment="service rhnsd is not configured
to start">
+      <criterion comment="rhnsd runlevel 0"
test_ref="test_runlevel0_rhnsd" />
+      <criterion comment="rhnsd runlevel 1"
test_ref="test_runlevel1_rhnsd" />
+      <criterion comment="rhnsd runlevel 2"
test_ref="test_runlevel2_rhnsd" />
+      <criterion comment="rhnsd runlevel 3"
test_ref="test_runlevel3_rhnsd" />
+      <criterion comment="rhnsd runlevel 4"
test_ref="test_runlevel4_rhnsd" />
+      <criterion comment="rhnsd runlevel 5"
test_ref="test_runlevel5_rhnsd" />
+      <criterion comment="rhnsd runlevel 6"
test_ref="test_runlevel6_rhnsd" />
+    </criteria>
+    </criteria>
+  </definition>
+  <unix:runlevel_test check="all" check_existence="any_exist"
+  comment="Runlevel test" id="test_runlevel0_rhnsd"
+  version="2">
+    <unix:object object_ref="obj_runlevel0_rhnsd" />
+    <unix:state state_ref="state_service_rhnsd_off" />
+  </unix:runlevel_test>
+  <unix:runlevel_test check="all" check_existence="any_exist"
+  comment="Runlevel test" id="test_runlevel1_rhnsd"
+  version="2">
+    <unix:object object_ref="obj_runlevel1_rhnsd" />
+    <unix:state state_ref="state_service_rhnsd_off" />
+  </unix:runlevel_test>
+  <unix:runlevel_test check="all" check_existence="any_exist"
+  comment="Runlevel test" id="test_runlevel2_rhnsd"
+  version="2">
+    <unix:object object_ref="obj_runlevel2_rhnsd" />
+    <unix:state state_ref="state_service_rhnsd_off" />
+  </unix:runlevel_test>
+  <unix:runlevel_test check="all" check_existence="any_exist"
+  comment="Runlevel test" id="test_runlevel3_rhnsd"
+  version="2">
+    <unix:object object_ref="obj_runlevel3_rhnsd" />
+    <unix:state state_ref="state_service_rhnsd_off" />
+  </unix:runlevel_test>
+  <unix:runlevel_test check="all" check_existence="any_exist"
+  comment="Runlevel test" id="test_runlevel4_rhnsd"
+  version="2">
+    <unix:object object_ref="obj_runlevel4_rhnsd" />
+    <unix:state state_ref="state_service_rhnsd_off" />
+  </unix:runlevel_test>
+  <unix:runlevel_test check="all" check_existence="any_exist"
+  comment="Runlevel test" id="test_runlevel5_rhnsd"
+  version="2">
+    <unix:object object_ref="obj_runlevel5_rhnsd" />
+    <unix:state state_ref="state_service_rhnsd_off" />
+  </unix:runlevel_test>
+  <unix:runlevel_test check="all" check_existence="any_exist"
+  comment="Runlevel test" id="test_runlevel6_rhnsd"
+  version="2">
+    <unix:object object_ref="obj_runlevel6_rhnsd" />
+    <unix:state state_ref="state_service_rhnsd_off" />
+  </unix:runlevel_test>
+  <unix:runlevel_object id="obj_runlevel0_rhnsd" version="1">
+    <unix:service_name>rhnsd</unix:service_name>
+    <unix:runlevel operation="equals">0</unix:runlevel>
+  </unix:runlevel_object>
+  <unix:runlevel_object id="obj_runlevel1_rhnsd" version="1">
+    <unix:service_name>rhnsd</unix:service_name>
+    <unix:runlevel operation="equals">1</unix:runlevel>
+  </unix:runlevel_object>
+  <unix:runlevel_object id="obj_runlevel2_rhnsd" version="1">
+    <unix:service_name>rhnsd</unix:service_name>
+    <unix:runlevel operation="equals">2</unix:runlevel>
+  </unix:runlevel_object>
+  <unix:runlevel_object id="obj_runlevel3_rhnsd" version="1">
+    <unix:service_name>rhnsd</unix:service_name>
+    <unix:runlevel operation="equals">3</unix:runlevel>
+  </unix:runlevel_object>
+  <unix:runlevel_object id="obj_runlevel4_rhnsd" version="1">
+    <unix:service_name>rhnsd</unix:service_name>
+    <unix:runlevel operation="equals">4</unix:runlevel>
+  </unix:runlevel_object>
+  <unix:runlevel_object id="obj_runlevel5_rhnsd" version="1">
+    <unix:service_name>rhnsd</unix:service_name>
+    <unix:runlevel operation="equals">5</unix:runlevel>
+  </unix:runlevel_object>
+  <unix:runlevel_object id="obj_runlevel6_rhnsd" version="1">
+    <unix:service_name>rhnsd</unix:service_name>
+    <unix:runlevel operation="equals">6</unix:runlevel>
+  </unix:runlevel_object>
+  <unix:runlevel_state comment="not configured to start"
id="state_service_rhnsd_off" version="1">
+    <unix:start datatype="boolean">false</unix:start>
+    <unix:kill datatype="boolean">true</unix:kill>
+  </unix:runlevel_state>
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/service_rhsmcertd_disabled.xml
b/RHEL/7/input/checks/templates/output/service_rhsmcertd_disabled.xml
new file mode 100644
index 0000000..1b5011c
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/service_rhsmcertd_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_rhsmcertd_disabled"
+  version="1">
+    <metadata>
+      <title>Service rhsmcertd Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The rhsmcertd service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package subscription-manager removed or service rhsmcertd
is not configured to start" operator="OR">
+      <extend_definition comment="subscription-manager removed"
definition_ref="package_subscription-manager_removed" />
+      <criterion comment="service rhsmcertd is not configured to start"
test_ref="test_target_rhsmcertd" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="rhsmcertd should not be in any target"
id="test_target_rhsmcertd" version="1">
+    <unix:object object_ref="object_rhsmcertd_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for rhsmcertd in all targets"
+  id="object_rhsmcertd_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/rhsmcertd\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/service_rpcgssd_disabled.xml
b/RHEL/7/input/checks/templates/output/service_rpcgssd_disabled.xml
new file mode 100644
index 0000000..f1fc3aa
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/service_rpcgssd_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_rpcgssd_disabled"
+  version="1">
+    <metadata>
+      <title>Service rpcgssd Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The rpcgssd service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package nfs-utils removed or service rpcgssd is not
configured to start" operator="OR">
+      <extend_definition comment="nfs-utils removed"
definition_ref="package_nfs-utils_removed" />
+      <criterion comment="service rpcgssd is not configured to start"
test_ref="test_target_rpcgssd" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="rpcgssd should not be in any target"
id="test_target_rpcgssd" version="1">
+    <unix:object object_ref="object_rpcgssd_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for rpcgssd in all targets"
+  id="object_rpcgssd_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/rpcgssd\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/service_rpcidmapd_disabled.xml
b/RHEL/7/input/checks/templates/output/service_rpcidmapd_disabled.xml
new file mode 100644
index 0000000..799adb3
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/service_rpcidmapd_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_rpcidmapd_disabled"
+  version="1">
+    <metadata>
+      <title>Service rpcidmapd Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The rpcidmapd service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package nfs-utils removed or service rpcidmapd is not
configured to start" operator="OR">
+      <extend_definition comment="nfs-utils removed"
definition_ref="package_nfs-utils_removed" />
+      <criterion comment="service rpcidmapd is not configured to start"
test_ref="test_target_rpcidmapd" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="rpcidmapd should not be in any target"
id="test_target_rpcidmapd" version="1">
+    <unix:object object_ref="object_rpcidmapd_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for rpcidmapd in all targets"
+  id="object_rpcidmapd_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/rpcidmapd\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/service_rpcsvcgssd_disabled.xml
b/RHEL/7/input/checks/templates/output/service_rpcsvcgssd_disabled.xml
new file mode 100644
index 0000000..073e78f
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/service_rpcsvcgssd_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_rpcsvcgssd_disabled"
+  version="1">
+    <metadata>
+      <title>Service rpcsvcgssd Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The rpcsvcgssd service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package nfs-utils removed or service rpcsvcgssd is not
configured to start" operator="OR">
+      <extend_definition comment="nfs-utils removed"
definition_ref="package_nfs-utils_removed" />
+      <criterion comment="service rpcsvcgssd is not configured to start"
test_ref="test_target_rpcsvcgssd" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="rpcsvcgssd should not be in any target"
id="test_target_rpcsvcgssd" version="1">
+    <unix:object object_ref="object_rpcsvcgssd_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for rpcsvcgssd in all targets"
+  id="object_rpcsvcgssd_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/rpcsvcgssd\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/service_rsyslog_enabled.xml
b/RHEL/7/input/checks/templates/output/service_rsyslog_enabled.xml
new file mode 100644
index 0000000..9b29e3a
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/service_rsyslog_enabled.xml
@@ -0,0 +1,32 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_enabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_rsyslog_enabled"
+  version="1">
+    <metadata>
+      <title>Service rsyslog Enabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The rsyslog service should be enabled if
possible.</description>
+    </metadata>
+    <criteria comment="service rsyslog is configured to start"
operator="AND">
+      <criterion comment="service rsyslog is configured to start"
test_ref="test_target_rsyslog" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="any_exist"
+  comment="rsyslog should be in at least one target"
id="test_target_rsyslog" version="1">
+    <unix:object object_ref="object_rsyslog_enabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for rsyslog in all targets"
+  id="object_rsyslog_enabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/rsyslog\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/service_saslauthd_disabled.xml
b/RHEL/7/input/checks/templates/output/service_saslauthd_disabled.xml
new file mode 100644
index 0000000..e1571a7
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/service_saslauthd_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_saslauthd_disabled"
+  version="1">
+    <metadata>
+      <title>Service saslauthd Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The saslauthd service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package cyrus-sasl removed or service saslauthd is not
configured to start" operator="OR">
+      <extend_definition comment="cyrus-sasl removed"
definition_ref="package_cyrus-sasl_removed" />
+      <criterion comment="service saslauthd is not configured to start"
test_ref="test_target_saslauthd" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="saslauthd should not be in any target"
id="test_target_saslauthd" version="1">
+    <unix:object object_ref="object_saslauthd_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for saslauthd in all targets"
+  id="object_saslauthd_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/saslauthd\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/service_smartd_disabled.xml
b/RHEL/7/input/checks/templates/output/service_smartd_disabled.xml
new file mode 100644
index 0000000..f413711
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/service_smartd_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_smartd_disabled"
+  version="1">
+    <metadata>
+      <title>Service smartd Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The smartd service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package smartmontools removed or service smartd is not
configured to start" operator="OR">
+      <extend_definition comment="smartmontools removed"
definition_ref="package_smartmontools_removed" />
+      <criterion comment="service smartd is not configured to start"
test_ref="test_target_smartd" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="smartd should not be in any target"
id="test_target_smartd" version="1">
+    <unix:object object_ref="object_smartd_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for smartd in all targets"
+  id="object_smartd_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/smartd\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/service_smb_disabled.xml
b/RHEL/7/input/checks/templates/output/service_smb_disabled.xml
new file mode 100644
index 0000000..65a48c0
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/service_smb_disabled.xml
@@ -0,0 +1,32 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_smb_disabled"
+  version="1">
+    <metadata>
+      <title>Service smb Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The smb service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="service smb is not configured to start"
operator="AND">
+      <criterion comment="service smb is not configured to start"
test_ref="test_target_smb" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="smb should not be in any target" id="test_target_smb"
version="1">
+    <unix:object object_ref="object_smb_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for smb in all targets"
+  id="object_smb_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/smb\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/service_snmpd_disabled.xml
b/RHEL/7/input/checks/templates/output/service_snmpd_disabled.xml
new file mode 100644
index 0000000..d8837a3
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/service_snmpd_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_snmpd_disabled"
+  version="1">
+    <metadata>
+      <title>Service snmpd Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The snmpd service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package net-snmp removed or service snmpd is not
configured to start" operator="OR">
+      <extend_definition comment="net-snmp removed"
definition_ref="package_net-snmp_removed" />
+      <criterion comment="service snmpd is not configured to start"
test_ref="test_target_snmpd" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="snmpd should not be in any target" id="test_target_snmpd"
version="1">
+    <unix:object object_ref="object_snmpd_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for snmpd in all targets"
+  id="object_snmpd_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/snmpd\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/service_squid_disabled.xml
b/RHEL/7/input/checks/templates/output/service_squid_disabled.xml
new file mode 100644
index 0000000..33b3c77
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/service_squid_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_squid_disabled"
+  version="1">
+    <metadata>
+      <title>Service squid Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The squid service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package squid removed or service squid is not configured
to start" operator="OR">
+      <extend_definition comment="squid removed"
definition_ref="package_squid_removed" />
+      <criterion comment="service squid is not configured to start"
test_ref="test_target_squid" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="squid should not be in any target" id="test_target_squid"
version="1">
+    <unix:object object_ref="object_squid_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for squid in all targets"
+  id="object_squid_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/squid\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/service_sshd_disabled.xml
b/RHEL/7/input/checks/templates/output/service_sshd_disabled.xml
new file mode 100644
index 0000000..b5190e1
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/service_sshd_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_sshd_disabled"
+  version="1">
+    <metadata>
+      <title>Service sshd Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The sshd service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package openssh-server removed or service sshd is not
configured to start" operator="OR">
+      <extend_definition comment="openssh-server removed"
definition_ref="package_openssh-server_removed" />
+      <criterion comment="service sshd is not configured to start"
test_ref="test_target_sshd" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="sshd should not be in any target" id="test_target_sshd"
version="1">
+    <unix:object object_ref="object_sshd_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for sshd in all targets"
+  id="object_sshd_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/sshd\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/service_sysstat_disabled.xml
b/RHEL/7/input/checks/templates/output/service_sysstat_disabled.xml
new file mode 100644
index 0000000..07493cd
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/service_sysstat_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_sysstat_disabled"
+  version="1">
+    <metadata>
+      <title>Service sysstat Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The sysstat service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package sysstat removed or service sysstat is not
configured to start" operator="OR">
+      <extend_definition comment="sysstat removed"
definition_ref="package_sysstat_removed" />
+      <criterion comment="service sysstat is not configured to start"
test_ref="test_target_sysstat" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="sysstat should not be in any target"
id="test_target_sysstat" version="1">
+    <unix:object object_ref="object_sysstat_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for sysstat in all targets"
+  id="object_sysstat_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/sysstat\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/service_tftp_disabled.xml
b/RHEL/7/input/checks/templates/output/service_tftp_disabled.xml
new file mode 100644
index 0000000..008443f
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/service_tftp_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_tftp_disabled"
+  version="1">
+    <metadata>
+      <title>Service tftp Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The tftp service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package tftp-server removed or service tftp is not
configured to start" operator="OR">
+      <extend_definition comment="tftp-server removed"
definition_ref="package_tftp-server_removed" />
+      <criterion comment="service tftp is not configured to start"
test_ref="test_target_tftp" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="tftp should not be in any target" id="test_target_tftp"
version="1">
+    <unix:object object_ref="object_tftp_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for tftp in all targets"
+  id="object_tftp_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/tftp\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/service_vsftpd_disabled.xml
b/RHEL/7/input/checks/templates/output/service_vsftpd_disabled.xml
new file mode 100644
index 0000000..58b8ddb
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/service_vsftpd_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_vsftpd_disabled"
+  version="1">
+    <metadata>
+      <title>Service vsftpd Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The vsftpd service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package vsftpd removed or service vsftpd is not configured
to start" operator="OR">
+      <extend_definition comment="vsftpd removed"
definition_ref="package_vsftpd_removed" />
+      <criterion comment="service vsftpd is not configured to start"
test_ref="test_target_vsftpd" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="vsftpd should not be in any target"
id="test_target_vsftpd" version="1">
+    <unix:object object_ref="object_vsftpd_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for vsftpd in all targets"
+  id="object_vsftpd_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/vsftpd\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/service_xinetd_disabled.xml
b/RHEL/7/input/checks/templates/output/service_xinetd_disabled.xml
new file mode 100644
index 0000000..c65bbd7
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/service_xinetd_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_xinetd_disabled"
+  version="1">
+    <metadata>
+      <title>Service xinetd Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The xinetd service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package xinetd removed or service xinetd is not configured
to start" operator="OR">
+      <extend_definition comment="xinetd removed"
definition_ref="package_xinetd_removed" />
+      <criterion comment="service xinetd is not configured to start"
test_ref="test_target_xinetd" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="xinetd should not be in any target"
id="test_target_xinetd" version="1">
+    <unix:object object_ref="object_xinetd_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for xinetd in all targets"
+  id="object_xinetd_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/xinetd\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/output/service_ypbind_disabled.xml
b/RHEL/7/input/checks/templates/output/service_ypbind_disabled.xml
new file mode 100644
index 0000000..5799cb5
--- /dev/null
+++ b/RHEL/7/input/checks/templates/output/service_ypbind_disabled.xml
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_ypbind_disabled"
+  version="1">
+    <metadata>
+      <title>Service ypbind Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The ypbind service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package ypbind removed or service ypbind is not configured
to start" operator="OR">
+      <extend_definition comment="ypbind removed"
definition_ref="package_ypbind_removed" />
+      <criterion comment="service ypbind is not configured to start"
test_ref="test_target_ypbind" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="ypbind should not be in any target"
id="test_target_ypbind" version="1">
+    <unix:object object_ref="object_ypbind_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for ypbind in all targets"
+  id="object_ypbind_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/ypbind\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/packages_installed.csv
b/RHEL/7/input/checks/templates/packages_installed.csv
index d956daa..9811f87 100644
--- a/RHEL/7/input/checks/templates/packages_installed.csv
+++ b/RHEL/7/input/checks/templates/packages_installed.csv
@@ -1,12 +1,11 @@
 aide
 audit
 cronie
-GConf2
+dconf
 iptables
-iptables-ipv6
+iptables-services
 irqbalance
 ntp
-openswan
 policycoreutils
 postfix
 psacct
diff --git a/RHEL/7/input/checks/templates/packages_removed.csv
b/RHEL/7/input/checks/templates/packages_removed.csv
new file mode 100644
index 0000000..02d786f
--- /dev/null
+++ b/RHEL/7/input/checks/templates/packages_removed.csv
@@ -0,0 +1,41 @@
+abrt
+at
+bind
+cpuspeed
+cups
+cyrus-sasl
+dbus
+dhcp
+dhcpd
+dovecot
+hal
+httpd
+iputils
+kexec-tools
+libcgroup
+mdadm
+net-snmp
+nfs-utils
+oddjob
+openldap-servers
+openssh-server
+pam_ldap
+portreserve
+qpid-cpp-server
+quota
+rhnsd
+rsh-server
+samba-common
+sendmail
+smartmontools
+squid
+subscription-manager
+sysstat
+talk-server
+telnet-server
+tftp-server
+vsftpd
+xinetd
+xorg-x11-server-common
+ypbind
+ypserv
diff --git a/RHEL/7/input/checks/templates/services_systemd_disabled.csv
b/RHEL/7/input/checks/templates/services_systemd_disabled.csv
new file mode 100644
index 0000000..6310184
--- /dev/null
+++ b/RHEL/7/input/checks/templates/services_systemd_disabled.csv
@@ -0,0 +1,37 @@
+abrtd,abrt
+acpid,
+autofs,
+certmonger,
+atd,at
+avahi-daemon,
+bluetooth,
+cgconfig,libcgroup
+cups,cups
+dhcpd,dhcp
+dovecot,dovecot
+httpd,httpd
+kdump,kexec-tools
+mdmonitor,mdadm
+named,bind
+nfs-lock,nfs-utils
+nfs-server,nfs-utils
+oddjobd,oddjob
+portreserve,portreserve
+qpidd,qpid-cpp-server
+quotaon,
+rdisc,iputils
+rhsmcertd,subscription-manager
+rpcgssd,nfs-utils
+rpcidmapd,nfs-utils
+rpcsvcgssd,nfs-utils
+saslauthd,cyrus-sasl
+smartd,smartmontools
+smb,
+snmpd,net-snmp
+squid,squid
+sshd,openssh-server
+sysstat,sysstat
+tftp,tftp-server
+vsftpd,vsftpd
+xinetd,xinetd
+ypbind,ypbind
diff --git a/RHEL/7/input/checks/templates/services_systemd_enabled.csv
b/RHEL/7/input/checks/templates/services_systemd_enabled.csv
new file mode 100644
index 0000000..b3f9b1a
--- /dev/null
+++ b/RHEL/7/input/checks/templates/services_systemd_enabled.csv
@@ -0,0 +1,9 @@
+auditd,audit
+crond,cronie
+ip6tables,iptables-ipv6
+iptables,iptables
+irqbalance,irqbalance
+ntpd,ntp
+postfix,postfix
+psacct,psacct
+rsyslog,
diff --git a/RHEL/7/input/checks/templates/services_sysv_disabled.csv
b/RHEL/7/input/checks/templates/services_sysv_disabled.csv
new file mode 100644
index 0000000..88119b6
--- /dev/null
+++ b/RHEL/7/input/checks/templates/services_sysv_disabled.csv
@@ -0,0 +1 @@
+rhnsd,rhnsd
diff --git a/RHEL/7/input/checks/templates/template_BASH_package_installed
b/RHEL/7/input/checks/templates/template_BASH_package_installed
new file mode 100644
index 0000000..1ea466e
--- /dev/null
+++ b/RHEL/7/input/checks/templates/template_BASH_package_installed
@@ -0,0 +1 @@
+yum -y install PKGNAME
diff --git a/RHEL/7/input/checks/templates/template_OVAL_package_installed
b/RHEL/7/input/checks/templates/template_OVAL_package_installed
new file mode 100644
index 0000000..240b2ba
--- /dev/null
+++ b/RHEL/7/input/checks/templates/template_OVAL_package_installed
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_installed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_PKGNAME_installed"
+  version="1">
+    <metadata>
+      <title>Package PKGNAME Installed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package PKGNAME should be
installed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package PKGNAME is installed"
+      test_ref="test_package_PKGNAME_installed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="all_exist"
+  id="test_package_PKGNAME_installed" version="1"
+  comment="package PKGNAME is installed">
+    <linux:object object_ref="obj_package_PKGNAME_installed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_PKGNAME_installed"
version="1">
+    <linux:name>PKGNAME</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/templates/template_kernel_module_disabled
b/RHEL/7/input/checks/templates/template_kernel_module_disabled
new file mode 100644
index 0000000..1e31000
--- /dev/null
+++ b/RHEL/7/input/checks/templates/template_kernel_module_disabled
@@ -0,0 +1,31 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_kernel_modules_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance"
+  id="kernel_module_KERNMODULE_disabled" version="1">
+    <metadata>
+      <title>Disable KERNMODULE Kernel Module</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The kernel module KERNMODULE should be
disabled.</description>
+      <reference source="swells" ref_id="20130928"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria operator="AND">
+      <criterion test_ref="test_kernmod_KERNMODULE_disabled"
comment="kernel module KERNMODULE disabled in /etc/modprobe.d" />
+    </criteria>
+  </definition>
+
+  <ind:textfilecontent54_test id="test_kernmod_KERNMODULE_disabled"
version="1" check="all"
+  comment="kernel module KERNMODULE disabled">
+    <ind:object object_ref="obj_kernmod_KERNMODULE_disabled" />
+  </ind:textfilecontent54_test>
+
+  <ind:textfilecontent54_object id="obj_kernmod_KERNMODULE_disabled"
+  version="1" comment="kernel module KERNMODULE disabled">
+    <ind:path>/etc/modprobe.d</ind:path>
+    <ind:filename operation="pattern
match">^.*\.conf$</ind:filename>
+    <ind:pattern operation="pattern
match">^\s*install\s+KERNMODULE\s+(/bin/false|/bin/true)$</ind:pattern>
+    <ind:instance datatype="int">1</ind:instance>
+  </ind:textfilecontent54_object>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/template_package_removed
b/RHEL/7/input/checks/templates/template_package_removed
new file mode 100644
index 0000000..9f3e850
--- /dev/null
+++ b/RHEL/7/input/checks/templates/template_package_removed
@@ -0,0 +1,26 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_PKGNAME_removed"
+  version="1">
+    <metadata>
+      <title>Package PKGNAME Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The RPM package PKGNAME should be removed.</description>
+      <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package PKGNAME is removed"
+      test_ref="test_package_PKGNAME_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_PKGNAME_removed" version="1"
+  comment="package PKGNAME is removed">
+    <linux:object object_ref="obj_package_PKGNAME_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_PKGNAME_removed"
version="1">
+    <linux:name>PKGNAME</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/RHEL/7/input/checks/templates/template_service_systemd_disabled
b/RHEL/7/input/checks/templates/template_service_systemd_disabled
new file mode 100644
index 0000000..63f31be
--- /dev/null
+++ b/RHEL/7/input/checks/templates/template_service_systemd_disabled
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance"
id="service_SERVICENAME_disabled"
+  version="1">
+    <metadata>
+      <title>Service SERVICENAME Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The SERVICENAME service should be disabled if
possible.</description>
+    </metadata>
+    <criteria comment="package PACKAGENAME removed or service SERVICENAME is not
configured to start" operator="OR">
+      <extend_definition comment="PACKAGENAME removed"
definition_ref="package_PACKAGENAME_removed" />
+      <criterion comment="service SERVICENAME is not configured to start"
test_ref="test_target_SERVICENAME" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="none_exist"
+  comment="SERVICENAME should not be in any target"
id="test_target_SERVICENAME" version="1">
+    <unix:object object_ref="object_SERVICENAME_disabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for SERVICENAME in all targets"
+  id="object_SERVICENAME_disabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/SERVICENAME\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/template_service_systemd_enabled
b/RHEL/7/input/checks/templates/template_service_systemd_enabled
new file mode 100644
index 0000000..50c3b46
--- /dev/null
+++ b/RHEL/7/input/checks/templates/template_service_systemd_enabled
@@ -0,0 +1,33 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_systemd_enabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance" id="service_SERVICENAME_enabled"
+  version="1">
+    <metadata>
+      <title>Service SERVICENAME Enabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The SERVICENAME service should be enabled if
possible.</description>
+    </metadata>
+    <criteria comment="package PACKAGENAME installed and service SERVICENAME is
configured to start" operator="AND">
+      <extend_definition comment="PACKAGENAME installed"
definition_ref="package_PACKAGENAME_installed" />
+      <criterion comment="service SERVICENAME is configured to start"
test_ref="test_target_SERVICENAME" />
+    </criteria>
+  </definition>
+
+  <unix:file_test check="all" check_existence="any_exist"
+  comment="SERVICENAME should be in at least one target"
id="test_target_SERVICENAME" version="1">
+    <unix:object object_ref="object_SERVICENAME_enabled" />
+  </unix:file_test>
+
+  <unix:file_object comment="Look for SERVICENAME in all targets"
+  id="object_SERVICENAME_enabled" version="1">
+    <unix:filepath operation="pattern
match">\/etc\/systemd\/system\/.*\.wants\/SERVICENAME\.service</unix:filepath>
+    <filter action="include">state_symlink</filter>
+  </unix:file_object>
+
+  <unix:file_state id="state_symlink" version="1">
+    <unix:type operation="equals">symbolic link</unix:type>
+  </unix:file_state>
+
+</def-group>
diff --git a/RHEL/7/input/checks/templates/template_service_sysv_disabled
b/RHEL/7/input/checks/templates/template_service_sysv_disabled
new file mode 100644
index 0000000..e15d29d
--- /dev/null
+++ b/RHEL/7/input/checks/templates/template_service_sysv_disabled
@@ -0,0 +1,99 @@
+<def-group>
+  <!-- THIS FILE IS GENERATED by create_services_sysv_disabled.py.  DO NOT EDIT. 
-->
+  <definition class="compliance"
id="service_SERVICENAME_disabled"
+  version="1">
+    <metadata>
+      <title>Service SERVICENAME Disabled</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The SERVICENAME service should be disabled if
possible.</description>
+    </metadata>
+   <criteria comment="package PACKAGENAME removed or service SERVICENAME is not
configured to start" operator="OR">
+    <extend_definition comment="PACKAGENAME removed"
definition_ref="package_PACKAGENAME_removed" />
+    <criteria operator="AND" comment="service SERVICENAME is not
configured to start">
+      <criterion comment="SERVICENAME runlevel 0"
test_ref="test_runlevel0_SERVICENAME" />
+      <criterion comment="SERVICENAME runlevel 1"
test_ref="test_runlevel1_SERVICENAME" />
+      <criterion comment="SERVICENAME runlevel 2"
test_ref="test_runlevel2_SERVICENAME" />
+      <criterion comment="SERVICENAME runlevel 3"
test_ref="test_runlevel3_SERVICENAME" />
+      <criterion comment="SERVICENAME runlevel 4"
test_ref="test_runlevel4_SERVICENAME" />
+      <criterion comment="SERVICENAME runlevel 5"
test_ref="test_runlevel5_SERVICENAME" />
+      <criterion comment="SERVICENAME runlevel 6"
test_ref="test_runlevel6_SERVICENAME" />
+    </criteria>
+    </criteria>
+  </definition>
+  <unix:runlevel_test check="all" check_existence="any_exist"
+  comment="Runlevel test" id="test_runlevel0_SERVICENAME"
+  version="2">
+    <unix:object object_ref="obj_runlevel0_SERVICENAME" />
+    <unix:state state_ref="state_service_SERVICENAME_off" />
+  </unix:runlevel_test>
+  <unix:runlevel_test check="all" check_existence="any_exist"
+  comment="Runlevel test" id="test_runlevel1_SERVICENAME"
+  version="2">
+    <unix:object object_ref="obj_runlevel1_SERVICENAME" />
+    <unix:state state_ref="state_service_SERVICENAME_off" />
+  </unix:runlevel_test>
+  <unix:runlevel_test check="all" check_existence="any_exist"
+  comment="Runlevel test" id="test_runlevel2_SERVICENAME"
+  version="2">
+    <unix:object object_ref="obj_runlevel2_SERVICENAME" />
+    <unix:state state_ref="state_service_SERVICENAME_off" />
+  </unix:runlevel_test>
+  <unix:runlevel_test check="all" check_existence="any_exist"
+  comment="Runlevel test" id="test_runlevel3_SERVICENAME"
+  version="2">
+    <unix:object object_ref="obj_runlevel3_SERVICENAME" />
+    <unix:state state_ref="state_service_SERVICENAME_off" />
+  </unix:runlevel_test>
+  <unix:runlevel_test check="all" check_existence="any_exist"
+  comment="Runlevel test" id="test_runlevel4_SERVICENAME"
+  version="2">
+    <unix:object object_ref="obj_runlevel4_SERVICENAME" />
+    <unix:state state_ref="state_service_SERVICENAME_off" />
+  </unix:runlevel_test>
+  <unix:runlevel_test check="all" check_existence="any_exist"
+  comment="Runlevel test" id="test_runlevel5_SERVICENAME"
+  version="2">
+    <unix:object object_ref="obj_runlevel5_SERVICENAME" />
+    <unix:state state_ref="state_service_SERVICENAME_off" />
+  </unix:runlevel_test>
+  <unix:runlevel_test check="all" check_existence="any_exist"
+  comment="Runlevel test" id="test_runlevel6_SERVICENAME"
+  version="2">
+    <unix:object object_ref="obj_runlevel6_SERVICENAME" />
+    <unix:state state_ref="state_service_SERVICENAME_off" />
+  </unix:runlevel_test>
+  <unix:runlevel_object id="obj_runlevel0_SERVICENAME"
version="1">
+    <unix:service_name>SERVICENAME</unix:service_name>
+    <unix:runlevel operation="equals">0</unix:runlevel>
+  </unix:runlevel_object>
+  <unix:runlevel_object id="obj_runlevel1_SERVICENAME"
version="1">
+    <unix:service_name>SERVICENAME</unix:service_name>
+    <unix:runlevel operation="equals">1</unix:runlevel>
+  </unix:runlevel_object>
+  <unix:runlevel_object id="obj_runlevel2_SERVICENAME"
version="1">
+    <unix:service_name>SERVICENAME</unix:service_name>
+    <unix:runlevel operation="equals">2</unix:runlevel>
+  </unix:runlevel_object>
+  <unix:runlevel_object id="obj_runlevel3_SERVICENAME"
version="1">
+    <unix:service_name>SERVICENAME</unix:service_name>
+    <unix:runlevel operation="equals">3</unix:runlevel>
+  </unix:runlevel_object>
+  <unix:runlevel_object id="obj_runlevel4_SERVICENAME"
version="1">
+    <unix:service_name>SERVICENAME</unix:service_name>
+    <unix:runlevel operation="equals">4</unix:runlevel>
+  </unix:runlevel_object>
+  <unix:runlevel_object id="obj_runlevel5_SERVICENAME"
version="1">
+    <unix:service_name>SERVICENAME</unix:service_name>
+    <unix:runlevel operation="equals">5</unix:runlevel>
+  </unix:runlevel_object>
+  <unix:runlevel_object id="obj_runlevel6_SERVICENAME"
version="1">
+    <unix:service_name>SERVICENAME</unix:service_name>
+    <unix:runlevel operation="equals">6</unix:runlevel>
+  </unix:runlevel_object>
+  <unix:runlevel_state comment="not configured to start"
id="state_service_SERVICENAME_off" version="1">
+    <unix:start datatype="boolean">false</unix:start>
+    <unix:kill datatype="boolean">true</unix:kill>
+  </unix:runlevel_state>
+</def-group>
diff --git a/RHEL/7/input/fixes/bash/package_dconf_installed.sh
b/RHEL/7/input/fixes/bash/package_dconf_installed.sh
new file mode 100644
index 0000000..d276612
--- /dev/null
+++ b/RHEL/7/input/fixes/bash/package_dconf_installed.sh
@@ -0,0 +1 @@
+yum -y install dconf
diff --git a/RHEL/7/input/fixes/bash/package_iptables-services_installed.sh
b/RHEL/7/input/fixes/bash/package_iptables-services_installed.sh
new file mode 100644
index 0000000..6c602dd
--- /dev/null
+++ b/RHEL/7/input/fixes/bash/package_iptables-services_installed.sh
@@ -0,0 +1 @@
+yum -y install iptables-services
diff --git a/RHEL/7/transforms/idtranslate.pyc b/RHEL/7/transforms/idtranslate.pyc
index fb064b84de1e759615a888176d5d5fbb2582e5c0..8e23a1ecb418adabd17e6b05dde91e7af945deae
100644
GIT binary patch
delta 1489
zcmaJ=OKTHR6h7xBGsz^Ggf^0guT*R?bkTrlpx`6a$41<=XdkqO(pWN;HdZ68wxNaW
zTnP1Uec;YTH^qgx(2bie^$)lZ#gz*M_kQP2`j8HW+{w+k=YEfK&O9%^E>=GOc4J?@
zzaO5V&d0`Y1?#@cL^XVw?hsAv?wKZdC$7lbs2t<^#;p<_Pl|ZFEhg(YKSZ@7RGvss
zee0*ChAjYI63`JmRt;!RP0^g9#u;KiQ1B2B313^$q@os6OVKKm#KY7Eszv!#MYD=V
zSPzAkQWc<;>W%r^rTOUx_og*R%1^_`Z+7uf&Z!ybr%-1Z@@x3hH2eVD&(LHe#Ucj#
z2!pffi<5}3HACd-yWy=MMqRghuexlpEJLdHldc4i?$kj1g983RN}%{;<@zP)kWeC&
z_tk`rK8aeLXwyb|(*7EtXv~EYm4O~dmY$8QkBvbEYyq)~4a$m*ap@^)8#z_O=fP-L
zGEt#ch=eX=O7B-FX~cTA+~EZ#*5{(n0wk1m!6|TBUvv(K(LPU4IR$^S?yLmn55+E|
zJ+#<#AFY>iV7#=BjRoePjt}$;vVR3i<bt^a2=ok-)DG=N_2c;LL72q&l_=_BX5$ey
zn09!6m^b8@JD@-a3WQ+{(da^nm<<oGO{#DrPrpnQ+0)yJcLzBlWxef|#&>ya49D^x
z88N5@%H^pa3~*F=*GdZw2vg$~)MFHu@Pk8WQG}Vu!dO;Dr0U1@^<;i+E=r9Ih66JZ
z5h%PUqS+#8Q739q&88ZT!&HkJhfyS{mTi)R!ZCJXDQ4tgNbuGf_omhVs&IT2r=-Md
za%D$ejIxp$m#f%R<Fx1+iselMoA6z~pcb@5sOgetLUT4X27OPC97t{VP~((ECc=4x
zj<!T(EPZ)>zCM5@{{yDiQ@KeLdH+pb%&@G{J##6PIN_V?6>~c(B<==zWB41Dyf?p6
zn;bX+-@3X>0~j!3muyaPL=`xTcQeC%>ZHnX4@b;Nng=<}=Q+nkeWH6Z0PC#&*!>|O
Jjwwsu_zNsg4W0l1

delta 1507
zcmZ`&O-NKx6h8O9pZR@Gj^#L*C4<pm&_vWwkRocekw}NMM6+;^e460+YOH237-$uN
z-9->Zv@>WUEu>AGAX)}(TDNE?En2jTzH{Gmw3r#*ee>SA=X^is+_#Z^nH?~GInmnL
zt+81Oeg^&ruvQ#FRKz7{k!Z61END{f#3i}w16^W%{dx|!Ct2LKvMux2-%rI(%1_2=
zeskNBml<@3K}T_`XwdGWqy<T(q2T?ni?G3THAz#Fs)DMLDuOs}QVpOMr7M!=Bo)-K
zQEnXsR_^Z2Qm$Ms=Wcno7nO+TpPGlp_KAZcC1;_Zn7B@U5ig$R2ijf=PiQF_W-ox!
z^QE06Xe@XJxymy)8}ljG>gkLNQ}EK1axdi_^~UNPVV@cHS-^7PM6y-*gt2rLit3aj
z1Ue+8wG30sx<Q`h$2=QS+U@U6r1XU{4rIu7hzavji=l^NTy2Ls`dmphZGA@LyD()k
zFFH{*Gyw!bncs;q=5uW>5lcjBIQ*gs=aI<a!K81T`)pzjVXgGx#u&a|Z5e(sR2T;>
zjHlXpzJ7{&6nW5u;6k*&ja#PA1?ss1=T1F~UTsowDt5fL&I?Z>AVIse4sN|skE+M9
zxrRX3&RaWX?&ATU0vdHMtp(szYBU^2c4g4SQjUbsOhDJE%!)kqDxMXt`W%1XkR`7^
zIl1x34%2TO+SMNd9fAYk3{QU(fUjU&eh)A%%*~|IM*?~2wcdgj$p<F|Ybic#epp><
zNv|!0sZ=FCIU&x)N5qOP!dQc#MMay6*fpsb*7m~4kyV>>m^s3YV>{7+4VeJJ#fO74
zb_GOy0e*X<R2&V2MJdIJF|NYHOpKNt#$Vmg0CC^!bE-l|h&+c}9a^xdG%b7)h_eXQ
zpXgXaH}Hz#?$Lp=mOW+8zh%$@DGBr_MkyqsJgp`DhqUYnTob#lxFqhoa)K@tdjcq@
zkt-ORV4?5+B;JZ9L;u;DJl2b$lV}qOVaqO&!Uuam^vH}%iEd#do)l-W&SB@MI+2`e
Sh;&+gNq%U!lUHBcuKWdHLmM9e

diff --git a/shared/oval/package_aide_installed.xml
b/shared/oval/package_aide_installed.xml
index b46f78d..413bb7d 100644
--- a/shared/oval/package_aide_installed.xml
+++ b/shared/oval/package_aide_installed.xml
@@ -1,15 +1,14 @@
 <def-group>
+ <!-- THIS FILE IS GENERATED by create_package_installed.py.  DO NOT EDIT.  -->
   <definition class="compliance" id="package_aide_installed"
   version="1">
     <metadata>
       <title>Package aide Installed</title>
       <affected family="unix">
         <platform>Red Hat Enterprise Linux 6</platform>
-        <platform>Red Hat Enterprise Linux 7</platform>
       </affected>
       <description>The RPM package aide should be installed.</description>
       <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
-      <!-- rhel7 <reference source="swells" ref_id="20131223"
ref_url="test_attestation" /> -->
     </metadata>
     <criteria>
       <criterion comment="package aide is installed"
diff --git a/shared/oval/package_openssh-server_removed.xml
b/shared/oval/package_openssh-server_removed.xml
index 311463e..5455384 100644
--- a/shared/oval/package_openssh-server_removed.xml
+++ b/shared/oval/package_openssh-server_removed.xml
@@ -6,7 +6,6 @@
       <title>Package openssh-server Removed</title>
       <affected family="unix">
         <platform>Red Hat Enterprise Linux 6</platform>
-        <platform>Red Hat Enterprise Linux 7</platform>
       </affected>
       <description>The RPM package openssh-server should be
removed.</description>
       <reference source="swells" ref_id="20130829"
ref_url="test_attestation"/>
-- 
1.7.1