diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/exceptions/TriggerNotFoundException.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/exceptions/TriggerNotFoundException.java
index b58cb89..d3e0113 100644
--- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/exceptions/TriggerNotFoundException.java
+++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/exceptions/TriggerNotFoundException.java
@@ -1,8 +1,5 @@
 package it.fabioformosa.quartzmanager.api.exceptions;
 
-import lombok.ToString;
-
-@ToString
 public class TriggerNotFoundException extends Exception {
   public TriggerNotFoundException(String name) {
     super("Trigger with name " + name + " not found!");
diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/websockets/WebSocketProgressNotifier.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/websockets/WebSocketProgressNotifier.java
index 464a12d..7eeba6d 100644
--- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/websockets/WebSocketProgressNotifier.java
+++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/websockets/WebSocketProgressNotifier.java
@@ -43,7 +43,7 @@ public class WebSocketProgressNotifier implements WebhookSender<TriggerFiredBund
 
     JobDetail jobDetail = jobExecutionContext.getJobDetail();
     triggerFiredBundleDTO.setJobKey(jobDetail.getKey().getName());
-    triggerFiredBundleDTO.setJobClass(trigger.getClass().getSimpleName());
+    triggerFiredBundleDTO.setJobClass(jobDetail.getJobClass().getName());
     return triggerFiredBundleDTO;
   }
 
diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/jobs/SampleJobTest.java b/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/jobs/SampleJobTest.java
index e41947d..287a2ae 100644
--- a/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/jobs/SampleJobTest.java
+++ b/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/jobs/SampleJobTest.java
@@ -12,7 +12,7 @@ import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 import org.quartz.*;
 
-import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.argThat;
 
 class SampleJobTest {
 
@@ -47,8 +47,19 @@ class SampleJobTest {
     Mockito.when(jobExecutionContext.getJobDetail()).thenReturn(jobDetail);
 
     sampleJob.execute(jobExecutionContext);
-    Mockito.verify(webSocketLogsNotifier).send(any(LogRecord.class));
-    Mockito.verify(webSocketProgressNotifier).send(any(TriggerFiredBundleDTO.class));
+    Mockito.verify(webSocketLogsNotifier).send(argThat(actualLogRecord -> {
+      Assertions.assertThat(actualLogRecord.getMessage()).isEqualTo("Hello!");
+      Assertions.assertThat(actualLogRecord.getType()).isEqualTo(LogRecord.LogType.INFO);
+      Assertions.assertThat(actualLogRecord.getDate()).isNotNull();
+      Assertions.assertThat(actualLogRecord.getThreadName()).isNotNull();
+      return true;
+    }));
+    Mockito.verify(webSocketProgressNotifier).send(argThat(triggerFiredBundleDTO -> {
+      Assertions.assertThat(triggerFiredBundleDTO.getJobKey()).isEqualTo("test-job");
+      Assertions.assertThat(triggerFiredBundleDTO.getRepeatCount()).isEqualTo(6);
+      Assertions.assertThat(triggerFiredBundleDTO.getJobClass()).isEqualTo(SampleJob.class.getName());
+      return true;
+    }));
   }
 
   @Test
@@ -57,6 +68,7 @@ class SampleJobTest {
     LogRecord logRecord = sampleJob.doIt(jobExecutionContext);
     Assertions.assertThat(logRecord.getMessage()).isEqualTo("Hello!");
     Assertions.assertThat(logRecord.getType()).isEqualTo(LogRecord.LogType.INFO);
+    Assertions.assertThat(logRecord.getDate()).isNotNull();
   }
 
 }