diff --git a/SOL002/VNFFaultManagement-API/Alarms.robot b/SOL002/VNFFaultManagement-API/Alarms.robot
index e2ab4b7822b5fd32ec9dcbb81e3fcca1a45f8bc1..168d9bce6f498029a96db36a3a1ab0e54ad1aa9b 100644
--- a/SOL002/VNFFaultManagement-API/Alarms.robot
+++ b/SOL002/VNFFaultManagement-API/Alarms.robot
@@ -8,97 +8,147 @@ Library    OperatingSystem
 
 *** Test Cases ***
 POST Alarms - Method not implemented
-    log    Trying to perform a PUT. This method should not be implemented
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/alarms
-    Log    Validate Status code
-    Integer    response status    405
+    [Documentation]    Test ID: 6.3.4.2.1
+    ...    Test title: POST Alarms - Method not implemented
+    ...    Test objective: The objective is to test that the method is not implemented
+    ...    Pre-conditions: 
+    ...    Reference: section 7.4.2.3.1 - SOL002 v2.4.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: 
+    ...    Post-Conditions: none
+    POST Alarms Task
+    Check HTTP Response Status Code Is    405
 
 Get information about multiple alarms 
-    [Documentation]    Test ID: 7.4.2.1
+    [Documentation]    Test ID: 6.3.4.2.2
     ...    Test title: Get information about multiple alarms
     ...    Test objective: The objective is to retrieve information about the alarm list
     ...    Pre-conditions: 
-    ...    Reference: section 7.4.2 - SOL002 v2.4.1
+    ...    Reference: section 7.4.2.3.2 - SOL002 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions:  
-    Log    Query VNF The GET method queries information about multiple alarms.
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms
-    Log    Validate Status code
-    Integer    response status    200
-    ${contentType}=    Output    response headers Content-Type
-    Should Contain    ${contentType}    ${CONTENT_TYPE}
-    ${result}=    Output    response body
-    Validate Json    alarms.schema.json    ${result}
-    Log    Validation OK
+    GET Alarms Task
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is    alarms
 
 Get information about multiple alarms with filters 
-    [Documentation]    Test ID: 7.4.2.2
+    [Documentation]    Test ID: 6.3.4.2.3
     ...    Test title: Get information about multiple alarms - with filters
     ...    Test objective: The objective is to retrieve information about the alarm list
     ...    Pre-conditions: 
-    ...    Reference: section 7.4.2 - SOL002 v2.4.1
+    ...    Reference: section 7.4.2.3.3 - SOL002 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: 
-    Log    Query VNF The GET method queries information about multiple alarms with filters.
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?${alarm_filter}=${managedObjectId} 
-    Log    Validate Status code
-    Integer    response status    200
-    ${contentType}=    Output    response headers Content-Type
-    Should Contain    ${contentType}    ${CONTENT_TYPE}
-    ${result}=    Output    response body
-    Validate Json    alarms.schema.json    ${result}
-    Log    Validation OK
+    GET Alarms Task with filter
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is    alarms
 
 Get information about multiple alarms Bad Request Invalid attribute-based filtering parameters
-    [Documentation]    Test ID: 7.4.2.2-1
+    [Documentation]    Test ID: 6.3.4.2.4
     ...    Test title: Get information about multiple alarms - with Invalid attribute-based filtering parameters
     ...    Test objective: The objective is to retrieve information about the alarm list
     ...    Pre-conditions: 
-    ...    Reference: section 7.4.2 - SOL002 v2.4.1
+    ...    Reference: section 7.4.2.3.4 - SOL002 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: 
-    Log    Query VNF The GET method queries information about multiple alarm instances.
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"} 
-    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?${invalid_alarm_filter}=${managedObjectId} 
-    Log    Validate Status code
-    Integer    response status    400
-    ${problemDetails}=    Output    response body
-    Validate Json    ProblemDetails.schema.json    ${problemDetails}
-    Log    Validation OK
+    GET Alarms Task with filter
+    Check HTTP Response Status Code Is    400
+    Check HTTP Response Body Json Schema Is    ProblemDetails
     
 PUT Alarms - Method not implemented
+    [Documentation]    Test ID: 6.3.4.2.5
+    ...    Test title: PUT Alarms - Method not implemented
+    ...    Test objective: The objective is to test that the method is not implemented
+    ...    Pre-conditions: 
+    ...    Reference: section 7.4.2.3.4 - SOL002 v2.4.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: 
+    ...    Post-Conditions: none
+    PUT Alarms Task
+    Check HTTP Response Status Code Is    405
+
+PATCH Alarms - Method not implemented
+    [Documentation]    Test ID: 6.3.4.2.6
+    ...    Test title: PATCH Alarms - Method not implemented
+    ...    Test objective: The objective is to test that the method is not implemented
+    ...    Pre-conditions: 
+    ...    Reference: section 7.4.2.3.5 - SOL002 v2.4.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: 
+    ...    Post-Conditions: none
+    PATCH Alarms Task
+    Check HTTP Response Status Code Is    405
+
+DELETE Alarms - Method not implemented
+    [Documentation]    Test ID: 6.3.4.2.7
+    ...    Test title: DELETE Alarms - Method not implemented
+    ...    Test objective: The objective is to test that the method is not implemented
+    ...    Pre-conditions: 
+    ...    Reference: section 7.4.2.3.6 - SOL002 v2.4.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: 
+    ...    Post-Conditions: none
+    DELETE Alarms Task
+    Check HTTP Response Status Code Is    405
+
+*** Keywords ***
+POST Alarms Task
+    log    Trying to perform a POST. This method should not be implemented
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Post    ${apiRoot}/${apiName}/${apiVersion}/alarms
+    ${outputResponse}=    Output    response
+	Set Global Variable    @{response}    ${outputResponse}
+PUT Alarms Task
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Put    ${apiRoot}/${apiName}/${apiVersion}/alarms
-    Log    Validate Status code
-    Integer    response status    405
-
-PATCH Alarms - Method not implemented
+    ${outputResponse}=    Output    response
+	Set Global Variable    @{response}    ${outputResponse}
+PATCH Alarms Task
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Patch    ${apiRoot}/${apiName}/${apiVersion}/alarms
-    Log    Validate Status code
-    Integer    response status    405
-
-DELETE Alarms - Method not implemented
+    ${outputResponse}=    Output    response
+	Set Global Variable    @{response}    ${outputResponse}
+DELETE Alarms Task
     log    Trying to perform a DELETE. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Delete    ${apiRoot}/${apiName}/${apiVersion}/alarms
-    Log    Validate Status code
-    Integer    response status    405
+    ${outputResponse}=    Output    response
+	Set Global Variable    @{response}    ${outputResponse}			
+GET Alarms Task	
+	Log    Query VNF The GET method queries information about multiple alarms.
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Log    Execute Query and validate response
+    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms
+    ${outputResponse}=    Output    response
+	Set Global Variable    @{response}    ${outputResponse}
+GET Alarms Task with filter
+	Log    Query VNF The GET method queries information about multiple alarms with filters.
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Log    Execute Query and validate response
+    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?${alarm_filter}=${managedObjectId} 
+    ${outputResponse}=    Output    response
+	Set Global Variable    @{response}    ${outputResponse}	
+GET Alarms Task with invalid filter
+	Log    Query VNF The GET method queries information about multiple alarms with filters.
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Log    Execute Query and validate response
+    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?${invalid_alarm_filter}=${managedObjectId} 
+    ${outputResponse}=    Output    response
+	Set Global Variable    @{response}    ${outputResponse}	
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}    
+    Should Be Equal    ${response.status_code}    ${expected_status}
+    Log    Status code validated 
 
diff --git a/SOL002/VNFFaultManagement-API/EscalatePerceivedSeverityTask.robot b/SOL002/VNFFaultManagement-API/EscalatePerceivedSeverityTask.robot
index d81cb4dcfcb7bfc440018c7908aabf8eac26c722..7826dfbffc10ef5384c983756f1d9d3101ae5830 100644
--- a/SOL002/VNFFaultManagement-API/EscalatePerceivedSeverityTask.robot
+++ b/SOL002/VNFFaultManagement-API/EscalatePerceivedSeverityTask.robot
@@ -5,49 +5,65 @@ Suite Setup    Check resource existance
 
 *** Test Cases ***
 Escalate the perceived severity 
-    [Documentation]    Test ID: 7.4.4.1
+    [Documentation]    Test ID: 6.3.4.3.1
     ...    Test title: Escalate the perceived severity
     ...    Test objective: To enable the consumer to escalate the perceived severity of an alarm that is represented by an individual alarm resource.
     ...    Pre-conditions: The resource representing the individual alarm has been created
-    ...    Reference: section 7.4.4 - SOL002 v2.4.1
+    ...    Reference: section 7.4.4.3.1 - SOL002 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions:   
-    Log    escalate the perceived severity of an alarm with the VNFM
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}/escalate    ${PerceivedSeverity}
-    Integer    response status    204
-    Log    Status code validated
-   
+    Post escalate severity
+    Check HTTP Response Status Code Is    204
+    
 GET Escalate the perceived severity - Method not implemented
-    log    Trying to perform a GET. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}/escalate    
-    Log    Validate Status code
-    Integer    response status    405
+    [Documentation]    Test ID: 6.3.4.3.2
+    ...    Test title: GET Escalate the perceived severity - Method not implemented
+    ...    Test objective: to thest that the method is not implemented
+    ...    Pre-conditions: 
+    ...    Reference: section 7.4.4.3.2 - SOL002 v2.4.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: 
+    ...    Post-Conditions:   
+    Get escalate severity
+    Check HTTP Response Status Code Is    405
 
 PUT Escalate the perceived severity - Method not implemented
-    log    Trying to perform a PUT. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}/escalate    
-    Log    Validate Status code
-    Integer    response status    405
-
+    [Documentation]    Test ID: 6.3.4.3.3
+    ...    Test title: PUT Escalate the perceived severity - Method not implemented
+    ...    Test objective: to thest that the method is not implemented
+    ...    Pre-conditions: 
+    ...    Reference: section 7.4.4.3.3 - SOL002 v2.4.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: 
+    ...    Post-Conditions:   
+    Put escalate severity
+    Check HTTP Response Status Code Is    405
+    
 PATCH Escalate the perceived severity - Method not implemented
-    log    Trying to perform a PATCH. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}/escalate    
-    Log    Validate Status code
-    Integer    response status    405
+    [Documentation]    Test ID: 6.3.4.3.4
+    ...    Test title: PATCH Escalate the perceived severity - Method not implemented
+    ...    Test objective: to thest that the method is not implemented
+    ...    Pre-conditions: 
+    ...    Reference: section 7.4.4.3.4 - SOL002 v2.4.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: 
+    ...    Post-Conditions:   
+    Put escalate severity
+    Check HTTP Response Status Code Is    405
+    
     
 DELETE Escalate the perceived severity - Method not implemented
-    log    Trying to perform a DELETE. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}/escalate    
-    Log    Validate Status code
-    Integer    response status    405
+    [Documentation]    Test ID: 6.3.4.3.5
+    ...    Test title: PATCH Escalate the perceived severity - Method not implemented
+    ...    Test objective: to thest that the method is not implemented
+    ...    Pre-conditions: 
+    ...    Reference: section 7.4.4.3.5 - SOL002 v2.4.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: 
+    ...    Post-Conditions:   
+    Delete escalate severity
+    Check HTTP Response Status Code Is    405
 
 *** Keywords ***
 Check resource existance
@@ -56,3 +72,35 @@ Check resource existance
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Get    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}
     Integer    response status    200
+POST escalate severity
+    Log    escalate the perceived severity of an alarm with the VNFM
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Post    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}/escalate    ${PerceivedSeverity}
+    ${outputResponse}=    Output    response
+	Set Global Variable    @{response}    ${outputResponse}
+GET escalate severity
+    log    Trying to perform a GET. This method should not be implemented
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}/escalate 
+    ${outputResponse}=    Output    response
+	Set Global Variable    @{response}    ${outputResponse} 
+PUT escalate severity	
+	log    Trying to perform a PUT. This method should not be implemented
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Put    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}/escalate    
+     ${outputResponse}=    Output    response
+	Set Global Variable    @{response}    ${outputResponse} 
+PATCH escalate severity
+    log    Trying to perform a PATCH. This method should not be implemented
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Patch    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}/escalate  
+     ${outputResponse}=    Output    response
+	Set Global Variable    @{response}    ${outputResponse} 
+DELETE escalate severity        
+    log    Trying to perform a DELETE. This method should not be implemented
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Delete    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}/escalate  
+     ${outputResponse}=    Output    response
+	Set Global Variable    @{response}    ${outputResponse} 
\ No newline at end of file
diff --git a/SOL002/VNFFaultManagement-API/IndividualAlarm.robot b/SOL002/VNFFaultManagement-API/IndividualAlarm.robot
index 2fc1c72eaa79565e502389ffae31090c9319befd..bb89f769c555a675b08e82e97364b5ba8cab2147 100644
--- a/SOL002/VNFFaultManagement-API/IndividualAlarm.robot
+++ b/SOL002/VNFFaultManagement-API/IndividualAlarm.robot
@@ -14,125 +14,153 @@ ${original_etag}    1234
 
 *** Test Cases ***
 POST Alarm - Method not implemented
-    log    Trying to perform a POST. This method should not be implemented
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}
-    Log    Validate Status code
-    Integer    response status    405
+    [Documentation]    Test ID: 6.3.4.2.1
+    ...    Test title: POST Alarms - Method not implemented
+    ...    Test objective: The objective is to test that the method is not implemented
+    ...    Pre-conditions: 
+    ...    Reference: section 7.4.3.3.1 - SOL002 v2.4.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: 
+    ...    Post-Conditions: none
+    POST Alarm Task
+    Check HTTP Response Status Code Is    405
 
 
-Get information about a configuration
-    [Documentation]    Test ID: 7.4.3.1
-    ...    Test title: Get information about an alarm
+Get information about an individual alarm
+    [Documentation]    Test ID: 6.3.4.2.2
+    ...    Test title: Get information about an individual alarm
     ...    Test objective: The objective is to read an individual alarm.
     ...    Pre-conditions: The related alarm exists
-    ...    Reference: section 7.4.3 - SOL002 v2.4.1
+    ...    Reference: section 7.4.3.3.2  - SOL002 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions:   
-    Log    Query VNF The GET method queries information about an alarm.
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}
-    Log    Validate Status code
-    Integer    response status    200
-    ${etag}    Output    response headers ETag
-    Set Suite Variable    &{original_etag}    ${etag}
-    ${contentType}=    Output    response headers Content-Type
-    Should Contain    ${contentType}    ${CONTENT_TYPE}
-    ${result}=    Output    response body
-    Validate Json    alarm.schema.json    ${result}
-    Log    Validation OK
+    GET Alarm Task
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is    alarm
+    
 
 
 PUT Alarm - Method not implemented
-    log    Trying to perform a PUT. This method should not be implemented
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}
-    Log    Validate Status code
-    Integer    response status    405
+     [Documentation]    Test ID: 6.3.4.2.3
+    ...    Test title: PUT Alarms - Method not implemented
+    ...    Test objective: The objective is to test that the method is not implemented
+    ...    Pre-conditions: 
+    ...    Reference: section 7.4.3.3.3 - SOL002 v2.4.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: 
+    ...    Post-Conditions: none
+    PUT Alarm Task
+    Check HTTP Response Status Code Is    405
 
 
 PATCH Alarm
-    [Documentation]    Test ID: 7.4.3.2
-    ...    Test title: Modify an individual alarm resource
-    ...    Test objective: The objective is to Modify an individual alarm resource
-    ...    Pre-conditions: The related alarm exists
-    ...    Reference: section 7.4.3 - SOL002 v2.4.1
+    [Documentation]    Test ID: 6.3.4.2.3
+    ...    Test title: PUT Alarms - Method not implemented
+    ...    Test objective: The objective is to test that the method is not implemented
+    ...    Pre-conditions: 
+    ...    Reference: section 7.4.3.3.4 - SOL002 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
-    ...    Post-Conditions: 
-    log    Trying to perform a PATCH. This method modifies an individual alarm resource
-    Set Headers  {"Accept":"${ACCEPT}"} 
-    Set Headers  {"Content-Type": "${CONTENT_TYPE_PATCH}"}
-    Set Headers  {"If-Match": "${original_etag[0]}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/alarmModifications.json
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}    ${body}
-    Log    Validate Status code
-    Integer    response status    200
-    ${contentType}=    Output    response headers Content-Type
-    Should Contain    ${contentType}    ${CONTENT_TYPE}
-    ${result}=    Output    response body
-    Validate Json    alarmModifications.schema.json    ${result}
-    Log    Validation OK
+    ...    Post-Conditions: none
+    PUT Alarm Task
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is     alarmModifications
     
-
-
-
 PATCH Alarm - Precondition failed
-    [Documentation]    Test ID: 7.4.3.2-1
+    [Documentation]    Test ID: 6.3.4.2.4
     ...    Test title: Modify an individual alarm resource - Precondition failed
     ...    Test objective: The objective is to Modify an individual alarm resource
     ...    Pre-conditions: The related alarm exists
-    ...    Reference: section 7.4.3 - SOL002 v2.4.1
+    ...    Reference: section 7.4.3.3.4 - SOL002 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: The alarm resource is not modified
-    Depends On Test    PATCH Alarm    # If the previous test scceeded, it means that Etag has been modified
-    log    Trying to perform a PATCH. This method modifies an individual alarm resource
-    Set Headers  {"Accept":"${ACCEPT}"} 
-    Set Headers  {"Content-Type": "${CONTENT_TYPE_PATCH}"} 
-    Set Headers    {"If-Match": "${original_etag[0]}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/alarmModifications.json
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}    ${body}
-    Log    Validate Status code
-    Integer    response status    412
-    ${problemDetails}=    Output    response body
-    Validate Json    ProblemDetails.schema.json    ${problemDetails}
-    Log    Validation OK
-
+    PUT Alarm Task
+    Check HTTP Response Status Code Is    412
+    Check HTTP Response Body Json Schema Is     ProblemDetails
+    
 PATCH Alarm - Conflict
-    [Documentation]    Test ID: 7.4.3.2-1
-    ...    Test title: Modify an individual alarm resource - Conflict
+    [Documentation]    Test ID: 6.3.4.2.5
+    ...    Test title: Modify an individual alarm resource - Precondition failed
     ...    Test objective: The objective is to Modify an individual alarm resource
     ...    Pre-conditions: The related alarm exists
-    ...    Reference: section 7.4.3 - SOL002 v2.4.1
+    ...    Reference: section 7.4.3.3.4 - SOL002 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: The alarm resource is not modified
-    Depends On Test    PATCH Alarm    # If the previous test scceeded, it means that the alarm is in ackownledged state
+    PUT Alarm Task
+    Check HTTP Response Status Code Is    409
+    Check HTTP Response Body Json Schema Is     ProblemDetails
+    
+
+DELETE Alarm - Method not implemented
+    [Documentation]    Test ID: 6.3.4.2.6
+    ...    Test title: DELETE Alarm - Method not implemented
+    ...    Test objective: The objective is to test that the method is not implemented
+    ...    Pre-conditions: 
+    ...    Reference: section 7.4.3.3.5 - SOL002 v2.4.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: 
+    ...    Post-Conditions: 
+    DELETE Alarm Task
+    Check HTTP Response Status Code Is    405
+
+*** Keywords ***
+POST Alarm Task
+    log    Trying to perform a POST. This method should not be implemented
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Post    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}
+    ${outputResponse}=    Output    response
+	Set Global Variable    @{response}    ${outputResponse}
+PUT Alarm Task
+    log    Trying to perform a PUT. This method should not be implemented
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Put    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}     ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    @{response}    ${outputResponse}
+PATCH Alarm Task
     log    Trying to perform a PATCH. This method modifies an individual alarm resource
-    Set Headers  {"Accept":"${ACCEPT}"}
-    Set Headers  {"Content-Type": "${CONTENT_TYPE_PATCH}"} 
+    Set Headers  {"Accept":"${ACCEPT}"} 
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_PATCH}"}
+    Set Headers  {"If-Match": "${original_etag[0]}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    jsons/alarmModifications.json
     Patch    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}    ${body}
-    Log    Validate Status code
-    Integer    response status    409
-    ${problemDetails}=    Output    response body
-    Validate Json    ProblemDetails.schema.json    ${problemDetails}
-    Log    Validation OK
-
-DELETE Alarm - Method not implemented
+    ${outputResponse}=    Output    response
+	Set Global Variable    @{response}    ${outputResponse}
+DELETE Alarm Task
     log    Trying to perform a DELETE. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Delete    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}
-    Log    Validate Status code
-    Integer    response status    405   
+    ${outputResponse}=    Output    response
+	Set Global Variable    @{response}    ${outputResponse}			
+GET Alarm Task	
+	Log    Query VNF The GET method queries information about individual alarm.
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Log    Execute Query and validate response
+    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}
+    ${etag}    Output    response headers ETag
+    Set Suite Variable    &{original_etag}    ${etag}
+    ${outputResponse}=    Output    response
+	Set Global Variable    @{response}    ${outputResponse}
+GET Alarm Task with filter
+	Log    Query VNF The GET method queries information about individual alarm with filters.
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Log    Execute Query and validate response
+    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?${alarm_filter}=${managedObjectId} 
+    ${outputResponse}=    Output    response
+	Set Global Variable    @{response}    ${outputResponse}	
+GET Alarm Task with invalid filter
+	Log    Query VNF The GET method queries information about individual alarm with filters.
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Log    Execute Query and validate response
+    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?${invalid_alarm_filter}=${managedObjectId} 
+    ${outputResponse}=    Output    response
+	Set Global Variable    @{response}    ${outputResponse}	
\ No newline at end of file
diff --git a/SOL002/VNFFaultManagement-API/IndividualSubscription.robot b/SOL002/VNFFaultManagement-API/IndividualSubscription.robot
index 9c251085bf6628526296d3762de529a76007ed8a..b60f4bbc8ef39f43f4f49dc1fa1ba14ced1ecf36 100644
--- a/SOL002/VNFFaultManagement-API/IndividualSubscription.robot
+++ b/SOL002/VNFFaultManagement-API/IndividualSubscription.robot
@@ -9,66 +9,122 @@ Suite Setup    Check resource existance
 
 *** Test Cases ***
 Post Individual Subscription - Method not implemented
-    log    Trying to perform a POST. This method should not be implemented
-    Set Headers  {"Accept":"${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}  
-    Log    Validate Status code
-    Output    response
-    Integer    response status    405
-
+    [Documentation]    Test ID: 6.3.4.5.1
+    ...    Test title: Post Individual Subscription - Method not implemented
+    ...    Test objective: The objective is to test that the method is not implemented
+    ...    Pre-conditions: 
+    ...    Reference: section 7.4.6.3.1 - SOL002 v2.4.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: 
+    ...    Post-Conditions: 
+    Post Create individual subscription
+    Check HTTP Response Status Code Is    405
+    
 Get Information about an individual subscription
-    [Documentation]    Test ID: 7.4.6.1
-    ...    Test title: Retrieve the alarm subscriptions
+    [Documentation]    Test ID: 6.3.4.5.2
+    ...    Test title: Get Information about an individual subscription
     ...    Test objective: The objective is to read an individual subscription for VNF alarms subscribed by the client
     ...    Pre-conditions: The subscription with the given id exists
-    ...    Reference: section 7.4.6 - SOL002 v2.4.1
+    ...    Reference: section 7.4.6.3.2 - SOL002 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  
     ...    Post-Conditions: 
+    Get individual subscription
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is   FmSubscription
+
+PUT an individual subscription - Method not implemented
+    [Documentation]    Test ID: 6.3.4.5.3
+    ...    Test title: Put Individual Subscription - Method not implemented
+    ...    Test objective: The objective is to test that the method is not implemented
+    ...    Pre-conditions: 
+    ...    Reference: section 7.4.6.3.3 - SOL002 v2.4.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: 
+    ...    Post-Conditions: 
+    Put individual subscription
+    Check HTTP Response Status Code Is    405
+    
+
+PATCH an individual subscription - Method not implemented
+    [Documentation]    Test ID: 6.3.4.5.4
+    ...    Test title: Patch Individual Subscription - Method not implemented
+    ...    Test objective: The objective is to test that the method is not implemented
+    ...    Pre-conditions: 
+    ...    Reference: section 7.4.6.3.4 - SOL002 v2.4.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: 
+    ...    Post-Conditions: 
+    Patch individual subscription
+    Check HTTP Response Status Code Is    405
+    
+    
+DELETE an individual subscription
+    [Documentation]    Test ID: 6.3.4.5.5
+    ...    Test title: Delete an Individual Subscription
+    ...    Test objective: The objective is to test that the deletion of a subscription
+    ...    Pre-conditions: an existing subscription
+    ...    Reference: section 7.4.6.3.5 - SOL002 v2.4.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: 
+    ...    Post-Conditions: the subscription is deleted
+    Check resource existance
+    Delete individual subscription
+    Check HTTP Response Status Code Is    204
+    
+*** Keywords ***
+Check resource existance
+    Set Headers    {"Accept":"${ACCEPT}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId} 
+    Integer    response status    200
+Post Create individual subscription
+    log    Trying to perform a POST. This method should not be implemented
+    Set Headers  {"Accept":"${ACCEPT}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}  
+    ${outputResponse}=    Output    response
+	Set Global Variable    @{response}    ${outputResponse}				
+Get individual subscription
     log    Trying to get information about an individual subscription
     Set Headers    {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Get    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
-    Log    Validate Status code
-    Integer    response status    200
-    ${contentType}=    Output    response headers Content-Type
-    Should Contain    ${contentType}    ${CONTENT_TYPE}
-    ${result}=    Output    response body
-    Validate Json    FmSubscription.schema.json    ${result}
-    Log    Validation OK
-
-PUT an individual subscription - Method not implemented
+    ${outputResponse}=    Output    response
+	Set Global Variable    @{response}    ${outputResponse}	
+Get individual subscription - filter
+    Log    Get the list of active individual subscription using a filter
+    Set Headers    {"Accept": "${ACCEPT}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${sub_filter}
+    ${outputResponse}=    Output    response
+	Set Global Variable    @{response}    ${outputResponse}		
+Get individual subscription - invalid filter  
+    Log    Get the list of active individual subscription using an invalid filter
+    Set Headers    {"Accept": "${ACCEPT}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${sub_filter_invalid}
+    ${outputResponse}=    Output    response
+	Set Global Variable    @{response}    ${outputResponse}		
+PUT individual subscription
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}    
-    Log    Validate Status code
-    Output    response
-    Integer    response status    405
-
-PATCH an individual subscription - Method not implemented
+    Put    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}        
+    ${outputResponse}=    Output    response
+	Set Global Variable    @{response}    ${outputResponse}	
+PATCH individual subscription
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}    
-    Log    Validate Status code
-    Output    response
-    Integer    response status    405
-    
-DELETE an individual subscription
+    Patch    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId} 
+    ${outputResponse}=    Output    response
+	Set Global Variable    @{response}    ${outputResponse}		
+DELETE individual subscription
     log    Try to delete an individual subscription
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}    
-    Log    Validate Status code
-    Output    response
-    Integer    response status    204
-
-*** Keywords ***
-Check resource existance
-    Set Headers    {"Accept":"${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId} 
-    Integer    response status    200
\ No newline at end of file
+    Delete    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}    	   
+    ${outputResponse}=    Output    response
+	Set Global Variable    @{response}    ${outputResponse}	      
\ No newline at end of file
diff --git a/SOL002/VNFFaultManagement-API/Subscriptions.robot b/SOL002/VNFFaultManagement-API/Subscriptions.robot
index 147fdf2dc21c49b322433128e924307989c40569..72df01875abfa2be883b47389b0c00e5f72ab92f 100644
--- a/SOL002/VNFFaultManagement-API/Subscriptions.robot
+++ b/SOL002/VNFFaultManagement-API/Subscriptions.robot
@@ -7,158 +7,189 @@ Library    JSONSchemaLibrary    schemas/
 
 *** Test Cases ***
 Create a new subscription
-    [Documentation]    Test ID: 7.4.5.1
+    [Documentation]    Test ID: 6.3.4.4.1
     ...    Test title: Create a new alarm subscription
     ...    Test objective: The objective is to create a new subscription.
     ...    Pre-conditions: no subscription with the same filter and callbackUri exists
-    ...    Reference: section 7.4.5 - SOL002 v2.4.1
+    ...    Reference: section 7.4.5.3.1 - SOL002 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: 
-    Log    Create subscription instance by POST to ${apiRoot}/${apiName}/${apiVersion}/subscriptions
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/fmSubscriptionRequest.json
-    Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
-    Integer    response status    201
-    Log    Status code validated
-    ${headers}=    Output    response headers
-    Should Contain    ${headers}    Location
-    ${contentType}=    Output    response headers Content-Type
-    Should Contain    ${contentType}    ${CONTENT_TYPE}
-    ${result}=    Output    response body
-    Validate Json    FmSubscription.schema.json    ${result}
-    Log    Validation OK
+    Post Create subscription
+    Check HTTP Response Status Code Is    201
+    Check HTTP Response Body Json Schema Is    FmSubscription
 
 Create a new Subscription - DUPLICATION
-     [Documentation]    Test ID: 7.4.5.2
+     [Documentation]    Test ID: 6.3.4.4.2
     ...    Test title: Create a new alarm subscription - DUPLICATION
-    ...    Test objective: The objective is to create a new subscription.
+    ...    Test objective: The objective is to create a duplicate subscription.
     ...    Pre-conditions: subscription with the same filter and callbackUri exists
-    ...    Reference: section 7.4.5 - SOL002 v2.4.1
+    ...    Reference: section 7.4.5.3.1 - SOL002 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: the VNFM allows creating a subscription resource if another subscription resource with the same filter and callbackUri already exists
     ...    Post-Conditions: 
-    Log    Trying to create a subscription with an already created content
-    Pass Execution If    ${VNFM_ALLOWS_DUPLICATE_SUBS} == 0    NVFO is not permitting duplication. Skipping the test
-    Set Headers    {"Accept": "${ACCEPT}"}
-    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/fmSubscriptionRequest.json
-    Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
-    Integer    response status    201
-    Log    Status code validated
-    ${contentType}=    Output    response headers Content-Type
-    Should Contain    ${contentType}    ${CONTENT_TYPE}
-    ${result}=    Output    response body
-    Validate Json    FmSubscription.schema.json    ${result}
-    Log    Validation OK
-
+    Post Create subscription - DUPLICATION
+    Check HTTP Response Status Code Is    201
+    Check HTTP Response Body Json Schema Is    FmSubscription
+    
 Create a new Subscription - NO-DUPLICATION
-    [Documentation]    Test ID: 7.4.5.3
+    [Documentation]    Test ID: 6.3.4.4.3
     ...    Test title: Create a new alarm subscription - NO DUPLICATION
     ...    Test objective: The objective is to create a new subscription.
     ...    Pre-conditions: subscription with the same filter and callbackUri exists
-    ...    Reference: section 7.4.5 - SOL002 v2.4.1
+    ...    Reference: section 7.4.5.3.1 - SOL002 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: the VNFM decides to not create a duplicate subscription resource 
     ...    Post-Conditions:
-    Log    Trying to create a subscription with an already created content
-    Pass Execution If    ${VNFM_ALLOWS_DUPLICATE_SUBS} == 1    VNFM permits duplication. Skipping the test
-    Set Headers    {"Accept": "${ACCEPT}"}
-    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/fmSubscriptionRequest.json
-    Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
-    Integer    response status    303
-    Log    Status code validated
-    ${headers}=    Output    response headers
-    Should Contain    ${headers}    Location
-    Log    Validation OK
+    Post Create subscription - DUPLICATION
+    Check HTTP Response Status Code Is    303
 
 GET Subscriptions
-    [Documentation]    Test ID: 7.4.5.4
+    [Documentation]    Test ID: 6.3.4.4.5
     ...    Test title: Retrieve a list of alarm subscriptions
     ...    Test objective: The objective is to retrieve the list of active subscriptions
     ...    Pre-conditions: 
-    ...    Reference: section 7.4.5 - SOL002 v2.4.1
+    ...    Reference: section 7.4.5.3.2 - SOL002 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  
     ...    Post-Conditions: 
-    Log    Get the list of active subscriptions
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
-    Log    Validate Status code
-    Integer    response status    200
-    ${result}=    Output    response body
-    Validate Json    FmSubscriptions.schema.json    ${result}
-    Log    Validation OK
+    Get subscriptions
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is   FmSubscriptions 
 
 GET Subscription - Filter
-    [Documentation]    Test ID: 7.4.5.5
+    [Documentation]    Test ID: 6.3.4.4.6
     ...    Test title: Retrieve a list of alarm subscriptions
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter
     ...    Pre-conditions: 
-    ...    Reference: section 7.4.5 - SOL002 v2.4.1
+    ...    Reference: section 7.4.5.3.2 - SOL002 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  
     ...    Post-Conditions: 
-    Log    Get the list of active subscriptions using a filter
-    Set Headers    {"Accept": "${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${sub_filter}
-    Integer    response status    200
-    Log    Received a 200 OK as expected
-    ${result}=    Output    response body
-    Validate Json    FmSubscriptions.schema.json    ${result}
-    Log    Validation OK
+    Get subscriptions - filter
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is   FmSubscriptions 
     
 GET subscriptions - Bad Request Invalid attribute-based filtering parameters
-    [Documentation]    Test ID: 7.4.5.5-1
+    [Documentation]    Test ID: 6.3.4.4.7
     ...    Test title: Retrieve a list of alarm subscriptions
     ...    Test objective: The objective is to retrieve the list of active subscriptions with Invalid attribute-based filtering parameters
     ...    Pre-conditions: 
-    ...    Reference: section 7.4.5 - SOL002 v2.4.1
+    ...    Reference: section 7.4.5.3.2 - SOL002 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  
     ...    Post-Conditions: 
+    Get subscriptions - invalid filter
+    Check HTTP Response Status Code Is    400
+    Check HTTP Response Body Json Schema Is   ProblemDetails 
+    
+PUT subscriptions - Method not implemented
+    [Documentation]    Test ID: 6.3.4.4.8
+    ...    Test title: PUT subscriptions - Method not implemented
+    ...    Test objective: The objective is to test that the method is not implemented
+    ...    Pre-conditions: 
+    ...    Reference: section 7.4.5.3.3 - SOL002 v2.4.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability:  
+    ...    Post-Conditions: 
+    PUT subscriptions
+    Check HTTP Response Status Code Is    405
+
+PATCH subscriptions - Method not implemented
+    [Documentation]    Test ID: 6.3.4.4.9
+    ...    Test title: PUT subscriptions - Method not implemented
+    ...    Test objective: The objective is to test that the method is not implemented
+    ...    Pre-conditions: 
+    ...    Reference: section 7.4.5.3.4 - SOL002 v2.4.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability:  
+    ...    Post-Conditions: 
+    PATCH subscriptions
+    Check HTTP Response Status Code Is    405
+
+DELETE subscriptions - Method not implemented
+    [Documentation]    Test ID: 6.3.4.4.10
+    ...    Test title: DELETE subscriptions - Method not implemented
+    ...    Test objective: The objective is to test that the method is not implemented
+    ...    Pre-conditions: 
+    ...    Reference: section 7.4.5.3.5 - SOL002 v2.4.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability:  
+    ...    Post-Conditions: 
+    DELETE subscriptions
+    Check HTTP Response Status Code Is    405
+
+*** Keywords ***
+Post Create subscription
+    Log    Create subscription instance by POST to ${apiRoot}/${apiName}/${apiVersion}/subscriptions
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${body}=    Get File    jsons/fmSubscriptionRequest.json
+    Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    @{response}    ${outputResponse}				
+Post Create subscription - DUPLICATION
+    Log    Trying to create a subscription with an already created content
+    Pass Execution If    ${VNFM_ALLOWS_DUPLICATE_SUBS} == 0    NVFO is not permitting duplication. Skipping the test
+    Set Headers    {"Accept": "${ACCEPT}"}
+    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    ${body}=    Get File    jsons/fmSubscriptionRequest.json
+    Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}		
+    ${outputResponse}=    Output    response
+	Set Global Variable    @{response}    ${outputResponse}			
+Post Create subscription - NO-DUPLICATION	
+    Log    Trying to create a subscription with an already created content
+    Pass Execution If    ${VNFM_ALLOWS_DUPLICATE_SUBS} == 1    VNFM permits duplication. Skipping the test
+    Set Headers    {"Accept": "${ACCEPT}"}
+    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    ${body}=    Get File    jsons/fmSubscriptionRequest.json
+    Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    @{response}    ${outputResponse}		
+Get subscriptions
+    Log    Get the list of active subscriptions
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Log    Execute Query and validate response
+    Get    ${apiRoot}/${apiName}/${apiVersion}/subscriptions	
+    ${outputResponse}=    Output    response
+	Set Global Variable    @{response}    ${outputResponse}	
+Get subscriptions - filter
+    Log    Get the list of active subscriptions using a filter
+    Set Headers    {"Accept": "${ACCEPT}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${sub_filter}
+    ${outputResponse}=    Output    response
+	Set Global Variable    @{response}    ${outputResponse}		
+Get subscriptions - invalid filter  
     Log    Get the list of active subscriptions using an invalid filter
     Set Headers    {"Accept": "${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${sub_filter_invalid}
-    Integer    response status    400
-    Log    Received a 400 Bad Request as expected
-    ${contentType}=    Output    response headers Content-Type
-    Should Contain    ${contentType}    ${CONTENT_TYPE}
-    ${problemDetails}=    Output    response body
-    Validate Json    ProblemDetails.schema.json    ${problemDetails}
-    Log    Validation OK
-    
-PUT subscriptions - Method not implemented
+    ${outputResponse}=    Output    response
+	Set Global Variable    @{response}    ${outputResponse}		
+PUT subscriptions
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    
-    Log    Validate Status code
-    Integer    response status    405
-
-PATCH subscriptions - Method not implemented
+    Put    ${apiRoot}/${apiName}/${apiVersion}/subscriptions       
+    ${outputResponse}=    Output    response
+	Set Global Variable    @{response}    ${outputResponse}	
+PATCH subscriptions
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    
-    Log    Validate Status code
-    Integer    response status    405
-
-DELETE subscriptions - Method not implemented
+    Patch    ${apiRoot}/${apiName}/${apiVersion}/subscriptions     
+    ${outputResponse}=    Output    response
+	Set Global Variable    @{response}    ${outputResponse}		
+DELETE subscriptions
     log    Trying to perform a DELETE. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
-    Log    Validate Status code
-    Integer    response status    405
-    
\ No newline at end of file
+    Delete    ${apiRoot}/${apiName}/${apiVersion}/subscriptions 	   
+    ${outputResponse}=    Output    response
+	Set Global Variable    @{response}    ${outputResponse}	    
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/CancelOperationWorkflow.robot b/SOL003/VNFLifecycleManagement-API/CancelOperationWorkflow.robot
index c91f193469eaf8bfc431bcd3de2e0ea01f6092bd..45cd386d47ad8800bcfecdaeb5402b4bee9037b6 100644
--- a/SOL003/VNFLifecycleManagement-API/CancelOperationWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/CancelOperationWorkflow.robot
@@ -35,7 +35,7 @@ Cancel a VNF LCM Operation - PROCESSING - ROLLING_BACK
     [Documentation]    Test ID: 7.3.1.20
     ...    Test title: Cancel a VNF LCM Operation - PROCESSING - ROLLING_BACK
     ...    Test objective: The objective is to test the workflow for Cancelling a VNF LCM Operation being either in the PROCESSIONG or ROLLING_BACK state
-    ...    Pre-conditions: The VNF lifecycle management operation occurrence is in PROCESSING or ROLLING_BACK state. NFVO is subscribed to VNF LCM Operation Occurrence notifications (Test ID: 5.4.20.1)
+    ...    Pre-conditions: The VNF lifecycle management operation occurrence is in PROCESSING or ROLLING_BACK state. NFVO is subscribed to VNF LCM Operation Occurrence notifications
     ...    Reference: section 5.3.10 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: NFVO is able to receive notifications from VNFM
diff --git a/SOL003/VNFLifecycleManagement-API/CreateVNFWorkflow.robot b/SOL003/VNFLifecycleManagement-API/CreateVNFWorkflow.robot
index 863f39aef12db34ace014c62e055419da6ee9e2c..4168601a726eeeee9e909108b4fcf477eb3e8363 100644
--- a/SOL003/VNFLifecycleManagement-API/CreateVNFWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/CreateVNFWorkflow.robot
@@ -19,7 +19,7 @@ Create VNF Instance Resource
     [Documentation]    Test ID: 7.3.1.23
     ...    Test title: Create VNF Instance workflow
     ...    Test objective: The objective is to test the workflow for the creation of a new VNF instance resource.
-    ...    Pre-conditions: NFVO is subscribed to VNF Identifier Creation notifications (Test ID: 5.4.20.2)
+    ...    Pre-conditions: NFVO is subscribed to VNF Identifier Creation notifications 
     ...    Reference: section 5.3.1 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: NFVO is able to receive notifications from VNFM
diff --git a/SOL003/VNFLifecycleManagement-API/DeleteVNFWorkflow.robot b/SOL003/VNFLifecycleManagement-API/DeleteVNFWorkflow.robot
index 38c605dde367d3686f205b3938edcf69f739bd92..a5fbf8b18fb2f533d1a8ed51455c020e5db7e790 100644
--- a/SOL003/VNFLifecycleManagement-API/DeleteVNFWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/DeleteVNFWorkflow.robot
@@ -19,7 +19,7 @@ Delete VNF Instance Resource
     [Documentation]    Test ID: 7.3.1.24
     ...    Test title: Delete VNF Instance workflow
     ...    Test objective: The objective is to test the workflow for the deleteion of an existing VNF instance resource
-    ...    Pre-conditions: The VNF Instance resource is in NOT_INSTANTIATED state. NFVO is subscribed to VNF Identifier Creation notifications (Test ID: 5.4.20.2)
+    ...    Pre-conditions: The VNF Instance resource is in NOT_INSTANTIATED state. NFVO is subscribed to VNF Identifier Creation notifications 
     ...    Reference: section 5.3.2 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: NFVO is able to receive notifications from VNFM
diff --git a/SOL003/VNFLifecycleManagement-API/OperateVNFWorkflow.robot b/SOL003/VNFLifecycleManagement-API/OperateVNFWorkflow.robot
index 8236d1b5582e5adaabf23d3c9887dfd8529b0e6b..f3425229e2302065d1293519ec5239cd84c9ef74 100644
--- a/SOL003/VNFLifecycleManagement-API/OperateVNFWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/OperateVNFWorkflow.robot
@@ -18,7 +18,7 @@ Suite Teardown    Terminate All Processes    kill=true
 Operate a VNF Instance
     [Documentation]    Test ID: 7.3.1.29
     ...    Test title: Operate a VNF Instance
-    ...    Test objective: The objective is to change the operational state of a VNF instance.
+    ...    Test objective: The objective is to test the workflow of operational change of a VNF instance.
     ...    Pre-conditions: VNF instance in INSTANTIATED state 
     ...    Reference: section 5.3.3 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
diff --git a/SOL003/VNFLifecycleManagement-API/RetryOperationWorkflow.robot b/SOL003/VNFLifecycleManagement-API/RetryOperationWorkflow.robot
index f0e0c051b4f8a3de2156962818c4aba5d05c5680..ed7da8a1781201b4e90760ed1730d76d743f5910 100644
--- a/SOL003/VNFLifecycleManagement-API/RetryOperationWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/RetryOperationWorkflow.robot
@@ -16,7 +16,7 @@ Library    Process
 Retry VNF LCM Operation - Successful
     [Documentation]    Test ID: 7.3.1.30.1
     ...    Test title: Retry VNF LCM Operation - Successful
-    ...    Test objective: The objective is to test the workflow for a Retry VNF LCM Operation and the operation is successful
+    ...    Test objective: The objective is to test the workflow for a successful Retry VNF LCM Operation and the status notifications
     ...    Pre-conditions: The VNF lifecycle management operation occurrence is in FAILED_TEMP state. NFVO is subscribed to VNF LCM Operation Occurrence notifications 
     ...    Reference: section 5.3.10 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
@@ -33,7 +33,7 @@ Retry VNF LCM Operation - Successful
 Retry VNF LCM Operation - Unsuccessful
     [Documentation]    Test ID: 7.3.1.30.2
     ...    Test title: Retry VNF LCM Operation - Unsuccessful
-    ...    Test objective: The objective is to test the workflow for a Retry VNF LCM Operation and the operation is not successful
+    ...    Test objective: The objective is to test the workflow for an unsuccesful Retry VNF LCM Operation and the status notifications
     ...    Pre-conditions: The VNF lifecycle management operation occurrence is in FAILED_TEMP state. NFVO is subscribed to VNF LCM Operation Occurrence notifications 
     ...    Reference: section 5.3.10 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
diff --git a/SOL003/VNFLifecycleManagement-API/RollBackOperationWorkflow.robot b/SOL003/VNFLifecycleManagement-API/RollBackOperationWorkflow.robot
index d655bf69a270fb36d1b8c64815550326e44e08c6..ad076f8e7c6ab3834ce30600d13bd216033182ca 100644
--- a/SOL003/VNFLifecycleManagement-API/RollBackOperationWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/RollBackOperationWorkflow.robot
@@ -15,11 +15,11 @@ Suite Teardown    Terminate All Processes    kill=true
 
 
 *** Test Cases ***
-Roll back a VNF LCM Operation - Successful
+Rollback a VNF LCM Operation - Successful
     [Documentation]    Test ID: 7.3.1.31.1
-    ...    Test title: Roll back VNF LCM Operation - Successful
+    ...    Test title: Rollback VNF LCM Operation - Successful
     ...    Test objective: The objective is to test the workflow for a Rolling Back a VNF LCM Operation and the operation is successful
-    ...    Pre-conditions: The VNF lifecycle management operation occurrence is in FAILED_TEMP state. NFVO is subscribed to VNF LCM Operation Occurrence notifications (Test ID: 5.4.20.1)
+    ...    Pre-conditions: The VNF lifecycle management operation occurrence is in FAILED_TEMP state. NFVO is subscribed to VNF LCM Operation Occurrence notifications 
     ...    Reference: section 5.3.11 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: NFVO is able to receive notifications from VNFM
@@ -32,11 +32,11 @@ Roll back a VNF LCM Operation - Successful
     Check Operation Notification For Roll Back    ROLLED_BACK
     Check Postcondition VNF Roll Back Successful
 
-Retry VNF LCM Operation - Unsuccessful
+Rollback VNF LCM Operation - Unsuccessful
     [Documentation]    Test ID: 7.3.1.31.2
-    ...    Test title: Retry VNF LCM Operation - Unsuccessful
-    ...    Test objective: The objective is to test the workflow for a Retry VNF LCM Operation and the operation is not successful
-    ...    Pre-conditions: The VNF lifecycle management operation occurrence is in FAILED_TEMP state. NFVO is subscribed to VNF LCM Operation Occurrence notifications (Test ID: 5.4.20.1)
+    ...    Test title: Rollback VNF LCM Operation - Unsuccessful
+    ...    Test objective: The objective is to test the workflow for a Rollback VNF LCM Operation and the operation is not successful
+    ...    Pre-conditions: The VNF lifecycle management operation occurrence is in FAILED_TEMP state. NFVO is subscribed to VNF LCM Operation Occurrence notifications 
     ...    Reference: section 5.3.10 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: NFVO is able to receive notifications from VNFM
diff --git a/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelWorkflow.robot b/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelWorkflow.robot
index f1d214123822a56f758ee3ccd54efa6fd064ba2e..2e83b9a9277f22c8be39a9efa1bb5b9d9673a288 100644
--- a/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelWorkflow.robot
@@ -17,7 +17,7 @@ VNF Instance Scale To Level
    [Documentation]    Test ID: 7.3.1.32
     ...    Test title: VNF Instance Scale To Level worflow
     ...    Test objective: The objective is to test the workflow for the scale to level of a VNF instance
-    ...    Pre-conditions: VNF instance in INSTANTIATED state (Test ID: 5.4.4.1). NFVO is subscribed to VNF LCM Operation Occurrence notifications (Test ID: 5.4.20.1)
+    ...    Pre-conditions: VNF instance in INSTANTIATED state . NFVO is subscribed to VNF LCM Operation Occurrence notifications 
     ...    Reference: section 5.4.6 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  NFVO is able to receive notifications from VNFM. Scale operation is supported for the VNF (as capability in the VNFD)
diff --git a/SOL003/VNFLifecycleManagement-API/TerminatelVNFWorkflow.robot b/SOL003/VNFLifecycleManagement-API/TerminatelVNFWorkflow.robot
index 7959ce7146225a411c95602713a9925c1fa48a7b..dc97a808b53f2318a3ad333961fd6b03113e7834 100644
--- a/SOL003/VNFLifecycleManagement-API/TerminatelVNFWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/TerminatelVNFWorkflow.robot
@@ -17,7 +17,7 @@ Terminate a VNF Instance
     [Documentation]    Test ID: 7.3.1.34
     ...    Test title: Terminate a VNF Instance
     ...    Test objective: The objective is to terminate a VNF instance.
-    ...    Pre-conditions: VNF instance in INSTANTIATED state (Test ID: 5.a.b.c)
+    ...    Pre-conditions: VNF instance in INSTANTIATED state 
     ...    Reference: section 5.3.3 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: NFVO is able to receive notifications from VNFM.