diff --git a/tests/dcaegen2/testcases/02__cert_basic_auth_tests.robot b/tests/dcaegen2/testcases/02__cert_basic_auth_tests.robot
index ef10203..6df6627 100644
--- a/tests/dcaegen2/testcases/02__cert_basic_auth_tests.robot
+++ b/tests/dcaegen2/testcases/02__cert_basic_auth_tests.robot
@@ -125,12 +125,12 @@
 Publish VES Event With Empty Stnd Domain Namespace Parameter
     [Tags]    DCAE-VESC-R1 DCAE-VESC-STNDDEFINED
     [Documentation]   Post single event with invalid data (empty stnd namespace parameter) to /eventListener/v7 endpoint, expect 400 Response Status Code and "Mandatory input %1 %2 is empty in request" message
-    Send Request And Validate Response And Error Message  Publish Event To VES Collector  ${https_basic_auth_session}  ${VES_EVENTLISTENER_V7}  ${VES_STDN_DEFINED_EMMPTY_NAMESPACE}   400   Mandatory input %1 %2 is empty in request
+    Send Request And Validate Response And Error Message  Publish Event To VES Collector  ${https_basic_auth_session}  ${VES_EVENTLISTENER_V7}  ${VES_STND_DEFINED_EMPTY_NAMESPACE}   400   Mandatory input %1 %2 is empty in request
 
 Publish VES Event With Missing Stnd Domain Namespace Parameter
     [Tags]    DCAE-VESC-R1 DCAE-VESC-STNDDEFINED
     [Documentation]   Post single event with invalid data (missing stnd namespace parameter) to /eventListener/v7 endpoint, expect 400 Response Status Code and "Mandatory input %1 %2 is missing from request" message
-    Send Request And Validate Response And Error Message  Publish Event To VES Collector  ${https_basic_auth_session}  ${VES_EVENTLISTENER_V7}  ${VES_STDN_DEFINED_MISSING_NAMESPACE}    400   Mandatory input %1 %2 is missing from request
+    Send Request And Validate Response And Error Message  Publish Event To VES Collector  ${https_basic_auth_session}  ${VES_EVENTLISTENER_V7}  ${VES_STND_DEFINED_MISSING_NAMESPACE}    400   Mandatory input %1 %2 is missing from request
 
 Publish Single VES Event With Empty JSON
     [Tags]    DCAE-VESC-R1 DCAE-VESC-STNDDEFINED
@@ -145,19 +145,19 @@
 Publish Single VES Event With stndDefinedNamespace = 3GPP-Provisioning
     [Tags]    DCAE-VESC-R1 DCAE-VESC-STNDDEFINED
     [Documentation]   Post single event with stndDefinedNamespace = 3GPP-Provisioning and event should routed to topic unauthenticated.SEC_3GPP_PROVISIONING_OUTPUT
-    Send Request And Validate Response  Publish Event To VES Collector  ${https_basic_auth_session}  ${VES_EVENTLISTENER_V7}  ${VES_STDN_DEFINED_3GPP_PROVISIONING}  202  unauthenticated.SEC_3GPP_PROVISIONING_OUTPUT
+    Send Request And Validate Response  Publish Event To VES Collector  ${https_basic_auth_session}  ${VES_EVENTLISTENER_V7}  ${VES_STND_DEFINED_3GPP_PROVISIONING}  202  unauthenticated.SEC_3GPP_PROVISIONING_OUTPUT
 
 Publish Single VES Event With stndDefinedNamespace = 3GPP-Heartbeat
     [Tags]    DCAE-VESC-R1 DCAE-VESC-STNDDEFINED
     [Documentation]   Post single event with stndDefinedNamespace = 3GPP-Heartbeat and event should routed to topic unauthenticated.SEC_3GPP_HEARTBEAT_OUTPUT
-    Send Request And Validate Response  Publish Event To VES Collector  ${https_basic_auth_session}  ${VES_EVENTLISTENER_V7}  ${VES_STDN_DEFINED_3GPP_HEARTBEAT}  202  unauthenticated.SEC_3GPP_HEARTBEAT_OUTPUT
+    Send Request And Validate Response  Publish Event To VES Collector  ${https_basic_auth_session}  ${VES_EVENTLISTENER_V7}  ${VES_STND_DEFINED_3GPP_HEARTBEAT}  202  unauthenticated.SEC_3GPP_HEARTBEAT_OUTPUT
 
 Publish Single VES Event With stndDefinedNamespace = 3GPP-PerformanceAssurance
     [Tags]    DCAE-VESC-R1 DCAE-VESC-STNDDEFINED
     [Documentation]   Post single event with stndDefinedNamespace = 3GPP-PerformanceAssurance and event should routed to topic unauthenticated.SEC_3GPP_PERFORMANCEASSURANCE_OUTPUT
-    Send Request And Validate Response  Publish Event To VES Collector  ${https_basic_auth_session}  ${VES_EVENTLISTENER_V7}  ${VES_STDN_DEFINED_3GPP_PERFORMANCE_ASSURANCE}  202  unauthenticated.SEC_3GPP_PERFORMANCEASSURANCE_OUTPUT
+    Send Request And Validate Response  Publish Event To VES Collector  ${https_basic_auth_session}  ${VES_EVENTLISTENER_V7}  ${VES_STND_DEFINED_3GPP_PERFORMANCE_ASSURANCE}  202  unauthenticated.SEC_3GPP_PERFORMANCEASSURANCE_OUTPUT
 
 Publish Single VES Event With stndDefinedNamespace = 3GPP-FaultSupervision
     [Tags]    DCAE-VESC-R1 DCAE-VESC-STNDDEFINED
     [Documentation]   Post single event with stndDefinedNamespace = 3GPP-FaultSupervision and event should routed to topic unauthenticated.SEC_3GPP_FAULTSUPERVISION_OUTPUT
-    Send Request And Validate Response  Publish Event To VES Collector  ${https_basic_auth_session}  ${VES_EVENTLISTENER_V7}  ${VES_STDN_DEFINED_3GPP_FAULTSUPERVISION}  202  unauthenticated.SEC_3GPP_FAULTSUPERVISION_OUTPUT
+    Send Request And Validate Response  Publish Event To VES Collector  ${https_basic_auth_session}  ${VES_EVENTLISTENER_V7}  ${VES_STND_DEFINED_3GPP_FAULTSUPERVISION}  202  unauthenticated.SEC_3GPP_FAULTSUPERVISION_OUTPUT
diff --git a/tests/dcaegen2/testcases/assets/json_events/ves7_valid_eventWithStndDefinedFields.json b/tests/dcaegen2/testcases/assets/json_events/ves7_valid_eventWithStndDefinedFields.json
index 5d40b9d..99b7ce3 100644
--- a/tests/dcaegen2/testcases/assets/json_events/ves7_valid_eventWithStndDefinedFields.json
+++ b/tests/dcaegen2/testcases/assets/json_events/ves7_valid_eventWithStndDefinedFields.json
@@ -1,47 +1,52 @@
 {
   "event": {
     "commonEventHeader": {
+      "version": "4.1",
+      "vesEventListenerVersion": "7.2",
       "domain": "stndDefined",
       "eventId": "stndDefined-gNB_Nokia000001",
       "eventName": "stndDefined-gNB-Nokia-PowerLost",
       "stndDefinedNamespace": "3GPP-FaultSupervision",
-      "lastEpochMicrosec": 1234567890,
-      "priority": "Normal",
-      "reportingEntityName": "Nokia123456",
-      "sequence": 0,
-      "sourceName": "Nokia123456",
-      "startEpochMicrosec": 1234567890,
-      "version": "4.1",
-      "vesEventListenerVersion": "7.2"
+      "startEpochMicrosec": 1413378172000000,
+      "lastEpochMicrosec": 1413378172000000,
+      "reportingEntityName": "ibcx0001vm002oam001",
+      "sourceName": "scfx0001vm002cap001",
+      "sequence": 1,
+      "priority": "High"
     },
     "stndDefinedFields": {
-      "schemaReference": "https://www.3gpp.org/Rel-16/TS28532_generic_fault_supervision.json#definitions/schemas/notifyNewAlarm-NotifType",
+      "schemaReference": "https://forge.3gpp.org/rep/sa5/data-models/blob/REL-16/OpenAPI/faultMnS.yaml#components/schemas/NotifyNewAlarm",
       "data": {
-        "header": {
-          "uri": "xyz",
-          "notificationId": "xyz",
-          "notificationType": "notifyNewAlarm",
-          "eventTime": "xyz",
-          "systemDN": "xyz"
+        "href": 1,
+        "uri": "1",
+        "notificationId": 1,
+        "notificationType": "notifyNewAlarm",
+        "eventTime": "xyz",
+        "systemDN": "xyz",
+        "probableCause": 1,
+        "perceivedSeverity": "INDETERMINATE",
+        "rootCauseIndicator": false,
+        "specificProblem": "xyz",
+        "correlatedNotifications": [],
+        "backedUpStatus": true,
+        "backUpObject": "xyz",
+        "trendIndication": "MORE_SEVERE",
+        "thresholdInfo": {
+          "observedMeasurement": "new",
+          "observedValue": 123
         },
-        "body": {
-          "probableCause": "xyz",
-          "perceivedSeverity": "Major",
-          "rootCauseIndicator": false,
-          "specificProblem": "xyz",
-          "correlatedNotifications": [],
-          "backedUpStatus": true,
-          "backUpObject": "xyz",
-          "trendIndication": "No change",
-          "thresholdInfo": {},
-          "stateChangeDefinition": [],
-          "monitoredAttributes": [],
-          "proposedRepairActions": "xyz",
-          "additionalText": "xyz",
-          "additionalInformation": [],
-          "alarmId": "xyz",
-          "alarmType": "Environmental Alarm"
-        }
+        "stateChangeDefinition": {
+        },
+        "monitoredAttributes": {
+          "newAtt": "new"
+        },
+        "proposedRepairActions": "xyz",
+        "additionalText": "xyz",
+        "additionalInformation": {
+          "addInfo": "new"
+        },
+        "alarmId": "1",
+        "alarmType": "COMMUNICATIONS_ALARM"
       },
       "stndDefinedFieldsVersion": "1.0"
     }
diff --git a/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_3GPP-FaultSupervision.json b/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_3GPP-FaultSupervision.json
index aa026e7..0d749f3 100644
--- a/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_3GPP-FaultSupervision.json
+++ b/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_3GPP-FaultSupervision.json
@@ -1,43 +1,52 @@
 {
   "event": {
     "commonEventHeader": {
+      "version": "4.1",
+      "vesEventListenerVersion": "7.2",
       "domain": "stndDefined",
       "eventId": "stndDefined-gNB_Nokia000001",
       "eventName": "stndDefined-gNB-Nokia-PowerLost",
       "stndDefinedNamespace": "3GPP-FaultSupervision",
-      "lastEpochMicrosec": 1234567890,
-      "priority": "Normal",
-      "reportingEntityName": "Nokia123456",
-      "sequence": 0,
-      "sourceName": "Nokia123456",
-      "startEpochMicrosec": 1234567890,
-      "version": "4.1",
-      "vesEventListenerVersion": "7.2"
+      "startEpochMicrosec": 1413378172000000,
+      "lastEpochMicrosec": 1413378172000000,
+      "reportingEntityName": "ibcx0001vm002oam001",
+      "sourceName": "scfx0001vm002cap001",
+      "sequence": 1,
+      "priority": "High"
     },
     "stndDefinedFields": {
-      "schemaReference": "https://www.3gpp.org/Rel-16/TS28532_generic_fault_supervision.json#definitions/schemas/notifyNewAlarm-NotifType",
+      "schemaReference": "https://forge.3gpp.org/rep/sa5/data-models/blob/REL-16/OpenAPI/faultMnS.yaml#components/schemas/NotifyNewAlarm",
       "data": {
-        "uri": "xyz",
-        "notificationId": "xyz",
+        "href": 1,
+        "uri": "1",
+        "notificationId": 1,
         "notificationType": "notifyNewAlarm",
         "eventTime": "xyz",
         "systemDN": "xyz",
-        "probableCause": "xyz",
-        "perceivedSeverity": "Major",
+        "probableCause": 1,
+        "perceivedSeverity": "INDETERMINATE",
         "rootCauseIndicator": false,
         "specificProblem": "xyz",
         "correlatedNotifications": [],
         "backedUpStatus": true,
         "backUpObject": "xyz",
-        "trendIndication": "No change",
-        "thresholdInfo": {},
-        "stateChangeDefinition": [],
-        "monitoredAttributes": [],
+        "trendIndication": "MORE_SEVERE",
+        "thresholdInfo": {
+          "observedMeasurement": "new",
+          "observedValue": 123
+        },
+        "stateChangeDefinition": {
+        },
+        "monitoredAttributes": {
+          "newAtt": "new"
+        },
         "proposedRepairActions": "xyz",
         "additionalText": "xyz",
-        "additionalInformation": [],
-        "alarmId": "xyz",
-        "alarmType": "Environmental Alarm"
+        "additionalInformation": {
+          "addInfo": "new"
+        },
+        "alarmId": "1",
+        "alarmType": "COMMUNICATIONS_ALARM"
       },
       "stndDefinedFieldsVersion": "1.0"
     }
diff --git a/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_3GPP-Heartbeat.json b/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_3GPP-Heartbeat.json
index 7e274c2..414904f 100644
--- a/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_3GPP-Heartbeat.json
+++ b/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_3GPP-Heartbeat.json
@@ -1,43 +1,52 @@
 {
   "event": {
     "commonEventHeader": {
+      "version": "4.1",
+      "vesEventListenerVersion": "7.2",
       "domain": "stndDefined",
       "eventId": "stndDefined-gNB_Nokia000001",
       "eventName": "stndDefined-gNB-Nokia-PowerLost",
       "stndDefinedNamespace": "3GPP-Heartbeat",
-      "lastEpochMicrosec": 1234567890,
-      "priority": "Normal",
-      "reportingEntityName": "Nokia123456",
-      "sequence": 0,
-      "sourceName": "Nokia123456",
-      "startEpochMicrosec": 1234567890,
-      "version": "4.1",
-      "vesEventListenerVersion": "7.2"
+      "startEpochMicrosec": 1413378172000000,
+      "lastEpochMicrosec": 1413378172000000,
+      "reportingEntityName": "ibcx0001vm002oam001",
+      "sourceName": "scfx0001vm002cap001",
+      "sequence": 1,
+      "priority": "High"
     },
     "stndDefinedFields": {
-      "schemaReference": "https://www.3gpp.org/Rel-16/TS28532_generic_fault_supervision.json#definitions/schemas/notifyNewAlarm-NotifType",
+      "schemaReference": "https://forge.3gpp.org/rep/sa5/data-models/blob/REL-16/OpenAPI/faultMnS.yaml#components/schemas/NotifyNewAlarm",
       "data": {
-        "uri": "xyz",
-        "notificationId": "xyz",
+        "href": 1,
+        "uri": "1",
+        "notificationId": 1,
         "notificationType": "notifyNewAlarm",
         "eventTime": "xyz",
         "systemDN": "xyz",
-        "probableCause": "xyz",
-        "perceivedSeverity": "Major",
+        "probableCause": 1,
+        "perceivedSeverity": "INDETERMINATE",
         "rootCauseIndicator": false,
         "specificProblem": "xyz",
         "correlatedNotifications": [],
         "backedUpStatus": true,
         "backUpObject": "xyz",
-        "trendIndication": "No change",
-        "thresholdInfo": {},
-        "stateChangeDefinition": [],
-        "monitoredAttributes": [],
+        "trendIndication": "MORE_SEVERE",
+        "thresholdInfo": {
+          "observedMeasurement": "new",
+          "observedValue": 123
+        },
+        "stateChangeDefinition": {
+        },
+        "monitoredAttributes": {
+          "newAtt": "new"
+        },
         "proposedRepairActions": "xyz",
         "additionalText": "xyz",
-        "additionalInformation": [],
-        "alarmId": "xyz",
-        "alarmType": "Environmental Alarm"
+        "additionalInformation": {
+          "addInfo": "new"
+        },
+        "alarmId": "1",
+        "alarmType": "COMMUNICATIONS_ALARM"
       },
       "stndDefinedFieldsVersion": "1.0"
     }
diff --git a/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_3GPP-PerformanceAssurance.json b/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_3GPP-PerformanceAssurance.json
index 0652039..8e1f697 100644
--- a/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_3GPP-PerformanceAssurance.json
+++ b/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_3GPP-PerformanceAssurance.json
@@ -1,43 +1,52 @@
 {
   "event": {
     "commonEventHeader": {
+      "version": "4.1",
+      "vesEventListenerVersion": "7.2",
       "domain": "stndDefined",
       "eventId": "stndDefined-gNB_Nokia000001",
       "eventName": "stndDefined-gNB-Nokia-PowerLost",
       "stndDefinedNamespace": "3GPP-PerformanceAssurance",
-      "lastEpochMicrosec": 1234567890,
-      "priority": "Normal",
-      "reportingEntityName": "Nokia123456",
-      "sequence": 0,
-      "sourceName": "Nokia123456",
-      "startEpochMicrosec": 1234567890,
-      "version": "4.1",
-      "vesEventListenerVersion": "7.2"
+      "startEpochMicrosec": 1413378172000000,
+      "lastEpochMicrosec": 1413378172000000,
+      "reportingEntityName": "ibcx0001vm002oam001",
+      "sourceName": "scfx0001vm002cap001",
+      "sequence": 1,
+      "priority": "High"
     },
     "stndDefinedFields": {
-      "schemaReference": "https://www.3gpp.org/Rel-16/TS28532_generic_fault_supervision.json#definitions/schemas/notifyNewAlarm-NotifType",
+      "schemaReference": "https://forge.3gpp.org/rep/sa5/data-models/blob/REL-16/OpenAPI/faultMnS.yaml#components/schemas/NotifyNewAlarm",
       "data": {
-        "uri": "xyz",
-        "notificationId": "xyz",
+        "href": 1,
+        "uri": "1",
+        "notificationId": 1,
         "notificationType": "notifyNewAlarm",
         "eventTime": "xyz",
         "systemDN": "xyz",
-        "probableCause": "xyz",
-        "perceivedSeverity": "Major",
+        "probableCause": 1,
+        "perceivedSeverity": "INDETERMINATE",
         "rootCauseIndicator": false,
         "specificProblem": "xyz",
         "correlatedNotifications": [],
         "backedUpStatus": true,
         "backUpObject": "xyz",
-        "trendIndication": "No change",
-        "thresholdInfo": {},
-        "stateChangeDefinition": [],
-        "monitoredAttributes": [],
+        "trendIndication": "MORE_SEVERE",
+        "thresholdInfo": {
+          "observedMeasurement": "new",
+          "observedValue": 123
+        },
+        "stateChangeDefinition": {
+        },
+        "monitoredAttributes": {
+          "newAtt": "new"
+        },
         "proposedRepairActions": "xyz",
         "additionalText": "xyz",
-        "additionalInformation": [],
-        "alarmId": "xyz",
-        "alarmType": "Environmental Alarm"
+        "additionalInformation": {
+          "addInfo": "new"
+        },
+        "alarmId": "1",
+        "alarmType": "COMMUNICATIONS_ALARM"
       },
       "stndDefinedFieldsVersion": "1.0"
     }
diff --git a/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_3GPP-Provisioning.json b/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_3GPP-Provisioning.json
index d940661..bb37d1e 100644
--- a/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_3GPP-Provisioning.json
+++ b/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_3GPP-Provisioning.json
@@ -1,43 +1,52 @@
 {
   "event": {
     "commonEventHeader": {
+      "version": "4.1",
+      "vesEventListenerVersion": "7.2",
       "domain": "stndDefined",
       "eventId": "stndDefined-gNB_Nokia000001",
       "eventName": "stndDefined-gNB-Nokia-PowerLost",
       "stndDefinedNamespace": "3GPP-Provisioning",
-      "lastEpochMicrosec": 1234567890,
-      "priority": "Normal",
-      "reportingEntityName": "Nokia123456",
-      "sequence": 0,
-      "sourceName": "Nokia123456",
-      "startEpochMicrosec": 1234567890,
-      "version": "4.1",
-      "vesEventListenerVersion": "7.2"
+      "startEpochMicrosec": 1413378172000000,
+      "lastEpochMicrosec": 1413378172000000,
+      "reportingEntityName": "ibcx0001vm002oam001",
+      "sourceName": "scfx0001vm002cap001",
+      "sequence": 1,
+      "priority": "High"
     },
     "stndDefinedFields": {
-      "schemaReference": "https://www.3gpp.org/Rel-16/TS28532_generic_fault_supervision.json#definitions/schemas/notifyNewAlarm-NotifType",
+      "schemaReference": "https://forge.3gpp.org/rep/sa5/data-models/blob/REL-16/OpenAPI/faultMnS.yaml#components/schemas/NotifyNewAlarm",
       "data": {
-        "uri": "xyz",
-        "notificationId": "xyz",
+        "href": 1,
+        "uri": "1",
+        "notificationId": 1,
         "notificationType": "notifyNewAlarm",
         "eventTime": "xyz",
         "systemDN": "xyz",
-        "probableCause": "xyz",
-        "perceivedSeverity": "Major",
+        "probableCause": 1,
+        "perceivedSeverity": "INDETERMINATE",
         "rootCauseIndicator": false,
         "specificProblem": "xyz",
         "correlatedNotifications": [],
         "backedUpStatus": true,
         "backUpObject": "xyz",
-        "trendIndication": "No change",
-        "thresholdInfo": {},
-        "stateChangeDefinition": [],
-        "monitoredAttributes": [],
+        "trendIndication": "MORE_SEVERE",
+        "thresholdInfo": {
+          "observedMeasurement": "new",
+          "observedValue": 123
+        },
+        "stateChangeDefinition": {
+        },
+        "monitoredAttributes": {
+          "newAtt": "new"
+        },
         "proposedRepairActions": "xyz",
         "additionalText": "xyz",
-        "additionalInformation": [],
-        "alarmId": "xyz",
-        "alarmType": "Environmental Alarm"
+        "additionalInformation": {
+          "addInfo": "new"
+        },
+        "alarmId": "1",
+        "alarmType": "COMMUNICATIONS_ALARM"
       },
       "stndDefinedFieldsVersion": "1.0"
     }
diff --git a/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_empty_namespace.json b/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_empty_namespace.json
index bf5f095..49812e8 100644
--- a/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_empty_namespace.json
+++ b/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_empty_namespace.json
@@ -1,45 +1,54 @@
 {
   "event": {
     "commonEventHeader": {
+      "version": "4.1",
+      "vesEventListenerVersion": "7.2",
       "domain": "stndDefined",
       "eventId": "stndDefined-gNB_Nokia000001",
       "eventName": "stndDefined-gNB-Nokia-PowerLost",
       "stndDefinedNamespace": "",
-      "lastEpochMicrosec": 1234567890,
-      "priority": "Normal",
-      "reportingEntityName": "Nokia123456",
-      "sequence": 0,
-      "sourceName": "Nokia123456",
-      "startEpochMicrosec": 1234567890,
-      "version": "4.1",
-      "vesEventListenerVersion": "7.2"
+      "startEpochMicrosec": 1413378172000000,
+      "lastEpochMicrosec": 1413378172000000,
+      "reportingEntityName": "ibcx0001vm002oam001",
+      "sourceName": "scfx0001vm002cap001",
+      "sequence": 1,
+      "priority": "High"
     },
     "stndDefinedFields": {
-      "schemaReference": "https://www.3gpp.org/Rel-16/TS28532_generic_fault_supervision.json#definitions/schemas/notifyNewAlarm-NotifType",
+      "schemaReference": "https://forge.3gpp.org/rep/sa5/data-models/blob/REL-16/OpenAPI/faultMnS.yaml#components/schemas/NotifyNewAlarm",
       "data": {
-        "uri": "xyz",
-        "notificationId": "xyz",
+        "href": 1,
+        "uri": "1",
+        "notificationId": 1,
         "notificationType": "notifyNewAlarm",
         "eventTime": "xyz",
         "systemDN": "xyz",
-        "probableCause": "xyz",
-        "perceivedSeverity": "Major",
+        "probableCause": 1,
+        "perceivedSeverity": "INDETERMINATE",
         "rootCauseIndicator": false,
         "specificProblem": "xyz",
         "correlatedNotifications": [],
         "backedUpStatus": true,
         "backUpObject": "xyz",
-        "trendIndication": "No change",
-        "thresholdInfo": {},
-        "stateChangeDefinition": [],
-        "monitoredAttributes": [],
+        "trendIndication": "MORE_SEVERE",
+        "thresholdInfo": {
+          "observedMeasurement": "new",
+          "observedValue": 123
+        },
+        "stateChangeDefinition": {
+        },
+        "monitoredAttributes": {
+          "newAtt": "new"
+        },
         "proposedRepairActions": "xyz",
         "additionalText": "xyz",
-        "additionalInformation": [],
-        "alarmId": "xyz",
-        "alarmType": "Environmental Alarm"
+        "additionalInformation": {
+          "addInfo": "new"
+        },
+        "alarmId": "1",
+        "alarmType": "COMMUNICATIONS_ALARM"
       },
       "stndDefinedFieldsVersion": "1.0"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_missing_namespace.json b/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_missing_namespace.json
index 230dc54..a5a16d1 100644
--- a/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_missing_namespace.json
+++ b/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_missing_namespace.json
@@ -1,44 +1,53 @@
 {
   "event": {
     "commonEventHeader": {
+      "version": "4.1",
+      "vesEventListenerVersion": "7.2",
       "domain": "stndDefined",
       "eventId": "stndDefined-gNB_Nokia000001",
       "eventName": "stndDefined-gNB-Nokia-PowerLost",
-      "lastEpochMicrosec": 1234567890,
-      "priority": "Normal",
-      "reportingEntityName": "Nokia123456",
-      "sequence": 0,
-      "sourceName": "Nokia123456",
-      "startEpochMicrosec": 1234567890,
-      "version": "4.1",
-      "vesEventListenerVersion": "7.2"
+      "startEpochMicrosec": 1413378172000000,
+      "lastEpochMicrosec": 1413378172000000,
+      "reportingEntityName": "ibcx0001vm002oam001",
+      "sourceName": "scfx0001vm002cap001",
+      "sequence": 1,
+      "priority": "High"
     },
     "stndDefinedFields": {
-      "schemaReference": "https://www.3gpp.org/Rel-16/TS28532_generic_fault_supervision.json#definitions/schemas/notifyNewAlarm-NotifType",
+      "schemaReference": "https://forge.3gpp.org/rep/sa5/data-models/blob/REL-16/OpenAPI/faultMnS.yaml#components/schemas/NotifyNewAlarm",
       "data": {
-        "uri": "xyz",
-        "notificationId": "xyz",
+        "href": 1,
+        "uri": "1",
+        "notificationId": 1,
         "notificationType": "notifyNewAlarm",
         "eventTime": "xyz",
         "systemDN": "xyz",
-        "probableCause": "xyz",
-        "perceivedSeverity": "Major",
+        "probableCause": 1,
+        "perceivedSeverity": "INDETERMINATE",
         "rootCauseIndicator": false,
         "specificProblem": "xyz",
         "correlatedNotifications": [],
         "backedUpStatus": true,
         "backUpObject": "xyz",
-        "trendIndication": "No change",
-        "thresholdInfo": {},
-        "stateChangeDefinition": [],
-        "monitoredAttributes": [],
+        "trendIndication": "MORE_SEVERE",
+        "thresholdInfo": {
+          "observedMeasurement": "new",
+          "observedValue": 123
+        },
+        "stateChangeDefinition": {
+        },
+        "monitoredAttributes": {
+          "newAtt": "new"
+        },
         "proposedRepairActions": "xyz",
         "additionalText": "xyz",
-        "additionalInformation": [],
-        "alarmId": "xyz",
-        "alarmType": "Environmental Alarm"
+        "additionalInformation": {
+          "addInfo": "new"
+        },
+        "alarmId": "1",
+        "alarmType": "COMMUNICATIONS_ALARM"
       },
       "stndDefinedFieldsVersion": "1.0"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/tests/dcaegen2/testcases/resources/collector.properties b/tests/dcaegen2/testcases/resources/collector.properties
index 088b635..cd41763 100755
--- a/tests/dcaegen2/testcases/resources/collector.properties
+++ b/tests/dcaegen2/testcases/resources/collector.properties
@@ -54,11 +54,11 @@
 ## default no validation checkflag (-1)
 ## If enabled (1) - schema files locations must be specified, mapping file path must be specified, schema reference path
 ## in event json must be specified, path to stndDefined data field in event json must be specified
-collector.externalSchema.2ndStageValidation=-1
+collector.externalSchema.checkflag=1
 collector.externalSchema.schemasLocation=./etc/externalRepo/
 collector.externalSchema.mappingFileLocation=./etc/externalRepo/schema-map.json
-collector.externalSchema.schemaRefPath=/event/stndDefinedFields/schemaReference
-collector.externalSchema.stndDefinedDataPath=/event/stndDefinedFields/data
+event.externalSchema.schemaRefPath=/event/stndDefinedFields/schemaReference
+event.externalSchema.stndDefinedDataPath=/event/stndDefinedFields/data
 
 ## List all streamid per domain to be supported. The streamid should match to channel name on dmaapfile
 collector.dmaap.streamid=fault=ves-fault|syslog=ves-syslog|heartbeat=ves-heartbeat|measurementsForVfScaling=ves-measurement|mobileFlow=ves-mobileflow|other=ves-other|stateChange=ves-statechange|thresholdCrossingAlert=ves-thresholdCrossingAlert|voiceQuality=ves-voicequality|sipSignaling=ves-sipsignaling|notification=ves-notification|pnfRegistration=ves-pnfRegistration|3GPP-FaultSupervision=ves-3gpp-fault-supervision|3GPP-Heartbeat=ves-3gpp-heartbeat|3GPP-Provisioning=ves-3gpp-provisioning|3GPP-PerformanceAssurance=ves-3gpp-performance-assurance
diff --git a/tests/dcaegen2/testcases/resources/dcae_properties.robot b/tests/dcaegen2/testcases/resources/dcae_properties.robot
index cab31af..f608b71 100644
--- a/tests/dcaegen2/testcases/resources/dcae_properties.robot
+++ b/tests/dcaegen2/testcases/resources/dcae_properties.robot
@@ -46,13 +46,13 @@
 ${EVENT_PNF_REGISTRATION}                %{WORKSPACE}/tests/dcaegen2/testcases/assets/json_events/ves_pnf_registration_event.json
 ${EVENT_PNF_REGISTRATION_V7}             %{WORKSPACE}/tests/dcaegen2/testcases/assets/json_events/ves7_pnf_registration_event.json
 ${DCAE_HEALTH_CHECK_BODY}                %{WORKSPACE}/tests/dcae/testcases/assets/json_events/dcae_healthcheck.json
-${VES_STDN_DEFINED_EMMPTY_NAMESPACE}     %{WORKSPACE}/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_empty_namespace.json
-${VES_STDN_DEFINED_MISSING_NAMESPACE}    %{WORKSPACE}/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_missing_namespace.json
+${VES_STND_DEFINED_EMPTY_NAMESPACE}     %{WORKSPACE}/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_empty_namespace.json
+${VES_STND_DEFINED_MISSING_NAMESPACE}    %{WORKSPACE}/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_missing_namespace.json
 ${VES_NAMESPACE_3GPP_PROVISIONING_MISSING_SOURCENAME}   %{WORKSPACE}/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_3GPP-Provisioning_missing_sourceName.json
-${VES_STDN_DEFINED_3GPP_PROVISIONING}    %{WORKSPACE}/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_3GPP-Provisioning.json
-${VES_STDN_DEFINED_3GPP_HEARTBEAT}       %{WORKSPACE}/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_3GPP-Heartbeat.json
-${VES_STDN_DEFINED_3GPP_FAULTSUPERVISION}  %{WORKSPACE}/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_3GPP-FaultSupervision.json
-${VES_STDN_DEFINED_3GPP_PERFORMANCE_ASSURANCE}  %{WORKSPACE}/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_3GPP-PerformanceAssurance.json
+${VES_STND_DEFINED_3GPP_PROVISIONING}    %{WORKSPACE}/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_3GPP-Provisioning.json
+${VES_STND_DEFINED_3GPP_HEARTBEAT}       %{WORKSPACE}/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_3GPP-Heartbeat.json
+${VES_STND_DEFINED_3GPP_FAULTSUPERVISION}  %{WORKSPACE}/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_3GPP-FaultSupervision.json
+${VES_STND_DEFINED_3GPP_PERFORMANCE_ASSURANCE}  %{WORKSPACE}/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_3GPP-PerformanceAssurance.json
 
 #DCAE Health Check
 ${CONFIG_BINDING_URL}                    http://localhost:8443