diff --git a/module_utils/snapshot_lsr/lvm.py b/module_utils/snapshot_lsr/lvm.py
index 8f904a15..092a4349 100644
--- a/module_utils/snapshot_lsr/lvm.py
+++ b/module_utils/snapshot_lsr/lvm.py
@@ -96,7 +96,9 @@ def get_json_from_args(module, module_args, vg_include):
         vg_str = vg["vg_name"]
         for lv in lv_list:
 
-            if lv["lv_name"].endswith(module_args["snapshot_lvm_snapset_name"]):
+            if module_args["snapshot_lvm_snapset_name"] and lv["lv_name"].endswith(
+                module_args["snapshot_lvm_snapset_name"]
+            ):
                 logger.info(
                     "get_json_from_args: already a snapshot for %s", lv["lv_name"]
                 )
@@ -129,7 +131,7 @@ def get_json_from_args(module, module_args, vg_include):
                 )
                 continue
             volume = {}
-            volume["name"] = ("snapshot : " + vg_str + "/" + lv["lv_name"],)
+            volume["name"] = "snapshot : " + vg_str + "/" + lv["lv_name"]
             volume["vg"] = vg_str
             volume["lv"] = lv["lv_name"]
 
diff --git a/module_utils/snapshot_lsr/snapmgr.py b/module_utils/snapshot_lsr/snapmgr.py
index 2524c69f..9d5823e2 100644
--- a/module_utils/snapshot_lsr/snapmgr.py
+++ b/module_utils/snapshot_lsr/snapmgr.py
@@ -240,7 +240,11 @@ def mgr_snapshot_cmd(module, module_args, snapset_json):
     source_list = mgr_get_source_list_for_create(volume_list)
 
     if check_mode:
-        return {rc, "Would call function manager.create_snapshot_set()", False}
+        return {
+            "return_code": SnapshotStatus.SNAPSHOT_OK,
+            "errors": "Would call function manager.create_snapshot_set()",
+            "changed": False,
+        }
 
     manager = snap_manager.Manager()
 
@@ -437,14 +441,15 @@ def mgr_extend_cmd(module, module_args, snapset_json):
 
     if check_mode:
         return {
-            rc,
-            "Would run function "
-            + " manager.resize_snapshot_set() with ".join(source_list),
+            "return_code": rc,
+            "errors": "Would run function manager.resize_snapshot_set() with "
+            + ", ".join(source_list),
+            "changed": False,
         }
 
     # there are no LVs that require an extend operation, return OK.
     if len(source_list) == 0:
-        return {"return_code": rc, "errors": "source list emmpty", "changed": changed}
+        return {"return_code": rc, "errors": "source list empty", "changed": changed}
 
     try:
         manager.resize_snapshot_set(source_list, snapset_name)
@@ -472,9 +477,10 @@ def mgr_revert_cmd(module_args, snapset_json):
 
     if check_mode:
         return {
-            rc,
-            "Would run function "
-            + " manager.revert_snapshot_set with ".join(snapset_name),
+            "return_code": rc,
+            "errors": "Would run function manager.revert_snapshot_set with "
+            + snapset_name,
+            "changed": False,
         }
 
     manager = snap_manager.Manager()
@@ -512,7 +518,7 @@ def mgr_mount_cmd(module, module_args, snapset_json):
     if snapshot_set is None or len(snapshot_set) == 0:
         return {
             "return_code": SnapshotStatus.ERROR_MOUNT_FAILED,
-            "errors": "snnapshot not found:" + snapset_name,
+            "errors": "snapshot not found: " + snapset_name,
             "changed": False,
         }
 
@@ -545,7 +551,7 @@ def mgr_umount_cmd(module, module_args, snapset_json):
     if snapshot_set is None or len(snapshot_set) == 0:
         return {
             "return_code": SnapshotStatus.ERROR_MOUNT_FAILED,
-            "errors": "snnapshot not found:" + snapset_name,
+            "errors": "snapshot not found: " + snapset_name,
             "changed": False,
         }
 
diff --git a/module_utils/snapshot_lsr/validate.py b/module_utils/snapshot_lsr/validate.py
index e7811bcf..b72defac 100644
--- a/module_utils/snapshot_lsr/validate.py
+++ b/module_utils/snapshot_lsr/validate.py
@@ -46,7 +46,9 @@ def get_json_from_args(module, module_args, vg_include):
         vg_str = vg["vg_name"]
         for lv in lv_list:
 
-            if lv["lv_name"].endswith(module_args["snapshot_lvm_snapset_name"]):
+            if module_args["snapshot_lvm_snapset_name"] and lv["lv_name"].endswith(
+                module_args["snapshot_lvm_snapset_name"]
+            ):
                 logger.info(
                     "get_json_from_args: already a snapshot for %s", lv["lv_name"]
                 )
@@ -79,7 +81,7 @@ def get_json_from_args(module, module_args, vg_include):
                 )
                 continue
             volume = {}
-            volume["name"] = ("snapshot : " + vg_str + "/" + lv["lv_name"],)
+            volume["name"] = "snapshot : " + vg_str + "/" + lv["lv_name"]
             volume["vg"] = vg_str
             volume["lv"] = lv["lv_name"]
 
diff --git a/tests/library/find_unused_disk.py b/tests/library/find_unused_disk.py
index a87bd22a..4f8c90e5 100644
--- a/tests/library/find_unused_disk.py
+++ b/tests/library/find_unused_disk.py
@@ -117,7 +117,8 @@ def no_holders(disk_path):
 def can_open(disk_path):
     """Return true if the device can be opened with exclusive access."""
     try:
-        os.open(disk_path, os.O_EXCL)
+        fd = os.open(disk_path, os.O_EXCL)
+        os.close(fd)
         return True
     except OSError:
         return False