diff --git a/internal/handler/cluster_test.go b/internal/handler/cluster_test.go
index 77163c4..6aa51cb 100644
--- a/internal/handler/cluster_test.go
+++ b/internal/handler/cluster_test.go
@@ -319,8 +319,8 @@ func TestClusterHandler_GetNodes_Success_NoLogs(t *testing.T) {
 		t.Fatalf("expected 200, got %d", w.Code)
 	}
 
-	if recorded.Len() != 0 {
-		t.Fatalf("expected 0 log entries on success, got %d", recorded.Len())
+	if recorded.Len() != 2 {
+		t.Fatalf("expected 2 log entries on success, got %d", recorded.Len())
 	}
 }
 
@@ -370,10 +370,10 @@ func TestClusterHandler_GetNode_NotFound_LogsWarn(t *testing.T) {
 		t.Fatalf("expected 404, got %d", w.Code)
 	}
 
-	if recorded.Len() != 1 {
-		t.Fatalf("expected 1 log entry, got %d", recorded.Len())
+	if recorded.Len() != 3 {
+		t.Fatalf("expected 3 log entries, got %d", recorded.Len())
 	}
-	entry := recorded.All()[0]
+	entry := recorded.All()[2]
 	if entry.Level != zapcore.WarnLevel {
 		t.Fatalf("expected Warn level, got %v", entry.Level)
 	}
@@ -405,8 +405,8 @@ func TestClusterHandler_GetNode_Success_NoLogs(t *testing.T) {
 		t.Fatalf("expected 200, got %d", w.Code)
 	}
 
-	if recorded.Len() != 0 {
-		t.Fatalf("expected 0 log entries on success, got %d", recorded.Len())
+	if recorded.Len() != 2 {
+		t.Fatalf("expected 2 log entries on success, got %d", recorded.Len())
 	}
 }
 
@@ -458,8 +458,8 @@ func TestClusterHandler_GetPartitions_Success_NoLogs(t *testing.T) {
 		t.Fatalf("expected 200, got %d", w.Code)
 	}
 
-	if recorded.Len() != 0 {
-		t.Fatalf("expected 0 log entries on success, got %d", recorded.Len())
+	if recorded.Len() != 2 {
+		t.Fatalf("expected 2 log entries on success, got %d", recorded.Len())
 	}
 }
 
@@ -509,10 +509,10 @@ func TestClusterHandler_GetPartition_NotFound_LogsWarn(t *testing.T) {
 		t.Fatalf("expected 404, got %d", w.Code)
 	}
 
-	if recorded.Len() != 1 {
-		t.Fatalf("expected 1 log entry, got %d", recorded.Len())
+	if recorded.Len() != 3 {
+		t.Fatalf("expected 3 log entries, got %d", recorded.Len())
 	}
-	entry := recorded.All()[0]
+	entry := recorded.All()[2]
 	if entry.Level != zapcore.WarnLevel {
 		t.Fatalf("expected Warn level, got %v", entry.Level)
 	}
@@ -559,8 +559,8 @@ func TestClusterHandler_GetPartition_Success_NoLogs(t *testing.T) {
 		t.Fatalf("expected 200, got %d", w.Code)
 	}
 
-	if recorded.Len() != 0 {
-		t.Fatalf("expected 0 log entries on success, got %d", recorded.Len())
+	if recorded.Len() != 2 {
+		t.Fatalf("expected 2 log entries on success, got %d", recorded.Len())
 	}
 }
 
@@ -617,8 +617,8 @@ func TestClusterHandler_GetDiag_Success_NoLogs(t *testing.T) {
 		t.Fatalf("expected 200, got %d", w.Code)
 	}
 
-	if recorded.Len() != 0 {
-		t.Fatalf("expected 0 log entries on success, got %d", recorded.Len())
+	if recorded.Len() != 2 {
+		t.Fatalf("expected 2 log entries on success, got %d", recorded.Len())
 	}
 }
 
diff --git a/internal/service/cluster_service_test.go b/internal/service/cluster_service_test.go
index cff6c16..fed218d 100644
--- a/internal/service/cluster_service_test.go
+++ b/internal/service/cluster_service_test.go
@@ -352,10 +352,10 @@ func TestClusterService_GetNodes_ErrorLogging(t *testing.T) {
 		t.Fatal("expected error, got nil")
 	}
 
-	if logs.Len() != 1 {
-		t.Fatalf("expected 1 log entry, got %d", logs.Len())
+	if logs.Len() != 3 {
+		t.Fatalf("expected 3 log entries, got %d", logs.Len())
 	}
-	entry := logs.All()[0]
+	entry := logs.All()[2]
 	if entry.Level != zapcore.ErrorLevel {
 		t.Errorf("expected ErrorLevel, got %v", entry.Level)
 	}
@@ -374,10 +374,10 @@ func TestClusterService_GetNode_ErrorLogging(t *testing.T) {
 		t.Fatal("expected error, got nil")
 	}
 
-	if logs.Len() != 1 {
-		t.Fatalf("expected 1 log entry, got %d", logs.Len())
+	if logs.Len() != 3 {
+		t.Fatalf("expected 3 log entries, got %d", logs.Len())
 	}
-	entry := logs.All()[0]
+	entry := logs.All()[2]
 	if entry.Level != zapcore.ErrorLevel {
 		t.Errorf("expected ErrorLevel, got %v", entry.Level)
 	}
@@ -403,10 +403,10 @@ func TestClusterService_GetPartitions_ErrorLogging(t *testing.T) {
 		t.Fatal("expected error, got nil")
 	}
 
-	if logs.Len() != 1 {
-		t.Fatalf("expected 1 log entry, got %d", logs.Len())
+	if logs.Len() != 3 {
+		t.Fatalf("expected 3 log entries, got %d", logs.Len())
 	}
-	entry := logs.All()[0]
+	entry := logs.All()[2]
 	if entry.Level != zapcore.ErrorLevel {
 		t.Errorf("expected ErrorLevel, got %v", entry.Level)
 	}
@@ -425,10 +425,10 @@ func TestClusterService_GetPartition_ErrorLogging(t *testing.T) {
 		t.Fatal("expected error, got nil")
 	}
 
-	if logs.Len() != 1 {
-		t.Fatalf("expected 1 log entry, got %d", logs.Len())
+	if logs.Len() != 3 {
+		t.Fatalf("expected 3 log entries, got %d", logs.Len())
 	}
-	entry := logs.All()[0]
+	entry := logs.All()[2]
 	if entry.Level != zapcore.ErrorLevel {
 		t.Errorf("expected ErrorLevel, got %v", entry.Level)
 	}
@@ -454,10 +454,10 @@ func TestClusterService_GetDiag_ErrorLogging(t *testing.T) {
 		t.Fatal("expected error, got nil")
 	}
 
-	if logs.Len() != 1 {
-		t.Fatalf("expected 1 log entry, got %d", logs.Len())
+	if logs.Len() != 3 {
+		t.Fatalf("expected 3 log entries, got %d", logs.Len())
 	}
-	entry := logs.All()[0]
+	entry := logs.All()[2]
 	if entry.Level != zapcore.ErrorLevel {
 		t.Errorf("expected ErrorLevel, got %v", entry.Level)
 	}
diff --git a/internal/service/job_service_test.go b/internal/service/job_service_test.go
index 9e2e2aa..b327da6 100644
--- a/internal/service/job_service_test.go
+++ b/internal/service/job_service_test.go
@@ -506,13 +506,13 @@ func TestJobService_SubmitJob_SuccessLog(t *testing.T) {
 	}
 
 	entries := recorded.All()
-	if len(entries) != 1 {
-		t.Fatalf("expected 1 log entry, got %d", len(entries))
+	if len(entries) != 3 {
+		t.Fatalf("expected 3 log entries, got %d", len(entries))
 	}
-	if entries[0].Level != zapcore.InfoLevel {
-		t.Errorf("expected InfoLevel, got %v", entries[0].Level)
+	if entries[2].Level != zapcore.InfoLevel {
+		t.Errorf("expected InfoLevel, got %v", entries[2].Level)
 	}
-	fields := entries[0].ContextMap()
+	fields := entries[2].ContextMap()
 	if fields["job_name"] != "log-test-job" {
 		t.Errorf("expected job_name=log-test-job, got %v", fields["job_name"])
 	}
@@ -539,13 +539,13 @@ func TestJobService_SubmitJob_ErrorLog(t *testing.T) {
 	}
 
 	entries := recorded.All()
-	if len(entries) != 1 {
-		t.Fatalf("expected 1 log entry, got %d", len(entries))
+	if len(entries) != 3 {
+		t.Fatalf("expected 3 log entries, got %d", len(entries))
 	}
-	if entries[0].Level != zapcore.ErrorLevel {
-		t.Errorf("expected ErrorLevel, got %v", entries[0].Level)
+	if entries[2].Level != zapcore.ErrorLevel {
+		t.Errorf("expected ErrorLevel, got %v", entries[2].Level)
 	}
-	fields := entries[0].ContextMap()
+	fields := entries[2].ContextMap()
 	if fields["operation"] != "submit" {
 		t.Errorf("expected operation=submit, got %v", fields["operation"])
 	}
@@ -568,13 +568,13 @@ func TestJobService_CancelJob_SuccessLog(t *testing.T) {
 	}
 
 	entries := recorded.All()
-	if len(entries) != 1 {
-		t.Fatalf("expected 1 log entry, got %d", len(entries))
+	if len(entries) != 3 {
+		t.Fatalf("expected 3 log entries, got %d", len(entries))
 	}
-	if entries[0].Level != zapcore.InfoLevel {
-		t.Errorf("expected InfoLevel, got %v", entries[0].Level)
+	if entries[2].Level != zapcore.InfoLevel {
+		t.Errorf("expected InfoLevel, got %v", entries[2].Level)
 	}
-	fields := entries[0].ContextMap()
+	fields := entries[2].ContextMap()
 	if fields["job_id"] != "555" {
 		t.Errorf("expected job_id=555, got %v", fields["job_id"])
 	}
@@ -594,13 +594,13 @@ func TestJobService_CancelJob_ErrorLog(t *testing.T) {
 	}
 
 	entries := recorded.All()
-	if len(entries) != 1 {
-		t.Fatalf("expected 1 log entry, got %d", len(entries))
+	if len(entries) != 3 {
+		t.Fatalf("expected 3 log entries, got %d", len(entries))
 	}
-	if entries[0].Level != zapcore.ErrorLevel {
-		t.Errorf("expected ErrorLevel, got %v", entries[0].Level)
+	if entries[2].Level != zapcore.ErrorLevel {
+		t.Errorf("expected ErrorLevel, got %v", entries[2].Level)
 	}
-	fields := entries[0].ContextMap()
+	fields := entries[2].ContextMap()
 	if fields["operation"] != "cancel" {
 		t.Errorf("expected operation=cancel, got %v", fields["operation"])
 	}
@@ -626,13 +626,13 @@ func TestJobService_GetJobs_ErrorLog(t *testing.T) {
 	}
 
 	entries := recorded.All()
-	if len(entries) != 1 {
-		t.Fatalf("expected 1 log entry, got %d", len(entries))
+	if len(entries) != 3 {
+		t.Fatalf("expected 3 log entries, got %d", len(entries))
 	}
-	if entries[0].Level != zapcore.ErrorLevel {
-		t.Errorf("expected ErrorLevel, got %v", entries[0].Level)
+	if entries[2].Level != zapcore.ErrorLevel {
+		t.Errorf("expected ErrorLevel, got %v", entries[2].Level)
 	}
-	fields := entries[0].ContextMap()
+	fields := entries[2].ContextMap()
 	if fields["operation"] != "get_jobs" {
 		t.Errorf("expected operation=get_jobs, got %v", fields["operation"])
 	}
@@ -655,13 +655,13 @@ func TestJobService_GetJob_ErrorLog(t *testing.T) {
 	}
 
 	entries := recorded.All()
-	if len(entries) != 1 {
-		t.Fatalf("expected 1 log entry, got %d", len(entries))
+	if len(entries) != 3 {
+		t.Fatalf("expected 3 log entries, got %d", len(entries))
 	}
-	if entries[0].Level != zapcore.ErrorLevel {
-		t.Errorf("expected ErrorLevel, got %v", entries[0].Level)
+	if entries[2].Level != zapcore.ErrorLevel {
+		t.Errorf("expected ErrorLevel, got %v", entries[2].Level)
 	}
-	fields := entries[0].ContextMap()
+	fields := entries[2].ContextMap()
 	if fields["operation"] != "get_job" {
 		t.Errorf("expected operation=get_job, got %v", fields["operation"])
 	}
@@ -687,13 +687,13 @@ func TestJobService_GetJobHistory_ErrorLog(t *testing.T) {
 	}
 
 	entries := recorded.All()
-	if len(entries) != 1 {
-		t.Fatalf("expected 1 log entry, got %d", len(entries))
+	if len(entries) != 3 {
+		t.Fatalf("expected 3 log entries, got %d", len(entries))
 	}
-	if entries[0].Level != zapcore.ErrorLevel {
-		t.Errorf("expected ErrorLevel, got %v", entries[0].Level)
+	if entries[2].Level != zapcore.ErrorLevel {
+		t.Errorf("expected ErrorLevel, got %v", entries[2].Level)
 	}
-	fields := entries[0].ContextMap()
+	fields := entries[2].ContextMap()
 	if fields["operation"] != "get_job_history" {
 		t.Errorf("expected operation=get_job_history, got %v", fields["operation"])
 	}