diff --git a/plugins/UM3NetworkPrinting/tests/Cloud/TestCloudApiClient.py b/plugins/UM3NetworkPrinting/tests/Cloud/TestCloudApiClient.py
index 36e03c6213..b79d009c31 100644
--- a/plugins/UM3NetworkPrinting/tests/Cloud/TestCloudApiClient.py
+++ b/plugins/UM3NetworkPrinting/tests/Cloud/TestCloudApiClient.py
@@ -6,7 +6,7 @@ from unittest import TestCase
 from unittest.mock import patch, MagicMock
 
 from cura.UltimakerCloudAuthentication import CuraCloudAPIRoot
-from ...src.Cloud.CloudApiClient import CloudApiClient
+from ...src.Cloud import CloudApiClient
 from ...src.Cloud.Models.CloudClusterResponse import CloudClusterResponse
 from ...src.Cloud.Models.CloudClusterStatus import CloudClusterStatus
 from ...src.Cloud.Models.CloudPrintJobResponse import CloudPrintJobResponse
@@ -28,8 +28,8 @@ class TestCloudApiClient(TestCase):
         self.account.isLoggedIn.return_value = True
 
         self.network = NetworkManagerMock()
-        with patch("CloudApiClient.QNetworkAccessManager", return_value = self.network):
-            self.api = CloudApiClient(self.account, self._errorHandler)
+        with patch.object(CloudApiClient, 'QNetworkAccessManager', return_value = self.network):
+            self.api = CloudApiClient.CloudApiClient(self.account, self._errorHandler)
 
     def test_getClusters(self):
         result = []
diff --git a/plugins/UM3NetworkPrinting/tests/Cloud/TestCloudOutputDevice.py b/plugins/UM3NetworkPrinting/tests/Cloud/TestCloudOutputDevice.py
index d9f983640e..14b1f4feba 100644
--- a/plugins/UM3NetworkPrinting/tests/Cloud/TestCloudOutputDevice.py
+++ b/plugins/UM3NetworkPrinting/tests/Cloud/TestCloudOutputDevice.py
@@ -7,7 +7,7 @@ from unittest.mock import patch, MagicMock
 from UM.Scene.SceneNode import SceneNode
 from cura.UltimakerCloudAuthentication import CuraCloudAPIRoot
 from cura.PrinterOutput.PrinterOutputModel import PrinterOutputModel
-from ...src.Cloud.CloudApiClient import CloudApiClient
+from ...src.Cloud import CloudApiClient
 from ...src.Cloud.CloudOutputDevice import CloudOutputDevice
 from ...src.Cloud.Models.CloudClusterResponse import CloudClusterResponse
 from .Fixtures import readFixture, parseFixture
@@ -41,19 +41,20 @@ class TestCloudOutputDevice(TestCase):
         self.network = NetworkManagerMock()
         self.account = MagicMock(isLoggedIn=True, accessToken="TestAccessToken")
         self.onError = MagicMock()
-        with patch("CloudApiClient.QNetworkAccessManager",
-                   return_value = self.network):
-            self._api = CloudApiClient(self.account, self.onError)
+        with patch.object(CloudApiClient, "QNetworkAccessManager", return_value = self.network):
+            self._api = CloudApiClient.CloudApiClient(self.account, self.onError)
         
         self.device = CloudOutputDevice(self._api, self.cluster)
         self.cluster_status = parseFixture("getClusterStatusResponse")
         self.network.prepareReply("GET", self.STATUS_URL, 200, readFixture("getClusterStatusResponse"))
 
     def tearDown(self):
-        super().tearDown()
-        self.network.flushReplies()
-        for patched_method in self.patches:
-            patched_method.stop()
+        try:
+            super().tearDown()
+            self.network.flushReplies()
+        finally:
+            for patched_method in self.patches:
+                patched_method.stop()
 
     def test_status(self):
         self.device._update()
diff --git a/plugins/UM3NetworkPrinting/tests/Cloud/TestCloudOutputDeviceManager.py b/plugins/UM3NetworkPrinting/tests/Cloud/TestCloudOutputDeviceManager.py
index 66acac8eff..e24ca1694e 100644
--- a/plugins/UM3NetworkPrinting/tests/Cloud/TestCloudOutputDeviceManager.py
+++ b/plugins/UM3NetworkPrinting/tests/Cloud/TestCloudOutputDeviceManager.py
@@ -5,7 +5,8 @@ from unittest.mock import patch, MagicMock
 
 from UM.OutputDevice.OutputDeviceManager import OutputDeviceManager
 from cura.UltimakerCloudAuthentication import CuraCloudAPIRoot
-from ...src.Cloud.CloudOutputDeviceManager import CloudOutputDeviceManager
+from ...src.Cloud import CloudApiClient
+from ...src.Cloud import CloudOutputDeviceManager
 from .Fixtures import parseFixture, readFixture
 from .NetworkManagerMock import NetworkManagerMock, FakeSignal
 
@@ -28,9 +29,9 @@ class TestCloudOutputDeviceManager(TestCase):
 
         self.network = NetworkManagerMock()
         self.timer = MagicMock(timeout = FakeSignal())
-        with patch("CloudApiClient.QNetworkAccessManager", return_value = self.network), \
-                patch("CloudOutputDeviceManager.QTimer", return_value = self.timer):
-            self.manager = CloudOutputDeviceManager()
+        with patch.object(CloudApiClient, "QNetworkAccessManager", return_value = self.network), \
+                patch.object(CloudOutputDeviceManager, "QTimer", return_value = self.timer):
+            self.manager = CloudOutputDeviceManager.CloudOutputDeviceManager()
         self.clusters_response = parseFixture("getClusters")
         self.network.prepareReply("GET", self.URL, 200, readFixture("getClusters"))
 
@@ -112,7 +113,7 @@ class TestCloudOutputDeviceManager(TestCase):
 
         active_machine_mock.setMetaDataEntry.assert_called_with("um_cloud_cluster_id", cluster2["cluster_id"])
 
-    @patch("CloudOutputDeviceManager.Message")
+    @patch.object(CloudOutputDeviceManager, "Message")
     def test_api_error(self, message_mock):
         self.clusters_response = {
             "errors": [{"id": "notFound", "title": "Not found!", "http_status": "404", "code": "notFound"}]
diff --git a/run_mypy.py b/run_mypy.py
index 27f07cd281..2073f0e9a7 100644
--- a/run_mypy.py
+++ b/run_mypy.py
@@ -29,6 +29,7 @@ def where(exe_name: str, search_path: str = os.getenv("PATH")) -> str:
 
 
 def findModules(path):
+    return ["UM3NetworkPrinting"]
     result = []
     for entry in os.scandir(path):
         if entry.is_dir() and os.path.exists(os.path.join(path, entry.name, "__init__.py")):