diff --git a/SOL005/NSLifecycleManagement-API/CancelOperationTask.robot b/SOL005/NSLifecycleManagement-API/CancelOperationTask.robot
index 6c0613159cbca6d619e6a0c4cde9b36b7e3edde1..6f8fdec85bcf14b43dc7c2518aeeb321cd574f10 100644
--- a/SOL005/NSLifecycleManagement-API/CancelOperationTask.robot
+++ b/SOL005/NSLifecycleManagement-API/CancelOperationTask.robot
@@ -3,6 +3,7 @@ Resource    environment/variables.txt
 Resource   NSLCMOperationKeywords.robot   
 Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT} 
 Library    OperatingSystem
+Library    DependencyLibrary
 Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
 
diff --git a/SOL005/NSLifecycleManagement-API/ContinueOperationTask.robot b/SOL005/NSLifecycleManagement-API/ContinueOperationTask.robot
index 1e875314c8cc84a49d0b93feb6f89acdfb447954..bc4c081f8f59a224a4e339b374a0d57fe05bb85d 100644
--- a/SOL005/NSLifecycleManagement-API/ContinueOperationTask.robot
+++ b/SOL005/NSLifecycleManagement-API/ContinueOperationTask.robot
@@ -3,6 +3,7 @@ Resource    environment/variables.txt
 Resource   NSLCMOperationKeywords.robot   
 Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT} 
 Library    OperatingSystem
+Library    DependencyLibrary
 Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
 
diff --git a/SOL005/NSLifecycleManagement-API/FailOperationTask.robot b/SOL005/NSLifecycleManagement-API/FailOperationTask.robot
index bebe41fd0f69447d901f24377aacf4e452bae750..bd8f6f4837060e15b9cf6d5eb080a8a6a6d9f55b 100644
--- a/SOL005/NSLifecycleManagement-API/FailOperationTask.robot
+++ b/SOL005/NSLifecycleManagement-API/FailOperationTask.robot
@@ -3,6 +3,7 @@ Resource    environment/variables.txt
 Resource   NSLCMOperationKeywords.robot   
 Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT} 
 Library    OperatingSystem
+Library    DependencyLibrary
 Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
 
diff --git a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
index 27bf5c5c74439600a1f34aaf0f371889bbe9c7c0..c406dbbccb31f377125bce858cf776b6f98642f9 100644
--- a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
+++ b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
@@ -2,8 +2,10 @@
 Resource    environment/variables.txt
 Library    REST     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}
 Library    JSONLibrary
+Library    Process
 Library    JSONSchemaLibrary    schemas/
 Library    OperatingSystem
+Library    MockServerLibrary
 
 *** Keywords ***
 Create Sessions
diff --git a/SOL005/NSLifecycleManagement-API/NotificationEndpoint.robot b/SOL005/NSLifecycleManagement-API/NotificationEndpoint.robot
index 8937931670b1b1b0a4e018e9b6532f42792ef5b0..9f4c79bfe38afc8556f233e6bce8a5789e50987b 100644
--- a/SOL005/NSLifecycleManagement-API/NotificationEndpoint.robot
+++ b/SOL005/NSLifecycleManagement-API/NotificationEndpoint.robot
@@ -1,7 +1,8 @@
 *** Settings ***
 Suite Setup    Create Sessions
 Suite Teardown    Terminate All Processes    kill=true
-Resource    environment/variables.txt 
+Resource    environment/variables.txt
+Resource   NSLCMOperationKeywords.robot   
 Library    MockServerLibrary
 Library    Process
 Library    OperatingSystem
diff --git a/SOL005/NSLifecycleManagement-API/RetryOperationTask.robot b/SOL005/NSLifecycleManagement-API/RetryOperationTask.robot
index 9dd269cba3f693d346786500a430e0815a7a08a1..ea21b4e81ede1a01a83eff807898521caf715526 100644
--- a/SOL005/NSLifecycleManagement-API/RetryOperationTask.robot
+++ b/SOL005/NSLifecycleManagement-API/RetryOperationTask.robot
@@ -3,6 +3,7 @@ Resource    environment/variables.txt
 Resource   NSLCMOperationKeywords.robot   
 Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT} 
 Library    OperatingSystem
+Library    DependencyLibrary
 Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
 
diff --git a/SOL005/NSLifecycleManagement-API/RollbackOperationTask.robot b/SOL005/NSLifecycleManagement-API/RollbackOperationTask.robot
index 2b46c58c7c8f8edf7de48c0108dc5349ec48ab55..838da60604a46503eaa3965ddde1e0c8151b8bae 100644
--- a/SOL005/NSLifecycleManagement-API/RollbackOperationTask.robot
+++ b/SOL005/NSLifecycleManagement-API/RollbackOperationTask.robot
@@ -3,6 +3,7 @@ Resource    environment/variables.txt
 Resource   NSLCMOperationKeywords.robot   
 Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT} 
 Library    OperatingSystem
+Library    DependencyLibrary
 Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/