diff --git a/enrich.py b/enrich.py
index d0a2e4d..3413b96 100755
--- a/enrich.py
+++ b/enrich.py
@@ -32,8 +32,7 @@ def analyze_pcap(pcapng_path, start_ts, end_ts, ap_bssid, ap_channel):
     cap = pyshark.FileCapture(
         pcapng_path,
         use_json=True,
-        include_raw=False,
-        keep_packets=False
+        include_raw=False
     )
 
     ap_channel = int(ap_channel)
diff --git a/enrichment/csv_handler.py b/enrichment/csv_handler.py
index 39a2342..ca2a7d7 100644
--- a/enrichment/csv_handler.py
+++ b/enrichment/csv_handler.py
@@ -27,7 +27,7 @@ def write_ssid_sidecar(enriched_path, ssid_summary):
     write a sidecar CSV file next to it.
     """
     enriched = Path(enriched_path)
-    ssid_outfile = Path(enriched_path).with_name(Path(enriched_path).stem + '-ssid-metrics.csv')
+    ssid_outfile = enriched.with_name(enriched.stem + '-ssid-metrics.csv')
 
     with ssid_outfile.open('w', newline='', encoding='utf-8') as f:
         fieldnames = [
diff --git a/runtest.sh b/runtest.sh
index 97cc441..b53378b 100755
--- a/runtest.sh
+++ b/runtest.sh
@@ -9,10 +9,6 @@ source settings.env
 
 EMAIL_BODY=${EMAIL_BODY:-"Test $BOOT_ID completed successfully. Please find the attached files and collect the probe."}
 
-BOOT_ID=$(cat /proc/sys/kernel/random/boot_id)
-TEST_FILE="${HOME}/${BOOT_ID}-speedtest.csv"
-ENRICHED_FILE="${TEST_FILE%.csv}+rf.csv"
-SSID_METRICS_FILE="${ENRICHED_FILE%.csv}-ssid-metrics.csv"
 FAILURE_LOG="${TEST_FILE%.csv}-failures.log"
 SCRIPT_START=$(date +%s)
 
@@ -31,10 +27,6 @@ die() {
 
 [ -z "$RECIPIENT" ] && die "Please set the RECIPIENT variable in settings.env."
 
-log "Test file: $TEST_FILE"
-log "Enriched file: $ENRICHED_FILE"
-log "SSID metrics file: $SSID_METRICS_FILE"
-
 sudo -v
 while true; do sudo -n true; sleep 60; done 2>/dev/null &
 SUDO_KEEPALIVE_PID=$!
diff --git a/settings.env.default b/settings.env.default
index 86fab42..8082336 100644
--- a/settings.env.default
+++ b/settings.env.default
@@ -1,5 +1,10 @@
+BOOT_ID=$(cat /proc/sys/kernel/random/boot_id)
+
 SCRIPT_DIRECTORY="${HOME}/wifi_test"
 KISMET_LOG_DIR="${HOME}/kismet_logs"
+TEST_FILE="${HOME}/${BOOT_ID}-speedtest.csv"
+ENRICHED_FILE="${TEST_FILE%}+rf.csv"
+SSID_METRICS_FILE="${ENRICHED_FILE%.csv}-ssid-metrics.csv"
 
 NUM_TESTS=1
 NUM_SAMPLES=5