diff --git a/cmd/server/tests/test_helpers.go b/cmd/server/tests/test_helpers.go
index 9f08707..7f316e5 100644
--- a/cmd/server/tests/test_helpers.go
+++ b/cmd/server/tests/test_helpers.go
@@ -144,6 +144,13 @@ func setupTestServer(t *testing.T) (*httptest.Server, *database.Queries, *config
 	analyticsHandler := handlers.NewAnalyticsHandler(queries)
 	queueHandler := handlers.NewQueueHandler(queries, queueProcessor)
 
+	// Create refactored handlers (matching main.go Phase 6)
+	worker := services.NewWorker(3)
+	collectionHandler := handlers.NewCollectionHandler(queries, connManager)
+	mediaHandler := handlers.NewMediaHandler(queries, worker)
+	searchHandler := handlers.NewSearchHandler(queries)
+	matchingHandler := handlers.NewMatchingHandler(queries, connManager)
+
 	// Create conversion service for OPDS
 	conversionService := services.NewConversionService(queries, getCachePath())
 	opdsHandler := handlers.NewOPDSHandler(queries, conversionService)
@@ -172,11 +179,15 @@ func setupTestServer(t *testing.T) (*httptest.Server, *database.Queries, *config
 		AuthHandler:          authHandler,
 		LibraryHandler:       libraryHandler,
 		DeviceHandler:        deviceHandler,
+		MediaHandler:         mediaHandler,
+		SearchHandler:        searchHandler,
+		MatchingHandler:      matchingHandler,
 		KOReaderHandler:      koreaderHandler,
 		WSHandler:            wsHandler,
 		ConflictHandler:      conflictHandler,
 		AnalyticsHandler:     analyticsHandler,
 		QueueHandler:         queueHandler,
+		CollectionHandler:    collectionHandler,
 		OPDSHandler:          opdsHandler,
 		ConnManager:          connManager,
 		QueueProcessor:       queueProcessor,