From 6c0ae9cdff7257e69e4686aeee49bf837340add2 Mon Sep 17 00:00:00 2001
From: reinaortega <miguelangel.reinaortega@etsi.org>
Date: Tue, 11 Jan 2022 15:10:18 +0100
Subject: [PATCH] Improvement of PTC verdicts handling

Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>
---
 OneM2M_Testcases_CSE_Release_1.ttcn | 471 +++++++++++++++++-----------
 OneM2M_Testcases_CSE_Release_2.ttcn | 119 ++++---
 2 files changed, 353 insertions(+), 237 deletions(-)

diff --git a/OneM2M_Testcases_CSE_Release_1.ttcn b/OneM2M_Testcases_CSE_Release_1.ttcn
index 5ea51ef..1f4a1e7 100644
--- a/OneM2M_Testcases_CSE_Release_1.ttcn
+++ b/OneM2M_Testcases_CSE_Release_1.ttcn
@@ -3661,15 +3661,16 @@ module OneM2M_Testcases_CSE_Release_1 {
 					 */
 					testcase TC_CSE_DMR_CRE_001_CNT_CB() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						v_createRequest.primitiveContent.container.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int3, v_createRequest, -)); //Container
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 												
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.container.resourceName)){
 								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
@@ -3679,17 +3680,18 @@ module OneM2M_Testcases_CSE_Release_1 {
 						
 					testcase TC_CSE_DMR_CRE_001_CNT_AE() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						v_createRequest.primitiveContent.container.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int3, v_createRequest, m_createAe(PX_TS_AE1.appId, omit, PX_TS_AE1.aeIdStem, -, omit)));//Container
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 																			
-							if(getverdict == pass){ 
+							if(v_verdict == pass){ 
 								v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 								if(not ispresent(v_responsePrimitive.primitiveContent.container.resourceName)){
 									setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
@@ -3700,6 +3702,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_DMR_CRE_001_CNT_CNT() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
@@ -3707,9 +3710,9 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_createRequest.primitiveContent.container.resourceName := omit;
 
 						v_ae1.start(f_CSE_DMR_CRE_001(int3, v_createRequest, m_createContainerBase));//Container
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.container.resourceName)){
 								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 					}
@@ -3719,6 +3722,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_DMR_CRE_001_GRP_CB() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
@@ -3726,11 +3730,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_createRequest.primitiveContent.group_.resourceName := omit;
 
 						v_ae1.start(f_CSE_DMR_CRE_001(int9, v_createRequest, -));//Group
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 												
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.group_.resourceName)){
 								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 						}
@@ -3740,6 +3744,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						
 					testcase TC_CSE_DMR_CRE_001_GRP_AE() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
@@ -3747,11 +3752,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_createRequest.primitiveContent.group_.resourceName := omit;
 
 						v_ae1.start(f_CSE_DMR_CRE_001(int9, v_createRequest, m_createAe(PX_TS_AE1.appId, omit, PX_TS_AE1.aeIdStem, -, omit)));//Group
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 												
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.group_.resourceName)){
 									setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 								}
@@ -3761,6 +3766,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_DMR_CRE_001_ACP_CB() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
@@ -3768,11 +3774,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_createRequest.primitiveContent.accessControlPolicy.resourceName := omit;
 
 						v_ae1.start(f_CSE_DMR_CRE_001(int1, v_createRequest, -));//AccessControlPolicy
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 												
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.accessControlPolicy.resourceName)){
 								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 						}
@@ -3782,6 +3788,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_DMR_CRE_001_ACP_AE() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
@@ -3789,11 +3796,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_createRequest.primitiveContent.accessControlPolicy.resourceName := omit;
 
 						v_ae1.start(f_CSE_DMR_CRE_001(int1, v_createRequest, m_createAe(PX_TS_AE1.appId, omit, PX_TS_AE1.aeIdStem, -, omit)));//AccessControlPolicy
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 												
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.accessControlPolicy.resourceName)){
 								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
@@ -3803,17 +3810,18 @@ module OneM2M_Testcases_CSE_Release_1 {
 				
 					testcase TC_CSE_DMR_CRE_001_SUB_CB() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						v_createRequest.primitiveContent.subscription.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int23, v_createRequest, -));//Subscription
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 												
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
 								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
@@ -3823,17 +3831,18 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_DMR_CRE_001_SUB_AE() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						v_createRequest.primitiveContent.subscription.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int23, v_createRequest, m_createAe(PX_TS_AE1.appId, omit, PX_TS_AE1.aeIdStem, -, omit)));//Subscription
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 												
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
 								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
@@ -3843,17 +3852,18 @@ module OneM2M_Testcases_CSE_Release_1 {
 						
 					testcase TC_CSE_DMR_CRE_001_SUB_CNT() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						v_createRequest.primitiveContent.subscription.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int23, v_createRequest, m_createContainerBase));//Subscription
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 												
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
 								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
@@ -3863,17 +3873,18 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_DMR_CRE_001_SUB_ACP() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						v_createRequest.primitiveContent.subscription.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int23, v_createRequest, m_createAcpBase));//Subscription
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 												
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
 								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
@@ -3882,17 +3893,18 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_DMR_CRE_001_SUB_CSR() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						
 						v_createRequest.primitiveContent.subscription.resourceName := omit;
 						v_cse1.start(f_CSE_DMR_CRE_001_cseSimu(int23, v_createRequest));//Subscription
-						v_cse1.done;
+						v_cse1.done -> value v_verdict;
 						
 						 
 												
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_cse1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_cse1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
 								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
@@ -3901,17 +3913,18 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_DMR_CRE_001_CIN_CNT() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						v_createRequest.primitiveContent.contentInstance.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int4, v_createRequest, m_createContainerBase));//ContentInstance
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 												
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.contentInstance.resourceName)){
 								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
@@ -3930,15 +3943,16 @@ module OneM2M_Testcases_CSE_Release_1 {
 					 */
 					testcase TC_CSE_DMR_CRE_002_CNT() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						v_ae1.start(f_CSE_DMR_CRE_002(int3, m_createContainerBase));//container
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 						
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.container.resourceName)){
 								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							} else {
@@ -3952,15 +3966,16 @@ module OneM2M_Testcases_CSE_Release_1 {
 
 					testcase TC_CSE_DMR_CRE_002_GRP() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						v_ae1.start(f_CSE_DMR_CRE_002(int9, m_createGroupBase));//group
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 																		
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.group_.resourceName)){
 								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							} else {
@@ -3973,15 +3988,16 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_DMR_CRE_002_ACP() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						v_ae1.start(f_CSE_DMR_CRE_002(int1, m_createAcpBase ));//accessControlPolicy
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 																		
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.accessControlPolicy.resourceName)){
 								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							} else {
@@ -3994,15 +4010,16 @@ module OneM2M_Testcases_CSE_Release_1 {
 
 					testcase TC_CSE_DMR_CRE_002_SUB() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						v_ae1.start(f_CSE_DMR_CRE_002(int23, m_createSubscriptionBase));//Subscription
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 																		
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
 								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							} else {
@@ -4159,16 +4176,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 					 */
 					testcase TC_CSE_DMR_CRE_006_MNI() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						v_ae1.start(f_CSE_DMR_CRE_006(int3, v_createRequest));		
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 																		
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.container.maxNrOfInstances)){
 								setverdict(fail, __SCOPE__ & ": Error, maxNrOfInstances attribute not provided");
 							} 
@@ -4177,16 +4195,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_DMR_CRE_006_MBS() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						v_ae1.start(f_CSE_DMR_CRE_006(int3, v_createRequest));
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 																		
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.container.maxByteSize)){
 								setverdict(fail, __SCOPE__ & ": Error, maxByteSize attribute not provided");
 							} 
@@ -4196,16 +4215,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_DMR_CRE_006_MIA() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 												
 						v_ae1.start(f_CSE_DMR_CRE_006(int3, v_createRequest));
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 																		
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.container.maxInstanceAge)){
 								setverdict(fail, __SCOPE__ & ": Error, maxInstanceAge attribute not provided");
 							} 
@@ -5129,6 +5149,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					 */
 					testcase TC_CSE_DMR_UPD_001_CNT_LBL() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var Labels v_labels_1 := {"VALUE_1"};
@@ -5141,11 +5162,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_updateRequest.primitiveContent.container.labels := v_labels_2;
 						
 						v_ae1.start(f_CSE_DMR_UPD_001(int3, v_createRequest, v_updateRequest));//Container
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 																		
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.container)) {
@@ -5168,6 +5189,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 
 					testcase TC_CSE_DMR_UPD_001_GRP_LBL() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var Labels v_labels_1 := {"VALUE_1"};
@@ -5180,11 +5202,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_updateRequest.primitiveContent.group_.labels := v_labels_2;
 
 						v_ae1.start(f_CSE_DMR_UPD_001(int9, v_createRequest, v_updateRequest));//Group
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 																		
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
@@ -5207,6 +5229,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_DMR_UPD_001_ACP_LBL() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var Labels v_labels_1 := {"VALUE_1"};
@@ -5219,11 +5242,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_updateRequest.primitiveContent.accessControlPolicy.labels := v_labels_2;
 
 						v_ae1.start(f_CSE_DMR_UPD_001(int1, v_createRequest, v_updateRequest));//ACP
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 																		
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.accessControlPolicy)) {
@@ -5246,6 +5269,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				
 					testcase TC_CSE_DMR_UPD_001_SUB_LBL() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 					
 						var Labels v_labels_1 := {"VALUE_1"};
@@ -5258,11 +5282,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_updateRequest.primitiveContent.subscription.labels := v_labels_2;
 
 						v_ae1.start(f_CSE_DMR_UPD_001(int23, v_createRequest, v_updateRequest));//Subscription
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 																		
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -5294,6 +5318,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					 */
 					testcase TC_CSE_DMR_UPD_002_CNT_LBL() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var Labels v_labels_1 := {"VALUE_1"};
@@ -5303,11 +5328,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
                         
 						v_ae1.start(f_CSE_DMR_UPD_002(int3, m_createContainerBase, v_updateRequest));//Container
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 																		
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.container)) {
@@ -5330,6 +5355,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 
 					testcase TC_CSE_DMR_UPD_002_GRP_LBL() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var Labels v_labels_1 := {"VALUE_1"};
@@ -5339,11 +5365,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_updateRequest.primitiveContent.group_.labels := v_labels_1;
 						
 						v_ae1.start(f_CSE_DMR_UPD_002(int9, m_createGroupBase, v_updateRequest));//Group
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 																		
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
@@ -5366,6 +5392,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_DMR_UPD_002_ACP_LBL() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var Labels v_labels_1 := {"VALUE_1"};
@@ -5375,11 +5402,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_updateRequest.primitiveContent.accessControlPolicy.labels := v_labels_1;
 							
 						v_ae1.start(f_CSE_DMR_UPD_002(int1, m_createAcpBase,v_updateRequest));//AccessControlPolicy
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 																		
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.accessControlPolicy)) {
@@ -5402,6 +5429,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				
 					testcase TC_CSE_DMR_UPD_002_SUB_LBL() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var Labels v_labels_1 := {"VALUE_1"};
@@ -5411,11 +5439,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_updateRequest.primitiveContent.subscription.labels := v_labels_1;
 						
 						v_ae1.start(f_CSE_DMR_UPD_002(int23, m_createSubscriptionBase,v_updateRequest));//Subscription
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 																		
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -5446,6 +5474,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					 */
 					testcase TC_CSE_DMR_UPD_003_CNT_LBL() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 					
 						var Labels v_labels_1 := {"VALUE_1"};
@@ -5461,11 +5490,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_nullFields := {{"labels", omit}};
                         
 						v_ae1.start(f_CSE_DMR_UPD_003(int3, v_createRequest, v_updateRequest, v_nullFields));//Container
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 																		
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.container)) {
@@ -5492,6 +5521,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 
 					testcase TC_CSE_DMR_UPD_003_GRP_LBL() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var Labels v_labels_1 := {"VALUE_1"};
@@ -5507,11 +5537,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_nullFields := {{"labels", omit}};
 						
 						v_ae1.start(f_CSE_DMR_UPD_003(int9, v_createRequest, v_updateRequest, v_nullFields));//Group
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 																		
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
@@ -5536,6 +5566,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_DMR_UPD_003_ACP_LBL() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var Labels v_labels_1 := {"VALUE_1"};
@@ -5551,11 +5582,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_nullFields := {{"labels", omit}};
 							
 						v_ae1.start(f_CSE_DMR_UPD_003(int1, v_createRequest, v_updateRequest, v_nullFields));//AccessControlPolicy
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 																		
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.accessControlPolicy)) {
@@ -5580,6 +5611,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				
 					testcase TC_CSE_DMR_UPD_003_SUB_LBL() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var Labels v_labels_1 := {"VALUE_1"};
@@ -5595,11 +5627,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_nullFields := {{"labels", omit}};
 						
 						v_ae1.start(f_CSE_DMR_UPD_003(int23, v_createRequest, v_updateRequest, v_nullFields));//Subscription
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 																		
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -5632,6 +5664,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					 */
 					testcase TC_CSE_DMR_UPD_004_CNT_ET_MNI_LBL() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var Labels v_labels_1 := {"VALUE_1"};
 						var Labels v_labels_2 := {"To be deleted"};
@@ -5648,11 +5681,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_nullFields := {{"labels", omit}};
 						
 						v_ae1.start(f_CSE_DMR_UPD_004(int3, v_createRequest, v_updateRequest, v_nullFields));//Container
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 																		
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.container)) {
 									//Check attribute 1
@@ -5692,6 +5725,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 
 					testcase TC_CSE_DMR_UPD_004_GRP_ET_GN_LBL() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var XSD.String v_groupName_1 := "VALUE_1";
 						var Labels v_labels_1 := {"VALUE_1"};
@@ -5710,11 +5744,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_nullFields := {{"labels", omit}};
                         
 						v_ae1.start(f_CSE_DMR_UPD_004(int9, v_createRequest, v_updateRequest, v_nullFields));//Group
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 																		
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
 									//Check attribute 1
@@ -5754,6 +5788,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_DMR_UPD_004_ACP_PVS_PV_LBL() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var Labels v_labels_1 := {"VALUE_1"};
 						var Labels v_labels_2 := {"To be deleted"};
@@ -5773,11 +5808,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_nullFields := {{"labels", omit}};
       							
 						v_ae1.start(f_CSE_DMR_UPD_004(int1, v_createRequest, v_updateRequest, v_nullFields));//AccessControlPolicy
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 																		
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.accessControlPolicy)) {
 									//Check attribute 1
@@ -5817,6 +5852,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_DMR_UPD_004_SUB_ET_LBL_EXC() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var Labels v_labels_1 := {"VALUE_1"};
 						var AttributeAux_list v_nullFields;
@@ -5832,11 +5868,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_nullFields := {{"expirationCounter", omit}};
       							
 						v_ae1.start(f_CSE_DMR_UPD_004(int23, v_createRequest, v_updateRequest, v_nullFields));//Subscription
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 																		
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
 									//Check attribute 1
@@ -5960,6 +5996,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					 */
 					testcase TC_CSE_DMR_UPD_006_CNT_LBL() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var Labels v_labels_1 := {"VALUE_1"};
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
@@ -5967,9 +6004,9 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
 						
 						v_ae1.start(f_CSE_DMR_UPD_006(int3, m_createContainerBase, v_updateRequest));//Container
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
-						if(getverdict == pass){ 
+						if(v_verdict == pass){ 
 							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
 							//Check that the resource has NOT been udpated
 							  if(ischosen(v_primitiveContentRetrieveResource.container)) {
@@ -5982,6 +6019,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 
 					testcase TC_CSE_DMR_UPD_006_GRP_LBL() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var Labels v_labels_1 := {"VALUE_1"};
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
@@ -5989,9 +6027,9 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_updateRequest.primitiveContent.group_.labels := v_labels_1;
 						
 						v_ae1.start(f_CSE_DMR_UPD_006(int9, m_createGroupBase, v_updateRequest));//Group
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
-						if(getverdict == pass){ 
+						if(v_verdict == pass){ 
 							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
 							//Check that the resource has NOT been udpated
 							  if(ischosen(v_primitiveContentRetrieveResource.group_)) {
@@ -6004,6 +6042,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_DMR_UPD_006_ACP_LBL() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var Labels v_labels_1 := {"VALUE_1"};
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
@@ -6014,9 +6053,9 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_updateRequest.primitiveContent.accessControlPolicy.labels := v_labels_1;
 								
 						v_ae1.start(f_CSE_DMR_UPD_006(int1, v_requestPrimitive, v_updateRequest));//AccessControlPolicy
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
-						if(getverdict == pass){ 
+						if(v_verdict == pass){ 
 							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
 							//Check that the resource has NOT been udpated
 							  if(ischosen(v_primitiveContentRetrieveResource.accessControlPolicy)) {
@@ -6029,6 +6068,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				
 					testcase TC_CSE_DMR_UPD_006_SUB_LBL() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var Labels v_labels_1 := {"VALUE_1"};
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
@@ -6036,9 +6076,9 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_updateRequest.primitiveContent.subscription.labels := v_labels_1;
 								
 						v_ae1.start(f_CSE_DMR_UPD_006(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
-						if(getverdict == pass){ 
+						if(v_verdict == pass){ 
 							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
 							//Check that the resource has NOT been udpated
 							  if(ischosen(v_primitiveContentRetrieveResource.subscription)) {
@@ -6059,6 +6099,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					 */
 					testcase TC_CSE_DMR_UPD_007_CNT_CT() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var Timestamp v_creationTime := "21001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
@@ -6067,9 +6108,9 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_updateRequest.primitiveContent.container_invalid.creationTime := v_creationTime;
 						
 						v_ae1.start(f_CSE_DMR_UPD_007(int3, m_createContainerBase, v_updateRequest));//Container
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
-						if(getverdict == pass){ 
+						if(v_verdict == pass){ 
 							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
 							//Check that the resource has NOT been udpated
 							  if(ischosen(v_primitiveContentRetrieveResource.container_invalid)) {
@@ -6082,6 +6123,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 
 					testcase TC_CSE_DMR_UPD_007_GRP_CT() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var Timestamp v_creationTime := "21001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
@@ -6090,9 +6132,9 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_updateRequest.primitiveContent.group_invalid.creationTime := v_creationTime;
 						
 						v_ae1.start(f_CSE_DMR_UPD_007(int9, m_createGroupBase, v_updateRequest));//Group
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
-						if(getverdict == pass){ 
+						if(v_verdict == pass){ 
 							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
 							//Check that the resource has NOT been udpated
 							  if(ischosen(v_primitiveContentRetrieveResource.group_invalid)) {
@@ -6105,6 +6147,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_DMR_UPD_007_ACP_CT() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var Timestamp v_creationTime := "21001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
@@ -6113,9 +6156,9 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_updateRequest.primitiveContent.accessControlPolicy_invalid.creationTime := v_creationTime;
 								
 						v_ae1.start(f_CSE_DMR_UPD_007(int1, m_createAcpBase, v_updateRequest));//AccessControlPolicy
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
-						if(getverdict == pass){ 
+						if(v_verdict == pass){ 
 							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
 							//Check that the resource has NOT been udpated
 							  if(ischosen(v_primitiveContentRetrieveResource.accessControlPolicy_invalid)) {
@@ -6128,6 +6171,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				
 					testcase TC_CSE_DMR_UPD_007_SUB_CT() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var Timestamp v_creationTime := "21001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
@@ -6136,9 +6180,9 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_updateRequest.primitiveContent.subscription_invalid.creationTime := v_creationTime;
 								
 						v_ae1.start(f_CSE_DMR_UPD_007(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
-						if(getverdict == pass){ 
+						if(v_verdict == pass){ 
 							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
 							//Check that the resource has NOT been udpated
 							  if(ischosen(v_primitiveContentRetrieveResource.subscription_invalid)) {
@@ -6160,6 +6204,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 
 					testcase TC_CSE_DMR_UPD_008_GRP_MNM() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var AttributeAux_list v_nullFields;
@@ -6169,9 +6214,9 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_updateRequest.primitiveContent.group_.maxNrOfMembers := 1;
 						
 						v_ae1.start(f_CSE_DMR_UPD_008(int9, m_createGroupBase, v_updateRequest, v_nullFields));//Group
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
-						if(getverdict == pass){ 
+						if(v_verdict == pass){ 
 							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
 							  //Check that the resource has NOT been udpated
 							  if(ischosen(v_primitiveContentRetrieveResource.group_)) {
@@ -6184,6 +6229,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_DMR_UPD_008_ACP_PVS() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var SetOfAcrs v_selfPrivileges:= {{valueof(m_createAcr({"all"}, int63))}};
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
@@ -6194,9 +6240,9 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_updateRequest.primitiveContent.accessControlPolicy.selfPrivileges := v_selfPrivileges;
 								
 						v_ae1.start(f_CSE_DMR_UPD_008(int1, m_createAcpBase, v_updateRequest, v_nullFields));//AccessControlPolicy
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
-						if(getverdict == pass){ 
+						if(v_verdict == pass){ 
 							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
 						  	//Check that the resource has NOT been udpated
 						  	if(ischosen(v_primitiveContentRetrieveResource.accessControlPolicy)) {
@@ -6209,6 +6255,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				
 					testcase TC_CSE_DMR_UPD_008_SUB_NU() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var AttributeAux_list v_nullFields;
@@ -6218,9 +6265,9 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_updateRequest.primitiveContent.subscription.notificationURI := {"NullTarget"};
 								
 						v_ae1.start(f_CSE_DMR_UPD_008(int23, m_createSubscriptionBase, v_updateRequest, v_nullFields));//Subscription
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
-						if(getverdict == pass){ 
+						if(v_verdict == pass){ 
 							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
 							  //Check that the resource has NOT been udpated
 							  if(ischosen(v_primitiveContentRetrieveResource.subscription)) {
@@ -6305,19 +6352,20 @@ module OneM2M_Testcases_CSE_Release_1 {
 				 */
 					testcase TC_CSE_DMR_UPD_010_CNT() runs on Tester system CseSystem {
 						// Local variables
-					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-					var RequestPrimitive v_updateRequest := valueof(m_updateContainerBase);
+						var verdicttype v_verdict;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var RequestPrimitive v_updateRequest := valueof(m_updateContainerBase);
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
-					var Labels v_labels_1:= {"VALUE_1"};
+						var Labels v_labels_1:= {"VALUE_1"};
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 			   
 
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
 
 						v_ae1.start(f_CSE_DMR_UPD_010(int3, v_createRequest, v_updateRequest));//Container
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 
-						if(getverdict == pass){ 
+						if(v_verdict == pass){ 
 							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
 							//Check that stateTag has been incremented
 							  if(ischosen(v_primitiveContentRetrieveResource.container)) {
@@ -6340,19 +6388,20 @@ module OneM2M_Testcases_CSE_Release_1 {
 				 */
 					testcase TC_CSE_DMR_UPD_011_CNT_CIN() runs on Tester system CseSystem {
 						// Local variables
-					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-					var template RequestPrimitive v_updateRequest := m_updateContentInstanceBase;
-					var Labels v_labels:= {"LABEL"};
+						var verdicttype v_verdict;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_updateRequest := m_updateContentInstanceBase;
+						var Labels v_labels:= {"LABEL"};
 						var template RequestPrimitive v_createParentRequest := m_createContainerBase;
 						var template RequestPrimitive v_createChildRequest := m_createContentInstanceBase;
-					var PrimitiveContent v_primitiveContentRetrieveResource;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
 					
-					v_updateRequest.primitiveContent.contentInstance.labels := v_labels;
+						v_updateRequest.primitiveContent.contentInstance.labels := v_labels;
 							   
 						v_ae1.start(f_CSE_DMR_UPD_011(int3, v_createParentRequest, int4, v_createChildRequest, v_updateRequest));//ContentInstance under Container
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
         
-					if(getverdict == pass){ 
+					if(v_verdict == pass){ 
 							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
 						//Check that the resource has NOT been udpated
 							if(ischosen(v_primitiveContentRetrieveResource.contentInstance)) {
@@ -6534,6 +6583,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_DMR_UPD_014_ACP_LBL() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var Labels v_labels_1 := {"VALUE_1"};
@@ -6545,11 +6595,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_updateRequest.primitiveContent.accessControlPolicy.labels := v_labels_2;
 
 						v_ae1.start(f_CSE_DMR_UPD_014(int1, v_createRequest, v_updateRequest));//ACP
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 	
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.accessControlPolicy)) {
@@ -6564,6 +6614,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_DMR_UPD_014_CNT_ACPI() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var AcpType v_accessControlPolicyIDs_1 := {"NotInitialized_1"};
 						var AcpType v_accessControlPolicyIDs_2 := {"NotInitialized_2"};
@@ -6575,11 +6626,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_updateRequest.primitiveContent.container.accessControlPolicyIDs := v_accessControlPolicyIDs_2;
 
 						v_ae1.start(f_CSE_DMR_UPD_014(int3, v_createRequest, v_updateRequest, true));//Container
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.container)) {
@@ -6593,6 +6644,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_DMR_UPD_014_CNT_LBL() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var Labels v_labels_1 := {"VALUE_1"};
 						var Labels v_labels_2 := {"VALUE_2"};
@@ -6604,11 +6656,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_updateRequest.primitiveContent.container.labels := v_labels_2;
 		
 						v_ae1.start(f_CSE_DMR_UPD_014(int3, v_createRequest, v_updateRequest));//Container
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 		
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.container)) {
@@ -6622,6 +6674,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_DMR_UPD_014_CNT_MBS() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var XSD.NonNegativeInteger v_maxByteSize_1 := 256;
 						var XSD.NonNegativeInteger v_maxByteSize_2 := 512;
@@ -6633,11 +6686,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_updateRequest.primitiveContent.container.maxByteSize := v_maxByteSize_2;
 	
 						v_ae1.start(f_CSE_DMR_UPD_014(int3, v_createRequest, v_updateRequest));//Container
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 	
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.container)) {
@@ -6651,6 +6704,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_DMR_UPD_014_CNT_MIA() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var XSD.NonNegativeInteger v_maxInstanceAge_1 := 60;
 						var XSD.NonNegativeInteger v_maxInstanceAge_2 := 120;
@@ -6662,11 +6716,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_updateRequest.primitiveContent.container.maxInstanceAge := v_maxInstanceAge_2;
 
 						v_ae1.start(f_CSE_DMR_UPD_014(int3, v_createRequest, v_updateRequest));//Container
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.container)) {
@@ -6680,6 +6734,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_DMR_UPD_014_CNT_MNI() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var XSD.NonNegativeInteger v_maxNrOfInstances_1 := 1;
 						var XSD.NonNegativeInteger v_maxNrOfInstances_2 := 2;
@@ -6691,11 +6746,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_updateRequest.primitiveContent.container.maxNrOfInstances := v_maxNrOfInstances_2;
 	
 						v_ae1.start(f_CSE_DMR_UPD_014(int3, v_createRequest, v_updateRequest));//Container
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.container)) {
@@ -6709,6 +6764,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_DMR_UPD_014_SUB_ACPI() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var AcpType v_accessControlPolicyIDs_1 := {"NotInitialized_1"};
 						var AcpType v_accessControlPolicyIDs_2 := {"NotInitialized_2"};
@@ -6719,11 +6775,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_updateRequest.primitiveContent.subscription.accessControlPolicyIDs := v_accessControlPolicyIDs_2;
 
 						v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest, true));//Subscription
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -6738,6 +6794,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_DMR_UPD_014_SUB_LBL() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var Labels v_labels_1 := {"VALUE_1"};
 						var Labels v_labels_2 := {"VALUE_2"};
@@ -6748,11 +6805,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_updateRequest.primitiveContent.subscription.labels := v_labels_2;
 
 						v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 	
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -6774,6 +6831,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					 * @desc Check that the IUT updates successfully the value of the optional attribute OPTIONAL_ATTRIBUTE of the RESOURCE_TYPE resource under CSEBase
 					 */
 					testcase TC_CSE_DMR_UPD_015_CSR_LBL() runs on Tester system CseSystem {
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var Labels v_labels := {"MyLabel"};
 					   	var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;
@@ -6782,11 +6840,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 					   v_updateRequest.primitiveContent.remoteCSE.labels := v_labels;
 	
 					   v_ae1.start(f_CSE_DMR_UPD_015(int16, m_createRemoteCSEBase, v_updateRequest));//Remote CSE
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 
-					   if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+					   if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 						   //Check attribute 1
 						   if(ispresent(v_responsePrimitive.primitiveContent)) {
 							   if(ischosen(v_responsePrimitive.primitiveContent.remoteCSE)) {
@@ -6807,6 +6865,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					}
 					
 					testcase TC_CSE_DMR_UPD_015_CSR_POA() runs on Tester system CseSystem {
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var PoaList v_poaList := {f_getLocalPoA(PX_TS_AE2.mcaPortIn)};
 					   var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;
@@ -6815,11 +6874,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 					   v_updateRequest.primitiveContent.remoteCSE.pointOfAccess := v_poaList;
 
 					   v_ae1.start(f_CSE_DMR_UPD_015(int16, m_createRemoteCSEBase, v_updateRequest));//Remote CSE
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 
-					   if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+					   if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 						  //Check attribute 1
 						  if(ispresent(v_responsePrimitive.primitiveContent)) {
 							  if(ischosen(v_responsePrimitive.primitiveContent.remoteCSE)) {
@@ -6840,6 +6899,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					}
 					
 					testcase TC_CSE_DMR_UPD_015_CSR_NL() runs on Tester system CseSystem {
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var XSD.AnyURI v_nodeLink := "MyNodeId";
 					   	var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;
@@ -6848,11 +6908,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 					   v_updateRequest.primitiveContent.remoteCSE.nodeLink := v_nodeLink;
 
 					   v_ae1.start(f_CSE_DMR_UPD_015(int16, m_createRemoteCSEBase, v_updateRequest));//Remote CSE
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 
-					   if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+					   if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 						 //Check attribute 1
 						 if(ispresent(v_responsePrimitive.primitiveContent)) {
 							 if(ischosen(v_responsePrimitive.primitiveContent.remoteCSE)) {
@@ -6873,6 +6933,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					}
 			  		
 					testcase TC_CSE_DMR_UPD_015_AE_LBL() runs on Tester system CseSystem {
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var Labels v_labels := {"MyLabel"};
 						var template RequestPrimitive v_updateRequest := m_updateAeBase;
@@ -6881,11 +6942,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_updateRequest.primitiveContent.aE.labels := v_labels;
 						
 						v_ae1.start(f_CSE_DMR_UPD_015(int2, m_createAe(PX_TS_AE1.appId, -, PX_TS_AE1.aeIdStem), v_updateRequest));//AE
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 	
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							 //Check attribute 1
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.aE)) {
@@ -6906,17 +6967,18 @@ module OneM2M_Testcases_CSE_Release_1 {
 					}
 					
 					testcase TC_CSE_DMR_UPD_015_AE_ACPI() runs on Tester system CseSystem {
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_updateRequest := m_updateAeBase;
 						var RequestPrimitive v_updateRequestPrimitive;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						v_ae1.start(f_CSE_DMR_UPD_015(int2, m_createAe(PX_TS_AE1.appId, -, PX_TS_AE1.aeIdStem), v_updateRequest, true));//AE
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 
-						if(getverdict == pass){ 
+						if(v_verdict == pass){ 
 							v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							v_updateRequestPrimitive := f_getRequestPrimitive(v_ae1);	
 							 //Check attribute 1
@@ -6939,6 +7001,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					}
 					
 					testcase TC_CSE_DMR_UPD_015_AE_APN() runs on Tester system CseSystem {
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var XSD.String v_appName := "MyAppName";
 						var template RequestPrimitive v_updateRequest := m_updateAeBase;
@@ -6946,11 +7009,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						v_updateRequest.primitiveContent.aE.appName := v_appName;
 						v_ae1.start(f_CSE_DMR_UPD_015(int2, m_createAe(PX_TS_AE1.appId, -, PX_TS_AE1.aeIdStem), v_updateRequest));//AE
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							 //Check attribute 1
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.aE)) {
@@ -6971,6 +7034,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					}
 					
 					testcase TC_CSE_DMR_UPD_015_AE_POA() runs on Tester system CseSystem {
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var PoaList v_poaList := {f_getLocalPoA(PX_TS_AE2.mcaPortIn)};
 						var template RequestPrimitive v_updateRequest := m_updateAeBase;
@@ -6978,11 +7042,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						v_updateRequest.primitiveContent.aE.pointOfAccess := v_poaList;
 						v_ae1.start(f_CSE_DMR_UPD_015(int2, m_createAe(PX_TS_AE1.appId, -, PX_TS_AE1.aeIdStem), v_updateRequest));//AE
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							 //Check attribute 1
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.aE)) {
@@ -7003,6 +7067,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					}
 					
 					testcase TC_CSE_DMR_UPD_015_CNT_LBL() runs on Tester system CseSystem {
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var Labels v_labels := {"MyLabel"};
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
@@ -7011,11 +7076,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_updateRequest.primitiveContent.container.labels := v_labels;
 						
 						v_ae1.start(f_CSE_DMR_UPD_015(int3, m_createContainerBase, v_updateRequest));//Container
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							 //Check attribute 1
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.container)) {
@@ -7036,17 +7101,18 @@ module OneM2M_Testcases_CSE_Release_1 {
 					}
 					
 					testcase TC_CSE_DMR_UPD_015_CNT_ACPI() runs on Tester system CseSystem {
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var RequestPrimitive v_updateRequestPrimitive;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						v_ae1.start(f_CSE_DMR_UPD_015(int3, m_createContainerBase, v_updateRequest, true));//Container
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 
-						if(getverdict == pass){
+						if(v_verdict == pass){
 							 v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							 v_updateRequestPrimitive := f_getRequestPrimitive(v_ae1);	
 							 //Check attribute 1
@@ -7069,6 +7135,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					}
 					
 					testcase TC_CSE_DMR_UPD_015_CNT_MNI() runs on Tester system CseSystem {
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var XSD.NonNegativeInteger v_maxNrOfInstances := 5;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
@@ -7077,11 +7144,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_updateRequest.primitiveContent.container.maxNrOfInstances := v_maxNrOfInstances;
 						
 						v_ae1.start(f_CSE_DMR_UPD_015(int3, m_createContainerBase, v_updateRequest));//Container
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							 //Check attribute 1
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.container)) {
@@ -7102,6 +7169,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					}
 					
 					testcase TC_CSE_DMR_UPD_015_CNT_MBS() runs on Tester system CseSystem {
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var XSD.NonNegativeInteger v_maxByteSize := 512;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
@@ -7110,11 +7178,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_updateRequest.primitiveContent.container.maxByteSize := v_maxByteSize;
 						
 						v_ae1.start(f_CSE_DMR_UPD_015(int3, m_createContainerBase, v_updateRequest));//Container
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							 //Check attribute 1
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.container)) {
@@ -7135,6 +7203,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					}
 					
 					testcase TC_CSE_DMR_UPD_015_CNT_MIA() runs on Tester system CseSystem {
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;					
 						var XSD.NonNegativeInteger v_maxInstanceAge := 1;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
@@ -7143,11 +7212,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_updateRequest.primitiveContent.container.maxInstanceAge := v_maxInstanceAge;
 						
 						v_ae1.start(f_CSE_DMR_UPD_015(int3, m_createContainerBase, v_updateRequest));//Container
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							 //Check attribute 1
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.container)) {
@@ -7168,6 +7237,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					}
 					
 					testcase TC_CSE_DMR_UPD_015_ACP_LBL() runs on Tester system CseSystem {
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var Labels v_labels := {"MyLabel"};
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
@@ -7176,11 +7246,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_updateRequest.primitiveContent.accessControlPolicy.labels := v_labels;
 						
 						v_ae1.start(f_CSE_DMR_UPD_015(int1, m_createAcpBase, v_updateRequest));//AccessControlPolicy
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 	
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							 //Check attribute 1
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.accessControlPolicy)) {
@@ -7201,17 +7271,18 @@ module OneM2M_Testcases_CSE_Release_1 {
 					}
 					
 					testcase TC_CSE_DMR_UPD_015_SUB_ACPI() runs on Tester system CseSystem {
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var RequestPrimitive v_updateRequestPrimitive;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest, true));//Subscription
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 
-						if(getverdict == pass){ 
+						if(v_verdict == pass){ 
 							v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							v_updateRequestPrimitive := f_getRequestPrimitive(v_ae1);	
 							  //Check attribute 1
@@ -7234,6 +7305,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					}
 					
 					testcase TC_CSE_DMR_UPD_015_SUB_LBL() runs on Tester system CseSystem {
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var Labels v_labels := {"MyLabel"};
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
@@ -7241,11 +7313,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						v_updateRequest.primitiveContent.subscription.labels := v_labels;
 						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							 //Check attribute 1
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -7266,6 +7338,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					}
 					
 					testcase TC_CSE_DMR_UPD_015_GRP_LBL() runs on Tester system CseSystem {
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var Labels v_labels := {"MyLabel"};
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
@@ -7273,11 +7346,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						v_updateRequest.primitiveContent.group_.labels := v_labels;
 						v_ae1.start(f_CSE_DMR_UPD_015(int9, m_createGroupBase, v_updateRequest));//Group
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							 //Check attribute 1
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
@@ -7298,17 +7371,18 @@ module OneM2M_Testcases_CSE_Release_1 {
 					}
 					
 					testcase TC_CSE_DMR_UPD_015_GRP_ACPI() runs on Tester system CseSystem {
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var RequestPrimitive v_updateRequestPrimitive;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						v_ae1.start(f_CSE_DMR_UPD_015(int9, m_createGroupBase, v_updateRequest, true));//Group
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 
-						if(getverdict == pass){
+						if(v_verdict == pass){
 							 v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							 v_updateRequestPrimitive := f_getRequestPrimitive(v_ae1);	
 							 //Check attribute 1
@@ -7331,6 +7405,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					}
 					
 					testcase TC_CSE_DMR_UPD_015_GRP_MACP() runs on Tester system CseSystem {
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var ListOfURIs v_membersAccessControlPolicyIDs := {"NotInitialized"};
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
@@ -7338,11 +7413,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						v_updateRequest.primitiveContent.group_.membersAccessControlPolicyIDs := v_membersAccessControlPolicyIDs;
 						v_ae1.start(f_CSE_DMR_UPD_015(int9, m_createGroupBase, v_updateRequest, true));//Group
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							 //Check attribute 1
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
@@ -7363,6 +7438,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					}
 					
 					testcase TC_CSE_DMR_UPD_015_GRP_GN() runs on Tester system CseSystem {
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var XSD.String v_groupName:="MyGroupName";
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
@@ -7370,11 +7446,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						v_updateRequest.primitiveContent.group_.groupName := v_groupName;
 						v_ae1.start(f_CSE_DMR_UPD_015(int9, m_createGroupBase, v_updateRequest));//Group
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							 //Check attribute 1
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
@@ -7402,6 +7478,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					 * @desc Check that the IUT updates successfully the value of the attribute MANDATORY_ATTRIBUTE of the RESOURCE_TYPE resource under CSEBase
 					*/
 					testcase TC_CSE_DMR_UPD_016_CSR_ET() runs on Tester system CseSystem {
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var Timestamp v_expirationTime := "21001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;
@@ -7410,11 +7487,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_updateRequest.primitiveContent.remoteCSE.expirationTime := v_expirationTime;
 						
 						v_ae1.start(f_CSE_DMR_UPD_016(int16, m_createRemoteCSEBase, v_updateRequest));//Remote CSE
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 						
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.remoteCSE)) {
@@ -7435,6 +7512,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					}
 					
 					testcase TC_CSE_DMR_UPD_016_CSR_RR() runs on Tester system CseSystem {
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var XSD.Boolean v_requestReachability := true;
 						var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;
@@ -7443,9 +7521,9 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_updateRequest.primitiveContent.remoteCSE.requestReachability := v_requestReachability;
 						
 						v_ae1.start(f_CSE_DMR_UPD_016(int16, m_createRemoteCSEBase, v_updateRequest));//Remote CSE
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.remoteCSE)) {
@@ -7466,6 +7544,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					}
 			  		
 					testcase TC_CSE_DMR_UPD_016_AE_ET() runs on Tester system CseSystem {
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var Timestamp v_expirationTime := "21001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updateAeBase;
@@ -7474,11 +7553,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_updateRequest.primitiveContent.aE.expirationTime := v_expirationTime;
 						
 						v_ae1.start(f_CSE_DMR_UPD_016(int2, m_createAe(PX_TS_AE1.appId, -, PX_TS_AE1.aeIdStem), v_updateRequest));//AE
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.aE)) {
@@ -7499,6 +7578,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					}
 					
 					testcase TC_CSE_DMR_UPD_016_AE_RR() runs on Tester system CseSystem {
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var XSD.Boolean v_requestReachability := true;
 						var template RequestPrimitive v_updateRequest := m_updateAeBase;
@@ -7507,11 +7587,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_updateRequest.primitiveContent.aE.requestReachability := v_requestReachability;
 
 						v_ae1.start(f_CSE_DMR_UPD_016(int2, m_createAe(PX_TS_AE1.appId, -, PX_TS_AE1.aeIdStem), v_updateRequest));//AE
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.aE)) {
@@ -7532,6 +7612,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					}
 					
 					testcase TC_CSE_DMR_UPD_016_CNT_ET() runs on Tester system CseSystem {
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var Timestamp v_expirationTime := "21001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
@@ -7540,11 +7621,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_updateRequest.primitiveContent.container.expirationTime := v_expirationTime;
 						
 						v_ae1.start(f_CSE_DMR_UPD_016(int3, m_createContainerBase, v_updateRequest));//Container
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.container)) {
@@ -7565,6 +7646,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					}
 					
 					testcase TC_CSE_DMR_UPD_016_ACP_ET() runs on Tester system CseSystem {
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var Timestamp v_expirationTime := "21001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
@@ -7573,11 +7655,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_updateRequest.primitiveContent.accessControlPolicy.expirationTime := v_expirationTime;
 						
 						v_ae1.start(f_CSE_DMR_UPD_016(int1, m_createAcpBase, v_updateRequest));//AccessControlPolicy
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.accessControlPolicy)) {
@@ -7598,6 +7680,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					}
 					
 					testcase TC_CSE_DMR_UPD_016_ACP_PV() runs on Tester system CseSystem {
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var SetOfAcrs v_privileges_1 := {{valueof(m_createAcr({PX_SUPER_AE_ID}, int61))}};
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
@@ -7605,11 +7688,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						v_updateRequest.primitiveContent.accessControlPolicy.privileges := v_privileges_1;
 						v_ae1.start(f_CSE_DMR_UPD_016(int1, m_createAcpBase, v_updateRequest));//AccessControlPolicy
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.accessControlPolicy)) {
@@ -7630,6 +7713,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					}
 					
 					testcase TC_CSE_DMR_UPD_016_ACP_PVS() runs on Tester system CseSystem {
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var SetOfAcrs v_privileges_1 := {{valueof(m_createAcr({PX_SUPER_AE_ID}, int62))}};
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
@@ -7637,11 +7721,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						v_updateRequest.primitiveContent.accessControlPolicy.selfPrivileges := v_privileges_1;
 						v_ae1.start(f_CSE_DMR_UPD_016(int1, m_createAcpBase, v_updateRequest));//AccessControlPolicy
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.accessControlPolicy)) {
@@ -7662,6 +7746,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					}
 				    
 					testcase TC_CSE_DMR_UPD_016_SUB_ET() runs on Tester system CseSystem {
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var Timestamp v_expirationTime := "21001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
@@ -7670,11 +7755,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_updateRequest.primitiveContent.subscription.expirationTime := v_expirationTime;
 						
 						v_ae1.start(f_CSE_DMR_UPD_016(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -7696,6 +7781,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					}
 					
 					testcase TC_CSE_DMR_UPD_016_SUB_NU() runs on Tester system CseSystem {
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var ListOfURIs v_notificationURI := {"NotReachableNotificationURI"};
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
@@ -7705,11 +7791,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_updateRequest.primitiveContent.subscription.notificationURI := v_notificationURI;
 						
 						v_ae1.start(f_CSE_DMR_UPD_016(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -7730,6 +7816,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					}
 					
 					testcase TC_CSE_DMR_UPD_016_SUB_NCT() runs on Tester system CseSystem {
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var NotificationContentType v_notificationContentType := int2;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
@@ -7738,11 +7825,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_updateRequest.primitiveContent.subscription.notificationContentType := v_notificationContentType;
 						
 						v_ae1.start(f_CSE_DMR_UPD_016(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -7763,6 +7850,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					}
 					
 					testcase TC_CSE_DMR_UPD_016_GRP_ET() runs on Tester system CseSystem {
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var Timestamp v_expirationTime := "21001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
@@ -7771,11 +7859,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_updateRequest.primitiveContent.group_.expirationTime := v_expirationTime;
 						
 						v_ae1.start(f_CSE_DMR_UPD_016(int9, m_createGroupBase, v_updateRequest));//Group
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
@@ -7796,6 +7884,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					}
 					
 					testcase TC_CSE_DMR_UPD_016_GRP_MNM() runs on Tester system CseSystem {
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var XSD.PositiveInteger v_maxNrOfMembers := 10;
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
@@ -7804,11 +7893,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_updateRequest.primitiveContent.group_.maxNrOfMembers := v_maxNrOfMembers;
 						
 						v_ae1.start(f_CSE_DMR_UPD_016(int9, m_createGroupBase, v_updateRequest));//Group
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
@@ -7829,6 +7918,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					}
 					
 					testcase TC_CSE_DMR_UPD_016_GRP_MID() runs on Tester system CseSystem {
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var ListOfURIs v_memberIDs := {"NotInitialized"};
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
@@ -7837,11 +7927,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_updateRequest.primitiveContent.group_.memberIDs := v_memberIDs;
 						
 						v_ae1.start(f_CSE_DMR_UPD_016(int9, m_createGroupBase, v_updateRequest));//Group
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
@@ -7968,14 +8058,15 @@ module OneM2M_Testcases_CSE_Release_1 {
 					 */
 					testcase TC_CSE_DMR_DEL_005_CNT() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 		
 						
 						v_ae1.start(f_CSE_DMR_DEL_005(int3, m_createContainerBase, int3, m_createContainerBase));//Container
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
-						if(getverdict == pass){ 
+						if(v_verdict == pass){ 
 							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
 							//Check that stateTag has been incremented
 							  if(ischosen(v_primitiveContentRetrieveResource.container)) {
diff --git a/OneM2M_Testcases_CSE_Release_2.ttcn b/OneM2M_Testcases_CSE_Release_2.ttcn
index cfd4bb6..614d968 100644
--- a/OneM2M_Testcases_CSE_Release_2.ttcn
+++ b/OneM2M_Testcases_CSE_Release_2.ttcn
@@ -594,6 +594,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					 */
 					testcase TC_CSE_DMR_CRE_001_PCH_AE() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
@@ -602,7 +603,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_createRequest.primitiveContent.pollingChannel.resourceName := omit;
 
 						v_ae1.start(f_CSE_DMR_CRE_001(int15, v_createRequest, m_createAe(PX_TS_AE1.appId, omit, PX_TS_AE1.aeIdStem, -, omit)));//PollingChannel
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 												
@@ -624,11 +625,12 @@ module OneM2M_Testcases_CSE_Release_2 {
 					 */
 					testcase TC_CSE_DMR_CRE_002_PCH() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 			
 						v_ae1.start(f_CSE_DMR_CRE_002(int15, m_createPollingChannelBase));//Pollingchannel
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 												
@@ -645,11 +647,12 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_CRE_002_FLXC() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
 						v_ae1.start(f_CSE_DMR_CRE_002(int28, m_createGenericInterworkingServiceBase));//Specialization of FlexContainer
-						v_ae1.done;	 
+						v_ae1.done -> value v_verdict;	 
 							
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.genericInterworkingService.resourceName)){
@@ -705,14 +708,15 @@ module OneM2M_Testcases_CSE_Release_2 {
 					 */
 					testcase TC_CSE_DMR_CRE_006_CNT_MNI() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 		
 						v_ae1.start(f_CSE_DMR_CRE_006(int3, v_createRequest));		
-						v_ae1.done;		 
+						v_ae1.done -> value v_verdict;		 
 														
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.container.maxNrOfInstances)){
 								setverdict(fail, __SCOPE__, ": Error, maxNrOfInstances attribute not provided");
 							} 
@@ -721,14 +725,15 @@ module OneM2M_Testcases_CSE_Release_2 {
 	
 					testcase TC_CSE_DMR_CRE_006_CNT_MBS() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 		
 						v_ae1.start(f_CSE_DMR_CRE_006(int3, v_createRequest));
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 																				
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.container.maxByteSize)){
 								setverdict(fail, __SCOPE__, ": Error, maxByteSize attribute not provided");
 							} 
@@ -738,15 +743,16 @@ module OneM2M_Testcases_CSE_Release_2 {
 	
 					testcase TC_CSE_DMR_CRE_006_CNT_MIA() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 								
 						
 						v_ae1.start(f_CSE_DMR_CRE_006(int3, v_createRequest));
-						v_ae1.done;		 
+						v_ae1.done -> value v_verdict;		 
 														
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.container.maxInstanceAge)){
 								setverdict(fail, __SCOPE__, ": Error, maxInstanceAge attribute not provided");
 							} 
@@ -1205,6 +1211,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					 */
 					testcase TC_CSE_DMR_UPD_001_PCH_LBL() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var Labels v_labels_1 := {"VALUE_1"};
@@ -1217,11 +1224,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_updateRequest.primitiveContent.pollingChannel.labels := v_labels_2;
 
 						v_ae1.start(f_CSE_DMR_UPD_001(int15, v_createRequest, v_updateRequest));//PollingChannel
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 																		
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.pollingChannel)) {
@@ -1253,6 +1260,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					 */
 					testcase TC_CSE_DMR_UPD_002_PCH_LBL() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var Labels v_labels_1 := {"VALUE_1"};
@@ -1262,11 +1270,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_updateRequest.primitiveContent.pollingChannel.labels := v_labels_1;
 						
 						v_ae1.start(f_CSE_DMR_UPD_002(int15, m_createPollingChannelBase,v_updateRequest));//PollingChannel
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 																		
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.pollingChannel)) {
@@ -1297,6 +1305,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					 */
 					testcase TC_CSE_DMR_UPD_003_PCH_LBL() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var Labels v_labels_1 := {"VALUE_1"};
 						var Labels v_labels_2 := {"To be deleted"};
@@ -1311,11 +1320,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_nullFields := {{"labels", omit}};
 						
 						v_ae1.start(f_CSE_DMR_UPD_003(int15, v_createRequest, v_updateRequest, v_nullFields));//PollingChannel
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 																		
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.pollingChannel)) {
@@ -1349,6 +1358,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					 */
 					testcase TC_CSE_DMR_UPD_007_PCH_CT() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var Timestamp v_creationTime := "21001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
@@ -1357,9 +1367,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_updateRequest.primitiveContent.pollingChannel_invalid.creationTime := v_creationTime;
 							
 						v_ae1.start(f_CSE_DMR_UPD_007(int15, m_createPollingChannelBase, v_updateRequest));//PollingChannel
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
-						if(getverdict == pass){ 
+						if(v_verdict == pass){ 
 							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
 							//Check that the resource has NOT been udpated
 							  if(ischosen(v_primitiveContentRetrieveResource.pollingChannel_invalid)) {
@@ -1402,6 +1412,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					 */
 					testcase TC_CSE_DMR_UPD_014_ACP_ET() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var Timestamp v_expirationTime_1 := "20301231T012345";
 						var Timestamp v_expirationTime_2 := "20401020T012345";
@@ -1412,11 +1423,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_updateRequest.primitiveContent.accessControlPolicy.expirationTime := v_expirationTime_2;
 
 						v_ae1.start(f_CSE_DMR_UPD_014(int1, v_createRequest, v_updateRequest));//ACP
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 						
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.accessControlPolicy)) {
@@ -1431,6 +1442,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 										
 					testcase TC_CSE_DMR_UPD_014_CNT_ET() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var Timestamp v_expirationTime_1 := "20301231T012345";
 						var Timestamp v_expirationTime_2 := "20401020T012345";
@@ -1442,11 +1454,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_updateRequest.primitiveContent.container.expirationTime := v_expirationTime_2;
 
 						v_ae1.start(f_CSE_DMR_UPD_014(int3, v_createRequest, v_updateRequest));//Container
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.container)) {
@@ -1460,6 +1472,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 										
 					testcase TC_CSE_DMR_UPD_014_CNT_OR() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var XSD.AnyURI v_ontologyRef_1 := "MyOntologyRef_1";
 						var XSD.AnyURI v_ontologyRef_2 := "MyOntologyRef_2";
@@ -1471,11 +1484,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_updateRequest.primitiveContent.container.ontologyRef := v_ontologyRef_2;
 	
 						v_ae1.start(f_CSE_DMR_UPD_014(int3, v_createRequest, v_updateRequest));//Container
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 	
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.container)) {
@@ -1489,6 +1502,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_UPD_014_SUB_BN() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var BatchNotify v_batchNotify_1 := {1, "PT1S"};
 						var BatchNotify v_batchNotify_2 := {2, "PT1S"};
@@ -1499,11 +1513,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_updateRequest.primitiveContent.subscription.batchNotify := v_batchNotify_2;
 
 						v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -1518,6 +1532,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_UPD_014_SUB_ENC() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var EventNotificationCriteria v_eventNotificationCriteria_1 := valueof(m_eventNotificationCriteria({int1}, -));
@@ -1529,11 +1544,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_updateRequest.primitiveContent.subscription.eventNotificationCriteria := v_eventNotificationCriteria_2;
 
 						v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -1548,6 +1563,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_UPD_014_SUB_ET() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var Timestamp v_expirationTime_1 := "20301231T012345";
@@ -1559,11 +1575,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_updateRequest.primitiveContent.subscription.expirationTime := v_expirationTime_2;
 
 						v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -1578,6 +1594,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_UPD_014_SUB_EXC() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var XSD.PositiveInteger v_expirationCounter_1 := 10;
@@ -1589,11 +1606,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_updateRequest.primitiveContent.subscription.expirationCounter := v_expirationCounter_2;
 
 						v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -1608,6 +1625,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_UPD_014_SUB_GPI() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var XSD.AnyURI v_groupID_1 := "MyGroupID_1";
@@ -1619,11 +1637,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_updateRequest.primitiveContent.subscription.groupID := v_groupID_2;
 
 						v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -1638,6 +1656,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_UPD_014_SUB_LN() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var XSD.Boolean v_latestNotify_1 := true;
@@ -1649,11 +1668,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_updateRequest.primitiveContent.subscription.latestNotify := v_latestNotify_2;
 
 						v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -1668,6 +1687,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_UPD_014_SUB_NCT() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 					
 						var NotificationContentType v_notificationContentType_1 := int1;
@@ -1679,11 +1699,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_updateRequest.primitiveContent.subscription.notificationContentType := v_notificationContentType_2;
 
 						v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -1698,6 +1718,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_UPD_014_SUB_NEC() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var EventCat v_notificationEventCat_1 := {alt_1 := 100};
@@ -1709,11 +1730,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_updateRequest.primitiveContent.subscription.notificationEventCat := v_notificationEventCat_2;
 
 						v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -1728,6 +1749,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_UPD_014_SUB_NFU() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var XSD.AnyURI v_notificationForwardingURI_1 := "MyForwardingURI_1";
@@ -1739,11 +1761,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_updateRequest.primitiveContent.subscription.notificationForwardingURI := v_notificationForwardingURI_2;
 
 						v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -1758,6 +1780,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_UPD_014_SUB_NSP() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var XSD.PositiveInteger v_notificationStoragePriority_1 := 1;
@@ -1769,11 +1792,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_updateRequest.primitiveContent.subscription.notificationStoragePriority := v_notificationStoragePriority_2;
 
 						v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -1788,6 +1811,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_UPD_014_SUB_PN() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var PendingNotification v_pendingNotification_1 := int1;
@@ -1799,11 +1823,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_updateRequest.primitiveContent.subscription.pendingNotification := v_pendingNotification_2;
 
 						v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -1818,6 +1842,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_UPD_014_SUB_RL() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var RateLimit v_rateLimit_1 := {0, "PT20M"};
@@ -1829,11 +1854,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_updateRequest.primitiveContent.subscription.rateLimit := v_rateLimit_2;
 
 						v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
 						 
 
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+						if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
-- 
GitLab