diff --git a/SOL005/NSFaultManagement-API/Alarms.robot b/SOL005/NSFaultManagement-API/Alarms.robot
index 50f47bcd7f5c6c1861dfc6b3cf57deab4b38a96b..4650a5b89bdb54dd93bdaa5ba7ddaa03890591e1 100644
--- a/SOL005/NSFaultManagement-API/Alarms.robot
+++ b/SOL005/NSFaultManagement-API/Alarms.robot
@@ -15,7 +15,7 @@ POST Alarms - Method not implemented
     ...    Reference: Clause 8.4.2.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none 
-    ...    Post-Conditions:  alarm not created
+    ...    Post-Conditions:  none
     POST Alarms
     Check HTTP Response Status Code Is    405
 
@@ -62,11 +62,11 @@ GET information about multiple alarms with "all_fields" attribute selector
     [Documentation]    Test ID: 5.3.3.1.5
     ...    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: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     GET Alarms Task with all_fields attribute selector
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    alarms
@@ -75,11 +75,11 @@ GET information about multiple alarms with exclude_default attribute selector
     [Documentation]    Test ID: 5.3.3.1.6
     ...    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: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     GET Alarms Task with exclude_default attribute selector
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    alarms
@@ -89,11 +89,11 @@ GET information about multiple alarms with fields attribute selector
     [Documentation]    Test ID: 5.3.3.1.7
     ...    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: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     GET Alarms Task with fields attribute selector
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    alarms
@@ -102,10 +102,10 @@ GET information about multiple alarms with "exclude_fields" attribute selector
     [Documentation]    Test ID: 5.3.3.1.8
     ...    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: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
-    ...    Applicability: 
+    ...    Applicability: none
     ...    Post-Conditions: none
     GET Alarms Task with exclude_fields attribute selector
     Check HTTP Response Status Code Is    200
@@ -123,7 +123,6 @@ PUT Alarms - Method not implemented
     PUT Alarms
     Check HTTP Response Status Code Is    405
     
-    
 PATCH Alarms - Method not implemented
     [Documentation]    Test ID: 5.3.3.1.6
     ...    Test title: PATCH Alarms - Method not implemented
@@ -144,7 +143,7 @@ DELETE Alarms - Method not implemented
     ...    Reference: Clause 8.4.2.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
-    ...    Post-Conditions: alarm not deleted
+    ...    Post-Conditions: none
     DELETE Alarms
     Check HTTP Response Status Code Is    405
 
@@ -159,7 +158,7 @@ GET information about multiple alarms as Paged Response
     ...    Post-Conditions: none
     GET Alarms
     Check HTTP Response Status Code Is    200
-    Check LINK in Header
+    Check HTTP Response Header Contains Location
     
 GET information about multiple alarms - Bad Request Response too Big
     [Documentation]    Test ID: 5.3.3.1.9
@@ -230,7 +229,6 @@ GET information about multiple alarms with filter "rootCauseFaultyComponent.faul
     Check HTTP Response Body Json Schema Is    alarms
     Check PostCondition HTTP Response Body alarms Matches the requested attribute-based filter "faultyVnfInstanceId"
     
-
 GET information about multiple alarms with filter "rootCauseFaultyResource.faultyResourceType"
      [Documentation]    Test ID: 5.3.3.1.14
     ...    Test title: GET information about multiple alarms with filter "rootCauseFaultyResource.faultyResourceType"
@@ -285,5 +283,4 @@ GET information about multiple alarms with filter "probableCause"
     GET Alarms with filter "probableCause"
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    alarms
-    Check PostCondition HTTP Response Body alarms Matches the requested attribute-based filter "probableCause"
-    
\ No newline at end of file
+    Check PostCondition HTTP Response Body alarms Matches the requested attribute-based filter "probableCause"
\ No newline at end of file
diff --git a/SOL005/NSFaultManagement-API/ApiVersion.robot b/SOL005/NSFaultManagement-API/ApiVersion.robot
index 18dc486a97ea084b0bdb75ed007636ddb4da2469..47ae5def9f6d8801797b78c62b0b118cd2002bae 100644
--- a/SOL005/NSFaultManagement-API/ApiVersion.robot
+++ b/SOL005/NSFaultManagement-API/ApiVersion.robot
@@ -169,35 +169,35 @@ DELETE API Version
 POST API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/v1/api_version
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 GET API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/v1/api_version
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PUT API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/v1/api_version
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PATCH API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/v1/api_version
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/v1/api_version
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
diff --git a/SOL005/NSFaultManagement-API/IndividualAlarm.robot b/SOL005/NSFaultManagement-API/IndividualAlarm.robot
index b6481159f164158e1116ca470353fad7f9714212..d0b5dafe4c7e9e9f8c319022e995e960ae8a5ae3 100644
--- a/SOL005/NSFaultManagement-API/IndividualAlarm.robot
+++ b/SOL005/NSFaultManagement-API/IndividualAlarm.robot
@@ -17,7 +17,7 @@ POST Individual Alarm - Method not implemented
     ...    Reference: Clause 8.4.3.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions:  alarm is not created
+    ...    Post-Conditions:  none
     POST Individual Alarm
     Check HTTP Response Status Code Is    405
 
@@ -45,7 +45,7 @@ GET information about Invalid Individual Alarm
     ...    Post-Conditions:   none 
     GET Invalid Individual Alarm
     Check HTTP Response Status Code Is    404
-    
+    Check HTTP Response Body Json Schema Is    ProblemDetails
 
 PUT Individual Alarm - Method not implemented
     [Documentation]    Test ID: 5.3.3.2.4
@@ -85,7 +85,6 @@ PATCH Alarm - Conflict
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails
    
-
 PATCH Alarm - Precondition failed
     [Documentation]    Test ID: 5.3.3.2.7
     ...    Test title: Modify an individual alarm resource - Precondition failed
@@ -107,6 +106,6 @@ DELETE Individual Alarm - Method not implemented
     ...    Reference: Clause 8.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
-    ...    Post-Conditions: alarm not deleted
+    ...    Post-Conditions: none
     DELETE Individual Alarm
-    Check HTTP Response Status Code Is    405
+    Check HTTP Response Status Code Is    405
\ No newline at end of file
diff --git a/SOL005/NSFaultManagement-API/IndividualSubscription.robot b/SOL005/NSFaultManagement-API/IndividualSubscription.robot
index 50ab67ca25064f71a3be9e39077f35bbe0efb32d..b89a6501219fc297e4dcf4322c27b2d2fe667344 100644
--- a/SOL005/NSFaultManagement-API/IndividualSubscription.robot
+++ b/SOL005/NSFaultManagement-API/IndividualSubscription.robot
@@ -14,7 +14,7 @@ Post Individual Subscription - Method not implemented
     ...    Reference: Clause 8.4.5.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: subscription is not created
+    ...    Post-Conditions: none
     POST Individual Subscription
     Check HTTP Response Status Code Is    405
 
@@ -65,5 +65,4 @@ DELETE an individual subscription
     ...    Applicability:  none
     ...    Post-Conditions: subscription is not deleted
     DELETE Individual Subscription
-    Check HTTP Response Status Code Is    204
-    
\ No newline at end of file
+    Check HTTP Response Status Code Is    204
\ No newline at end of file
diff --git a/SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot b/SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot
index f2df28a614fc7856a64900bc72d285b58993c240..ab113914a6cc9a8b7d4d357c1eafaf958c2a77af 100644
--- a/SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot
+++ b/SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot
@@ -19,7 +19,7 @@ Create Sessions
 Check Individual Subscription existence
     Set Headers    {"Accept":"${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId} 
     Integer    response status    200
     
 Check HTTP Response Status Code Is
@@ -61,7 +61,7 @@ POST Alarms
     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
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms
     ${outputResponse}=    Output    response 
     Set Global Variable    ${response}    ${outputResponse}
     
@@ -69,7 +69,7 @@ PATCH Alarms
     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
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms
     ${outputResponse} =    Output    response 
     Set Global Variable    ${response}    ${outputResponse}
     
@@ -77,7 +77,7 @@ PUT Alarms
     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
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms
     ${outputResponse}=    Output    response 
     Set Global Variable    ${response}    ${outputResponse}
     
@@ -85,7 +85,7 @@ DELETE Alarms
     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
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
     
@@ -94,7 +94,7 @@ GET Alarms
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query
-    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
     
@@ -103,7 +103,7 @@ GET Alarms With Filters
 	Set Headers  {"Accept":"${ACCEPT}"}  
 	Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
 	Log    Execute Query
-	Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?${alarm_filter}=${nsInstanceId}
+	Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?${alarm_filter}=${nsInstanceId}
 	${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -112,42 +112,42 @@ GET Alarms With Invalid Filters
 	Set Headers  {"Accept":"${ACCEPT}"}  
 	Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
 	Log    Execute Query
-	Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?${invalid_alarm_filter}=${nsInstanceId}
+	Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?${invalid_alarm_filter}=${nsInstanceId}
 	${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 GET Alarms Task with all_fields attribute selector
     Log    Query VNF The GET method queries information about multiple alarms, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/alarms?exclude_default
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 GET Alarms Task with exclude_default attribute selector
     Log    Query VNF The GET method queries information about multiple alarms, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/alarms?exclude_default
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 GET Alarms Task with fields attribute selector
     Log    Query VNF The GET method queries information about multiple alarms, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/alarms?fields=${fields}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}	
 GET Alarms Task with exclude_fields attribute selector
     Log    Query VNF The GET method queries information about multiple alarms, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/alarms?exclude_fields=${fields}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?exclude_fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}    
 POST Individual Alarm
     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/${alarmId}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}
     ${outputResponse}=    Output    response 
     Set Global Variable    ${response}    ${outputResponse}
     
@@ -155,7 +155,7 @@ DELETE Individual Alarm
     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}
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
     
@@ -163,7 +163,7 @@ PUT Individual Alarm
     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}
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
 
@@ -173,7 +173,7 @@ GET Individual Alarm
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query 
-    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
     
@@ -183,7 +183,7 @@ GET Invalid Individual Alarm
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query 
-    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms/${invalidAlarmId}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${invalidAlarmId}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
    
@@ -193,7 +193,7 @@ PATCH Individual Alarm
     Set Headers  {"Content-Type": "${CONTENT_TYPE_PATCH}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    jsons/alarmModifications.json
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}    ${body}
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}    ${body}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
    
@@ -204,18 +204,18 @@ PATCH Individual Alarm Conflict
     Set Headers    {"If-Match": "${Etag}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    jsons/alarmModifications.json
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}    ${body}
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}    ${body}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
     
 POST Subscription
-    Log    Create subscription instance by POST to ${apiRoot}/${apiName}/${apiVersion}/subscriptions
+    Log    Create subscription instance by POST to ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template}=    Get File    jsons/fmSubscriptionRequest.json
     ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
 
@@ -227,7 +227,7 @@ Post Create subscription - DUPLICATION
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${template}=    Get File    jsons/fmSubscriptionRequest.json
     ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}		
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}		
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 	
@@ -239,7 +239,7 @@ Post Create subscription - NO-DUPLICATION
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${template}=    Get File    jsons/fmSubscriptionRequest.json
     ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 	
@@ -247,7 +247,7 @@ GET Subscriptions
     Log    Get the list of active subscriptions
     Set Headers    {"Accept": "${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
         
@@ -255,7 +255,7 @@ GET Subscriptions with 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}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${sub_filter}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}    
     
@@ -263,7 +263,7 @@ GET Subscriptions with 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}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${sub_filter_invalid}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
     
@@ -271,35 +271,35 @@ Get subscriptions with all_fields attribute selector
     Log    Get the list of active subscriptions, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?exclude_default
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 Get subscriptions with exclude_default attribute selector
     Log    Get the list of active subscriptions, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?exclude_default
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 Get subscriptions with fields attribute selector
     Log    Get the list of active subscriptions, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?fields=${fields}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}	
 Get subscriptions with exclude_fields attribute selector
     Log    Get the list of active subscriptions, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?exclude_fields=${fields}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?exclude_fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}     
 PUT Subscriptions
     log    Trying to perform a PUT Subscriptions. 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    
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
     
@@ -307,7 +307,7 @@ PATCH Subscriptions
     log    Trying to perform a PATCH Subscriptions. 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    
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
     
@@ -315,7 +315,7 @@ DELETE Subscriptions
     log    Trying to perform a DELETE Subscriptions. 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    
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
     
@@ -323,7 +323,7 @@ POST 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}  
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}  
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
     
@@ -331,7 +331,7 @@ 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}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}   
     
@@ -339,7 +339,7 @@ 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}  
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}  
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
     
@@ -347,7 +347,7 @@ PATCH Individual Subscription
     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/${subscriptionId}  
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}  
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
 
@@ -355,7 +355,7 @@ DELETE Individual Subscription
     log    Trying to perform a DELETE.
     Set Headers  {"Accept":"${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}  
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}  
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
     
@@ -428,7 +428,7 @@ Do DELETE Notification
     Log  Verifying results
     Verify Mock Expectation  ${req}
     
-Check LINK in Header
+Check HTTP Response Header Contains Location
     ${linkURL}=    Get Value From Json    ${response['headers']}    $..Link
     Should Not Be Empty    ${linkURL}
 
@@ -437,7 +437,7 @@ GET Alarm With Filter "id"
 	Set Headers  {"Accept":"${ACCEPT}"}  
 	Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
 	Log    Execute Query
-	Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?id=${alarmId}
+	Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?id=${alarmId}
 	${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -449,7 +449,7 @@ GET Alarms With Filter "rootCauseFaultyComponent_faultyNestedNsInstanceId"
 	Set Headers  {"Accept":"${ACCEPT}"}  
 	Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
 	Log    Execute Query
-	Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?rootCauseFaultyComponent.faultyNestedNsInstanceId=${faultyNestedNsInstanceId}
+	Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?rootCauseFaultyComponent.faultyNestedNsInstanceId=${faultyNestedNsInstanceId}
 	${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -463,7 +463,7 @@ GET Alarms With Filter "rootCauseFaultyComponent_faultyNsVirtualLinkInstanceId"
 	Set Headers  {"Accept":"${ACCEPT}"}  
 	Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
 	Log    Execute Query
-	Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?rootCauseFaultyComponent.faultyNsVirtualLinkInstanceId=${faultyNsVirtualLinkInstanceId}
+	Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?rootCauseFaultyComponent.faultyNsVirtualLinkInstanceId=${faultyNsVirtualLinkInstanceId}
 	${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -477,7 +477,7 @@ GET Alarms With Filter "rootCauseFaultyComponent_faultyVnfInstanceId"
 	Set Headers  {"Accept":"${ACCEPT}"}  
 	Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
 	Log    Execute Query
-	Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?rootCauseFaultyComponent.faultyVnfInstanceId=${faultyVnfInstanceId}
+	Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?rootCauseFaultyComponent.faultyVnfInstanceId=${faultyVnfInstanceId}
 	${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -491,7 +491,7 @@ GET Alarms With Filter "rootCauseFaultyResource_faultyResourceType"
 	Set Headers  {"Accept":"${ACCEPT}"}  
 	Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
 	Log    Execute Query
-	Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?rootCauseFaultyResource.faultyResourceType=${faultyResourceType}
+	Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?rootCauseFaultyResource.faultyResourceType=${faultyResourceType}
 	${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -505,7 +505,7 @@ GET Alarms with filter "eventType"
     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?eventType=${eventType}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?eventType=${eventType}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -519,7 +519,7 @@ GET Alarms with filter "perceivedSeverity"
     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?perceivedSeverity=${perceivedSeverity}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?perceivedSeverity=${perceivedSeverity}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -533,7 +533,7 @@ GET Alarms with filter "probableCause"
     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?probableCause=${probableCause}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?probableCause=${probableCause}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -546,7 +546,7 @@ Get subscriptions with filter "id"
     Log    Get the list of active subscriptions using a filter "id"
     Set Headers    {"Accept": "${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?id=${subscription_id}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?id=${subscription_id}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -557,7 +557,7 @@ Get subscriptions with filter "filter_notificationTypes"
     Log    Get the list of active subscriptions using a filter "filter.notificationTypes"
     Set Headers    {"Accept": "${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?filter.notificationTypes=${notification_type}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?filter.notificationTypes=${notification_type}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -570,7 +570,7 @@ Get subscriptions with filter "filter_faultyResourceTypes"
     Log    Get the list of active subscriptions using a filter "filter.faultyResourceTypes"
     Set Headers    {"Accept": "${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?filter.faultyResourceTypes=${faultyResourceType}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?filter.faultyResourceTypes=${faultyResourceType}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -583,7 +583,7 @@ Get subscriptions with filter "filter_perceivedSeverities"
     Log    Get the list of active subscriptions using a filter "filter.perceivedSeverities"
     Set Headers    {"Accept": "${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?filter.perceivedSeverities=${perceivedSeverity}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?filter.perceivedSeverities=${perceivedSeverity}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -596,7 +596,7 @@ Get subscriptions with filter "filter_eventTypes"
     Log    Get the list of active subscriptions using a filter "filter.eventTypes"
     Set Headers    {"Accept": "${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?filter.eventTypes=${eventType}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?filter.eventTypes=${eventType}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -609,7 +609,7 @@ Get subscriptions with filter "filter_probableCauses"
     Log    Get the list of active subscriptions using a filter "filter.probableCauses"
     Set Headers    {"Accept": "${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?filter.probableCauses=${probableCause}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?filter.probableCauses=${probableCause}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 
diff --git a/SOL005/NSFaultManagement-API/Subscriptions.robot b/SOL005/NSFaultManagement-API/Subscriptions.robot
index 1aea8c7f903048abbf873693a939583c14466747..4b7e352fa4f6142fb7f66246845a15c6b24e6558 100644
--- a/SOL005/NSFaultManagement-API/Subscriptions.robot
+++ b/SOL005/NSFaultManagement-API/Subscriptions.robot
@@ -105,11 +105,11 @@ GET subscriptions with "exclude_default" attribute selector
     [Documentation]    Test ID: 5.3.3.3.8
     ...    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: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
-    ...    Applicability:  
-    ...    Post-Conditions: 
+    ...    Applicability:  none
+    ...    Post-Conditions: none
     Get subscriptions with exclude_default attribute selector
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is   FmSubscriptions
@@ -118,11 +118,11 @@ GET subscriptions with "fields" attribute selector
     [Documentation]    Test ID: 5.3.3.3.9
     ...    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: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
-    ...    Applicability:  
-    ...    Post-Conditions: 
+    ...    Applicability:  none
+    ...    Post-Conditions: none
     Get subscriptions with fields attribute selector
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is   FmSubscriptions
@@ -131,11 +131,11 @@ GET subscriptions with "exclude_fields" attribute selector
     [Documentation]    Test ID: 5.3.3.3.10
     ...    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: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
-    ...    Applicability:  
-    ...    Post-Conditions: 
+    ...    Applicability:  none
+    ...    Post-Conditions: none
     Get subscriptions with exclude_fields attribute selector
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is   FmSubscriptions  
@@ -172,7 +172,7 @@ DELETE subscriptions - Method not implemented
     ...    Reference: Clause 8.4.4.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
-    ...    Post-Conditions: subscription is not deleted
+    ...    Post-Conditions: none
     DELETE Subscriptions
     Check HTTP Response Status Code Is    405
     
@@ -187,7 +187,7 @@ Retrieve a list of alarm subscriptions as Paged Response
     ...    Post-Conditions: none
     GET Subscriptions
     Check HTTP Response Status Code Is    200
-    Check LINK in Header
+    Check HTTP Response Header Contains Location
     
 GET subscriptions - Bad Request Response too Big
     [Documentation]    Test ID: 5.3.3.3.15
diff --git a/SOL005/NSFaultManagement-API/environment/variables.txt b/SOL005/NSFaultManagement-API/environment/variables.txt
index 7f86938c5d15e5aeb5f9385cd0968651d1e99286..78e923fd053134e12d02eac7e0a14889933ee9a3 100644
--- a/SOL005/NSFaultManagement-API/environment/variables.txt
+++ b/SOL005/NSFaultManagement-API/environment/variables.txt
@@ -11,7 +11,7 @@ ${nsInstanceId}    007c111c-38a1-42c0-a666-7475ecb1567c
 ${invalid_alarm_filter}    badFilter 
 ${apiRoot}        /
 ${apiName}        nsfm
-${apiVersion}     v1
+${apiMajorVersion}     v1
 ${CONTENT_TYPE}    application/json
 
 ${NFVO_ALLOWS_DUPLICATE_SUBS}     0