diff --git a/SOL005/NSDManagement-API/IndividualNSDescriptor.robot b/SOL005/NSDManagement-API/IndividualNSDescriptor.robot
index 9fd77ae9b7e998d9ab37a83ff399916a8cd725ed..47a1aa7a0819a1783dbf8a19da3fe9f205e49d38 100644
--- a/SOL005/NSDManagement-API/IndividualNSDescriptor.robot
+++ b/SOL005/NSDManagement-API/IndividualNSDescriptor.robot
@@ -66,7 +66,6 @@ Enable Individual Network Service Descriptor
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is   NsdInfoModification
     Check Postcondition Network Service Descriptor is in operational state    ENABLED
-    Check PostCondition GET Individual Network Service Descriptor Information
     Check Postcondition Network Service Descriptor usage state is unmodified (Implicit)   
 
 Enable Individual Network Service Descriptor with conflict due to operational state ENABLED
diff --git a/SOL005/NSDManagement-API/NSDManagementKeywords.robot b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
index 4172e6bedf1f456ec8d5e0fded2fef5f337603a0..eb27f2b78c9a40c203e7682888a7c27b73d75a3a 100644
--- a/SOL005/NSDManagement-API/NSDManagementKeywords.robot
+++ b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
@@ -223,6 +223,7 @@ Check Postcondition Network Service Descriptor is in operational state
 
 Check Postcondition Network Service Descriptor usage state is unmodified (Implicit)
     Log    Checking postcondition use status
+    Check PostCondition GET Individual Network Service Descriptor Information
     Should Be Equal As Strings   ${response['body']['nsdUsageState']}    ${usageState} 
 
 Send PATCH to enable Individual Network Service Descriptor
diff --git a/SOL005/NSLifecycleManagement-API/CreateNSInstanceWorkflow.robot b/SOL005/NSLifecycleManagement-API/CreateNSInstanceWorkflow.robot
index 7a9e9e2e1e333c51a9541c431e42ce9754bf054d..f2b9dad22a116e610b55be51851a81337e16dfc5 100644
--- a/SOL005/NSLifecycleManagement-API/CreateNSInstanceWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/CreateNSInstanceWorkflow.robot
@@ -24,9 +24,9 @@ NS Instance Creation
     Check HTTP Response Body Json Schema Is    NsInstance
     Check resource not_instantiated    1
     
-NS Instance Creation with DISABLED nsd
+NS Instance Creation with DISABLED Network Service Descriptor
     [Documentation]    Test ID: 5.3.2.18.2
-    ...    Test title: NS Instance Creation with DISABLED nsd
+    ...    Test title: NS Instance Creation with DISABLED Network Service Descriptor
     ...    Test objective: The objective is to test the workflow for Creating a NS instance with a disabled NSD
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO in disabled operational state.
     ...    Reference: Clauses 6.4.2.3.1 and 5.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
diff --git a/SOL005/NSLifecycleManagement-API/DeleteNSInstanceWorkflow.robot b/SOL005/NSLifecycleManagement-API/DeleteNSInstanceWorkflow.robot
index 915e8e041ea1ebbe972b540e5383ec6bb5942828..21767cc1795586a4993695c9adf9f6b2ec89d156 100644
--- a/SOL005/NSLifecycleManagement-API/DeleteNSInstanceWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/DeleteNSInstanceWorkflow.robot
@@ -19,4 +19,4 @@ NS Instance Deletion
     Check resource not_instantiated
     DELETE IndividualNSInstance
     Check HTTP Response Status Code Is    204
-    Check Instance Deleted
+    Check Postcondition NS instance is deleted
diff --git a/SOL005/NSLifecycleManagement-API/TerminateNSTask.robot b/SOL005/NSLifecycleManagement-API/TerminateNSTask.robot
index 20d927b2efa5691b1059e61eb3e188fc5986b5bb..9e9870149c4e7ad783e24e75edb5665f09a6ca23 100644
--- a/SOL005/NSLifecycleManagement-API/TerminateNSTask.robot
+++ b/SOL005/NSLifecycleManagement-API/TerminateNSTask.robot
@@ -20,7 +20,6 @@ POST Terminate a NSInstance
     Check HTTP Response Status Code Is    202
     Check HTTP Response Header Contains    Location
     Check resource not_instantiated
-    Sleep    15s
     
 POST Terminate a NSInstance Conflict
     [Documentation]    Test ID: 5.3.2.7.2