diff --git a/tests/tests_check_no_lv_fail.yml b/tests/tests_check_no_lv_fail.yml
index a78bc0d..c3d09dd 100644
--- a/tests/tests_check_no_lv_fail.yml
+++ b/tests/tests_check_no_lv_fail.yml
@@ -23,11 +23,10 @@
             __snapshot_failed_msg: >-
               Role check did not fail with incorrect LV name
             __snapshot_failed_params:
+              snapshot_lvm_action: check
               snapshot_lvm_vg: test_vg1
               snapshot_lvm_lv: xxxxx
               snapshot_lvm_snapset_name: snapset1
-              snapshot_lvm_verify_only: true
-              snapshot_lvm_action: check
             __snapshot_failed_changed: false
       always:
         - name: Cleanup
diff --git a/tests/tests_check_no_vg_fail.yml b/tests/tests_check_no_vg_fail.yml
index c778a98..61003cb 100644
--- a/tests/tests_check_no_vg_fail.yml
+++ b/tests/tests_check_no_vg_fail.yml
@@ -22,10 +22,14 @@
             __snapshot_failed_regex: "source volume group does not exist:*"
             __snapshot_failed_msg: Role check did not fail with wrong VG
             __snapshot_failed_params:
+              snapshot_lvm_action: check
               snapshot_lvm_vg: xxxxxx
               snapshot_lvm_snapset_name: snapset1
               snapshot_lvm_verify_only: true
-              snapshot_lvm_action: check
+              snapshot_lvm_all_vgs: false
+              snapshot_lvm_mountpoint_create: false
+              snapshot_lvm_unmount_all: false
+              snapshot_lvm_mount_origin: false
             __snapshot_failed_changed: false
       always:
         - name: Cleanup
diff --git a/tests/tests_mount_no_vg_fail.yml b/tests/tests_mount_no_vg_fail.yml
index 36a3a4b..67cf536 100644
--- a/tests/tests_mount_no_vg_fail.yml
+++ b/tests/tests_mount_no_vg_fail.yml
@@ -40,6 +40,9 @@
               snapshot_lvm_lv: lv1
               snapshot_lvm_mountpoint: "{{ test_mnt_parent ~ '/lv1_mp' }}"
               snapshot_lvm_mountpoint_create: true
+              snapshot_lvm_unmount_all: false
+              snapshot_lvm_mount_origin: false
+              snapshot_lvm_verify_only: false
             __snapshot_failed_changed: false
 
         - name: Remove the snapshot LVs
diff --git a/tests/tests_mount_verify_fail.yml b/tests/tests_mount_verify_fail.yml
index 0ccd8a1..49d7329 100644
--- a/tests/tests_mount_verify_fail.yml
+++ b/tests/tests_mount_verify_fail.yml
@@ -38,6 +38,11 @@
             snapshot_lvm_lv: lv1
             snapshot_lvm_mountpoint: "{{ test_mnt_parent ~ '/lv1_mp' }}"
             snapshot_lvm_mountpoint_create: true
+            snapshot_lvm_all_vgs: false
+            snapshot_lvm_unmount_all: false
+            snapshot_lvm_mount_origin: false
+            snapshot_lvm_verify_only: false
+            __snapshot_failed_changed: false
 
         - name: Verify snapshot is mounted for lv1
           include_role:
diff --git a/tests/tests_no_space_fail.yml b/tests/tests_no_space_fail.yml
index a8b229b..3c77139 100644
--- a/tests/tests_no_space_fail.yml
+++ b/tests/tests_no_space_fail.yml
@@ -25,7 +25,7 @@
             __snapshot_failed_msg: Role did not fail with no space error
             __snapshot_failed_params:
               snapshot_lvm_percent_space_required: 15
-              snapshot_all: true
+              snapshot_lvm_all_vgs: true
               snapshot_lvm_snapset_name: snapset1
               snapshot_lvm_action: snapshot
             __snapshot_failed_changed: false
diff --git a/tests/verify-role-failed.yml b/tests/verify-role-failed.yml
index a661a6f..a7fc237 100644
--- a/tests/verify-role-failed.yml
+++ b/tests/verify-role-failed.yml
@@ -14,7 +14,7 @@
           __snapshot_failed_params.get('snapshot_lvm_percent_space_required')
           }}"
         snapshot_lvm_all_vgs: "{{
-          __snapshot_failed_params.get('snapshot_all')
+          __snapshot_failed_params.get('snapshot_lvm_all_vgs') | d(false)
           }}"
         snapshot_lvm_snapset_name: "{{
           __snapshot_failed_params.get('snapshot_lvm_snapset_name')
@@ -26,7 +26,7 @@
           __snapshot_failed_params.get('snapshot_lvm_action')
           }}"
         snapshot_lvm_verify_only: "{{
-          __snapshot_failed_params.get('snapshot_lvm_verify_only')
+          __snapshot_failed_params.get('snapshot_lvm_verify_only') | d(false)
           }}"
         snapshot_lvm_vg: "{{
           __snapshot_failed_params.get('snapshot_lvm_vg')
@@ -35,13 +35,13 @@
           __snapshot_failed_params.get('snapshot_lvm_lv')
           }}"
         snapshot_lvm_mount_origin: "{{
-          __snapshot_failed_params.get('snapshot_lvm_mount_origin')
+          __snapshot_failed_params.get('snapshot_lvm_mount_origin') | d(false)
           }}"
         snapshot_lvm_mountpoint_create: "{{
-          __snapshot_failed_params.get('snapshot_lvm_mountpoint_create')
+          __snapshot_failed_params.get('snapshot_lvm_mountpoint_create') | d(false)
           }}"
         snapshot_lvm_unmount_all: "{{
-          __snapshot_failed_params.get('snapshot_lvm_unmount_all')
+          __snapshot_failed_params.get('snapshot_lvm_unmount_all') | d(false)
           }}"
         snapshot_lvm_mountpoint: "{{
           __snapshot_failed_params.get('snapshot_lvm_mountpoint')