diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
index e8a5d165e..25b3a394a 100644
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -30,7 +30,7 @@ jobs:
     name:  Tests
     runs-on: ubuntu-20.04
     needs: testrun_baseline
-    timeout-minutes: 40
+    timeout-minutes: 45
     steps:
       - name: Checkout source
         uses: actions/checkout@v2.3.4
diff --git a/framework/python/src/test_orc/test_orchestrator.py b/framework/python/src/test_orc/test_orchestrator.py
index d8ae4b5f2..f7302df62 100644
--- a/framework/python/src/test_orc/test_orchestrator.py
+++ b/framework/python/src/test_orc/test_orchestrator.py
@@ -339,14 +339,13 @@ def _run_test_module(self, module):
         module_results = module_results_json["results"]
         for test_result in module_results:
           self._session.add_test_result(test_result)
+          self._session.add_total_tests(1)
     except (FileNotFoundError, PermissionError,
             json.JSONDecodeError) as results_error:
       LOGGER.error(
           f"Error occured whilst obbtaining results for module {module.name}")
       LOGGER.debug(results_error)
 
-    self._session.add_total_tests(module.total_tests)
-
     LOGGER.info("Test module " + module.name + " has finished")
 
   def _get_module_status(self, module):
diff --git a/modules/test/nmap/python/src/nmap_module.py b/modules/test/nmap/python/src/nmap_module.py
index 693472d47..9e9d94c4a 100644
--- a/modules/test/nmap/python/src/nmap_module.py
+++ b/modules/test/nmap/python/src/nmap_module.py
@@ -116,6 +116,8 @@ def _nmap_results_to_json(self, nmap_results):
 
   def _process_nmap_json_results(self, nmap_results_json):
     results = {}
+    if "host" not in nmap_results_json["nmaprun"]:
+      return results
     if "ports" in nmap_results_json["nmaprun"]["host"]:
       ports = nmap_results_json["nmaprun"]["host"]["ports"]
       # Checking if an object is a JSON object
diff --git a/testing/device_configs/tester1/device_config.json b/testing/device_configs/tester1/device_config.json
index 55a5036ca..b979b2e26 100644
--- a/testing/device_configs/tester1/device_config.json
+++ b/testing/device_configs/tester1/device_config.json
@@ -7,7 +7,7 @@
       "enabled": true
     },
     "connection": {
-      "enabled": true
+      "enabled": false
     },
     "ntp": {
       "enabled": true