diff --git a/meta/main.yml b/meta/main.yml
index a0fa26f9..d07ca641 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -1,7 +1,7 @@
 ---
 galaxy_info:
   author: OpenStack
-  description: Security hardening role for OpenStack Ansible
+  description: Security hardening role for OpenStack-Ansible
   company: OpenStack
   license: Apache
   min_ansible_version: 1.8
diff --git a/tasks/misc.yml b/tasks/misc.yml
index 0569012a..a34836de 100644
--- a/tasks/misc.yml
+++ b/tasks/misc.yml
@@ -21,10 +21,19 @@
     - cat2
     - V-38489
 
+- name: Verify that AIDE configuration directory exists
+  stat:
+    path: /etc/aide/aide.conf.d
+  register: aide_conf
+  always_run: true
+  tags:
+    - always
+
 - name: V-38489 - Exclude certain directories from AIDE and initialize DB
   template:
     src: ZZ_aide_exclusions.j2
     dest: /etc/aide/aide.conf.d/ZZ_aide_exclusions
+  when: aide_conf.stat.exists | bool
   notify:
     - initialize AIDE
   tags:
@@ -43,7 +52,9 @@
 - name: V-38670 - System must detect unauthorized changes to software and information
   fail:
     msg: "FAILED: AIDE cron job is missing"
-  when: v38670_result.stat.exists == False
+  when:
+    - not check_mode
+    - v38670_result.stat.exists == False
   tags:
     - cat2
     - V-38670
@@ -125,7 +136,9 @@
 - name: V-38624 - System logs must be rotated daily (verify cron job)
   fail:
     msg: "FAILED: Cron job for logrotate is missing"
-  when: v38624_result.stat.exists == False
+  when:
+    - not check_mode
+    - v38624_result.stat.exists == False
   tags:
    - cat3
    - V-38624
@@ -178,7 +191,10 @@
 - name: V-38660 - The snmpd service must only use SNMPv3 or newer
   fail:
     msg: "FAILED: Insecure SNMP configuration found -- use SNMPv3 only"
-  when: v38660_snmpd_installed.rc == 0 and v38660_result.rc == 0
+  when:
+    - not check_mode
+    - v38660_snmpd_installed.rc == 0
+    - v38660_result.rc == 0
   tags:
     - cat2
     - V-38660
diff --git a/tests/ansible.cfg b/tests/ansible.cfg
index 6c8a3443..8a266959 100644
--- a/tests/ansible.cfg
+++ b/tests/ansible.cfg
@@ -1,2 +1,3 @@
 [defaults]
-roles_path = ../..
+roles_path = ../../
+remote_tmp = ../.ansible/tmp/
diff --git a/tests/inventory b/tests/inventory
index df8b5f69..185aaefc 100644
--- a/tests/inventory
+++ b/tests/inventory
@@ -1,2 +1,2 @@
 [all]
-localhost ansible_connection=local
+localhost ansible_connection=local physical_host=localhost ansible_become=True