diff --git a/server/tests/integration/workflows.test.js b/server/tests/integration/workflows.test.js
index 50f1d14..0730fad 100644
--- a/server/tests/integration/workflows.test.js
+++ b/server/tests/integration/workflows.test.js
@@ -44,7 +44,7 @@ describe('Integration Tests', () => {
   beforeEach(async () => {
     await cleanDatabase();
     alertService.activeAlerts.clear();
-    trackingService.activeDrones.clear();
+    trackingService.clear();
   });
 
   describe('Complete User Registration and Login Flow', () => {
diff --git a/server/tests/services/droneTrackingService.test.js b/server/tests/services/droneTrackingService.test.js
index 4b0ab5f..3979f25 100644
--- a/server/tests/services/droneTrackingService.test.js
+++ b/server/tests/services/droneTrackingService.test.js
@@ -18,7 +18,7 @@ describe('DroneTrackingService', () => {
 
   beforeEach(async () => {
     await cleanDatabase();
-    trackingService.activeDrones.clear();
+    trackingService.clear();
     trackingService.removeAllListeners();
   });
 
diff --git a/server/tests/setup.js b/server/tests/setup.js
index 4bd2c97..c1bc201 100644
--- a/server/tests/setup.js
+++ b/server/tests/setup.js
@@ -8,6 +8,12 @@ process.env.DB_LOGGING = 'false';
 
 const { Sequelize } = require('sequelize');
 const path = require('path');
+const sinon = require('sinon');
+
+// Global Sinon setup - restore all spies after each test
+afterEach(() => {
+  sinon.restore();
+});
 
 // Set additional test environment variables
 
@@ -121,7 +127,7 @@ async function createTestUser(userData = {}) {
   const defaultUserData = {
     username: 'testuser',
     email: 'test@example.com',
-    password: 'password123',
+    password_hash: '$2b$10$dummyHashForTestingOnly',
     role: 'admin',
     tenant_id: tenant.id,
     is_active: true,