From 065ea65970e7e5a94022395c4b09f0e830b7810e Mon Sep 17 00:00:00 2001
From: J Boddey <jacob.boddey@hotmail.co.uk>
Date: Fri, 10 May 2024 10:59:03 +0100
Subject: [PATCH] Revert "Pass log level to test module (#443)"

This reverts commit 5ca36b5e76992836589f078143b8cc380018d790.
---
 .gitignore                                    |    1 -
 cmd/package                                   |    9 +-
 docs/get_started.md                           |    5 +-
 docs/test/index.md                            |    5 -
 docs/test/statuses.md                         |   32 -
 framework/python/src/api/api.py               |   48 +-
 framework/python/src/common/device.py         |    3 -
 framework/python/src/common/session.py        |   24 +-
 framework/python/src/common/testreport.py     |  170 +--
 framework/python/src/common/util.py           |   11 +-
 framework/python/src/core/test_runner.py      |    6 +-
 framework/python/src/core/testrun.py          |   30 +-
 framework/python/src/net_orc/ip_control.py    |    7 -
 .../src/net_orc/network_orchestrator.py       |   34 +-
 framework/python/src/test_orc/test_case.py    |   23 +-
 .../python/src/test_orc/test_orchestrator.py  |   74 +-
 framework/requirements.txt                    |    4 +-
 local/system.json.example                     |    2 +-
 make/DEBIAN/control                           |    2 +-
 modules/devices/faux-dev/python/src/util.py   |   20 +-
 .../python/src/grpc_server/dhcp_config.py     |    6 -
 .../src/grpc_server/dhcp_config_test.py       |    4 +-
 .../python/src/grpc_server/network_service.py |    2 +-
 .../python/src/grpc_server/dhcp_config.py     |    6 -
 .../src/grpc_server/dhcp_config_test.py       |    4 +-
 .../python/src/grpc_server/network_service.py |    2 +-
 modules/network/ntp/python/src/chronyd.py     |    3 +-
 modules/network/ntp/python/src/ntp_server.py  |    2 +-
 modules/test/base/python/src/logger.py        |    6 +-
 modules/test/base/python/src/test_module.py   |   39 +-
 modules/test/base/python/src/util.py          |   18 +-
 .../test/conn/python/src/connection_module.py |   19 +-
 modules/test/dns/python/src/dns_module.py     |   12 +-
 modules/test/{services => nmap}/README.md     |    0
 .../{services => nmap}/bin/start_test_module  |    0
 .../conf/module_config.json                   |    4 +-
 .../nmap.Dockerfile}                          |    4 +-
 .../python/requirements.txt                   |    0
 .../python/src/nmap_module.py}                |   14 +-
 .../test/{services => nmap}/python/src/run.py |   16 +-
 modules/test/ntp/python/src/ntp_module.py     |    7 +-
 .../protocol/python/src/protocol_module.py    |   11 +-
 .../tls/bin/check_cert_chain_signature.sh     |    6 +-
 modules/test/tls/bin/check_cert_signature.sh  |    6 +-
 modules/test/tls/bin/get_ciphers.sh           |    8 +-
 .../test/tls/bin/get_client_hello_packets.sh  |    8 +-
 .../test/tls/bin/get_handshake_complete.sh    |   10 +-
 .../tls/bin/get_non_tls_client_connections.sh |    6 +-
 .../tls/bin/get_tls_client_connections.sh     |    6 +-
 modules/test/tls/bin/get_tls_packets.sh       |    8 +-
 modules/test/tls/python/requirements.txt      |    6 +-
 modules/test/tls/python/src/tls_module.py     |  327 +++--
 modules/test/tls/python/src/tls_util.py       |   30 +-
 modules/ui/README.md                          |    2 +-
 modules/ui/package-lock.json                  | 1156 ++++++++---------
 modules/ui/src/app/app.component.html         |    3 -
 modules/ui/src/app/app.component.scss         |    1 -
 modules/ui/src/app/app.component.spec.ts      |   11 -
 modules/ui/src/app/app.component.ts           |   13 -
 modules/ui/src/app/app.module.ts              |    4 -
 .../device-item/device-item.component.html    |    4 +-
 .../device-item/device-item.component.scss    |    3 +-
 .../shutdown-app-modal.component.html         |   38 -
 .../shutdown-app-modal.component.scss         |   44 -
 .../shutdown-app-modal.component.spec.ts      |  100 --
 .../shutdown-app-modal.component.ts           |   53 -
 .../shutdown-app/shutdown-app.component.html  |   23 -
 .../shutdown-app/shutdown-app.component.scss  |   28 -
 .../shutdown-app.component.spec.ts            |  112 --
 .../shutdown-app/shutdown-app.component.ts    |   92 --
 .../src/app/interceptors/error.interceptor.ts |   20 +-
 modules/ui/src/app/mocks/progress.mock.ts     |    1 -
 modules/ui/src/app/mocks/reports.mock.ts      |    5 -
 modules/ui/src/app/mocks/settings.mock.ts     |    2 +-
 modules/ui/src/app/model/testrun-status.ts    |    4 +-
 .../device-form/device-form.component.html    |    4 +-
 .../device-form/device-form.component.spec.ts |    4 +-
 .../device-form/device.validators.ts          |   15 +-
 .../devices/device-repository.component.html  |   34 +-
 .../device-repository.component.spec.ts       |    2 +-
 .../filter-dialog/filter-dialog.component.ts  |    2 +-
 .../app/pages/reports/history.component.scss  |   36 +-
 .../app/pages/reports/history.component.ts    |    2 +-
 .../ui/src/app/pages/reports/reports.store.ts |    3 +-
 .../app/pages/settings/settings.store.spec.ts |    2 +-
 .../src/app/pages/settings/settings.store.ts  |   10 +-
 .../download-options.component.html           |   43 -
 .../download-options.component.scss           |   91 --
 .../download-options.component.spec.ts        |   78 --
 .../download-options.component.ts             |   86 --
 .../progress-initiate-form.component.ts       |    2 +-
 .../progress-status-card.component.html       |   25 +-
 .../progress-status-card.component.spec.ts    |   39 +-
 .../progress-status-card.component.ts         |    4 +-
 .../app/pages/testrun/progress.component.html |   12 +-
 .../pages/testrun/progress.component.spec.ts  |   44 +-
 .../src/app/pages/testrun/progress.module.ts  |    4 +-
 .../ui/src/app/providers/window.provider.ts   |   27 -
 .../src/app/services/test-run.service.spec.ts |   17 +-
 .../ui/src/app/services/test-run.service.ts   |   19 +-
 modules/ui/src/assets/icons/device_run.svg    |   13 -
 modules/ui/src/styles.scss                    |   11 -
 modules/ui/src/theming/colors.scss            |    1 -
 testing/pylint/test_pylint                    |    4 +-
 testing/tests/test_tests.py                   |   37 +-
 testing/unit/dns/dns_module_test.py           |   37 +-
 testing/unit/nmap/nmap_module_test.py         |   27 +-
 testing/unit/report/report.json               |  526 ++++++++
 testing/unit/report/report_compliant.json     |  268 ----
 testing/unit/report/report_noncompliant.json  |  316 -----
 testing/unit/report/report_test.py            |   48 +-
 testing/unit/run_tests.sh                     |  112 +-
 testing/unit/tls/tls_module_test.py           |   64 +-
 113 files changed, 1670 insertions(+), 3228 deletions(-)
 delete mode 100644 docs/test/index.md
 delete mode 100644 docs/test/statuses.md
 rename modules/test/{services => nmap}/README.md (100%)
 rename modules/test/{services => nmap}/bin/start_test_module (100%)
 rename modules/test/{services => nmap}/conf/module_config.json (95%)
 rename modules/test/{services/services.Dockerfile => nmap/nmap.Dockerfile} (91%)
 rename modules/test/{services => nmap}/python/requirements.txt (100%)
 rename modules/test/{services/python/src/services_module.py => nmap/python/src/nmap_module.py} (95%)
 rename modules/test/{services => nmap}/python/src/run.py (82%)
 mode change 100755 => 100644 modules/test/tls/bin/check_cert_chain_signature.sh
 mode change 100755 => 100644 modules/test/tls/bin/check_cert_signature.sh
 mode change 100755 => 100644 modules/test/tls/bin/get_ciphers.sh
 mode change 100755 => 100644 modules/test/tls/bin/get_client_hello_packets.sh
 mode change 100755 => 100644 modules/test/tls/bin/get_handshake_complete.sh
 mode change 100755 => 100644 modules/test/tls/bin/get_non_tls_client_connections.sh
 mode change 100755 => 100644 modules/test/tls/bin/get_tls_client_connections.sh
 mode change 100755 => 100644 modules/test/tls/bin/get_tls_packets.sh
 delete mode 100644 modules/ui/src/app/components/shutdown-app-modal/shutdown-app-modal.component.html
 delete mode 100644 modules/ui/src/app/components/shutdown-app-modal/shutdown-app-modal.component.scss
 delete mode 100644 modules/ui/src/app/components/shutdown-app-modal/shutdown-app-modal.component.spec.ts
 delete mode 100644 modules/ui/src/app/components/shutdown-app-modal/shutdown-app-modal.component.ts
 delete mode 100644 modules/ui/src/app/components/shutdown-app/shutdown-app.component.html
 delete mode 100644 modules/ui/src/app/components/shutdown-app/shutdown-app.component.scss
 delete mode 100644 modules/ui/src/app/components/shutdown-app/shutdown-app.component.spec.ts
 delete mode 100644 modules/ui/src/app/components/shutdown-app/shutdown-app.component.ts
 delete mode 100644 modules/ui/src/app/pages/testrun/components/download-options/download-options.component.html
 delete mode 100644 modules/ui/src/app/pages/testrun/components/download-options/download-options.component.scss
 delete mode 100644 modules/ui/src/app/pages/testrun/components/download-options/download-options.component.spec.ts
 delete mode 100644 modules/ui/src/app/pages/testrun/components/download-options/download-options.component.ts
 delete mode 100644 modules/ui/src/app/providers/window.provider.ts
 delete mode 100644 modules/ui/src/assets/icons/device_run.svg
 create mode 100644 testing/unit/report/report.json
 delete mode 100644 testing/unit/report/report_compliant.json
 delete mode 100644 testing/unit/report/report_noncompliant.json

diff --git a/.gitignore b/.gitignore
index 26fdf0fcd..b4d001453 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,7 +12,6 @@ testing/unit/dns/output/
 testing/unit/nmap/output/
 testing/unit/ntp/output/
 testing/unit/tls/output/
-testing/unit/tls/tmp/
 testing/unit/report/output/
 
 *.deb
diff --git a/cmd/package b/cmd/package
index cdc7cc8cf..823c55a43 100755
--- a/cmd/package
+++ b/cmd/package
@@ -17,10 +17,6 @@
 # Creates a package for Testrun
 
 MAKE_SRC_DIR=make
-TESTRUN_VER="1-2-2"
-
-# Delete existing make files
-rm -rf $MAKE_SRC_DIR/usr
 
 # Delete existing make files
 rm -rf $MAKE_SRC_DIR/usr
@@ -60,7 +56,4 @@ cp -r {framework,modules} $MAKE_SRC_DIR/usr/local/testrun
 dpkg-deb --build --root-owner-group make
 
 # Rename the .deb file
-mv make.deb testrun_${TESTRUN_VER}_amd64.deb
-
-# Echo package version
-echo Created installation package at testrun_${TESTRUN_VER}_amd64.deb
+mv make.deb testrun_1-2-1_amd64.deb
diff --git a/docs/get_started.md b/docs/get_started.md
index a7b893d13..c9f508043 100644
--- a/docs/get_started.md
+++ b/docs/get_started.md
@@ -109,8 +109,5 @@ If you encounter any issues or need assistance, consider the following:
 - Check the configuration settings.
 - Refer to the Testrun documentation or ask for assistance in the issues page: https://github.com/google/testrun/issues
 
-# Reviewing
-Once you have completed a test attempt, you may want to review the test report provided by Testrun. For more information about what Testrun looks for when testing, and what the output means, take a look at the testing documentation: [Testing](/docs/test/index.md).
-
 # Uninstall
-To uninstall Testrun, use the built-in dpkg uninstall command to remove Testrun correctly. For Testrun, this would be:  ```sudo apt-get remove testrun```. Note that this 
+To uninstall Testrun, use the built-in dpkg uninstall command to remove Testrun correctly. For Testrun, this would be:  ```sudo apt-get remove testrun```
diff --git a/docs/test/index.md b/docs/test/index.md
deleted file mode 100644
index b440a86f1..000000000
--- a/docs/test/index.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Testing
-
-The test requirements that are investigated by Testrun can be found in the [test modules documentation](/docs/test/modules.md).
-
-To understand the testing results, various definitions of test results and requirements are specified in the [statuses documentation](/docs/test/statuses.md).
\ No newline at end of file
diff --git a/docs/test/statuses.md b/docs/test/statuses.md
deleted file mode 100644
index 5a2ba626d..000000000
--- a/docs/test/statuses.md
+++ /dev/null
@@ -1,32 +0,0 @@
-# Test Statuses
-Testrun will output the result and description of each automated test. The test results will be one of the following:
-
-| Name | Description | What next? |
-|---|---|---|
-| Compliant | The device implements the required feature correctly | Nothing |
-| Non-Compliant | The device does not support the specified requirements for the test | Modify or implement the required functionality on the device |
-| Feature Not Present | The device does not implement a feature covered by the test | You may implement the  functionality (not required) |
-| Error | An error occured whilst running the test | Create a bug report requesting additional support to diagnose the issue |
-| Skipped | The test has not been executed because a linked test did not produce a compliant result | You may implement the functionality (not required) |
-
-## Test requirement
-Testrun also determines whether each test is required for the device to receive an overall compliant result. These rules are:
-
-| Name | Description |
-|---|---|
-| Required | The device must implement the feature |
-| Recommended | The device should implement the feature, but will not receive an overall Non-Compliant if not implemented |
-| Roadmap | The device should implement this feature in the future, but is not required at the moment |
-| Required If Applicable | If the device implements this feature, it must be implemented correctly (as per the test requirements) |
-
-## Testrun Statuses
-Once testing is completed, an overall result for the test attempt will be produced. This is calculated by comparing the result of all tests, and whether they are required or not required.
-
-### Compliant
-All required tests are implemented correctly, and all required if applicable tests are implemented correctly (where the feature has been implemented).
-
-### Non-Compliant
-One or more of the required tests (or required if applicable tests) have produced a non-compliant result.
-
-### Error
-One of more of the required tests (or required if applicable tests) have not executed correctly. This does not necessarily indicate that the device is compliant or non-compliant.
\ No newline at end of file
diff --git a/framework/python/src/api/api.py b/framework/python/src/api/api.py
index 758da6656..0a00c19cd 100644
--- a/framework/python/src/api/api.py
+++ b/framework/python/src/api/api.py
@@ -21,7 +21,6 @@
 import os
 import psutil
 import requests
-import signal
 import threading
 import uvicorn
 from urllib.parse import urlparse
@@ -47,7 +46,7 @@ class Api:
   def __init__(self, test_run):
 
     self._test_run = test_run
-    self._name = "Testrun API"
+    self._name = "TestRun API"
     self._router = APIRouter()
 
     self._session = self._test_run.get_session()
@@ -67,9 +66,6 @@ def __init__(self, test_run):
                                methods=["POST"])
     self._router.add_api_route("/system/status",
                                self.get_status)
-    self._router.add_api_route("/system/shutdown",
-                               self.shutdown,
-                               methods=["POST"])
 
     self._router.add_api_route("/system/version",
                                self.get_version)
@@ -247,35 +243,8 @@ async def stop_test_run(self):
   async def get_status(self):
     return self._test_run.get_session().to_json()
 
-  def shutdown(self, response: Response):
-
-    LOGGER.debug("Received request to shutdown Testrun")
-
-    # Check that Testrun is not currently running
-    if (self._session.get_status() not in [
-            "Cancelled",
-            "Compliant",
-            "Non-Compliant",
-            "Idle"]):
-      LOGGER.debug("Unable to shutdown Testrun as Testrun is in progress")
-      response.status_code = 400
-      return self._generate_msg(
-        False,
-        "Unable to shutdown. A test is currently in progress."
-      )
-
-    self._test_run.shutdown()
-    os.kill(os.getpid(), signal.SIGTERM)
-
   async def get_version(self, response: Response):
-
-    # Add defaults
     json_response = {}
-    json_response["installed_version"] = "v" + self._test_run.get_version()
-    json_response["update_available"] = False
-    json_response["latest_version"] = None
-    json_response["latest_version_url"] = (
-      "https://github.com/google/testrun/releases")
 
     # Obtain the current version
     current_version = self._session.get_version()
@@ -295,9 +264,9 @@ async def get_version(self, response: Response):
       # Check OK response was received
       if version_check.status_code != 200:
         response.status_code = 500
-        LOGGER.debug(version_check.content)
-        LOGGER.error("Failed to fetch latest version")
-        return json_response
+        LOGGER.error(version_check.content)
+        return self._generate_msg(False, "Failed to fetch latest version. " +
+                                  "Please, check the internet connection")
 
       # Extract version number from response, removing the leading 'v'
       latest_version_no = version_check.json()["name"].strip("v")
@@ -320,7 +289,8 @@ async def get_version(self, response: Response):
       response.status_code = 500
       LOGGER.error("Failed to fetch latest version")
       LOGGER.debug(e)
-      return json_response
+      return self._generate_msg(False, "Failed to fetch latest version. " +
+                                "Please, check the internet connection")
 
   async def get_reports(self, request: Request):
     LOGGER.debug("Received reports list request")
@@ -334,7 +304,7 @@ async def get_reports(self, request: Request):
     for report in reports:
       # report URL is currently hard coded as localhost so we can
       # replace that to fix the IP dynamically from the requester
-      report["report"] = report["report"].replace("localhost", server_ip)
+      report["report"] = report["report"].replace("localhost",server_ip)
     return reports
 
   async def delete_report(self, request: Request, response: Response):
@@ -561,8 +531,8 @@ def _validate_device_json(self, json_obj):
       return False
 
     # Check length of strings
-    if len(json_obj.get(DEVICE_MANUFACTURER_KEY)) > 28 or len(
-      json_obj.get(DEVICE_MODEL_KEY)) > 28:
+    if len(json_obj.get(DEVICE_MANUFACTURER_KEY)) > 64 or len(
+      json_obj.get(DEVICE_MODEL_KEY)) > 64:
       return False
 
     disallowed_chars = ["/", "\\", "\'", "\"", ";"]
diff --git a/framework/python/src/common/device.py b/framework/python/src/common/device.py
index c6a289d2c..51d68dfc6 100644
--- a/framework/python/src/common/device.py
+++ b/framework/python/src/common/device.py
@@ -41,9 +41,6 @@ def add_report(self, report):
   def get_reports(self):
     return self.reports
 
-  def clear_reports(self):
-    self.reports = []
-
   def remove_report(self, timestamp: datetime):
     for report in self.reports:
       if report.get_started().strftime('%Y-%m-%dT%H:%M:%S') == timestamp:
diff --git a/framework/python/src/common/session.py b/framework/python/src/common/session.py
index 09eef117e..02edbc425 100644
--- a/framework/python/src/common/session.py
+++ b/framework/python/src/common/session.py
@@ -31,10 +31,10 @@
 
 LOGGER = logger.get_logger('session')
 
-class TestrunSession():
+class TestRunSession():
   """Represents the current session of Test Run."""
 
-  def __init__(self, config_file, version):
+  def __init__(self, config_file):
     self._status = 'Idle'
     self._device = None
     self._started = None
@@ -46,7 +46,8 @@ def __init__(self, config_file, version):
     self._total_tests = 0
     self._report_url = None
 
-    self._load_version(default_version=version)
+    self._version = None
+    self._load_version()
 
     self._config_file = config_file
     self._config = self._get_default_config()
@@ -89,7 +90,7 @@ def _get_default_config(self):
       'log_level': 'INFO',
       'startup_timeout': 60,
       'monitor_period': 30,
-      'max_device_reports': 0,
+      'max_device_reports': 5,
       'api_url': 'http://localhost',
       'api_port': 8000
     }
@@ -140,18 +141,14 @@ def _load_config(self):
 
       LOGGER.debug(self._config)
 
-  def _load_version(self, default_version):
+  def _load_version(self):
     version_cmd = util.run_command(
       'dpkg-query --showformat=\'${Version}\' --show testrun')
-    # index 1 of response is the stderr byte stream so if
-    # it has any data in it, there was an error and we 
-    # did not resolve the version and we'll use the fallback
-    if len(version_cmd[1]) == 0:
+
+    if version_cmd:
       version = version_cmd[0]
-      self._version = version
-    else:
-      self._version = default_version
-    LOGGER.info(f'Running Testrun version {self._version}')
+      LOGGER.info(f'Running Testrun version {version}')
+    self._version = version
 
   def get_version(self):
     return self._version
@@ -297,7 +294,6 @@ def reset(self):
     self.set_target_device(None)
     self._report_url = None
     self._total_tests = 0
-    self._module_reports = []
     self._results = []
     self._started = None
     self._finished = None
diff --git a/framework/python/src/common/testreport.py b/framework/python/src/common/testreport.py
index 13c91482b..ac42a064b 100644
--- a/framework/python/src/common/testreport.py
+++ b/framework/python/src/common/testreport.py
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-"""Store previous Testrun information."""
+"""Store previous test run information."""
 
 from datetime import datetime
 from weasyprint import HTML
@@ -23,7 +23,7 @@
 
 DATE_TIME_FORMAT = '%Y-%m-%d %H:%M:%S'
 RESOURCES_DIR = 'resources/report'
-TESTS_FIRST_PAGE = 11
+TESTS_FIRST_PAGE = 12
 TESTS_PER_PAGE = 20
 
 # Locate parent directory
@@ -48,7 +48,6 @@ def __init__(self,
                finished=None,
                total_tests=0):
     self._device = {}
-    self._mac_addr = None
     self._status: str = status
     self._started = started
     self._finished = finished
@@ -58,10 +57,7 @@ def __init__(self,
     self._report_url = ''
     self._cur_page = 0
     # Placeholder until available in json report
-    self._version = 'v1.2.2'
-
-  def get_mac_addr(self):
-    return self._mac_addr
+    self._version = 'v1.2.1'
 
   def add_module_reports(self, module_reports):
     self._module_reports = module_reports
@@ -90,14 +86,9 @@ def set_report_url(self, url):
 
   def get_report_url(self):
     return self._report_url
-  
-  def set_mac_addr(self, mac_addr):
-    self._mac_addr = mac_addr
 
   def to_json(self):
     report_json = {}
-
-    report_json['mac_addr'] = self._mac_addr
     report_json['device'] = self._device
     report_json['status'] = self._status
     report_json['started'] = self._started.strftime(DATE_TIME_FORMAT)
@@ -105,18 +96,13 @@ def to_json(self):
 
     test_results = []
     for test in self._results:
-      test_dict = {
+      test_results.append({
         'name': test.name,
         'description': test.description,
         'expected_behavior': test.expected_behavior,
         'required_result': test.required_result,
         'result': test.result
-      }
-
-      if test.recommendations is not None and len(test.recommendations) > 0:
-        test_dict['recommendations'] = test.recommendations
-
-      test_results.append(test_dict)
+      })
 
     report_json['tests'] = {'total': self._total_tests,
                             'results': test_results}
@@ -129,7 +115,6 @@ def from_json(self, json_file):
     self._device['manufacturer'] = json_file['device']['manufacturer']
     self._device['model'] = json_file['device']['model']
 
-    # Firmware is not specified for non-UI devices
     if 'firmware' in json_file['device']:
       self._device['firmware'] = json_file['device']['firmware']
 
@@ -152,8 +137,6 @@ def from_json(self, json_file):
         expected_behavior=test_result['expected_behavior'],
         required_result=test_result['required_result'],
         result=test_result['result'])
-      if 'recommendations' in test_result:
-        test_case.recommendations = test_result['recommendations']
       self.add_test(test_case)
 
   # Create a pdf file in memory and return the bytes
@@ -248,86 +231,10 @@ def generate_module_page(self, json_data, module_report):
       {module_report}
     </div>'''
     page += self.generate_footer(self._cur_page)
-    page += '</div>'  # Page end
+    page += '</div>'  #Page end
     page += '<div style="break-after:page"></div>'
     return page
 
-  def generate_steps_to_resolve(self, json_data):
-
-    steps_so_far = 0
-    tests_with_recommendations = []
-    index = 1
-
-    # Collect all tests with recommendations
-    for test in json_data['tests']['results']:
-      if 'recommendations' in test:
-        tests_with_recommendations.append(test)
-
-    # Check if test has recommendations
-    if len(tests_with_recommendations) == 0:
-      return ''
-
-    # Start new page
-    self._cur_page += 1
-    page = '<div class="page">'
-    page += self.generate_header(json_data, False)
-
-    # Add title
-    page += '<h1>Steps to Resolve</h1>'
-
-    for test in tests_with_recommendations:
-
-      # Generate new page
-      if steps_so_far == 4 and (
-        len(tests_with_recommendations) - (index-1) > 0):
-
-        # Reset steps counter
-        steps_so_far = 0
-
-        # Render footer
-        page += self.generate_footer(self._cur_page)
-        page += '</div>'  # Page end
-        page += '<div style="break-after:page"></div>'
-
-        # Render new header
-        self._cur_page += 1
-        page += '<div class="page">'
-        page += self.generate_header(json_data, False)
-
-      # Render test recommendations
-      page += f'''
-        <table class="steps-to-resolve">
-          <tbody>
-            <tr>
-              <td width="10%" class="steps-to-resolve index">{index}.</td>
-              <td width="32%" class="steps-to-resolve"><span class="steps-to-resolve subtitle">Name</span><br>{test["name"]}</td>
-              <td class="steps-to-resolve"><span class="steps-to-resolve subtitle">Description</span><br>{test["description"]}</td>
-            </tr>
-            <tr>
-              <td width="10%"></td>
-              <td colspan="2" class="steps-to-resolve" style="padding-bottom:20px;">
-                <span class="steps-to-resolve subtitle">Steps to resolve</span>
-        '''
-
-      step_number = 1
-      for recommendation in test['recommendations']:
-        page += f'''<br>
-          <span style="font-size: 14px">{
-              step_number}. {recommendation}</span>'''
-        step_number += 1
-
-      page += '</td></tbody></table>'
-
-      index += 1
-      steps_so_far += 1
-
-    # Render final footer
-    page += self.generate_footer(self._cur_page)
-    page += '</div>'  # Page end
-    page += '<div style="break-after:page"></div>'
-
-    return page
-
   def generate_module_pages(self, json_data):
     pages = ''
     content_max_size = 913
@@ -341,7 +248,7 @@ def generate_module_pages(self, json_data):
 
       # Reset values for each module report
       data_table_active = False
-      data_rows_active = False
+      data_rows_active=False
       page_content = ''
       content_size = 0
       content = module_reports.split('\n')
@@ -372,16 +279,16 @@ def generate_module_pages(self, json_data):
         # Add appropriate content size for each data row
         # update if CSS changes for this element
         elif '<tr>' in line and data_rows_active:
-          content_size += 42
+          content_size += 40.667
 
         # If the current line is within the content size limit
         # we'll add it to this page, otherweise, we'll put it on the next
         # page. Also make sure that if there is less than 40 pixels
         # left after a data row, start a new page or the row will get cut off.
-        # Current row size is 42 # adjust if we update the
-        # "module-data tbody tr" element.
+        # Current row size is 40.667 so rounding to 41 padding,
+        # adjust if we update the "module-data tbody tr" element.
         if content_size >= content_max_size or (
-          data_rows_active and content_max_size - content_size < 42):
+          data_rows_active and content_max_size - content_size < 41):
           # If in the middle of a table, close the table
           if data_rows_active:
             page_content += '</tbody></table>'
@@ -404,7 +311,6 @@ def generate_body(self, json_data):
     body = f'''
     <body>
       {self.generate_pages(json_data)}
-      {self.generate_steps_to_resolve(json_data)}
       {self.generate_module_pages(json_data)}
     </body>
     '''
@@ -450,8 +356,6 @@ def generate_result(self, result):
       result_class = 'result-test-result-non-compliant'
     elif result['result'] == 'Compliant':
       result_class = 'result-test-result-compliant'
-    elif result['result'] == 'Error':
-      result_class = 'result-test-result-error'
     else:
       result_class = 'result-test-result-skipped'
 
@@ -506,8 +410,7 @@ def generate_summary(self, json_data):
     mac = (json_data['device']['mac_addr']
            if 'mac_addr' in json_data['device'] else 'Undefined')
 
-    summary += '''<div class="device-information">
-      <div style="padding-right:0.1in;">'''
+    summary += '<div class="device-information">'
 
     summary += self.generate_device_summary_label('Manufacturer', manufacturer)
     summary += self.generate_device_summary_label('Model', model)
@@ -516,7 +419,7 @@ def generate_summary(self, json_data):
                                                   mac,
                                                   trailing_space=False)
 
-    summary += '</div></div>'
+    summary += '</div>'
 
     # Add device configuration
     summary += '''
@@ -659,7 +562,7 @@ def generate_css(self):
       --header-width: 8.5in;
       --header-pos-x: 0in;
       --header-pos-y: 0in;
-      --page-width: 8.5in;
+      --summary-width: 8.5in;
       --summary-height: 2.8in;
       --vertical-line-height: calc(var(--summary-height)-.2in);
       --vertical-line-pos-x: 25%;
@@ -787,32 +690,6 @@ def generate_css(self):
       font-family: 'Roboto Mono', monospace;
     }
 
-    table.steps-to-resolve {
-      background-color: #F8F9FA;
-      margin-bottom: 30px;
-      width: var(--page-width);
-    }
-
-    td.steps-to-resolve {
-      padding-left: 20px;
-      padding-top: 20px;
-      padding-right: 15px;
-      vertical-align: top;
-    }
-
-    .steps-to-resolve.subtitle {
-      text-align: left;
-      padding-top: 15px;
-      font-weight: 500;
-      color: #5F6368;
-      font-size: 14px;
-    }
-
-    .steps-to-resolve.index {
-      font-size: 40px;
-      padding-left: 30px;
-    }
-
     .callout-container.info {
       background-color: #e8f0fe;
     }
@@ -840,21 +717,20 @@ def generate_css(self):
 
     .device-information {
       padding-top: 0.2in;
-      padding-left: 0.2in;
+      padding-left: 0.3in;
       background-color: #F8F9FA;
       width: 250px;
-      height: 100.4%;
+      height: 2.6in;
     }
 
     /* Define the summary related css elements*/
     .summary-content {
       position: relative;
-      width: var(--page-width);
+      width: var(--summary-width);
       height: var(--summary-height);
       margin-top: 19px;
       margin-bottom: 19px;
       background-color: #E8EAED;
-      padding-bottom: 20px;
     }
 
     .summary-item-label {
@@ -904,7 +780,7 @@ def generate_css(self):
       right: 0in;
       top: 0in;
       width: 2.6in;
-      height: 100%;
+      height: var(--summary-height);
     }
 
     .summary-box-compliant {
@@ -981,16 +857,10 @@ def generate_css(self):
       max-width: 380px;
     }
 
-    .result-test-result-error {
-      background-color: #FCE8E6;
-      color: #C5221F;
-      left: 7.3in;
-    }
-
     .result-test-result-non-compliant {
       background-color: #FCE8E6;
       color: #C5221F;
-      left: 7.04in;
+      left: 7.02in;
     }
 
     .result-test-result {
@@ -1012,7 +882,7 @@ def generate_css(self):
     .result-test-result-skipped {
       background-color: #e3e3e3;
       color: #393939;
-      left: 7.22in;
+      left: 7.2in;
     }
 
     /* CSS for the footer */
diff --git a/framework/python/src/common/util.py b/framework/python/src/common/util.py
index 70c0b76c8..c485d5ff2 100644
--- a/framework/python/src/common/util.py
+++ b/framework/python/src/common/util.py
@@ -28,7 +28,7 @@ def run_command(cmd, output=True):
   By default, returns the standard output and error output
   If the caller sets optional output parameter to False,
   will only return a boolean result indicating if it was
-  successful in running the command.  Failure is indicated
+  succesful in running the command.  Failure is indicated
   by any return code from the process other than zero."""
 
   success = False
@@ -43,11 +43,8 @@ def run_command(cmd, output=True):
       LOGGER.error('Error: ' + err_msg)
     else:
       success = True
-      LOGGER.debug('Command succeeded: ' + cmd)
     if output:
-      out = stdout.strip().decode('utf-8')
-      LOGGER.debug('Command output: ' + out)
-      return out, stderr
+      return stdout.strip().decode('utf-8'), stderr
     else:
       return success
 
@@ -73,10 +70,10 @@ def get_os_user():
     user = os.getlogin()
   except OSError:
     # Handle the OSError exception
-    LOGGER.error('An OS error occurred whilst calling os.getlogin()')
+    LOGGER.error('An OS error occured whilst calling os.getlogin()')
   except Exception: # pylint: disable=W0703
     # Catch any other unexpected exceptions
-    LOGGER.error('An unknown exception occurred whilst calling os.getlogin()')
+    LOGGER.error('An unknown exception occured whilst calling os.getlogin()')
   return user
 
 def get_user():
diff --git a/framework/python/src/core/test_runner.py b/framework/python/src/core/test_runner.py
index 870e97752..07b6121b5 100644
--- a/framework/python/src/core/test_runner.py
+++ b/framework/python/src/core/test_runner.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Wrapper for the Testrun that simplifies
+"""Wrapper for the TestRun that simplifies
 virtual testing procedure by allowing direct calling
 from the command line.
 
@@ -22,7 +22,7 @@
 
 import argparse
 import sys
-from testrun import Testrun
+from testrun import TestRun
 from common import logger
 import signal
 
@@ -39,7 +39,7 @@ def __init__(self,
                single_intf=False,
                no_ui=False):
     self._register_exits()
-    self.test_run = Testrun(config_file=config_file,
+    self.test_run = TestRun(config_file=config_file,
                             validate=validate,
                             net_only=net_only,
                             single_intf=single_intf,
diff --git a/framework/python/src/core/testrun.py b/framework/python/src/core/testrun.py
index 71070e2cc..4ca176a79 100644
--- a/framework/python/src/core/testrun.py
+++ b/framework/python/src/core/testrun.py
@@ -29,7 +29,7 @@
 import time
 from common import logger, util
 from common.device import Device
-from common.session import TestrunSession
+from common.session import TestRunSession
 from common.testreport import TestReport
 from api.api import Api
 from net_orc.listener import NetworkEvent
@@ -60,9 +60,7 @@
 DEVICE_TEST_MODULES = 'test_modules'
 MAX_DEVICE_REPORTS_KEY = 'max_device_reports'
 
-VERSION = '1.2.2'
-
-class Testrun:  # pylint: disable=too-few-public-methods
+class TestRun:  # pylint: disable=too-few-public-methods
   """Test Run controller.
 
   Creates an instance of the network orchestrator, test
@@ -89,8 +87,7 @@ def __init__(self,
     self._register_exits()
 
     # Create session
-    self._session = TestrunSession(config_file=self._config_file,
-                                   version=self.get_version())
+    self._session = TestRunSession(config_file=self._config_file)
 
     # Register runtime parameters
     if single_intf:
@@ -130,9 +127,6 @@ def __init__(self,
       while True:
         time.sleep(1)
 
-  def get_version(self):
-    return VERSION
-
   def load_all_devices(self):
     self._session.clear_device_repository()
     self._load_devices(device_dir=LOCAL_DEVICES_DIR)
@@ -193,9 +187,6 @@ def _load_test_reports(self, device):
 
     LOGGER.debug(f'Loading test reports for device {device.model}')
 
-    # Remove the existing reports in memory
-    device.clear_reports()
-
     # Locate reports folder
     reports_folder = os.path.join(root_dir,
                                   LOCAL_DEVICES_DIR,
@@ -222,7 +213,6 @@ def _load_test_reports(self, device):
         report_json = json.load(report_json_file)
         test_report = TestReport()
         test_report.from_json(report_json)
-        test_report.set_mac_addr(device.mac_addr)
         device.add_report(test_report)
 
   def delete_report(self, device: Device, timestamp):
@@ -292,9 +282,6 @@ def save_device(self, device: Device, device_json):
     with open(config_file_path, 'w+', encoding='utf-8') as config_file:
       config_file.writelines(json.dumps(device.to_config_json(), indent=4))
 
-    # Reload device reports
-    self._load_test_reports(device)
-
     return device.to_config_json()
 
   def delete_device(self, device: Device):
@@ -356,16 +343,12 @@ def _register_exits(self):
     signal.signal(signal.SIGABRT, self._exit_handler)
     signal.signal(signal.SIGQUIT, self._exit_handler)
 
-  def shutdown(self):
-    LOGGER.info('Shutting down Testrun')
-    self.stop()
-    self._stop_ui()
-
   def _exit_handler(self, signum, arg):  # pylint: disable=unused-argument
     LOGGER.debug('Exit signal received: ' + str(signum))
     if signum in (2, signal.SIGTERM):
       LOGGER.info('Exit signal received.')
-      self.shutdown()
+      self.stop()
+      self._stop_ui()
       sys.exit(1)
 
   def _get_config_abs(self, config_file=None):
@@ -416,6 +399,8 @@ def _device_discovered(self, mac_addr):
 
       self.get_session().set_target_device(device)
 
+    self._set_status('In Progress')
+
     LOGGER.info(
         f'Discovered {device.manufacturer} {device.model} on the network. ' +
         'Waiting for device to obtain IP')
@@ -424,7 +409,6 @@ def _device_stable(self, mac_addr):
 
     # Do not continue testing if Testrun has cancelled during monitor phase
     if self.get_session().get_status() == 'Cancelled':
-      self._stop_network()
       return
 
     LOGGER.info(f'Device with mac address {mac_addr} is ready for testing.')
diff --git a/framework/python/src/net_orc/ip_control.py b/framework/python/src/net_orc/ip_control.py
index 1eeafc1a9..5c9f86d18 100644
--- a/framework/python/src/net_orc/ip_control.py
+++ b/framework/python/src/net_orc/ip_control.py
@@ -41,13 +41,6 @@ def add_namespace(self, namespace):
       success = util.run_command('ip netns add ' + namespace)
       return success
 
-  def check_interface_status(self, interface_name):
-    output = util.run_command(cmd=f'ip link show {interface_name}',output=True)
-    if 'state DOWN ' in output[0]:
-      return False
-    else:
-      return True
-
   def delete_link(self, interface_name):
     """Delete an ip link"""
     success = util.run_command('ip link delete ' + interface_name)
diff --git a/framework/python/src/net_orc/network_orchestrator.py b/framework/python/src/net_orc/network_orchestrator.py
index aa23f1918..94c747758 100644
--- a/framework/python/src/net_orc/network_orchestrator.py
+++ b/framework/python/src/net_orc/network_orchestrator.py
@@ -16,7 +16,7 @@
 import ipaddress
 import json
 import os
-from scapy.all import sniff, wrpcap, BOOTP, AsyncSniffer
+from scapy.all import sniff, wrpcap, BOOTP
 import shutil
 import subprocess
 import sys
@@ -47,11 +47,11 @@
 class NetworkOrchestrator:
   """Manage and controls a virtual testing network."""
 
-  def __init__(self, session):
+  def __init__(self,
+               session):
 
     self._session = session
     self._monitor_in_progress = False
-    self._monitor_packets = []
     self._listener = None
     self._net_modules = []
 
@@ -74,12 +74,12 @@ def start(self):
     shutil.rmtree(os.path.join(os.getcwd(), NET_DIR), ignore_errors=True)
 
     # Cleanup any old config files test files
-    conf_runtime_dir = os.path.join(RUNTIME_DIR, 'conf')
+    conf_runtime_dir = os.path.join(RUNTIME_DIR,'conf')
     shutil.rmtree(conf_runtime_dir, ignore_errors=True)
     os.makedirs(conf_runtime_dir, exist_ok=True)
 
     # Copy the system config file to the runtime directory
-    system_conf_runtime = os.path.join(conf_runtime_dir, 'system.json')
+    system_conf_runtime = os.path.join(conf_runtime_dir,'system.json')
     with open(system_conf_runtime, 'w', encoding='utf-8') as f:
       json.dump(self.get_session().get_config(), f, indent=2)
 
@@ -199,7 +199,7 @@ def _device_discovered(self, mac_addr):
     wrpcap(os.path.join(device_runtime_dir, 'startup.pcap'), packet_capture)
 
     # Copy the device config file to the runtime directory
-    runtime_device_conf = os.path.join(device_runtime_dir, 'device_config.json')
+    runtime_device_conf = os.path.join(device_runtime_dir,'device_config.json')
     with open(runtime_device_conf, 'w', encoding='utf-8') as f:
       json.dump(self._session.get_target_device().to_config_json(), f, indent=2)
 
@@ -240,33 +240,20 @@ def _start_device_monitor(self, device):
     """Start a timer until the steady state has been reached and
         callback the steady state method for this device."""
     self.get_session().set_status('Monitoring')
-    self._monitor_packets = []
     LOGGER.info(f'Monitoring device with mac addr {device.mac_addr} '
                 f'for {str(self._session.get_monitor_period())} seconds')
 
     device_runtime_dir = os.path.join(RUNTIME_DIR, TEST_DIR,
                                       device.mac_addr.replace(':', ''))
 
-    sniffer = AsyncSniffer(iface=self._session.get_device_interface(),
-                           timeout=self._session.get_monitor_period(),
-                           prn=self._monitor_packet_callback)
-    sniffer.start()
-
-    while sniffer.running:
-      if not self._ip_ctrl.check_interface_status(
-          self._session.get_device_interface()):
-        sniffer.stop()
-        self._session.set_status('Cancelled')
-        LOGGER.error('Device interface disconnected, cancelling Testrun')
-    wrpcap(os.path.join(device_runtime_dir, 'monitor.pcap'),
-           self._monitor_packets)
+    packet_capture = sniff(iface=self._session.get_device_interface(),
+                           timeout=self._session.get_monitor_period())
+    wrpcap(os.path.join(device_runtime_dir, 'monitor.pcap'), packet_capture)
+
     self._monitor_in_progress = False
     self.get_listener().call_callback(NetworkEvent.DEVICE_STABLE,
                                       device.mac_addr)
 
-  def _monitor_packet_callback(self, packet):
-    self._monitor_packets.append(packet)
-
   def _check_network_services(self):
     LOGGER.debug('Checking network modules...')
     for net_module in self._net_modules:
@@ -742,7 +729,6 @@ def restore_net(self):
   def get_session(self):
     return self._session
 
-
 class NetworkModule:
   """Define all the properties of a Network Module"""
 
diff --git a/framework/python/src/test_orc/test_case.py b/framework/python/src/test_orc/test_case.py
index cf0d6593a..72097b2a9 100644
--- a/framework/python/src/test_orc/test_case.py
+++ b/framework/python/src/test_orc/test_case.py
@@ -28,21 +28,10 @@ class TestCase:  # pylint: disable=too-few-public-methods,too-many-instance-attr
   recommendations: list = field(default_factory=lambda: [])
 
   def to_dict(self):
-
-    if self.recommendations is not None and len(self.recommendations) > 0:
-      return {
-        "name": self.name,
-        "description": self.description,
-        "expected_behavior": self.expected_behavior,
-        "required_result": self.required_result,
-        "result": self.result,
-        "recommendations": self.recommendations
-      }
-
     return {
-        "name": self.name,
-        "description": self.description,
-        "expected_behavior": self.expected_behavior,
-        "required_result": self.required_result,
-        "result": self.result
-      }
+      "name": self.name,
+      "description": self.description,
+      "expected_behavior": self.expected_behavior,
+      "required_result": self.required_result,
+      "result": self.result
+    }
diff --git a/framework/python/src/test_orc/test_orchestrator.py b/framework/python/src/test_orc/test_orchestrator.py
index d7f94bcd7..21d99dcbd 100644
--- a/framework/python/src/test_orc/test_orchestrator.py
+++ b/framework/python/src/test_orc/test_orchestrator.py
@@ -160,7 +160,6 @@ def _write_reports(self, test_report):
   def _generate_report(self):
 
     report = {}
-    report["mac_addr"] = self.get_session().get_target_device().mac_addr
     report["device"] = self.get_session().get_target_device().to_dict()
     report["started"] = self.get_session().get_started().strftime(
         "%Y-%m-%d %H:%M:%S")
@@ -191,33 +190,32 @@ def _cleanup_old_test_results(self, device):
     else:
       max_device_reports = self._session.get_max_device_reports()
 
-    if max_device_reports > 0:
-      completed_results_dir = os.path.join(
-          self._root_path,
-          LOCAL_DEVICE_REPORTS.replace("{device_folder}", device.device_folder))
-
-      completed_tests = os.listdir(completed_results_dir)
-      cur_test_count = len(completed_tests)
-      if cur_test_count > max_device_reports:
-        LOGGER.debug("Current device has more than max results allowed: " +
-                     str(cur_test_count) + ">" + str(max_device_reports))
-
-        # Find and delete the oldest test
-        oldest_test = self._find_oldest_test(completed_results_dir)
-        if oldest_test is not None:
-          LOGGER.debug("Oldest test found, removing: " + str(oldest_test[1]))
-          shutil.rmtree(oldest_test[1], ignore_errors=True)
-
-          # Remove oldest test from session
-          oldest_timestamp = oldest_test[0]
-          self.get_session().get_target_device().remove_report(oldest_timestamp)
-
-          # Confirm the delete was succesful
-          new_test_count = len(os.listdir(completed_results_dir))
-          if (new_test_count != cur_test_count
-              and new_test_count > max_device_reports):
-            # Continue cleaning up until we're under the max
-            self._cleanup_old_test_results(device)
+    completed_results_dir = os.path.join(
+        self._root_path,
+        LOCAL_DEVICE_REPORTS.replace("{device_folder}", device.device_folder))
+
+    completed_tests = os.listdir(completed_results_dir)
+    cur_test_count = len(completed_tests)
+    if cur_test_count > max_device_reports:
+      LOGGER.debug("Current device has more than max tests results allowed: " +
+                   str(cur_test_count) + ">" + str(max_device_reports))
+
+      # Find and delete the oldest test
+      oldest_test = self._find_oldest_test(completed_results_dir)
+      if oldest_test is not None:
+        LOGGER.debug("Oldest test found, removing: " + str(oldest_test[1]))
+        shutil.rmtree(oldest_test[1], ignore_errors=True)
+
+        # Remove oldest test from session
+        oldest_timestamp = oldest_test[0]
+        self.get_session().get_target_device().remove_report(oldest_timestamp)
+
+        # Confirm the delete was succesful
+        new_test_count = len(os.listdir(completed_results_dir))
+        if (new_test_count != cur_test_count
+            and new_test_count > max_device_reports):
+          # Continue cleaning up until we're under the max
+          self._cleanup_old_test_results(device)
 
   def _find_oldest_test(self, completed_tests_dir):
     oldest_timestamp = None
@@ -324,12 +322,11 @@ def _run_test_module(self, module):
       device_test_dir = os.path.join(self._root_path, RUNTIME_TEST_DIR,
                                      device.mac_addr.replace(":", ""))
 
+      root_certs_dir = os.path.join(self._root_path, DEVICE_ROOT_CERTS)
+
       container_runtime_dir = os.path.join(device_test_dir, module.name)
       os.makedirs(container_runtime_dir, exist_ok=True)
 
-      config_file = os.path.join(self._root_path, "local/system.json")
-      root_certs_dir = os.path.join(self._root_path, "local/root_certs")
-
       container_log_file = os.path.join(container_runtime_dir, "module.log")
 
       network_runtime_dir = os.path.join(self._root_path, "runtime/network")
@@ -342,6 +339,9 @@ def _run_test_module(self, module):
 
       client = docker.from_env()
 
+      # if module.name == 'connection':
+      #   self._net_orc.remove_arp_filters()
+
       module.container = client.containers.run(
           module.image_name,
           auto_remove=True,
@@ -351,14 +351,6 @@ def _run_test_module(self, module):
           privileged=True,
           detach=True,
           mounts=[
-              Mount(target="/testrun/system.json",
-                    source=config_file,
-                    type="bind",
-                    read_only=True),
-              Mount(target="/testrun/root_certs",
-                    source=root_certs_dir,
-                    type="bind",
-                    read_only=True),
               Mount(target="/runtime/output",
                     source=container_runtime_dir,
                     type="bind"),
@@ -373,6 +365,10 @@ def _run_test_module(self, module):
               Mount(target="/runtime/device/monitor.pcap",
                     source=device_monitor_capture,
                     type="bind",
+                    read_only=True),
+              Mount(target="/testrun/root_certs",
+                    source=root_certs_dir,
+                    type="bind",
                     read_only=True)
           ],
           environment={
diff --git a/framework/requirements.txt b/framework/requirements.txt
index 9522bd3b0..9f9e4ea91 100644
--- a/framework/requirements.txt
+++ b/framework/requirements.txt
@@ -14,11 +14,11 @@ weasyprint==60.2
 fastapi==0.109.1
 psutil==5.9.8
 uvicorn==0.27.0
-pydantic==1.10.13
+pydantic==1.10.11
 
 # Requirements for testing
 pytest==7.4.4
 pytest-timeout==2.2.0
 
 # Requirements for the report
-markdown==3.5.2
+markdown==3.5.2
\ No newline at end of file
diff --git a/local/system.json.example b/local/system.json.example
index 23023bead..d2f398b24 100644
--- a/local/system.json.example
+++ b/local/system.json.example
@@ -6,5 +6,5 @@
   "log_level": "INFO",
   "startup_timeout": 60,
   "monitor_period": 300,
-  "max_device_reports": 0
+  "max_device_reports": 5
 }
diff --git a/make/DEBIAN/control b/make/DEBIAN/control
index dff4ce378..c1039787d 100644
--- a/make/DEBIAN/control
+++ b/make/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: Testrun
-Version: 1.2.2
+Version: 1.2.1
 Architecture: amd64
 Maintainer: Google <boddey@google.com>
 Homepage: https://github.com/google/testrun
diff --git a/modules/devices/faux-dev/python/src/util.py b/modules/devices/faux-dev/python/src/util.py
index 8ffc70cbc..920752217 100644
--- a/modules/devices/faux-dev/python/src/util.py
+++ b/modules/devices/faux-dev/python/src/util.py
@@ -16,15 +16,15 @@
 import subprocess
 import shlex
 
+# Runs a process at the os level
+# By default, returns the standard output and error output
+# If the caller sets optional output parameter to False,
+# will only return a boolean result indicating if it was
+# succesful in running the command.  Failure is indicated
+# by any return code from the process other than zero.
 
-def run_command(cmd, logger, output=True):
-  """Runs a process at the os level
-  By default, returns the standard output and error output
-  If the caller sets optional output parameter to False,
-  will only return a boolean result indicating if it was
-  successful in running the command.  Failure is indicated
-  by any return code from the process other than zero."""
 
+def run_command(cmd, logger, output=True):
   success = False
   process = subprocess.Popen(shlex.split(cmd),
                              stdout=subprocess.PIPE,
@@ -37,10 +37,8 @@ def run_command(cmd, logger, output=True):
     logger.error('Error: ' + err_msg)
   else:
     success = True
-    logger.debug('Command succeeded: ' + cmd)
+
   if output:
-    out = stdout.strip().decode('utf-8')
-    logger.debug('Command output: ' + out)
-    return success, out
+    return success, stdout.strip().decode('utf-8')
   else:
     return success, None
diff --git a/modules/network/dhcp-1/python/src/grpc_server/dhcp_config.py b/modules/network/dhcp-1/python/src/grpc_server/dhcp_config.py
index d38d95785..877d49610 100644
--- a/modules/network/dhcp-1/python/src/grpc_server/dhcp_config.py
+++ b/modules/network/dhcp-1/python/src/grpc_server/dhcp_config.py
@@ -56,12 +56,6 @@ def enable_failover(self):
     for subnet in self._subnets:
       subnet.enable_peer()
 
-  def get_peer(self):
-    return self._peer
-
-  def get_subnets(self):
-    return self._subnets
-
   def get_reserved_host(self, hw_addr):
     for host in self._reserved_hosts:
       if hw_addr == host.hw_addr:
diff --git a/modules/network/dhcp-1/python/src/grpc_server/dhcp_config_test.py b/modules/network/dhcp-1/python/src/grpc_server/dhcp_config_test.py
index 493266c2c..4bc1bd52d 100644
--- a/modules/network/dhcp-1/python/src/grpc_server/dhcp_config_test.py
+++ b/modules/network/dhcp-1/python/src/grpc_server/dhcp_config_test.py
@@ -61,14 +61,14 @@ def test_resolve_config(self):
   def test_disable_failover(self):
     DHCP_CONFIG.disable_failover()
     print('Test Disable Config:\n' + str(DHCP_CONFIG))
-    config_lines = str(DHCP_CONFIG.get_peer()).split('\n')
+    config_lines = str(DHCP_CONFIG._peer).split('\n')
     for line in config_lines:
       self.assertTrue(line.startswith('#'))
 
   def test_enable_failover(self):
     DHCP_CONFIG.enable_failover()
     print('Test Enable Config:\n' + str(DHCP_CONFIG))
-    config_lines = str(DHCP_CONFIG.get_peer()).split('\n')
+    config_lines = str(DHCP_CONFIG._peer).split('\n')
     for line in config_lines:
       self.assertFalse(line.startswith('#'))
 
diff --git a/modules/network/dhcp-1/python/src/grpc_server/network_service.py b/modules/network/dhcp-1/python/src/grpc_server/network_service.py
index 5124a07ad..92726025d 100644
--- a/modules/network/dhcp-1/python/src/grpc_server/network_service.py
+++ b/modules/network/dhcp-1/python/src/grpc_server/network_service.py
@@ -142,7 +142,7 @@ def GetDHCPRange(self, request, context):  # pylint: disable=W0613
     """
     LOGGER.info('Get DHCP range called')
     try:
-      pool = self._get_dhcp_config().get_subnets()[0].pools[0]
+      pool = self._get_dhcp_config()._subnets[0].pools[0]
       return pb2.DHCPRange(code=200, start=pool.range_start, end=pool.range_end)
     except Exception as e:  # pylint: disable=W0718
       fail_message = 'Failed to get DHCP range: ' + str(e)
diff --git a/modules/network/dhcp-2/python/src/grpc_server/dhcp_config.py b/modules/network/dhcp-2/python/src/grpc_server/dhcp_config.py
index c49523a64..5357ba7ed 100644
--- a/modules/network/dhcp-2/python/src/grpc_server/dhcp_config.py
+++ b/modules/network/dhcp-2/python/src/grpc_server/dhcp_config.py
@@ -58,12 +58,6 @@ def enable_failover(self):
     for subnet in self._subnets:
       subnet.enable_peer()
 
-  def get_peer(self):
-    return self._peer
-
-  def get_subnets(self):
-    return self._subnets
-
   def get_reserved_host(self, hw_addr):
     for host in self._reserved_hosts:
       if hw_addr == host.hw_addr:
diff --git a/modules/network/dhcp-2/python/src/grpc_server/dhcp_config_test.py b/modules/network/dhcp-2/python/src/grpc_server/dhcp_config_test.py
index 7d368265a..0a156db68 100644
--- a/modules/network/dhcp-2/python/src/grpc_server/dhcp_config_test.py
+++ b/modules/network/dhcp-2/python/src/grpc_server/dhcp_config_test.py
@@ -58,14 +58,14 @@ def test_resolve_config(self):
   def test_disable_failover(self):
     DHCP_CONFIG.disable_failover()
     print('Test Disable Config:\n' + str(DHCP_CONFIG))
-    config_lines = str(DHCP_CONFIG.get_peer()).split('\n')
+    config_lines = str(DHCP_CONFIG._peer).split('\n')
     for line in config_lines:
       self.assertTrue(line.startswith('#'))
 
   def test_enable_failover(self):
     DHCP_CONFIG.enable_failover()
     print('Test Enable Config:\n' + str(DHCP_CONFIG))
-    config_lines = str(DHCP_CONFIG.get_peer()).split('\n')
+    config_lines = str(DHCP_CONFIG._peer).split('\n')
     for line in config_lines:
       self.assertFalse(line.startswith('#'))
 
diff --git a/modules/network/dhcp-2/python/src/grpc_server/network_service.py b/modules/network/dhcp-2/python/src/grpc_server/network_service.py
index 7c5c61d4f..f9deba965 100644
--- a/modules/network/dhcp-2/python/src/grpc_server/network_service.py
+++ b/modules/network/dhcp-2/python/src/grpc_server/network_service.py
@@ -142,7 +142,7 @@ def GetDHCPRange(self, request, context):  # pylint: disable=W0613
     """
     LOGGER.info('Get DHCP range called')
     try:
-      pool = self._get_dhcp_config().get_subnets()[0].pools[0]
+      pool = self._get_dhcp_config()._subnets[0].pools[0]
       return pb2.DHCPRange(code=200, start=pool.range_start, end=pool.range_end)
     except Exception as e:  # pylint: disable=W0718
       fail_message = 'Failed to get DHCP range: ' + str(e)
diff --git a/modules/network/ntp/python/src/chronyd.py b/modules/network/ntp/python/src/chronyd.py
index 23dd834df..b8ce7db56 100644
--- a/modules/network/ntp/python/src/chronyd.py
+++ b/modules/network/ntp/python/src/chronyd.py
@@ -46,5 +46,4 @@ def is_running(self):
     LOGGER.info('Checking chronyd server')
     running = os.path.exists(PID_FILE)
     LOGGER.info('chronyd server status: ' + str(running))
-    return running
-    
\ No newline at end of file
+    return running
\ No newline at end of file
diff --git a/modules/network/ntp/python/src/ntp_server.py b/modules/network/ntp/python/src/ntp_server.py
index 42fe21e77..14a3d9bac 100644
--- a/modules/network/ntp/python/src/ntp_server.py
+++ b/modules/network/ntp/python/src/ntp_server.py
@@ -16,7 +16,7 @@
 from common import logger
 from chronyd import ChronydServer
 import time
-LOGGER = None
+
 LOG_NAME = 'ntp_server'
 
 class NTPServer:
diff --git a/modules/test/base/python/src/logger.py b/modules/test/base/python/src/logger.py
index e6a2b004c..a5e5ab18d 100644
--- a/modules/test/base/python/src/logger.py
+++ b/modules/test/base/python/src/logger.py
@@ -15,17 +15,19 @@
 """Sets up the logger to be used for the test modules."""
 import json
 import logging
+import os
 
 LOGGERS = {}
 _LOG_FORMAT = '%(asctime)s %(name)-8s %(levelname)-7s %(message)s'
 _DATE_FORMAT = '%b %02d %H:%M:%S'
 _DEFAULT_LEVEL = logging.INFO
-_CONF_FILE_NAME = 'testrun/system.json'
+_CONF_DIR = 'conf'
+_CONF_FILE_NAME = 'system.json'
 _LOG_DIR = '/runtime/output/'
 
 # Set log level
 try:
-  with open(_CONF_FILE_NAME,
+  with open(os.path.join(_CONF_DIR, _CONF_FILE_NAME),
             encoding='UTF-8') as config_json_file:
     system_conf_json = json.load(config_json_file)
 
diff --git a/modules/test/base/python/src/test_module.py b/modules/test/base/python/src/test_module.py
index 471f22222..f7707ba3a 100644
--- a/modules/test/base/python/src/test_module.py
+++ b/modules/test/base/python/src/test_module.py
@@ -26,31 +26,21 @@
 class TestModule:
   """An example test module."""
 
-  def __init__(self,
-               module_name,
-               log_name,
-               log_dir=None,
-               conf_file=CONF_FILE,
-               results_dir=RESULTS_DIR):
+  def __init__(self, module_name, log_name, log_dir=None,conf_file=CONF_FILE,results_dir=RESULTS_DIR):
     self._module_name = module_name
-    self._results_dir = results_dir if results_dir is not None else RESULTS_DIR
-    self._device_mac = os.environ.get('DEVICE_MAC', '')
-    self._ipv4_addr = os.environ.get('IPV4_ADDR', '')
-    self._ipv4_subnet = os.environ.get('IPV4_SUBNET', '')
-    self._ipv6_subnet = os.environ.get('IPV6_SUBNET', '')
-    self._add_logger(log_name=log_name,
-                     module_name=module_name,
-                     log_dir=log_dir)
-    self._config = self._read_config(
-        conf_file=conf_file if conf_file is not None else CONF_FILE)
+    self._results_dir=results_dir if results_dir is not None else RESULTS_DIR
+    self._device_mac = os.environ.get('DEVICE_MAC','')
+    self._ipv4_addr = os.environ.get('IPV4_ADDR','')
+    self._ipv4_subnet = os.environ.get('IPV4_SUBNET','')
+    self._ipv6_subnet = os.environ.get('IPV6_SUBNET','')
+    self._add_logger(log_name=log_name, module_name=module_name, log_dir=log_dir)
+    self._config = self._read_config(conf_file=conf_file if conf_file is not None else CONF_FILE)
     self._device_ipv4_addr = None
     self._device_ipv6_addr = None
 
   def _add_logger(self, log_name, module_name, log_dir=None):
     global LOGGER
-    LOGGER = logger.get_logger(name=log_name,
-                               log_file=module_name,
-                               log_dir=log_dir)
+    LOGGER = logger.get_logger(log_name, module_name, log_dir=log_dir)
 
   def generate_module_report(self):
     pass
@@ -110,7 +100,7 @@ def run_tests(self):
               result = getattr(self, test_method_name)(config=test['config'])
             else:
               result = getattr(self, test_method_name)()
-          except Exception as e:  # pylint: disable=W0718
+          except Exception as e:
             LOGGER.error(f'An error occurred whilst running {test["name"]}')
             LOGGER.error(e)
         else:
@@ -146,16 +136,13 @@ def run_tests(self):
             test['description'] = result[1]
           else:
             test['description'] = 'No description was provided for this test'
-
-          # Check if details were provided
-          if len(result)>2:
-            test['details'] = result[2]
       else:
         test['result'] = 'Error'
         test['description'] = 'An error occured whilst running this test'
 
       # Remove the steps to resolve if compliant already
-      if (test['result'] == 'Compliant' and 'recommendations' in test):
+      if (test['result'] == 'Compliant' and
+          'recommendations' in test):
         test.pop('recommendations')
 
       test['end'] = datetime.now().isoformat()
@@ -166,7 +153,7 @@ def run_tests(self):
     json_results = json.dumps({'results': tests}, indent=2)
     self._write_results(json_results)
 
-  def _read_config(self, conf_file=CONF_FILE):
+  def _read_config(self,conf_file=CONF_FILE):
     with open(conf_file, encoding='utf-8') as f:
       config = json.load(f)
     return config
diff --git a/modules/test/base/python/src/util.py b/modules/test/base/python/src/util.py
index ba9c89d6d..0f54c4298 100644
--- a/modules/test/base/python/src/util.py
+++ b/modules/test/base/python/src/util.py
@@ -19,14 +19,13 @@
 
 LOGGER = logger.get_logger('util')
 
+# Runs a process at the os level
+# By default, returns the standard output and error output
+# If the caller sets optional output parameter to False,
+# will only return a boolean result indicating if it was
+# succesful in running the command.  Failure is indicated
+# by any return code from the process other than zero.
 def run_command(cmd, output=True):
-  """Runs a process at the os level
-  By default, returns the standard output and error output
-  If the caller sets optional output parameter to False,
-  will only return a boolean result indicating if it was
-  successful in running the command.  Failure is indicated
-  by any return code from the process other than zero."""
-
   success = False
   process = subprocess.Popen(shlex.split(cmd),
                              stdout=subprocess.PIPE,
@@ -38,10 +37,7 @@ def run_command(cmd, output=True):
     LOGGER.error('Error: ' + err_msg)
   else:
     success = True
-    LOGGER.debug('Command succeeded: ' + cmd)
   if output:
-    out = stdout.strip().decode('utf-8')
-    LOGGER.debug('Command output: ' + out)
-    return out, stderr
+    return stdout.strip().decode('utf-8'), stderr
   else:
     return success
diff --git a/modules/test/conn/python/src/connection_module.py b/modules/test/conn/python/src/connection_module.py
index 34e129103..cf8852ef0 100644
--- a/modules/test/conn/python/src/connection_module.py
+++ b/modules/test/conn/python/src/connection_module.py
@@ -104,8 +104,9 @@ def _connection_switch_arp_inspection(self):
       no_arp = False
 
       # Check MAC address matches IP address
-      if (arp_packet.hwsrc == self._device_mac
-          and (arp_packet.psrc not in (self._device_ipv4_addr, '0.0.0.0'))):
+      if (arp_packet.hwsrc == self._device_mac and
+          (arp_packet.psrc != self._device_ipv4_addr
+           and arp_packet.psrc != '0.0.0.0')):
         LOGGER.info(f'Bad ARP packet detected for MAC: {self._device_mac}')
         LOGGER.info(f'''ARP packet from IP {arp_packet.psrc}
                     does not match {self._device_ipv4_addr}''')
@@ -204,11 +205,13 @@ def _connection_single_ip(self):
     LOGGER.info('Inspecting: ' + str(len(packets)) + ' packets')
     for packet in packets:
       if DHCP in packet:
-        if self._get_dhcp_type(packet) == 3:
-          mac_address = packet[Ether].src
-          LOGGER.info('DHCPREQUEST detected MAC address: ' + mac_address)
-          if not mac_address.startswith(TR_CONTAINER_MAC_PREFIX):
-            mac_addresses.add(mac_address.upper())
+        for option in packet[DHCP].options:
+          # message-type, option 3 = DHCPREQUEST
+          if self._get_dhcp_type(packet) == 3:
+            mac_address = packet[Ether].src
+            LOGGER.info('DHCPREQUEST detected MAC address: ' + mac_address)
+            if not mac_address.startswith(TR_CONTAINER_MAC_PREFIX):
+              mac_addresses.add(mac_address.upper())
 
     # Check if the device mac address is in the list of DHCPREQUESTs
     result = self._device_mac.upper() in mac_addresses
@@ -634,4 +637,4 @@ def test_subnets(self, subnets):
         LOGGER.error(traceback.format_exc())
         result = {'result': False, 'details': 'Subnet test failed: ' + str(e)}
       results.append(result)
-    return results
+    return results
\ No newline at end of file
diff --git a/modules/test/dns/python/src/dns_module.py b/modules/test/dns/python/src/dns_module.py
index e9550663d..02d89eb0a 100644
--- a/modules/test/dns/python/src/dns_module.py
+++ b/modules/test/dns/python/src/dns_module.py
@@ -33,17 +33,17 @@ def __init__(self,
                log_dir=None,
                conf_file=None,
                results_dir=None,
-               dns_server_capture_file=DNS_SERVER_CAPTURE_FILE,
-               startup_capture_file=STARTUP_CAPTURE_FILE,
-               monitor_capture_file=MONITOR_CAPTURE_FILE):
+               DNS_SERVER_CAPTURE_FILE=DNS_SERVER_CAPTURE_FILE,
+               STARTUP_CAPTURE_FILE=STARTUP_CAPTURE_FILE,
+               MONITOR_CAPTURE_FILE=MONITOR_CAPTURE_FILE):
     super().__init__(module_name=module,
                      log_name=LOG_NAME,
                      log_dir=log_dir,
                      conf_file=conf_file,
                      results_dir=results_dir)
-    self.dns_server_capture_file=dns_server_capture_file
-    self.startup_capture_file=startup_capture_file
-    self.monitor_capture_file=monitor_capture_file
+    self.dns_server_capture_file=DNS_SERVER_CAPTURE_FILE
+    self.startup_capture_file=STARTUP_CAPTURE_FILE
+    self.monitor_capture_file=MONITOR_CAPTURE_FILE
     self._dns_server = '10.10.10.4'
     global LOGGER
     LOGGER = self._get_logger()
diff --git a/modules/test/services/README.md b/modules/test/nmap/README.md
similarity index 100%
rename from modules/test/services/README.md
rename to modules/test/nmap/README.md
diff --git a/modules/test/services/bin/start_test_module b/modules/test/nmap/bin/start_test_module
similarity index 100%
rename from modules/test/services/bin/start_test_module
rename to modules/test/nmap/bin/start_test_module
diff --git a/modules/test/services/conf/module_config.json b/modules/test/nmap/conf/module_config.json
similarity index 95%
rename from modules/test/services/conf/module_config.json
rename to modules/test/nmap/conf/module_config.json
index efd07d74b..1c1115afe 100644
--- a/modules/test/services/conf/module_config.json
+++ b/modules/test/nmap/conf/module_config.json
@@ -1,8 +1,8 @@
 {
   "config": {
     "meta": {
-      "name": "services",
-      "display_name": "Services",
+      "name": "nmap",
+      "display_name": "nmap",
       "description": "Scan for open ports using nmap"
     },
     "network": true,
diff --git a/modules/test/services/services.Dockerfile b/modules/test/nmap/nmap.Dockerfile
similarity index 91%
rename from modules/test/services/services.Dockerfile
rename to modules/test/nmap/nmap.Dockerfile
index 3a89fc33c..ea90ee06f 100644
--- a/modules/test/services/services.Dockerfile
+++ b/modules/test/nmap/nmap.Dockerfile
@@ -12,10 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Image name: test-run/services-test
+# Image name: test-run/nmap-test
 FROM test-run/base-test:latest
 
-ARG MODULE_NAME=services
+ARG MODULE_NAME=nmap
 ARG MODULE_DIR=modules/test/$MODULE_NAME
 
 # Load the requirements file
diff --git a/modules/test/services/python/requirements.txt b/modules/test/nmap/python/requirements.txt
similarity index 100%
rename from modules/test/services/python/requirements.txt
rename to modules/test/nmap/python/requirements.txt
diff --git a/modules/test/services/python/src/services_module.py b/modules/test/nmap/python/src/nmap_module.py
similarity index 95%
rename from modules/test/services/python/src/services_module.py
rename to modules/test/nmap/python/src/nmap_module.py
index bfa232c87..06613c023 100644
--- a/modules/test/services/python/src/services_module.py
+++ b/modules/test/nmap/python/src/nmap_module.py
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-"""Services test module"""
+"""NMAP test module"""
 import time
 import util
 import json
@@ -20,14 +20,14 @@
 from test_module import TestModule
 import os
 
-LOG_NAME = 'test_services'
-MODULE_REPORT_FILE_NAME = 'services_report.html'
-NMAP_SCAN_RESULTS_SCAN_FILE = 'services_scan_results.json'
+LOG_NAME = 'test_nmap'
+MODULE_REPORT_FILE_NAME = 'nmap_report.html'
+NMAP_SCAN_RESULTS_SCAN_FILE = 'nmap_scan_results.json'
 LOGGER = None
 
 
-class ServicesModule(TestModule):
-  """Services Test module"""
+class NmapModule(TestModule):
+  """NMAP Test module"""
 
   def __init__(self,
                module,
@@ -157,7 +157,7 @@ def generate_module_report(self):
     return report_path
 
   def _run_nmap(self):
-    LOGGER.info('Running nmap')
+    LOGGER.info('Running nmap module')
 
     # Run the monitor method asynchronously to keep this method non-blocking
     self._tcp_scan_thread = threading.Thread(target=self._scan_tcp_ports)
diff --git a/modules/test/services/python/src/run.py b/modules/test/nmap/python/src/run.py
similarity index 82%
rename from modules/test/services/python/src/run.py
rename to modules/test/nmap/python/src/run.py
index d8f933c1d..2a85bb074 100644
--- a/modules/test/services/python/src/run.py
+++ b/modules/test/nmap/python/src/run.py
@@ -17,12 +17,12 @@
 import signal
 import sys
 import logger
-from services_module import ServicesModule
+from nmap_module import NmapModule
 
-LOG_NAME = 'services_runner'
+LOG_NAME = 'nmap_runner'
 LOGGER = logger.get_logger(LOG_NAME)
 
-class ServicesModuleRunner:
+class NmapModuleRunner:
   """Run the NMAP module tests."""
 
   def __init__(self, module):
@@ -33,13 +33,13 @@ def __init__(self, module):
     signal.signal(signal.SIGQUIT, self._handler)
     self.add_logger(module)
 
-    LOGGER.info('Starting services module')
+    LOGGER.info('Starting nmap module')
 
-    self._test_module = ServicesModule(module)
+    self._test_module = NmapModule(module)
     self._test_module.run_tests()
     self._test_module.generate_module_report()
 
-    LOGGER.info('Services module finished')
+    LOGGER.info('nmap test module finished')
 
   def add_logger(self, module):
     global LOGGER
@@ -56,7 +56,7 @@ def _handler(self, signum):
 
 def run():
   parser = argparse.ArgumentParser(
-      description='Services Module Help',
+      description='Nmap Module Help',
       formatter_class=argparse.ArgumentDefaultsHelpFormatter)
 
   parser.add_argument(
@@ -68,7 +68,7 @@ def run():
 
   # For some reason passing in the args from bash adds an extra
   # space before the argument so we'll just strip out extra space
-  ServicesModuleRunner(args.module.strip())
+  NmapModuleRunner(args.module.strip())
 
 
 if __name__ == '__main__':
diff --git a/modules/test/ntp/python/src/ntp_module.py b/modules/test/ntp/python/src/ntp_module.py
index 23c5cfd13..952ae236f 100644
--- a/modules/test/ntp/python/src/ntp_module.py
+++ b/modules/test/ntp/python/src/ntp_module.py
@@ -157,10 +157,9 @@ def generate_module_report(self):
   def extract_ntp_data(self):
     ntp_data = []
 
-    # Read the pcap files
-    packets = (rdpcap(self.startup_capture_file) +
-      rdpcap(self.monitor_capture_file) +
-      rdpcap(self.ntp_server_capture_file))
+    # Read the pcap file
+    packets = rdpcap(self.ntp_server_capture_file) + rdpcap(
+        self.startup_capture_file) + rdpcap(self.monitor_capture_file)
 
     # Iterate through NTP packets
     for packet in packets:
diff --git a/modules/test/protocol/python/src/protocol_module.py b/modules/test/protocol/python/src/protocol_module.py
index 932bc7702..0c9936524 100644
--- a/modules/test/protocol/python/src/protocol_module.py
+++ b/modules/test/protocol/python/src/protocol_module.py
@@ -80,16 +80,7 @@ def _protocol_valid_modbus(self, config):
     LOGGER.info('Running protocol.valid_modbus')
     # Extract basic device connection information
     modbus = Modbus(log=LOGGER, device_ip=self._device_ipv4_addr, config=config)
-    results = modbus.validate_device()
-    # Determine results and return proper messaging and details
-    description = ''
-    if results[0] is None:
-      description = 'No modbus connection could be made'
-    elif results[0]:
-      description = 'Valid modbus communication detected'
-    else:
-      description = 'Failed to confirm valid modbus communication'
-    return results[0], description,  results[1]
+    return modbus.validate_device()
 
   def get_local_ip(self, interface_name):
     try:
diff --git a/modules/test/tls/bin/check_cert_chain_signature.sh b/modules/test/tls/bin/check_cert_chain_signature.sh
old mode 100755
new mode 100644
index fa7d595fb..9bb62e7b7
--- a/modules/test/tls/bin/check_cert_chain_signature.sh
+++ b/modules/test/tls/bin/check_cert_chain_signature.sh
@@ -14,12 +14,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-INTERMEDIATE="$1"
-DEVICE_CERT="$2"
+INTERMEDIATE=$1
+DEVICE_CERT=$2
 
 echo "ROOT: $ROOT_CERT"
 echo "DEVICE_CERT: $DEVICE_CERT"
 
-response=$(openssl verify -untrusted "$INTERMEDIATE" "$DEVICE_CERT")
+response=$(openssl verify -untrusted $INTERMEDIATE $DEVICE_CERT)
 
 echo "$response"
\ No newline at end of file
diff --git a/modules/test/tls/bin/check_cert_signature.sh b/modules/test/tls/bin/check_cert_signature.sh
old mode 100755
new mode 100644
index 83d1a74e5..37ea0f187
--- a/modules/test/tls/bin/check_cert_signature.sh
+++ b/modules/test/tls/bin/check_cert_signature.sh
@@ -14,12 +14,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ROOT_CERT="$1"
-DEVICE_CERT="$2"
+ROOT_CERT=$1
+DEVICE_CERT=$2
 
 echo "ROOT: $ROOT_CERT"
 echo "DEVICE_CERT: $DEVICE_CERT"
 
-response=$(openssl verify -CAfile "$ROOT_CERT" "$DEVICE_CERT")
+response=$(openssl verify -CAfile $ROOT_CERT $DEVICE_CERT)
 
 echo "$response"
diff --git a/modules/test/tls/bin/get_ciphers.sh b/modules/test/tls/bin/get_ciphers.sh
old mode 100755
new mode 100644
index 053afd37f..3896af388
--- a/modules/test/tls/bin/get_ciphers.sh
+++ b/modules/test/tls/bin/get_ciphers.sh
@@ -14,11 +14,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-CAPTURE_FILE="$1"
-DST_IP="$2"
-DST_PORT="$3"
+CAPTURE_FILE=$1
+DST_IP=$2
+DST_PORT=$3
 
 TSHARK_FILTER="ssl.handshake.ciphersuites and ip.dst==$DST_IP and tcp.dstport==$DST_PORT"
-response=$(tshark -r "$CAPTURE_FILE" -Y "$TSHARK_FILTER" -Vx | grep 'Cipher Suite:' | awk '{$1=$1};1' | sed 's/Cipher Suite: //')
+response=$(tshark -r $CAPTURE_FILE -Y "$TSHARK_FILTER" -Vx | grep 'Cipher Suite:' | awk '{$1=$1};1' | sed 's/Cipher Suite: //')
 
 echo "$response"
diff --git a/modules/test/tls/bin/get_client_hello_packets.sh b/modules/test/tls/bin/get_client_hello_packets.sh
old mode 100755
new mode 100644
index d563d11f2..03cfe903c
--- a/modules/test/tls/bin/get_client_hello_packets.sh
+++ b/modules/test/tls/bin/get_client_hello_packets.sh
@@ -14,9 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-CAPTURE_FILE="$1"
-SRC_IP="$2"
-TLS_VERSION="$3"
+CAPTURE_FILE=$1
+SRC_IP=$2
+TLS_VERSION=$3
 
 TSHARK_OUTPUT="-T json -e ip.src -e tcp.dstport -e ip.dst"
 TSHARK_FILTER="ssl.handshake.type==1 and ip.src==$SRC_IP"
@@ -27,7 +27,7 @@ elif [ $TLS_VERSION == '1.3' ];then
   TSHARK_FILTER="$TSHARK_FILTER and (ssl.handshake.version==0x0304 or tls.handshake.extensions.supported_version==0x0304)"
 fi
 
-response=$(tshark -r "$CAPTURE_FILE" $TSHARK_OUTPUT $TSHARK_FILTER)
+response=$(tshark -r $CAPTURE_FILE $TSHARK_OUTPUT $TSHARK_FILTER)
 
 echo "$response"
   	
\ No newline at end of file
diff --git a/modules/test/tls/bin/get_handshake_complete.sh b/modules/test/tls/bin/get_handshake_complete.sh
old mode 100755
new mode 100644
index 9bf9c525d..a2a6dc222
--- a/modules/test/tls/bin/get_handshake_complete.sh
+++ b/modules/test/tls/bin/get_handshake_complete.sh
@@ -14,10 +14,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-CAPTURE_FILE="$1"
-SRC_IP="$2"
-DST_IP="$3"
-TLS_VERSION="$4"
+CAPTURE_FILE=$1
+SRC_IP=$2
+DST_IP=$3
+TLS_VERSION=$4
 
 TSHARK_FILTER="ip.src==$SRC_IP and ip.dst==$DST_IP "
 
@@ -27,7 +27,7 @@ elif [ $TLS_VERSION == '1.2' ];then
 	TSHARK_FILTER=$TSHARK_FILTER "and ssl.handshake.type==2 and tls.handshake.extensions.supported_version==0x0304"
 fi
 
-response=$(tshark -r "$CAPTURE_FILE" $TSHARK_FILTER)
+response=$(tshark -r $CAPTURE_FILE $TSHARK_FILTER)
 
 echo "$response"
   	
\ No newline at end of file
diff --git a/modules/test/tls/bin/get_non_tls_client_connections.sh b/modules/test/tls/bin/get_non_tls_client_connections.sh
old mode 100755
new mode 100644
index 2bfc3d635..08ed19090
--- a/modules/test/tls/bin/get_non_tls_client_connections.sh
+++ b/modules/test/tls/bin/get_non_tls_client_connections.sh
@@ -14,8 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-CAPTURE_FILE="$1"
-SRC_IP="$2"
+CAPTURE_FILE=$1
+SRC_IP=$2
 
 TSHARK_OUTPUT="-T json -e ip.src -e tcp.dstport -e ip.dst"
 # Filter out TLS, DNS and NTP, ICMP (ping), braodcast and multicast packets
@@ -26,7 +26,7 @@ TSHARK_OUTPUT="-T json -e ip.src -e tcp.dstport -e ip.dst"
 # - ICMP (ping) requests are not encrypted so we also need to ignore these
 TSHARK_FILTER="ip.src == $SRC_IP and not tls and not dns and not ntp and not icmp and not(ip.dst == 224.0.0.0/4 or ip.dst == 255.255.255.255)"
 
-response=$(tshark -r "$CAPTURE_FILE" $TSHARK_OUTPUT $TSHARK_FILTER)
+response=$(tshark -r $CAPTURE_FILE $TSHARK_OUTPUT $TSHARK_FILTER)
 
 echo "$response"
   	
\ No newline at end of file
diff --git a/modules/test/tls/bin/get_tls_client_connections.sh b/modules/test/tls/bin/get_tls_client_connections.sh
old mode 100755
new mode 100644
index f036c2154..2486a5f9a
--- a/modules/test/tls/bin/get_tls_client_connections.sh
+++ b/modules/test/tls/bin/get_tls_client_connections.sh
@@ -14,13 +14,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-CAPTURE_FILE="$1"
-SRC_IP="$2"
+CAPTURE_FILE=$1
+SRC_IP=$2
 
 TSHARK_OUTPUT="-T json -e ip.src -e tcp.dstport -e ip.dst"
 TSHARK_FILTER="ip.src == $SRC_IP and tls"
 
-response=$(tshark -r "$CAPTURE_FILE" $TSHARK_OUTPUT $TSHARK_FILTER)
+response=$(tshark -r $CAPTURE_FILE $TSHARK_OUTPUT $TSHARK_FILTER)
 
 echo "$response"
   	
\ No newline at end of file
diff --git a/modules/test/tls/bin/get_tls_packets.sh b/modules/test/tls/bin/get_tls_packets.sh
old mode 100755
new mode 100644
index e64d4e9fb..e06a51571
--- a/modules/test/tls/bin/get_tls_packets.sh
+++ b/modules/test/tls/bin/get_tls_packets.sh
@@ -15,9 +15,9 @@
 # limitations under the License.
 
 
-CAPTURE_FILE="$1"
-SRC_IP="$2"
-TLS_VERSION="$3"
+CAPTURE_FILE=$1
+SRC_IP=$2
+TLS_VERSION=$3
 
 TSHARK_OUTPUT="-T json -e ip.src -e tcp.dstport -e ip.dst"
 # Handshakes will still report TLS version 1 even for TLS 1.2 connections
@@ -34,7 +34,7 @@ elif [ $TLS_VERSION == '1.3' ];then
 	TSHARK_FILTER="$TSHARK_FILTER and ssl.record.version==0x0304"
 fi
 
-response=$(tshark -r "$CAPTURE_FILE" $TSHARK_OUTPUT $TSHARK_FILTER)
+response=$(tshark -r $CAPTURE_FILE $TSHARK_OUTPUT $TSHARK_FILTER)
 
 echo "$response"
   	
\ No newline at end of file
diff --git a/modules/test/tls/python/requirements.txt b/modules/test/tls/python/requirements.txt
index f6d9cf8a7..a8a7e2a30 100644
--- a/modules/test/tls/python/requirements.txt
+++ b/modules/test/tls/python/requirements.txt
@@ -1,5 +1,5 @@
-cryptography==42.0.4
-pyOpenSSL==24.0.0
+cryptography==2.8
+pyOpenSSL==19.0.0
 lxml==5.1.0 # Requirement of pyshark but if upgraded automatically above 5.1 will cause a python crash
 pyshark==0.6
-requests==2.31.0
+requests==2.28.2
\ No newline at end of file
diff --git a/modules/test/tls/python/src/tls_module.py b/modules/test/tls/python/src/tls_module.py
index 98d6f25b1..472d403b2 100644
--- a/modules/test/tls/python/src/tls_module.py
+++ b/modules/test/tls/python/src/tls_module.py
@@ -14,9 +14,12 @@
 """Baseline test module"""
 from test_module import TestModule
 from tls_util import TLSUtil
+import os
 import pyshark
 from cryptography import x509
 from cryptography.hazmat.backends import default_backend
+from cryptography.hazmat.primitives import serialization
+from cryptography.hazmat.primitives.asymmetric import rsa, dsa, ec
 
 LOG_NAME = 'test_tls'
 MODULE_REPORT_FILE_NAME = 'tls_report.html'
@@ -24,7 +27,7 @@
 MONITOR_CAPTURE_FILE = '/runtime/device/monitor.pcap'
 TLS_CAPTURE_FILE = '/runtime/output/tls.pcap'
 GATEWAY_CAPTURE_FILE = '/runtime/network/gateway.pcap'
-LOGGER = None
+
 
 class TLSModule(TestModule):
   """An example testing module."""
@@ -51,144 +54,144 @@ def __init__(self,
 
   # def generate_module_report(self):
 
-  # html_content = '<h1>TLS Module</h1>'
-
-  # # List of capture files to scan
-  # pcap_files = [
-  #     self.startup_capture_file, self.monitor_capture_file,
-  #     self.tls_capture_file
-  # ]
-  # certificates = self.extract_certificates_from_pcap(pcap_files,
-  #                                                    self._device_mac)
-  # if len(certificates) > 0:
-
-  #   # Add summary table
-  #   summary_table = '''
-  #     <table class="module-summary">
-  #       <thead>
-  #         <tr>
-  #           <th>Expiry</th>
-  #           <th>Length</th>
-  #           <th>Type</th>
-  #           <th>Port number</th>
-  #           <th>Signed by</th>
-  #         </tr>
-  #       </thead>
-  #       <tbody>
-  #     '''
-
-  #   # table_content = '''
-  #   #   <table class="module-data">
-  #   #     <thead>
-  #   #       <tr>
-  #   #         <th>Expiry</th>
-  #   #         <th>Length</th>
-  #   #         <th>Type</th>
-  #   #         <th>Port number</th>
-  #   #         <th>Signed by</th>
-  #   #       </tr>
-  #   #     </thead>
-  #   #     <tbody>'''
-
-  #   cert_tables = []
-  #   for cert_num, ((ip_address, port), cert) in enumerate(
-  #       certificates.items()):
-
-  #     # Extract certificate data
-  #     not_valid_before = cert.not_valid_before
-  #     not_valid_after = cert.not_valid_after
-  #     version_value = f'{cert.version.value + 1} ({hex(cert.version.value)})'
-  #     signature_alg_value = cert.signature_algorithm_oid._name  # pylint: disable=W0212
-  #     not_before = str(not_valid_before)
-  #     not_after = str(not_valid_after)
-  #     public_key = cert.public_key()
-  #     signed_by = 'None'
-  #     if isinstance(public_key, rsa.RSAPublicKey):
-  #       public_key_type = 'RSA'
-  #     elif isinstance(public_key, dsa.DSAPublicKey):
-  #       public_key_type = 'DSA'
-  #     elif isinstance(public_key, ec.EllipticCurvePublicKey):
-  #       public_key_type = 'EC'
-  #     else:
-  #       public_key_type = 'Unknown'
-  #     # Calculate certificate length
-  #     cert_length = len(cert.public_bytes(
-  #       encoding=serialization.Encoding.DER))
-
-  #     # Generate the Certificate table
-  #     # cert_table = (f'| Property | Value |\n'
-  #     #               f'|---|---|\n'
-  #     #               f"| {'Version':<17} | {version_value:^25} |\n"
-  #     #               f"| {'Signature Alg.':<17} | {signature_alg_value:^25} |\n"
-  #     #               f"| {'Validity from':<17} | {not_before:^25} |\n"
-  #     #               f"| {'Valid to':<17} | {not_after:^25} |")
-
-  #     # Generate the Subject table
-  #     subj_table = ('| Distinguished Name | Value |\n'
-  #                   '|---|---|')
-  #     for val in cert.subject.rdns:
-  #       dn = val.rfc4514_string().split('=')
-  #       subj_table += f'\n| {dn[0]} | {dn[1]}'
-
-  #     # Generate the Issuer table
-  #     iss_table = ('| Distinguished Name | Value |\n'
-  #                  '|---|---|')
-  #     for val in cert.issuer.rdns:
-  #       dn = val.rfc4514_string().split('=')
-  #       iss_table += f'\n| {dn[0]} | {dn[1]}'
-  #       if 'CN' in dn[0]:
-  #         signed_by = dn[1]
-
-  #     ext_table = None
-  #     # if cert.extensions:
-  #     #   ext_table = ('| Extension | Value |\n'
-  #     #                '|---|---|')
-  #     #   for extension in cert.extensions:
-  #     #     for extension_value in extension.value:
-  #     #       ext_table += f'''\n| {extension.oid._name} |
-  #     #       {extension_value.value}'''  # pylint: disable=W0212
-  #     # cert_table = f'### Certificate\n{cert_table}'
-  #     # cert_table += f'\n\n### Subject\n{subj_table}'
-  #     # cert_table += f'\n\n### Issuer\n{iss_table}'
-  #     # if ext_table is not None:
-  #     #   cert_table += f'\n\n### Extensions\n{ext_table}'
-  #     # cert_tables.append(cert_table)
-
-  #     summary_table += f'''
-  #           <tr>
-  #             <td>{not_after}</td>
-  #             <td>{cert_length}</td>
-  #             <td>{public_key_type}</td>
-  #             <td>{port}</td>
-  #             <td>{signed_by}</td>
-  #           </tr>
-  #         '''
-
-  #   summary_table += '''
-  #       </tbody>
-  #     </table>
-  #   '''
-
-  #   html_content += summary_table
-
-  # else:
-  #   html_content += ('''
-  #     <div class="callout-container info">
-  #       <div class="icon"></div>
-  #       No TLS certificates found on the device
-  #     </div>''')
-
-  # LOGGER.debug('Module report:\n' + html_content)
-
-  # # Use os.path.join to create the complete file path
-  # report_path = os.path.join(self._results_dir, MODULE_REPORT_FILE_NAME)
-
-  # # Write the content to a file
-  # with open(report_path, 'w', encoding='utf-8') as file:
-  #   file.write(html_content)
-
-  # LOGGER.info('Module report generated at: ' + str(report_path))
-  # return report_path
+    # html_content = '<h1>TLS Module</h1>'
+
+    # # List of capture files to scan
+    # pcap_files = [
+    #     self.startup_capture_file, self.monitor_capture_file,
+    #     self.tls_capture_file
+    # ]
+    # certificates = self.extract_certificates_from_pcap(pcap_files,
+    #                                                    self._device_mac)
+    # if len(certificates) > 0:
+
+    #   # Add summary table
+    #   summary_table = '''
+    #     <table class="module-summary">
+    #       <thead>
+    #         <tr>
+    #           <th>Expiry</th>
+    #           <th>Length</th>
+    #           <th>Type</th>
+    #           <th>Port number</th>
+    #           <th>Signed by</th>
+    #         </tr>
+    #       </thead>
+    #       <tbody>       
+    #     '''
+
+    #   # table_content = '''
+    #   #   <table class="module-data">
+    #   #     <thead>
+    #   #       <tr>
+    #   #         <th>Expiry</th>
+    #   #         <th>Length</th>
+    #   #         <th>Type</th>
+    #   #         <th>Port number</th>
+    #   #         <th>Signed by</th>
+    #   #       </tr>
+    #   #     </thead>
+    #   #     <tbody>'''
+
+    #   cert_tables = []
+    #   for cert_num, ((ip_address, port), cert) in enumerate(
+    #       certificates.items()):
+
+    #     # Extract certificate data
+    #     not_valid_before = cert.not_valid_before
+    #     not_valid_after = cert.not_valid_after
+    #     version_value = f'{cert.version.value + 1} ({hex(cert.version.value)})'
+    #     signature_alg_value = cert.signature_algorithm_oid._name  # pylint: disable=W0212
+    #     not_before = str(not_valid_before)
+    #     not_after = str(not_valid_after)
+    #     public_key = cert.public_key()
+    #     signed_by = 'None'
+    #     if isinstance(public_key, rsa.RSAPublicKey):
+    #       public_key_type = 'RSA'
+    #     elif isinstance(public_key, dsa.DSAPublicKey):
+    #       public_key_type = 'DSA'
+    #     elif isinstance(public_key, ec.EllipticCurvePublicKey):
+    #       public_key_type = 'EC'
+    #     else:
+    #       public_key_type = 'Unknown'
+    #     # Calculate certificate length
+    #     cert_length = len(cert.public_bytes(
+    #       encoding=serialization.Encoding.DER))
+
+    #     # Generate the Certificate table
+    #     # cert_table = (f'| Property | Value |\n'
+    #     #               f'|---|---|\n'
+    #     #               f"| {'Version':<17} | {version_value:^25} |\n"
+    #     #               f"| {'Signature Alg.':<17} | {signature_alg_value:^25} |\n"
+    #     #               f"| {'Validity from':<17} | {not_before:^25} |\n"
+    #     #               f"| {'Valid to':<17} | {not_after:^25} |")
+
+    #     # Generate the Subject table
+    #     subj_table = ('| Distinguished Name | Value |\n'
+    #                   '|---|---|')
+    #     for val in cert.subject.rdns:
+    #       dn = val.rfc4514_string().split('=')
+    #       subj_table += f'\n| {dn[0]} | {dn[1]}'
+
+    #     # Generate the Issuer table
+    #     iss_table = ('| Distinguished Name | Value |\n'
+    #                  '|---|---|')
+    #     for val in cert.issuer.rdns:
+    #       dn = val.rfc4514_string().split('=')
+    #       iss_table += f'\n| {dn[0]} | {dn[1]}'
+    #       if 'CN' in dn[0]:
+    #         signed_by = dn[1]
+
+    #     ext_table = None
+    #     # if cert.extensions:
+    #     #   ext_table = ('| Extension | Value |\n'
+    #     #                '|---|---|')
+    #     #   for extension in cert.extensions:
+    #     #     for extension_value in extension.value:
+    #     #       ext_table += f'''\n| {extension.oid._name} |
+    #     #       {extension_value.value}'''  # pylint: disable=W0212
+    #     # cert_table = f'### Certificate\n{cert_table}'
+    #     # cert_table += f'\n\n### Subject\n{subj_table}'
+    #     # cert_table += f'\n\n### Issuer\n{iss_table}'
+    #     # if ext_table is not None:
+    #     #   cert_table += f'\n\n### Extensions\n{ext_table}'
+    #     # cert_tables.append(cert_table)
+
+    #     summary_table += f'''
+    #           <tr>
+    #             <td>{not_after}</td>
+    #             <td>{cert_length}</td>
+    #             <td>{public_key_type}</td>
+    #             <td>{port}</td>
+    #             <td>{signed_by}</td>
+    #           </tr>
+    #         '''
+
+    #   summary_table += '''
+    #       </tbody>
+    #     </table>
+    #   '''
+
+    #   html_content += summary_table
+
+    # else:
+    #   html_content += ('''
+    #     <div class="callout-container info">
+    #       <div class="icon"></div>
+    #       No TLS certificates found on the device
+    #     </div>''')
+
+    # LOGGER.debug('Module report:\n' + html_content)
+
+    # # Use os.path.join to create the complete file path
+    # report_path = os.path.join(self._results_dir, MODULE_REPORT_FILE_NAME)
+
+    # # Write the content to a file
+    # with open(report_path, 'w', encoding='utf-8') as file:
+    #   file.write(html_content)
+
+    # LOGGER.info('Module report generated at: ' + str(report_path))
+    # return report_path
 
   def extract_certificates_from_pcap(self, pcap_files, mac_address):
     # Initialize a list to store packets
@@ -234,18 +237,8 @@ def _security_tls_v1_2_server(self):
           self._device_ipv4_addr, tls_version='1.2')
       tls_1_3_results = self._tls_util.validate_tls_server(
           self._device_ipv4_addr, tls_version='1.3')
-      results = self._tls_util.process_tls_server_results(tls_1_2_results,
+      return self._tls_util.process_tls_server_results(tls_1_2_results,
                                                        tls_1_3_results)
-      # Determine results and return proper messaging and details
-      description = ''
-      if results[0] is None:
-        description = 'TLS 1.2 certificate could not be validated'
-      elif results[0]:
-        description = 'TLS 1.2 certificate is valid'
-      else:
-        description = 'TLS 1.2 certificate is invalid'
-      return results[0], description,results[1]
-
     else:
       LOGGER.error('Could not resolve device IP address. Skipping')
       return 'Error', 'Could not resolve device IP address'
@@ -255,18 +248,8 @@ def _security_tls_v1_3_server(self):
     self._resolve_device_ip()
     # If the ipv4 address wasn't resolved yet, try again
     if self._device_ipv4_addr is not None:
-      results = self._tls_util.validate_tls_server(self._device_ipv4_addr,
+      return self._tls_util.validate_tls_server(self._device_ipv4_addr,
                                                 tls_version='1.3')
-      # Determine results and return proper messaging and details
-      description = ''
-      if results[0] is None:
-        description = 'TLS 1.3 certificate could not be validated'
-      elif results[0]:
-        description = 'TLS 1.3 certificate is valid'
-      else:
-        description = 'TLS 1.3 certificate is invalid'
-      return results[0], description,results[1]
-
     else:
       LOGGER.error('Could not resolve device IP address. Skipping')
       return 'Error', 'Could not resolve device IP address'
@@ -276,16 +259,7 @@ def _security_tls_v1_2_client(self):
     self._resolve_device_ip()
     # If the ipv4 address wasn't resolved yet, try again
     if self._device_ipv4_addr is not None:
-      results = self._validate_tls_client(self._device_ipv4_addr, '1.2')
-      # Determine results and return proper messaging and details
-      description = ''
-      if results[0] is None:
-        description = 'No outbound connections were found'
-      elif results[0]:
-        description = 'TLS 1.2 client connections valid'
-      else:
-        description = 'TLS 1.2 client connections invalid'
-      return results[0], description,  results[1]
+      return self._validate_tls_client(self._device_ipv4_addr, '1.2')
     else:
       LOGGER.error('Could not resolve device IP address. Skipping')
       return 'Error', 'Could not resolve device IP address'
@@ -295,16 +269,7 @@ def _security_tls_v1_3_client(self):
     self._resolve_device_ip()
     # If the ipv4 address wasn't resolved yet, try again
     if self._device_ipv4_addr is not None:
-      results = self._validate_tls_client(self._device_ipv4_addr, '1.3')
-      # Determine results and return proper messaging and details
-      description = ''
-      if results[0] is None:
-        description = 'No outbound connections were found'
-      elif results[0]:
-        description = 'TLS 1.3 client connections valid'
-      else:
-        description = 'TLS 1.3 client connections invalid'
-      return results[0], description,  results[1]
+      return self._validate_tls_client(self._device_ipv4_addr, '1.3')
     else:
       LOGGER.error('Could not resolve device IP address. Skipping')
       return 'Error', 'Could not resolve device IP address'
diff --git a/modules/test/tls/python/src/tls_util.py b/modules/test/tls/python/src/tls_util.py
index 368108bdd..874810e18 100644
--- a/modules/test/tls/python/src/tls_util.py
+++ b/modules/test/tls/python/src/tls_util.py
@@ -188,7 +188,7 @@ def validate_local_ca_signature(self, device_cert_path):
         # Create the file path
         root_cert_path = os.path.join(self._root_certs_dir, root_cert)
         LOGGER.info('Checking root cert: ' + str(root_cert_path))
-        args = f'"{root_cert_path}" "{device_cert_path}"'
+        args = f'{root_cert_path} {device_cert_path}'
         command = f'{bin_file} {args}'
         response = util.run_command(command)
         if f'{device_cert_path}: OK' in str(response):
@@ -257,7 +257,7 @@ def validate_trusted_ca_signature_chain(self, device_cert_path,
 
     # Use openssl script to validate the combined certificate
     # against the available trusted CA's
-    args = f'"{intermediate_cert_path}" "{combined_cert_path}"'
+    args = f'{intermediate_cert_path} {combined_cert_path}'
     command = f'{bin_file} {args}'
     response = util.run_command(command)
     return combined_cert_name + ': OK' in str(response)
@@ -407,7 +407,7 @@ def write_cert_to_file(self, cert_name, cert):
 
   def get_ciphers(self, capture_file, dst_ip, dst_port):
     bin_file = self._bin_dir + '/get_ciphers.sh'
-    args = f'"{capture_file}" {dst_ip} {dst_port}'
+    args = f'{capture_file} {dst_ip} {dst_port}'
     command = f'{bin_file} {args}'
     response = util.run_command(command)
     ciphers = response[0].split('\n')
@@ -417,7 +417,7 @@ def get_hello_packets(self, capture_files, src_ip, tls_version):
     combined_results = []
     for capture_file in capture_files:
       bin_file = self._bin_dir + '/get_client_hello_packets.sh'
-      args = f'"{capture_file}" {src_ip} {tls_version}'
+      args = f'{capture_file} {src_ip} {tls_version}'
       command = f'{bin_file} {args}'
       response = util.run_command(command)
       packets = response[0].strip()
@@ -431,7 +431,7 @@ def get_handshake_complete(self, capture_files, src_ip, dst_ip, tls_version):
     combined_results = ''
     for capture_file in capture_files:
       bin_file = self._bin_dir + '/get_handshake_complete.sh'
-      args = f'"{capture_file}" {src_ip} {dst_ip} {tls_version}'
+      args = f'{capture_file} {src_ip} {dst_ip} {tls_version}'
       command = f'{bin_file} {args}'
       response = util.run_command(command)
       if len(response) > 0:
@@ -443,7 +443,7 @@ def get_non_tls_packetes(self, client_ip, capture_files):
     combined_packets = []
     for capture_file in capture_files:
       bin_file = self._bin_dir + '/get_non_tls_client_connections.sh'
-      args = f'"{capture_file}" {client_ip}'
+      args = f'{capture_file} {client_ip}'
       command = f'{bin_file} {args}'
       response = util.run_command(command)
       if len(response) > 0:
@@ -456,7 +456,7 @@ def get_tls_client_connection_packetes(self, client_ip, capture_files):
     combined_packets = []
     for capture_file in capture_files:
       bin_file = self._bin_dir + '/get_tls_client_connections.sh'
-      args = f'"{capture_file}" {client_ip}'
+      args = f'{capture_file} {client_ip}'
       command = f'{bin_file} {args}'
       response = util.run_command(command)
       packets = json.loads(response[0].strip())
@@ -471,7 +471,7 @@ def get_tls_packets(self, capture_files, src_ip, tls_version):
     combined_results = []
     for capture_file in capture_files:
       bin_file = self._bin_dir + '/get_tls_packets.sh'
-      args = f'"{capture_file}" {src_ip} {tls_version}'
+      args = f'{capture_file} {src_ip} {tls_version}'
       command = f'{bin_file} {args}'
       response = util.run_command(command)
       packets = response[0].strip()
@@ -549,15 +549,11 @@ def get_non_tls_client_connection_ips(self, client_ip, capture_files):
 
     non_tls_dst_ips = set()  # Store unique destination IPs
     for packet in packets:
-      # Check if packet contains TCP layer
-      if 'tcp' in packet['_source']['layers']:
-        tcp_flags = packet['_source']['layers']['tcp.flags']
-        if 'A' not in tcp_flags and 'S' not in tcp_flags:
-          # Packet is not ACK or SYN
-          dst_ip = ipaddress.ip_address(
-              packet['_source']['layers']['ip.dst'][0])
-          if not dst_ip in subnet_with_mask:
-            non_tls_dst_ips.add(str(dst_ip))
+      # Check if an IP address is within the specified subnet.
+      dst_ip = ipaddress.ip_address(packet['_source']['layers']['ip.dst'][0])
+      if not dst_ip in subnet_with_mask:
+        non_tls_dst_ips.add(str(dst_ip))
+
     return non_tls_dst_ips
 
   # Check if the device has made any outbound connections that don't
diff --git a/modules/ui/README.md b/modules/ui/README.md
index 7cb0cc2ae..cef441386 100644
--- a/modules/ui/README.md
+++ b/modules/ui/README.md
@@ -1,4 +1,4 @@
-# Testrun UI
+# TestRunUi
 
 This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 16.1.3.
 
diff --git a/modules/ui/package-lock.json b/modules/ui/package-lock.json
index 3cf3333c5..529f93bf5 100644
--- a/modules/ui/package-lock.json
+++ b/modules/ui/package-lock.json
@@ -52,6 +52,15 @@
         "typescript": "~5.2.2"
       }
     },
+    "node_modules/@aashutoshrathi/word-wrap": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
+      "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/@ampproject/remapping": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
@@ -66,12 +75,12 @@
       }
     },
     "node_modules/@angular-devkit/architect": {
-      "version": "0.1703.6",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1703.6.tgz",
-      "integrity": "sha512-Ck501FD/QuOjeKVFs7hU92w8+Ffetv0d5Sq09XY2/uygo5c/thMzp9nkevaIWBxUSeU5RqYZizDrhFVgYzbbOw==",
+      "version": "0.1703.2",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1703.2.tgz",
+      "integrity": "sha512-fT5gSzwDHOyGv8zF97t8rjeoYSGSxXjWWstl3rN1nXdO0qgJ5m6Sv0fupON+HltdXDCBLRH+2khNpqx/Fh0Qww==",
       "dev": true,
       "dependencies": {
-        "@angular-devkit/core": "17.3.6",
+        "@angular-devkit/core": "17.3.2",
         "rxjs": "7.8.1"
       },
       "engines": {
@@ -81,15 +90,15 @@
       }
     },
     "node_modules/@angular-devkit/build-angular": {
-      "version": "17.3.6",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-17.3.6.tgz",
-      "integrity": "sha512-K4CEZvhQZUUOpmXPVoI1YBM8BARbIlqE6FZRxakmnr+YOtVTYE5s+Dr1wgja8hZIohNz6L7j167G9Aut7oPU/w==",
+      "version": "17.3.2",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-17.3.2.tgz",
+      "integrity": "sha512-muPCUyL0uHvRkLH4NLWiccER6P2vCm/Q5DDvqyN4XOzzY3tAHHLrKrpvY87sgd2oNJ6Ci8x7GPNcfzR5KELCnw==",
       "dev": true,
       "dependencies": {
         "@ampproject/remapping": "2.3.0",
-        "@angular-devkit/architect": "0.1703.6",
-        "@angular-devkit/build-webpack": "0.1703.6",
-        "@angular-devkit/core": "17.3.6",
+        "@angular-devkit/architect": "0.1703.2",
+        "@angular-devkit/build-webpack": "0.1703.2",
+        "@angular-devkit/core": "17.3.2",
         "@babel/core": "7.24.0",
         "@babel/generator": "7.23.6",
         "@babel/helper-annotate-as-pure": "7.22.5",
@@ -100,7 +109,7 @@
         "@babel/preset-env": "7.24.0",
         "@babel/runtime": "7.24.0",
         "@discoveryjs/json-ext": "0.5.7",
-        "@ngtools/webpack": "17.3.6",
+        "@ngtools/webpack": "17.3.2",
         "@vitejs/plugin-basic-ssl": "1.1.0",
         "ansi-colors": "4.1.3",
         "autoprefixer": "10.4.18",
@@ -141,8 +150,8 @@
         "terser": "5.29.1",
         "tree-kill": "1.2.2",
         "tslib": "2.6.2",
-        "undici": "6.11.1",
-        "vite": "5.1.7",
+        "undici": "6.7.1",
+        "vite": "5.1.5",
         "watchpack": "2.4.0",
         "webpack": "5.90.3",
         "webpack-dev-middleware": "6.1.2",
@@ -210,12 +219,12 @@
       }
     },
     "node_modules/@angular-devkit/build-webpack": {
-      "version": "0.1703.6",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1703.6.tgz",
-      "integrity": "sha512-pJu0et2SiF0kfXenHSTtAART0omzbWpLgBfeUo4hBh4uwX5IaT+mRpYpr8gCXMq+qsjoQp3HobSU3lPDeBn+bg==",
+      "version": "0.1703.2",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1703.2.tgz",
+      "integrity": "sha512-w7rVFQcZK4iTCd/MLfQWIkDkwBOfAs++txNQyS9qYID8KvLs1V+oWYd2qDBRelRv1u3YtaCIS1pQx3GFKBC3OA==",
       "dev": true,
       "dependencies": {
-        "@angular-devkit/architect": "0.1703.6",
+        "@angular-devkit/architect": "0.1703.2",
         "rxjs": "7.8.1"
       },
       "engines": {
@@ -229,9 +238,9 @@
       }
     },
     "node_modules/@angular-devkit/core": {
-      "version": "17.3.6",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-17.3.6.tgz",
-      "integrity": "sha512-FVbkT9dEwHEvjnxr4mvMNSMg2bCFoGoP4X68xXU9dhLEUpC05opLvfbaR3Qh543eCJ5AstosBFVzB/krfIkOvA==",
+      "version": "17.3.2",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-17.3.2.tgz",
+      "integrity": "sha512-1vxKo9+pdSwTOwqPDSYQh84gZYmCJo6OgR5+AZoGLGMZSeqvi9RG5RiUcOMLQYOnuYv0arlhlWxz0ZjyR8ApKw==",
       "dev": true,
       "dependencies": {
         "ajv": "8.12.0",
@@ -429,9 +438,9 @@
       }
     },
     "node_modules/@angular/animations": {
-      "version": "17.3.7",
-      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-17.3.7.tgz",
-      "integrity": "sha512-ahenGALPPweeHgqtl9BMkGIAV4fUNI5kOWUrLNbKBfwIJN+aOBOYV1Jz6NKUQq6eYn/1ZYtm0f3lIkHIdtLKEw==",
+      "version": "17.3.1",
+      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-17.3.1.tgz",
+      "integrity": "sha512-2TZ0M5J0IizhHpb404DeqArlv8Ki9BFz5ZUuET2uFROpKW8IMDCht8fSrn/DKHpjB9lvzPUhNFaRxNWEY6klnA==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -439,13 +448,13 @@
         "node": "^18.13.0 || >=20.9.0"
       },
       "peerDependencies": {
-        "@angular/core": "17.3.7"
+        "@angular/core": "17.3.1"
       }
     },
     "node_modules/@angular/cdk": {
-      "version": "17.3.7",
-      "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-17.3.7.tgz",
-      "integrity": "sha512-aFEh8tzKFOwini6aNEp57S54Ocp9T7YIJfBVMESptu2TCPdMTlJ1HJTg5XS8NcQO+vwi9cFPGVwGF1frOx4LXA==",
+      "version": "17.3.1",
+      "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-17.3.1.tgz",
+      "integrity": "sha512-pHSN+KlCmdo2u9jY7Yxsry/ZK+EcjOYGzdwxXxcKragMzm7etY3BJiTl4N+qZRuV6cJlMj2PRkij8ABi/HQdEA==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -664,9 +673,9 @@
       "dev": true
     },
     "node_modules/@angular/common": {
-      "version": "17.3.7",
-      "resolved": "https://registry.npmjs.org/@angular/common/-/common-17.3.7.tgz",
-      "integrity": "sha512-A7LRJu1vVCGGgrfZXjU+njz50SiU4weheKCar5PIUprcdIofS1IrHAJDqYh+kwXxkjXbZMOr/ijQY0+AESLEsw==",
+      "version": "17.3.1",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-17.3.1.tgz",
+      "integrity": "sha512-HyUTJ4RxhE3bOmFRV6Fv2y01ixbrUb8Hd4MxPm8REbNMGKsWCfXhR3FfxFL18Sc03SAF+o0Md0wwekjFKTNKfQ==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -674,14 +683,14 @@
         "node": "^18.13.0 || >=20.9.0"
       },
       "peerDependencies": {
-        "@angular/core": "17.3.7",
+        "@angular/core": "17.3.1",
         "rxjs": "^6.5.3 || ^7.4.0"
       }
     },
     "node_modules/@angular/compiler": {
-      "version": "17.3.7",
-      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-17.3.7.tgz",
-      "integrity": "sha512-AlKiqPoxnrpQ0hn13fIaQPSVodaVAIjBW4vpFyuKFqs2LBKg6iolwZ21s8rEI0KR2gXl+8ugj0/UZ6YADiVM5w==",
+      "version": "17.3.1",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-17.3.1.tgz",
+      "integrity": "sha512-8qqlWPGZEyD2FY5losOW3Aocro+lFysPDzsf0LHgQUM6Ub1b+pq4jUOjH6w0vzaxG3TfxkgzOQ9aNdWtSV67Rg==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -689,7 +698,7 @@
         "node": "^18.13.0 || >=20.9.0"
       },
       "peerDependencies": {
-        "@angular/core": "17.3.7"
+        "@angular/core": "17.3.1"
       },
       "peerDependenciesMeta": {
         "@angular/core": {
@@ -698,9 +707,9 @@
       }
     },
     "node_modules/@angular/compiler-cli": {
-      "version": "17.3.7",
-      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-17.3.7.tgz",
-      "integrity": "sha512-vSg5IQZ9jGmvYjpbfH8KbH4Sl1IVeE+Mr1ogcxkGEsURSRvKo7EWc0K7LSEI9+gg0VLamMiP9EyCJdPxiJeLJQ==",
+      "version": "17.3.1",
+      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-17.3.1.tgz",
+      "integrity": "sha512-xLV9KU+zOpe57/2rQ59ku21EaStNpLSlR9+qkDYf8JR09fB+W9vY3UYbpi5RjHxAFIZBM5D9SFQjjll8rch26g==",
       "dev": true,
       "dependencies": {
         "@babel/core": "7.23.9",
@@ -721,7 +730,7 @@
         "node": "^18.13.0 || >=20.9.0"
       },
       "peerDependencies": {
-        "@angular/compiler": "17.3.7",
+        "@angular/compiler": "17.3.1",
         "typescript": ">=5.2 <5.5"
       }
     },
@@ -771,9 +780,9 @@
       }
     },
     "node_modules/@angular/core": {
-      "version": "17.3.7",
-      "resolved": "https://registry.npmjs.org/@angular/core/-/core-17.3.7.tgz",
-      "integrity": "sha512-HWcrbxqnvIMSxFuQdN0KPt08bc87hqr0LKm89yuRTUwx/2sNJlNQUobk6aJj4trswGBttcRDT+GOS4DQP2Nr4g==",
+      "version": "17.3.1",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-17.3.1.tgz",
+      "integrity": "sha512-Qf3/sgkXS1LHwOTtqAVYprySrn0YpPIZqerPc0tK+hyQfwAz5BQlpcBhbH8RWKlfCY8eO0cqo/j0+e8DQOgYfg==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -786,9 +795,9 @@
       }
     },
     "node_modules/@angular/forms": {
-      "version": "17.3.7",
-      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-17.3.7.tgz",
-      "integrity": "sha512-FEhXh/VmT++XCoO8i7bBtzxG7Am/cE1zrr9aF+fWW+4jpWvJvVN1IaSiJxgBB+iPsOJ9lTBRwfRW3onlcDkhrw==",
+      "version": "17.3.1",
+      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-17.3.1.tgz",
+      "integrity": "sha512-HndsO90k67sFHzd+sII+rhAUksffBvquFuAUCc6QR9WVjILxVg2fY7oBidgS1gKNqu0mptPG0GvuORnaW/0gSg==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -796,16 +805,16 @@
         "node": "^18.13.0 || >=20.9.0"
       },
       "peerDependencies": {
-        "@angular/common": "17.3.7",
-        "@angular/core": "17.3.7",
-        "@angular/platform-browser": "17.3.7",
+        "@angular/common": "17.3.1",
+        "@angular/core": "17.3.1",
+        "@angular/platform-browser": "17.3.1",
         "rxjs": "^6.5.3 || ^7.4.0"
       }
     },
     "node_modules/@angular/material": {
-      "version": "17.3.7",
-      "resolved": "https://registry.npmjs.org/@angular/material/-/material-17.3.7.tgz",
-      "integrity": "sha512-wjSKkk9KZE8QiBPkMd5axh5u/3pUSxoLKNO7OasFhEagMmSv5oYTLm40cErhtb4UdkSmbC19WuuluS6P3leoPA==",
+      "version": "17.3.1",
+      "resolved": "https://registry.npmjs.org/@angular/material/-/material-17.3.1.tgz",
+      "integrity": "sha512-Md1OnO0/sQvK5GkTQyE4v1DAaMswXt1TnjjY07KG7cICTrUN8lc0a2P9dMjlSFXIhxC7PTlNH6plSZ1uspbU8Q==",
       "dependencies": {
         "@material/animation": "15.0.0-canary.7f224ddd4.0",
         "@material/auto-init": "15.0.0-canary.7f224ddd4.0",
@@ -858,7 +867,7 @@
       },
       "peerDependencies": {
         "@angular/animations": "^17.0.0 || ^18.0.0",
-        "@angular/cdk": "17.3.7",
+        "@angular/cdk": "17.3.1",
         "@angular/common": "^17.0.0 || ^18.0.0",
         "@angular/core": "^17.0.0 || ^18.0.0",
         "@angular/forms": "^17.0.0 || ^18.0.0",
@@ -867,9 +876,9 @@
       }
     },
     "node_modules/@angular/platform-browser": {
-      "version": "17.3.7",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-17.3.7.tgz",
-      "integrity": "sha512-Nn8ZMaftAvO9dEwribWdNv+QBHhYIBrRkv85G6et80AXfXoYAr/xcfnQECRFtZgPmANqHC5auv/xrmExQG+Yeg==",
+      "version": "17.3.1",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-17.3.1.tgz",
+      "integrity": "sha512-8ABAL8PElSGzkIparVwifsU0NSu0DdqnWYw9YvLhhZQ6lOuWbG+dTUo/DXzmWhA6ezQWJGNakEZPJJytFIIy+A==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -877,9 +886,9 @@
         "node": "^18.13.0 || >=20.9.0"
       },
       "peerDependencies": {
-        "@angular/animations": "17.3.7",
-        "@angular/common": "17.3.7",
-        "@angular/core": "17.3.7"
+        "@angular/animations": "17.3.1",
+        "@angular/common": "17.3.1",
+        "@angular/core": "17.3.1"
       },
       "peerDependenciesMeta": {
         "@angular/animations": {
@@ -888,9 +897,9 @@
       }
     },
     "node_modules/@angular/platform-browser-dynamic": {
-      "version": "17.3.7",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-17.3.7.tgz",
-      "integrity": "sha512-9c2I4u0L1p2v1/lW8qy+WaNHisUWbyy6wqsv2v9FfCaSM49Lxymgo9LPFPC4qEG5ei5nE+eIQ2ocRiXXsf5QkQ==",
+      "version": "17.3.1",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-17.3.1.tgz",
+      "integrity": "sha512-ACW/npNaDxUNQtEomjjv/KIBY8jHEinePff5qosnAxLE0IpA4qE9eDp36zG35xoJqrPJPYjXbZCBRqqrzM7U7Q==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -898,16 +907,16 @@
         "node": "^18.13.0 || >=20.9.0"
       },
       "peerDependencies": {
-        "@angular/common": "17.3.7",
-        "@angular/compiler": "17.3.7",
-        "@angular/core": "17.3.7",
-        "@angular/platform-browser": "17.3.7"
+        "@angular/common": "17.3.1",
+        "@angular/compiler": "17.3.1",
+        "@angular/core": "17.3.1",
+        "@angular/platform-browser": "17.3.1"
       }
     },
     "node_modules/@angular/router": {
-      "version": "17.3.7",
-      "resolved": "https://registry.npmjs.org/@angular/router/-/router-17.3.7.tgz",
-      "integrity": "sha512-lMkuRrc1ZjP5JPDxNHqoAhB0uAnfPQ/q6mJrw1s8IZoVV6VyM+FxR5r13ajNcXWC38xy/YhBjpXPF1vBdxuLXg==",
+      "version": "17.3.1",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-17.3.1.tgz",
+      "integrity": "sha512-H6H7lY9i5Ppu0SFwwpeWqJbCFw8cILOj8Rd1+AGoCN5m3ivPtjD2Ltz62PI2zZkqx+WhQdk19l61Wm3oRqg70A==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -915,9 +924,9 @@
         "node": "^18.13.0 || >=20.9.0"
       },
       "peerDependencies": {
-        "@angular/common": "17.3.7",
-        "@angular/core": "17.3.7",
-        "@angular/platform-browser": "17.3.7",
+        "@angular/common": "17.3.1",
+        "@angular/core": "17.3.1",
+        "@angular/platform-browser": "17.3.1",
         "rxjs": "^6.5.3 || ^7.4.0"
       }
     },
@@ -935,9 +944,9 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.24.4",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.4.tgz",
-      "integrity": "sha512-vg8Gih2MLK+kOkHJp4gBEIkyaIi00jgWot2D9QOmmfLC8jINSOzmCLta6Bvz/JSBCqnegV0L80jhxkol5GWNfQ==",
+      "version": "7.24.1",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.1.tgz",
+      "integrity": "sha512-Pc65opHDliVpRHuKfzI+gSA4zcgr65O4cl64fFJIWEEh8JoHIHh0Oez1Eo8Arz8zq/JhgKodQaxEwUPRtZylVA==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
@@ -1053,19 +1062,19 @@
       }
     },
     "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.24.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.5.tgz",
-      "integrity": "sha512-uRc4Cv8UQWnE4NXlYTIIdM7wfFkOqlFztcC/gVXDKohKoVB3OyonfelUBaJzSwpBntZ2KYGF/9S7asCHsXwW6g==",
+      "version": "7.24.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.1.tgz",
+      "integrity": "sha512-1yJa9dX9g//V6fDebXoEfEsxkZHk3Hcbm+zLhyu6qVgYFLvmTALTeV+jNU9e5RnYtioBrGEOdoI2joMSNQ/+aA==",
       "dev": true,
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
         "@babel/helper-environment-visitor": "^7.22.20",
         "@babel/helper-function-name": "^7.23.0",
-        "@babel/helper-member-expression-to-functions": "^7.24.5",
+        "@babel/helper-member-expression-to-functions": "^7.23.0",
         "@babel/helper-optimise-call-expression": "^7.22.5",
         "@babel/helper-replace-supers": "^7.24.1",
         "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.24.5",
+        "@babel/helper-split-export-declaration": "^7.22.6",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -1075,18 +1084,6 @@
         "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.24.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.5.tgz",
-      "integrity": "sha512-5CHncttXohrHk8GWOFCcCl4oRD9fKosWlIRgWm4ql9VYioKm52Mk2xsmoohvm7f3JoiLSM5ZgJuRaf5QZZYd3Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.24.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@babel/helper-create-class-features-plugin/node_modules/semver": {
       "version": "6.3.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
@@ -1123,9 +1120,9 @@
       }
     },
     "node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.2.tgz",
-      "integrity": "sha512-LV76g+C502biUK6AyZ3LK10vDpDyCzZnhZFXkH1L75zHPj68+qc8Zfpx2th+gzwA2MzyK+1g/3EPl62yFnVttQ==",
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.1.tgz",
+      "integrity": "sha512-o7SDgTJuvx5vLKD6SFvkydkSMBvahDKGiNJzG22IZYXhiqoe9efY7zocICBgzHV4IRg5wdgl2nEL/tulKIEIbA==",
       "dev": true,
       "dependencies": {
         "@babel/helper-compilation-targets": "^7.22.6",
@@ -1173,12 +1170,12 @@
       }
     },
     "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.24.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.5.tgz",
-      "integrity": "sha512-4owRteeihKWKamtqg4JmWSsEZU445xpFRXPEwp44HbgbxdWlUV1b4Agg4lkA806Lil5XM/e+FJyS0vj5T6vmcA==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz",
+      "integrity": "sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.24.5"
+        "@babel/types": "^7.23.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1197,16 +1194,16 @@
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.24.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.24.5.tgz",
-      "integrity": "sha512-9GxeY8c2d2mdQUP1Dye0ks3VDyIMS98kt/llQ2nUId8IsWqTF0l1LkSX0/uP7l7MCDrzXS009Hyhe2gzTiGW8A==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz",
+      "integrity": "sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==",
       "dev": true,
       "dependencies": {
         "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-module-imports": "^7.24.3",
-        "@babel/helper-simple-access": "^7.24.5",
-        "@babel/helper-split-export-declaration": "^7.24.5",
-        "@babel/helper-validator-identifier": "^7.24.5"
+        "@babel/helper-module-imports": "^7.22.15",
+        "@babel/helper-simple-access": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.6",
+        "@babel/helper-validator-identifier": "^7.22.20"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1215,18 +1212,6 @@
         "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/helper-module-transforms/node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.24.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.5.tgz",
-      "integrity": "sha512-5CHncttXohrHk8GWOFCcCl4oRD9fKosWlIRgWm4ql9VYioKm52Mk2xsmoohvm7f3JoiLSM5ZgJuRaf5QZZYd3Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.24.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@babel/helper-optimise-call-expression": {
       "version": "7.22.5",
       "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz",
@@ -1240,9 +1225,9 @@
       }
     },
     "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.24.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.5.tgz",
-      "integrity": "sha512-xjNLDopRzW2o6ba0gKbkZq5YWEBaK3PCyTOY1K2P/O07LGMhMqlMXPxwN4S5/RhWuCobT8z0jrlKGlYmeR1OhQ==",
+      "version": "7.24.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.0.tgz",
+      "integrity": "sha512-9cUznXMG0+FxRuJfvL82QlTqIzhVW9sL0KjMPHhAOOvpQGL8QtdxnBKILjBqxlHyliz0yCa1G903ZXI/FuHy2w==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
@@ -1283,12 +1268,12 @@
       }
     },
     "node_modules/@babel/helper-simple-access": {
-      "version": "7.24.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.5.tgz",
-      "integrity": "sha512-uH3Hmf5q5n7n8mz7arjUlDOCbttY/DW4DYhE6FUsjKJ/oYC1kQQUvwEQWxRwUpX9qQKRXeqLwWxrqilMrf32sQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz",
+      "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.24.5"
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1328,9 +1313,9 @@
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.24.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.5.tgz",
-      "integrity": "sha512-3q93SSKX2TWCG30M2G2kwaKeTYgEUp5Snjuj8qm729SObL6nbtUldAi37qbxkD5gg3xnBio+f9nqpSepGZMvxA==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
+      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
@@ -1346,40 +1331,40 @@
       }
     },
     "node_modules/@babel/helper-wrap-function": {
-      "version": "7.24.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.24.5.tgz",
-      "integrity": "sha512-/xxzuNvgRl4/HLNKvnFwdhdgN3cpLxgLROeLDl83Yx0AJ1SGvq1ak0OszTOjDfiB8Vx03eJbeDWh9r+jCCWttw==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz",
+      "integrity": "sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-function-name": "^7.23.0",
-        "@babel/template": "^7.24.0",
-        "@babel/types": "^7.24.5"
+        "@babel/helper-function-name": "^7.22.5",
+        "@babel/template": "^7.22.15",
+        "@babel/types": "^7.22.19"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.24.5",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.5.tgz",
-      "integrity": "sha512-CiQmBMMpMQHwM5m01YnrM6imUG1ebgYJ+fAIW4FZe6m4qHTPaRHti+R8cggAwkdz4oXhtO4/K9JWlh+8hIfR2Q==",
+      "version": "7.24.1",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.1.tgz",
+      "integrity": "sha512-BpU09QqEe6ZCHuIHFphEFgvNSrubve1FtyMton26ekZ85gRGi6LrTF7zArARp2YvyFxloeiRmtSCq5sjh1WqIg==",
       "dev": true,
       "dependencies": {
         "@babel/template": "^7.24.0",
-        "@babel/traverse": "^7.24.5",
-        "@babel/types": "^7.24.5"
+        "@babel/traverse": "^7.24.1",
+        "@babel/types": "^7.24.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/highlight": {
-      "version": "7.24.5",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.5.tgz",
-      "integrity": "sha512-8lLmua6AVh/8SLJRRVD6V8p73Hir9w5mJrhE+IPpILG31KKlI9iz5zmBYKcWPS59qSfgP9RaSBQSHHE81WKuEw==",
+      "version": "7.24.2",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.2.tgz",
+      "integrity": "sha512-Yac1ao4flkTxTteCDZLEvdxg2fZfz1v8M4QpaGypq/WPDqg3ijHYbDfs+LG5hvzSoqaSZ9/Z9lKSP3CjZjv+pA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.24.5",
+        "@babel/helper-validator-identifier": "^7.22.20",
         "chalk": "^2.4.2",
         "js-tokens": "^4.0.0",
         "picocolors": "^1.0.0"
@@ -1389,9 +1374,9 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.24.5",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.5.tgz",
-      "integrity": "sha512-EOv5IK8arwh3LI47dz1b0tKUb/1uhHAnHJOrjgtQMIpu1uXd9mlFrJg9IUgGUgZ41Ch0K8REPTYpO7B76b4vJg==",
+      "version": "7.24.1",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.1.tgz",
+      "integrity": "sha512-Zo9c7N3xdOIQrNip7Lc9wvRPzlRtovHVE4lkz8WEDr7uYh/GMQhSiIgFxGIArRHYdJE5kxtZjAf8rT0xhdLCzg==",
       "dev": true,
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -1761,12 +1746,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.24.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.24.5.tgz",
-      "integrity": "sha512-sMfBc3OxghjC95BkYrYocHL3NaOplrcaunblzwXhGmlPwpmfsxr4vK+mBBt49r+S240vahmv+kUxkeKgs+haCw==",
+      "version": "7.24.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.24.1.tgz",
+      "integrity": "sha512-h71T2QQvDgM2SmT29UYU6ozjMlAt7s7CSs5Hvy8f8cf/GM/Z4a2zMfN+fjVGaieeCrXR3EdQl6C4gQG+OgmbKw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.5"
+        "@babel/helper-plugin-utils": "^7.24.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1792,12 +1777,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-class-static-block": {
-      "version": "7.24.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.24.4.tgz",
-      "integrity": "sha512-B8q7Pz870Hz/q9UgP8InNpY01CSLDSCyqX7zcRuv3FcPl87A2G17lASroHWaCtbdIcbYzOZ7kWmXFKbijMSmFg==",
+      "version": "7.24.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.24.1.tgz",
+      "integrity": "sha512-FUHlKCn6J3ERiu8Dv+4eoz7w8+kFLSyeVG4vDAikwADGjUCoHw/JHokyGtr8OR4UjpwPVivyF+h8Q5iv/JmrtA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.24.4",
+        "@babel/helper-create-class-features-plugin": "^7.24.1",
         "@babel/helper-plugin-utils": "^7.24.0",
         "@babel/plugin-syntax-class-static-block": "^7.14.5"
       },
@@ -1809,18 +1794,18 @@
       }
     },
     "node_modules/@babel/plugin-transform-classes": {
-      "version": "7.24.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.24.5.tgz",
-      "integrity": "sha512-gWkLP25DFj2dwe9Ck8uwMOpko4YsqyfZJrOmqqcegeDYEbp7rmn4U6UQZNj08UF6MaX39XenSpKRCvpDRBtZ7Q==",
+      "version": "7.24.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.24.1.tgz",
+      "integrity": "sha512-ZTIe3W7UejJd3/3R4p7ScyyOoafetUShSf4kCqV0O7F/RiHxVj/wRaRnQlrGwflvcehNA8M42HkAiEDYZu2F1Q==",
       "dev": true,
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
         "@babel/helper-compilation-targets": "^7.23.6",
         "@babel/helper-environment-visitor": "^7.22.20",
         "@babel/helper-function-name": "^7.23.0",
-        "@babel/helper-plugin-utils": "^7.24.5",
+        "@babel/helper-plugin-utils": "^7.24.0",
         "@babel/helper-replace-supers": "^7.24.1",
-        "@babel/helper-split-export-declaration": "^7.24.5",
+        "@babel/helper-split-export-declaration": "^7.22.6",
         "globals": "^11.1.0"
       },
       "engines": {
@@ -1830,18 +1815,6 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-classes/node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.24.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.5.tgz",
-      "integrity": "sha512-5CHncttXohrHk8GWOFCcCl4oRD9fKosWlIRgWm4ql9VYioKm52Mk2xsmoohvm7f3JoiLSM5ZgJuRaf5QZZYd3Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.24.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@babel/plugin-transform-computed-properties": {
       "version": "7.24.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.1.tgz",
@@ -1859,12 +1832,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.24.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.5.tgz",
-      "integrity": "sha512-SZuuLyfxvsm+Ah57I/i1HVjveBENYK9ue8MJ7qkc7ndoNjqquJiElzA7f5yaAXjyW2hKojosOTAQQRX50bPSVg==",
+      "version": "7.24.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.1.tgz",
+      "integrity": "sha512-ow8jciWqNxR3RYbSNVuF4U2Jx130nwnBnhRw6N6h1bOejNkABmcI5X5oz29K4alWX7vf1C+o6gtKXikzRKkVdw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.5"
+        "@babel/helper-plugin-utils": "^7.24.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2178,15 +2151,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-rest-spread": {
-      "version": "7.24.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.5.tgz",
-      "integrity": "sha512-7EauQHszLGM3ay7a161tTQH7fj+3vVM/gThlz5HpFtnygTxjrlvoeq7MPVA1Vy9Q555OB8SnAOsMkLShNkkrHA==",
+      "version": "7.24.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.1.tgz",
+      "integrity": "sha512-XjD5f0YqOtebto4HGISLNfiNMTTs6tbkFf2TOqJlYKYmbo+mN9Dnpl4SRoofiziuOWMIyq3sZEUqLo3hLITFEA==",
       "dev": true,
       "dependencies": {
         "@babel/helper-compilation-targets": "^7.23.6",
-        "@babel/helper-plugin-utils": "^7.24.5",
+        "@babel/helper-plugin-utils": "^7.24.0",
         "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.24.5"
+        "@babel/plugin-transform-parameters": "^7.24.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2228,12 +2201,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-chaining": {
-      "version": "7.24.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.5.tgz",
-      "integrity": "sha512-xWCkmwKT+ihmA6l7SSTpk8e4qQl/274iNbSKRRS8mpqFR32ksy36+a+LWY8OXCCEefF8WFlnOHVsaDI2231wBg==",
+      "version": "7.24.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.1.tgz",
+      "integrity": "sha512-n03wmDt+987qXwAgcBlnUUivrZBPZ8z1plL0YvgQalLm+ZE5BMhGm94jhxXtA1wzv1Cu2aaOv1BM9vbVttrzSg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.5",
+        "@babel/helper-plugin-utils": "^7.24.0",
         "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
         "@babel/plugin-syntax-optional-chaining": "^7.8.3"
       },
@@ -2245,12 +2218,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.24.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.5.tgz",
-      "integrity": "sha512-9Co00MqZ2aoky+4j2jhofErthm6QVLKbpQrvz20c3CH9KQCLHyNB+t2ya4/UrRpQGR+Wrwjg9foopoeSdnHOkA==",
+      "version": "7.24.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.1.tgz",
+      "integrity": "sha512-8Jl6V24g+Uw5OGPeWNKrKqXPDw2YDjLc53ojwfMcKwlEoETKU9rU0mHUtcg9JntWI/QYzGAXNWEcVHZ+fR+XXg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.5"
+        "@babel/helper-plugin-utils": "^7.24.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2276,14 +2249,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-private-property-in-object": {
-      "version": "7.24.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.24.5.tgz",
-      "integrity": "sha512-JM4MHZqnWR04jPMujQDTBVRnqxpLLpx2tkn7iPn+Hmsc0Gnb79yvRWOkvqFOx3Z7P7VxiRIR22c4eGSNj87OBQ==",
+      "version": "7.24.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.24.1.tgz",
+      "integrity": "sha512-pTHxDVa0BpUbvAgX3Gat+7cSciXqUcY9j2VZKTbSB6+VQGpNgNO9ailxTGHSXlqOnX1Hcx1Enme2+yv7VqP9bg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-create-class-features-plugin": "^7.24.5",
-        "@babel/helper-plugin-utils": "^7.24.5",
+        "@babel/helper-create-class-features-plugin": "^7.24.1",
+        "@babel/helper-plugin-utils": "^7.24.0",
         "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
       },
       "engines": {
@@ -2430,12 +2403,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-typeof-symbol": {
-      "version": "7.24.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.5.tgz",
-      "integrity": "sha512-UTGnhYVZtTAjdwOTzT+sCyXmTn8AhaxOS/MjG9REclZ6ULHWF9KoCZur0HSGU7hk8PdBFKKbYe6+gqdXWz84Jg==",
+      "version": "7.24.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.1.tgz",
+      "integrity": "sha512-CBfU4l/A+KruSUoW+vTQthwcAdwuqbpRNB8HQKlZABwHRhsdHZ9fezp4Sn18PeAlYxTNiLMlx4xUBV3AWfg1BA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.5"
+        "@babel/helper-plugin-utils": "^7.24.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2657,19 +2630,19 @@
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.24.5",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.5.tgz",
-      "integrity": "sha512-7aaBLeDQ4zYcUFDUD41lJc1fG8+5IU9DaNSJAgal866FGvmD5EbWQgnEC6kO1gGLsX0esNkfnJSndbTXA3r7UA==",
+      "version": "7.24.1",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.1.tgz",
+      "integrity": "sha512-xuU6o9m68KeqZbQuDt2TcKSxUw/mrsvavlEqQ1leZ/B+C9tk6E4sRWy97WaXgvq5E+nU3cXMxv3WKOCanVMCmQ==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.24.2",
-        "@babel/generator": "^7.24.5",
+        "@babel/code-frame": "^7.24.1",
+        "@babel/generator": "^7.24.1",
         "@babel/helper-environment-visitor": "^7.22.20",
         "@babel/helper-function-name": "^7.23.0",
         "@babel/helper-hoist-variables": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.24.5",
-        "@babel/parser": "^7.24.5",
-        "@babel/types": "^7.24.5",
+        "@babel/helper-split-export-declaration": "^7.22.6",
+        "@babel/parser": "^7.24.1",
+        "@babel/types": "^7.24.0",
         "debug": "^4.3.1",
         "globals": "^11.1.0"
       },
@@ -2678,12 +2651,12 @@
       }
     },
     "node_modules/@babel/traverse/node_modules/@babel/generator": {
-      "version": "7.24.5",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.5.tgz",
-      "integrity": "sha512-x32i4hEXvr+iI0NEoEfDKzlemF8AmtOP8CcrRaEcpzysWuoEb1KknpcvMsHKPONoKZiDuItklgWhB18xEhr9PA==",
+      "version": "7.24.1",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.1.tgz",
+      "integrity": "sha512-DfCRfZsBcrPEHUfuBMgbJ1Ut01Y/itOs+hY2nFLgqsqXd52/iSiVq5TITtUasIUgm+IIKdY2/1I7auiQOEeC9A==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.24.5",
+        "@babel/types": "^7.24.0",
         "@jridgewell/gen-mapping": "^0.3.5",
         "@jridgewell/trace-mapping": "^0.3.25",
         "jsesc": "^2.5.1"
@@ -2692,26 +2665,14 @@
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/traverse/node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.24.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.5.tgz",
-      "integrity": "sha512-5CHncttXohrHk8GWOFCcCl4oRD9fKosWlIRgWm4ql9VYioKm52Mk2xsmoohvm7f3JoiLSM5ZgJuRaf5QZZYd3Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.24.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@babel/types": {
-      "version": "7.24.5",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.5.tgz",
-      "integrity": "sha512-6mQNsaLeXTw0nxYUYu+NSa4Hx4BlF1x1x8/PMFbiR+GBSr+2DkECc69b8hgy2frEodNcvPffeH8YfWd3LI6jhQ==",
+      "version": "7.24.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.0.tgz",
+      "integrity": "sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-string-parser": "^7.24.1",
-        "@babel/helper-validator-identifier": "^7.24.5",
+        "@babel/helper-string-parser": "^7.23.4",
+        "@babel/helper-validator-identifier": "^7.22.20",
         "to-fast-properties": "^2.0.0"
       },
       "engines": {
@@ -3299,9 +3260,9 @@
       }
     },
     "node_modules/@humanwhocodes/object-schema": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz",
-      "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz",
+      "integrity": "sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==",
       "dev": true
     },
     "node_modules/@isaacs/cliui": {
@@ -3496,9 +3457,9 @@
       }
     },
     "node_modules/@leichtgewicht/ip-codec": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.5.tgz",
-      "integrity": "sha512-Vo+PSpZG2/fmgmiNzYK9qWRh8h/CHrwD0mo1h1DzL4yzHNSfWYujGTYsWGreD000gcgmZ7K4Ys6Tx9TxtsKdDw==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz",
+      "integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==",
       "dev": true
     },
     "node_modules/@ljharb/through": {
@@ -4266,9 +4227,9 @@
       }
     },
     "node_modules/@ngrx/component-store": {
-      "version": "17.2.0",
-      "resolved": "https://registry.npmjs.org/@ngrx/component-store/-/component-store-17.2.0.tgz",
-      "integrity": "sha512-ywhyoZpkbVIY1t5zf7xfWLGkY0A/fQdMjPehHloDI6bRLrmbllBhQRazwZ+FAGIi2myx1+mGcmAc6FbtIikedA==",
+      "version": "17.1.1",
+      "resolved": "https://registry.npmjs.org/@ngrx/component-store/-/component-store-17.1.1.tgz",
+      "integrity": "sha512-pknwettIC52JELk9PjhTgBBsY/WtdltB91jPW9c6hWCxW8X89ipV9Fe+alKBhqqL8pQiK/gPpWmbp0zPauUChQ==",
       "dependencies": {
         "@ngrx/operators": "17.0.0-beta.0",
         "tslib": "^2.0.0"
@@ -4279,16 +4240,16 @@
       }
     },
     "node_modules/@ngrx/effects": {
-      "version": "17.2.0",
-      "resolved": "https://registry.npmjs.org/@ngrx/effects/-/effects-17.2.0.tgz",
-      "integrity": "sha512-tXDJNsuBtbvI/7+vYnkDKKpUvLbopw1U5G6LoPnKNrbTPsPcUGmCqF5Su/ZoRN3BhXjt2j+eoeVdpBkxdxMRgg==",
+      "version": "17.1.1",
+      "resolved": "https://registry.npmjs.org/@ngrx/effects/-/effects-17.1.1.tgz",
+      "integrity": "sha512-VDNVI70wfEwqoNliffAiMhsPry0CWKkifCLmfzr+SZEEdAaPEBr4FtRrrdcdq/ovmkcgoWukkH2MBljbCyHwtA==",
       "dependencies": {
         "@ngrx/operators": "17.0.0-beta.0",
         "tslib": "^2.0.0"
       },
       "peerDependencies": {
         "@angular/core": "^17.0.0",
-        "@ngrx/store": "17.2.0",
+        "@ngrx/store": "17.1.1",
         "rxjs": "^6.5.3 || ^7.5.0"
       }
     },
@@ -4304,9 +4265,9 @@
       }
     },
     "node_modules/@ngrx/store": {
-      "version": "17.2.0",
-      "resolved": "https://registry.npmjs.org/@ngrx/store/-/store-17.2.0.tgz",
-      "integrity": "sha512-7wKgZ59B/6yQSvvsU0DQXipDqpkAXv7LwcXLD5Ww7nvqN0fQoRPThMh4+Wv55DCJhE0bQc1NEMciLA47uRt7Wg==",
+      "version": "17.1.1",
+      "resolved": "https://registry.npmjs.org/@ngrx/store/-/store-17.1.1.tgz",
+      "integrity": "sha512-MGbKLTcl4uq2Uzx+qbMYNy6xW+JnkpRiznaGFX2/NFflq/zNZsjbxZrvn4/Z6ClVYIjj3uadjM1fupwMYMJxVA==",
       "dependencies": {
         "tslib": "^2.0.0"
       },
@@ -4316,9 +4277,9 @@
       }
     },
     "node_modules/@ngtools/webpack": {
-      "version": "17.3.6",
-      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-17.3.6.tgz",
-      "integrity": "sha512-equxbgh2DKzZtiFMoVf1KD4yJcH1q8lpqQ/GSPPQUvONcmHrr+yqdRUdaJ7oZCyCYmXF/nByBxtMKtJr6nKZVg==",
+      "version": "17.3.2",
+      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-17.3.2.tgz",
+      "integrity": "sha512-E8zejFF4aJ8l2XcF+GgnE/1IqsZepnPT1xzulLB4LXtjVuXLFLoF9xkHQwxs7cJWWZsxd/SlNsCIcn/ezrYBcQ==",
       "dev": true,
       "engines": {
         "node": "^18.13.0 || >=20.9.0",
@@ -4367,25 +4328,25 @@
       }
     },
     "node_modules/@npmcli/agent": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/@npmcli/agent/-/agent-2.2.2.tgz",
-      "integrity": "sha512-OrcNPXdpSl9UX7qPVRWbmWMCSXrcDa2M9DvrbOTj7ao1S4PlqVFYv9/yLKMkrJKZ/V5A/kDBC690or307i26Og==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/@npmcli/agent/-/agent-2.2.1.tgz",
+      "integrity": "sha512-H4FrOVtNyWC8MUwL3UfjOsAihHvT1Pe8POj3JvjXhSTJipsZMtgUALCT4mGyYZNxymkUfOw3PUj6dE4QPp6osQ==",
       "dev": true,
       "dependencies": {
         "agent-base": "^7.1.0",
         "http-proxy-agent": "^7.0.0",
         "https-proxy-agent": "^7.0.1",
         "lru-cache": "^10.0.1",
-        "socks-proxy-agent": "^8.0.3"
+        "socks-proxy-agent": "^8.0.1"
       },
       "engines": {
         "node": "^16.14.0 || >=18.0.0"
       }
     },
     "node_modules/@npmcli/agent/node_modules/lru-cache": {
-      "version": "10.2.2",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.2.tgz",
-      "integrity": "sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==",
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.0.tgz",
+      "integrity": "sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==",
       "dev": true,
       "engines": {
         "node": "14 || >=16.14"
@@ -4404,15 +4365,15 @@
       }
     },
     "node_modules/@npmcli/git": {
-      "version": "5.0.7",
-      "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-5.0.7.tgz",
-      "integrity": "sha512-WaOVvto604d5IpdCRV2KjQu8PzkfE96d50CQGKgywXh2GxXmDeUO5EWcBC4V57uFyrNqx83+MewuJh3WTR3xPA==",
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-5.0.4.tgz",
+      "integrity": "sha512-nr6/WezNzuYUppzXRaYu/W4aT5rLxdXqEFupbh6e/ovlYFQ8hpu1UUPV3Ir/YTl+74iXl2ZOMlGzudh9ZPUchQ==",
       "dev": true,
       "dependencies": {
         "@npmcli/promise-spawn": "^7.0.0",
         "lru-cache": "^10.0.1",
         "npm-pick-manifest": "^9.0.0",
-        "proc-log": "^4.0.0",
+        "proc-log": "^3.0.0",
         "promise-inflight": "^1.0.1",
         "promise-retry": "^2.0.1",
         "semver": "^7.3.5",
@@ -4432,23 +4393,14 @@
       }
     },
     "node_modules/@npmcli/git/node_modules/lru-cache": {
-      "version": "10.2.2",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.2.tgz",
-      "integrity": "sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==",
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.0.tgz",
+      "integrity": "sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==",
       "dev": true,
       "engines": {
         "node": "14 || >=16.14"
       }
     },
-    "node_modules/@npmcli/git/node_modules/proc-log": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz",
-      "integrity": "sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==",
-      "dev": true,
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
     "node_modules/@npmcli/git/node_modules/which": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz",
@@ -4465,16 +4417,16 @@
       }
     },
     "node_modules/@npmcli/installed-package-contents": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-2.1.0.tgz",
-      "integrity": "sha512-c8UuGLeZpm69BryRykLuKRyKFZYJsZSCT4aVY5ds4omyZqJ172ApzgfKJ5eV/r3HgLdUYgFVe54KSFVjKoe27w==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-2.0.2.tgz",
+      "integrity": "sha512-xACzLPhnfD51GKvTOOuNX2/V4G4mz9/1I2MfDoye9kBM3RYe5g2YbscsaGoTlaWqkxeiapBWyseULVKpSVHtKQ==",
       "dev": true,
       "dependencies": {
         "npm-bundled": "^3.0.0",
         "npm-normalize-package-bin": "^3.0.0"
       },
       "bin": {
-        "installed-package-contents": "bin/index.js"
+        "installed-package-contents": "lib/index.js"
       },
       "engines": {
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
@@ -4490,9 +4442,9 @@
       }
     },
     "node_modules/@npmcli/package-json": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/package-json/-/package-json-5.1.0.tgz",
-      "integrity": "sha512-1aL4TuVrLS9sf8quCLerU3H9J4vtCtgu8VauYozrmEyU57i/EdKleCnsQ7vpnABIH6c9mnTxcH5sFkO3BlV8wQ==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/package-json/-/package-json-5.0.0.tgz",
+      "integrity": "sha512-OI2zdYBLhQ7kpNPaJxiflofYIpkNLi+lnGdzqUOfRmCF3r2l1nadcjtCYMJKv/Utm/ZtlffaUuTiAktPHbc17g==",
       "dev": true,
       "dependencies": {
         "@npmcli/git": "^5.0.0",
@@ -4500,7 +4452,7 @@
         "hosted-git-info": "^7.0.0",
         "json-parse-even-better-errors": "^3.0.0",
         "normalize-package-data": "^6.0.0",
-        "proc-log": "^4.0.0",
+        "proc-log": "^3.0.0",
         "semver": "^7.5.3"
       },
       "engines": {
@@ -4508,16 +4460,16 @@
       }
     },
     "node_modules/@npmcli/package-json/node_modules/glob": {
-      "version": "10.3.12",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.12.tgz",
-      "integrity": "sha512-TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg==",
+      "version": "10.3.10",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz",
+      "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==",
       "dev": true,
       "dependencies": {
         "foreground-child": "^3.1.0",
-        "jackspeak": "^2.3.6",
+        "jackspeak": "^2.3.5",
         "minimatch": "^9.0.1",
-        "minipass": "^7.0.4",
-        "path-scurry": "^1.10.2"
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0",
+        "path-scurry": "^1.10.1"
       },
       "bin": {
         "glob": "dist/esm/bin.mjs"
@@ -4529,19 +4481,10 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/@npmcli/package-json/node_modules/proc-log": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz",
-      "integrity": "sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==",
-      "dev": true,
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
     "node_modules/@npmcli/promise-spawn": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-7.0.2.tgz",
-      "integrity": "sha512-xhfYPXoV5Dy4UkY0D+v2KkwvnDfiA/8Mt3sWCGI/hM03NsYIH8ZaG6QzS9x7pje5vHZBZJ2v6VRFVTWACnqcmQ==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-7.0.1.tgz",
+      "integrity": "sha512-P4KkF9jX3y+7yFUxgcUdDtLy+t4OlDGuEBLNs57AZsfSfg+uV6MLndqGpnl4831ggaEdXwR50XFoZP4VFtHolg==",
       "dev": true,
       "dependencies": {
         "which": "^4.0.0"
@@ -4574,15 +4517,6 @@
         "node": "^16.13.0 || >=18.0.0"
       }
     },
-    "node_modules/@npmcli/redact": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/redact/-/redact-1.1.0.tgz",
-      "integrity": "sha512-PfnWuOkQgu7gCbnSsAisaX7hKOdZ4wSAhAzH3/ph5dSGau52kCRrMMGbiSQLwyTZpgldkZ49b0brkOr1AzGBHQ==",
-      "dev": true,
-      "engines": {
-        "node": "^16.14.0 || >=18.0.0"
-      }
-    },
     "node_modules/@npmcli/run-script": {
       "version": "7.0.4",
       "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-7.0.4.tgz",
@@ -4879,9 +4813,9 @@
       }
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.17.2.tgz",
-      "integrity": "sha512-NM0jFxY8bB8QLkoKxIQeObCaDlJKewVlIEkuyYKm5An1tdVZ966w2+MPQ2l8LBZLjR+SgyV+nRkTIunzOYBMLQ==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.13.0.tgz",
+      "integrity": "sha512-5ZYPOuaAqEH/W3gYsRkxQATBW3Ii1MfaT4EQstTnLKViLi2gLSQmlmtTpGucNP3sXEpOiI5tdGhjdE111ekyEg==",
       "cpu": [
         "arm"
       ],
@@ -4892,9 +4826,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.17.2.tgz",
-      "integrity": "sha512-yeX/Usk7daNIVwkq2uGoq2BYJKZY1JfyLTaHO/jaiSwi/lsf8fTFoQW/n6IdAsx5tx+iotu2zCJwz8MxI6D/Bw==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.13.0.tgz",
+      "integrity": "sha512-BSbaCmn8ZadK3UAQdlauSvtaJjhlDEjS5hEVVIN3A4bbl3X+otyf/kOJV08bYiRxfejP3DXFzO2jz3G20107+Q==",
       "cpu": [
         "arm64"
       ],
@@ -4905,9 +4839,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.17.2.tgz",
-      "integrity": "sha512-kcMLpE6uCwls023+kknm71ug7MZOrtXo+y5p/tsg6jltpDtgQY1Eq5sGfHcQfb+lfuKwhBmEURDga9N0ol4YPw==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.13.0.tgz",
+      "integrity": "sha512-Ovf2evVaP6sW5Ut0GHyUSOqA6tVKfrTHddtmxGQc1CTQa1Cw3/KMCDEEICZBbyppcwnhMwcDce9ZRxdWRpVd6g==",
       "cpu": [
         "arm64"
       ],
@@ -4918,9 +4852,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.17.2.tgz",
-      "integrity": "sha512-AtKwD0VEx0zWkL0ZjixEkp5tbNLzX+FCqGG1SvOu993HnSz4qDI6S4kGzubrEJAljpVkhRSlg5bzpV//E6ysTQ==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.13.0.tgz",
+      "integrity": "sha512-U+Jcxm89UTK592vZ2J9st9ajRv/hrwHdnvyuJpa5A2ngGSVHypigidkQJP+YiGL6JODiUeMzkqQzbCG3At81Gg==",
       "cpu": [
         "x64"
       ],
@@ -4931,22 +4865,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.17.2.tgz",
-      "integrity": "sha512-3reX2fUHqN7sffBNqmEyMQVj/CKhIHZd4y631duy0hZqI8Qoqf6lTtmAKvJFYa6bhU95B1D0WgzHkmTg33In0A==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.17.2.tgz",
-      "integrity": "sha512-uSqpsp91mheRgw96xtyAGP9FW5ChctTFEoXP0r5FAzj/3ZRv3Uxjtc7taRQSaQM/q85KEKjKsZuiZM3GyUivRg==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.13.0.tgz",
+      "integrity": "sha512-8wZidaUJUTIR5T4vRS22VkSMOVooG0F4N+JSwQXWSRiC6yfEsFMLTYRFHvby5mFFuExHa/yAp9juSphQQJAijQ==",
       "cpu": [
         "arm"
       ],
@@ -4957,9 +4878,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.17.2.tgz",
-      "integrity": "sha512-EMMPHkiCRtE8Wdk3Qhtciq6BndLtstqZIroHiiGzB3C5LDJmIZcSzVtLRbwuXuUft1Cnv+9fxuDtDxz3k3EW2A==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.13.0.tgz",
+      "integrity": "sha512-Iu0Kno1vrD7zHQDxOmvweqLkAzjxEVqNhUIXBsZ8hu8Oak7/5VTPrxOEZXYC1nmrBVJp0ZcL2E7lSuuOVaE3+w==",
       "cpu": [
         "arm64"
       ],
@@ -4970,9 +4891,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.17.2.tgz",
-      "integrity": "sha512-NMPylUUZ1i0z/xJUIx6VUhISZDRT+uTWpBcjdv0/zkp7b/bQDF+NfnfdzuTiB1G6HTodgoFa93hp0O1xl+/UbA==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.13.0.tgz",
+      "integrity": "sha512-C31QrW47llgVyrRjIwiOwsHFcaIwmkKi3PCroQY5aVq4H0A5v/vVVAtFsI1nfBngtoRpeREvZOkIhmRwUKkAdw==",
       "cpu": [
         "arm64"
       ],
@@ -4982,23 +4903,10 @@
         "linux"
       ]
     },
-    "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.17.2.tgz",
-      "integrity": "sha512-T19My13y8uYXPw/L/k0JYaX1fJKFT/PWdXiHr8mTbXWxjVF1t+8Xl31DgBBvEKclw+1b00Chg0hxE2O7bTG7GQ==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.17.2.tgz",
-      "integrity": "sha512-BOaNfthf3X3fOWAB+IJ9kxTgPmMqPPH5f5k2DcCsRrBIbWnaJCgX2ll77dV1TdSy9SaXTR5iDXRL8n7AnoP5cg==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.13.0.tgz",
+      "integrity": "sha512-Oq90dtMHvthFOPMl7pt7KmxzX7E71AfyIhh+cPhLY9oko97Zf2C9tt/XJD4RgxhaGeAraAXDtqxvKE1y/j35lA==",
       "cpu": [
         "riscv64"
       ],
@@ -5008,23 +4916,10 @@
         "linux"
       ]
     },
-    "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.17.2.tgz",
-      "integrity": "sha512-W0UP/x7bnn3xN2eYMql2T/+wpASLE5SjObXILTMPUBDB/Fg/FxC+gX4nvCfPBCbNhz51C+HcqQp2qQ4u25ok6g==",
-      "cpu": [
-        "s390x"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.17.2.tgz",
-      "integrity": "sha512-Hy7pLwByUOuyaFC6mAr7m+oMC+V7qyifzs/nW2OJfC8H4hbCzOX07Ov0VFk/zP3kBsELWNFi7rJtgbKYsav9QQ==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.13.0.tgz",
+      "integrity": "sha512-yUD/8wMffnTKuiIsl6xU+4IA8UNhQ/f1sAnQebmE/lyQ8abjsVyDkyRkWop0kdMhKMprpNIhPmYlCxgHrPoXoA==",
       "cpu": [
         "x64"
       ],
@@ -5035,9 +4930,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.17.2.tgz",
-      "integrity": "sha512-h1+yTWeYbRdAyJ/jMiVw0l6fOOm/0D1vNLui9iPuqgRGnXA0u21gAqOyB5iHjlM9MMfNOm9RHCQ7zLIzT0x11Q==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.13.0.tgz",
+      "integrity": "sha512-9RyNqoFNdF0vu/qqX63fKotBh43fJQeYC98hCaf89DYQpv+xu0D8QFSOS0biA7cGuqJFOc1bJ+m2rhhsKcw1hw==",
       "cpu": [
         "x64"
       ],
@@ -5048,9 +4943,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.17.2.tgz",
-      "integrity": "sha512-tmdtXMfKAjy5+IQsVtDiCfqbynAQE/TQRpWdVataHmhMb9DCoJxp9vLcCBjEQWMiUYxO1QprH/HbY9ragCEFLA==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.13.0.tgz",
+      "integrity": "sha512-46ue8ymtm/5PUU6pCvjlic0z82qWkxv54GTJZgHrQUuZnVH+tvvSP0LsozIDsCBFO4VjJ13N68wqrKSeScUKdA==",
       "cpu": [
         "arm64"
       ],
@@ -5061,9 +4956,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.17.2.tgz",
-      "integrity": "sha512-7II/QCSTAHuE5vdZaQEwJq2ZACkBpQDOmQsE6D6XUbnBHW8IAhm4eTufL6msLJorzrHDFv3CF8oCA/hSIRuZeQ==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.13.0.tgz",
+      "integrity": "sha512-P5/MqLdLSlqxbeuJ3YDeX37srC8mCflSyTrUsgbU1c/U9j6l2g2GiIdYaGD9QjdMQPMSgYm7hgg0551wHyIluw==",
       "cpu": [
         "ia32"
       ],
@@ -5074,9 +4969,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.17.2.tgz",
-      "integrity": "sha512-TGGO7v7qOq4CYmSBVEYpI1Y5xDuCEnbVC5Vth8mOsW0gDSzxNrVERPc790IGHsrT2dQSimgMr9Ub3Y1Jci5/8w==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.13.0.tgz",
+      "integrity": "sha512-UKXUQNbO3DOhzLRwHSpa0HnhhCgNODvfoPWv2FCXme8N/ANFfhIPMGuOT+QuKd16+B5yxZ0HdpNlqPvTMS1qfw==",
       "cpu": [
         "x64"
       ],
@@ -5148,12 +5043,12 @@
       }
     },
     "node_modules/@sigstore/bundle": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-2.3.1.tgz",
-      "integrity": "sha512-eqV17lO3EIFqCWK3969Rz+J8MYrRZKw9IBHpSo6DEcEX2c+uzDFOgHE9f2MnyDpfs48LFO4hXmk9KhQ74JzU1g==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-2.2.0.tgz",
+      "integrity": "sha512-5VI58qgNs76RDrwXNhpmyN/jKpq9evV/7f1XrcqcAfvxDl5SeVY/I5Rmfe96ULAV7/FK5dge9RBKGBJPhL1WsQ==",
       "dev": true,
       "dependencies": {
-        "@sigstore/protobuf-specs": "^0.3.1"
+        "@sigstore/protobuf-specs": "^0.3.0"
       },
       "engines": {
         "node": "^16.14.0 || >=18.0.0"
@@ -5169,23 +5064,23 @@
       }
     },
     "node_modules/@sigstore/protobuf-specs": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.3.1.tgz",
-      "integrity": "sha512-aIL8Z9NsMr3C64jyQzE0XlkEyBLpgEJJFDHLVVStkFV5Q3Il/r/YtY6NJWKQ4cy4AE7spP1IX5Jq7VCAxHHMfQ==",
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.3.0.tgz",
+      "integrity": "sha512-zxiQ66JFOjVvP9hbhGj/F/qNdsZfkGb/dVXSanNRNuAzMlr4MC95voPUBX8//ZNnmv3uSYzdfR/JSkrgvZTGxA==",
       "dev": true,
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
     "node_modules/@sigstore/sign": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@sigstore/sign/-/sign-2.3.0.tgz",
-      "integrity": "sha512-tsAyV6FC3R3pHmKS880IXcDJuiFJiKITO1jxR1qbplcsBkZLBmjrEw5GbC7ikD6f5RU1hr7WnmxB/2kKc1qUWQ==",
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/@sigstore/sign/-/sign-2.2.3.tgz",
+      "integrity": "sha512-LqlA+ffyN02yC7RKszCdMTS6bldZnIodiox+IkT8B2f8oRYXCB3LQ9roXeiEL21m64CVH1wyveYAORfD65WoSw==",
       "dev": true,
       "dependencies": {
-        "@sigstore/bundle": "^2.3.0",
+        "@sigstore/bundle": "^2.2.0",
         "@sigstore/core": "^1.0.0",
-        "@sigstore/protobuf-specs": "^0.3.1",
+        "@sigstore/protobuf-specs": "^0.3.0",
         "make-fetch-happen": "^13.0.0"
       },
       "engines": {
@@ -5206,14 +5101,14 @@
       }
     },
     "node_modules/@sigstore/verify": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@sigstore/verify/-/verify-1.2.0.tgz",
-      "integrity": "sha512-hQF60nc9yab+Csi4AyoAmilGNfpXT+EXdBgFkP9OgPwIBPwyqVf7JAWPtmqrrrneTmAT6ojv7OlH1f6Ix5BG4Q==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@sigstore/verify/-/verify-1.1.1.tgz",
+      "integrity": "sha512-BNANJms49rw9Q5J+fJjrDqOQSzjXDcOq/pgKDaVdDoIvQwqIfaoUriy+fQfh8sBX04hr4bkkrwu3EbhQqoQH7A==",
       "dev": true,
       "dependencies": {
-        "@sigstore/bundle": "^2.3.1",
+        "@sigstore/bundle": "^2.2.0",
         "@sigstore/core": "^1.1.0",
-        "@sigstore/protobuf-specs": "^0.3.1"
+        "@sigstore/protobuf-specs": "^0.3.0"
       },
       "engines": {
         "node": "^16.14.0 || >=18.0.0"
@@ -5226,9 +5121,9 @@
       "dev": true
     },
     "node_modules/@socket.io/component-emitter": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.2.tgz",
-      "integrity": "sha512-9BCxFwvbGg/RsZK9tjXd8s4UcwR0MWeFQ1XEKIQVVvAGJyINdrqKMcTRyLoK8Rse1GjzLV9cwjWV1olXRWEXVA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz",
+      "integrity": "sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==",
       "dev": true
     },
     "node_modules/@tufjs/canonical-json": {
@@ -5241,33 +5136,18 @@
       }
     },
     "node_modules/@tufjs/models": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@tufjs/models/-/models-2.0.1.tgz",
-      "integrity": "sha512-92F7/SFyufn4DXsha9+QfKnN03JGqtMFMXgSHbZOo8JG59WkTni7UzAouNQDf7AuP9OAMxVOPQcqG3sB7w+kkg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@tufjs/models/-/models-2.0.0.tgz",
+      "integrity": "sha512-c8nj8BaOExmZKO2DXhDfegyhSGcG9E/mPN3U13L+/PsoWm1uaGiHHjxqSHQiasDBQwDA3aHuw9+9spYAP1qvvg==",
       "dev": true,
       "dependencies": {
         "@tufjs/canonical-json": "2.0.0",
-        "minimatch": "^9.0.4"
+        "minimatch": "^9.0.3"
       },
       "engines": {
         "node": "^16.14.0 || >=18.0.0"
       }
     },
-    "node_modules/@tufjs/models/node_modules/minimatch": {
-      "version": "9.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz",
-      "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
     "node_modules/@types/body-parser": {
       "version": "1.19.5",
       "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz",
@@ -5322,9 +5202,9 @@
       }
     },
     "node_modules/@types/eslint": {
-      "version": "8.56.10",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.10.tgz",
-      "integrity": "sha512-Shavhk87gCtY2fhXDctcfS3e6FdxWkCx1iUZ9eEUbh7rTqlZT0/IzOkCOVt0fCjcFuZ9FPYfuezTBImfHCDBGQ==",
+      "version": "8.56.6",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.6.tgz",
+      "integrity": "sha512-ymwc+qb1XkjT/gfoQwxIeHZ6ixH23A+tCT2ADSA/DPVKzAjwYkTXBMCQ/f6fe4wEa85Lhp26VPeUxI7wMhAi7A==",
       "dev": true,
       "dependencies": {
         "@types/estree": "*",
@@ -5360,9 +5240,9 @@
       }
     },
     "node_modules/@types/express-serve-static-core": {
-      "version": "4.19.0",
-      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.0.tgz",
-      "integrity": "sha512-bGyep3JqPCRry1wq+O5n7oiBgGWmeIJXPjXXCo8EK0u8duZGSYar7cGqd3ML2JUsLGeB7fmc06KYo9fLGWqPvQ==",
+      "version": "4.17.43",
+      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.43.tgz",
+      "integrity": "sha512-oaYtiBirUOPQGSWNGPWnzyAFJ0BP3cwvN4oWZQY+zUBwpVIGsKUkpBpSztp74drYcjavs7SKFZ4DX1V2QeN8rg==",
       "dev": true,
       "dependencies": {
         "@types/node": "*",
@@ -5405,9 +5285,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "20.12.10",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.10.tgz",
-      "integrity": "sha512-Eem5pH9pmWBHoGAT8Dr5fdc5rYA+4NAovdM4EktRPVAAiJhmWWfQrA0cFhAbOsQdSfIHjAud6YdkbL69+zSKjw==",
+      "version": "20.11.30",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.30.tgz",
+      "integrity": "sha512-dHM6ZxwlmuZaRmUPfv1p+KrdD1Dci04FbdEm/9wEMouFqxYoFl5aMkt0VMAUtYRQDyYvD41WJLukhq/ha3YuTw==",
       "dev": true,
       "dependencies": {
         "undici-types": "~5.26.4"
@@ -5423,9 +5303,9 @@
       }
     },
     "node_modules/@types/qs": {
-      "version": "6.9.15",
-      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.15.tgz",
-      "integrity": "sha512-uXHQKES6DQKKCLh441Xv/dwxOq1TVS3JPUMlEqoEglvlhR6Mxnlew/Xq/LRVHpLyk7iK3zODe1qYHIMltO7XGg==",
+      "version": "6.9.14",
+      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.14.tgz",
+      "integrity": "sha512-5khscbd3SwWMhFqylJBLQ0zIu7c1K6Vz0uBIt915BI3zV0q1nfjRQD3RqSBcPaO6PHEF4ov/t9y89fSiyThlPA==",
       "dev": true
     },
     "node_modules/@types/range-parser": {
@@ -5466,14 +5346,14 @@
       }
     },
     "node_modules/@types/serve-static": {
-      "version": "1.15.7",
-      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.7.tgz",
-      "integrity": "sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==",
+      "version": "1.15.5",
+      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.5.tgz",
+      "integrity": "sha512-PDRk21MnK70hja/YF8AHfC7yIsiQHn1rcXx7ijCFBX/k+XQJhQT/gw3xekXKJvx+5SXaMMS8oqQy09Mzvz2TuQ==",
       "dev": true,
       "dependencies": {
         "@types/http-errors": "*",
-        "@types/node": "*",
-        "@types/send": "*"
+        "@types/mime": "*",
+        "@types/node": "*"
       }
     },
     "node_modules/@types/sockjs": {
@@ -6162,9 +6042,9 @@
       }
     },
     "node_modules/agent-base": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
-      "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz",
+      "integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==",
       "dev": true,
       "dependencies": {
         "debug": "^4.3.4"
@@ -6449,13 +6329,13 @@
       }
     },
     "node_modules/babel-plugin-polyfill-corejs2": {
-      "version": "0.4.11",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.11.tgz",
-      "integrity": "sha512-sMEJ27L0gRHShOh5G54uAAPaiCOygY/5ratXuiyb2G46FmlSpc9eFCzYVyDiPxfNbwzA7mYahmjQc5q+CZQ09Q==",
+      "version": "0.4.10",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.10.tgz",
+      "integrity": "sha512-rpIuu//y5OX6jVU+a5BCn1R5RSZYWAl2Nar76iwaOdycqb6JPxediskWFMMl7stfwNJR4b7eiQvh5fB5TEQJTQ==",
       "dev": true,
       "dependencies": {
         "@babel/compat-data": "^7.22.6",
-        "@babel/helper-define-polyfill-provider": "^0.6.2",
+        "@babel/helper-define-polyfill-provider": "^0.6.1",
         "semver": "^6.3.1"
       },
       "peerDependencies": {
@@ -6739,6 +6619,15 @@
       "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
       "dev": true
     },
+    "node_modules/builtins": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz",
+      "integrity": "sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==",
+      "dev": true,
+      "dependencies": {
+        "semver": "^7.0.0"
+      }
+    },
     "node_modules/bytes": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
@@ -6749,9 +6638,9 @@
       }
     },
     "node_modules/cacache": {
-      "version": "18.0.3",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-18.0.3.tgz",
-      "integrity": "sha512-qXCd4rh6I07cnDqh8V48/94Tc/WSfj+o3Gn6NZ0aZovS255bUx8O13uKxRFd2eWG0xgsco7+YItQNPaa5E85hg==",
+      "version": "18.0.2",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-18.0.2.tgz",
+      "integrity": "sha512-r3NU8h/P+4lVUHfeRw1dtgQYar3DZMm4/cm2bZgOvrFC/su7budSOeqh52VJIC4U4iG1WWwV6vRW0znqBvxNuw==",
       "dev": true,
       "dependencies": {
         "@npmcli/fs": "^3.1.0",
@@ -6772,16 +6661,16 @@
       }
     },
     "node_modules/cacache/node_modules/glob": {
-      "version": "10.3.12",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.12.tgz",
-      "integrity": "sha512-TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg==",
+      "version": "10.3.10",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz",
+      "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==",
       "dev": true,
       "dependencies": {
         "foreground-child": "^3.1.0",
-        "jackspeak": "^2.3.6",
+        "jackspeak": "^2.3.5",
         "minimatch": "^9.0.1",
-        "minipass": "^7.0.4",
-        "path-scurry": "^1.10.2"
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0",
+        "path-scurry": "^1.10.1"
       },
       "bin": {
         "glob": "dist/esm/bin.mjs"
@@ -6794,9 +6683,9 @@
       }
     },
     "node_modules/cacache/node_modules/lru-cache": {
-      "version": "10.2.2",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.2.tgz",
-      "integrity": "sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==",
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.0.tgz",
+      "integrity": "sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==",
       "dev": true,
       "engines": {
         "node": "14 || >=16.14"
@@ -6840,9 +6729,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001616",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001616.tgz",
-      "integrity": "sha512-RHVYKov7IcdNjVHJFNY/78RdG4oGVjbayxv8u5IO74Wv7Hlq4PnJE6mo/OjFijjVFNy5ijnCt6H3IIo4t+wfEw==",
+      "version": "1.0.30001600",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001600.tgz",
+      "integrity": "sha512-+2S9/2JFhYmYaDpZvo0lKkfvuKIglrx68MwOBqMGHhQsNkLjB5xtc/TGoEPs+MxjSyN/72qer2g97nzR641mOQ==",
       "dev": true,
       "funding": [
         {
@@ -7331,9 +7220,9 @@
       }
     },
     "node_modules/core-js-compat": {
-      "version": "3.37.0",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.37.0.tgz",
-      "integrity": "sha512-vYq4L+T8aS5UuFg4UwDhc7YNRWVeVZwltad9C/jV3R2LgVOpS9BDr7l/WL6BN0dbV3k1XejPTHqqEzJgsa0frA==",
+      "version": "3.36.1",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.36.1.tgz",
+      "integrity": "sha512-Dk997v9ZCt3X/npqzyGdTlq6t7lDBhZwGvV94PKzDArjp7BTRm7WlDAXYd/OWdeFHO8OChQYRJNJvUCqCbrtKA==",
       "dev": true,
       "dependencies": {
         "browserslist": "^4.23.0"
@@ -7875,9 +7764,9 @@
       "dev": true
     },
     "node_modules/ejs": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
-      "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==",
+      "version": "3.1.9",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.9.tgz",
+      "integrity": "sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==",
       "dev": true,
       "dependencies": {
         "jake": "^10.8.5"
@@ -7890,9 +7779,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.757",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.757.tgz",
-      "integrity": "sha512-jftDaCknYSSt/+KKeXzH3LX5E2CvRLm75P3Hj+J/dv3CL0qUYcOt13d5FN1NiL5IJbbhzHrb3BomeG2tkSlZmw==",
+      "version": "1.4.717",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.717.tgz",
+      "integrity": "sha512-6Fmg8QkkumNOwuZ/5mIbMU9WI3H2fmn5ajcVya64I5Yr5CcNmO7vcLt0Y7c96DCiMO5/9G+4sI2r6eEvdg1F7A==",
       "dev": true
     },
     "node_modules/emoji-regex": {
@@ -8083,9 +7972,9 @@
       }
     },
     "node_modules/es-module-lexer": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.2.tgz",
-      "integrity": "sha512-l60ETUTmLqbVbVHv1J4/qj+M8nq7AwMzEcg3kmJDt9dCNrTk+yHcYFf/Kw75pMDwd9mPcIGCG5LcS20SxYRzFA==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.0.tgz",
+      "integrity": "sha512-pqrTKmwEIgafsYZAGw9kszYzmagcE/n4dbgwGWLEXg7J4QFJVQRBld8j3Q3GNez79jzxZshq0bcT962QHOghjw==",
       "dev": true
     },
     "node_modules/esbuild": {
@@ -9148,9 +9037,9 @@
       }
     },
     "node_modules/fs-monkey": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.6.tgz",
-      "integrity": "sha512-b1FMfwetIKymC0eioW7mTywihSQE4oLzQn1dB6rZB5fx/3NpNEdAWeCSMB+60/AeT0TCXsxzAlcYVEFCTAksWg==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.5.tgz",
+      "integrity": "sha512-8uMbBjrhzW76TYgEV27Y5E//W2f/lTFmx78P2w19FZSxarhI/798APGQyuGCwmkNxgwGRhrLfvWyLBvNtuOmew==",
       "dev": true
     },
     "node_modules/fs.realpath": {
@@ -9438,9 +9327,9 @@
       }
     },
     "node_modules/hosted-git-info": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-7.0.2.tgz",
-      "integrity": "sha512-puUZAUKT5m8Zzvs72XWy3HtvVbTWljRE66cP60bxJzAqf2DgICo7lYTY2IHUmLnNpjYvw5bvmoHvPc0QO2a62w==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-7.0.1.tgz",
+      "integrity": "sha512-+K84LB1DYwMHoHSgaOY/Jfhw3ucPmSET5v98Ke/HdNSw4a0UktWzyW1mjhjpuxxTqOOsfWT/7iVshHmVZ4IpOA==",
       "dev": true,
       "dependencies": {
         "lru-cache": "^10.0.1"
@@ -9450,9 +9339,9 @@
       }
     },
     "node_modules/hosted-git-info/node_modules/lru-cache": {
-      "version": "10.2.2",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.2.tgz",
-      "integrity": "sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==",
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.0.tgz",
+      "integrity": "sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==",
       "dev": true,
       "engines": {
         "node": "14 || >=16.14"
@@ -9711,9 +9600,9 @@
       }
     },
     "node_modules/ignore-walk": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-6.0.5.tgz",
-      "integrity": "sha512-VuuG0wCnjhnylG1ABXT3dAuIpTNDs/G8jlpmwXY03fXoXy/8ZK8/T+hMzt8L4WnrLCJgdybqgPagnF/f97cg3A==",
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-6.0.4.tgz",
+      "integrity": "sha512-t7sv42WkwFkyKbivUCglsQW5YWMskWtbEf4MNKX5u/CCWHKSPzN4FtBQGsQZgCLbxOzpVlcbWVK5KB3auIOjSw==",
       "dev": true,
       "dependencies": {
         "minimatch": "^9.0.0"
@@ -9867,9 +9756,9 @@
       "dev": true
     },
     "node_modules/ipaddr.js": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.2.0.tgz",
-      "integrity": "sha512-Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.1.0.tgz",
+      "integrity": "sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ==",
       "dev": true,
       "engines": {
         "node": ">= 10"
@@ -10206,9 +10095,9 @@
       }
     },
     "node_modules/jake": {
-      "version": "10.9.1",
-      "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.1.tgz",
-      "integrity": "sha512-61btcOHNnLnsOdtLgA5efqQWjnSi/vow5HbI7HMdKKWqvrKR1bLK3BPlJn9gcSaP2ewuamUSMB5XEy76KUIS2w==",
+      "version": "10.8.7",
+      "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.7.tgz",
+      "integrity": "sha512-ZDi3aP+fG/LchyBzUM804VjddnwfSfsdeYkwt8NcbKRvo4rFkjhs456iLFn3k2ZUWvNe4i48WACDbza8fhq2+w==",
       "dev": true,
       "dependencies": {
         "async": "^3.2.3",
@@ -10506,9 +10395,9 @@
       "dev": true
     },
     "node_modules/json-parse-even-better-errors": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.2.tgz",
-      "integrity": "sha512-fi0NG4bPjCHunUJffmLd0gxssIgkNmArMvis4iNah6Owg1MCJjWhEcDLmsK6iGkJq3tHwbDkTlce70/tmXN4cQ==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.1.tgz",
+      "integrity": "sha512-aatBvbL26wVUCLmbWdCpeu9iF5wOyWpagiKkInA+kfws3sWdBrTnsvN2CKcyCYyUrc7rebNBlK6+kteg7ksecg==",
       "dev": true,
       "engines": {
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
@@ -11251,9 +11140,9 @@
       }
     },
     "node_modules/make-fetch-happen": {
-      "version": "13.0.1",
-      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-13.0.1.tgz",
-      "integrity": "sha512-cKTUFc/rbKUd/9meOvgrpJ2WrNzymt6jfRDdwg5UCnVzv9dTpEj9JS5m3wtziXVCjluIXyL8pcaukYqezIzZQA==",
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-13.0.0.tgz",
+      "integrity": "sha512-7ThobcL8brtGo9CavByQrQi+23aIfgYU++wg4B87AIS8Rb2ZBt/MEaDqzA00Xwv/jUjAjYkLHjVolYuTLKda2A==",
       "dev": true,
       "dependencies": {
         "@npmcli/agent": "^2.0.0",
@@ -11265,7 +11154,6 @@
         "minipass-flush": "^1.0.5",
         "minipass-pipeline": "^1.2.4",
         "negotiator": "^0.6.3",
-        "proc-log": "^4.2.0",
         "promise-retry": "^2.0.1",
         "ssri": "^10.0.0"
       },
@@ -11273,15 +11161,6 @@
         "node": "^16.14.0 || >=18.0.0"
       }
     },
-    "node_modules/make-fetch-happen/node_modules/proc-log": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz",
-      "integrity": "sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==",
-      "dev": true,
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
     "node_modules/media-typer": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
@@ -11451,9 +11330,9 @@
       }
     },
     "node_modules/minipass": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.0.tgz",
-      "integrity": "sha512-oGZRv2OT1lO2UF1zUcwdTb3wqUwI0kBGTgt/T7OdSj6M6N5m3o5uPf0AIW6lVxGGoiWUR7e2AwTE+xiwK8WQig==",
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz",
+      "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==",
       "dev": true,
       "engines": {
         "node": ">=16 || 14 >=14.17"
@@ -11472,9 +11351,9 @@
       }
     },
     "node_modules/minipass-fetch": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz",
-      "integrity": "sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.4.tgz",
+      "integrity": "sha512-jHAqnA728uUpIaFm7NWsCnqKT6UqZz7GcI/bDpPATuwYyKwJwW0remxSCxUlKiEty+eopHGa3oc8WxgQ1FFJqg==",
       "dev": true,
       "dependencies": {
         "minipass": "^7.0.3",
@@ -11824,9 +11703,9 @@
       }
     },
     "node_modules/node-gyp-build": {
-      "version": "4.8.1",
-      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.1.tgz",
-      "integrity": "sha512-OSs33Z9yWr148JZcbZd5WiAXhh/n9z8TxQcdMhIOlpN9AhWpLfvVFO73+m77bBABQMaY9XSvIa+qk0jlI7Gcaw==",
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.0.tgz",
+      "integrity": "sha512-u6fs2AEUljNho3EYTJNBfImO5QTo/J/1Etd+NVdCj7qWKUSN/bSLkZwhDv7I+w/MSC6qJ4cknepkAYykDdK8og==",
       "dev": true,
       "optional": true,
       "bin": {
@@ -11836,16 +11715,16 @@
       }
     },
     "node_modules/node-gyp/node_modules/glob": {
-      "version": "10.3.12",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.12.tgz",
-      "integrity": "sha512-TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg==",
+      "version": "10.3.10",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz",
+      "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==",
       "dev": true,
       "dependencies": {
         "foreground-child": "^3.1.0",
-        "jackspeak": "^2.3.6",
+        "jackspeak": "^2.3.5",
         "minimatch": "^9.0.1",
-        "minipass": "^7.0.4",
-        "path-scurry": "^1.10.2"
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0",
+        "path-scurry": "^1.10.1"
       },
       "bin": {
         "glob": "dist/esm/bin.mjs"
@@ -11894,9 +11773,9 @@
       "dev": true
     },
     "node_modules/nopt": {
-      "version": "7.2.1",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-7.2.1.tgz",
-      "integrity": "sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-7.2.0.tgz",
+      "integrity": "sha512-CVDtwCdhYIvnAzFoJ6NJ6dX3oga9/HyciQDnG1vQDjSLMeKLJ4A93ZqYKDrgYSr1FBY5/hMYC+2VCi24pgpkGA==",
       "dev": true,
       "dependencies": {
         "abbrev": "^2.0.0"
@@ -11909,9 +11788,9 @@
       }
     },
     "node_modules/normalize-package-data": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-6.0.1.tgz",
-      "integrity": "sha512-6rvCfeRW+OEZagAB4lMLSNuTNYZWLVtKccK79VSTf//yTY5VOCgcpH80O+bZK8Neps7pUnd5G+QlMg1yV/2iZQ==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-6.0.0.tgz",
+      "integrity": "sha512-UL7ELRVxYBHBgYEtZCXjxuD5vPxnmvMGq0jp/dGPKKrN7tfsBh2IY7TlJ15WWwdjRWD3RJbnsygUurTK3xkPkg==",
       "dev": true,
       "dependencies": {
         "hosted-git-info": "^7.0.0",
@@ -11942,9 +11821,9 @@
       }
     },
     "node_modules/npm-bundled": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-3.0.1.tgz",
-      "integrity": "sha512-+AvaheE/ww1JEwRHOrn4WHNzOxGtVp+adrg2AeZS/7KuxGUYFuBta98wYpfHBbJp6Tg6j1NKSEVHNcfZzJHQwQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-3.0.0.tgz",
+      "integrity": "sha512-Vq0eyEQy+elFpzsKjMss9kxqb9tG3YHg4dsyWuUENuzvSUWe1TCnW/vV9FkhvBk/brEDoDiVd+M1Btosa6ImdQ==",
       "dev": true,
       "dependencies": {
         "npm-normalize-package-bin": "^3.0.0"
@@ -12017,33 +11896,23 @@
       }
     },
     "node_modules/npm-registry-fetch": {
-      "version": "16.2.1",
-      "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-16.2.1.tgz",
-      "integrity": "sha512-8l+7jxhim55S85fjiDGJ1rZXBWGtRLi1OSb4Z3BPLObPuIaeKRlPRiYMSHU4/81ck3t71Z+UwDDl47gcpmfQQA==",
+      "version": "16.1.0",
+      "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-16.1.0.tgz",
+      "integrity": "sha512-PQCELXKt8Azvxnt5Y85GseQDJJlglTFM9L9U9gkv2y4e9s0k3GVDdOx3YoB6gm2Do0hlkzC39iCGXby+Wve1Bw==",
       "dev": true,
       "dependencies": {
-        "@npmcli/redact": "^1.1.0",
         "make-fetch-happen": "^13.0.0",
         "minipass": "^7.0.2",
         "minipass-fetch": "^3.0.0",
         "minipass-json-stream": "^1.0.1",
         "minizlib": "^2.1.2",
         "npm-package-arg": "^11.0.0",
-        "proc-log": "^4.0.0"
+        "proc-log": "^3.0.0"
       },
       "engines": {
         "node": "^16.14.0 || >=18.0.0"
       }
     },
-    "node_modules/npm-registry-fetch/node_modules/proc-log": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz",
-      "integrity": "sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==",
-      "dev": true,
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
     "node_modules/npm-run-path": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
@@ -12392,17 +12261,17 @@
       }
     },
     "node_modules/optionator": {
-      "version": "0.9.4",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
-      "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
+      "version": "0.9.3",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
+      "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
       "dev": true,
       "dependencies": {
+        "@aashutoshrathi/word-wrap": "^1.2.3",
         "deep-is": "^0.1.3",
         "fast-levenshtein": "^2.0.6",
         "levn": "^0.4.1",
         "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0",
-        "word-wrap": "^1.2.5"
+        "type-check": "^0.4.0"
       },
       "engines": {
         "node": ">= 0.8.0"
@@ -12747,12 +12616,12 @@
       "dev": true
     },
     "node_modules/path-scurry": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.2.tgz",
-      "integrity": "sha512-7xTavNy5RQXnsjANvVvMkEjvloOinkAjv/Z6Ildz9v2RinZ4SBKTWFOVRbaF8p0vpHnyjV/UwNDdKuUv6M5qcA==",
+      "version": "1.10.1",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz",
+      "integrity": "sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==",
       "dev": true,
       "dependencies": {
-        "lru-cache": "^10.2.0",
+        "lru-cache": "^9.1.1 || ^10.0.0",
         "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
       },
       "engines": {
@@ -12763,9 +12632,9 @@
       }
     },
     "node_modules/path-scurry/node_modules/lru-cache": {
-      "version": "10.2.2",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.2.tgz",
-      "integrity": "sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==",
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.0.tgz",
+      "integrity": "sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==",
       "dev": true,
       "engines": {
         "node": "14 || >=16.14"
@@ -12986,9 +12855,9 @@
       "dev": true
     },
     "node_modules/postcss-modules-extract-imports": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.1.0.tgz",
-      "integrity": "sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
+      "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
       "dev": true,
       "engines": {
         "node": "^10 || ^12 || >= 14"
@@ -12998,9 +12867,9 @@
       }
     },
     "node_modules/postcss-modules-local-by-default": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.5.tgz",
-      "integrity": "sha512-6MieY7sIfTK0hYfafw1OMEG+2bg8Q1ocHCpoWLqOKj3JXlKu4G7btkmM/B7lFubYkYWmRSPLZi5chid63ZaZYw==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.4.tgz",
+      "integrity": "sha512-L4QzMnOdVwRm1Qb8m4x8jsZzKAaPAgrUF1r/hjDR2Xj7R+8Zsf97jAlSQzWtKx5YNiNGN8QxmPFIc/sh+RQl+Q==",
       "dev": true,
       "dependencies": {
         "icss-utils": "^5.0.0",
@@ -13015,9 +12884,9 @@
       }
     },
     "node_modules/postcss-modules-scope": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.2.0.tgz",
-      "integrity": "sha512-oq+g1ssrsZOsx9M96c5w8laRmvEu9C3adDSjI8oTcbfkrTE8hx/zfyobUoWIxaKPO8bt6S62kxpw5GqypEw1QQ==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.1.1.tgz",
+      "integrity": "sha512-uZgqzdTleelWjzJY+Fhti6F3C9iF1JR/dODLs/JDefozYcKTBCdD8BIl6nNPbTbcLnGrk56hzwZC2DaGNvYjzA==",
       "dev": true,
       "dependencies": {
         "postcss-selector-parser": "^6.0.4"
@@ -13316,15 +13185,15 @@
       }
     },
     "node_modules/react-is": {
-      "version": "18.3.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
-      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
+      "version": "18.2.0",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
+      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==",
       "dev": true
     },
     "node_modules/read-package-json": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-7.0.1.tgz",
-      "integrity": "sha512-8PcDiZ8DXUjLf687Ol4BR8Bpm2umR7vhoZOzNRt+uxD9GpBh/K+CAAALVIiYFknmvlmyg7hM7BSNUXPaCCqd0Q==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-7.0.0.tgz",
+      "integrity": "sha512-uL4Z10OKV4p6vbdvIXB+OzhInYtIozl/VxUBPgNkBuUi2DeRonnuspmaVAMcrkmfjKGNmRndyQAbE7/AmzGwFg==",
       "dev": true,
       "dependencies": {
         "glob": "^10.2.2",
@@ -13350,16 +13219,16 @@
       }
     },
     "node_modules/read-package-json/node_modules/glob": {
-      "version": "10.3.12",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.12.tgz",
-      "integrity": "sha512-TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg==",
+      "version": "10.3.10",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz",
+      "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==",
       "dev": true,
       "dependencies": {
         "foreground-child": "^3.1.0",
-        "jackspeak": "^2.3.6",
+        "jackspeak": "^2.3.5",
         "minimatch": "^9.0.1",
-        "minipass": "^7.0.4",
-        "path-scurry": "^1.10.2"
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0",
+        "path-scurry": "^1.10.1"
       },
       "bin": {
         "glob": "dist/esm/bin.mjs"
@@ -13410,9 +13279,9 @@
       }
     },
     "node_modules/reflect-metadata": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.2.2.tgz",
-      "integrity": "sha512-urBwgfrvVP/eAyXx4hluJivBKzuEbSQs9rKWCrCkbSxNv8mxPcUZKeuoF3Uy4mJl3Lwprp6yy5/39VWigZ4K6Q==",
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.2.1.tgz",
+      "integrity": "sha512-i5lLI6iw9AU3Uu4szRNPPEkomnkjRTaVt9hy/bn5g/oSzekBSMeLZblcjP74AW0vBabqERLLIrz+gR8QYR54Tw==",
       "dev": true
     },
     "node_modules/regenerate": {
@@ -13641,9 +13510,9 @@
       }
     },
     "node_modules/rollup": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.17.2.tgz",
-      "integrity": "sha512-/9ClTJPByC0U4zNLowV1tMBe8yMEAxewtR3cUNX5BoEpGH3dQEWpJLr6CLp0fPdYRF/fzVOgvDb1zXuakwF5kQ==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.13.0.tgz",
+      "integrity": "sha512-3YegKemjoQnYKmsBlOHfMLVPPA5xLkQ8MHLLSw/fBrFaVkEayL51DilPpNNLq1exr98F2B1TzrV0FUlN3gWRPg==",
       "dev": true,
       "dependencies": {
         "@types/estree": "1.0.5"
@@ -13656,22 +13525,19 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.17.2",
-        "@rollup/rollup-android-arm64": "4.17.2",
-        "@rollup/rollup-darwin-arm64": "4.17.2",
-        "@rollup/rollup-darwin-x64": "4.17.2",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.17.2",
-        "@rollup/rollup-linux-arm-musleabihf": "4.17.2",
-        "@rollup/rollup-linux-arm64-gnu": "4.17.2",
-        "@rollup/rollup-linux-arm64-musl": "4.17.2",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.17.2",
-        "@rollup/rollup-linux-riscv64-gnu": "4.17.2",
-        "@rollup/rollup-linux-s390x-gnu": "4.17.2",
-        "@rollup/rollup-linux-x64-gnu": "4.17.2",
-        "@rollup/rollup-linux-x64-musl": "4.17.2",
-        "@rollup/rollup-win32-arm64-msvc": "4.17.2",
-        "@rollup/rollup-win32-ia32-msvc": "4.17.2",
-        "@rollup/rollup-win32-x64-msvc": "4.17.2",
+        "@rollup/rollup-android-arm-eabi": "4.13.0",
+        "@rollup/rollup-android-arm64": "4.13.0",
+        "@rollup/rollup-darwin-arm64": "4.13.0",
+        "@rollup/rollup-darwin-x64": "4.13.0",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.13.0",
+        "@rollup/rollup-linux-arm64-gnu": "4.13.0",
+        "@rollup/rollup-linux-arm64-musl": "4.13.0",
+        "@rollup/rollup-linux-riscv64-gnu": "4.13.0",
+        "@rollup/rollup-linux-x64-gnu": "4.13.0",
+        "@rollup/rollup-linux-x64-musl": "4.13.0",
+        "@rollup/rollup-win32-arm64-msvc": "4.13.0",
+        "@rollup/rollup-win32-ia32-msvc": "4.13.0",
+        "@rollup/rollup-win32-x64-msvc": "4.13.0",
         "fsevents": "~2.3.2"
       }
     },
@@ -14130,17 +13996,17 @@
       "dev": true
     },
     "node_modules/sigstore": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-2.3.0.tgz",
-      "integrity": "sha512-q+o8L2ebiWD1AxD17eglf1pFrl9jtW7FHa0ygqY6EKvibK8JHyq9Z26v9MZXeDiw+RbfOJ9j2v70M10Hd6E06A==",
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-2.2.2.tgz",
+      "integrity": "sha512-2A3WvXkQurhuMgORgT60r6pOWiCOO5LlEqY2ADxGBDGVYLSo5HN0uLtb68YpVpuL/Vi8mLTe7+0Dx2Fq8lLqEg==",
       "dev": true,
       "dependencies": {
-        "@sigstore/bundle": "^2.3.1",
+        "@sigstore/bundle": "^2.2.0",
         "@sigstore/core": "^1.0.0",
-        "@sigstore/protobuf-specs": "^0.3.1",
-        "@sigstore/sign": "^2.3.0",
+        "@sigstore/protobuf-specs": "^0.3.0",
+        "@sigstore/sign": "^2.2.3",
         "@sigstore/tuf": "^2.3.1",
-        "@sigstore/verify": "^1.2.0"
+        "@sigstore/verify": "^1.1.0"
       },
       "engines": {
         "node": "^16.14.0 || >=18.0.0"
@@ -14218,9 +14084,9 @@
       }
     },
     "node_modules/socks": {
-      "version": "2.8.3",
-      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz",
-      "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==",
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.1.tgz",
+      "integrity": "sha512-B6w7tkwNid7ToxjZ08rQMT8M9BJAf8DKx8Ft4NivzH0zBUfd6jldGcisJn/RLgxcX3FPNDdNQCUEMMT79b+oCQ==",
       "dev": true,
       "dependencies": {
         "ip-address": "^9.0.5",
@@ -14232,12 +14098,12 @@
       }
     },
     "node_modules/socks-proxy-agent": {
-      "version": "8.0.3",
-      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.3.tgz",
-      "integrity": "sha512-VNegTZKhuGq5vSD6XNKlbqWhyt/40CgoEw8XxD6dhnm8Jq9IEa3nIa4HwnM8XOqU0CdB0BwWVXusqiFXfHB3+A==",
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.2.tgz",
+      "integrity": "sha512-8zuqoLv1aP/66PHF5TqwJ7Czm3Yv32urJQHrVyhD7mmA6d61Zv8cIXQYPTWwmg6qlupnPvs/QKDmfa4P/qct2g==",
       "dev": true,
       "dependencies": {
-        "agent-base": "^7.1.1",
+        "agent-base": "^7.0.2",
         "debug": "^4.3.4",
         "socks": "^2.7.1"
       },
@@ -14383,9 +14249,9 @@
       "dev": true
     },
     "node_modules/ssri": {
-      "version": "10.0.6",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz",
-      "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==",
+      "version": "10.0.5",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.5.tgz",
+      "integrity": "sha512-bSf16tAFkGeRlUNDjXu8FzaMQt6g2HZJrun7mtMbIPOddxt3GLMSz5VWUWcqTJUPfLEaDIepGxv+bYQW49596A==",
       "dev": true,
       "dependencies": {
         "minipass": "^7.0.3"
@@ -14939,14 +14805,14 @@
       "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
     },
     "node_modules/tuf-js": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/tuf-js/-/tuf-js-2.2.1.tgz",
-      "integrity": "sha512-GwIJau9XaA8nLVbUXsN3IlFi7WmQ48gBUrl3FTkkL/XLu/POhBzfmX9hd33FNMX1qAsfl6ozO1iMmW9NC8YniA==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/tuf-js/-/tuf-js-2.2.0.tgz",
+      "integrity": "sha512-ZSDngmP1z6zw+FIkIBjvOp/II/mIub/O7Pp12j1WNsiCpg5R5wAc//i555bBQsE44O94btLt0xM/Zr2LQjwdCg==",
       "dev": true,
       "dependencies": {
-        "@tufjs/models": "2.0.1",
+        "@tufjs/models": "2.0.0",
         "debug": "^4.3.4",
-        "make-fetch-happen": "^13.0.1"
+        "make-fetch-happen": "^13.0.0"
       },
       "engines": {
         "node": "^16.14.0 || >=18.0.0"
@@ -15032,9 +14898,9 @@
       }
     },
     "node_modules/undici": {
-      "version": "6.11.1",
-      "resolved": "https://registry.npmjs.org/undici/-/undici-6.11.1.tgz",
-      "integrity": "sha512-KyhzaLJnV1qa3BSHdj4AZ2ndqI0QWPxYzaIOio0WzcEJB9gvuysprJSLtpvc2D9mhR9jPDUk7xlJlZbH2KR5iw==",
+      "version": "6.7.1",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-6.7.1.tgz",
+      "integrity": "sha512-+Wtb9bAQw6HYWzCnxrPTMVEV3Q1QjYanI0E4q02ehReMuquQdLTEFEYbfs7hcImVYKcQkWSwT6buEmSVIiDDtQ==",
       "dev": true,
       "engines": {
         "node": ">=18.0"
@@ -15129,9 +14995,9 @@
       }
     },
     "node_modules/update-browserslist-db": {
-      "version": "1.0.15",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.15.tgz",
-      "integrity": "sha512-K9HWH62x3/EalU1U6sjSZiylm9C8tgq2mSvshZpqc7QE69RaA2qjhkW2HlNA0tFpEbtyFz7HTqbSdN4MSwUodA==",
+      "version": "1.0.13",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
+      "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==",
       "dev": true,
       "funding": [
         {
@@ -15148,7 +15014,7 @@
         }
       ],
       "dependencies": {
-        "escalade": "^3.1.2",
+        "escalade": "^3.1.1",
         "picocolors": "^1.0.0"
       },
       "bin": {
@@ -15202,10 +15068,13 @@
       }
     },
     "node_modules/validate-npm-package-name": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.1.tgz",
-      "integrity": "sha512-OljLrQ9SQdOUqTaQxqL5dEfZWrXExyyWsozYlAWFawPVNuD83igl7uJD2RTkNMbniIYgt8l81eCJGIdQF7avLQ==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.0.tgz",
+      "integrity": "sha512-YuKoXDAhBYxY7SfOKxHBDoSyENFeW5VvIIQp2TGQuit8gpK6MnWaQelBKxso72DoxTZfZdcP3W90LqpSkgPzLQ==",
       "dev": true,
+      "dependencies": {
+        "builtins": "^5.0.0"
+      },
       "engines": {
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
@@ -15220,9 +15089,9 @@
       }
     },
     "node_modules/vite": {
-      "version": "5.1.7",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.1.7.tgz",
-      "integrity": "sha512-sgnEEFTZYMui/sTlH1/XEnVNHMujOahPLGMxn1+5sIT45Xjng1Ec1K78jRP15dSmVgg5WBin9yO81j3o9OxofA==",
+      "version": "5.1.5",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.1.5.tgz",
+      "integrity": "sha512-BdN1xh0Of/oQafhU+FvopafUp6WaYenLU/NFoL5WyJL++GxkNfieKzBhM24H3HVsPQrlAqB7iJYTHabzaRed5Q==",
       "dev": true,
       "dependencies": {
         "esbuild": "^0.19.3",
@@ -15918,9 +15787,9 @@
       }
     },
     "node_modules/webpack-dev-server/node_modules/ws": {
-      "version": "8.17.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.0.tgz",
-      "integrity": "sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow==",
+      "version": "8.16.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz",
+      "integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==",
       "dev": true,
       "engines": {
         "node": ">=10.0.0"
@@ -16103,15 +15972,6 @@
       "integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==",
       "dev": true
     },
-    "node_modules/word-wrap": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
-      "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/wrap-ansi": {
       "version": "6.2.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
@@ -16292,9 +16152,9 @@
       }
     },
     "node_modules/zone.js": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.14.5.tgz",
-      "integrity": "sha512-9XYWZzY6PhHOSdkYryNcMm7L8EK7a4q+GbTvxbIA2a9lMdRUpGuyaYvLDcg8D6bdn+JomSsbPcilVKg6SmUx6w==",
+      "version": "0.14.4",
+      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.14.4.tgz",
+      "integrity": "sha512-NtTUvIlNELez7Q1DzKVIFZBzNb646boQMgpATo9z3Ftuu/gWvzxCW7jdjcUDoRGxRikrhVHB/zLXh1hxeJawvw==",
       "dependencies": {
         "tslib": "^2.3.0"
       }
diff --git a/modules/ui/src/app/app.component.html b/modules/ui/src/app/app.component.html
index 8b3a8f7dc..a89ee0b51 100644
--- a/modules/ui/src/app/app.component.html
+++ b/modules/ui/src/app/app.component.html
@@ -87,9 +87,6 @@ <h1 class="main-heading">Testrun</h1>
         (click)="openGeneralSettings(true)">
         <mat-icon>tune</mat-icon>
       </button>
-      <app-shutdown-app
-        [disable]="testrunInProgress((systemStatus$ | async)?.status)">
-      </app-shutdown-app>
     </mat-toolbar>
     <div class="app-content-main" role="main" id="main">
       <ng-container *ngIf="settingMissedError$ | async as error">
diff --git a/modules/ui/src/app/app.component.scss b/modules/ui/src/app/app.component.scss
index 46db2a291..d5589fabd 100644
--- a/modules/ui/src/app/app.component.scss
+++ b/modules/ui/src/app/app.component.scss
@@ -102,7 +102,6 @@ $nav-open-btn-width: 210px;
   width: $nav-close-btn-width;
   display: flex;
   justify-content: flex-start;
-  padding-inline: 8px;
 }
 
 .app-sidebar-button:first-child {
diff --git a/modules/ui/src/app/app.component.spec.ts b/modules/ui/src/app/app.component.spec.ts
index 859cc7d64..901c08795 100644
--- a/modules/ui/src/app/app.component.spec.ts
+++ b/modules/ui/src/app/app.component.spec.ts
@@ -58,7 +58,6 @@ import {
   selectInterfaces,
   selectMenuOpened,
 } from './store/selectors';
-import { MatIconTestingModule } from '@angular/material/icon/testing';
 
 describe('AppComponent', () => {
   let component: AppComponent;
@@ -112,7 +111,6 @@ describe('AppComponent', () => {
         MatSidenavModule,
         BypassComponent,
         CalloutComponent,
-        MatIconTestingModule,
       ],
       providers: [
         { provide: TestRunService, useValue: mockService },
@@ -143,7 +141,6 @@ describe('AppComponent', () => {
         AppComponent,
         FakeGeneralSettingsComponent,
         FakeSpinnerComponent,
-        FakeShutdownAppComponent,
         FakeVersionComponent,
       ],
     });
@@ -658,14 +655,6 @@ class FakeGeneralSettingsComponent {
 })
 class FakeSpinnerComponent {}
 
-@Component({
-  selector: 'app-shutdown-app',
-  template: '<div></div>',
-})
-class FakeShutdownAppComponent {
-  @Input() disable!: boolean;
-}
-
 @Component({
   selector: 'app-version',
   template: '<div></div>',
diff --git a/modules/ui/src/app/app.component.ts b/modules/ui/src/app/app.component.ts
index 21605e630..55d6ab9dc 100644
--- a/modules/ui/src/app/app.component.ts
+++ b/modules/ui/src/app/app.component.ts
@@ -44,7 +44,6 @@ import { GeneralSettingsComponent } from './pages/settings/general-settings.comp
 import { AppStore } from './app.store';
 
 const DEVICES_LOGO_URL = '/assets/icons/devices.svg';
-const DEVICES_RUN_URL = '/assets/icons/device_run.svg';
 const REPORTS_LOGO_URL = '/assets/icons/reports.svg';
 const TESTRUN_LOGO_URL = '/assets/icons/testrun_logo_small.svg';
 const TESTRUN_LOGO_COLOR_URL = '/assets/icons/testrun_logo_color.svg';
@@ -95,10 +94,6 @@ export class AppComponent implements OnInit {
       'devices',
       this.domSanitizer.bypassSecurityTrustResourceUrl(DEVICES_LOGO_URL)
     );
-    this.matIconRegistry.addSvgIcon(
-      'device_run',
-      this.domSanitizer.bypassSecurityTrustResourceUrl(DEVICES_RUN_URL)
-    );
     this.matIconRegistry.addSvgIcon(
       'reports',
       this.domSanitizer.bypassSecurityTrustResourceUrl(REPORTS_LOGO_URL)
@@ -178,12 +173,4 @@ export class AppComponent implements OnInit {
   consentShown() {
     this.appStore.setContent();
   }
-
-  testrunInProgress(status?: string): boolean {
-    return (
-      status === StatusOfTestrun.InProgress ||
-      status === StatusOfTestrun.WaitingForDevice ||
-      status === StatusOfTestrun.Monitoring
-    );
-  }
 }
diff --git a/modules/ui/src/app/app.module.ts b/modules/ui/src/app/app.module.ts
index 753aaadc4..42ade0ddd 100644
--- a/modules/ui/src/app/app.module.ts
+++ b/modules/ui/src/app/app.module.ts
@@ -44,8 +44,6 @@ import { EffectsModule } from '@ngrx/effects';
 import { AppEffects } from './store/effects';
 import { CdkTrapFocus } from '@angular/cdk/a11y';
 import { SettingsDropdownComponent } from './pages/settings/components/settings-dropdown/settings-dropdown.component';
-import { ShutdownAppComponent } from './components/shutdown-app/shutdown-app.component';
-import { WindowProvider } from './providers/window.provider';
 
 @NgModule({
   declarations: [AppComponent, GeneralSettingsComponent],
@@ -73,10 +71,8 @@ import { WindowProvider } from './providers/window.provider';
     EffectsModule.forRoot([AppEffects]),
     CdkTrapFocus,
     SettingsDropdownComponent,
-    ShutdownAppComponent,
   ],
   providers: [
-    WindowProvider,
     {
       provide: HTTP_INTERCEPTORS,
       useClass: ErrorInterceptor,
diff --git a/modules/ui/src/app/components/device-item/device-item.component.html b/modules/ui/src/app/components/device-item/device-item.component.html
index 84117dd34..0496d74fb 100644
--- a/modules/ui/src/app/components/device-item/device-item.component.html
+++ b/modules/ui/src/app/components/device-item/device-item.component.html
@@ -61,6 +61,8 @@
     attr.aria-label="Start new testrun for device {{ label }}"
     class="button-start"
     mat-flat-button>
-    <mat-icon class="button-start-icon" [svgIcon]="'device_run'"></mat-icon>
+    <mat-icon class="button-start-icon" fontSet="material-icons-outlined">
+      play_arrow</mat-icon
+    >
   </button>
 </div>
diff --git a/modules/ui/src/app/components/device-item/device-item.component.scss b/modules/ui/src/app/components/device-item/device-item.component.scss
index f613ec2f1..be2d4980a 100644
--- a/modules/ui/src/app/components/device-item/device-item.component.scss
+++ b/modules/ui/src/app/components/device-item/device-item.component.scss
@@ -174,8 +174,9 @@ $border-radius: 12px;
 
 .button-start-icon {
   margin: 0;
-  width: 30px;
+  width: 24px;
   height: 24px;
+  font-size: 24px;
 }
 
 .device-item {
diff --git a/modules/ui/src/app/components/shutdown-app-modal/shutdown-app-modal.component.html b/modules/ui/src/app/components/shutdown-app-modal/shutdown-app-modal.component.html
deleted file mode 100644
index 0614dfc28..000000000
--- a/modules/ui/src/app/components/shutdown-app-modal/shutdown-app-modal.component.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!--
-Copyright 2023 Google LLC
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    https://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<span class="modal-title">{{ data.title }}</span>
-<p class="modal-content">
-  {{ data.content }}
-</p>
-
-<mat-dialog-actions align="end" class="modal-actions">
-  <button
-    (click)="cancel()"
-    class="cancel-button"
-    color="primary"
-    mat-button
-    type="button">
-    Cancel
-  </button>
-  <button
-    (click)="confirm()"
-    class="confirm-button"
-    color="primary"
-    mat-button
-    type="button">
-    Stop Server & Quit
-  </button>
-</mat-dialog-actions>
diff --git a/modules/ui/src/app/components/shutdown-app-modal/shutdown-app-modal.component.scss b/modules/ui/src/app/components/shutdown-app-modal/shutdown-app-modal.component.scss
deleted file mode 100644
index 85ddce69d..000000000
--- a/modules/ui/src/app/components/shutdown-app-modal/shutdown-app-modal.component.scss
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Copyright 2023 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-@import '../../../theming/colors';
-
-:host {
-  display: grid;
-  overflow: hidden;
-  width: 570px;
-  box-sizing: border-box;
-  padding: 24px 16px 8px 24px;
-  gap: 10px;
-}
-
-.modal-title {
-  color: $grey-900;
-  font-size: 18px;
-  line-height: 24px;
-}
-
-.modal-content {
-  font-family: Roboto, sans-serif;
-  font-size: 14px;
-  line-height: 20px;
-  letter-spacing: 0.2px;
-  color: $grey-800;
-}
-
-.modal-actions {
-  padding: 0;
-  min-height: 30px;
-}
diff --git a/modules/ui/src/app/components/shutdown-app-modal/shutdown-app-modal.component.spec.ts b/modules/ui/src/app/components/shutdown-app-modal/shutdown-app-modal.component.spec.ts
deleted file mode 100644
index d7cd5abb6..000000000
--- a/modules/ui/src/app/components/shutdown-app-modal/shutdown-app-modal.component.spec.ts
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
- * Copyright 2023 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ShutdownAppModalComponent } from './shutdown-app-modal.component';
-import {
-  MAT_DIALOG_DATA,
-  MatDialogModule,
-  MatDialogRef,
-} from '@angular/material/dialog';
-import { MatButtonModule } from '@angular/material/button';
-import { of } from 'rxjs';
-import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-
-describe('ShutdownAppModalComponent', () => {
-  let component: ShutdownAppModalComponent;
-  let fixture: ComponentFixture<ShutdownAppModalComponent>;
-  let compiled: HTMLElement;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [
-        ShutdownAppModalComponent,
-        MatDialogModule,
-        MatButtonModule,
-        BrowserAnimationsModule,
-      ],
-      providers: [
-        {
-          provide: MatDialogRef,
-          useValue: {
-            keydownEvents: () => of(new KeyboardEvent('keydown', { code: '' })),
-            close: () => ({}),
-          },
-        },
-        { provide: MAT_DIALOG_DATA, useValue: {} },
-      ],
-    }).compileComponents();
-
-    fixture = TestBed.createComponent(ShutdownAppModalComponent);
-    component = fixture.componentInstance;
-    component.data = {
-      title: 'title',
-      content: 'content',
-    };
-    compiled = fixture.nativeElement as HTMLElement;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-
-  it('should has title and content', () => {
-    const title = compiled.querySelector('.modal-title') as HTMLElement;
-    const content = compiled.querySelector('.modal-content') as HTMLElement;
-
-    expect(title.innerHTML.trim()).toEqual('title');
-    expect(content.innerHTML.trim()).toEqual('content');
-  });
-
-  it('should close dialog on click "cancel" button', () => {
-    const closeSpy = spyOn(component.dialogRef, 'close');
-    const closeButton = compiled.querySelector(
-      '.cancel-button'
-    ) as HTMLButtonElement;
-
-    closeButton.click();
-
-    expect(closeSpy).toHaveBeenCalledWith();
-
-    closeSpy.calls.reset();
-  });
-
-  it('should close dialog with true on click "confirm" button', () => {
-    const closeSpy = spyOn(component.dialogRef, 'close');
-    const confirmButton = compiled.querySelector(
-      '.confirm-button'
-    ) as HTMLButtonElement;
-
-    confirmButton.click();
-
-    expect(closeSpy).toHaveBeenCalledWith(true);
-
-    closeSpy.calls.reset();
-  });
-});
diff --git a/modules/ui/src/app/components/shutdown-app-modal/shutdown-app-modal.component.ts b/modules/ui/src/app/components/shutdown-app-modal/shutdown-app-modal.component.ts
deleted file mode 100644
index af42aabe9..000000000
--- a/modules/ui/src/app/components/shutdown-app-modal/shutdown-app-modal.component.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * Copyright 2023 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { ChangeDetectionStrategy, Component, Inject } from '@angular/core';
-import { EscapableDialogComponent } from '../escapable-dialog/escapable-dialog.component';
-import {
-  MAT_DIALOG_DATA,
-  MatDialogModule,
-  MatDialogRef,
-} from '@angular/material/dialog';
-import { MatButtonModule } from '@angular/material/button';
-
-interface DialogData {
-  title?: string;
-  content?: string;
-}
-
-@Component({
-  selector: 'app-shutdown-app-modal',
-  templateUrl: './shutdown-app-modal.component.html',
-  styleUrl: './shutdown-app-modal.component.scss',
-  standalone: true,
-  imports: [MatDialogModule, MatButtonModule],
-  changeDetection: ChangeDetectionStrategy.OnPush,
-})
-export class ShutdownAppModalComponent extends EscapableDialogComponent {
-  constructor(
-    public override dialogRef: MatDialogRef<ShutdownAppModalComponent>,
-    @Inject(MAT_DIALOG_DATA) public data: DialogData
-  ) {
-    super(dialogRef);
-  }
-
-  confirm() {
-    this.dialogRef.close(true);
-  }
-
-  cancel() {
-    this.dialogRef.close();
-  }
-}
diff --git a/modules/ui/src/app/components/shutdown-app/shutdown-app.component.html b/modules/ui/src/app/components/shutdown-app/shutdown-app.component.html
deleted file mode 100644
index a13bd5118..000000000
--- a/modules/ui/src/app/components/shutdown-app/shutdown-app.component.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
-Copyright 2023 Google LLC
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    https://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<button
-  class="shutdown-button"
-  mat-icon-button
-  aria-label="Shutdown Testrun"
-  [disabled]="disable"
-  (click)="openShutdownModal()">
-  <mat-icon>power_settings_new</mat-icon>
-</button>
diff --git a/modules/ui/src/app/components/shutdown-app/shutdown-app.component.scss b/modules/ui/src/app/components/shutdown-app/shutdown-app.component.scss
deleted file mode 100644
index a424bf842..000000000
--- a/modules/ui/src/app/components/shutdown-app/shutdown-app.component.scss
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * Copyright 2023 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-:host {
-  ::ng-deep.mat-mdc-icon-button .mat-mdc-button-persistent-ripple {
-    border-radius: inherit;
-  }
-}
-.shutdown-button {
-  border-radius: 20px;
-  padding: 0;
-  box-sizing: border-box;
-  height: 34px;
-  margin: 11px 2px 11px 0;
-  line-height: 50%;
-}
diff --git a/modules/ui/src/app/components/shutdown-app/shutdown-app.component.spec.ts b/modules/ui/src/app/components/shutdown-app/shutdown-app.component.spec.ts
deleted file mode 100644
index 522234f5e..000000000
--- a/modules/ui/src/app/components/shutdown-app/shutdown-app.component.spec.ts
+++ /dev/null
@@ -1,112 +0,0 @@
-/**
- * Copyright 2023 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import {
-  ComponentFixture,
-  fakeAsync,
-  TestBed,
-  tick,
-} from '@angular/core/testing';
-
-import { ShutdownAppComponent } from './shutdown-app.component';
-import { MatDialogModule, MatDialogRef } from '@angular/material/dialog';
-import { TestRunService } from '../../services/test-run.service';
-import SpyObj = jasmine.SpyObj;
-import { of } from 'rxjs';
-import { ShutdownAppModalComponent } from '../shutdown-app-modal/shutdown-app-modal.component';
-import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { WINDOW } from '../../providers/window.provider';
-
-describe('ShutdownAppComponent', () => {
-  let component: ShutdownAppComponent;
-  let compiled: HTMLElement;
-  let fixture: ComponentFixture<ShutdownAppComponent>;
-  let mockService: SpyObj<TestRunService>;
-
-  const windowMock = {
-    location: {
-      reload: jasmine.createSpy('reload'),
-    },
-  };
-
-  beforeEach(async () => {
-    mockService = jasmine.createSpyObj(['shutdownTestrun']);
-
-    await TestBed.configureTestingModule({
-      imports: [ShutdownAppComponent, MatDialogModule, BrowserAnimationsModule],
-      providers: [
-        { provide: TestRunService, useValue: mockService },
-        {
-          provide: MatDialogRef,
-          useValue: {
-            close: () => ({}),
-          },
-        },
-        { provide: WINDOW, useValue: windowMock },
-      ],
-    }).compileComponents();
-
-    fixture = TestBed.createComponent(ShutdownAppComponent);
-    component = fixture.componentInstance;
-    compiled = fixture.nativeElement as HTMLElement;
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-
-  it('#openShutdownModal should call service shutdownTestrun after close', fakeAsync(() => {
-    mockService.shutdownTestrun.and.returnValue(of(false));
-    spyOn(component.dialog, 'open').and.returnValue({
-      afterClosed: () => of(true),
-    } as MatDialogRef<typeof ShutdownAppModalComponent>);
-    tick();
-
-    component.openShutdownModal();
-
-    expect(mockService.shutdownTestrun).toHaveBeenCalled();
-  }));
-
-  it('#openShutdownModal should reload window after shutdownTestrun', fakeAsync(() => {
-    mockService.shutdownTestrun.and.returnValue(of(true));
-    spyOn(component.dialog, 'open').and.returnValue({
-      afterClosed: () => of(true),
-    } as MatDialogRef<typeof ShutdownAppModalComponent>);
-    tick();
-
-    component.openShutdownModal();
-
-    expect(windowMock.location.reload).toHaveBeenCalled();
-  }));
-
-  it('shutdown button should be enable', () => {
-    const shutdownButton = compiled.querySelector(
-      '.shutdown-button'
-    ) as HTMLButtonElement;
-
-    expect(shutdownButton.disabled).toBeFalse();
-  });
-
-  it('shutdown button should be disable', () => {
-    component.disable = true;
-    fixture.detectChanges();
-
-    const shutdownButton = compiled.querySelector(
-      '.shutdown-button'
-    ) as HTMLButtonElement;
-
-    expect(shutdownButton.disabled).toBeTrue();
-  });
-});
diff --git a/modules/ui/src/app/components/shutdown-app/shutdown-app.component.ts b/modules/ui/src/app/components/shutdown-app/shutdown-app.component.ts
deleted file mode 100644
index 99a9b06d0..000000000
--- a/modules/ui/src/app/components/shutdown-app/shutdown-app.component.ts
+++ /dev/null
@@ -1,92 +0,0 @@
-/**
- * Copyright 2023 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import {
-  ChangeDetectionStrategy,
-  Component,
-  Inject,
-  Input,
-  OnDestroy,
-} from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { MatButtonModule } from '@angular/material/button';
-import { MatIcon } from '@angular/material/icon';
-import { MatDialog } from '@angular/material/dialog';
-import { ShutdownAppModalComponent } from '../shutdown-app-modal/shutdown-app-modal.component';
-import { Subject, takeUntil } from 'rxjs';
-import { TestRunService } from '../../services/test-run.service';
-import { WINDOW } from '../../providers/window.provider';
-
-@Component({
-  selector: 'app-shutdown-app',
-  standalone: true,
-  imports: [CommonModule, MatButtonModule, MatIcon],
-  templateUrl: './shutdown-app.component.html',
-  styleUrl: './shutdown-app.component.scss',
-  changeDetection: ChangeDetectionStrategy.OnPush,
-})
-export class ShutdownAppComponent implements OnDestroy {
-  @Input() disable: boolean = false;
-
-  private destroy$: Subject<boolean> = new Subject<boolean>();
-  constructor(
-    public dialog: MatDialog,
-    private testRunService: TestRunService,
-    @Inject(WINDOW) private window: Window
-  ) {}
-
-  openShutdownModal() {
-    const dialogRef = this.dialog.open(ShutdownAppModalComponent, {
-      ariaLabel: 'Shutdown Testrun',
-      data: {
-        title: 'Shutdown Testrun',
-        content: 'Do you want to stop Testrun?',
-      },
-      autoFocus: true,
-      hasBackdrop: true,
-      disableClose: true,
-      panelClass: 'shutdown-app-dialog',
-    });
-
-    dialogRef
-      ?.afterClosed()
-      .pipe(takeUntil(this.destroy$))
-      .subscribe(shutdownApp => {
-        if (shutdownApp) {
-          this.shutdownApp();
-        }
-      });
-  }
-
-  private shutdownApp(): void {
-    this.testRunService
-      .shutdownTestrun()
-      .pipe(takeUntil(this.destroy$))
-      .subscribe(success => {
-        if (success) {
-          this.reloadPage();
-        }
-      });
-  }
-
-  private reloadPage(): void {
-    this.window.location.reload();
-  }
-
-  ngOnDestroy() {
-    this.destroy$.next(true);
-    this.destroy$.unsubscribe();
-  }
-}
diff --git a/modules/ui/src/app/interceptors/error.interceptor.ts b/modules/ui/src/app/interceptors/error.interceptor.ts
index 924cbde02..8fe5d0c23 100644
--- a/modules/ui/src/app/interceptors/error.interceptor.ts
+++ b/modules/ui/src/app/interceptors/error.interceptor.ts
@@ -31,27 +31,22 @@ import {
 import { NotificationService } from '../services/notification.service';
 
 import { SYSTEM_STOP } from '../services/test-run.service';
-import { finalize } from 'rxjs/operators';
 
 const DEFAULT_TIMEOUT_MS = 5000;
-const SYSTEM_STOP_TIMEOUT_MS = 60 * 1000;
+const SYSTEM_STOP_TIMEOUT_MS = 10000;
 
 @Injectable()
 export class ErrorInterceptor implements HttpInterceptor {
-  private isTestrunStop = false;
   constructor(private notificationService: NotificationService) {}
+
   intercept(
     request: HttpRequest<unknown>,
     next: HttpHandler,
     timeoutMs = DEFAULT_TIMEOUT_MS
   ): Observable<HttpEvent<unknown>> {
-    const timeoutValue =
-      request.url.includes(SYSTEM_STOP) || this.isTestrunStop
-        ? SYSTEM_STOP_TIMEOUT_MS
-        : timeoutMs;
-    if (request.url.includes(SYSTEM_STOP)) {
-      this.isTestrunStop = true;
-    }
+    const timeoutValue = request.url.includes(SYSTEM_STOP)
+      ? SYSTEM_STOP_TIMEOUT_MS
+      : timeoutMs;
     return next.handle(request).pipe(
       timeout(timeoutValue),
       catchError((error: HttpErrorResponse | TimeoutError) => {
@@ -71,11 +66,6 @@ export class ErrorInterceptor implements HttpInterceptor {
           }
         }
         return throwError(error);
-      }),
-      finalize(() => {
-        if (request.url.includes(SYSTEM_STOP)) {
-          this.isTestrunStop = false;
-        }
       })
     );
   }
diff --git a/modules/ui/src/app/mocks/progress.mock.ts b/modules/ui/src/app/mocks/progress.mock.ts
index 258e73c10..2911ea794 100644
--- a/modules/ui/src/app/mocks/progress.mock.ts
+++ b/modules/ui/src/app/mocks/progress.mock.ts
@@ -69,7 +69,6 @@ const PROGRESS_DATA_RESPONSE = (
 ) => {
   return {
     status,
-    mac_addr: '01:02:03:04:05:06',
     device: {
       manufacturer: 'Delta',
       model: '03-DIN-CPU',
diff --git a/modules/ui/src/app/mocks/reports.mock.ts b/modules/ui/src/app/mocks/reports.mock.ts
index 0cfb39420..9a5430b5c 100644
--- a/modules/ui/src/app/mocks/reports.mock.ts
+++ b/modules/ui/src/app/mocks/reports.mock.ts
@@ -3,7 +3,6 @@ import { MatTableDataSource } from '@angular/material/table';
 
 export const HISTORY = [
   {
-    mac_addr: '01:02:03:04:05:06',
     status: 'compliant',
     device: {
       manufacturer: 'Delta',
@@ -17,7 +16,6 @@ export const HISTORY = [
   },
   {
     status: 'compliant',
-    mac_addr: '01:02:03:04:05:07',
     device: {
       manufacturer: 'Delta',
       model: '03-DIN-SRC',
@@ -32,7 +30,6 @@ export const HISTORY = [
 
 export const HISTORY_AFTER_REMOVE = [
   {
-    mac_addr: '01:02:03:04:05:06',
     status: 'compliant',
     device: {
       manufacturer: 'Delta',
@@ -52,7 +49,6 @@ export const HISTORY_AFTER_REMOVE = [
 export const FORMATTED_HISTORY = [
   {
     status: 'compliant',
-    mac_addr: '01:02:03:04:05:06',
     device: {
       manufacturer: 'Delta',
       model: '03-DIN-SRC',
@@ -68,7 +64,6 @@ export const FORMATTED_HISTORY = [
   },
   {
     status: 'compliant',
-    mac_addr: '01:02:03:04:05:07',
     device: {
       manufacturer: 'Delta',
       model: '03-DIN-SRC',
diff --git a/modules/ui/src/app/mocks/settings.mock.ts b/modules/ui/src/app/mocks/settings.mock.ts
index baab9a2c0..c5b3ddc74 100644
--- a/modules/ui/src/app/mocks/settings.mock.ts
+++ b/modules/ui/src/app/mocks/settings.mock.ts
@@ -53,7 +53,7 @@ export const MOCK_INTERFACE_VALUE: SystemInterfaces = {
 };
 export const MOCK_LOG_VALUE: SystemInterfaces = {
   key: 'DEBUG',
-  value: 'Every event will be logged',
+  value: '',
 };
 
 export const MOCK_PERIOD_VALUE: SystemInterfaces = {
diff --git a/modules/ui/src/app/model/testrun-status.ts b/modules/ui/src/app/model/testrun-status.ts
index 3f6805367..1492160c5 100644
--- a/modules/ui/src/app/model/testrun-status.ts
+++ b/modules/ui/src/app/model/testrun-status.ts
@@ -16,7 +16,6 @@
 import { Device } from './device';
 
 export interface TestrunStatus {
-  mac_addr: string;
   status: string;
   device: IDevice;
   started: string | null;
@@ -62,7 +61,6 @@ export enum StatusOfTestrun {
   SmartReady = 'Smart Ready', // used for Completed
   Idle = 'Idle',
   Monitoring = 'Monitoring',
-  Error = 'Error',
 }
 
 export enum StatusOfTestResult {
@@ -71,7 +69,7 @@ export enum StatusOfTestResult {
   CompliantHigh = 'Compliant (High)',
   SmartReady = 'Smart Ready',
   NonCompliant = 'Non-Compliant', // device does not support feature but feature is required
-  NotPresent = 'Feature Not Present',
+  Skipped = 'Skipped',
   NotStarted = 'Not Started',
   InProgress = 'In Progress',
   Error = 'Error', // test failed to run
diff --git a/modules/ui/src/app/pages/devices/components/device-form/device-form.component.html b/modules/ui/src/app/pages/devices/components/device-form/device-form.component.html
index 5978f6d22..11f87ff33 100644
--- a/modules/ui/src/app/pages/devices/components/device-form/device-form.component.html
+++ b/modules/ui/src/app/pages/devices/components/device-form/device-form.component.html
@@ -31,7 +31,7 @@
       role="alert"
       aria-live="assertive">
       <span
-        >Please, check. The manufacturer name must be a maximum of 28
+        >Please, check. The manufacturer name must be a maximum of 64
         characters. Only letters, numbers, and accented letters are
         permitted.</span
       >
@@ -49,7 +49,7 @@
       role="alert"
       aria-live="assertive">
       <span
-        >Please, check. The device model name must be a maximum of 28
+        >Please, check. The device model name must be a maximum of 64
         characters. Only letters, numbers, and accented letters are
         permitted.</span
       >
diff --git a/modules/ui/src/app/pages/devices/components/device-form/device-form.component.spec.ts b/modules/ui/src/app/pages/devices/components/device-form/device-form.component.spec.ts
index 6ea72aa52..4ffbb402e 100644
--- a/modules/ui/src/app/pages/devices/components/device-form/device-form.component.spec.ts
+++ b/modules/ui/src/app/pages/devices/components/device-form/device-form.component.spec.ts
@@ -240,7 +240,7 @@ describe('DeviceFormComponent', () => {
 
         expect(error).toBeTruthy();
         expect(modelError).toContain(
-          'The device model name must be a maximum of 28 characters. Only letters, numbers, and accented letters are permitted.'
+          'The device model name must be a maximum of 64 characters. Only letters, numbers, and accented letters are permitted.'
         );
       });
     });
@@ -283,7 +283,7 @@ describe('DeviceFormComponent', () => {
 
         expect(error).toBeTruthy();
         expect(manufacturerError).toContain(
-          'The manufacturer name must be a maximum of 28 characters. Only letters, numbers, and accented letters are permitted.'
+          'The manufacturer name must be a maximum of 64 characters. Only letters, numbers, and accented letters are permitted.'
         );
       });
     });
diff --git a/modules/ui/src/app/pages/devices/components/device-form/device.validators.ts b/modules/ui/src/app/pages/devices/components/device-form/device.validators.ts
index 2b7b23ae1..5e54e7996 100644
--- a/modules/ui/src/app/pages/devices/components/device-form/device.validators.ts
+++ b/modules/ui/src/app/pages/devices/components/device-form/device.validators.ts
@@ -23,28 +23,15 @@ import { Device } from '../../../../model/device';
  */
 export class DeviceValidators {
   readonly STRING_FORMAT_REGEXP = new RegExp(
-    "^([a-z0-9\\p{L}\\p{M}.',-_ ]{1,28})$",
-    'u'
-  );
-
-  readonly FIRMWARE_FORMAT_REGEXP = new RegExp(
     "^([a-z0-9\\p{L}\\p{M}.',-_ ]{1,64})$",
     'u'
   );
 
   public deviceStringFormat(): ValidatorFn {
-    return this.stringFormat(this.STRING_FORMAT_REGEXP);
-  }
-
-  public firmwareStringFormat(): ValidatorFn {
-    return this.stringFormat(this.FIRMWARE_FORMAT_REGEXP);
-  }
-
-  private stringFormat(regExp: RegExp): ValidatorFn {
     return (control: AbstractControl): ValidationErrors | null => {
       const value = control.value?.trim();
       if (value) {
-        const result = regExp.test(value);
+        const result = this.STRING_FORMAT_REGEXP.test(value);
         return !result ? { invalid_format: true } : null;
       }
       return null;
diff --git a/modules/ui/src/app/pages/devices/device-repository.component.html b/modules/ui/src/app/pages/devices/device-repository.component.html
index 6dc585f5e..efd61fc2e 100644
--- a/modules/ui/src/app/pages/devices/device-repository.component.html
+++ b/modules/ui/src/app/pages/devices/device-repository.component.html
@@ -30,21 +30,21 @@ <h2 class="title">Devices</h2>
       </ng-container>
     </div>
   </ng-container>
-  <ng-template #empty>
-    <div class="device-repository-content-empty">
-      <ng-container *ngTemplateOutlet="addDeviceButton"></ng-container>
-    </div>
-  </ng-template>
-
-  <ng-template #addDeviceButton>
-    <button
-      (click)="openDialog(vm.devices)"
-      aria-label="Add device"
-      class="device-add-button"
-      color="primary"
-      mat-flat-button>
-      <mat-icon>add</mat-icon>
-      Add device
-    </button>
-  </ng-template>
 </ng-container>
+<ng-template #empty>
+  <div class="device-repository-content-empty">
+    <ng-container *ngTemplateOutlet="addDeviceButton"></ng-container>
+  </div>
+</ng-template>
+
+<ng-template #addDeviceButton>
+  <button
+    (click)="openDialog()"
+    aria-label="Add device"
+    class="device-add-button"
+    color="primary"
+    mat-flat-button>
+    <mat-icon>add</mat-icon>
+    Add device
+  </button>
+</ng-template>
diff --git a/modules/ui/src/app/pages/devices/device-repository.component.spec.ts b/modules/ui/src/app/pages/devices/device-repository.component.spec.ts
index 98c923d91..dc6279081 100644
--- a/modules/ui/src/app/pages/devices/device-repository.component.spec.ts
+++ b/modules/ui/src/app/pages/devices/device-repository.component.spec.ts
@@ -136,7 +136,7 @@ describe('DeviceRepositoryComponent', () => {
           device: null,
           title: 'Create device',
           testModules: MOCK_TEST_MODULES,
-          devices: [device, device, device],
+          devices: [],
         },
         autoFocus: true,
         hasBackdrop: true,
diff --git a/modules/ui/src/app/pages/reports/components/filter-dialog/filter-dialog.component.ts b/modules/ui/src/app/pages/reports/components/filter-dialog/filter-dialog.component.ts
index 3d8ac231a..f8fea286b 100644
--- a/modules/ui/src/app/pages/reports/components/filter-dialog/filter-dialog.component.ts
+++ b/modules/ui/src/app/pages/reports/components/filter-dialog/filter-dialog.component.ts
@@ -162,7 +162,7 @@ export class FilterDialogComponent
   private createFilterForm() {
     this.filterForm = this.fb.group({
       deviceInfo: ['', [this.deviceValidators.deviceStringFormat()]],
-      deviceFirmware: ['', [this.deviceValidators.firmwareStringFormat()]],
+      deviceFirmware: ['', [this.deviceValidators.deviceStringFormat()]],
       results: new FormArray(this.resultList.map(() => new FormControl(false))),
     });
   }
diff --git a/modules/ui/src/app/pages/reports/history.component.scss b/modules/ui/src/app/pages/reports/history.component.scss
index e8c8850d4..cc4f56bd0 100644
--- a/modules/ui/src/app/pages/reports/history.component.scss
+++ b/modules/ui/src/app/pages/reports/history.component.scss
@@ -35,10 +35,12 @@
   overflow-y: auto;
   border-radius: 4px;
   border: 1px solid $lighter-grey;
-  height: -webkit-max-content;
-  height: -moz-max-content;
-  height: max-content;
-  max-height: calc(100vh - 160px);
+  height: -webkit-fit-content;
+  height: -moz-fit-content;
+  height: fit-content;
+  max-height: -webkit-fill-available;
+  max-height: -moz-available;
+  max-height: stretch;
 }
 
 .history-content-empty,
@@ -46,11 +48,6 @@
   height: 100%;
 }
 
-.history-content {
-  container-type: inline-size;
-  container-name: history-content;
-}
-
 .history-content table {
   th {
     font-weight: 700;
@@ -98,27 +95,6 @@
   }
 }
 
-@container history-content (width < 770px) {
-  th,
-  td {
-    padding: 0 8px;
-  }
-}
-
-@container history-content (width < 680px) {
-  th,
-  td {
-    padding: 0 4px;
-  }
-}
-
-@container history-content (width < 632px) {
-  th,
-  td {
-    padding: 0 2px;
-  }
-}
-
 .results-content-empty,
 .results-content-filter-empty {
   display: flex;
diff --git a/modules/ui/src/app/pages/reports/history.component.ts b/modules/ui/src/app/pages/reports/history.component.ts
index 7f5dc01f1..f4ae52e0d 100644
--- a/modules/ui/src/app/pages/reports/history.component.ts
+++ b/modules/ui/src/app/pages/reports/history.component.ts
@@ -164,7 +164,7 @@ export class HistoryComponent implements OnInit, OnDestroy {
 
   removeDevice(data: TestrunStatus) {
     this.store.deleteReport({
-      mac_addr: data.mac_addr,
+      mac_addr: data.device.mac_addr,
       started: data.started,
     });
     this.focusNextButton();
diff --git a/modules/ui/src/app/pages/reports/reports.store.ts b/modules/ui/src/app/pages/reports/reports.store.ts
index a457b358b..23c63b86e 100644
--- a/modules/ui/src/app/pages/reports/reports.store.ts
+++ b/modules/ui/src/app/pages/reports/reports.store.ts
@@ -226,7 +226,8 @@ export class ReportsStore extends ComponentStore<ReportsComponentState> {
   ) {
     const history = current;
     const idx = history.findIndex(
-      report => report.mac_addr === mac_addr && report.started === started
+      report =>
+        report.device.mac_addr === mac_addr && report.started === started
     );
     if (typeof idx === 'number') {
       history.splice(idx, 1);
diff --git a/modules/ui/src/app/pages/settings/settings.store.spec.ts b/modules/ui/src/app/pages/settings/settings.store.spec.ts
index 4e1fb5379..603c688b8 100644
--- a/modules/ui/src/app/pages/settings/settings.store.spec.ts
+++ b/modules/ui/src/app/pages/settings/settings.store.spec.ts
@@ -322,7 +322,7 @@ describe('SettingsStore', () => {
           });
           expect((form.get(FormKey.LOG_LEVEL) as FormControl).value).toEqual({
             key: 'INFO',
-            value: 'Normal events and issues',
+            value: '',
           });
           expect(
             (form.get(FormKey.MONITOR_PERIOD) as FormControl).value
diff --git a/modules/ui/src/app/pages/settings/settings.store.ts b/modules/ui/src/app/pages/settings/settings.store.ts
index b98175c72..eededce2c 100644
--- a/modules/ui/src/app/pages/settings/settings.store.ts
+++ b/modules/ui/src/app/pages/settings/settings.store.ts
@@ -48,11 +48,11 @@ export const DEFAULT_INTERNET_OPTION = {
 };
 
 export const LOG_LEVELS = {
-  DEBUG: 'Every event will be logged',
-  INFO: 'Normal events and issues',
-  WARNING: 'Warnings, errors, critical issues',
-  ERROR: 'Errors and critical problems',
-  CRITICAL: 'Critical problems',
+  DEBUG: '',
+  INFO: '',
+  WARNING: '',
+  ERROR: '',
+  CRITICAL: '',
 };
 
 export const MONITORING_PERIOD = {
diff --git a/modules/ui/src/app/pages/testrun/components/download-options/download-options.component.html b/modules/ui/src/app/pages/testrun/components/download-options/download-options.component.html
deleted file mode 100644
index 491151ac2..000000000
--- a/modules/ui/src/app/pages/testrun/components/download-options/download-options.component.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!--
-Copyright 2023 Google LLC
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    https://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<mat-form-field
-  appearance="outline"
-  *ngIf="data"
-  class="download-options-field">
-  <mat-select placeholder="Download" class="download-options-select">
-    <mat-option
-      class="download-option pdf"
-      (onSelectionChange)="onSelected($event, data, DownloadOption.PDF)">
-      <mat-icon
-        matSuffix
-        class="download-report-icon"
-        fontSet="material-symbols-outlined">
-        lab_profile
-      </mat-icon>
-      <span>{{ DownloadOption.PDF }}</span>
-    </mat-option>
-    <mat-option
-      class="download-option"
-      (onSelectionChange)="onSelected($event, data, DownloadOption.ZIP)">
-      <mat-icon
-        class="download-report-icon"
-        fontSet="material-symbols-outlined">
-        archive
-      </mat-icon>
-      <span>{{ DownloadOption.ZIP }}</span>
-    </mat-option>
-  </mat-select>
-</mat-form-field>
diff --git a/modules/ui/src/app/pages/testrun/components/download-options/download-options.component.scss b/modules/ui/src/app/pages/testrun/components/download-options/download-options.component.scss
deleted file mode 100644
index 195a11839..000000000
--- a/modules/ui/src/app/pages/testrun/components/download-options/download-options.component.scss
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * Copyright 2023 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-@use 'node_modules/@angular/material/index' as mat;
-@import 'src/theming/colors';
-
-$option-width: 170px;
-$option-height: 36px;
-
-.download-options-field {
-  width: $option-width;
-  background: mat.get-color-from-palette($color-primary, 50);
-
-  ::ng-deep.mat-mdc-text-field-wrapper {
-    padding: 0 16px;
-  }
-
-  ::ng-deep.mat-mdc-form-field-subscript-wrapper {
-    display: none;
-  }
-
-  ::ng-deep.mat-mdc-form-field-infix {
-    padding: 6px 0;
-    height: $option-height;
-    width: $option-width;
-    min-height: $option-height;
-  }
-
-  ::ng-deep.mat-mdc-select-placeholder {
-    color: mat.get-color-from-palette($color-primary, 700);
-    font-size: 14px;
-    font-style: normal;
-    font-weight: 500;
-    line-height: 20px;
-    letter-spacing: 0.25px;
-  }
-
-  ::ng-deep.mat-mdc-select-arrow {
-    color: mat.get-color-from-palette($color-primary, 700);
-  }
-
-  ::ng-deep .mat-mdc-text-field-wrapper .mdc-notched-outline > * {
-    border-color: mat.get-color-from-palette($color-primary, 50);
-  }
-
-  ::ng-deep
-    .mat-mdc-text-field-wrapper.mdc-text-field--focused
-    .mdc-notched-outline
-    > * {
-    border-color: #000000de;
-  }
-
-  &:has(.download-options-select[aria-expanded='true'])
-    ::ng-deep
-    .mat-mdc-text-field-wrapper.mdc-text-field--focused
-    .mdc-notched-outline
-    > * {
-    border: none;
-  }
-
-  ::ng-deep
-    .mat-mdc-text-field-wrapper.mdc-text-field--outlined:hover
-    .mdc-notched-outline
-    > * {
-    border: none;
-  }
-}
-
-.download-option {
-  ::ng-deep .mat-mdc-focus-indicator {
-    display: none;
-  }
-}
-
-.download-option {
-  min-height: 32px;
-  color: $grey-800;
-}
diff --git a/modules/ui/src/app/pages/testrun/components/download-options/download-options.component.spec.ts b/modules/ui/src/app/pages/testrun/components/download-options/download-options.component.spec.ts
deleted file mode 100644
index c28c453c1..000000000
--- a/modules/ui/src/app/pages/testrun/components/download-options/download-options.component.spec.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-/**
- * Copyright 2023 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import {
-  DownloadOption,
-  DownloadOptionsComponent,
-} from './download-options.component';
-import { MOCK_PROGRESS_DATA_COMPLIANT } from '../../../../mocks/progress.mock';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { MatOptionSelectionChange } from '@angular/material/core';
-
-describe('DownloadOptionsComponent', () => {
-  let component: DownloadOptionsComponent;
-  let fixture: ComponentFixture<DownloadOptionsComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [DownloadOptionsComponent, NoopAnimationsModule],
-    }).compileComponents();
-
-    fixture = TestBed.createComponent(DownloadOptionsComponent);
-    component = fixture.componentInstance;
-    component.data = MOCK_PROGRESS_DATA_COMPLIANT;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-
-  it('#onSelected should call getReportTitle', () => {
-    const spyGetReportTitle = spyOn(component, 'getReportTitle');
-
-    const mockEvent = {
-      source: {},
-      isUserInput: true,
-    } as MatOptionSelectionChange;
-
-    component.onSelected(
-      mockEvent,
-      MOCK_PROGRESS_DATA_COMPLIANT,
-      DownloadOption.PDF
-    );
-
-    expect(spyGetReportTitle).toHaveBeenCalled();
-  });
-
-  it('#onSelected should call getZipLink when using for zip report', () => {
-    const spyGetZipLink = spyOn(component, 'getZipLink');
-
-    const mockEvent = {
-      source: {},
-      isUserInput: true,
-    } as MatOptionSelectionChange;
-
-    component.onSelected(
-      mockEvent,
-      MOCK_PROGRESS_DATA_COMPLIANT,
-      DownloadOption.ZIP
-    );
-
-    expect(spyGetZipLink).toHaveBeenCalled();
-  });
-});
diff --git a/modules/ui/src/app/pages/testrun/components/download-options/download-options.component.ts b/modules/ui/src/app/pages/testrun/components/download-options/download-options.component.ts
deleted file mode 100644
index 847feb30e..000000000
--- a/modules/ui/src/app/pages/testrun/components/download-options/download-options.component.ts
+++ /dev/null
@@ -1,86 +0,0 @@
-/**
- * Copyright 2023 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
-import { FormsModule } from '@angular/forms';
-import { MatFormFieldModule } from '@angular/material/form-field';
-import { MatSelectModule } from '@angular/material/select';
-import { CommonModule, DatePipe } from '@angular/common';
-import { MatIconModule } from '@angular/material/icon';
-import { TestrunStatus } from '../../../../model/testrun-status';
-import { MatOptionSelectionChange } from '@angular/material/core';
-
-export enum DownloadOption {
-  PDF = 'PDF Report',
-  ZIP = 'ZIP File',
-}
-@Component({
-  selector: 'app-download-options',
-  templateUrl: './download-options.component.html',
-  styleUrl: './download-options.component.scss',
-  standalone: true,
-  imports: [
-    CommonModule,
-    FormsModule,
-    MatIconModule,
-    MatFormFieldModule,
-    MatSelectModule,
-  ],
-  providers: [DatePipe],
-  changeDetection: ChangeDetectionStrategy.OnPush,
-})
-export class DownloadOptionsComponent {
-  @Input() data!: TestrunStatus;
-  DownloadOption = DownloadOption;
-  constructor(private datePipe: DatePipe) {}
-
-  onSelected(
-    event: MatOptionSelectionChange,
-    data: TestrunStatus,
-    type: string
-  ) {
-    if (event.isUserInput) {
-      this.createLink(data, type);
-    }
-  }
-
-  createLink(data: TestrunStatus, type: string) {
-    if (!data.report) {
-      return;
-    }
-    const link = document.createElement('a');
-    link.href =
-      type === DownloadOption.PDF ? data.report : this.getZipLink(data.report);
-    link.target = '_blank';
-    link.download = this.getReportTitle(data);
-    link.dispatchEvent(new MouseEvent('click'));
-  }
-
-  getZipLink(reportURL: string): string {
-    return reportURL.replace('report', 'export');
-  }
-
-  getReportTitle(data: TestrunStatus) {
-    return `${data.device.manufacturer} ${data.device.model} ${
-      data.device.firmware
-    } ${data.status} ${this.getFormattedDateString(data.started)}`
-      .replace(/ /g, '_')
-      .toLowerCase();
-  }
-
-  getFormattedDateString(date: string | null) {
-    return date ? this.datePipe.transform(date, 'd MMM y H:mm') : '';
-  }
-}
diff --git a/modules/ui/src/app/pages/testrun/components/progress-initiate-form/progress-initiate-form.component.ts b/modules/ui/src/app/pages/testrun/components/progress-initiate-form/progress-initiate-form.component.ts
index 754d0ea5b..cf323ec11 100644
--- a/modules/ui/src/app/pages/testrun/components/progress-initiate-form/progress-initiate-form.component.ts
+++ b/modules/ui/src/app/pages/testrun/components/progress-initiate-form/progress-initiate-form.component.ts
@@ -149,7 +149,7 @@ export class ProgressInitiateFormComponent
 
   private createInitiateForm() {
     this.initiateForm = this.fb.group({
-      firmware: ['', [this.deviceValidators.firmwareStringFormat()]],
+      firmware: ['', [this.deviceValidators.deviceStringFormat()]],
       test_modules: new FormArray([]),
     });
   }
diff --git a/modules/ui/src/app/pages/testrun/components/progress-status-card/progress-status-card.component.html b/modules/ui/src/app/pages/testrun/components/progress-status-card/progress-status-card.component.html
index fb4a404d6..971a58430 100644
--- a/modules/ui/src/app/pages/testrun/components/progress-status-card/progress-status-card.component.html
+++ b/modules/ui/src/app/pages/testrun/components/progress-status-card/progress-status-card.component.html
@@ -59,24 +59,13 @@
       ></ng-container>
     </div>
     <ng-container *ngIf="data.finished">
-      <ng-container *ngIf="data.status !== StatusOfTestrun.InProgress">
-        <ng-container
-          *ngTemplateOutlet="
-            Finished;
-            context: {
-              data: data
-            }
-          "></ng-container>
-      </ng-container>
-      <ng-container *ngIf="data.status === StatusOfTestrun.InProgress">
-        <ng-container
-          *ngTemplateOutlet="
-            InProgress;
-            context: {
-              data: data
-            }
-          "></ng-container
-      ></ng-container>
+      <ng-container
+        *ngTemplateOutlet="
+          Finished;
+          context: {
+            data: data
+          }
+        "></ng-container>
     </ng-container>
   </div>
 </ng-container>
diff --git a/modules/ui/src/app/pages/testrun/components/progress-status-card/progress-status-card.component.spec.ts b/modules/ui/src/app/pages/testrun/components/progress-status-card/progress-status-card.component.spec.ts
index de7341897..9d7248656 100644
--- a/modules/ui/src/app/pages/testrun/components/progress-status-card/progress-status-card.component.spec.ts
+++ b/modules/ui/src/app/pages/testrun/components/progress-status-card/progress-status-card.component.spec.ts
@@ -67,11 +67,6 @@ describe('ProgressStatusCardComponent', () => {
         StatusOfTestrun.CompliantHigh,
       ];
 
-      const statusesForCompletedFailedClass = [
-        StatusOfTestrun.NonCompliant,
-        StatusOfTestrun.Error,
-      ];
-
       statusesForProgressClass.forEach(testCase => {
         it(`should have class "progress" if status "${testCase}"`, () => {
           const expectedResult = { ...availableClasses, progress: true };
@@ -95,17 +90,15 @@ describe('ProgressStatusCardComponent', () => {
         });
       });
 
-      statusesForCompletedFailedClass.forEach(testCase => {
-        it(`should have class "completed-failed" if status "${testCase}"`, () => {
-          const expectedResult = {
-            ...availableClasses,
-            'completed-failed': true,
-          };
+      it('should have class "completed-failed" if status "Non Compliant"', () => {
+        const expectedResult = {
+          ...availableClasses,
+          'completed-failed': true,
+        };
 
-          const result = component.getClass(testCase);
+        const result = component.getClass(StatusOfTestrun.NonCompliant);
 
-          expect(result).toEqual(expectedResult);
-        });
+        expect(result).toEqual(expectedResult);
       });
 
       it('should have class "canceled" if status "Cancelled"', () => {
@@ -318,24 +311,6 @@ describe('ProgressStatusCardComponent', () => {
       });
     });
 
-    describe('with available systemStatus$ data, as "In Progress" and finish date', () => {
-      beforeEach(() => {
-        component.systemStatus$ = of({
-          ...MOCK_PROGRESS_DATA_IN_PROGRESS,
-          finished: '2023-06-22T09:26:00.123Z',
-        });
-        fixture.detectChanges();
-      });
-
-      it('should not have progress card result', () => {
-        const progressCardResultEl = compiled.querySelector(
-          '.progress-card-result-text span'
-        );
-
-        expect(progressCardResultEl).toBeNull();
-      });
-    });
-
     describe('with available systemStatus$ data, as Waiting for Device', () => {
       beforeEach(() => {
         component.systemStatus$ = of(MOCK_PROGRESS_DATA_WAITING_FOR_DEVICE);
diff --git a/modules/ui/src/app/pages/testrun/components/progress-status-card/progress-status-card.component.ts b/modules/ui/src/app/pages/testrun/components/progress-status-card/progress-status-card.component.ts
index 14f7aec72..8105fdca6 100644
--- a/modules/ui/src/app/pages/testrun/components/progress-status-card/progress-status-card.component.ts
+++ b/modules/ui/src/app/pages/testrun/components/progress-status-card/progress-status-card.component.ts
@@ -46,9 +46,7 @@ export class ProgressStatusCardComponent {
         status === StatusOfTestrun.CompliantLimited ||
         status === StatusOfTestrun.CompliantHigh ||
         status === StatusOfTestrun.SmartReady,
-      'completed-failed':
-        status === StatusOfTestrun.NonCompliant ||
-        status === StatusOfTestrun.Error,
+      'completed-failed': status === StatusOfTestrun.NonCompliant,
       canceled:
         status === StatusOfTestrun.Cancelled ||
         status === StatusOfTestrun.Cancelling,
diff --git a/modules/ui/src/app/pages/testrun/progress.component.html b/modules/ui/src/app/pages/testrun/progress.component.html
index d832c47ef..d2a28724e 100644
--- a/modules/ui/src/app/pages/testrun/progress.component.html
+++ b/modules/ui/src/app/pages/testrun/progress.component.html
@@ -42,9 +42,15 @@ <h2 class="title progress-title">
             mat-flat-button>
             Stop
           </button>
-          <app-download-options
-            *ngIf="data.report"
-            [data]="data"></app-download-options>
+          <app-download-report-pdf *ngIf="data.report" [data]="data">
+            <button
+              tabindex="-1"
+              class="report-button"
+              aria-label="Download testrun report"
+              mat-flat-button>
+              Download Report
+            </button>
+          </app-download-report-pdf>
         </div>
       </div>
       <app-progress-status-card [systemStatus$]="systemStatus$">
diff --git a/modules/ui/src/app/pages/testrun/progress.component.spec.ts b/modules/ui/src/app/pages/testrun/progress.component.spec.ts
index 22c4fcc52..ee1362fa1 100644
--- a/modules/ui/src/app/pages/testrun/progress.component.spec.ts
+++ b/modules/ui/src/app/pages/testrun/progress.component.spec.ts
@@ -46,6 +46,7 @@ import { IResult, TestrunStatus } from '../../model/testrun-status';
 import { MatDialogModule, MatDialogRef } from '@angular/material/dialog';
 import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
 import { ProgressInitiateFormComponent } from './components/progress-initiate-form/progress-initiate-form.component';
+import { DownloadReportComponent } from '../../components/download-report/download-report.component';
 import { DeleteFormComponent } from '../../components/delete-form/delete-form.component';
 import { SpinnerComponent } from '../../components/spinner/spinner.component';
 import { LoaderService } from '../../services/loader.service';
@@ -53,6 +54,7 @@ import { FocusManagerService } from '../../services/focus-manager.service';
 import { MockStore, provideMockStore } from '@ngrx/store/testing';
 import { AppState } from '../../store/state';
 import { selectDevices, selectHasDevices } from '../../store/selectors';
+import { DownloadReportPdfComponent } from '../../components/download-report-pdf/download-report-pdf.component';
 
 describe('ProgressComponent', () => {
   let component: ProgressComponent;
@@ -91,7 +93,6 @@ describe('ProgressComponent', () => {
           ProgressComponent,
           FakeProgressStatusCardComponent,
           FakeProgressTableComponent,
-          FakeDownloadOptionsComponent,
         ],
         providers: [
           { provide: TestRunService, useValue: testRunServiceMock },
@@ -113,6 +114,7 @@ describe('ProgressComponent', () => {
           MatToolbarModule,
           MatDialogModule,
           SpinnerComponent,
+          DownloadReportPdfComponent,
         ],
       })
         .overrideComponent(ProgressComponent, {
@@ -323,7 +325,6 @@ describe('ProgressComponent', () => {
           ProgressComponent,
           FakeProgressStatusCardComponent,
           FakeProgressTableComponent,
-          FakeDownloadOptionsComponent,
         ],
         providers: [
           { provide: TestRunService, useValue: testRunServiceMock },
@@ -344,7 +345,9 @@ describe('ProgressComponent', () => {
           MatIconModule,
           MatToolbarModule,
           MatDialogModule,
+          DownloadReportComponent,
           SpinnerComponent,
+          DownloadReportPdfComponent,
         ],
       })
         .overrideComponent(ProgressComponent, {
@@ -481,10 +484,10 @@ describe('ProgressComponent', () => {
         expect(startBtn.disabled).toBeTrue();
       });
 
-      it('should not have "Download" options', () => {
-        const downloadComp = compiled.querySelector('app-download-options');
+      it('should not have "Download Report" button', () => {
+        const reportBtn = compiled.querySelector('.report-button');
 
-        expect(downloadComp).toBeNull();
+        expect(reportBtn).toBeNull();
       });
     });
 
@@ -521,10 +524,21 @@ describe('ProgressComponent', () => {
         expect(startBtn.disabled).toBeFalse();
       });
 
-      it('should have "Download" options', () => {
-        const downloadComp = compiled.querySelector('app-download-options');
+      it('should have "Download Report" button', () => {
+        const reportBtn = compiled.querySelector('.report-button');
 
-        expect(downloadComp).not.toBeNull();
+        expect(reportBtn).not.toBeNull();
+      });
+
+      it('should have report link', () => {
+        const link = compiled.querySelector(
+          '.download-report-link'
+        ) as HTMLAnchorElement;
+
+        expect(link.href).toEqual('https://api.testrun.io/report.pdf');
+        expect(link.download).toEqual(
+          'delta_03-din-cpu_1.2.2_compliant_22_jun_2023_9:20'
+        );
       });
     });
 
@@ -543,10 +557,10 @@ describe('ProgressComponent', () => {
         expect(startBtn.disabled).toBeFalse();
       });
 
-      it('should not have "Download" options', () => {
-        const downloadComp = compiled.querySelector('app-download-options');
+      it('should not have "Download Report" button', () => {
+        const reportBtn = compiled.querySelector('.report-button');
 
-        expect(downloadComp).toBeNull();
+        expect(reportBtn).toBeNull();
       });
     });
 
@@ -631,11 +645,3 @@ class FakeProgressStatusCardComponent {
 class FakeProgressTableComponent {
   @Input() dataSource$!: Observable<IResult[] | undefined>;
 }
-
-@Component({
-  selector: 'app-download-options',
-  template: '<div></div>',
-})
-class FakeDownloadOptionsComponent {
-  @Input() data!: TestrunStatus;
-}
diff --git a/modules/ui/src/app/pages/testrun/progress.module.ts b/modules/ui/src/app/pages/testrun/progress.module.ts
index f46bf6199..c61eb4a4c 100644
--- a/modules/ui/src/app/pages/testrun/progress.module.ts
+++ b/modules/ui/src/app/pages/testrun/progress.module.ts
@@ -34,7 +34,7 @@ import { DeviceTestsComponent } from '../../components/device-tests/device-tests
 import { DownloadReportComponent } from '../../components/download-report/download-report.component';
 import { SpinnerComponent } from '../../components/spinner/spinner.component';
 import { CalloutComponent } from '../../components/callout/callout.component';
-import { DownloadOptionsComponent } from './components/download-options/download-options.component';
+import { DownloadReportPdfComponent } from '../../components/download-report-pdf/download-report-pdf.component';
 
 @NgModule({
   declarations: [
@@ -59,7 +59,7 @@ import { DownloadOptionsComponent } from './components/download-options/download
     DownloadReportComponent,
     SpinnerComponent,
     CalloutComponent,
-    DownloadOptionsComponent,
+    DownloadReportPdfComponent,
   ],
 })
 export class ProgressModule {}
diff --git a/modules/ui/src/app/providers/window.provider.ts b/modules/ui/src/app/providers/window.provider.ts
deleted file mode 100644
index 3902e6eb9..000000000
--- a/modules/ui/src/app/providers/window.provider.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { FactoryProvider, InjectionToken } from '@angular/core';
-
-/**
- * Copyright 2023 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-export const WINDOW = new InjectionToken<Window>('window');
-
-export const WindowProvider: FactoryProvider = {
-  provide: WINDOW,
-  useFactory: getWindow,
-};
-
-export function getWindow(): Window {
-  return window;
-}
diff --git a/modules/ui/src/app/services/test-run.service.spec.ts b/modules/ui/src/app/services/test-run.service.spec.ts
index 2068c2b80..f6a6294cf 100644
--- a/modules/ui/src/app/services/test-run.service.spec.ts
+++ b/modules/ui/src/app/services/test-run.service.spec.ts
@@ -79,7 +79,7 @@ describe('TestRunService', () => {
       },
       {
         displayName: 'Services',
-        name: 'services',
+        name: 'nmap',
         enabled: true,
       },
       {
@@ -200,19 +200,6 @@ describe('TestRunService', () => {
     req.flush({});
   });
 
-  it('#shutdownTestrun should have necessary request data', () => {
-    const apiUrl = 'http://localhost:8000/system/shutdown';
-
-    service.shutdownTestrun().subscribe(res => {
-      expect(res).toEqual(true);
-    });
-
-    const req = httpTestingController.expectOne(apiUrl);
-    expect(req.request.method).toBe('POST');
-    expect(req.request.body).toEqual({});
-    req.flush({});
-  });
-
   describe('#startTestRun', () => {
     it('should have necessary request data', () => {
       const apiUrl = 'http://localhost:8000/system/start';
@@ -284,7 +271,7 @@ describe('TestRunService', () => {
     ];
 
     const statusesForGreyRes = [
-      StatusOfTestResult.NotPresent,
+      StatusOfTestResult.Skipped,
       StatusOfTestResult.NotStarted,
     ];
 
diff --git a/modules/ui/src/app/services/test-run.service.ts b/modules/ui/src/app/services/test-run.service.ts
index 72f578571..0ee0a03e9 100644
--- a/modules/ui/src/app/services/test-run.service.ts
+++ b/modules/ui/src/app/services/test-run.service.ts
@@ -60,7 +60,7 @@ export class TestRunService {
     },
     {
       displayName: 'Services',
-      name: 'services',
+      name: 'nmap',
       enabled: true,
     },
     {
@@ -118,15 +118,14 @@ export class TestRunService {
    * @param isCancelling - indicates if status should be overridden with Cancelling value
    */
   getSystemStatus(isCancelling?: boolean): void {
-    this.http.get<TestrunStatus>(`${API_URL}/system/status`).subscribe(
-      (res: TestrunStatus) => {
+    this.http
+      .get<TestrunStatus>(`${API_URL}/system/status`)
+      .subscribe((res: TestrunStatus) => {
         if (isCancelling && res.status !== StatusOfTestrun.Cancelled) {
           res.status = StatusOfTestrun.Cancelling;
         }
         this.setSystemStatus(res);
-      },
-      err => console.error('HTTP Error', err)
-    );
+      });
   }
 
   stopTestrun(): Observable<boolean> {
@@ -135,12 +134,6 @@ export class TestRunService {
       .pipe(map(() => true));
   }
 
-  shutdownTestrun(): Observable<boolean> {
-    return this.http
-      .post<{ success: string }>(`${API_URL}/system/shutdown`, {})
-      .pipe(map(() => true));
-  }
-
   getTestModules(): TestModule[] {
     return this.testModules;
   }
@@ -191,7 +184,7 @@ export class TestRunService {
         result === StatusOfTestResult.Info ||
         result === StatusOfTestResult.InProgress,
       grey:
-        result === StatusOfTestResult.NotPresent ||
+        result === StatusOfTestResult.Skipped ||
         result === StatusOfTestResult.NotStarted,
     };
   }
diff --git a/modules/ui/src/assets/icons/device_run.svg b/modules/ui/src/assets/icons/device_run.svg
deleted file mode 100644
index ec3693133..000000000
--- a/modules/ui/src/assets/icons/device_run.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<svg width="30" height="18" viewBox="0 0 30 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M1.75024 16.25H6.75024V17.75H2.00024C1.51707 17.75 1.10968 17.5809 0.764522 17.2357C0.419366 16.8906 0.250244 16.4832 0.250244 16V2C0.250244 1.51683 0.419365 1.10944 0.764522 0.764278C1.10968 0.419121 1.51708 0.25 2.00024 0.25H22.0002C22.4834 0.25 22.8905 0.419098 23.2357 0.764278C23.5197 1.04822 23.6845 1.37428 23.734 1.75H1.75024V16.25Z" fill="#444746"/>
-<path d="M12.6483 4.99806L13.3486 6.71504L13.3495 6.71718L11.244 12.5588L11.2463 12.5654L10.5859 14.3976L10.5836 14.3911L9.73887 16.7347H11.4283L10.8501 15.1305L11.5105 13.2983L12.8371 16.9789C13.0124 17.4653 12.6525 17.9785 12.1359 17.9785H9.03123C8.60417 17.9785 8.28413 17.6277 8.28516 17.2313C8.28538 17.1482 8.29969 17.0632 8.33005 16.9789L12.6483 4.99806Z" fill="#444746"/>
-<path d="M18.8926 4.50053C18.6028 4.50182 18.3136 4.6662 18.1958 4.99368L13.8835 16.9786C13.8746 17.0032 13.8671 17.028 13.8609 17.0527C13.7474 17.5149 14.0957 17.9757 14.5844 17.9757H14.5176C14.5393 17.9775 14.5614 17.9785 14.5837 17.9785H17.4695L16.9775 16.7343H15.2904L18.896 6.71346L22.5015 16.7343H20.8142L21.3942 15.1231L20.7347 13.2902L19.4956 16.7343H19.492L19.4052 16.9757C19.2301 17.4623 19.5896 17.9757 20.1054 17.9757L20.1369 17.9785H23.2082C23.2305 17.9785 23.2526 17.9775 23.2743 17.9757H23.2026C23.7184 17.9757 24.0779 17.4623 23.9028 16.9757L23.8149 16.7314H23.8195L19.5961 4.99368C19.4783 4.66619 19.1892 4.50181 18.8993 4.50053H18.8926Z" fill="#444746"/>
-<path d="M19.3746 16.9757C19.199 17.4623 19.5596 17.9757 20.0769 17.9757L23.033 17.9785L22.4804 16.7343H20.788L21.3697 15.1231L20.7082 13.2902L19.4653 16.7343H19.4618L19.3746 16.9757Z" fill="#444746"/>
-<path d="M28.0692 16.7343H28.0461H26.3844H25.0672L24.9794 16.9786C24.8046 17.4652 25.1636 17.9785 25.6787 17.9785H28.5312L28.5295 17.974L28.0692 16.7343Z" fill="#444746"/>
-<path d="M26.3844 16.7343L26.961 15.1296L26.3024 13.2967L25.0672 16.7343H26.3844Z" fill="#444746"/>
-<path d="M15.8512 9.98902L14.0506 4.99351C13.8137 4.3362 12.8852 4.3362 12.6483 4.99351L8.33005 16.9744C8.29913 17.0602 8.28486 17.1468 8.28516 17.2313C8.28538 17.1482 8.29969 17.0632 8.33005 16.9789L12.6483 4.99806L13.3486 6.71504L13.3495 6.71263L15.1908 11.8213L15.8512 9.98902Z" fill="#444746"/>
-<path d="M16.3977 15.1229L16.9775 16.7343L17.4695 17.9785H17.6627L17.6816 17.9757C18.1974 17.9757 18.5569 17.4623 18.3818 16.9757L18.2939 16.7314H18.2954L18.1174 16.2366L17.0572 13.2901L17.0491 13.3126L16.3977 15.1229Z" fill="#444746"/>
-<path d="M24.4684 6.71338L26.5682 12.557L26.5658 12.5635L27.2244 14.3964L27.2268 14.3899L28.0692 16.7343L28.5295 17.974H28.7312C29.1613 17.974 29.4828 17.6183 29.4772 17.2185C29.4757 17.1394 29.4614 17.0586 29.4326 16.9786L25.1356 5.07269L24.4684 6.71338Z" fill="#444746"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M25.1374 4.99351L25.1336 5.00283L25.1303 4.99368L25.125 5.00664L25.1203 4.99368C25.0015 4.66358 24.7087 4.4992 24.4166 4.50053C24.124 4.49919 23.8308 4.66352 23.7118 4.99351L21.9113 9.98917L22.5717 11.8214L22.576 11.8093L22.5813 11.8239L24.4167 6.72285L28.0236 16.7301H26.3632L26.9391 15.1296L26.2797 13.2967L26.2779 13.3015L26.2751 13.2937L26.272 13.3025L26.2699 13.2967L25.0308 16.7301H25.0067L24.9197 16.9715C24.8013 17.3 24.9271 17.6407 25.1803 17.8273C25.2737 17.8978 25.3849 17.947 25.5079 17.9664L25.5221 17.9689L25.5371 17.9711H24.1955L24.1933 17.974H25.5598C25.5656 17.9746 25.5714 17.9752 25.5772 17.9757H24.2028L24.2007 17.9785H25.6435H25.6551H28.7324H28.7532H28.7555C29.0975 17.9785 29.3708 17.7528 29.4651 17.4588C29.4669 17.4533 29.4686 17.4477 29.4702 17.4422C29.4928 17.3659 29.5034 17.2852 29.5 17.2029C29.4974 17.1275 29.4831 17.0506 29.4556 16.9744L28.6349 14.6973L25.1435 4.99368L25.1403 5.00153L25.1374 4.99351ZM28.5295 17.974H28.7312C29.1613 17.974 29.4828 17.6183 29.4772 17.2185C29.4757 17.1394 29.4614 17.0586 29.4326 16.9786L25.1356 5.07269L24.4684 6.71338L26.5682 12.557L26.5658 12.5635L27.2244 14.3964L27.2268 14.3899L28.0692 16.7343L28.5295 17.974ZM24.4327 6.74845L24.4201 6.71338L24.4167 6.72285L24.413 6.71263L24.4087 6.72449L24.4047 6.71338L22.5847 11.7564L21.9504 9.99102L23.7461 4.99368C23.8603 4.67575 24.1358 4.51102 24.4166 4.50053C24.7044 4.50492 24.99 4.66935 25.1071 4.99368L25.1179 5.02385L24.4279 6.71338L24.4367 6.73751L24.4327 6.74845Z" fill="#444746"/>
-<path d="M23.7461 4.99368L21.9504 9.99102L22.5847 11.7564L24.4047 6.71338L24.4087 6.72449L24.413 6.71263L24.4167 6.72285L24.4201 6.71338L24.4327 6.74845L24.4367 6.73751L24.4279 6.71338L25.1179 5.02385L25.1071 4.99368C24.99 4.66935 24.7044 4.50492 24.4166 4.50053C24.1358 4.51102 23.8603 4.67575 23.7461 4.99368Z" fill="#444746"/>
-</svg>
diff --git a/modules/ui/src/styles.scss b/modules/ui/src/styles.scss
index 778f7cedf..dcb47d83d 100644
--- a/modules/ui/src/styles.scss
+++ b/modules/ui/src/styles.scss
@@ -41,15 +41,6 @@ body {
   background: $dark-grey;
 }
 
-.button-start {
-  &:hover,
-  &:focus-visible {
-    .button-start-icon path {
-      fill: $white;
-    }
-  }
-}
-
 .app-sidebar-button-active .mat-icon path {
   fill: $white;
 }
@@ -107,7 +98,6 @@ mat-hint {
   .mdc-button__label {
     position: relative;
     left: -999px;
-    display: none;
   }
 }
 
@@ -115,7 +105,6 @@ mat-hint {
   .app-sidebar-button {
     .mdc-button__label {
       left: 8px;
-      display: inline;
     }
   }
 
diff --git a/modules/ui/src/theming/colors.scss b/modules/ui/src/theming/colors.scss
index a54b7e9ab..db007cf16 100644
--- a/modules/ui/src/theming/colors.scss
+++ b/modules/ui/src/theming/colors.scss
@@ -23,7 +23,6 @@ $color-background-grey: #f8f9fa;
 $dark-grey: #444746;
 $grey-700: #5f6368;
 $grey-800: #3c4043;
-$grey-900: #202124;
 $light-grey: #bdc1c6;
 $lighter-grey: #dadce0;
 $green-50: #e6f4ea;
diff --git a/testing/pylint/test_pylint b/testing/pylint/test_pylint
index 9e9074aa7..a330d54c3 100755
--- a/testing/pylint/test_pylint
+++ b/testing/pylint/test_pylint
@@ -14,14 +14,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ERROR_LIMIT=78
+ERROR_LIMIT=0
 
 sudo cmd/install
 
 source venv/bin/activate
 sudo pip3 install pylint==3.0.3
 
-files=$(find ./ -path ./venv -prune -o -name '*.py' -print)
+files=$(find ./framework -path ./venv -prune -o -name '*.py' -print)
 
 OUT=pylint.out
 
diff --git a/testing/tests/test_tests.py b/testing/tests/test_tests.py
index 895b63ec0..a14afb2cb 100644
--- a/testing/tests/test_tests.py
+++ b/testing/tests/test_tests.py
@@ -11,6 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
 """ Test assertions for CI testing of tests """
 # Temporarily disabled because using Pytest fixtures
 # TODO refactor fixtures to not trigger error
@@ -28,7 +29,6 @@
 TEST_MATRIX = 'test_tests.json'
 RESULTS_PATH = '/tmp/results/*.json'
 
-
 #TODO add reason
 @dataclass(frozen=True)
 class TestResult:
@@ -73,23 +73,19 @@ def test_tests(results, test_matrix):
     actual = set(collect_actual_results(results[tester]))
     assert expected & actual == expected
 
-
 def test_list_tests(capsys, results, test_matrix):
-  all_tests = set(
-      itertools.chain.from_iterable(
-          [collect_actual_results(results[x]) for x in results.keys()]))
-
-  ci_pass = set([
-      test for testers in test_matrix.values()
-      for test, result in testers['expected_results'].items()
-      if result == 'Compliant'
-  ])
-
-  ci_fail = set([
-      test for testers in test_matrix.values()
-      for test, result in testers['expected_results'].items()
-      if result == 'Non-Compliant'
-  ])
+  all_tests = set(itertools.chain.from_iterable(
+      [collect_actual_results(results[x]) for x in results.keys()]))
+
+  ci_pass = set([test
+    for testers in test_matrix.values()
+    for test, result in testers['expected_results'].items()
+    if result == 'Compliant'])
+
+  ci_fail = set([test
+    for testers in test_matrix.values()
+    for test, result in testers['expected_results'].items()
+    if result == 'Non-Compliant'])
 
   with capsys.disabled():
     #TODO print matching the JSON schema for easy copy/paste
@@ -105,15 +101,12 @@ def test_list_tests(capsys, results, test_matrix):
     for tester in test_matrix.keys():
       print(f'\n{tester}:')
       print('  expected results:')
-      for test in collect_expected_results(
-          test_matrix[tester]['expected_results']):
+      for test in collect_expected_results(test_matrix[tester]['expected_results']):
         print(f'    {test.name}: {test.result}')
       print('  actual results:')
       for test in collect_actual_results(results[tester]):
         if test.name in test_matrix[tester]['expected_results']:
-          print(
-              f'    {test.name}: {test.result} (exp: {test_matrix[tester]["expected_results"][test.name]})'
-          )
+          print(f'    {test.name}: {test.result} (exp: {test_matrix[tester]["expected_results"][test.name]})')
         else:
           print(f'    {test.name}: {test.result}')
 
diff --git a/testing/unit/dns/dns_module_test.py b/testing/unit/dns/dns_module_test.py
index 6c3dec74d..52ec80b4d 100644
--- a/testing/unit/dns/dns_module_test.py
+++ b/testing/unit/dns/dns_module_test.py
@@ -22,19 +22,18 @@
 
 # Define the directories
 TEST_FILES_DIR = 'testing/unit/' + MODULE
-OUTPUT_DIR = os.path.join(TEST_FILES_DIR, 'output/')
-REPORTS_DIR = os.path.join(TEST_FILES_DIR, 'reports/')
-CAPTURES_DIR = os.path.join(TEST_FILES_DIR, 'captures/')
+OUTPUT_DIR = os.path.join(TEST_FILES_DIR,'output/')
+REPORTS_DIR = os.path.join(TEST_FILES_DIR,'reports/')
+CAPTURES_DIR = os.path.join(TEST_FILES_DIR,'captures/')
 
-LOCAL_REPORT = os.path.join(REPORTS_DIR, 'dns_report_local.html')
-LOCAL_REPORT_NO_DNS = os.path.join(REPORTS_DIR, 'dns_report_local_no_dns.html')
+LOCAL_REPORT = os.path.join(REPORTS_DIR,'dns_report_local.html')
+LOCAL_REPORT_NO_DNS = os.path.join(REPORTS_DIR,'dns_report_local_no_dns.html')
 CONF_FILE = 'modules/test/' + MODULE + '/conf/module_config.json'
 
 # Define the capture files to be used for the test
-DNS_SERVER_CAPTURE_FILE = os.path.join(CAPTURES_DIR, 'dns.pcap')
-STARTUP_CAPTURE_FILE = os.path.join(CAPTURES_DIR, 'startup.pcap')
-MONITOR_CAPTURE_FILE = os.path.join(CAPTURES_DIR, 'monitor.pcap')
-
+DNS_SERVER_CAPTURE_FILE = os.path.join(CAPTURES_DIR,'dns.pcap')
+STARTUP_CAPTURE_FILE = os.path.join(CAPTURES_DIR,'startup.pcap')
+MONITOR_CAPTURE_FILE = os.path.join(CAPTURES_DIR,'monitor.pcap')
 
 class TLSModuleTest(unittest.TestCase):
   """Contains and runs all the unit tests concerning DNS behaviors"""
@@ -50,9 +49,9 @@ def dns_module_report_test(self):
                            log_dir=OUTPUT_DIR,
                            conf_file=CONF_FILE,
                            results_dir=OUTPUT_DIR,
-                           dns_server_capture_file=DNS_SERVER_CAPTURE_FILE,
-                           startup_capture_file=STARTUP_CAPTURE_FILE,
-                           monitor_capture_file=MONITOR_CAPTURE_FILE)
+                           DNS_SERVER_CAPTURE_FILE=DNS_SERVER_CAPTURE_FILE,
+                           STARTUP_CAPTURE_FILE=STARTUP_CAPTURE_FILE,
+                           MONITOR_CAPTURE_FILE=MONITOR_CAPTURE_FILE)
 
     report_out_path = dns_module.generate_module_report()
 
@@ -62,7 +61,7 @@ def dns_module_report_test(self):
       formatted_report = self.add_formatting(report_out)
 
     # Write back the new formatted_report value
-    out_report_path = os.path.join(OUTPUT_DIR, 'dns_report_with_dns.html')
+    out_report_path = os.path.join(OUTPUT_DIR,'dns_report_with_dns.html')
     with open(out_report_path, 'w', encoding='utf-8') as file:
       file.write(formatted_report)
 
@@ -106,9 +105,9 @@ def dns_module_report_no_dns_test(self):
                            log_dir=OUTPUT_DIR,
                            conf_file=CONF_FILE,
                            results_dir=OUTPUT_DIR,
-                           dns_server_capture_file=dns_server_cap_file,
-                           startup_capture_file=startup_cap_file,
-                           monitor_capture_file=monitor_cap_file)
+                           DNS_SERVER_CAPTURE_FILE=dns_server_cap_file,
+                           STARTUP_CAPTURE_FILE=startup_cap_file,
+                           MONITOR_CAPTURE_FILE=monitor_cap_file)
 
     report_out_path = dns_module.generate_module_report()
 
@@ -118,7 +117,7 @@ def dns_module_report_no_dns_test(self):
       formatted_report = self.add_formatting(report_out)
 
     # Write back the new formatted_report value
-    out_report_path = os.path.join(OUTPUT_DIR, 'dns_report_no_dns.html')
+    out_report_path = os.path.join(OUTPUT_DIR,'dns_report_no_dns.html')
     with open(out_report_path, 'w', encoding='utf-8') as file:
       file.write(formatted_report)
 
@@ -128,7 +127,8 @@ def dns_module_report_no_dns_test(self):
 
     self.assertEqual(report_out, report_local)
 
-  def add_formatting(self, body):
+
+  def add_formatting(self,body):
     return f'''
     <!DOCTYPE html>
     <html lang="en">
@@ -138,7 +138,6 @@ def add_formatting(self, body):
     </body>
     </html'''
 
-
 if __name__ == '__main__':
   suite = unittest.TestSuite()
   # Module report test
diff --git a/testing/unit/nmap/nmap_module_test.py b/testing/unit/nmap/nmap_module_test.py
index a175d60d0..73fff3a54 100644
--- a/testing/unit/nmap/nmap_module_test.py
+++ b/testing/unit/nmap/nmap_module_test.py
@@ -22,13 +22,12 @@
 
 # Define the file paths
 TEST_FILES_DIR = 'testing/unit/' + MODULE
-OUTPUT_DIR = os.path.join(TEST_FILES_DIR, 'output/')
-REPORTS_DIR = os.path.join(TEST_FILES_DIR, 'reports/')
-RESULTS_DIR = os.path.join(TEST_FILES_DIR, 'results/')
+OUTPUT_DIR = os.path.join(TEST_FILES_DIR,'output/')
+REPORTS_DIR = os.path.join(TEST_FILES_DIR,'reports/')
+RESULTS_DIR = os.path.join(TEST_FILES_DIR,'results/')
 
-LOCAL_REPORT = os.path.join(REPORTS_DIR, 'nmap_report_local.html')
-LOCAL_REPORT_ALL_CLOSED = os.path.join(REPORTS_DIR,
-                                       'nmap_report_all_closed_local.html')
+LOCAL_REPORT = os.path.join(REPORTS_DIR,'nmap_report_local.html')
+LOCAL_REPORT_ALL_CLOSED = os.path.join(REPORTS_DIR,'nmap_report_all_closed_local.html')
 CONF_FILE = 'modules/test/' + MODULE + '/conf/module_config.json'
 
 
@@ -43,9 +42,8 @@ def setUpClass(cls):
   # Test the module report generation
   def nmap_module_ports_open_report_test(self):
     # Move test scan into expected folder
-    src_scan_results_path = os.path.join(RESULTS_DIR,
-                                         'ports_open_scan_result.json')
-    dst_scan_results_path = os.path.join(OUTPUT_DIR, 'nmap_scan_results.json')
+    src_scan_results_path = os.path.join(RESULTS_DIR,'ports_open_scan_result.json')
+    dst_scan_results_path = os.path.join(OUTPUT_DIR,'nmap_scan_results.json')
     shutil.copy(src_scan_results_path, dst_scan_results_path)
 
     nmap_module = NmapModule(module=MODULE,
@@ -63,7 +61,7 @@ def nmap_module_ports_open_report_test(self):
       formatted_report = self.add_formatting(report_out)
 
     # Write back the new formatted_report value
-    out_report_path = os.path.join(OUTPUT_DIR, 'nmap_report_ports_open.html')
+    out_report_path = os.path.join(OUTPUT_DIR,'nmap_report_ports_open.html')
     with open(out_report_path, 'w', encoding='utf-8') as file:
       file.write(formatted_report)
 
@@ -75,9 +73,8 @@ def nmap_module_ports_open_report_test(self):
 
     # Test the module report generation with all ports closed
   def nmap_module_report_all_closed_test(self):
-    src_scan_results_path = os.path.join(RESULTS_DIR,
-                                         'all_closed_scan_result.json')
-    dst_scan_results_path = os.path.join(OUTPUT_DIR, 'nmap_scan_results.json')
+    src_scan_results_path = os.path.join(RESULTS_DIR,'all_closed_scan_result.json')
+    dst_scan_results_path = os.path.join(OUTPUT_DIR,'nmap_scan_results.json')
     shutil.copy(src_scan_results_path, dst_scan_results_path)
 
     nmap_module = NmapModule(module=MODULE,
@@ -95,7 +92,7 @@ def nmap_module_report_all_closed_test(self):
       formatted_report = self.add_formatting(report_out)
 
     # Write back the new formatted_report value
-    out_report_path = os.path.join(OUTPUT_DIR, 'nmap_report_all_closed.html')
+    out_report_path = os.path.join(OUTPUT_DIR,'nmap_report_all_closed.html')
     with open(out_report_path, 'w', encoding='utf-8') as file:
       file.write(formatted_report)
 
@@ -105,7 +102,7 @@ def nmap_module_report_all_closed_test(self):
 
     self.assertEqual(report_out, report_local)
 
-  def add_formatting(self, body):
+  def add_formatting(self,body):
     return f'''
     <!DOCTYPE html>
     <html lang="en">
diff --git a/testing/unit/report/report.json b/testing/unit/report/report.json
new file mode 100644
index 000000000..0c947bdc4
--- /dev/null
+++ b/testing/unit/report/report.json
@@ -0,0 +1,526 @@
+{
+  "device": {
+    "mac_addr": "38:d1:35:01:17:fe",
+    "manufacturer": "EasyIO",
+    "model": "FS-32",
+    "test_modules": {
+      "connection": {
+        "enabled": false,
+        "tests": {
+          "connection.dhcp_address": {
+            "enabled": true
+          },
+          "connection.mac_address": {
+            "enabled": true
+          },
+          "connection.mac_oui": {
+            "enabled": true
+          },
+          "connection.private_address": {
+            "enabled": true
+          },
+          "connection.shared_address": {
+            "enabled": true
+          },
+          "connection.single_ip": {
+            "enabled": true
+          },
+          "connection.target_ping": {
+            "enabled": true
+          },
+          "connection.ipaddr.ip_change": {
+            "enabled": true
+          },
+          "connection.ipaddr.dhcp_failover": {
+            "enabled": true
+          },
+          "connection.ipv6_slaac": {
+            "enabled": true
+          },
+          "connection.ipv6_ping": {
+            "enabled": true
+          }
+        }
+      },
+      "nmap": {
+        "enabled": true
+      },
+      "baseline": {
+        "enabled": true
+      },
+      "dns": {
+        "enabled": true
+      },
+      "ntp": {
+        "enabled": true
+      },
+      "protocol": {
+        "enabled": true
+      },
+      "tls": {
+        "enabled": true
+      }
+    }
+  },
+  "status": "Non-Compliant",
+  "started": "2024-01-23 14:35:17",
+  "finished": "2024-01-23 14:39:20",
+  "tests": {
+    "total": 17,
+    "results": [
+      {
+        "name": "security.tls.v1_2_server",
+        "test_description": "Check the device web server TLS 1.2 & certificate is valid",
+        "expected_behavior": "TLS 1.2 certificate is issued to the web browser client when accessed",
+        "required_result": "Required",
+        "start": "2024-01-23T14:36:14.517381",
+        "result": "Compliant",
+        "description": "TLS 1.2 validated: Certificate has a valid time range\nRSA key length passed: 2048 >= 2048\nDevice signed by cert:BIOT_CA_Root.pem. \nTLS 1.3 validated: Certificate has a valid time range\nRSA key length passed: 2048 >= 2048\nDevice signed by cert:BIOT_CA_Root.pem. ",
+        "end": "2024-01-23T14:36:14.824597",
+        "duration": "0:00:00.307216"
+      },
+      {
+        "name": "security.tls.v1_2_client",
+        "test_description": "Device uses TLS with connection to an external service on port 443 (or any other port which could be running the webserver-HTTPS)",
+        "expected_behavior": "The packet indicates a TLS connection with at least TLS 1.2 and support for ECDH and ECDSA ciphers",
+        "required_result": "Required",
+        "start": "2024-01-23T14:36:14.824649",
+        "result": "Compliant",
+        "description": "Completed handshake detected from server: 173.194.195.206\n",
+        "end": "2024-01-23T14:36:17.035258",
+        "duration": "0:00:02.210609"
+      },
+      {
+        "name": "dns.network.hostname_resolution",
+        "test_description": "Verify the device sends DNS requests",
+        "expected_behavior": "The device sends DNS requests.",
+        "required_result": "Required",
+        "start": "2024-01-23T14:36:22.978454",
+        "result": "Compliant",
+        "description": "DNS traffic detected from device",
+        "end": "2024-01-23T14:36:23.017788",
+        "duration": "0:00:00.039334"
+      },
+      {
+        "name": "dns.network.from_dhcp",
+        "test_description": "Verify the device allows for a DNS server to be entered automatically",
+        "expected_behavior": "The device sends DNS requests to the DNS server provided by the DHCP server",
+        "required_result": "Roadmap",
+        "start": "2024-01-23T14:36:23.017821",
+        "result": "Compliant",
+        "description": "DNS traffic detected only to DHCP provided server",
+        "end": "2024-01-23T14:36:23.089265",
+        "duration": "0:00:00.071444"
+      },
+      {
+        "name": "security.services.ftp",
+        "test_description": "Check FTP port 20/21 is disabled and FTP is not running on any port",
+        "expected_behavior": "There is no FTP service running on any port",
+        "required_result": "Required",
+        "config": {
+          "services": [
+            "ftp",
+            "ftp-data"
+          ],
+          "ports": [
+            {
+              "number": 20,
+              "type": "tcp"
+            },
+            {
+              "number": 20,
+              "type": "udp"
+            },
+            {
+              "number": 21,
+              "type": "tcp"
+            },
+            {
+              "number": 21,
+              "type": "udp"
+            }
+          ]
+        },
+        "start": "2024-01-23T14:39:11.952531",
+        "result": "Compliant",
+        "description": "No FTP server found",
+        "end": "2024-01-23T14:39:11.955139",
+        "duration": "0:00:00.002608"
+      },
+      {
+        "name": "security.ssh.version",
+        "test_description": "If the device is running a SSH server ensure it is SSHv2",
+        "expected_behavior": "SSH server is not running or server is SSHv2",
+        "required_result": "Required",
+        "config": {
+          "services": [
+            "ssh"
+          ],
+          "ports": [
+            {
+              "number": 22,
+              "type": "tcp"
+            }
+          ],
+          "version": "protocol 2.0"
+        },
+        "start": "2024-01-23T14:39:11.955233",
+        "result": "Compliant",
+        "description": "SSH server found running 8.8 protocol 2.0",
+        "end": "2024-01-23T14:39:11.955797",
+        "duration": "0:00:00.000564"
+      },
+      {
+        "name": "security.services.telnet",
+        "test_description": "Check TELNET port 23 is disabled and TELNET is not running on any port",
+        "expected_behavior": "There is no FTP service running on any port",
+        "required_result": "Required",
+        "config": {
+          "services": [
+            "telnet"
+          ],
+          "ports": [
+            {
+              "number": 23,
+              "type": "tcp"
+            },
+            {
+              "number": 23,
+              "type": "udp"
+            }
+          ]
+        },
+        "start": "2024-01-23T14:39:11.955850",
+        "result": "Compliant",
+        "description": "No telnet server found",
+        "end": "2024-01-23T14:39:11.956427",
+        "duration": "0:00:00.000577"
+      },
+      {
+        "name": "security.services.smtp",
+        "test_description": "Check SMTP ports 25, 465 and 587 are not enabled and SMTP is not running on any port.",
+        "expected_behavior": "There is no smtp service running on any port",
+        "required_result": "Required",
+        "config": {
+          "services": [
+            "smtp"
+          ],
+          "ports": [
+            {
+              "number": 25,
+              "type": "tcp"
+            },
+            {
+              "number": 465,
+              "type": "tcp"
+            },
+            {
+              "number": 587,
+              "type": "tcp"
+            }
+          ]
+        },
+        "start": "2024-01-23T14:39:11.956474",
+        "result": "Compliant",
+        "description": "No SMTP server found",
+        "end": "2024-01-23T14:39:11.957414",
+        "duration": "0:00:00.000940"
+      },
+      {
+        "name": "security.services.http",
+        "test_description": "Check that there is no HTTP server running on any port",
+        "expected_behavior": "Device is unreachable on port 80 (or any other port) and only responds to HTTPS requests on port 443 (or any other port if HTTP is used at all)",
+        "required_result": "Required",
+        "config": {
+          "services": [
+            "http"
+          ],
+          "ports": [
+            {
+              "number": 80,
+              "type": "tcp"
+            },
+            {
+              "number": 80,
+              "type": "udp"
+            },
+            {
+              "number": 443,
+              "type": "tcp",
+              "allowed": true
+            },
+            {
+              "number": 443,
+              "type": "udp",
+              "allowed": true
+            }
+          ]
+        },
+        "start": "2024-01-23T14:39:11.957432",
+        "result": "Compliant",
+        "description": "No HTTP server found",
+        "end": "2024-01-23T14:39:11.958301",
+        "duration": "0:00:00.000869"
+      },
+      {
+        "name": "security.services.pop",
+        "test_description": "Check POP ports 109 and 110 are disabled and POP is not running on any port",
+        "expected_behavior": "There is no pop service running on any port",
+        "required_result": "Required",
+        "config": {
+          "services": [
+            "pop2",
+            "pop3",
+            "pop3s"
+          ],
+          "ports": [
+            {
+              "number": 109,
+              "type": "tcp"
+            },
+            {
+              "number": 109,
+              "type": "udp"
+            },
+            {
+              "number": 110,
+              "type": "tcp"
+            },
+            {
+              "number": 110,
+              "type": "udp"
+            },
+            {
+              "number": 995,
+              "type": "tcp"
+            },
+            {
+              "number": 995,
+              "type": "udp"
+            }
+          ]
+        },
+        "start": "2024-01-23T14:39:11.958319",
+        "result": "Compliant",
+        "description": "No POP server found",
+        "end": "2024-01-23T14:39:11.958837",
+        "duration": "0:00:00.000518"
+      },
+      {
+        "name": "security.services.imap",
+        "test_description": "Check IMAP port 143 is disabled and IMAP is not running on any port",
+        "expected_behavior": "There is no imap service running on any port",
+        "required_result": "Required",
+        "config": {
+          "services": [
+            "imap",
+            "imap3",
+            "imap4-ssl"
+          ],
+          "ports": [
+            {
+              "number": 143,
+              "type": "tcp"
+            },
+            {
+              "number": 143,
+              "type": "udp"
+            },
+            {
+              "number": 220,
+              "type": "tcp"
+            },
+            {
+              "number": 220,
+              "type": "udp"
+            },
+            {
+              "number": 585,
+              "type": "tcp"
+            },
+            {
+              "number": 585,
+              "type": "udp"
+            },
+            {
+              "number": 993,
+              "type": "tcp"
+            },
+            {
+              "number": 993,
+              "type": "udp"
+            }
+          ]
+        },
+        "start": "2024-01-23T14:39:11.958855",
+        "result": "Compliant",
+        "description": "No IMAP server found",
+        "end": "2024-01-23T14:39:11.959440",
+        "duration": "0:00:00.000585"
+      },
+      {
+        "name": "security.services.snmpv3",
+        "test_description": "Check SNMP port 161/162 is disabled.  If SNMP is an essential service, check it supports version 3",
+        "expected_behavior": "Device is unreachable on port 161 (or any other port) and device is unreachable on port 162 (or any other port) unless SNMP is essential in which case it is SNMPv3 is used.",
+        "required_result": "Required",
+        "config": {
+          "services": [
+            "snmp"
+          ],
+          "ports": [
+            {
+              "number": 161,
+              "type": "tcp"
+            },
+            {
+              "number": 161,
+              "type": "udp"
+            }
+          ]
+        },
+        "start": "2024-01-23T14:39:11.959458",
+        "result": "Compliant",
+        "description": "No SNMP server found",
+        "end": "2024-01-23T14:39:11.960023",
+        "duration": "0:00:00.000565"
+      },
+      {
+        "name": "security.services.vnc",
+        "test_description": "Check VNC is disabled on any port",
+        "expected_behavior": "Device cannot be accessed /connected to via VNC on any port",
+        "required_result": "Required",
+        "config": {
+          "services": [
+            "vnc",
+            "vnc-1",
+            "vnc-2",
+            "vnc-3",
+            "vnc-http",
+            "vnc-http-1",
+            "vnc-http-2",
+            "vnc-http-3"
+          ],
+          "ports": [
+            {
+              "number": 5800,
+              "type": "tcp"
+            },
+            {
+              "number": 5801,
+              "type": "tcp"
+            },
+            {
+              "number": 5802,
+              "type": "tcp"
+            },
+            {
+              "number": 5803,
+              "type": "tcp"
+            },
+            {
+              "number": 5900,
+              "type": "tcp"
+            },
+            {
+              "number": 5901,
+              "type": "tcp"
+            },
+            {
+              "number": 5902,
+              "type": "tcp"
+            },
+            {
+              "number": 5903,
+              "type": "tcp"
+            }
+          ]
+        },
+        "start": "2024-01-23T14:39:11.960041",
+        "result": "Compliant",
+        "description": "No VNC server found",
+        "end": "2024-01-23T14:39:11.960568",
+        "duration": "0:00:00.000527"
+      },
+      {
+        "name": "security.services.tftp",
+        "test_description": "Check TFTP port 69 is disabled (UDP)",
+        "expected_behavior": "There is no tftp service running on any port",
+        "required_result": "Required",
+        "config": {
+          "services": [
+            "tftp",
+            "tftps"
+          ],
+          "ports": [
+            {
+              "number": 69,
+              "type": "tcp"
+            },
+            {
+              "number": 69,
+              "type": "udp"
+            },
+            {
+              "number": 3713,
+              "type": "tcp"
+            },
+            {
+              "number": 3713,
+              "type": "udp"
+            }
+          ]
+        },
+        "start": "2024-01-23T14:39:11.960607",
+        "result": "Compliant",
+        "description": "No TFTP server found",
+        "end": "2024-01-23T14:39:11.961168",
+        "duration": "0:00:00.000561"
+      },
+      {
+        "name": "ntp.network.ntp_server",
+        "test_description": "Check NTP port 123 is disabled and the device is not operating as an NTP server",
+        "expected_behavior": "The device dos not respond to NTP requests when it's IP is set as the NTP server on another device",
+        "required_result": "Required",
+        "config": {
+          "services": [
+            "ntp"
+          ],
+          "ports": [
+            {
+              "number": 123,
+              "type": "udp"
+            }
+          ]
+        },
+        "start": "2024-01-23T14:39:11.961185",
+        "result": "Compliant",
+        "description": "No NTP server found",
+        "end": "2024-01-23T14:39:11.961523",
+        "duration": "0:00:00.000338"
+      },
+      {
+        "name": "ntp.network.ntp_support",
+        "test_description": "Does the device request network time sync as client as per RFC 5905 - Network Time Protocol Version 4: Protocol and Algorithms Specification",
+        "expected_behavior": "The device sends an NTPv4 request to the configured NTP server.",
+        "required_result": "Required",
+        "start": "2024-01-23T14:39:17.837341",
+        "result": "Non-Compliant",
+        "description": "Device has not sent any NTP requests",
+        "end": "2024-01-23T14:39:18.695602",
+        "duration": "0:00:00.858261"
+      },
+      {
+        "name": "ntp.network.ntp_dhcp",
+        "test_description": "Accept NTP address over DHCP",
+        "expected_behavior": "Device can accept NTP server address, provided by the DHCP server (DHCP OFFER PACKET)",
+        "required_result": "Roadmap",
+        "start": "2024-01-23T14:39:18.695663",
+        "result": "Non-Compliant",
+        "description": "Device has not sent any NTP requests",
+        "end": "2024-01-23T14:39:19.543005",
+        "duration": "0:00:00.847342"
+      }
+    ]
+  },
+  "report": "http://localhost:8000/report/EasyIO_FS32/2024-01-23T14:35:17"
+}
\ No newline at end of file
diff --git a/testing/unit/report/report_compliant.json b/testing/unit/report/report_compliant.json
deleted file mode 100644
index 17e994d20..000000000
--- a/testing/unit/report/report_compliant.json
+++ /dev/null
@@ -1,268 +0,0 @@
-{
-  "device": {
-    "mac_addr": "aa:bb:cc:dd:ee:ff",
-    "manufacturer": "Testrun",
-    "model": "Faux",
-    "firmware": "1.0.0",
-    "test_modules": {
-      "connection": {
-        "enabled": true
-      },
-      "ntp": {
-        "enabled": true
-      },
-      "dns": {
-        "enabled": true
-      },
-      "services": {
-        "enabled": true
-      },
-      "tls": {
-        "enabled": true
-      },
-      "protocol": {
-        "enabled": true
-      }
-    }
-  },
-  "status": "Compliant",
-  "started": "2024-04-10 21:21:47",
-  "finished": "2024-04-10 21:35:43",
-  "tests": {
-    "total": 33,
-    "results": [
-      {
-        "name": "protocol.valid_bacnet",
-        "description": "Device IP matches discovered device",
-        "expected_behavior": "BACnet traffic can be seen on the network and packets are valid and not malformed",
-        "required_result": "Recommended",
-        "result": "Compliant"
-      },
-      {
-        "name": "protocol.bacnet.version",
-        "description": "BACnet protocol version detected: 1.15",
-        "expected_behavior": "The BACnet client implements an up to date version of BACnet",
-        "required_result": "Recommended",
-        "result": "Compliant"
-      },
-      {
-        "name": "protocol.valid_modbus",
-        "description": "Established connection to modbus port: 502\nHolding registers succesfully read: 0:5\nInput registers succesfully read: 0:5\nCoil registers succesfully read: 0:1\nDiscrete inputs succesfully read: 0:1",
-        "expected_behavior": "Any Modbus functionality works as expected and valid Modbus traffic can be observed",
-        "required_result": "Recommended",
-        "result": "Compliant"
-      },
-      {
-        "name": "security.tls.v1_2_server",
-        "description": "TLS 1.2 validated: Certificate has a valid time range\nRSA key length passed: 2048 >= 2048\nDevice signed by cert:/testrun/root_certs/myrootca4132.pem\nTLS 1.3 validated: Certificate has a valid time range\nRSA key length passed: 2048 >= 2048\nDevice signed by cert:/testrun/root_certs/myrootca4132.pem",
-        "expected_behavior": "TLS 1.2 certificate is issued to the web browser client when accessed",
-        "required_result": "Required",
-        "result": "Compliant"
-      },
-      {
-        "name": "security.tls.v1_2_client",
-        "description": "TLS 1.2 client connections valid",
-        "expected_behavior": "The packet indicates a TLS connection with at least TLS 1.2 and support for ECDH and ECDSA ciphers",
-        "required_result": "Required",
-        "result": "Compliant"
-      },
-      {
-        "name": "connection.switch.arp_inspection",
-        "description": "Device uses ARP",
-        "expected_behavior": "Device continues to operate correctly when ARP inspection is enabled on the switch.  No functionality is lost with ARP inspection enabled.",
-        "required_result": "Required",
-        "result": "Compliant"
-      },
-      {
-        "name": "connection.switch.dhcp_snooping",
-        "description": "Device does not act as a DHCP server",
-        "expected_behavior": "Device continues to operate correctly when DHCP snooping is enabled on the switch.",
-        "required_result": "Required",
-        "result": "Compliant"
-      },
-      {
-        "name": "connection.dhcp_address",
-        "description": "Device responded to leased ip address",
-        "expected_behavior": "The device is not setup with a static IP address.  The device accepts an IP address from a DHCP server (RFC 2131) and responds succesfully to an ICMP echo (ping) request.",
-        "required_result": "Required",
-        "result": "Compliant"
-      },
-      {
-        "name": "connection.mac_address",
-        "description": "MAC address found: aa:bb:cc:dd:ee:ff",
-        "expected_behavior": "N/A",
-        "required_result": "Required",
-        "result": "Compliant"
-      },
-      {
-        "name": "connection.mac_oui",
-        "description": "OUI Manufacturer found: Texas Instruments",
-        "expected_behavior": "The MAC address prefix is registered in the IEEE Organizationally Unique Identifier database.",
-        "required_result": "Required",
-        "result": "Compliant"
-      },
-      {
-        "name": "connection.private_address",
-        "description": "All subnets are supported",
-        "expected_behavior": "The device under test accepts IP addresses within all ranges specified in RFC 1918 and communicates using these addresses.  The Internet Assigned Numbers Authority (IANA) has reserved the following three blocks of the IP address space for private internets.  10.0.0.0 - 10.255.255.255.255 (10/8 prefix). 172.16.0.0 - 172.31.255.255 (172.16/12 prefix).  192.168.0.0 - 192.168.255.255 (192.168/16 prefix)",
-        "required_result": "Required",
-        "result": "Compliant"
-      },
-      {
-        "name": "connection.shared_address",
-        "description": "All subnets are supported",
-        "expected_behavior": "The device under test accepts IP addresses within the ranges specified in RFC 6598 and communicates using these addresses",
-        "required_result": "Required",
-        "result": "Compliant"
-      },
-      {
-        "name": "connection.single_ip",
-        "description": "Device is using a single IP address",
-        "expected_behavior": "The device under test does not behave as a network switch and only requets one IP address.  This test is to avoid that devices implement network switches that allow connecting strings of daisy chained devices to one single network port, as this would not make 802.1x port based authentication possible.",
-        "required_result": "Required",
-        "result": "Compliant"
-      },
-      {
-        "name": "connection.target_ping",
-        "description": "Device responds to ping",
-        "expected_behavior": "The device under test responds to an ICMP echo (ping) request.",
-        "required_result": "Required",
-        "result": "Compliant"
-      },
-      {
-        "name": "connection.ipaddr.ip_change",
-        "description": "Device has accepted an IP address change",
-        "expected_behavior": "If the lease expires before the client receiveds a DHCPACK, the client moves to INIT state, MUST immediately stop any other network processing and requires network initialization parameters as if the client were uninitialized.  If the client then receives a DHCPACK allocating the client its previous network addres, the client SHOULD continue network processing.  If the client is given a new network address, it MUST NOT continue using the previous network address and SHOULD notify the local users of the problem.",
-        "required_result": "Required",
-        "result": "Compliant"
-      },
-      {
-        "name": "connection.ipaddr.dhcp_failover",
-        "description": "Secondary DHCP server lease confirmed active in device",
-        "expected_behavior": "",
-        "required_result": "Required",
-        "result": "Compliant"
-      },
-      {
-        "name": "connection.ipv6_slaac",
-        "description": "Device has formed SLAAC address fd10:77be:4186:0:1a62:e4ff:fed7:430a",
-        "expected_behavior": "The device under test complies with RFC4862 and forms a valid IPv6 SLAAC address",
-        "required_result": "Required",
-        "result": "Compliant"
-      },
-      {
-        "name": "connection.ipv6_ping",
-        "description": "Device responds to IPv6 ping on fd10:77be:4186:0:1a62:e4ff:fed7:430a",
-        "expected_behavior": "The device responds to the ping as per RFC4443",
-        "required_result": "Required",
-        "result": "Compliant"
-      },
-      {
-        "name": "dns.network.hostname_resolution",
-        "description": "DNS traffic detected from device",
-        "expected_behavior": "The device sends DNS requests.",
-        "required_result": "Required",
-        "result": "Compliant"
-      },
-      {
-        "name": "dns.network.from_dhcp",
-        "description": "DNS traffic detected only to DHCP provided server",
-        "expected_behavior": "The device sends DNS requests to the DNS server provided by the DHCP server",
-        "required_result": "Roadmap",
-        "result": "Compliant"
-      },
-      {
-        "name": "security.services.ftp",
-        "description": "No FTP server found",
-        "expected_behavior": "There is no FTP service running on any port",
-        "required_result": "Required",
-        "result": "Compliant"
-      },
-      {
-        "name": "security.ssh.version",
-        "description": "No SSH server found",
-        "expected_behavior": "SSH server is not running or server is SSHv2",
-        "required_result": "Required",
-        "result": "Compliant"
-      },
-      {
-        "name": "security.services.telnet",
-        "description": "No telnet server found",
-        "expected_behavior": "There is no Telnet service running on any port",
-        "required_result": "Required",
-        "result": "Compliant"
-      },
-      {
-        "name": "security.services.smtp",
-        "description": "No SMTP server found",
-        "expected_behavior": "There is no SMTP service running on any port",
-        "required_result": "Required",
-        "result": "Compliant"
-      },
-      {
-        "name": "security.services.http",
-        "description": "No HTTP server found",
-        "expected_behavior": "Device is unreachable on port 80 (or any other port) and only responds to HTTPS requests on port 443 (or any other port if HTTP is used at all)",
-        "required_result": "Required",
-        "result": "Compliant"
-      },
-      {
-        "name": "security.services.pop",
-        "description": "No POP server found",
-        "expected_behavior": "There is no POP service running on any port",
-        "required_result": "Required",
-        "result": "Compliant"
-      },
-      {
-        "name": "security.services.imap",
-        "description": "No IMAP server found",
-        "expected_behavior": "There is no IMAP service running on any port",
-        "required_result": "Required",
-        "result": "Compliant"
-      },
-      {
-        "name": "security.services.snmpv3",
-        "description": "No SNMP server found",
-        "expected_behavior": "Device is unreachable on port 161 (or any other port) and device is unreachable on port 162 (or any other port) unless SNMP is essential in which case it is SNMPv3 is used.",
-        "required_result": "Required",
-        "result": "Compliant"
-      },
-      {
-        "name": "security.services.vnc",
-        "description": "No VNC server found",
-        "expected_behavior": "Device cannot be accessed / connected to via VNC on any port",
-        "required_result": "Required",
-        "result": "Compliant"
-      },
-      {
-        "name": "security.services.tftp",
-        "description": "No TFTP server found",
-        "expected_behavior": "There is no TFTP service running on any port",
-        "required_result": "Required",
-        "result": "Compliant"
-      },
-      {
-        "name": "ntp.network.ntp_server",
-        "description": "No NTP server found",
-        "expected_behavior": "The device does not respond to NTP requests when it's IP is set as the NTP server on another device",
-        "required_result": "Required",
-        "result": "Compliant"
-      },
-      {
-        "name": "ntp.network.ntp_support",
-        "description": "Device sent NTPv4 packets.",
-        "expected_behavior": "The device sends an NTPv4 request to the configured NTP server.",
-        "required_result": "Required",
-        "result": "Compliant"
-      },
-      {
-        "name": "ntp.network.ntp_dhcp",
-        "description": "Device sent NTP request to non-DHCP provided server",
-        "expected_behavior": "Device can accept NTP server address, provided by the DHCP server (DHCP OFFER PACKET)",
-        "required_result": "Roadmap",
-        "result": "Non-Compliant"
-      }
-    ]
-  },
-  "report": "http://localhost:8000/report/Testrun Faux/2024-04-10T21:21:47"
-}
\ No newline at end of file
diff --git a/testing/unit/report/report_noncompliant.json b/testing/unit/report/report_noncompliant.json
deleted file mode 100644
index 98fbeb284..000000000
--- a/testing/unit/report/report_noncompliant.json
+++ /dev/null
@@ -1,316 +0,0 @@
-{
-  "device": {
-    "mac_addr": "aa:bb:cc:dd:ee:ff",
-    "manufacturer": "Testrun",
-    "model": "Faux",
-    "firmware": "1.0.0",
-    "test_modules": {
-      "connection": {
-        "enabled": true
-      },
-      "ntp": {
-        "enabled": true
-      },
-      "dns": {
-        "enabled": true
-      },
-      "services": {
-        "enabled": true
-      },
-      "tls": {
-        "enabled": true
-      },
-      "protocol": {
-        "enabled": true
-      }
-    }
-  },
-  "status": "Non-Compliant",
-  "started": "2024-04-10 21:21:47",
-  "finished": "2024-04-10 21:35:43",
-  "tests": {
-    "total": 33,
-    "results": [
-      {
-        "name": "protocol.valid_bacnet",
-        "description": "Device IP matches discovered device",
-        "expected_behavior": "BACnet traffic can be seen on the network and packets are valid and not malformed",
-        "required_result": "Recommended",
-        "result": "Compliant"
-      },
-      {
-        "name": "protocol.bacnet.version",
-        "description": "BACnet protocol version detected: 1.15",
-        "expected_behavior": "The BACnet client implements an up to date version of BACnet",
-        "required_result": "Recommended",
-        "result": "Compliant"
-      },
-      {
-        "name": "protocol.valid_modbus",
-        "description": "Established connection to modbus port: 502\nHolding registers succesfully read: 0:5\nInput registers succesfully read: 0:5\nCoil registers succesfully read: 0:1\nDiscrete inputs succesfully read: 0:1",
-        "expected_behavior": "Any Modbus functionality works as expected and valid Modbus traffic can be observed",
-        "required_result": "Recommended",
-        "result": "Compliant"
-      },
-      {
-        "name": "security.tls.v1_2_server",
-        "description": "TLS 1.2 certificate could not be validated",
-        "expected_behavior": "TLS 1.2 certificate is issued to the web browser client when accessed",
-        "required_result": "Required",
-        "result": "Non-Compliant",
-        "recommendations": [
-          "Enable TLS 1.2 support in the web server configuration",
-          "Disable TLS 1.0 and 1.1",
-          "Sign the certificate used by the web server"
-        ]
-      },
-      {
-        "name": "security.tls.v1_2_client",
-        "description": "TLS 1.2 client connections invalid",
-        "expected_behavior": "The packet indicates a TLS connection with at least TLS 1.2 and support for ECDH and ECDSA ciphers",
-        "required_result": "Required",
-        "result": "Non-Compliant",
-        "recommendations": [
-          "Disable connections to unsecure services",
-          "Ensure any URLs connected to are secure (https)"
-        ]
-      },
-      {
-        "name": "connection.switch.arp_inspection",
-        "description": "Device uses ARP",
-        "expected_behavior": "Device continues to operate correctly when ARP inspection is enabled on the switch.  No functionality is lost with ARP inspection enabled.",
-        "required_result": "Required",
-        "result": "Compliant"
-      },
-      {
-        "name": "connection.switch.dhcp_snooping",
-        "description": "Device does not act as a DHCP server",
-        "expected_behavior": "Device continues to operate correctly when DHCP snooping is enabled on the switch.",
-        "required_result": "Required",
-        "result": "Compliant"
-      },
-      {
-        "name": "connection.dhcp_address",
-        "description": "No DHCP lease could be found",
-        "expected_behavior": "The device is not setup with a static IP address.  The device accepts an IP address from a DHCP server (RFC 2131) and responds succesfully to an ICMP echo (ping) request.",
-        "required_result": "Required",
-        "result": "Non-Compliant",
-        "recommendations": [
-          "Enable DHCP",
-          "Install a DHCP client"
-        ]
-      },
-      {
-        "name": "connection.mac_address",
-        "description": "No MAC address found",
-        "expected_behavior": "N/A",
-        "required_result": "Required",
-        "result": "Non-Compliant",
-        "recommendations": [
-          "Ensure that the MAC address is set by hardware only"
-        ]
-      },
-      {
-        "name": "connection.mac_oui",
-        "description": "OUI Manufacturer found: Texas Instruments",
-        "expected_behavior": "The MAC address prefix is registered in the IEEE Organizationally Unique Identifier database.",
-        "required_result": "Required",
-        "result": "Compliant",
-        "recommendations": [
-          "No OUI Manufacturer found for aa:bb:cc:dd:ee:ff"
-        ]
-      },
-      {
-        "name": "connection.private_address",
-        "description": "Subnet 10.0.0.100-10.0.0.200 failed",
-        "expected_behavior": "The device under test accepts IP addresses within all ranges specified in RFC 1918 and communicates using these addresses.  The Internet Assigned Numbers Authority (IANA) has reserved the following three blocks of the IP address space for private internets.  10.0.0.0 - 10.255.255.255.255 (10/8 prefix). 172.16.0.0 - 172.31.255.255 (172.16/12 prefix).  192.168.0.0 - 192.168.255.255 (192.168/16 prefix)",
-        "required_result": "Required",
-        "result": "Non-Compliant",
-        "recommendations": [
-          "Install a DHCP client that supports private address space"
-        ]
-      },
-      {
-        "name": "connection.shared_address",
-        "description": "Subnet 100.64.0.1-100.64.255.254 failed",
-        "expected_behavior": "The device under test accepts IP addresses within the ranges specified in RFC 6598 and communicates using these addresses",
-        "required_result": "Required",
-        "result": "Non-Compliant",
-        "recommendations": [
-          "Install a DHCP client that supports shared address space",
-          "Enable shared address space support in the DHCP client"
-        ]
-      },
-      {
-        "name": "connection.single_ip",
-        "description": "Device is using multiple IP addresses",
-        "expected_behavior": "The device under test does not behave as a network switch and only requets one IP address.  This test is to avoid that devices implement network switches that allow connecting strings of daisy chained devices to one single network port, as this would not make 802.1x port based authentication possible.",
-        "required_result": "Required",
-        "result": "Non-Compliant",
-        "recommendations": [
-          "Ensure that all ports on the device are isolated",
-          "Ensure only one DHCP client is running"
-        ]
-      },
-      {
-        "name": "connection.target_ping",
-        "description": "Device does not respond to ping",
-        "expected_behavior": "The device under test responds to an ICMP echo (ping) request.",
-        "required_result": "Required",
-        "result": "Non-Compliant",
-        "recommendations": [
-          "Configure device to allow ICMP requests (ping)",
-          "Create a firewall exception to allow ICMP requests from LAN"
-        ]
-      },
-      {
-        "name": "connection.ipaddr.ip_change",
-        "description": "Device did not accept IP address change",
-        "expected_behavior": "If the lease expires before the client receiveds a DHCPACK, the client moves to INIT state, MUST immediately stop any other network processing and requires network initialization parameters as if the client were uninitialized.  If the client then receives a DHCPACK allocating the client its previous network addres, the client SHOULD continue network processing.  If the client is given a new network address, it MUST NOT continue using the previous network address and SHOULD notify the local users of the problem.",
-        "required_result": "Required",
-        "result": "Non-Compliant",
-        "recommendations": [
-          "Install a compliant DHCP client"
-        ]
-      },
-      {
-        "name": "connection.ipaddr.dhcp_failover",
-        "description": "Device did not recieve a new lease from secondary DHCP server'",
-        "expected_behavior": "",
-        "required_result": "Required",
-        "result": "Non-Compliant",
-        "recommendations": [
-          "Install a compliant DHCP client"
-        ]
-      },
-      {
-        "name": "connection.ipv6_slaac",
-        "description": "Device does not support IPv6 SLAAC",
-        "expected_behavior": "The device under test complies with RFC4862 and forms a valid IPv6 SLAAC address",
-        "required_result": "Required",
-        "result": "Non-Compliant",
-        "recommendations": [
-          "Install a network manager that supports IPv6",
-          "Disable DHCPv6"
-        ]
-      },
-      {
-        "name": "connection.ipv6_ping",
-        "description": "No IPv6 SLAAC address found. Cannot ping",
-        "expected_behavior": "The device responds to the ping as per RFC4443",
-        "required_result": "Required",
-        "result": "Compliant"
-      },
-      {
-        "name": "dns.network.hostname_resolution",
-        "description": "DNS traffic detected from device",
-        "expected_behavior": "The device sends DNS requests.",
-        "required_result": "Required",
-        "result": "Non-Compliant",
-        "recommendations": [
-          "Enable ping response to IPv6 ICMP requests in network manager settings",
-          "Create a firewall exception to allow ICMPv6 via LAN"
-        ]
-      },
-      {
-        "name": "dns.network.from_dhcp",
-        "description": "DNS traffic detected only to DHCP provided server",
-        "expected_behavior": "The device sends DNS requests to the DNS server provided by the DHCP server",
-        "required_result": "Roadmap",
-        "result": "Compliant"
-      },
-      {
-        "name": "security.services.ftp",
-        "description": "No FTP server found",
-        "expected_behavior": "There is no FTP service running on any port",
-        "required_result": "Required",
-        "result": "Compliant"
-      },
-      {
-        "name": "security.ssh.version",
-        "description": "No SSH server found",
-        "expected_behavior": "SSH server is not running or server is SSHv2",
-        "required_result": "Required",
-        "result": "Compliant"
-      },
-      {
-        "name": "security.services.telnet",
-        "description": "No telnet server found",
-        "expected_behavior": "There is no Telnet service running on any port",
-        "required_result": "Required",
-        "result": "Compliant"
-      },
-      {
-        "name": "security.services.smtp",
-        "description": "No SMTP server found",
-        "expected_behavior": "There is no SMTP service running on any port",
-        "required_result": "Required",
-        "result": "Compliant"
-      },
-      {
-        "name": "security.services.http",
-        "description": "No HTTP server found",
-        "expected_behavior": "Device is unreachable on port 80 (or any other port) and only responds to HTTPS requests on port 443 (or any other port if HTTP is used at all)",
-        "required_result": "Required",
-        "result": "Compliant"
-      },
-      {
-        "name": "security.services.pop",
-        "description": "No POP server found",
-        "expected_behavior": "There is no POP service running on any port",
-        "required_result": "Required",
-        "result": "Compliant"
-      },
-      {
-        "name": "security.services.imap",
-        "description": "No IMAP server found",
-        "expected_behavior": "There is no IMAP service running on any port",
-        "required_result": "Required",
-        "result": "Compliant"
-      },
-      {
-        "name": "security.services.snmpv3",
-        "description": "No SNMP server found",
-        "expected_behavior": "Device is unreachable on port 161 (or any other port) and device is unreachable on port 162 (or any other port) unless SNMP is essential in which case it is SNMPv3 is used.",
-        "required_result": "Required",
-        "result": "Compliant"
-      },
-      {
-        "name": "security.services.vnc",
-        "description": "No VNC server found",
-        "expected_behavior": "Device cannot be accessed / connected to via VNC on any port",
-        "required_result": "Required",
-        "result": "Compliant"
-      },
-      {
-        "name": "security.services.tftp",
-        "description": "No TFTP server found",
-        "expected_behavior": "There is no TFTP service running on any port",
-        "required_result": "Required",
-        "result": "Compliant"
-      },
-      {
-        "name": "ntp.network.ntp_server",
-        "description": "No NTP server found",
-        "expected_behavior": "The device does not respond to NTP requests when it's IP is set as the NTP server on another device",
-        "required_result": "Required",
-        "result": "Compliant"
-      },
-      {
-        "name": "ntp.network.ntp_support",
-        "description": "Device sent NTPv4 packets.",
-        "expected_behavior": "The device sends an NTPv4 request to the configured NTP server.",
-        "required_result": "Required",
-        "result": "Compliant"
-      },
-      {
-        "name": "ntp.network.ntp_dhcp",
-        "description": "Device sent NTP request to non-DHCP provided server",
-        "expected_behavior": "Device can accept NTP server address, provided by the DHCP server (DHCP OFFER PACKET)",
-        "required_result": "Roadmap",
-        "result": "Non-Compliant"
-      }
-    ]
-  },
-  "report": "http://localhost:8000/report/Testrun Faux/2024-04-10T21:21:47"
-}
\ No newline at end of file
diff --git a/testing/unit/report/report_test.py b/testing/unit/report/report_test.py
index 180fabb9b..bef02a79a 100644
--- a/testing/unit/report/report_test.py
+++ b/testing/unit/report/report_test.py
@@ -21,9 +21,8 @@
 
 # Define the file paths
 UNIT_TEST_DIR = 'testing/unit/'
-TEST_FILES_DIR = os.path.join('testing/unit', MODULE)
-OUTPUT_DIR = os.path.join(TEST_FILES_DIR, 'output/')
-
+TEST_FILES_DIR = os.path.join('testing/unit',MODULE)
+OUTPUT_DIR = os.path.join(TEST_FILES_DIR,'output/')
 
 class ReportTest(unittest.TestCase):
   """Contains and runs all the unit tests concerning DNS behaviors"""
@@ -33,38 +32,34 @@ def setUpClass(cls):
     # Create the output directories and ignore errors if it already exists
     os.makedirs(OUTPUT_DIR, exist_ok=True)
 
-  def create_report(self, results_file_path):
+  def report_test(self):
     report = TestReport()
+
     # Load the json report data
-    with open(results_file_path, 'r', encoding='utf-8') as file:
+    with open(os.path.join(TEST_FILES_DIR, 'report.json'),
+              'r',
+              encoding='utf-8') as file:
       report_json = json.loads(file.read())
     report.from_json(report_json)
-    # Load all module html reports
+
+    # Load all module markdown reports
     reports_md = []
-    #reports_md.append(self.get_module_html_report('tls'))
-    reports_md.append(self.get_module_html_report('dns'))
-    reports_md.append(self.get_module_html_report('nmap'))
-    reports_md.append(self.get_module_html_report('ntp'))
+    reports_md.append(self.get_module_md_report('tls'))
+    reports_md.append(self.get_module_md_report('dns'))
+    reports_md.append(self.get_module_md_report('nmap'))
+    reports_md.append(self.get_module_md_report('ntp'))
     report.add_module_reports(reports_md)
 
-    # Save report to file
-    file_name = os.path.splitext(os.path.basename(results_file_path))[0]
-    report_out_file = os.path.join(OUTPUT_DIR, file_name + '.html')
-    with open(report_out_file, 'w', encoding='utf-8') as file:
+    # Generate the report
+    with open(os.path.join(OUTPUT_DIR, 'report.html'), 'w',
+              encoding='utf-8') as file:
       file.write(report.to_html())
 
-  def report_compliant_test(self):
-    self.create_report(os.path.join(TEST_FILES_DIR, 'report_compliant.json'))
-
-  def report_noncompliant_test(self):
-    self.create_report(os.path.join(TEST_FILES_DIR, 'report_noncompliant.json'))
-
-  def get_module_html_report(self, module):
+  def get_module_md_report(self, module):
     # Combine the path components using os.path.join
-    report_file = os.path.join(
-        UNIT_TEST_DIR,
-        os.path.join(module,
-                     os.path.join('reports', module + '_report_local.html')))
+    report_file = os.path.join(UNIT_TEST_DIR,
+      os.path.join(module,
+        os.path.join('reports',module+'_report_local.html')))
 
     with open(report_file, 'r', encoding='utf-8') as file:
       report = file.read()
@@ -73,8 +68,7 @@ def get_module_html_report(self, module):
 
 if __name__ == '__main__':
   suite = unittest.TestSuite()
-  suite.addTest(ReportTest('report_compliant_test'))
-  suite.addTest(ReportTest('report_noncompliant_test'))
+  suite.addTest(ReportTest('report_test'))
 
   runner = unittest.TextTestRunner()
   runner.run(suite)
diff --git a/testing/unit/run_tests.sh b/testing/unit/run_tests.sh
index 01c2b36cf..e471405b8 100644
--- a/testing/unit/run_tests.sh
+++ b/testing/unit/run_tests.sh
@@ -1,57 +1,57 @@
-#!/bin/bash -e
-
-# Copyright 2023 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# This script should be run from within the unit_test directory.  If
-# it is run outside this directory, paths will not be resolved correctly.
-
-# Move into the root directory of test-run
-pushd ../../ >/dev/null 2>&1
-
-echo "Root dir: $PWD"
-
-# Add the framework sources
-PYTHONPATH="$PWD/framework/python/src:$PWD/framework/python/src/common"
-
-# Add the test module sources
-PYTHONPATH="$PYTHONPATH:$PWD/modules/test/base/python/src"
-PYTHONPATH="$PYTHONPATH:$PWD/modules/test/tls/python/src"
-PYTHONPATH="$PYTHONPATH:$PWD/modules/test/dns/python/src"
-PYTHONPATH="$PYTHONPATH:$PWD/modules/test/nmap/python/src"
-PYTHONPATH="$PYTHONPATH:$PWD/modules/test/ntp/python/src"
-
-# Set the python path with all sources
-export PYTHONPATH
-
-# Run the DHCP Unit tests
-python3 -u $PWD/modules/network/dhcp-1/python/src/grpc_server/dhcp_config_test.py
-python3 -u $PWD/modules/network/dhcp-2/python/src/grpc_server/dhcp_config_test.py
-
-# Run the TLS Module Unit Tests
-python3 -u $PWD/testing/unit/tls/tls_module_test.py
-
-# Run the DNS Module Unit Tests
-python3 -u $PWD/testing/unit/dns/dns_module_test.py
-
-# Run the NMAP Module Unit Tests
-python3 -u $PWD/testing/unit/nmap/nmap_module_test.py
-
-# Run the NTP Module Unit Tests
-python3 -u $PWD/testing/unit/ntp/ntp_module_test.py
-
-# # Run the Report Unit Tests
-python3 -u $PWD/testing/unit/report/report_test.py
-
+#!/bin/bash -e
+
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# This script should be run from within the unit_test directory.  If
+# it is run outside this directory, paths will not be resolved correctly.
+
+# Move into the root directory of test-run
+pushd ../../ >/dev/null 2>&1
+
+echo "Root dir: $PWD"
+
+# Add the framework sources
+PYTHONPATH="$PWD/framework/python/src:$PWD/framework/python/src/common"
+
+# Add the test module sources
+PYTHONPATH="$PYTHONPATH:$PWD/modules/test/base/python/src"
+PYTHONPATH="$PYTHONPATH:$PWD/modules/test/tls/python/src"
+PYTHONPATH="$PYTHONPATH:$PWD/modules/test/dns/python/src"
+PYTHONPATH="$PYTHONPATH:$PWD/modules/test/nmap/python/src"
+PYTHONPATH="$PYTHONPATH:$PWD/modules/test/ntp/python/src"
+
+# Set the python path with all sources
+export PYTHONPATH
+
+# Run the DHCP Unit tests
+python3 -u $PWD/modules/network/dhcp-1/python/src/grpc_server/dhcp_config_test.py
+python3 -u $PWD/modules/network/dhcp-2/python/src/grpc_server/dhcp_config_test.py
+
+# Run the TLS Module Unit Tests
+python3 -u $PWD/testing/unit/tls/tls_module_test.py
+
+# Run the DNS Module Unit Tests
+python3 -u $PWD/testing/unit/dns/dns_module_test.py
+
+# Run the NMAP Module Unit Tests
+python3 -u $PWD/testing/unit/nmap/nmap_module_test.py
+
+# Run the NTP Module Unit Tests
+python3 -u $PWD/testing/unit/ntp/ntp_module_test.py
+
+# # Run the Report Unit Tests
+python3 -u $PWD/testing/unit/report/report_test.py
+
 popd >/dev/null 2>&1
\ No newline at end of file
diff --git a/testing/unit/tls/tls_module_test.py b/testing/unit/tls/tls_module_test.py
index 9a14d1ee5..fb06b0eb1 100644
--- a/testing/unit/tls/tls_module_test.py
+++ b/testing/unit/tls/tls_module_test.py
@@ -23,27 +23,24 @@
 import netifaces
 import ssl
 import http.client
-import shutil
-import logging
 
 MODULE = 'tls'
 # Define the file paths
 TEST_FILES_DIR = 'testing/unit/' + MODULE
-OUTPUT_DIR = os.path.join(TEST_FILES_DIR, 'output/')
-REPORTS_DIR = os.path.join(TEST_FILES_DIR, 'reports/')
-CAPTURES_DIR = os.path.join(TEST_FILES_DIR, 'captures/')
-CERT_DIR = os.path.join(TEST_FILES_DIR, 'certs/')
-ROOT_CERTS_DIR = os.path.join(TEST_FILES_DIR, 'root_certs')
-
-LOCAL_REPORT = os.path.join(REPORTS_DIR, 'tls_report_local.md')
-LOCAL_REPORT_EXT = os.path.join(REPORTS_DIR, 'tls_report_ext_local.md')
-LOCAL_REPORT_NO_CERT = os.path.join(REPORTS_DIR, 'tls_report_no_cert_local.md')
+OUTPUT_DIR = os.path.join(TEST_FILES_DIR,'output/')
+REPORTS_DIR = os.path.join(TEST_FILES_DIR,'reports/')
+CAPTURES_DIR = os.path.join(TEST_FILES_DIR,'captures/')
+CERT_DIR = os.path.join(TEST_FILES_DIR,'certs/')
+ROOT_CERTS_DIR = os.path.join(TEST_FILES_DIR,'root_certs')
+
+LOCAL_REPORT = os.path.join(REPORTS_DIR,'tls_report_local.md')
+LOCAL_REPORT_EXT = os.path.join(REPORTS_DIR,'tls_report_ext_local.md')
+LOCAL_REPORT_NO_CERT = os.path.join(REPORTS_DIR,'tls_report_no_cert_local.md')
 CONF_FILE = 'modules/test/' + MODULE + '/conf/module_config.json'
 
 TLS_UTIL = None
 PACKET_CAPTURE = None
 
-
 class TLSModuleTest(unittest.TestCase):
   """Contains and runs all the unit tests concerning TLS behaviors"""
 
@@ -151,7 +148,7 @@ def security_tls_server_results_test(self, ):
     tls_1_2_results = True, success_message
     tls_1_3_results = True, success_message
     expected = True, (f'TLS 1.2 validated: {success_message}\n'
-                      f'TLS 1.3 validated: {success_message}')
+      f'TLS 1.3 validated: {success_message}')
     result = TLS_UTIL.process_tls_server_results(tls_1_2_results,
                                                  tls_1_3_results)
     self.assertEqual(result, expected)
@@ -174,10 +171,11 @@ def security_tls_server_results_test(self, ):
                                                  tls_1_3_results)
     self.assertEqual(result, expected)
 
+
     # TLS 1.2 Fail and TLS 1.2 Fail
     tls_1_3_results = False, fail_message
     expected = False, (f'TLS 1.2 not validated: {fail_message}\n'
-                       f'TLS 1.3 not validated: {fail_message}')
+                      f'TLS 1.3 not validated: {fail_message}')
     result = TLS_UTIL.process_tls_server_results(tls_1_2_results,
                                                  tls_1_3_results)
     self.assertEqual(result, expected)
@@ -303,7 +301,7 @@ def security_tls_client_unsupported_tls_client(self):
   def tls_module_report_test(self):
     print('\ntls_module_report_test')
     os.environ['DEVICE_MAC'] = '38:d1:35:01:17:fe'
-    pcap_file = os.path.join(CAPTURES_DIR, 'tls.pcap')
+    pcap_file = os.path.join(CAPTURES_DIR,'tls.pcap')
     tls = TLSModule(module=MODULE,
                     log_dir=OUTPUT_DIR,
                     conf_file=CONF_FILE,
@@ -325,7 +323,7 @@ def tls_module_report_test(self):
   def tls_module_report_ext_test(self):
     print('\ntls_module_report_ext_test')
     os.environ['DEVICE_MAC'] = '28:29:86:27:d6:05'
-    pcap_file = os.path.join(CAPTURES_DIR, 'tls_ext.pcap')
+    pcap_file = os.path.join(CAPTURES_DIR,'tls_ext.pcap')
     tls = TLSModule(module=MODULE,
                     log_dir=OUTPUT_DIR,
                     conf_file=CONF_FILE,
@@ -338,7 +336,7 @@ def tls_module_report_ext_test(self):
   def tls_module_report_no_cert_test(self):
     print('\ntls_module_report_no_cert_test')
     os.environ['DEVICE_MAC'] = ''
-    pcap_file = os.path.join(CAPTURES_DIR, 'tls_ext.pcap')
+    pcap_file = os.path.join(CAPTURES_DIR,'tls_ext.pcap')
     tls = TLSModule(module=MODULE,
                     log_dir=OUTPUT_DIR,
                     conf_file=CONF_FILE,
@@ -445,41 +443,16 @@ def get_interface_ip(self, interface_name):
 
   def tls_module_trusted_ca_cert_chain_test(self):
     print('\ntls_module_trusted_ca_cert_chain_test')
-    cert_path = os.path.join(CERT_DIR, '_.google.com.crt')
+    cert_path = os.path.join(CERT_DIR,'_.google.com.crt')
     cert_valid = TLS_UTIL.validate_cert_chain(device_cert_path=cert_path)
     self.assertEqual(cert_valid, True)
 
   def tls_module_local_ca_cert_test(self):
     print('\ntls_module_trusted_ca_cert_chain_test')
-    cert_path = os.path.join(CERT_DIR, 'device_cert_local.crt')
-    cert_valid = TLS_UTIL.validate_local_ca_signature(
-        device_cert_path=cert_path)
-    self.assertEqual(cert_valid[0], True)
-
-  def tls_module_ca_cert_spaces_test(self):
-    print('\tls_module_ca_cert_spaces_test')
-    # Make a tmp folder to make a differnt CA directory
-    tmp_dir = os.path.join(TEST_FILES_DIR,'tmp')
-    if os.path.exists(tmp_dir):
-      shutil.rmtree(tmp_dir)
-    os.makedirs(tmp_dir, exist_ok=True)
-    # Move and rename the TestRun CA root with spaces
-    ca_file = os.path.join(ROOT_CERTS_DIR,'Testrun_CA_Root.crt')
-    ca_file_with_spaces = os.path.join(tmp_dir,'Testrun CA Root.crt')
-    shutil.copy(ca_file,ca_file_with_spaces)
-
     cert_path = os.path.join(CERT_DIR,'device_cert_local.crt')
-    log = logger.get_logger('unit_test_' + MODULE)
-    log.setLevel(logging.DEBUG)
-    tls_util = TLSUtil(log,
-                       bin_dir='modules/test/tls/bin',
-                       cert_out_dir=OUTPUT_DIR,
-                       root_certs_dir=tmp_dir)
-
-    cert_valid = tls_util.validate_local_ca_signature(device_cert_path=cert_path)
+    cert_valid = TLS_UTIL.validate_local_ca_signature(device_cert_path=cert_path)
     self.assertEqual(cert_valid[0], True)
 
-
 if __name__ == '__main__':
   suite = unittest.TestSuite()
   suite.addTest(TLSModuleTest('client_hello_packets_test'))
@@ -512,10 +485,9 @@ def tls_module_ca_cert_spaces_test(self):
   suite.addTest(TLSModuleTest('tls_module_report_ext_test'))
   suite.addTest(TLSModuleTest('tls_module_report_no_cert_test'))
 
-  # Test signature validation methods
+  # Test signature validation  methods
   suite.addTest(TLSModuleTest('tls_module_trusted_ca_cert_chain_test'))
   suite.addTest(TLSModuleTest('tls_module_local_ca_cert_test'))
-  suite.addTest(TLSModuleTest('tls_module_ca_cert_spaces_test'))
 
   runner = unittest.TextTestRunner()
   runner.run(suite)