diff --git a/SOL005/NSLifecycleManagement-API/HealNSTaskWorkflow.robot b/SOL005/NSLifecycleManagement-API/HealNSTaskWorkflow.robot
index 15cf70650f125cbdc8eb99266ff56532eacdd42e..189810f73c340af6d34ca53d19171466bfb0c9fa 100644
--- a/SOL005/NSLifecycleManagement-API/HealNSTaskWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/HealNSTaskWorkflow.robot
@@ -5,7 +5,6 @@ Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}
 Library    OperatingSystem
 Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
-Suite Setup    Check resource existance
 Suite Setup       Initialize System
 Suite Teardown    Terminate All Processes    kill=true
 
diff --git a/SOL005/NSLifecycleManagement-API/InstanciateNSTaskWorkflow.robot b/SOL005/NSLifecycleManagement-API/InstanciateNSTaskWorkflow.robot
index 2cbcf60e1e05ea8ab7528645ad2ec0d44b86952e..0e77dbbd4cb3be0b94ed94a9f564f1977f35e3ea 100644
--- a/SOL005/NSLifecycleManagement-API/InstanciateNSTaskWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/InstanciateNSTaskWorkflow.robot
@@ -5,12 +5,12 @@ Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}
 Library    OperatingSystem
 Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
-Suite Setup    Check resource existance
 Suite Setup       Initialize System
 Suite Teardown    Terminate All Processes    kill=true
 
 *** Test Cases ***
 Instantiate Flow of NS lifecycle management operations
+    Check resource existance
     Check resource not_instantiated
     Do POST Instatiate nsInstance
     Check HTTP Response Status Code Is    202
diff --git a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
index d512df61e2aef48c0114660b6aaea6c83b4c7cf8..ff0ebadc843889cb6a7d637a45e5fecff5398cb8 100644
--- a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
+++ b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
@@ -9,12 +9,12 @@ Library    MockServerLibrary
 
 *** Keywords ***
 Initialize System
-    Start Process  java  -jar  ${MOCK_SERVER_JAR}  -serverPort  ${callback_port}  alias=mockInstance
+    Start Process  java  -jar  ../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar  -serverPort  ${callback_port}  alias=mockInstance
     Wait For Process  handle=mockInstance  timeout=5s  on_timeout=continue
-    Create Mock Session  ${callback_uri}:${callback_port}
+    Create Mock Session  ${callback_uri}:${callback_port} 
     
 Check Operation Occurrence Id
-    ${occid}=    Get Value From Json    ${response[0]['headers']['Location']} 
+    ${occid}=    Get Value From Json    ${response[0]['headers']['Location']}  ${response}
     Set Global Variable    @{nsLcmOpOccId}    ${occid}
     Should Not Be Empty    ${nsLcmOpOccId}
     
diff --git a/SOL005/NSLifecycleManagement-API/ScaleNSTaskWorkflow.robot b/SOL005/NSLifecycleManagement-API/ScaleNSTaskWorkflow.robot
index d427d6ca7519b8cbbfaa3a7ddf6307747b649342..15b5f10781683cbb141fc6fb08e430f98a33bcea 100644
--- a/SOL005/NSLifecycleManagement-API/ScaleNSTaskWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/ScaleNSTaskWorkflow.robot
@@ -5,12 +5,12 @@ Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}
 Library    OperatingSystem
 Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
-Suite Setup    Check resource existance
 Suite Setup       Initialize System
 Suite Teardown    Terminate All Processes    kill=true
 
 *** Test Cases ***
 Scale Flow of NS lifecycle management operations
+    Check resource existance
     Check resource instantiated
     Do POST scale nsInstance
     Check HTTP Response Status Code Is    202
diff --git a/SOL005/NSLifecycleManagement-API/TerminateNSTaskWorkflow.robot b/SOL005/NSLifecycleManagement-API/TerminateNSTaskWorkflow.robot
index 1324aa753901b8d8dcf63764b44bf443a26dc6cd..2fa0a1d0d67866d63f6054cbcca1bad59c967821 100644
--- a/SOL005/NSLifecycleManagement-API/TerminateNSTaskWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/TerminateNSTaskWorkflow.robot
@@ -5,12 +5,12 @@ Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}
 Library    OperatingSystem
 Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
-Suite Setup    Check resource existance
 Suite Setup       Initialize System
 Suite Teardown    Terminate All Processes    kill=true
 
 *** Test Cases ***
 Terminate Flow of NS lifecycle management operations
+    Check resource existance
     Check resource instantiated
     Do POST Terminate NSInstance
     Check HTTP Response Status Code Is    202
diff --git a/SOL005/NSLifecycleManagement-API/UpdateNSTaskWorkflow.robot b/SOL005/NSLifecycleManagement-API/UpdateNSTaskWorkflow.robot
index ed420629c60bede67673c80def04582810bb1112..6392024dbdaa0f3943827a75ba8ebca98d35e791 100644
--- a/SOL005/NSLifecycleManagement-API/UpdateNSTaskWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/UpdateNSTaskWorkflow.robot
@@ -5,12 +5,12 @@ Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}
 Library    OperatingSystem
 Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
-Suite Setup    Check resource existance
 Suite Setup       Initialize System
 Suite Teardown    Terminate All Processes    kill=true
 
 *** Test Cases ***
 Update Flow of NS lifecycle management operations
+    Check resource existance
     Check resource instantiated
     Do POST Update NSInstance
     Check HTTP Response Status Code Is    202