diff --git a/SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot b/SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot
index d80fb5aa58045179dbc3b1507941afa967f52fe5..f9d96c4786e68593fe4553c77d25b0582ba842ab 100644
--- a/SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot
@@ -20,7 +20,7 @@ Post Cancel operation task
     ...    Post-Conditions: none    
     POST Cancel operation task
     Check HTTP Response Status Code Is    202
-    Check resource has a temporary failure
+    Check operation resource state is FAILED_TEMP
     
 Post Cancel operation task Conflict
     [Documentation]    Test ID: 6.3.5.16.2
diff --git a/SOL002/VNFLifecycleManagement-API/FailOperationTask.robot b/SOL002/VNFLifecycleManagement-API/FailOperationTask.robot
index 6fa0b8bad6a6c88bc9494727d0ceadf40dd0f25b..5c871b0122482eefd25d59123b36f85eb90fb83b 100644
--- a/SOL002/VNFLifecycleManagement-API/FailOperationTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/FailOperationTask.robot
@@ -19,6 +19,7 @@ Post Fail operation task
     Post Fail operation
     Check HTTP Response Status Code Is    202
     Check Operation Occurrence Id
+    Check operation resource state is FINALLY_FAILED
 
 Post Fail operation task Conflict (Not-FAILED_TEMP)
     # TODO: Need to set the pre-condition of the test. VNF instance shall be in INSTANTIATED state
diff --git a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
index 3d0477b4069468c2721133127cc3bc8abb5c3401..1ccd255ebd8182fb489b77be1968eca46f9f89fd 100644
--- a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
+++ b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
@@ -58,11 +58,16 @@ Check VNF Status
     Should Be Equal As Strings    ${current}    ${expected}
     Log    VNF Status in the correct status
 
-Check resource has a temporary failure
+Check operation resource state is FAILED_TEMP
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
-    String    response body instantiationState    FAILED_TEMP     
-    
+    String    response body instantiationState    FAILED_TEMP   
+
+Check operation resource state is FINALLY_FAILED      
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
+    String    response body instantiationState    FINALLY_FAILED  
+     
 Check HTTP Response Header Contains
     [Arguments]    ${CONTENT_TYPE}
     Should Contain    ${response.headers}    ${CONTENT_TYPE}
diff --git a/SOL003/VNFLifecycleManagement-API/CancelOperationTask.robot b/SOL003/VNFLifecycleManagement-API/CancelOperationTask.robot
index 1a84a3324eac51d5e6f9d0611236ddf142deabec..59b0574e2ed8d14dd37ced9c349f7d436862e6b7 100644
--- a/SOL003/VNFLifecycleManagement-API/CancelOperationTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/CancelOperationTask.robot
@@ -19,7 +19,7 @@ Post Cancel operation task
     ...    Post-Conditions: VNF instance status equal to FAILED_TEMP     
     POST Cancel operation task
     Check HTTP Response Status Code Is    202
-    Check resource has a temporary failure
+    Check operation resource state is FAILED_TEMP
     
 Post Cancel operation task Conflict
     [Documentation]    Test ID: 7.3.1.16.2
diff --git a/SOL003/VNFLifecycleManagement-API/FailOperationTask.robot b/SOL003/VNFLifecycleManagement-API/FailOperationTask.robot
index 26f7e47c1ac7b7e9aab3165497084851f3339977..af2287afbaefc55598bf49739e58420e8b38c4b4 100644
--- a/SOL003/VNFLifecycleManagement-API/FailOperationTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/FailOperationTask.robot
@@ -16,10 +16,11 @@ Post Fail operation task
     ...    Reference:  section 5.4.16.3.1 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: none 
+    ...    Post-Conditions: VNF resource state is FINALLY_FAILED
     Post Fail operation
     Check HTTP Response Status Code Is    202
     Check Operation Occurrence Id
+    Check operation resource state is FINALLY_FAILED
 
 Post Fail operation task Conflict (Not-FAILED_TEMP)
     # TODO: Need to set the pre-condition of the test. VNF instance shall be in INSTANTIATED state
diff --git a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
index 2efc5fef57ed3b2fcfc6869c892634d90fa001e3..1e122404b96d095ea8a0ba685f9ef642325cf3a7 100644
--- a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
+++ b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
@@ -58,11 +58,15 @@ Check VNF Status
     Should Be Equal As Strings    ${current}    ${expected}
     Log    VNF Status in the correct status
 
-Check resource has a temporary failure
+Check operation resource state is FAILED_TEMP
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
     String    response body instantiationState    FAILED_TEMP     
     
+Check operation resource state is FINALLY_FAILED
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
+    String    response body instantiationState    FINALLY_FAILED      
 Get Vnf Scale Info
     [Arguments]    ${vnfInstanceId}
     ${vnfInstance}=    Get Vnf Instance    ${vnfInstanceId}
diff --git a/SOL005/NSLifecycleManagement-API/CancelOperationTask.robot b/SOL005/NSLifecycleManagement-API/CancelOperationTask.robot
index 6ae9e02fcd23f816215c1b1f51b8a913ba08e3a0..d23a730b2a1a7467ede2e9c4b8ac4171b00d17f3 100644
--- a/SOL005/NSLifecycleManagement-API/CancelOperationTask.robot
+++ b/SOL005/NSLifecycleManagement-API/CancelOperationTask.robot
@@ -19,7 +19,7 @@ Post Cancel operation task
     ...    Post-Conditions: NS instance status equal to FAILED_TEMP     
 	POST Cancel operation task
 	Check HTTP Response Status Code Is    202
-	Check resource has a temporary failure
+	Check operation resource state is FAILED_TEMP
 	
 Post Cancel operation task Not Found
     [Documentation]    Test ID: 5.3.2.14.2
diff --git a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
index fd1b42ed54981fca88335492093056e99b76733e..ab9e277171ee4ea7a32cf081b93354ccb103f66b 100644
--- a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
+++ b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
@@ -114,7 +114,7 @@ Check resource not_instantiated
     Get    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId} 
     String    response body instantiationState    NOT_INSTANTIATED
 
-Check resource has a temporary failure
+Check operation resource state is FAILED_TEMP    
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}