diff --git a/containers/example-app/src/__tests__/server.test.ts b/containers/example-app/src/__tests__/server.test.ts
index d307bab9..785c978f 100644
--- a/containers/example-app/src/__tests__/server.test.ts
+++ b/containers/example-app/src/__tests__/server.test.ts
@@ -1,4 +1,4 @@
-import http from 'http';
+import http from 'node:http';
 import { createRequestHandler, startServer } from '../server';
 
 describe('example-app server', () => {
diff --git a/scripts/config/sonar-scanner.properties b/scripts/config/sonar-scanner.properties
index efc71450..dc0f6de5 100644
--- a/scripts/config/sonar-scanner.properties
+++ b/scripts/config/sonar-scanner.properties
@@ -4,7 +4,7 @@ sonar.host.url=https://sonarcloud.io
 sonar.qualitygate.wait=true
 sonar.sourceEncoding=UTF-8
 sonar.sources=.
-sonar.exclusions=lambdas/*/src/__tests__/**/*,infrastructure/terraform/bin/terraform.sh
+sonar.exclusions=lambdas/*/src/__tests__/**/*,containers/**/src/__tests__,infrastructure/terraform/bin/terraform.sh
 sonar.terraform.provider.aws.version=5.54.1
 sonar.cpd.exclusions=**.test.*
 sonar.coverage.exclusions=tests/, **/*.dev.*, lambdas/**/src/__tests__, utils/utils/src/zod-validators.ts ,**/jest.config.ts,scripts/**/*, containers/**/src/__tests__, eslint.config.mjs, docs/assets/js/nhs-notify.js, containers/example-app/src/server.ts
diff --git a/scripts/githooks/check-todos.sh b/scripts/githooks/check-todos.sh
index fa4063af..dba47f79 100755
--- a/scripts/githooks/check-todos.sh
+++ b/scripts/githooks/check-todos.sh
@@ -125,7 +125,7 @@ function search_todos() {
     # If the file is excluded, skip it
     if [[ "$skip" = false && -f "$file" ]]; then
       file_todos=$(grep -nHiE '\bTODO\b' "$file" || true)
-      [ -n "$file_todos" ] && todos+="$file_todos\n"
+      [[ -n "$file_todos" ]] && todos+="$file_todos\n"
     fi
   done
 
diff --git a/scripts/maintenance/merge.js b/scripts/maintenance/merge.js
index 8f5bd6cc..3c747df1 100644
--- a/scripts/maintenance/merge.js
+++ b/scripts/maintenance/merge.js
@@ -13,7 +13,7 @@
  *
  *******************************************************************************/
 
-const fs = require("fs");
+const fs = require("node:fs");
 
 // Read files
 const [file1, file2] = process.argv.slice(2);
diff --git a/scripts/setup/setup.sh b/scripts/setup/setup.sh
index 1865ffcc..cc0d9394 100755
--- a/scripts/setup/setup.sh
+++ b/scripts/setup/setup.sh
@@ -15,6 +15,8 @@ function main() {
   cd "$(git rev-parse --show-toplevel)"
 
   run-setup
+
+  return 0
 }
 
 function run-setup() {
@@ -23,6 +25,8 @@ function run-setup() {
   time make config
 
   check-setup-status
+
+  return 0
 }
 
 # Check the exit status of tfsec.
@@ -34,6 +38,8 @@ function check-setup-status() {
     echo "Setup was unsuccessful."
     exit 1
   fi
+
+  return 0
 }
 
 # ==============================================================================
diff --git a/scripts/terraform/trivy-scan.sh b/scripts/terraform/trivy-scan.sh
index 36cf16db..1588f531 100755
--- a/scripts/terraform/trivy-scan.sh
+++ b/scripts/terraform/trivy-scan.sh
@@ -28,35 +28,38 @@ function main() {
   local dir_to_scan="."
 
   while [[ $# -gt 0 ]]; do
-    case "$1" in
+    local current_arg="$1"
+    case "$current_arg" in
       --mode|-m)
         if [[ $# -lt 2 ]]; then
           echo "Error: --mode requires an argument." >&2
           usage
           exit 1
         fi
-        scan_mode="$2"
+        local mode_arg="$2"
+        scan_mode="$mode_arg"
         shift 2
+          exit 0
+          ;;
+        --)
+          shift
+          break
+          ;;
+        -*)
         ;;
+          usage
+          exit 1
+          ;;
+        *)
+          dir_to_scan="$current_arg"
+          shift
       --help|-h)
-        usage
-        exit 0
-        ;;
-      --)
-        shift
-        break
-        ;;
-      -*)
-        echo "Unknown option: $1" >&2
-        usage
-        exit 1
-        ;;
-      *)
-        dir_to_scan="$1"
+      dir_to_scan="$trailing_arg"
         shift
         ;;
     esac
-  done
+      local trailing_arg="$1"
+      dir_to_scan="$trailing_arg"
 
   if [[ $# -gt 0 ]]; then
     dir_to_scan="$1"