diff --git a/cmd/server/tests/device_cap_test.go b/cmd/server/tests/device_cap_test.go
index 92e4b68..253cef3 100644
--- a/cmd/server/tests/device_cap_test.go
+++ b/cmd/server/tests/device_cap_test.go
@@ -21,7 +21,7 @@ func TestUpdateUserMaxDevices(t *testing.T) {
 	// Create test user with admin role
 	loginTestUser(t, setup.Server, setup.DB)
 	adminUserID := getTestUserID(t, setup.DB)
-	adminToken := getAdminToken(t, setup.Server, adminUserID)
+	adminToken := getAdminToken(t, ts, adminUserID)
 
 	// Create a test user
 	userID := createTestUserForMaxDevices(t, setup.Server, adminToken)
@@ -65,7 +65,7 @@ func TestUpdateUserMaxDevices(t *testing.T) {
 			}
 			jsonData, _ := json.Marshal(payload)
 
-			req, _ := http.NewRequest("PUT", setup.Server.URL+"/api/auth/users/"+userID.String()+"/max-devices", bytes.NewBuffer(jsonData))
+			req, _ := http.NewRequest("PUT", ts.URL+"/api/auth/users/"+userID.String()+"/max-devices", bytes.NewBuffer(jsonData))
 			req.Header.Set("Content-Type", "application/json")
 			req.Header.Set("Authorization", "Bearer "+adminToken)
 
@@ -92,7 +92,7 @@ func TestUpdateUserMaxDevicesValidation(t *testing.T) {
 	adminToken := loginTestUser(t, setup.Server, setup.DB)
 	createAdminUser(t, setup.Server, adminToken)
 	adminUserID := getTestUserID(t, setup.DB)
-	adminToken = getAdminToken(t, setup.Server, adminUserID)
+	adminToken = getAdminToken(t, ts, adminUserID)
 
 	// Create test user
 	userID := createTestUserForMaxDevices(t, setup.Server, adminToken)
@@ -131,7 +131,7 @@ func TestUpdateUserMaxDevicesValidation(t *testing.T) {
 			}
 			jsonData, _ := json.Marshal(payload)
 
-			req, _ := http.NewRequest("PUT", setup.Server.URL+"/api/auth/users/"+userID.String()+"/max-devices", bytes.NewBuffer(jsonData))
+			req, _ := http.NewRequest("PUT", ts.URL+"/api/auth/users/"+userID.String()+"/max-devices", bytes.NewBuffer(jsonData))
 			req.Header.Set("Content-Type", "application/json")
 			req.Header.Set("Authorization", "Bearer "+adminToken)
 
@@ -153,7 +153,7 @@ func TestUpdateUserMaxDevicesAuth(t *testing.T) {
 	adminToken := loginTestUser(t, setup.Server, setup.DB)
 	createAdminUser(t, setup.Server, adminToken)
 	adminUserID := getTestUserID(t, setup.DB)
-	adminToken = getAdminToken(t, setup.Server, adminUserID)
+	adminToken = getAdminToken(t, ts, adminUserID)
 
 	// Create regular user
 	userID := createTestUserForMaxDevices(t, setup.Server, adminToken)
@@ -164,7 +164,7 @@ func TestUpdateUserMaxDevicesAuth(t *testing.T) {
 		}
 		jsonData, _ := json.Marshal(payload)
 
-		req, _ := http.NewRequest("PUT", setup.Server.URL+"/api/auth/users/"+userID.String()+"/max-devices", bytes.NewBuffer(jsonData))
+		req, _ := http.NewRequest("PUT", ts.URL+"/api/auth/users/"+userID.String()+"/max-devices", bytes.NewBuffer(jsonData))
 		req.Header.Set("Content-Type", "application/json")
 
 		client := &http.Client{}
@@ -187,7 +187,7 @@ func TestUpdateUserMaxDevicesAuth(t *testing.T) {
 		}
 		jsonData, _ := json.Marshal(payload)
 
-		req, _ := http.NewRequest("PUT", setup.Server.URL+"/api/auth/users/"+userID.String()+"/max-devices", bytes.NewBuffer(jsonData))
+		req, _ := http.NewRequest("PUT", ts.URL+"/api/auth/users/"+userID.String()+"/max-devices", bytes.NewBuffer(jsonData))
 		req.Header.Set("Content-Type", "application/json")
 		req.Header.Set("Authorization", "Bearer "+regularToken)
 
@@ -208,7 +208,7 @@ func TestUpdateUserMaxDevicesNonExistentUser(t *testing.T) {
 	adminToken := loginTestUser(t, setup.Server, setup.DB)
 	createAdminUser(t, setup.Server, adminToken)
 	adminUserID := getTestUserID(t, setup.DB)
-	adminToken = getAdminToken(t, setup.Server, adminUserID)
+	adminToken = getAdminToken(t, ts, adminUserID)
 
 	// Use a non-existent user ID
 	nonExistentUserID := uuid.New()
@@ -218,7 +218,7 @@ func TestUpdateUserMaxDevicesNonExistentUser(t *testing.T) {
 	}
 	jsonData, _ := json.Marshal(payload)
 
-	req, _ := http.NewRequest("PUT", setup.Server.URL+"/api/auth/users/"+nonExistentUserID.String()+"/max-devices", bytes.NewBuffer(jsonData))
+	req, _ := http.NewRequest("PUT", ts.URL+"/api/auth/users/"+nonExistentUserID.String()+"/max-devices", bytes.NewBuffer(jsonData))
 	req.Header.Set("Content-Type", "application/json")
 	req.Header.Set("Authorization", "Bearer "+adminToken)
 
@@ -239,7 +239,7 @@ func TestUpdateUserMaxDevicesMissingUserID(t *testing.T) {
 	adminToken := loginTestUser(t, setup.Server, setup.DB)
 	createAdminUser(t, setup.Server, adminToken)
 	adminUserID := getTestUserID(t, setup.DB)
-	adminToken = getAdminToken(t, setup.Server, adminUserID)
+	adminToken = getAdminToken(t, ts, adminUserID)
 
 	payload := map[string]interface{}{
 		"max_devices": 10,
@@ -247,7 +247,7 @@ func TestUpdateUserMaxDevicesMissingUserID(t *testing.T) {
 	jsonData, _ := json.Marshal(payload)
 
 	// Missing user ID in URL
-	req, _ := http.NewRequest("PUT", setup.Server.URL+"/api/auth/users//max-devices", bytes.NewBuffer(jsonData))
+	req, _ := http.NewRequest("PUT", ts.URL+"/api/auth/users//max-devices", bytes.NewBuffer(jsonData))
 	req.Header.Set("Content-Type", "application/json")
 	req.Header.Set("Authorization", "Bearer "+adminToken)
 
@@ -267,9 +267,9 @@ func TestListUsersIncludesMaxDevices(t *testing.T) {
 	adminToken := loginTestUser(t, setup.Server, setup.DB)
 	createAdminUser(t, setup.Server, adminToken)
 	adminUserID := getTestUserID(t, setup.DB)
-	adminToken = getAdminToken(t, setup.Server, adminUserID)
+	adminToken = getAdminToken(t, ts, adminUserID)
 
-	req, _ := http.NewRequest("GET", setup.Server.URL+"/api/auth/users", nil)
+	req, _ := http.NewRequest("GET", ts.URL+"/api/auth/users", nil)
 	req.Header.Set("Authorization", "Bearer "+adminToken)
 
 	client := &http.Client{}
@@ -304,7 +304,7 @@ func createAdminUser(t *testing.T, ts *httptest.Server, token string) {
 	}
 
 	jsonData, _ := json.Marshal(createUserPayload)
-	req, _ := http.NewRequest("POST", setup.Server.URL+"/api/auth/register", bytes.NewBuffer(jsonData))
+	req, _ := http.NewRequest("POST", ts.URL+"/api/auth/register", bytes.NewBuffer(jsonData))
 	req.Header.Set("Content-Type", "application/json")
 	req.Header.Set("Authorization", "Bearer "+token)
 
@@ -324,7 +324,7 @@ func createTestUserForMaxDevices(t *testing.T, ts *httptest.Server, adminToken s
 	}
 
 	jsonData, _ := json.Marshal(createUserPayload)
-	req, _ := http.NewRequest("POST", setup.Server.URL+"/api/auth/register", bytes.NewBuffer(jsonData))
+	req, _ := http.NewRequest("POST", ts.URL+"/api/auth/register", bytes.NewBuffer(jsonData))
 	req.Header.Set("Content-Type", "application/json")
 	req.Header.Set("Authorization", "Bearer "+adminToken)
 
@@ -342,7 +342,7 @@ func createTestUserForMaxDevices(t *testing.T, ts *httptest.Server, adminToken s
 			"password": "Test@Pass123!",
 		}
 		loginData, _ := json.Marshal(loginPayload)
-		loginReq, _ := http.NewRequest("POST", setup.Server.URL+"/api/auth/login", bytes.NewBuffer(loginData))
+		loginReq, _ := http.NewRequest("POST", ts.URL+"/api/auth/login", bytes.NewBuffer(loginData))
 		loginReq.Header.Set("Content-Type", "application/json")
 
 		loginResp, err := client.Do(loginReq)
@@ -420,7 +420,7 @@ func getAdminToken(t *testing.T, ts *httptest.Server, userID uuid.UUID) string {
 	}
 
 	jsonData, _ := json.Marshal(loginPayload)
-	req, _ := http.NewRequest("POST", setup.Server.URL+"/api/auth/login", bytes.NewBuffer(jsonData))
+	req, _ := http.NewRequest("POST", ts.URL+"/api/auth/login", bytes.NewBuffer(jsonData))
 	req.Header.Set("Content-Type", "application/json")
 
 	client := &http.Client{}
@@ -448,7 +448,7 @@ func loginTestUserByCredentials(t *testing.T, ts *httptest.Server, email, passwo
 	}
 
 	jsonData, _ := json.Marshal(loginPayload)
-	req, _ := http.NewRequest("POST", setup.Server.URL+"/api/auth/login", bytes.NewBuffer(jsonData))
+	req, _ := http.NewRequest("POST", ts.URL+"/api/auth/login", bytes.NewBuffer(jsonData))
 	req.Header.Set("Content-Type", "application/json")
 
 	client := &http.Client{}
diff --git a/cmd/server/tests/queue_test.go b/cmd/server/tests/queue_test.go
index 440af4d..d56ba65 100644
--- a/cmd/server/tests/queue_test.go
+++ b/cmd/server/tests/queue_test.go
@@ -19,7 +19,7 @@ import (
 func TestListAllQueueItems_Admin(t *testing.T) {
 	setup := setupTestServer(t)
 
-	token := loginAdminUser(t, setup.Server, db)
+	token := loginAdminUser(t, setup.Server, setup.DB) db)
 
 	req := httptest.NewRequest("GET", "/api/queue/items", nil)
 	req.Header.Set("Authorization", "Bearer "+token)