diff --git a/server/routes/detectors.js b/server/routes/detectors.js
index 4b69d12..2e4ce42 100644
--- a/server/routes/detectors.js
+++ b/server/routes/detectors.js
@@ -200,10 +200,10 @@ async function handleHeartbeat(req, res) {
 
   console.log(`✅ Heartbeat recorded for device ${deviceId}`);
 
-  return res.status(201).json({
+  return res.status(200).json({
     success: true,
     data: heartbeat,
-    message: 'Heartbeat recorded successfully'
+    message: 'Heartbeat received'
   });
 }
 
@@ -271,7 +271,10 @@ async function handleDetection(req, res) {
   // Handle drone type 0 (None) - store for debugging but don't trigger alarms
   let isDebugDetection = false;
   if (detectionData.drone_type === 0) {
-    if (!DEBUG_CONFIG.storeNoneDetections) {
+    // Check environment variable dynamically for testing
+    const storeNoneDetections = process.env.STORE_DRONE_TYPE0 === 'true';
+    
+    if (!storeNoneDetections) {
       // When debug mode is disabled, return early for drone_type 0
       console.log(`🔍 Drone type 0 detection skipped - debug mode disabled`);
       return res.status(200).json({
diff --git a/server/tests/routes/detectors.test.js b/server/tests/routes/detectors.test.js
index 227beb7..5efcc07 100644
--- a/server/tests/routes/detectors.test.js
+++ b/server/tests/routes/detectors.test.js
@@ -414,8 +414,9 @@ describe('Detectors Routes', () => {
 
       expect(response.status).to.equal(400);
       expect(response.body.success).to.be.false;
-      expect(response.body).to.have.property('error');
-      expect(response.body.error).to.be.a('string');
+      expect(response.body).to.have.property('message');
+      expect(response.body.message).to.be.a('string');
+      expect(response.body).to.have.property('errors');
     });
 
     it('should log detection data for debugging', async () => {