diff --git a/tests/test_bluetooth_aggregator.py b/tests/test_bluetooth_aggregator.py
index 75a2c17..06bd421 100644
--- a/tests/test_bluetooth_aggregator.py
+++ b/tests/test_bluetooth_aggregator.py
@@ -7,9 +7,8 @@ from unittest.mock import MagicMock, patch
 from utils.bluetooth.aggregator import DeviceAggregator
 from utils.bluetooth.models import BTObservation, BTDeviceAggregate
 from utils.bluetooth.constants import (
-    RSSI_RANGE_BANDS,
     MAX_RSSI_SAMPLES,
-    DEVICE_STALE_SECONDS,
+    DEVICE_STALE_TIMEOUT as DEVICE_STALE_SECONDS,
 )
 
 
diff --git a/tests/test_bluetooth_heuristics.py b/tests/test_bluetooth_heuristics.py
index 09c0de6..9059190 100644
--- a/tests/test_bluetooth_heuristics.py
+++ b/tests/test_bluetooth_heuristics.py
@@ -7,11 +7,11 @@ from unittest.mock import MagicMock
 from utils.bluetooth.heuristics import HeuristicsEngine
 from utils.bluetooth.models import BTDeviceAggregate
 from utils.bluetooth.constants import (
-    HEURISTIC_PERSISTENT_MIN_SEEN,
-    HEURISTIC_PERSISTENT_WINDOW_SECONDS,
-    HEURISTIC_BEACON_VARIANCE_THRESHOLD,
-    HEURISTIC_STRONG_STABLE_RSSI,
-    HEURISTIC_STRONG_STABLE_VARIANCE,
+    PERSISTENT_MIN_SEEN_COUNT as HEURISTIC_PERSISTENT_MIN_SEEN,
+    PERSISTENT_WINDOW_SECONDS as HEURISTIC_PERSISTENT_WINDOW_SECONDS,
+    BEACON_INTERVAL_MAX_VARIANCE as HEURISTIC_BEACON_VARIANCE_THRESHOLD,
+    STRONG_RSSI_THRESHOLD as HEURISTIC_STRONG_STABLE_RSSI,
+    STABLE_VARIANCE_THRESHOLD as HEURISTIC_STRONG_STABLE_VARIANCE,
 )
 
 
diff --git a/utils/bluetooth/constants.py b/utils/bluetooth/constants.py
index 8451658..17a464d 100644
--- a/utils/bluetooth/constants.py
+++ b/utils/bluetooth/constants.py
@@ -89,6 +89,9 @@ BLUETOOTHCTL_TIMEOUT = 10.0
 # btmgmt command timeout
 BTMGMT_TIMEOUT = 10.0
 
+# Generic subprocess timeout (short operations)
+SUBPROCESS_TIMEOUT_SHORT = 5.0
+
 # =============================================================================
 # ADDRESS TYPE CLASSIFICATIONS
 # =============================================================================