diff --git a/SOL005/NSFaultManagement-API/Alarms.robot b/SOL005/NSFaultManagement-API/Alarms.robot
index 4650a5b89bdb54dd93bdaa5ba7ddaa03890591e1..2ebcec5f32e2ab6f491dd6225a218b0df4bd418b 100644
--- a/SOL005/NSFaultManagement-API/Alarms.robot
+++ b/SOL005/NSFaultManagement-API/Alarms.robot
@@ -12,7 +12,7 @@ POST Alarms - Method not implemented
     ...    Test title:POST Alarms - Method not implemented
     ...    Test objective: The objective is to test that Post method is not allowed to create Fault management alarms on NFV
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.2.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.2.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none 
     ...    Post-Conditions:  none
@@ -24,7 +24,7 @@ GET information about multiple alarms
     ...    Test title: GET information about multiple alarms
     ...    Test objective: The objective is to retrieve information about the alarm list and perform a JSON schema and content validation of the returned alarms data structure
     ...    Pre-conditions:  none
-    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -37,7 +37,7 @@ GET information about multiple alarms with filters
     ...    Test title: GET information about multiple alarms with filters
     ...    Test objective: The objective is to retrieve information about the alarm list and perform a JSON schema and content validation of the returned alarms data structure, and verify that the retrieved information matches the issued attribute-based filters 
     ...    Pre-conditions:  none
-    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -50,7 +50,7 @@ GET information about multiple alarms Bad Request Invalid attribute-based filter
     ...    Test title: GET information about multiple alarms Bad Request Invalid attribute-based filtering parameters
     ...    Test objective:  The objective is to try to retrieve information about the alarm list with invalid filters and perform a JSON schema and content validation of the returned problem details data structure
     ...    Pre-conditions:  none
-    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions:  none
@@ -63,7 +63,7 @@ GET information about multiple alarms with "all_fields" attribute selector
     ...    Test title: GET information about multiple alarms with "all_fields" attribute selector
     ...    Test objective: The objective is to retrieve information about the alarm list
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -76,7 +76,7 @@ GET information about multiple alarms with exclude_default attribute selector
     ...    Test title: GET information about multiple alarms with "exclude_default" attribute selector
     ...    Test objective: The objective is to retrieve information about the alarm list
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -90,7 +90,7 @@ GET information about multiple alarms with fields attribute selector
     ...    Test title: GET information about multiple alarms with fields attribute selector
     ...    Test objective: The objective is to retrieve information about the alarm list
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -103,7 +103,7 @@ GET information about multiple alarms with "exclude_fields" attribute selector
     ...    Test title: GET information about multiple alarms with "exclude_fields" attribute selector
     ...    Test objective: The objective is to retrieve information about the alarm list
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -116,7 +116,7 @@ PUT Alarms - Method not implemented
     ...    Test title: PUT Alarms - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed for Fault management alarms on NFV
     ...    Pre-conditions:  none
-    ...    Reference: Clause 8.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -128,7 +128,7 @@ PATCH Alarms - Method not implemented
     ...    Test title: PATCH Alarms - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed for Fault management alarms on NFV
     ...    Pre-conditions:  none
-    ...    Reference: Clause 8.4.2.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.2.3.4 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -140,7 +140,7 @@ DELETE Alarms - Method not implemented
     ...    Test title: DELETE Alarms - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed for Fault management alarms on NFV
     ...    Pre-conditions:  none
-    ...    Reference: Clause 8.4.2.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.2.3.5 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -152,7 +152,7 @@ GET information about multiple alarms as Paged Response
     ...    Test title: GET information about multiple alarms as Paged Response
     ...    Test objective: The objective is to retrieve information about the alarm list as paged response.
     ...    Pre-conditions:  none
-    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -165,7 +165,7 @@ GET information about multiple alarms - Bad Request Response too Big
     ...    Test title: GET information about multiple alarms - Bad Request Response too Big
     ...    Test objective:  The objective is to test that the retrieval of information about the alarm list fails because response is too big, and perform a JSON schema and content validation of the returned problem details data structure
     ...    Pre-conditions:  none
-    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions:  none
@@ -178,7 +178,7 @@ GET information about multiple alarms with filter "id"
     ...    Test title: GET information about multiple alarms with filter "id"
     ...    Test objective: The objective is to retrieve information about the alarm list with filter "id" and perform a JSON schema and content validation of the returned alarms data structure, and verify that the retrieved information matches the issued attribute-based filters 
     ...    Pre-conditions:  none
-    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -192,7 +192,7 @@ GET information about multiple alarms with filter "rootCauseFaultyComponent.faul
     ...    Test title: GET information about multiple alarms with filter "rootCauseFaultyComponent.faultyNestedNsInstanceId"
     ...    Test objective: The objective is to retrieve information about the alarm list with filter "rootCauseFaultyComponent.faultyNestedNsInstanceId" and perform a JSON schema and content validation of the returned alarms data structure, and verify that the retrieved information matches the issued attribute-based filters 
     ...    Pre-conditions:  none
-    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -206,7 +206,7 @@ GET information about multiple alarms with filter "rootCauseFaultyComponent.faul
     ...    Test title: GET information about multiple alarms with filter "rootCauseFaultyComponent.faultyNsVirtualLinkInstanceId"
     ...    Test objective: The objective is to retrieve information about the alarm list with filter "rootCauseFaultyComponent.faultyNsVirtualLinkInstanceId" and perform a JSON schema and content validation of the returned alarms data structure, and verify that the retrieved information matches the issued attribute-based filters 
     ...    Pre-conditions:  none
-    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -220,7 +220,7 @@ GET information about multiple alarms with filter "rootCauseFaultyComponent.faul
     ...    Test title: GET information about multiple alarms with filter "rootCauseFaultyComponent.faultyVnfInstanceId"
     ...    Test objective: The objective is to retrieve information about the alarm list with filter "rootCauseFaultyComponent.faultyVnfInstanceId" and perform a JSON schema and content validation of the returned alarms data structure, and verify that the retrieved information matches the issued attribute-based filters 
     ...    Pre-conditions:  none
-    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -234,7 +234,7 @@ GET information about multiple alarms with filter "rootCauseFaultyResource.fault
     ...    Test title: GET information about multiple alarms with filter "rootCauseFaultyResource.faultyResourceType"
     ...    Test objective: The objective is to retrieve information about the alarm list with filter "rootCauseFaultyResource.faultyResourceType" and perform a JSON schema and content validation of the returned alarms data structure, and verify that the retrieved information matches the issued attribute-based filters 
     ...    Pre-conditions:  none
-    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -248,7 +248,7 @@ GET information about multiple alarms with filter "eventType"
     ...    Test title: GET information about multiple alarms with filter "eventType"
     ...    Test objective: The objective is to retrieve information about the alarm list with filter "eventType" and perform a JSON schema and content validation of the returned alarms data structure, and verify that the retrieved information matches the issued attribute-based filters 
     ...    Pre-conditions:  none
-    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -262,7 +262,7 @@ GET information about multiple alarms with filter "perceivedSeverity"
     ...    Test title: GET information about multiple alarms with filter "perceivedSeverity"
     ...    Test objective: The objective is to retrieve information about the alarm list with filter "perceivedSeverity" and perform a JSON schema and content validation of the returned alarms data structure, and verify that the retrieved information matches the issued attribute-based filters 
     ...    Pre-conditions:  none
-    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -276,7 +276,7 @@ GET information about multiple alarms with filter "probableCause"
     ...    Test title: GET information about multiple alarms with filter "probableCause"
     ...    Test objective: The objective is to retrieve information about the alarm list with filter "probableCause" and perform a JSON schema and content validation of the returned alarms data structure, and verify that the retrieved information matches the issued attribute-based filters 
     ...    Pre-conditions:  none
-    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability:  none
     ...    Post-Conditions: none
diff --git a/SOL005/NSFaultManagement-API/ApiVersion.robot b/SOL005/NSFaultManagement-API/ApiVersion.robot
index 663f8b96d950f0761d0074cb0fc7f0a6c9add238..2d67fab77c7af8305b974c60a30f5ae87dc613b8 100644
--- a/SOL005/NSFaultManagement-API/ApiVersion.robot
+++ b/SOL005/NSFaultManagement-API/ApiVersion.robot
@@ -13,7 +13,7 @@ POST API Version - Method not implemented
     ...    Test title: POST API version - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v2.7.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -25,7 +25,7 @@ GET API Version
     ...    Test title: GET API Version
     ...    Test objective: The objective is to test that GET method successfully return ApiVersionInformation
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v2.7.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -38,7 +38,7 @@ PUT API Version - Method not implemented
     ...    Test title: PUT API Version - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v2.7.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -50,7 +50,7 @@ PATCH API Version - Method not implemented
     ...    Test title: PATCH API Version - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v2.7.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -62,7 +62,7 @@ DELETE API Version - Method not implemented
     ...    Test title: DELETE API Version - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v2.7.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -74,7 +74,7 @@ POST API Version with apiMajorVerion - Method not implemented
     ...    Test title: POST API version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v2.7.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -86,7 +86,7 @@ GET API Version with apiMajorVerion
     ...    Test title: GET API Version with apiMajorVerion
     ...    Test objective: The objective is to test that GET method successfully return ApiVersionInformation
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v2.7.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -99,7 +99,7 @@ PUT API Version with apiMajorVerion - Method not implemented
     ...    Test title: PUT API Version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v2.7.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -111,7 +111,7 @@ PATCH API Version with apiMajorVerion - Method not implemented
     ...    Test title: PATCH API Version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v2.7.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -123,7 +123,7 @@ DELETE API Version with apiMajorVerion - Method not implemented
     ...    Test title: DELETE API Version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v2.7.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL005/NSFaultManagement-API/IndividualAlarm.robot b/SOL005/NSFaultManagement-API/IndividualAlarm.robot
index d0b5dafe4c7e9e9f8c319022e995e960ae8a5ae3..957752f388066b4220c87290f37cfff3a732bce9 100644
--- a/SOL005/NSFaultManagement-API/IndividualAlarm.robot
+++ b/SOL005/NSFaultManagement-API/IndividualAlarm.robot
@@ -14,7 +14,7 @@ POST Individual Alarm - Method not implemented
     ...    Test title:POST Individual Alarm - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed for Fault management individual alarm on NFV
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.3.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.3.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions:  none
@@ -26,7 +26,7 @@ GET information about Individual Alarm
     ...    Test title: GET information about Individual Alarm 
     ...    Test objective: The objective is to retrieve information about individual alarm and perform a JSON schema and content validation of the returned alarm data structure
     ...    Pre-conditions: The related alarm exists
-    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions: none   
@@ -39,7 +39,7 @@ GET information about Invalid Individual Alarm
     ...    Test title: GET information about Invalid Individual Alarm 
     ...    Test objective: The objective is to try to read an Invalid individual alarm and get 404 not found response code
     ...    Pre-conditions: The related alarm does not exists
-    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions:   none 
@@ -52,7 +52,7 @@ PUT Individual Alarm - Method not implemented
     ...    Test title:PUT Individual Alarm - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed for Fault management individual alarm on NFV
     ...    Pre-conditions:  none
-    ...    Reference: Clause 8.4.3.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.3.3.3 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions:   none
@@ -64,7 +64,7 @@ PATCH Alarm
     ...    Test title: Modify an individual alarm resource
     ...    Test objective: The objective is to Modify an individual alarm resource and perform a JSON schema and content validation of the returned alarm modifications data structure
     ...    Pre-conditions: The related alarm exists
-    ...    Reference: Clause 8.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions:  none
@@ -77,7 +77,7 @@ PATCH Alarm - Conflict
     ...    Test title: Modify an individual alarm resource - Conflict
     ...    Test objective: The objective is to test that an individual alarm resource cannot be modified if the alarm is already in the state that is requested to be set
     ...    Pre-conditions: The related alarm exists
-    ...    Reference: Clause 8.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -90,7 +90,7 @@ PATCH Alarm - Precondition failed
     ...    Test title: Modify an individual alarm resource - Precondition failed
     ...    Test objective: The objective is to test that an individual alarm resource cannot be modifed if the resource was modified by another entity
     ...    Pre-conditions: The related alarm exists
-    ...    Reference: Clause 8.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions: 
@@ -103,7 +103,7 @@ DELETE Individual Alarm - Method not implemented
     ...    Test title:DELETE Individual Alarm - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed for Fault management individual alarm on NFV
     ...    Pre-conditions:  none
-    ...    Reference: Clause 8.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions: none
diff --git a/SOL005/NSFaultManagement-API/IndividualSubscription.robot b/SOL005/NSFaultManagement-API/IndividualSubscription.robot
index b89a6501219fc297e4dcf4322c27b2d2fe667344..91a2d2e706e5c3851ec5b1805a42fb2fa825fd40 100644
--- a/SOL005/NSFaultManagement-API/IndividualSubscription.robot
+++ b/SOL005/NSFaultManagement-API/IndividualSubscription.robot
@@ -11,7 +11,7 @@ Post Individual Subscription - Method not implemented
     ...    Test title:Post Individual Subscription - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed for Fault management subscription on NFV  
     ...    Pre-conditions:none 
-    ...    Reference: Clause 8.4.5.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.5.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -23,7 +23,7 @@ Get Information about an individual subscription
     ...    Test title: Get Information about an individual subscription
     ...    Test objective: The objective is to read an individual subscription for NFVO alarms subscribed by the client and perform a JSON schema and content validation of the returned fault management individual subscription data structure
     ...    Pre-conditions: The subscription with the given id exists
-    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -36,7 +36,7 @@ PUT an individual subscription - Method not implemented
     ...    Test title:PUT an individual subscription - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed for Fault management subscription on NFV   
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.5.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.5.3.3 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -48,7 +48,7 @@ PATCH an individual subscription - Method not implemented
     ...    Test title:PATCH an individual subscription - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed for Fault management subscription on NFV  
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.5.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.5.3.4 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -60,7 +60,7 @@ DELETE an individual subscription
     ...    Test title:DELETE an individual subscription
     ...    Test objective: The objective is to DELETE an individual subscription 
     ...    Pre-conditions: The Subsbcription already exists
-    ...    Reference: Clause 8.4.5.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.5.3.5 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions: subscription is not deleted
diff --git a/SOL005/NSFaultManagement-API/NotificationConsumer.robot b/SOL005/NSFaultManagement-API/NotificationConsumer.robot
index 5964b816e632d1942a5e71e41d284db73bd19c2a..e64f7cd787063b7b44c534cf01181b57d365f56a 100644
--- a/SOL005/NSFaultManagement-API/NotificationConsumer.robot
+++ b/SOL005/NSFaultManagement-API/NotificationConsumer.robot
@@ -13,7 +13,7 @@ NS Fault Alarm Notification
     ...    Test title: NS Fault Alarm Notification
     ...    Test objective: The objective is to test that NS Fault Alarm Notification is delivered with success to the notification consumer
     ...    Pre-conditions: A NS instance is instantiated, and a subscription for fault alarm notifications is available in the NFVO.
-    ...    Reference: Clause 8.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -25,7 +25,7 @@ NS Fault Alarm Cleared Notification
     ...    Test title: NS Fault Alarm Cleared Notification
     ...    Test objective: The objective is to test that NS Fault Alarm Cleared Notification is delivered with success to the notification consumer
     ...    Pre-conditions: A NS instance is instantiated, and a subscription for fault alarm cleared notifications is available in the NFVO.
-    ...    Reference: Clause 8.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -37,7 +37,7 @@ NS Fault Alarm List Rebuilt Notification
     ...    Test title: NS Fault Alarm List Rebuilt Notification
     ...    Test objective: The objective is to test that NS Fault Alarm List Rebuilt Notification is delivered with success to the notification consumer
     ...    Pre-conditions: A NS instance is instantiated, and a subscription for fault alarm list rebuilt notifications is available in the NFVO.
-    ...    Reference: Clause 8.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL005/NSFaultManagement-API/NotificationEndpoint.robot b/SOL005/NSFaultManagement-API/NotificationEndpoint.robot
index 97421160ea335abcccb43cc18607d4a3aac21efe..3e811a2a358821b72eb1a244c2cfc359951fb6a9 100644
--- a/SOL005/NSFaultManagement-API/NotificationEndpoint.robot
+++ b/SOL005/NSFaultManagement-API/NotificationEndpoint.robot
@@ -16,7 +16,7 @@ NS Fault Alarm Notification
     ...    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. 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: Clause 8.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -29,7 +29,7 @@ NS Fault Alarm Cleared Notification
     ...    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. 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: Clause 8.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -42,7 +42,7 @@ NS Fault Alarm List Rebuilt Notification
     ...    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. 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: Clause 8.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL005/NSFaultManagement-API/Subscriptions.robot b/SOL005/NSFaultManagement-API/Subscriptions.robot
index 4850c4b0769984d3cf78c6f321bd1491bca12bb9..5c5480266eb9810bc3ed9db2eb80427bb8a68ced 100644
--- a/SOL005/NSFaultManagement-API/Subscriptions.robot
+++ b/SOL005/NSFaultManagement-API/Subscriptions.robot
@@ -16,7 +16,7 @@ Create a new alarm subscription
     ...    Test title: Create a new alarm subscription
     ...    Test objective: The objective is to create a new Fault management alarm subscriptions and perform a JSON schema and content validation of the returned fault management alarms subscription data structure
     ...    Pre-conditions: no subscription with the same filter and callbackUri exists
-    ...    Reference: Clause 8.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -30,7 +30,7 @@ Create a new alarm subscription
     # ...    Test title: Create a new alarm subscription - DUPLICATION
     # ...    Test objective: The objective is to create a new subscription with the NFV allowing duplication and perform a JSON schema and content validation of the returned fault management alarms subscription data structure..
     # ...    Pre-conditions: subscription with the same filter and callbackUri exists
-    # ...    Reference: Clause 8.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    # ...    Reference: Clause 8.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
     # ...    Config ID: Config_prod_NFVO 
     # ...    Applicability: the NFVO allows creating a subscription resource if another subscription resource with the same filter and callbackUri already exists
     # ...    Post-Conditions: none
@@ -44,7 +44,7 @@ Create a new alarm subscription
     # ...    Test title: Create a new alarm subscription - NO DUPLICATION
     # ...    Test objective: The objective is to create a new subscription with the NFV not allowing duplication and perform a JSON schema and content validation of the returned fault management alarms subscription data structure.
     # ...    Pre-conditions: subscription with the same filter and callbackUri exists
-    # ...    Reference: Clause 8.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    # ...    Reference: Clause 8.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
     # ...    Config ID: Config_prod_NFVO 
     # ...    Applicability: the NFVO decides to not create a duplicate subscription resource 
     # ...    Post-Conditions: none
@@ -57,7 +57,7 @@ Create a duplicated Subscription
     ...    Test title: Create a duplicated alarm subscription
     ...    Test objective: The objective is to create a new subscription with the NFV allowing duplication and perform a JSON schema and content validation of the returned fault management alarms subscription data structure..
     ...    Pre-conditions: subscription with the same filter and callbackUri exists
-    ...    Reference: Clause 8.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability: 
     ...    Post-Conditions: none
@@ -71,7 +71,7 @@ Retrieve a list of alarm subscriptions
     ...    Test title: Retrieve a list of alarm subscriptions
     ...    Test objective: The objective is to retrieve the list of active subscriptions and perform a JSON schema and content validation of the returned fault management alarms subscription data structure.
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -84,7 +84,7 @@ Retrieve a list of alarm subscriptions - Filter
     ...    Test title: Retrieve a list of alarm subscriptions - Filter
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter and perform a JSON schema and content validation of the returned fault management alarms subscription data structure.
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -97,7 +97,7 @@ GET subscriptions - Bad Request Invalid attribute-based filtering parameters
     ...    Test title: GET subscriptions - Bad Request Invalid attribute-based filtering parameters
     ...    Test objective:The objective is to retrieve the list of active subscriptions with Invalid attribute-based filtering parameters and perform a JSON schema and content validation of the returned problem details data structure.
     ...    Pre-conditions:  none
-    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:   none
     ...    Post-Conditions: none     
@@ -110,7 +110,7 @@ GET subscriptions with "all_fields" attribute selector
     ...    Test title: GET subscriptions with "all_fields" attribute selector
     ...    Test objective: The objective is to retrieve the list of active subscriptions with attribute selector
     ...    Pre-conditions: 
-    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -123,7 +123,7 @@ GET subscriptions with "exclude_default" attribute selector
     ...    Test title: GET subscriptions with "exclude_default" attribute selector
     ...    Test objective: The objective is to retrieve the list of active subscriptions with attribute selector
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -136,7 +136,7 @@ GET subscriptions with "fields" attribute selector
     ...    Test title: GET subscriptions with "fields" attribute selector
     ...    Test objective: The objective is to retrieve the list of active subscriptions with attribute selector
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -149,7 +149,7 @@ GET subscriptions with "exclude_fields" attribute selector
     ...    Test title: GET subscriptions with "exclude_fields" attribute selector
     ...    Test objective: The objective is to retrieve the list of active subscriptions with attribute selector
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -162,7 +162,7 @@ PUT subscriptions - Method not implemented
     ...    Test title:PUT subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to for Fault management subscriptions on NFV 
     ...    Pre-conditions:  none
-    ...    Reference: Clause 8.4.4.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.4.3.3 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions:   none
@@ -174,7 +174,7 @@ PATCH subscriptions - Method not implemented
     ...    Test title:PATCH subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to for Fault management subscriptions on NFV  
     ...    Pre-conditions:  none
-    ...    Reference: Clause 8.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions:   none
@@ -186,7 +186,7 @@ DELETE subscriptions - Method not implemented
     ...    Test title: DELETE subscriptions - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to for Fault management subscriptions on NFV 
     ...    Pre-conditions:  none
-    ...    Reference: Clause 8.4.4.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.4.3.5 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -198,7 +198,7 @@ Retrieve a list of alarm subscriptions as Paged Response
     ...    Test title: Retrieve a list of alarm subscriptions as Paged Response
     ...    Test objective: The objective is to retrieve the list of active subscriptions as paged response.
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -211,7 +211,7 @@ GET subscriptions - Bad Request Response too Big
     ...    Test title: GET subscriptions - Bad Request Response too Big
     ...    Test objective:The objective is test that the retrieval of active subscriptions list fails because response is too big, and perform a JSON schema and content validation of the returned problem details data structure.
     ...    Pre-conditions:  none
-    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:   none
     ...    Post-Conditions: none     
@@ -224,7 +224,7 @@ Retrieve a list of alarm subscriptions with filter "id"
     ...    Test title: Retrieve a list of alarm subscriptions with filter "id"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "id" and perform a JSON schema and content validation of the returned fault management alarms subscription data structure.
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -238,7 +238,7 @@ Retrieve a list of alarm subscriptions with filter "filter.notificationTypes"
     ...    Test title: Retrieve a list of alarm subscriptions with filter "filter.notificationTypes"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "filter.notificationTypes" and perform a JSON schema and content validation of the returned fault management alarms subscription data structure.
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -252,7 +252,7 @@ Retrieve a list of alarm subscriptions with filter "filter.faultyResourceTypes"
     ...    Test title: Retrieve a list of alarm subscriptions with filter "filter.faultyResourceTypes"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "filter.faultyResourceTypes" and perform a JSON schema and content validation of the returned fault management alarms subscription data structure.
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -266,7 +266,7 @@ Retrieve a list of alarm subscriptions with filter "filter.perceivedSeverities"
     ...    Test title: Retrieve a list of alarm subscriptions with filter "filter.perceivedSeverities"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "filter.perceivedSeverities" and perform a JSON schema and content validation of the returned fault management alarms subscription data structure.
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -280,7 +280,7 @@ Retrieve a list of alarm subscriptions with filter "filter.eventTypes"
     ...    Test title: Retrieve a list of alarm subscriptions with filter "filter.eventTypes"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "filter.eventTypes" and perform a JSON schema and content validation of the returned fault management alarms subscription data structure.
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -294,7 +294,7 @@ Retrieve a list of alarm subscriptions with filter "filter.probableCauses"
     ...    Test title: Retrieve a list of alarm subscriptions with filter "filter.probableCauses"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "filter.probableCauses" and perform a JSON schema and content validation of the returned fault management alarms subscription data structure.
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -308,7 +308,7 @@ Create a new alarm subscription - Unprocessable Entity
     ...    Test title: Create a new alarm subscription- Unprocessable Entity
     ...    Test objective: The objective is to test that creation of a new Fault management alarm subscriptions fials when content type of the payload body is supported and the payload body of a request contains syntactically correct data but the data cannot be processed.
     ...    Pre-conditions: 
-    ...    Reference: Clause 8.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 8.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability: none
     ...    Post-Conditions: none