diff --git a/plugins/modules/dcnm_bootflash.py b/plugins/modules/dcnm_bootflash.py
index 317670a79..ad4e10e7c 100644
--- a/plugins/modules/dcnm_bootflash.py
+++ b/plugins/modules/dcnm_bootflash.py
@@ -16,7 +16,7 @@
 # pylint: disable=wrong-import-position
 from __future__ import absolute_import, division, print_function
 
-__metaclass__ = type
+__metaclass__ = type  # pylint: disable=invalid-name
 __author__ = "Allen Robel"
 
 DOCUMENTATION = """
@@ -188,37 +188,26 @@
 import copy
 import inspect
 import logging
+from typing import Any
 
 from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.cisco.dcnm.plugins.module_utils.bootflash.bootflash_files import \
-    BootflashFiles
-from ansible_collections.cisco.dcnm.plugins.module_utils.bootflash.bootflash_info import \
-    BootflashInfo
-from ansible_collections.cisco.dcnm.plugins.module_utils.bootflash.convert_target_to_params import \
-    ConvertTargetToParams
-from ansible_collections.cisco.dcnm.plugins.module_utils.common.log_v2 import \
-    Log
-from ansible_collections.cisco.dcnm.plugins.module_utils.common.properties import \
-    Properties
-from ansible_collections.cisco.dcnm.plugins.module_utils.common.response_handler import \
-    ResponseHandler
-from ansible_collections.cisco.dcnm.plugins.module_utils.common.rest_send_v2 import \
-    RestSend
-from ansible_collections.cisco.dcnm.plugins.module_utils.common.results import \
-    Results
-from ansible_collections.cisco.dcnm.plugins.module_utils.common.sender_dcnm import \
-    Sender
-from ansible_collections.cisco.dcnm.plugins.module_utils.common.switch_details import \
-    SwitchDetails
-
-
-@Properties.add_rest_send
+from ansible_collections.cisco.dcnm.plugins.module_utils.bootflash.bootflash_files import BootflashFiles
+from ansible_collections.cisco.dcnm.plugins.module_utils.bootflash.bootflash_info import BootflashInfo
+from ansible_collections.cisco.dcnm.plugins.module_utils.bootflash.convert_target_to_params import ConvertTargetToParams
+from ansible_collections.cisco.dcnm.plugins.module_utils.common.log_v2 import Log
+from ansible_collections.cisco.dcnm.plugins.module_utils.common.response_handler import ResponseHandler
+from ansible_collections.cisco.dcnm.plugins.module_utils.common.rest_send_v2 import RestSend
+from ansible_collections.cisco.dcnm.plugins.module_utils.common.results import Results
+from ansible_collections.cisco.dcnm.plugins.module_utils.common.sender_dcnm import Sender
+from ansible_collections.cisco.dcnm.plugins.module_utils.common.switch_details import SwitchDetails
+
+
 class Common:
     """
     Common methods for all states
     """
 
-    def __init__(self, params):
+    def __init__(self, params: dict[str, Any]) -> None:
         self.class_name = self.__class__.__name__
         method_name = inspect.stack()[0][3]
 
@@ -238,20 +227,21 @@ def __init__(self, params):
         def raise_error(msg):
             raise ValueError(f"{self.class_name}.{method_name}: {msg}")
 
-        self.check_mode = self.params.get("check_mode", None)
-        if self.check_mode is None:
+        if self.params.get("check_mode") is None:
             msg = "params is missing mandatory key: check_mode."
             raise_error(msg)
 
+        self.check_mode: bool = self.params.get("check_mode", False)
+
         if self.check_mode not in [True, False]:
             msg = "check_mode must be True or False. "
             msg += f"Got {self.check_mode}."
             raise_error(msg)
 
-        self._valid_states = ["deleted", "query"]
+        self._valid_states: list[str] = ["deleted", "query"]
 
-        self.state = self.params.get("state", None)
-        if self.state is None:
+        self.state: str = self.params.get("state", "")
+        if not self.state:
             msg = "params is missing mandatory key: state."
             raise_error(msg)
         if self.state not in self._valid_states:
@@ -259,24 +249,23 @@ def raise_error(msg):
             msg += f"Expected one of: {','.join(self._valid_states)}."
             raise_error(msg)
 
-        self.config = self.params.get("config", None)
+        self.config: dict[str, Any] = self.params.get("config", {})
         if not isinstance(self.config, dict):
             msg = "Expected dict for config. "
             msg += f"Got {type(self.config).__name__}."
             raise_error(msg)
 
-        self.targets = self.config.get("targets", None)
+        self.targets: list[dict] = self.config.get("targets", [])
         if not isinstance(self.targets, list):
             self.targets = []
 
-        if len(self.targets) > 0:
-            for item in self.targets:
-                if not isinstance(item, dict):
-                    msg = "Expected list of dict for params.config.targets. "
-                    msg += f"Got list element of type {type(item).__name__}."
-                    raise_error(msg)
+        for item in self.targets:
+            if not isinstance(item, dict):
+                msg = "Expected list of dict for params.config.targets. "
+                msg += f"Got list element of type {type(item).__name__}."
+                raise_error(msg)
 
-        self.switches = self.config.get("switches", None)
+        self.switches: list[dict] = self.config.get("switches", [])
         if not isinstance(self.switches, list):
             msg = "Expected list of dict for params.config.switches. "
             msg += f"Got {type(self.switches).__name__}."
@@ -288,14 +277,14 @@ def raise_error(msg):
                 msg += f"Got list element of type {type(item).__name__}."
                 raise_error(msg)
 
-        self._rest_send = None
+        self._rest_send: RestSend = RestSend({})
 
-        self.bootflash_info = BootflashInfo()
-        self.convert_target_to_params = ConvertTargetToParams()
-        self.results = Results()
+        self.bootflash_info: BootflashInfo = BootflashInfo()
+        self.convert_target_to_params: ConvertTargetToParams = ConvertTargetToParams()
+        self.results: Results = Results()
         self.results.state = self.state
         self.results.check_mode = self.check_mode
-        self.want = []
+        self.want: list[dict] = []
 
         msg = f"ENTERED Common().{method_name}: "
         msg += f"state: {self.state}, "
@@ -361,29 +350,69 @@ def raise_type_error(msg):
             raise TypeError(f"{self.class_name}.{method_name}: {msg}")
 
         for switch in self.switches:
-            if switch.get("ip_address", None) is None:
+            if not switch.get("ip_address"):
                 msg = "Expected ip_address in switch dict. "
                 msg += f"Got {switch}."
                 raise_value_error(msg)
 
-            if switch.get("targets", None) is None:
+            if not switch.get("targets", []):
                 switch["targets"] = self.targets
             if not isinstance(switch["targets"], list):
                 msg = "Expected list of dictionaries for switch['targets']. "
                 msg += f"Got {type(switch['targets']).__name__}."
                 raise_type_error(msg)
 
-            for target in switch["targets"]:
-                if target.get("filepath", None) is None:
+            target: dict[str, str]
+            for target in switch.get("targets", []):
+                if not target.get("filepath"):
                     msg = "Expected filepath in target dict. "
                     msg += f"Got {target}."
                     raise_value_error(msg)
-                if target.get("supervisor", None) is None:
+                if not target.get("supervisor"):
                     msg = "Expected supervisor in target dict. "
                     msg += f"Got {target}."
                     raise_value_error(msg)
             self.want.append(copy.deepcopy(switch))
 
+    @property
+    def rest_send(self) -> RestSend:
+        """
+        ### Summary
+        An instance of the RestSend class.
+
+        ### Raises
+        -   getter: `ValueError` if rest_send has not been properly initialized (missing params).
+        -   setter: ``TypeError`` if the value is not an instance of RestSend.
+
+        ### getter
+        Return a properly initialized instance of the RestSend class.
+
+        ### setter
+        Set an instance of the RestSend class.
+        """
+        if not self._rest_send.params:
+            msg = f"{self.class_name}.rest_send: "
+            msg += "rest_send has not been set (missing params)."
+            raise ValueError(msg)
+        return self._rest_send
+
+    @rest_send.setter
+    def rest_send(self, value: RestSend):
+        method_name = inspect.stack()[0][3]
+        _class_have = None
+        _class_need = "RestSend"
+        msg = f"{self.class_name}.{method_name}: "
+        msg += f"value must be an instance of {_class_need}. "
+        msg += f"Got value {value} of type {type(value).__name__}."
+        try:
+            _class_have = value.class_name
+        except AttributeError as error:
+            msg += f" Error detail: {error}."
+            raise TypeError(msg) from error
+        if _class_have != _class_need:
+            raise TypeError(msg)
+        self._rest_send = value
+
 
 class Deleted(Common):
     """
@@ -395,9 +424,9 @@ class Deleted(Common):
         -   ``Common.__init__()`` raises TypeError or ValueError.
     """
 
-    def __init__(self, params):
-        self.class_name = self.__class__.__name__
-        method_name = inspect.stack()[0][3]
+    def __init__(self, params: dict[str, Any]) -> None:
+        self.class_name: str = self.__class__.__name__
+        method_name: str = inspect.stack()[0][3]
         try:
             super().__init__(params)
         except (TypeError, ValueError) as error:
@@ -406,8 +435,8 @@ def __init__(self, params):
             msg += f"Error detail: {error}"
             raise ValueError(msg) from error
 
-        self.bootflash_files = BootflashFiles()
-        self.files_to_delete = {}
+        self.bootflash_files: BootflashFiles = BootflashFiles()
+        self.files_to_delete: dict[str, list[dict[str, str]]] = {}
 
         msg = f"ENTERED {self.class_name}().{method_name}: "
         msg += f"state: {self.state}, "
@@ -448,7 +477,7 @@ def populate_files_to_delete(self, switch) -> None:
         }
         ```
         """
-        method_name = inspect.stack()[0][3]
+        method_name: str = inspect.stack()[0][3]
         self.bootflash_info.filter_switch = switch["ip_address"]
         if switch["ip_address"] not in self.files_to_delete:
             self.files_to_delete[switch["ip_address"]] = []
@@ -462,11 +491,9 @@ def populate_files_to_delete(self, switch) -> None:
                 msg += "Error assigning BootflashInfo.filter_supervisor. "
                 msg += f"Error detail: {error}"
                 raise ValueError(msg) from error
-            self.files_to_delete[switch["ip_address"]].extend(
-                self.bootflash_info.matches
-            )
+            self.files_to_delete[switch["ip_address"]].extend(self.bootflash_info.matches)
 
-    def update_bootflash_files(self, ip_address, target) -> None:
+    def update_bootflash_files(self, ip_address: str, target: dict[str, str]) -> None:
         """
         ### Summary
         Call ``BootflashFiles().add_file()`` to add the file associated with
@@ -478,7 +505,7 @@ def update_bootflash_files(self, ip_address, target) -> None:
         -    ``ValueError`` if:
                 -   ``BootflashFiles().add_file`` raises ``ValueError``.
         """
-        method_name = inspect.stack()[0][3]
+        method_name: str = inspect.stack()[0][3]
 
         try:
             self.convert_target_to_params.target = target
@@ -536,7 +563,7 @@ def commit(self) -> None:
         self.bootflash_info.switch_details = SwitchDetails()
 
         # Retrieve bootflash contents for the user's switches.
-        switch_list = []
+        switch_list: list[str] = []
         for switch in self.switches:
             switch_list.append(switch["ip_address"])
         self.bootflash_info.switches = switch_list
@@ -572,13 +599,13 @@ class Query(Common):
         -   ``Common.__init__()`` raises TypeError or ValueError.
     """
 
-    def __init__(self, params):
-        self.class_name = self.__class__.__name__
+    def __init__(self, params: dict[str, Any]) -> None:
+        self.class_name: str = self.__class__.__name__
 
-        self.log = logging.getLogger(f"dcnm.{self.class_name}")
+        self.log: logging.Logger = logging.getLogger(f"dcnm.{self.class_name}")
 
-        self.action = "bootflash_info"
-        method_name = inspect.stack()[0][3]
+        self.action: str = "bootflash_info"
+        method_name: str = inspect.stack()[0][3]
 
         try:
             super().__init__(params)
@@ -601,12 +628,12 @@ def register_null_result(self) -> None:
         ### Raises
         None
         """
-        response_dict = {}
+        response_dict: dict[str, dict[str, Any]] = {}
         response_dict["0.0.0.0"] = {}
         response_dict["0.0.0.0"]["DATA"] = "No switches to query."
         response_dict["0.0.0.0"]["MESSAGE"] = "OK"
         response_dict["0.0.0.0"]["RETURN_CODE"] = 200
-        result_dict = {}
+        result_dict: dict[str, dict[str, str]] = {}
         result_dict["0.0.0.0"] = {}
         result_dict["0.0.0.0"]["found"] = False
         result_dict["0.0.0.0"]["success"] = True
@@ -617,11 +644,13 @@ def register_null_result(self) -> None:
 
     def commit(self) -> None:
         """
-        ### Summary
-        query the bootflash on all switches in self.switches
+        # Summary
+
+        Query the bootflash on all switches in self.switches
         and register the results.
 
-        ### Raises
+        ## Raises
+
         None.  While this method does not directly raise exceptions, it
         calls other methods that may raise the following exceptions:
 
@@ -630,7 +659,7 @@ def commit(self) -> None:
         -   ValueError
 
         """
-        method_name = inspect.stack()[0][3]
+        method_name: str = inspect.stack()[0][3]
         msg = f"ENTERED {self.class_name}.{method_name}: "
         msg += f"state: {self.state}, "
         msg += f"check_mode: {self.check_mode}"
@@ -655,7 +684,7 @@ def commit(self) -> None:
         self.bootflash_info.switch_details = SwitchDetails()
 
         # Retrieve bootflash contents for the user's switches.
-        switches_to_query = []
+        switches_to_query: list[str] = []
         for switch in self.switches:
             switches_to_query.append(switch["ip_address"])
         self.bootflash_info.switches = switches_to_query
@@ -667,7 +696,7 @@ def commit(self) -> None:
 
         # Update results (diff)
         # Use the file info from the controller as the diff.
-        diff_current = {}
+        diff_current: dict[str, list[dict[str, Any]]] = {}
         for switch in self.switches:
             ip_address = switch.get("ip_address")
             self.bootflash_info.filter_switch = ip_address
@@ -688,7 +717,7 @@ def main():
     main entry point for module execution
     """
 
-    argument_spec = {
+    argument_spec: dict[str, dict[str, Any]] = {
         "config": {
             "required": True,
             "type": "dict",
@@ -698,23 +727,21 @@ def main():
             "choices": ["deleted", "query"],
         },
     }
-    ansible_module = AnsibleModule(
-        argument_spec=argument_spec, supports_check_mode=True
-    )
+    ansible_module = AnsibleModule(argument_spec=argument_spec, supports_check_mode=True)
 
-    params = copy.deepcopy(ansible_module.params)
+    params: dict[str, Any] = copy.deepcopy(ansible_module.params)
     params["check_mode"] = ansible_module.check_mode
 
     # Logging setup
     try:
-        log = Log()
+        log: Log = Log()
         log.commit()
     except (TypeError, ValueError) as error:
         ansible_module.fail_json(str(error))
 
-    sender = Sender()
+    sender: Sender = Sender()
     sender.ansible_module = ansible_module
-    rest_send = RestSend(params)
+    rest_send: RestSend = RestSend(params)
     rest_send.response_handler = ResponseHandler()
     rest_send.sender = sender
 
@@ -730,6 +757,8 @@ def main():
         task.rest_send = rest_send
         task.commit()
     except (TypeError, ValueError) as error:
+        if task is None:
+            ansible_module.fail_json(f"{error}")
         ansible_module.fail_json(f"{error}", **task.results.failed_result)
 
     task.results.build_final_result()
diff --git a/tests/unit/modules/dcnm/dcnm_bootflash/fixture.py b/tests/unit/modules/dcnm/dcnm_bootflash/fixture.py
index bb3730787..d380f1660 100644
--- a/tests/unit/modules/dcnm/dcnm_bootflash/fixture.py
+++ b/tests/unit/modules/dcnm/dcnm_bootflash/fixture.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2024 Cisco and/or its affiliates.
+# Copyright (c) 2024-2025 Cisco and/or its affiliates.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,7 +14,10 @@
 
 from __future__ import absolute_import, division, print_function
 
-__metaclass__ = type
+__metaclass__ = type  # pylint: disable=invalid-name
+
+__copyright__ = "Copyright (c) 2024-2025 Cisco and/or its affiliates."
+__author__ = "Allen Robel"
 
 import json
 import os
diff --git a/tests/unit/modules/dcnm/dcnm_bootflash/test_bootflash_common.py b/tests/unit/modules/dcnm/dcnm_bootflash/test_bootflash_common.py
index 27c369e43..44db7337b 100644
--- a/tests/unit/modules/dcnm/dcnm_bootflash/test_bootflash_common.py
+++ b/tests/unit/modules/dcnm/dcnm_bootflash/test_bootflash_common.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2024 Cisco and/or its affiliates.
+# Copyright (c) 2024-2025 Cisco and/or its affiliates.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,19 +20,17 @@
 
 from __future__ import absolute_import, division, print_function
 
-__metaclass__ = type
+__metaclass__ = type  # pylint: disable=invalid-name
 
-__copyright__ = "Copyright (c) 2024 Cisco and/or its affiliates."
+__copyright__ = "Copyright (c) 2024-2025 Cisco and/or its affiliates."
 __author__ = "Allen Robel"
 
 import copy
 import inspect
 
 import pytest
-from ansible_collections.cisco.dcnm.plugins.modules.dcnm_bootflash import \
-    Common
-from ansible_collections.cisco.dcnm.tests.unit.modules.dcnm.dcnm_bootflash.utils import (
-    configs_query, does_not_raise, params_deleted, params_query)
+from ansible_collections.cisco.dcnm.plugins.modules.dcnm_bootflash import Common
+from ansible_collections.cisco.dcnm.tests.unit.modules.dcnm.dcnm_bootflash.utils import configs_query, does_not_raise, params_deleted, params_query
 
 
 def test_bootflash_common_00000() -> None:
@@ -56,7 +54,8 @@ def test_bootflash_common_00000() -> None:
     assert instance.check_mode is False
     assert instance.config == params_deleted.get("config")
     assert instance.convert_target_to_params.class_name == "ConvertTargetToParams"
-    assert instance._rest_send is None
+    assert instance._rest_send.params == {}
+    assert instance._rest_send.class_name == "RestSend"
     assert instance.results.class_name == "Results"
     assert instance.results.check_mode is False
     assert instance.results.state == "deleted"
diff --git a/tests/unit/modules/dcnm/dcnm_bootflash/test_bootflash_deleted.py b/tests/unit/modules/dcnm/dcnm_bootflash/test_bootflash_deleted.py
index 5d4c6e25b..92a16cba7 100644
--- a/tests/unit/modules/dcnm/dcnm_bootflash/test_bootflash_deleted.py
+++ b/tests/unit/modules/dcnm/dcnm_bootflash/test_bootflash_deleted.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2024 Cisco and/or its affiliates.
+# Copyright (c) 2024-2025 Cisco and/or its affiliates.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,9 +20,9 @@
 
 from __future__ import absolute_import, division, print_function
 
-__metaclass__ = type
+__metaclass__ = type  # pylint: disable=invalid-name
 
-__copyright__ = "Copyright (c) 2024 Cisco and/or its affiliates."
+__copyright__ = "Copyright (c) 2024-2025 Cisco and/or its affiliates."
 __author__ = "Allen Robel"
 
 import copy
@@ -30,24 +30,23 @@
 import json
 
 import pytest
-from ansible_collections.cisco.dcnm.plugins.module_utils.common.response_handler import \
-    ResponseHandler
-from ansible_collections.cisco.dcnm.plugins.module_utils.common.rest_send_v2 import \
-    RestSend
-from ansible_collections.cisco.dcnm.plugins.module_utils.common.results import \
-    Results
-from ansible_collections.cisco.dcnm.plugins.module_utils.common.sender_file import \
-    Sender
-from ansible_collections.cisco.dcnm.plugins.module_utils.common.switch_details import \
-    SwitchDetails
-from ansible_collections.cisco.dcnm.plugins.modules.dcnm_bootflash import \
-    Deleted
-from ansible_collections.cisco.dcnm.tests.unit.module_utils.common.common_utils import \
-    ResponseGenerator
+from ansible_collections.cisco.dcnm.plugins.module_utils.common.response_handler import ResponseHandler
+from ansible_collections.cisco.dcnm.plugins.module_utils.common.rest_send_v2 import RestSend
+from ansible_collections.cisco.dcnm.plugins.module_utils.common.results import Results
+from ansible_collections.cisco.dcnm.plugins.module_utils.common.sender_file import Sender
+from ansible_collections.cisco.dcnm.plugins.module_utils.common.switch_details import SwitchDetails
+from ansible_collections.cisco.dcnm.plugins.modules.dcnm_bootflash import Deleted
+from ansible_collections.cisco.dcnm.tests.unit.module_utils.common.common_utils import ResponseGenerator
 from ansible_collections.cisco.dcnm.tests.unit.modules.dcnm.dcnm_bootflash.utils import (
-    MockAnsibleModule, configs_deleted, does_not_raise, params_deleted,
-    responses_ep_all_switches, responses_ep_bootflash_discovery,
-    responses_ep_bootflash_files, responses_ep_bootflash_info)
+    MockAnsibleModule,
+    configs_deleted,
+    does_not_raise,
+    params_deleted,
+    responses_ep_all_switches,
+    responses_ep_bootflash_discovery,
+    responses_ep_bootflash_files,
+    responses_ep_bootflash_info,
+)
 
 
 def test_bootflash_deleted_00000() -> None:
@@ -72,7 +71,8 @@ def test_bootflash_deleted_00000() -> None:
     assert instance.check_mode is False
     assert instance.config == params_deleted.get("config")
     assert instance.convert_target_to_params.class_name == "ConvertTargetToParams"
-    assert instance._rest_send is None
+    assert instance._rest_send.params == {}
+    assert instance._rest_send.class_name == "RestSend"
     assert instance.results.class_name == "Results"
     assert instance.results.check_mode is False
     assert instance.results.state == "deleted"
@@ -162,14 +162,8 @@ def responses():
         instance.commit()
 
     assert "File(s) Deleted Successfully." in instance.results.response[0]["DATA"]
-    assert (
-        instance.results.diff[0]["172.22.150.112"][0]["filepath"]
-        == "bootflash:/air.txt"
-    )
-    assert (
-        instance.results.diff[0]["172.22.150.113"][0]["filepath"]
-        == "bootflash:/black.txt"
-    )
+    assert instance.results.diff[0]["172.22.150.112"][0]["filepath"] == "bootflash:/air.txt"
+    assert instance.results.diff[0]["172.22.150.113"][0]["filepath"] == "bootflash:/black.txt"
     assert instance.results.response[0]["MESSAGE"] == "OK"
     assert instance.results.response[0]["RETURN_CODE"] == 200
     assert instance.results.result[0]["success"] is True
diff --git a/tests/unit/modules/dcnm/dcnm_bootflash/test_bootflash_files.py b/tests/unit/modules/dcnm/dcnm_bootflash/test_bootflash_files.py
index a969e9d44..6cf4f828c 100644
--- a/tests/unit/modules/dcnm/dcnm_bootflash/test_bootflash_files.py
+++ b/tests/unit/modules/dcnm/dcnm_bootflash/test_bootflash_files.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2024 Cisco and/or its affiliates.
+# Copyright (c) 2024-2025 Cisco and/or its affiliates.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,35 +20,33 @@
 
 from __future__ import absolute_import, division, print_function
 
-__metaclass__ = type
+__metaclass__ = type  # pylint: disable=invalid-name
 
-__copyright__ = "Copyright (c) 2024 Cisco and/or its affiliates."
+__copyright__ = "Copyright (c) 2024-2025 Cisco and/or its affiliates."
 __author__ = "Allen Robel"
 
 import copy
 import inspect
 
 import pytest
-from ansible_collections.cisco.dcnm.plugins.module_utils.bootflash.bootflash_files import \
-    BootflashFiles
-from ansible_collections.cisco.dcnm.plugins.module_utils.bootflash.convert_target_to_params import \
-    ConvertTargetToParams
-from ansible_collections.cisco.dcnm.plugins.module_utils.common.response_handler import \
-    ResponseHandler
-from ansible_collections.cisco.dcnm.plugins.module_utils.common.rest_send_v2 import \
-    RestSend
-from ansible_collections.cisco.dcnm.plugins.module_utils.common.results import \
-    Results
-from ansible_collections.cisco.dcnm.plugins.module_utils.common.sender_file import \
-    Sender
-from ansible_collections.cisco.dcnm.plugins.module_utils.common.switch_details import \
-    SwitchDetails
-from ansible_collections.cisco.dcnm.tests.unit.module_utils.common.common_utils import \
-    ResponseGenerator
+from ansible_collections.cisco.dcnm.plugins.module_utils.bootflash.bootflash_files import BootflashFiles
+from ansible_collections.cisco.dcnm.plugins.module_utils.bootflash.convert_target_to_params import ConvertTargetToParams
+from ansible_collections.cisco.dcnm.plugins.module_utils.common.response_handler import ResponseHandler
+from ansible_collections.cisco.dcnm.plugins.module_utils.common.rest_send_v2 import RestSend
+from ansible_collections.cisco.dcnm.plugins.module_utils.common.results import Results
+from ansible_collections.cisco.dcnm.plugins.module_utils.common.sender_file import Sender
+from ansible_collections.cisco.dcnm.plugins.module_utils.common.switch_details import SwitchDetails
+from ansible_collections.cisco.dcnm.tests.unit.module_utils.common.common_utils import ResponseGenerator
 from ansible_collections.cisco.dcnm.tests.unit.modules.dcnm.dcnm_bootflash.utils import (
-    MockAnsibleModule, configs_deleted, does_not_raise, params_deleted,
-    payloads_bootflash_files, responses_ep_all_switches,
-    responses_ep_bootflash_files, targets)
+    MockAnsibleModule,
+    configs_deleted,
+    does_not_raise,
+    params_deleted,
+    payloads_bootflash_files,
+    responses_ep_all_switches,
+    responses_ep_bootflash_files,
+    targets,
+)
 
 
 def test_bootflash_files_00000() -> None:
@@ -173,9 +171,7 @@ def responses():
 
     assert instance.payload == payloads_bootflash_files(f"{key}a")
     assert instance.results.response_current["RETURN_CODE"] == 200
-    assert instance.results.result == [
-        {"success": True, "changed": True, "sequence_number": 1}
-    ]
+    assert instance.results.result == [{"success": True, "changed": True, "sequence_number": 1}]
 
 
 def test_bootflash_files_00110() -> None:
@@ -823,9 +819,7 @@ def test_bootflash_files_00500() -> None:
 
     assert instance.results.response_current["RETURN_CODE"] == 200
     assert instance.results.response_current["MESSAGE"] == "No files to delete."
-    assert instance.results.result == [
-        {"success": True, "changed": False, "sequence_number": 1}
-    ]
+    assert instance.results.result == [{"success": True, "changed": False, "sequence_number": 1}]
 
 
 def test_bootflash_files_00600() -> None:
@@ -1001,9 +995,7 @@ def test_bootflash_files_00800() -> None:
         instance.target = "foo"
 
 
-@pytest.mark.parametrize(
-    "parameter", ["filepath", "ip_address", "serial_number", "supervisor"]
-)
+@pytest.mark.parametrize("parameter", ["filepath", "ip_address", "serial_number", "supervisor"])
 def test_bootflash_files_00810(parameter) -> None:
     """
     ### Classes and Methods
diff --git a/tests/unit/modules/dcnm/dcnm_bootflash/test_bootflash_info.py b/tests/unit/modules/dcnm/dcnm_bootflash/test_bootflash_info.py
index ea6daa3d2..7bc41e399 100644
--- a/tests/unit/modules/dcnm/dcnm_bootflash/test_bootflash_info.py
+++ b/tests/unit/modules/dcnm/dcnm_bootflash/test_bootflash_info.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2024 Cisco and/or its affiliates.
+# Copyright (c) 2024-2025 Cisco and/or its affiliates.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,9 +20,9 @@
 
 from __future__ import absolute_import, division, print_function
 
-__metaclass__ = type
+__metaclass__ = type  # pylint: disable=invalid-name
 
-__copyright__ = "Copyright (c) 2024 Cisco and/or its affiliates."
+__copyright__ = "Copyright (c) 2024-2025 Cisco and/or its affiliates."
 __author__ = "Allen Robel"
 
 import copy
@@ -30,24 +30,22 @@
 import json
 
 import pytest
-from ansible_collections.cisco.dcnm.plugins.module_utils.bootflash.bootflash_info import \
-    BootflashInfo
-from ansible_collections.cisco.dcnm.plugins.module_utils.common.response_handler import \
-    ResponseHandler
-from ansible_collections.cisco.dcnm.plugins.module_utils.common.rest_send_v2 import \
-    RestSend
-from ansible_collections.cisco.dcnm.plugins.module_utils.common.results import \
-    Results
-from ansible_collections.cisco.dcnm.plugins.module_utils.common.sender_file import \
-    Sender
-from ansible_collections.cisco.dcnm.plugins.module_utils.common.switch_details import \
-    SwitchDetails
-from ansible_collections.cisco.dcnm.tests.unit.module_utils.common.common_utils import \
-    ResponseGenerator
+from ansible_collections.cisco.dcnm.plugins.module_utils.bootflash.bootflash_info import BootflashInfo
+from ansible_collections.cisco.dcnm.plugins.module_utils.common.response_handler import ResponseHandler
+from ansible_collections.cisco.dcnm.plugins.module_utils.common.rest_send_v2 import RestSend
+from ansible_collections.cisco.dcnm.plugins.module_utils.common.results import Results
+from ansible_collections.cisco.dcnm.plugins.module_utils.common.sender_file import Sender
+from ansible_collections.cisco.dcnm.plugins.module_utils.common.switch_details import SwitchDetails
+from ansible_collections.cisco.dcnm.tests.unit.module_utils.common.common_utils import ResponseGenerator
 from ansible_collections.cisco.dcnm.tests.unit.modules.dcnm.dcnm_bootflash.utils import (
-    MockAnsibleModule, configs_query, does_not_raise, params_query,
-    responses_ep_all_switches, responses_ep_bootflash_discovery,
-    responses_ep_bootflash_info)
+    MockAnsibleModule,
+    configs_query,
+    does_not_raise,
+    params_query,
+    responses_ep_all_switches,
+    responses_ep_bootflash_discovery,
+    responses_ep_bootflash_info,
+)
 
 
 def test_bootflash_info_00000() -> None:
diff --git a/tests/unit/modules/dcnm/dcnm_bootflash/test_bootflash_query.py b/tests/unit/modules/dcnm/dcnm_bootflash/test_bootflash_query.py
index 6db1b1711..8df2182c0 100644
--- a/tests/unit/modules/dcnm/dcnm_bootflash/test_bootflash_query.py
+++ b/tests/unit/modules/dcnm/dcnm_bootflash/test_bootflash_query.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2024 Cisco and/or its affiliates.
+# Copyright (c) 2024-2025 Cisco and/or its affiliates.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,28 +20,29 @@
 
 from __future__ import absolute_import, division, print_function
 
-__metaclass__ = type
+__metaclass__ = type  # pylint: disable=invalid-name
 
-__copyright__ = "Copyright (c) 2024 Cisco and/or its affiliates."
+__copyright__ = "Copyright (c) 2024-2025 Cisco and/or its affiliates."
 __author__ = "Allen Robel"
 
 import copy
 import inspect
 
 import pytest
-from ansible_collections.cisco.dcnm.plugins.module_utils.common.response_handler import \
-    ResponseHandler
-from ansible_collections.cisco.dcnm.plugins.module_utils.common.rest_send_v2 import \
-    RestSend
-from ansible_collections.cisco.dcnm.plugins.module_utils.common.sender_file import \
-    Sender
+from ansible_collections.cisco.dcnm.plugins.module_utils.common.response_handler import ResponseHandler
+from ansible_collections.cisco.dcnm.plugins.module_utils.common.rest_send_v2 import RestSend
+from ansible_collections.cisco.dcnm.plugins.module_utils.common.sender_file import Sender
 from ansible_collections.cisco.dcnm.plugins.modules.dcnm_bootflash import Query
-from ansible_collections.cisco.dcnm.tests.unit.module_utils.common.common_utils import \
-    ResponseGenerator
+from ansible_collections.cisco.dcnm.tests.unit.module_utils.common.common_utils import ResponseGenerator
 from ansible_collections.cisco.dcnm.tests.unit.modules.dcnm.dcnm_bootflash.utils import (
-    MockAnsibleModule, configs_query, does_not_raise, params_query,
-    responses_ep_all_switches, responses_ep_bootflash_discovery,
-    responses_ep_bootflash_info)
+    MockAnsibleModule,
+    configs_query,
+    does_not_raise,
+    params_query,
+    responses_ep_all_switches,
+    responses_ep_bootflash_discovery,
+    responses_ep_bootflash_info,
+)
 
 
 def test_bootflash_query_00000() -> None:
@@ -66,7 +67,8 @@ def test_bootflash_query_00000() -> None:
     assert instance.check_mode is False
     assert instance.config == params_query.get("config")
     assert instance.convert_target_to_params.class_name == "ConvertTargetToParams"
-    assert instance._rest_send is None
+    assert instance._rest_send.params == {}
+    assert instance._rest_send.class_name == "RestSend"
     assert instance.results.class_name == "Results"
     assert instance.results.check_mode is False
     assert instance.results.state == "query"
@@ -154,14 +156,8 @@ def responses():
         instance.rest_send = rest_send
         instance.commit()
 
-    assert (
-        instance.results.diff[0]["172.22.150.112"][0]["filepath"]
-        == "bootflash:/air.txt"
-    )
-    assert (
-        instance.results.diff[0]["172.22.150.113"][0]["filepath"]
-        == "bootflash:/black.txt"
-    )
+    assert instance.results.diff[0]["172.22.150.112"][0]["filepath"] == "bootflash:/air.txt"
+    assert instance.results.diff[0]["172.22.150.113"][0]["filepath"] == "bootflash:/black.txt"
     assert instance.results.metadata[0]["action"] == "bootflash_info"
     assert instance.results.metadata[0]["check_mode"] is False
     assert instance.results.metadata[0]["sequence_number"] == 1
diff --git a/tests/unit/modules/dcnm/dcnm_bootflash/test_convert_file_info_to_target.py b/tests/unit/modules/dcnm/dcnm_bootflash/test_convert_file_info_to_target.py
index 5c2eeef39..606c3dded 100644
--- a/tests/unit/modules/dcnm/dcnm_bootflash/test_convert_file_info_to_target.py
+++ b/tests/unit/modules/dcnm/dcnm_bootflash/test_convert_file_info_to_target.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2024 Cisco and/or its affiliates.
+# Copyright (c) 2024-2025 Cisco and/or its affiliates.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,19 +20,17 @@
 
 from __future__ import absolute_import, division, print_function
 
-__metaclass__ = type
+__metaclass__ = type  # pylint: disable=invalid-name
 
-__copyright__ = "Copyright (c) 2024 Cisco and/or its affiliates."
+__copyright__ = "Copyright (c) 2024-2025 Cisco and/or its affiliates."
 __author__ = "Allen Robel"
 
 import inspect
 from datetime import datetime
 
 import pytest
-from ansible_collections.cisco.dcnm.plugins.module_utils.bootflash.convert_file_info_to_target import \
-    ConvertFileInfoToTarget
-from ansible_collections.cisco.dcnm.tests.unit.modules.dcnm.dcnm_bootflash.utils import (
-    does_not_raise, file_info, targets_convert_file_info_to_target)
+from ansible_collections.cisco.dcnm.plugins.module_utils.bootflash.convert_file_info_to_target import ConvertFileInfoToTarget
+from ansible_collections.cisco.dcnm.tests.unit.modules.dcnm.dcnm_bootflash.utils import does_not_raise, file_info, targets_convert_file_info_to_target
 
 
 def test_convert_file_info_to_target_00000() -> None:
@@ -227,9 +225,7 @@ def test_convert_file_info_to_target_00210() -> None:
     match += r"Could not convert date to datetime object\.\s+"
     match += r"date: Sep 19 22:20:07 202\.\s+"
     match += r"Error detail:\s+"
-    match += (
-        r"time data 'Sep 19 22:20:07 202' does not match format '%b %d %H:%M:%S %Y'\."
-    )
+    match += r"time data 'Sep 19 22:20:07 202' does not match format '%b %d %H:%M:%S %Y'\."
     with pytest.raises(ValueError, match=match):
         instance.file_info = file_info(f"{key}")
         instance.date  # pylint: disable=pointless-statement
diff --git a/tests/unit/modules/dcnm/dcnm_bootflash/test_convert_target_to_params.py b/tests/unit/modules/dcnm/dcnm_bootflash/test_convert_target_to_params.py
index aa7e8a8cb..03a6911fd 100644
--- a/tests/unit/modules/dcnm/dcnm_bootflash/test_convert_target_to_params.py
+++ b/tests/unit/modules/dcnm/dcnm_bootflash/test_convert_target_to_params.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2024 Cisco and/or its affiliates.
+# Copyright (c) 2024-2025 Cisco and/or its affiliates.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,18 +20,16 @@
 
 from __future__ import absolute_import, division, print_function
 
-__metaclass__ = type
+__metaclass__ = type  # pylint: disable=invalid-name
 
-__copyright__ = "Copyright (c) 2024 Cisco and/or its affiliates."
+__copyright__ = "Copyright (c) 2024-2025 Cisco and/or its affiliates."
 __author__ = "Allen Robel"
 
 import inspect
 
 import pytest
-from ansible_collections.cisco.dcnm.plugins.module_utils.bootflash.convert_target_to_params import \
-    ConvertTargetToParams
-from ansible_collections.cisco.dcnm.tests.unit.modules.dcnm.dcnm_bootflash.utils import (
-    does_not_raise, targets)
+from ansible_collections.cisco.dcnm.plugins.module_utils.bootflash.convert_target_to_params import ConvertTargetToParams
+from ansible_collections.cisco.dcnm.tests.unit.modules.dcnm.dcnm_bootflash.utils import does_not_raise, targets
 
 
 def test_convert_target_to_params_00000() -> None:
diff --git a/tests/unit/modules/dcnm/dcnm_bootflash/utils.py b/tests/unit/modules/dcnm/dcnm_bootflash/utils.py
index 607c6011d..238797da7 100644
--- a/tests/unit/modules/dcnm/dcnm_bootflash/utils.py
+++ b/tests/unit/modules/dcnm/dcnm_bootflash/utils.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2024 Cisco and/or its affiliates.
+# Copyright (c) 2024-2025 Cisco and/or its affiliates.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,18 +14,17 @@
 
 from __future__ import absolute_import, division, print_function
 
-__metaclass__ = type
+__metaclass__ = type  # pylint: disable=invalid-name
 
+__copyright__ = "Copyright (c) 2024-2025 Cisco and/or its affiliates."
+__author__ = "Allen Robel"
 
 from contextlib import contextmanager
 
 import pytest
-from ansible_collections.ansible.netcommon.tests.unit.modules.utils import \
-    AnsibleFailJson
-from ansible_collections.cisco.dcnm.plugins.module_utils.common.response_handler import \
-    ResponseHandler
-from ansible_collections.cisco.dcnm.tests.unit.modules.dcnm.dcnm_bootflash.fixture import \
-    load_fixture
+from ansible_collections.ansible.netcommon.tests.unit.modules.utils import AnsibleFailJson
+from ansible_collections.cisco.dcnm.plugins.module_utils.common.response_handler import ResponseHandler
+from ansible_collections.cisco.dcnm.tests.unit.modules.dcnm.dcnm_bootflash.fixture import load_fixture
 
 params_query = {
     "state": "query",