diff --git a/runtest.sh b/runtest.sh
index e36a182..b53378b 100755
--- a/runtest.sh
+++ b/runtest.sh
@@ -7,6 +7,8 @@ IFS=$'\n\t'
 
 source settings.env
 
+EMAIL_BODY=${EMAIL_BODY:-"Test $BOOT_ID completed successfully. Please find the attached files and collect the probe."}
+
 FAILURE_LOG="${TEST_FILE%.csv}-failures.log"
 SCRIPT_START=$(date +%s)
 
diff --git a/settings.env.default b/settings.env.default
index 45cfae0..8082336 100644
--- a/settings.env.default
+++ b/settings.env.default
@@ -4,7 +4,7 @@ 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="${TEST_FILE%.csv}-ssid-metrics.csv"
+SSID_METRICS_FILE="${ENRICHED_FILE%.csv}-ssid-metrics.csv"
 
 NUM_TESTS=1
 NUM_SAMPLES=5