diff --git a/SOL002/VNFFaultManagement-API/NotificationEndpoint.robot b/SOL002/VNFFaultManagement-API/NotificationEndpoint.robot
index 68f162712bca35b87d2f458a624e4b44bfa6b6bb..6116b87a29ce408a0e63a71f1555172a2e750028 100644
--- a/SOL002/VNFFaultManagement-API/NotificationEndpoint.robot
+++ b/SOL002/VNFFaultManagement-API/NotificationEndpoint.robot
@@ -13,7 +13,7 @@ Suite Teardown    Terminate All Processes    kill=true
 VNF Fault Alarm Notification
     [Documentation]    Test ID: 6.3.4.6.1
     ...    Test title: VNF Fault Alarm Notification
-    ...    Test objective: The objective is to test the dispatch of VNF Fault Alarm Notification when a virtualised resource within an VNF instance fails, and perform a JSON schema and content validation of the delivered notification
+    ...    Test objective: The objective is to test the dispatch of VNF Fault Alarm Notification when a virtualised resource within an VNF instance fails, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A VNF instance is instantiated, and a subscription for fault alarm notifications is available in the VNFM.
     ...    Reference:  section 7.4.7.3.1 - SOL002 v2.4.1
     ...    Config ID: Config_prod_VNFM
@@ -26,20 +26,20 @@ VNF Fault Alarm Notification
 VNF Fault Alarm Cleared Notification
     [Documentation]    Test ID: 6.3.4.6.2
     ...    Test title: VNF Fault Alarm Cleared Notification
-    ...    Test objective: The objective is to test the dispatch of VNF Fault Alarm Cleared Notification when a faulty virtualised resource within an VNF instance is cleared, and perform a JSON schema and content validation of the delivered notification
+    ...    Test objective: The objective is to test the dispatch of VNF Fault Alarm Cleared Notification when a faulty virtualised resource within an VNF instance is cleared, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A VNF instance is instantiated, a virtualised resource is in faulty state, and a subscription for fault alarm cleared notifications is available in the VNFM.
     ...    Reference:  section 7.4.7.3.1 - SOL002 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
-    Trigger the fault cleared of a virtualised resource in the VNF instance (external action) 
+    Trigger the clear of a faulty virtualised resource in the VNF instance (external action)
     Check Alarm cleared Notification Http POST Request Body Json Schema Is    alarmClearedNotification
     Check Alarm cleared Notification Http POST Request Body notificationType attribute Is    alarmClearedNotification
 
 VNF Fault Alarm List Rebuilt Notification 
     [Documentation]    Test ID: 6.3.4.6.3
     ...    Test title: VNF Fault Alarm List Rebuilt Notification 
-    ...    Test objective: The objective is to test the dispatch of VNF Fault Alarm List Rebuilt Notification when the VNFM decides to rebuild the list of its VNF alarms, e.g. due to a corruption in the alarm storage, and perform a JSON schema and content validation of the delivered notification
+    ...    Test objective: The objective is to test the dispatch of VNF Fault Alarm List Rebuilt Notification when the VNFM decides to rebuild the list of its VNF alarms, e.g. due to a corruption in the alarm storage, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A VNF instance is instantiated, one or more virtualised resource are in faulty state, and a subscription for fault alarm list rebuilt notifications is available in the VNFM.
     ...    Reference:  section 7.4.7.3.1 - SOL002 v2.4.1
     ...    Config ID: Config_prod_VNFM
@@ -55,7 +55,7 @@ Trigger the fault of a virtualised resource in the VNF instance (external action
     #do nothing
     Log    do nothing
 
-Trigger the fault cleared of a virtualised resource in the VNF instance (external action) 
+Trigger the clear of a faulty virtualised resource in the VNF instance (external action)
     #do nothing
     Log    do nothing   
 
diff --git a/SOL002/VNFIndicatorNotification-API/VnfIndicatorNotification.robot b/SOL002/VNFIndicatorNotification-API/VnfIndicatorNotification.robot
index 3f077f50d66467ceac28fe8b57bf44e23ad82ebf..8a737c43c5420cb555665b2b06751cda13c00464 100644
--- a/SOL002/VNFIndicatorNotification-API/VnfIndicatorNotification.robot
+++ b/SOL002/VNFIndicatorNotification-API/VnfIndicatorNotification.robot
@@ -14,7 +14,7 @@ Library    String
 VNF Indicator Value Change Notification
     [Documentation]    Test ID: 6.3.2.6.1
     ...    Test title: VNF Indicator Value Change Notification
-    ...    Test objective: The objective is to test the dispatch of VNF Indicator Value Change Notification when new indicator values are available in the VNF, and perform a JSON schema and content validation of the delivered notification
+    ...    Test objective: The objective is to test the dispatch of VNF Indicator Value Change Notification when new indicator values are available in the VNF, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A VNF is instantiated, and a subscription for indicator value change notifications is available in the VNF.
     ...    Reference:  section 8.4.7.3.1 - SOL002 v2.4.1
     ...    Config ID: Config_prod_VNF
diff --git a/SOL002/VNFPerformanceManagementNotification-API/PerformanceManagementNotification.robot b/SOL002/VNFPerformanceManagementNotification-API/PerformanceManagementNotification.robot
index 9a1955e890a64bf5a2afa6df683f8e2494a0e4e6..7f78bdf7adce54bc3ab85a7f1ee298d092152361 100644
--- a/SOL002/VNFPerformanceManagementNotification-API/PerformanceManagementNotification.robot
+++ b/SOL002/VNFPerformanceManagementNotification-API/PerformanceManagementNotification.robot
@@ -15,7 +15,7 @@ Library    String
 VNF Performance Information Availability Notification
     [Documentation]    Test ID: 6.3.3.8.1
     ...    Test title: VNF Performance Information Availability Notification
-    ...    Test objective: The objective is to test the dispatch of VNF Performance Information Availability Notification when new VNF perfomance information is available in the NFVO, and perform a JSON schema and content validation of the delivered notification
+    ...    Test objective: The objective is to test the dispatch of VNF Performance Information Availability Notification when new VNF performance information is available in the NFVO, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A VNF performance job is created, and a subscription for information availability notifications is available in the VNFM.
     ...    Reference:  section 6.4.9.3.1 - SOL002 v2.4.1
     ...    Config ID: Config_prod_VNFM
@@ -28,7 +28,7 @@ VNF Performance Information Availability Notification
 VNF Threshold Crossed Notification
     [Documentation]    Test ID: 6.3.3.8.2
     ...    Test title: VNF Threshold Crossed Notification
-    ...    Test objective: The objective is to test the dispatch of VNF Threshold Crossed Notification when a previously set VNF perfomance metric threshold is crossed, and perform a JSON schema and content validation of the delivered notification
+    ...    Test objective: The objective is to test the dispatch of VNF Threshold Crossed Notification when a previously set VNF performance metric threshold is crossed, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A VNF performance job is created, and a threshold subscription is available in the VNFM.
     ...    Reference:  section 6.4.9.3.1 - SOL002 v2.4.1
     ...    Config ID: Config_prod_VNFM
diff --git a/SOL003/VNFFaultManagementNotification-API/NotificationEndpoint.robot b/SOL003/VNFFaultManagementNotification-API/NotificationEndpoint.robot
index ca8d40fd5fdb88ef015de49c6607b743d799403b..2eff1076a27ec8fb0a065370ad892aea7e05e9d4 100644
--- a/SOL003/VNFFaultManagementNotification-API/NotificationEndpoint.robot
+++ b/SOL003/VNFFaultManagementNotification-API/NotificationEndpoint.robot
@@ -13,7 +13,7 @@ Suite Teardown    Terminate All Processes    kill=true
 VNF Fault Alarm Notification
     [Documentation]    Test ID: 7.3.5.5.1
     ...    Test title: VNF Fault Alarm Notification
-    ...    Test objective: The objective is to test the dispatch of VNF Fault Alarm Notification when a virtualised resource within an VNF instance fails, and perform a JSON schema and content validation of the delivered notification
+    ...    Test objective: The objective is to test the dispatch of VNF Fault Alarm Notification when a virtualised resource within an VNF instance fails, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A VNF instance is instantiated, and a subscription for fault alarm notifications is available in the VNFM.
     ...    Reference:  section 7.4.6.3.1 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
@@ -26,20 +26,20 @@ VNF Fault Alarm Notification
 VNF Fault Alarm Cleared Notification
     [Documentation]    Test ID: 7.3.5.5.2
     ...    Test title: VNF Fault Alarm Cleared Notification
-    ...    Test objective: The objective is to test the dispatch of VNF Fault Alarm Cleared Notification when a faulty virtualised resource within an VNF instance is cleared, and perform a JSON schema and content validation of the delivered notification
+    ...    Test objective: The objective is to test the dispatch of VNF Fault Alarm Cleared Notification when a faulty virtualised resource within an VNF instance is cleared, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A VNF instance is instantiated, a virtualised resource is in faulty state, and a subscription for fault alarm cleared notifications is available in the VNFM.
     ...    Reference:  section 7.4.6.3.1 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
-    Trigger the fault cleared of a virtualised resource in the VNF instance (external action) 
+    Trigger the clear of a faulty virtualised resource in the VNF instance (external action)
     Check Alarm cleared Notification Http POST Request Body Json Schema Is    alarmClearedNotification
     Check Alarm cleared Notification Http POST Request Body notificationType attribute Is    alarmClearedNotification
 
 VNF Fault Alarm List Rebuilt Notification 
     [Documentation]    Test ID: 7.3.5.5.3
     ...    Test title: VNF Fault Alarm List Rebuilt Notification 
-    ...    Test objective: The objective is to test the dispatch of VNF Fault Alarm List Rebuilt Notification when the VNFM decides to rebuild the list of its VNF alarms, e.g. due to a corruption in the alarm storage, and perform a JSON schema and content validation of the delivered notification
+    ...    Test objective: The objective is to test the dispatch of VNF Fault Alarm List Rebuilt Notification when the VNFM decides to rebuild the list of its VNF alarms, e.g. due to a corruption in the alarm storage, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A VNF instance is instantiated, one or more virtualised resource are in faulty state, and a subscription for fault alarm list rebuilt notifications is available in the VNFM.
     ...    Reference:  section 7.4.6.3.1 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
@@ -55,7 +55,7 @@ Trigger the fault of a virtualised resource in the VNF instance (external action
     #do nothing
     Log    do nothing
 
-Trigger the fault cleared of a virtualised resource in the VNF instance (external action) 
+Trigger the clear of a faulty virtualised resource in the VNF instance (external action)
     #do nothing
     Log    do nothing   
 
diff --git a/SOL003/VNFIndicator-API/VnfIndicatorNotification.robot b/SOL003/VNFIndicator-API/VnfIndicatorNotification.robot
index c9b359d537b7fd55c109eff1e3cd36ff9378f578..4990d6a37cfafe2f741d8b40e743463a25f7483a 100644
--- a/SOL003/VNFIndicator-API/VnfIndicatorNotification.robot
+++ b/SOL003/VNFIndicator-API/VnfIndicatorNotification.robot
@@ -14,7 +14,7 @@ Library    String
 VNF Indicator Value Change Notification
     [Documentation]    Test ID: 7.3.6.6.1
     ...    Test title: VNF Indicator Value Change Notification
-    ...    Test objective: The objective is to test the dispatch of VNF Indicator Value Change Notification when new indicator values are available in the VNFM, and perform a JSON schema and content validation of the delivered notification
+    ...    Test objective: The objective is to test the dispatch of VNF Indicator Value Change Notification when new indicator values are available in the VNFM, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A VNF is instantiated, and a subscription for indicator value change notifications is available in the VNFM.
     ...    Reference:  section 8.4.7.3.1 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
diff --git a/SOL003/VNFPackageManagement-API/PackageManagementNotification.robot b/SOL003/VNFPackageManagement-API/PackageManagementNotification.robot
index a16af8ccc9bb3d37bf1b01dbed8199d0207bea81..877a665e5fc2feef0225ad6a0e4100ebd4be8bb7 100644
--- a/SOL003/VNFPackageManagement-API/PackageManagementNotification.robot
+++ b/SOL003/VNFPackageManagement-API/PackageManagementNotification.robot
@@ -14,7 +14,7 @@ Library    String
 VNF Package Onboarding Notification
     [Documentation]    Test ID: 7.3.3.8.1
     ...    Test title: VNF Package Onboarding Notification
-    ...    Test objective: The objective is to test the dispatch of VNF Package Onboarding notification when the VNF package onboarding operation is successfully completed, and perform a JSON schema and content validation of the delivered notification
+    ...    Test objective: The objective is to test the dispatch of VNF Package Onboarding notification when the VNF package onboarding operation is successfully completed, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A VNF package subscription for onboarding notifications is available in the NFVO.
     ...    Reference:  section 10.4.9.3.1 - SOL003 v2.4.1
     ...    Config ID: Config_prod_NFVO
@@ -27,7 +27,7 @@ VNF Package Onboarding Notification
 VNF Package Operational State Change Notification
     [Documentation]    Test ID: 7.3.3.8.2
     ...    Test title: VNF Package Operational State Change Notification
-    ...    Test objective: The objective is to test the dispatch of VNF Package Change notification when the VNF package operational state is modified, and perform a JSON schema and content validation of the delivered notification
+    ...    Test objective: The objective is to test the dispatch of VNF Package Change notification when the VNF package operational state is modified, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A VNF package subscription for change notifications is available in the NFVO.
     ...    Reference:  section 10.4.9.3.1 - SOL003 v2.4.1
     ...    Config ID: Config_prod_NFVO
@@ -41,7 +41,7 @@ VNF Package Operational State Change Notification
 VNF Package Deletion Notification
     [Documentation]    Test ID: 7.3.3.8.3
     ...    Test title: VNF Package Deletion Notification
-    ...    Test objective: The objective is to test the dispatch of VNF Package Change notification when the VNF package is deleted on the NFVO, and perform a JSON schema and content validation of the delivered notification
+    ...    Test objective: The objective is to test the dispatch of VNF Package Change notification when the VNF package is deleted on the NFVO, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A VNF package subscription for change notifications is available in the NFVO.
     ...    Reference:  section 10.4.9.3.1 - SOL003 v2.4.1
     ...    Config ID: Config_prod_NFVO
diff --git a/SOL003/VNFPerformanceManagement-API/PerformanceManagementNotification.robot b/SOL003/VNFPerformanceManagement-API/PerformanceManagementNotification.robot
index b5696a0fe9f07e021f70631bf030522d88ae9d9b..7a2ce441466e7c4830f43827f721e6dde6781dfa 100644
--- a/SOL003/VNFPerformanceManagement-API/PerformanceManagementNotification.robot
+++ b/SOL003/VNFPerformanceManagement-API/PerformanceManagementNotification.robot
@@ -15,7 +15,7 @@ Library    String
 VNF Performance Information Availability Notification
     [Documentation]    Test ID: 7.3.4.8.1
     ...    Test title: VNF Performance Information Availability Notification
-    ...    Test objective: The objective is to test the dispatch of VNF Performance Information Availability Notification when new VNF perfomance information is available in the NFVO, and perform a JSON schema and content validation of the delivered notification
+    ...    Test objective: The objective is to test the dispatch of VNF Performance Information Availability Notification when new VNF performance information is available in the NFVO, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A VNF performance job is created, and a subscription for information availability notifications is available in the VNFM.
     ...    Reference:  section 6.4.9.3.1 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
@@ -28,7 +28,7 @@ VNF Performance Information Availability Notification
 VNF Threshold Crossed Notification
     [Documentation]    Test ID: 7.3.4.8.2
     ...    Test title: VNF Threshold Crossed Notification
-    ...    Test objective: The objective is to test the dispatch of VNF Threshold Crossed Notification when a previously set VNF perfomance metric threshold is crossed, and perform a JSON schema and content validation of the delivered notification
+    ...    Test objective: The objective is to test the dispatch of VNF Threshold Crossed Notification when a previously set VNF performance metric threshold is crossed, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A VNF performance job is created, and a threshold subscription is available in the VNFM.
     ...    Reference:  section 6.4.9.3.1 - SOL005 v2.4.1
     ...    Config ID: Config_prod_VNFM
diff --git a/SOL005/NSDManagement-API/NSDManagementNotification.robot b/SOL005/NSDManagement-API/NSDManagementNotification.robot
index 8d522a6ca24cd89129b219e33c429284fadbdd8a..163a26247739e1e0798cb0aa5474284eba0758fa 100644
--- a/SOL005/NSDManagement-API/NSDManagementNotification.robot
+++ b/SOL005/NSDManagement-API/NSDManagementNotification.robot
@@ -14,7 +14,7 @@ Library    String
 NSD Onboarding Notification
     [Documentation]    Test ID: 5.3.1.9.1
     ...    Test title: NSD Onboarding Notification
-    ...    Test objective: The objective is to test the dispatch of NSD Onboarding notification when the NSD onboarding operation is successfully completed, and perform a JSON schema and content validation of the delivered notification
+    ...    Test objective: The objective is to test the dispatch of NSD Onboarding notification when the NSD onboarding operation is successfully completed, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A NSD management subscription for onboarding notifications is available in the NFVO.
     ...    Reference:  section 5.4.10.3.1 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
@@ -27,7 +27,7 @@ NSD Onboarding Notification
 NSD Onboarding Failure Notification
     [Documentation]    Test ID: 5.3.1.9.2
     ...    Test title: NSD Onboarding Failure Notification
-    ...    Test objective: The objective is to test the dispatch of NSD Onboarding faulure notification when the NSD onboarding operation fails, and perform a JSON schema and content validation of the delivered notification
+    ...    Test objective: The objective is to test the dispatch of NSD Onboarding faulure notification when the NSD onboarding operation fails, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A NSD management subscription for onboarding failure notifications is available in the NFVO.
     ...    Reference:  section 5.4.10.3.1 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
@@ -40,20 +40,20 @@ NSD Onboarding Failure Notification
 NSD Operational State Change Notification
     [Documentation]    Test ID: 5.3.1.9.3
     ...    Test title: NSD Operational State Change Notification
-    ...    Test objective: The objective is to test the dispatch of NSD Operational State Change notification when the NSD operational status change in the NFVO, and perform a JSON schema and content validation of the delivered notification
+    ...    Test objective: The objective is to test the dispatch of NSD Operational State Change notification when the NSD operational status change in the NFVO, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A NSD management subscription for operational state change notifications is available in the NFVO.
     ...    Reference:  section 5.4.10.3.1 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
-    Trigger the cross of NSD Operational State Change (external action) 
+    Trigger the change of NSD Operational State (external action) 
     Check NSD Operational State Change Notification Http Request Body Json Schema Is    NsdChangeNotification
     Check NSD Operational State Change Notification Http Request Body notificationType attribute Is    NsdChangeNotification
 
 NSD Deletion Notification
     [Documentation]    Test ID: 5.3.1.9.4
     ...    Test title: NSD Deletion Notification
-    ...    Test objective: The objective is to test the dispatch of NSD Deletion notification when the NSD is deleted from the NFVO, and perform a JSON schema and content validation of the delivered notification
+    ...    Test objective: The objective is to test the dispatch of NSD Deletion notification when the NSD is deleted from the NFVO, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A NSD management subscription for deletion notifications is available in the NFVO.
     ...    Reference:  section 5.4.10.3.1 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
@@ -66,7 +66,7 @@ NSD Deletion Notification
 PNFD Onboarding Notification
     [Documentation]    Test ID: 5.3.1.9.5
     ...    Test title: PNFD Onboarding Notification
-    ...    Test objective: The objective is to test the dispatch of PNFD Onboarding notification when the PNFD onboarding operation is successfully completed, and perform a JSON schema and content validation of the delivered notification
+    ...    Test objective: The objective is to test the dispatch of PNFD Onboarding notification when the PNFD onboarding operation is successfully completed, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A PNFD management subscription for onboarding notifications is available in the NFVO.
     ...    Reference:  section 5.4.10.3.1 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
@@ -79,7 +79,7 @@ PNFD Onboarding Notification
 PNFD Onboarding Failure Notification
     [Documentation]    Test ID: 5.3.1.9.6
     ...    Test title: PNFD Onboarding Failure Notification
-    ...    Test objective: The objective is to test the dispatch of PNFD Onboarding faulure notification when the PNFD onboarding operation fails, and perform a JSON schema and content validation of the delivered notification
+    ...    Test objective: The objective is to test the dispatch of PNFD Onboarding faulure notification when the PNFD onboarding operation fails, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A PNFD management subscription for onboarding failure notifications is available in the NFVO.
     ...    Reference:  section 5.4.10.3.1 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
@@ -92,7 +92,7 @@ PNFD Onboarding Failure Notification
 PNFD Deletion Notification
     [Documentation]    Test ID: 5.3.1.9.7
     ...    Test title: PNFD Deletion Notification
-    ...    Test objective: The objective is to test the dispatch of PNFD Deletion notification when the PNFD is deleted from the NFVO, and perform a JSON schema and content validation of the delivered notification
+    ...    Test objective: The objective is to test the dispatch of PNFD Deletion notification when the PNFD is deleted from the NFVO, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A PNFD management subscription for deletion notifications is available in the NFVO.
     ...    Reference:  section 5.4.10.3.1 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
@@ -112,7 +112,7 @@ Trigger the failure of NSD Onboarding (external action)
     #do nothing
     Log    do nothing   
 
-Trigger the cross of NSD Operational State Change (external action) 
+Trigger the change of NSD Operational State (external action) 
     #do nothing
     Log    do nothing
  
diff --git a/SOL005/NSFaultManagement-API/NotificationEndpoint.robot b/SOL005/NSFaultManagement-API/NotificationEndpoint.robot
index 392a9701a592efdae8b7e24013758977f69ec5ee..20e4a755754ef4fd3930333cc4cb6b090d6a1c03 100644
--- a/SOL005/NSFaultManagement-API/NotificationEndpoint.robot
+++ b/SOL005/NSFaultManagement-API/NotificationEndpoint.robot
@@ -14,7 +14,7 @@ Suite Teardown    Terminate All Processes    kill=true
 NS Fault Alarm Notification
     [Documentation]    Test ID: 5.3.3.5.1
     ...    Test title: NS Fault Alarm Notification
-    ...    Test objective: The objective is to test the dispatch of NS Fault Alarm Notification when a virtualised resource within an NS instance fails, and perform a JSON schema and content validation of the delivered notification
+    ...    Test objective: The objective is to test the dispatch of NS Fault Alarm Notification when a virtualised resource within an NS instance fails, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A NS instance is instantiated, and a subscription for fault alarm notifications is available in the NFVO.
     ...    Reference:  section 8.4.6.3.1 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
@@ -27,7 +27,7 @@ NS Fault Alarm Notification
 NS Fault Alarm Cleared Notification
     [Documentation]    Test ID: 5.3.3.5.2
     ...    Test title: NS Fault Alarm Cleared Notification
-    ...    Test objective: The objective is to test the dispatch of NS Fault Alarm Cleared Notification when a faulty virtualised resource within an NS instance is cleared, and perform a JSON schema and content validation of the delivered notification
+    ...    Test objective: The objective is to test the dispatch of NS Fault Alarm Cleared Notification when a faulty virtualised resource within an NS instance is cleared, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A NS instance is instantiated, a virtualised resource is in faulty state, and a subscription for fault alarm cleared notifications is available in the NFVO.
     ...    Reference:  section 8.4.6.3.1 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
@@ -40,7 +40,7 @@ NS Fault Alarm Cleared Notification
 NS Fault Alarm List Rebuilt Notification 
     [Documentation]    Test ID: 5.3.3.5.3
     ...    Test title: NS Fault Alarm List Rebuilt Notification 
-    ...    Test objective: The objective is to test the dispatch of NS Fault Alarm List Rebuilt Notification when the NFVO decides to rebuild the list of its NS alarms, e.g. due to a corruption in the alarm storage, and perform a JSON schema and content validation of the delivered notification
+    ...    Test objective: The objective is to test the dispatch of NS Fault Alarm List Rebuilt Notification when the NFVO decides to rebuild the list of its NS alarms, e.g. due to a corruption in the alarm storage, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A NS instance is instantiated, one or more virtualised resource are in faulty state, and a subscription for fault alarm list rebuilt notifications is available in the NFVO.
     ...    Reference:  section 8.4.6.3.1 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
diff --git a/SOL005/NSPerformanceManagement-API/Notifications.robot b/SOL005/NSPerformanceManagement-API/Notifications.robot
index 28386c330696ef3dde7e509df130a5cd5f5a6633..aa2b4790eb45a222d1e65b7d6f3697fed1a47e76 100644
--- a/SOL005/NSPerformanceManagement-API/Notifications.robot
+++ b/SOL005/NSPerformanceManagement-API/Notifications.robot
@@ -15,7 +15,7 @@ Library    String
 NS Performance Information Availability Notification
     [Documentation]    Test ID: 5.3.4.8.1
     ...    Test title: NS Performance Information Availability Notification
-    ...    Test objective: The objective is to test the dispatch of NS Performance Information Availability Notification when new NS perfomance information is available in the NFVO, and perform a JSON schema and content validation of the delivered notification
+    ...    Test objective: The objective is to test the dispatch of NS Performance Information Availability Notification when new NS performance information is available in the NFVO, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A NS performance job is created, and a subscription for information availability notifications is available in the NFVO.
     ...    Reference:  section 7.4.9.3.1 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
@@ -28,7 +28,7 @@ NS Performance Information Availability Notification
 NS Threshold Crossed Notification
     [Documentation]    Test ID: 5.3.4.8.2
     ...    Test title: NS Threshold Crossed Notification
-    ...    Test objective: The objective is to test the dispatch of NS Threshold Crossed Notification when a previously set NS perfomance metric threshold is crossed, and perform a JSON schema and content validation of the delivered notification
+    ...    Test objective: The objective is to test the dispatch of NS Threshold Crossed Notification when a previously set NS performance metric threshold is crossed, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A NS performance job is created, and a threshold subscription is available in the NFVO.
     ...    Reference:  section 7.4.9.3.1 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
diff --git a/SOL005/VNFPackageManagement-API/Notifications.robot b/SOL005/VNFPackageManagement-API/Notifications.robot
index 98b8b79651c762257cb329c1ae7fa361eeedcbfd..97ff74b1709346c28ecc3ad54a8d67bdb086783f 100644
--- a/SOL005/VNFPackageManagement-API/Notifications.robot
+++ b/SOL005/VNFPackageManagement-API/Notifications.robot
@@ -14,7 +14,7 @@ Library    String
 VNF Package Onboarding Notification
     [Documentation]    Test ID: 5.3.5.9.1
     ...    Test title: VNF Package Onboarding Notification
-    ...    Test objective: The objective is to test the dispatch of VNF Package Onboarding notification when the VNF package onboarding operation is successfully completed, and perform a JSON schema and content validation of the delivered notification
+    ...    Test objective: The objective is to test the dispatch of VNF Package Onboarding notification when the VNF package onboarding operation is successfully completed, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A VNF package subscription for onboarding notifications is available in the NFVO.
     ...    Reference:  section 9.4.10.3.1 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
@@ -27,7 +27,7 @@ VNF Package Onboarding Notification
 VNF Package Operational State Change Notification
     [Documentation]    Test ID: 5.3.5.9.2
     ...    Test title: VNF Package Operational State Change Notification
-    ...    Test objective: The objective is to test the dispatch of VNF Package Change notification when the VNF package operational state is modified, and perform a JSON schema and content validation of the delivered notification
+    ...    Test objective: The objective is to test the dispatch of VNF Package Change notification when the VNF package operational state is modified, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A VNF package subscription for change notifications is available in the NFVO.
     ...    Reference:  section 9.4.10.3.1 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
@@ -41,7 +41,7 @@ VNF Package Operational State Change Notification
 VNF Package Deletion Notification
     [Documentation]    Test ID: 5.3.5.9.3
     ...    Test title: VNF Package Deletion Notification
-    ...    Test objective: The objective is to test the dispatch of VNF Package Change notification when the VNF package is deleted on the NFVO, and perform a JSON schema and content validation of the delivered notification
+    ...    Test objective: The objective is to test the dispatch of VNF Package Change notification when the VNF package is deleted on the NFVO, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A VNF package subscription for change notifications is available in the NFVO.
     ...    Reference:  section 9.4.10.3.1 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO