diff --git a/cmd/server/tests/auth_test.go b/cmd/server/tests/auth_test.go
index 617b487..87fd77a 100644
--- a/cmd/server/tests/auth_test.go
+++ b/cmd/server/tests/auth_test.go
@@ -55,7 +55,7 @@ func TestAuthMiddlewareAlt(t *testing.T) {
 		handler.ServeHTTP(rr, req)
 
 		assert.Equal(t, http.StatusUnauthorized, rr.Code)
-		assert.Equal(t, `{"message":"valid token"}`, rr.Body.String())
+		assert.Equal(t, `{"message":"missing or malformed jwt"}`, rr.Body.String())
 	})
 
 	// Test valid JWT token format
diff --git a/cmd/server/tests/library_test.go b/cmd/server/tests/library_test.go
index eced1ca..cbbc58a 100644
--- a/cmd/server/tests/library_test.go
+++ b/cmd/server/tests/library_test.go
@@ -59,7 +59,7 @@ func TestAuthMiddleware(t *testing.T) {
 		handler.ServeHTTP(rr, req)
 
 		assert.Equal(t, http.StatusUnauthorized, rr.Code)
-		assert.Equal(t, `{"message":"valid token"}`, rr.Body.String())
+		assert.Equal(t, `{"message":"missing or malformed jwt"}`, rr.Body.String())
 	})
 
 	// Test valid JWT token format
@@ -115,7 +115,7 @@ func TestLibraryCreationUnauthorized(t *testing.T) {
 		w.Write([]byte(`{"message":"missing or malformed jwt"}`))
 	})
 
-	handler.ServeHTTP(rr, resp)
+	handler.ServeHTTP(rr, req)
 
 	assert.Equal(t, http.StatusUnauthorized, rr.Code)
 	assert.Equal(t, `{"message":"missing or malformed jwt"}`, rr.Body.String())
@@ -154,7 +154,7 @@ func TestLibraryCreationWithValidAdmin(t *testing.T) {
 	})
 
 	req.Header.Set("X-User-Role", "admin")
-	handler.ServeHTTP(rr, resp)
+	handler.ServeHTTP(rr, req)
 
 	assert.Equal(t, http.StatusCreated, rr.Code)
 	assert.Contains(t, rr.Body.String(), "Admin Library")
@@ -196,7 +196,7 @@ func TestLibraryTypesResponse(t *testing.T) {
 		w.Write(jsonData)
 	})
 
-	handler.ServeHTTP(rr, resp)
+	handler.ServeHTTP(rr, req)
 
 	assert.Equal(t, http.StatusOK, rr.Code)
 	assert.Contains(t, rr.Body.String(), "ebooks")
@@ -223,19 +223,13 @@ func TestUserVisibleLibraries(t *testing.T) {
 				"type_name":  "ebooks",
 				"is_visible": true,
 			},
-			{
-				"id":         "lib-2",
-				"name":       "Hidden Admin Library",
-				"type_name":  "comics",
-				"is_visible": false,
-			},
 		}
 
 		jsonData, _ := json.Marshal(response)
 		w.Write(jsonData)
 	})
 
-	handler.ServeHTTP(rr, resp)
+	handler.ServeHTTP(rr, req)
 
 	assert.Equal(t, http.StatusOK, rr.Code)
 	assert.Contains(t, rr.Body.String(), "User Library 1")
@@ -268,7 +262,7 @@ func TestMediaItemsList(t *testing.T) {
 		w.Write(jsonData)
 	})
 
-	handler.ServeHTTP(rr, resp)
+	handler.ServeHTTP(rr, req)
 
 	assert.Equal(t, http.StatusOK, rr.Code)
 	assert.Contains(t, rr.Body.String(), "Test Book 1")
@@ -328,7 +322,7 @@ func TestJSONValidation(t *testing.T) {
 				}
 			})
 
-			handler.ServeHTTP(rr, resp)
+			handler.ServeHTTP(rr, req)
 
 			assert.Equal(t, tc.expectedStatus, rr.Code)
 			if tc.expectedError != "" {
@@ -375,7 +369,7 @@ func TestErrorHandling(t *testing.T) {
 				w.Write([]byte(`{"error":"test error"}`))
 			})
 
-			handler.ServeHTTP(rr, resp)
+			handler.ServeHTTP(rr, req)
 
 			assert.Equal(t, tc.expectedStatus, rr.Code)
 		})