diff --git a/open-banking-accelerator/components/event-notifications/com.wso2.openbanking.accelerator.event.notifications.service/src/main/java/com/wso2/openbanking/accelerator/event/notifications/service/persistence/EventSubscriptionStoreInitializer.java b/open-banking-accelerator/components/event-notifications/com.wso2.openbanking.accelerator.event.notifications.service/src/main/java/com/wso2/openbanking/accelerator/event/notifications/service/persistence/EventSubscriptionStoreInitializer.java
index 9b5d845b..3d0f63ad 100644
--- a/open-banking-accelerator/components/event-notifications/com.wso2.openbanking.accelerator.event.notifications.service/src/main/java/com/wso2/openbanking/accelerator/event/notifications/service/persistence/EventSubscriptionStoreInitializer.java
+++ b/open-banking-accelerator/components/event-notifications/com.wso2.openbanking.accelerator.event.notifications.service/src/main/java/com/wso2/openbanking/accelerator/event/notifications/service/persistence/EventSubscriptionStoreInitializer.java
@@ -19,6 +19,7 @@
 package com.wso2.openbanking.accelerator.event.notifications.service.persistence;
 
 import com.wso2.openbanking.accelerator.common.persistence.JDBCPersistenceManager;
+import com.wso2.openbanking.accelerator.common.util.Generated;
 import com.wso2.openbanking.accelerator.event.notifications.service.dao.EventSubscriptionDAO;
 import com.wso2.openbanking.accelerator.event.notifications.service.dao.EventSubscriptionDAOImpl;
 import com.wso2.openbanking.accelerator.event.notifications.service.dao.EventSubscriptionSqlStatements;
@@ -32,6 +33,7 @@
 /**
  * Initializer Class for EventSubscription Service DB.
  */
+@Generated(message = "Datastore initializer classes")
 public class EventSubscriptionStoreInitializer {
 
     private static Log log = LogFactory.getLog(EventSubscriptionStoreInitializer.class);
diff --git a/open-banking-accelerator/components/event-notifications/com.wso2.openbanking.accelerator.event.notifications.service/src/test/java/com/wso2/openbanking/accelerator/event/notifications/service/util/EventNotificationServiceUtilTests.java b/open-banking-accelerator/components/event-notifications/com.wso2.openbanking.accelerator.event.notifications.service/src/test/java/com/wso2/openbanking/accelerator/event/notifications/service/util/EventNotificationServiceUtilTests.java
deleted file mode 100644
index 2d9b95e3..00000000
--- a/open-banking-accelerator/components/event-notifications/com.wso2.openbanking.accelerator.event.notifications.service/src/test/java/com/wso2/openbanking/accelerator/event/notifications/service/util/EventNotificationServiceUtilTests.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.wso2.openbanking.accelerator.event.notifications.service.util;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.testng.annotations.Test;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-
-/**
- * Test class for EventNotificationServiceUtil.
- */
-public class EventNotificationServiceUtilTests {
-    @Test
-    public void testGetCustomNotificationPayload() throws Exception {
-        JsonNode jsonNode = new ObjectMapper().readTree("{\"key\": \"value\"}");
-        String payload = EventNotificationServiceUtil.getCustomNotificationPayload(jsonNode);
-        assertNotNull(payload);
-        assertEquals("{\"key\":\"value\"}", payload);
-    }
-}
diff --git a/open-banking-accelerator/components/event-notifications/com.wso2.openbanking.accelerator.event.notifications.service/src/test/resources/testng.xml b/open-banking-accelerator/components/event-notifications/com.wso2.openbanking.accelerator.event.notifications.service/src/test/resources/testng.xml
index 0b4f417f..01b9ba0a 100644
--- a/open-banking-accelerator/components/event-notifications/com.wso2.openbanking.accelerator.event.notifications.service/src/test/resources/testng.xml
+++ b/open-banking-accelerator/components/event-notifications/com.wso2.openbanking.accelerator.event.notifications.service/src/test/resources/testng.xml
@@ -31,7 +31,6 @@
             <class name="com.wso2.openbanking.accelerator.event.notifications.service.service.EventPollingServiceTests"></class>
             <class name="com.wso2.openbanking.accelerator.event.notifications.service.service.EventCreationServiceTests"></class>
             <class name="com.wso2.openbanking.accelerator.event.notifications.service.service.EventSubscriptionServiceTests"></class>
-            <class name="com.wso2.openbanking.accelerator.event.notifications.service.util.EventNotificationServiceUtilTests"></class>
             <class name="com.wso2.openbanking.accelerator.event.notifications.service.realtime.service.EventNotificationProducerServiceTests"></class>
             <class name="com.wso2.openbanking.accelerator.event.notifications.service.realtime.service.RealtimeEventNotificationLoaderServiceTest"></class>
             <class name="com.wso2.openbanking.accelerator.event.notifications.service.realtime.service.RealtimeEventNotificationSenderServiceTests"></class>