diff --git a/OneM2M_Testcases_CSE_Release_1.ttcn b/OneM2M_Testcases_CSE_Release_1.ttcn
index dc638d7782ce919c87ec0bf7f237962a71097ffe..368690adb0aeebc96bd406bc0c0f35e66a5f0c10 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 e5af8e553d436edc95d475bb419fa94aa843ae6a..6afe2af5d59d77bc99d3bf2c9d13426130ac3da8 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)) {
diff --git a/OneM2M_Testcases_CSE_Release_3.ttcn b/OneM2M_Testcases_CSE_Release_3.ttcn
index babb85971511eab1a8c1f83cf8fdbea6bfdffb3f..8df824bae459bd2cc871e59fd3af4126be04b09b 100644
--- a/OneM2M_Testcases_CSE_Release_3.ttcn
+++ b/OneM2M_Testcases_CSE_Release_3.ttcn
@@ -300,17 +300,18 @@ module OneM2M_Testcases_CSE_Release_3 {
 					 */
 					testcase TC_CSE_DMR_CRE_001_SCH_CB() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var template RequestPrimitive v_createRequest := m_createScheduleBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						v_createRequest.primitiveContent.schedule.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int18, v_createRequest, -));//Schedule
-						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.schedule.resourceName)){
 								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
@@ -320,17 +321,18 @@ module OneM2M_Testcases_CSE_Release_3 {
 									
 					testcase TC_CSE_DMR_CRE_001_SCH_SUB() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var template RequestPrimitive v_createRequest := m_createScheduleBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						v_createRequest.primitiveContent.schedule.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int18, v_createRequest, m_createSubscriptionBase));//Schedule
-						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.schedule.resourceName)){
 								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
@@ -340,17 +342,18 @@ module OneM2M_Testcases_CSE_Release_3 {
 										
 					testcase TC_CSE_DMR_CRE_001_SUB_SCH() 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_createScheduleBase));//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");
 							}
@@ -359,17 +362,18 @@ module OneM2M_Testcases_CSE_Release_3 {
 					
 					testcase TC_CSE_DMR_CRE_001_SUB_GRP() 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_createGroupBase));//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");
 							}
@@ -378,6 +382,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					
 					testcase TC_CSE_DMR_CRE_001_SUB_AEA() runs on Tester system CseSystem {
 						//Local variables
+						var verdicttype v_verdict;
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var RequestPrimitive v_createAEAnnc := valueof(m_createAEAnncBase);
@@ -385,9 +390,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 	
 						v_createRequest.primitiveContent.timeSeries.resourceName := omit;
 						v_cse1.start(f_CSE_DMR_CRE_001_cseSimu(int23, v_createRequest, int10002, v_createAEAnnc));//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");
 							}
@@ -396,6 +401,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					
 					testcase TC_CSE_DMR_CRE_001_CNT_AEA() runs on Tester system CseSystem {
 						//Local variables
+						var verdicttype v_verdict;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var RequestPrimitive v_createAEAnnc := valueof(m_createAEAnncBase);
@@ -403,9 +409,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 
 						v_createRequest.primitiveContent.container.resourceName := omit;
 						v_cse1.start(f_CSE_DMR_CRE_001_cseSimu(int3, v_createRequest, int10002, v_createAEAnnc));//Container
-						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");
 							}
@@ -415,6 +421,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					
 					testcase TC_CSE_DMR_CRE_001_GRP_AEA() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var RequestPrimitive v_createAEAnnc := valueof(m_createAEAnncBase);
@@ -422,9 +429,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 
 						v_createRequest.primitiveContent.group_.resourceName := omit;
 						v_cse1.start(f_CSE_DMR_CRE_001_cseSimu(int9, v_createRequest, int10002, v_createAEAnnc));//Group
-						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.group_.resourceName)){
 								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
 							}
@@ -433,6 +440,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					
 					testcase TC_CSE_DMR_CRE_001_ACP_AEA() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var RequestPrimitive v_createAEAnnc := valueof(m_createAEAnncBase);
@@ -440,9 +448,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 
 						v_createRequest.primitiveContent.accessControlPolicy.resourceName := omit;
 						v_cse1.start(f_CSE_DMR_CRE_001_cseSimu(int1, v_createRequest, int10002, v_createAEAnnc));//Access Control Policy
-						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.accessControlPolicy.resourceName)){
 								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
 							}
@@ -451,15 +459,16 @@ module OneM2M_Testcases_CSE_Release_3 {
 										
 					testcase TC_CSE_DMR_CRE_001_LCP_CB() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var template RequestPrimitive v_createRequest := m_createLocationPolicyBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						v_createRequest.primitiveContent.locationPolicy.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int10, v_createRequest, -));//Location Policy
-						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.locationPolicy.resourceName)){
 								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
@@ -469,15 +478,16 @@ module OneM2M_Testcases_CSE_Release_3 {
 					
 					testcase TC_CSE_DMR_CRE_001_TS_CB() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 	
 						v_createRequest.primitiveContent.timeSeries.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int29, v_createRequest, -));//TimeSeries
-						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.timeSeries.resourceName)){
 								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
 							}
@@ -487,6 +497,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					
 					testcase TC_CSE_DMR_CRE_001_TS_AE() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;	
@@ -494,9 +505,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_createRequest.primitiveContent.timeSeries.resourceName := omit;
 
 						v_ae1.start(f_CSE_DMR_CRE_001(int29, v_createRequest, m_createAe(PX_TS_AE1.appId, omit, PX_TS_AE1.aeIdStem, -, omit)));//TimeSeries
-						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.timeSeries.resourceName)){
 								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
 							}
@@ -506,15 +517,16 @@ module OneM2M_Testcases_CSE_Release_3 {
 					
 					testcase TC_CSE_DMR_CRE_001_TS_CSR() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 	
 						v_createRequest.primitiveContent.timeSeries.resourceName := omit;
 						v_cse1.start(f_CSE_DMR_CRE_001_cseSimu(int29, v_createRequest, -, -));//TimeSeries
-						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.timeSeries.resourceName)){
 								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
 							}
@@ -523,6 +535,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					
 					testcase TC_CSE_DMR_CRE_001_TS_AEA() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var RequestPrimitive v_createAEAnnc := valueof(m_createAEAnncBase);
@@ -530,9 +543,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 
 						v_createRequest.primitiveContent.timeSeries.resourceName := omit;
 						v_cse1.start(f_CSE_DMR_CRE_001_cseSimu(int29, v_createRequest, int10002, v_createAEAnnc));//TimeSeries
-						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.timeSeries.resourceName)){
 								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
 							}
@@ -541,15 +554,16 @@ module OneM2M_Testcases_CSE_Release_3 {
 					
 					testcase TC_CSE_DMR_CRE_001_TSI_TS() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 	
 						v_createRequest.primitiveContent.timeSeriesInstance.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int30, v_createRequest, m_createTimeSeriesBase));//TimeSeriesInstance
-						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.timeSeriesInstance.resourceName)){
 								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
 							}
@@ -567,15 +581,16 @@ module OneM2M_Testcases_CSE_Release_3 {
 					 */
 					testcase TC_CSE_DMR_CRE_002_SCH() 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(int18, m_createScheduleBase));//Schedule
-						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.schedule.resourceName)){
 								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							} else {
@@ -588,14 +603,15 @@ module OneM2M_Testcases_CSE_Release_3 {
 										
 					testcase TC_CSE_DMR_CRE_002_TS() 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(int29, m_createTimeSeriesBase));//TimeSeries
-						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.timeSeries.resourceName)){
 								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
 							} else {
@@ -670,15 +686,16 @@ module OneM2M_Testcases_CSE_Release_3 {
 					 */
 					testcase TC_CSE_DMR_CRE_006_TS_MNI() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
 						
 						v_ae1.start(f_CSE_DMR_CRE_006(int29, 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.timeSeries.maxNrOfInstances)){
 								setverdict(fail, __SCOPE__, ": Error, maxNrOfInstances attribute not provided");
 							} 
@@ -687,15 +704,16 @@ module OneM2M_Testcases_CSE_Release_3 {
 
 					testcase TC_CSE_DMR_CRE_006_TS_MBS() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
 						
 						v_ae1.start(f_CSE_DMR_CRE_006(int29, 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.timeSeries.maxByteSize)){
 								setverdict(fail, __SCOPE__, ": Error, maxByteSize attribute not provided");
 							} 
@@ -705,15 +723,16 @@ module OneM2M_Testcases_CSE_Release_3 {
 
 					testcase TC_CSE_DMR_CRE_006_TS_MIA() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 			
 						
 						v_ae1.start(f_CSE_DMR_CRE_006(int29, 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.timeSeries.maxInstanceAge)){
 								setverdict(fail, __SCOPE__, ": Error, maxInstanceAge attribute not provided");
 							} 
@@ -1387,15 +1406,16 @@ module OneM2M_Testcases_CSE_Release_3 {
 					
 					testcase TC_CSE_DMR_CRE_021_CNTA_AEA() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var template RequestPrimitive v_createRequest := m_createContainerAnncBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 	
 						v_createRequest.primitiveContent.containerAnnc.resourceName := omit;
 						v_cse1.start(f_CSE_DMR_CRE_021(int10003, v_createRequest));//ContainerAnnc
-						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.containerAnnc.resourceName)){
 								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
 							}
@@ -1404,6 +1424,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 
 					testcase TC_CSE_DMR_CRE_021_GRPA_AEA() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var template RequestPrimitive v_createRequest := m_createGroupAnncBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
@@ -1411,9 +1432,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 						
 						v_createRequest.primitiveContent.groupAnnc.resourceName := omit;
 						v_cse1.start(f_CSE_DMR_CRE_021(int10009, v_createRequest));//GroupAnnc
-						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.groupAnnc.resourceName)){
 								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
 							}
@@ -1422,6 +1443,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 
 					testcase TC_CSE_DMR_CRE_021_ACPA_AEA() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var template RequestPrimitive v_createRequest := m_createAcpAnncBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
@@ -1429,9 +1451,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 						
 						v_createRequest.primitiveContent.accessControlPolicyAnnc.resourceName := omit;
 						v_cse1.start(f_CSE_DMR_CRE_021(int10001, v_createRequest));//AccessControlPolicyAnnc
-						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.accessControlPolicyAnnc.resourceName)){
 								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
 							}
@@ -1440,6 +1462,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					
 					testcase TC_CSE_DMR_CRE_021_TSA_AEA() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesAnncBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
@@ -1447,9 +1470,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 						
 						v_createRequest.primitiveContent.timeSeriesAnnc.resourceName := omit;
 						v_cse1.start(f_CSE_DMR_CRE_021(int10029, v_createRequest));//TimeSeriesAnnc
-						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.timeSeriesAnnc.resourceName)){
 								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
 							}
@@ -1569,6 +1592,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					 */
 					testcase TC_CSE_DMR_CRE_023_CNT() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var RequestPrimitive v_requestPrimitive;
@@ -1579,9 +1603,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_createRequest.primitiveContent.container.announcedAttribute := {"mbs"};
 	
 						v_ae1.start(f_CSE_DMR_CRE_023(int3, v_createRequest, mw_createContainerAnnc()));//Container
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
-						if(getverdict == pass){ 
+						if(v_verdict == pass){ 
 							//Check if maxByteSize attribute has been announced
 							v_requestPrimitive := f_getRequestPrimitive(v_ae1);
 							if (ispresent(v_requestPrimitive.primitiveContent.containerAnnc.maxByteSize)){
@@ -1598,6 +1622,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 	
 					testcase TC_CSE_DMR_CRE_023_CIN() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						var RequestPrimitive v_requestPrimitive;
@@ -1608,9 +1633,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_createRequest.primitiveContent.contentInstance.announcedAttribute := {"cs"};
 		
 						v_ae1.start(f_CSE_DMR_CRE_023(int4, v_createRequest, mw_createContentInstanceAnnc()));//ContentInstance
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
-						if(getverdict == pass){ 
+						if(v_verdict == pass){ 
 							//Check if contentSize attribute has been announced
 							v_requestPrimitive := f_getRequestPrimitive(v_ae1);
 							if (ispresent(v_requestPrimitive.primitiveContent.contentInstanceAnnc.contentSize)){
@@ -1627,6 +1652,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 
 					testcase TC_CSE_DMR_CRE_023_GRP() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
 						var RequestPrimitive v_requestPrimitive;
@@ -1637,9 +1663,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_createRequest.primitiveContent.group_.announcedAttribute := {"mnm"};
 		
 						v_ae1.start(f_CSE_DMR_CRE_023(int9, v_createRequest, mw_createGroupAnnc()));//Group
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
-						if(getverdict == pass){ 
+						if(v_verdict == pass){ 
 							//Check if maxNrOfMembers attribute has been announced
 							v_requestPrimitive := f_getRequestPrimitive(v_ae1);
 							if (ispresent(v_requestPrimitive.primitiveContent.groupAnnc.maxNrOfMembers)){
@@ -1656,6 +1682,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 	
 					testcase TC_CSE_DMR_CRE_023_LCP() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createLocationPolicy(int1, omit, omit, omit, omit);
 						var RequestPrimitive v_requestPrimitive;
@@ -1666,9 +1693,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_createRequest.primitiveContent.locationPolicy.announcedAttribute := {"los"};
 		
 						v_ae1.start(f_CSE_DMR_CRE_023(int10, v_createRequest, mw_createLocationPolicyAnnc()));//LocationPolicy
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
-						if(getverdict == pass){ 
+						if(v_verdict == pass){ 
 							//Check if locationSource attribute has been announced
 							v_requestPrimitive := f_getRequestPrimitive(v_ae1);
 							if (ispresent(v_requestPrimitive.primitiveContent.locationPolicyAnnc.locationSource)){
@@ -1685,6 +1712,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 	
 					testcase TC_CSE_DMR_CRE_023_SCH() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createScheduleBase;
 						var RequestPrimitive v_requestPrimitive;
@@ -1695,9 +1723,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_createRequest.primitiveContent.schedule.announcedAttribute := {"se"};
 						
 						v_ae1.start(f_CSE_DMR_CRE_023(int18, v_createRequest, mw_createScheduleAnnc()));//Schedule
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
-						if(getverdict == pass){ 
+						if(v_verdict == pass){ 
 							//Check if scheduleElement attribute has been announced
 							v_requestPrimitive := f_getRequestPrimitive(v_ae1);
 							if (ispresent(v_requestPrimitive.primitiveContent.scheduleAnnc.scheduleElement)){
@@ -1714,6 +1742,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					
 					testcase TC_CSE_DMR_CRE_023_TS() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						var RequestPrimitive v_requestPrimitive;
@@ -1725,9 +1754,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_createRequest.primitiveContent.timeSeries.announcedAttribute := {"mbs"};
 
 						v_ae1.start(f_CSE_DMR_CRE_023(int29, v_createRequest, mw_createTimeSeriesAnnc()));//TimeSeries
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 	
-						if(getverdict == pass){ 
+						if(v_verdict == pass){ 
 							//Check if maxByteSize attribute has been announced
 							v_requestPrimitive := f_getRequestPrimitive(v_ae1);
 							if (ispresent(v_requestPrimitive.primitiveContent.timeSeriesAnnc.maxByteSize)){
@@ -1744,6 +1773,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					
 					testcase TC_CSE_DMR_CRE_023_TSI() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
 						var RequestPrimitive v_requestPrimitive;
@@ -1755,9 +1785,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_createRequest.primitiveContent.timeSeriesInstance.announcedAttribute := {"snr"};
 
 						v_ae1.start(f_CSE_DMR_CRE_023(int30, v_createRequest, mw_createTimeSeriesInstanceAnnc()));//TimeSeriesInstance
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 
-						if(getverdict == pass){ 
+						if(v_verdict == pass){ 
 							//Check if maxByteSize attribute has been announced
 							v_requestPrimitive := f_getRequestPrimitive(v_ae1);
 							if (ispresent(v_requestPrimitive.primitiveContent.timeSeriesInstanceAnnc.sequenceNr)){
@@ -3516,6 +3546,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					 */
 					testcase TC_CSE_DMR_UPD_001_SCH_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"};
@@ -3528,11 +3559,11 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_updateRequest.primitiveContent.schedule.labels := v_labels_2;
 
 						v_ae1.start(f_CSE_DMR_UPD_001(int18, v_createRequest, v_updateRequest));//Schedule
-						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.schedule)) {
@@ -3556,6 +3587,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					
 					testcase TC_CSE_DMR_UPD_001_TS_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"};
@@ -3569,11 +3601,11 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_updateRequest.primitiveContent.timeSeries.labels := v_labels_2;
 
 						v_ae1.start(f_CSE_DMR_UPD_001(int29, v_createRequest, v_updateRequest));//TimeSeries
-						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.timeSeries)) {
@@ -3604,6 +3636,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					 */
 					testcase TC_CSE_DMR_UPD_002_SCH_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_updateScheduleBase;
@@ -3613,11 +3646,11 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_updateRequest.primitiveContent.schedule.labels := v_labels_1;
 						
 						v_ae1.start(f_CSE_DMR_UPD_002(int18, m_createScheduleBase,v_updateRequest));//Schedule
-						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.schedule)) {
@@ -3640,6 +3673,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					
 					testcase TC_CSE_DMR_UPD_002_TS_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_updateTimeSeriesBase;
@@ -3650,11 +3684,11 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_updateRequest.primitiveContent.timeSeries.labels := v_labels_1;
 	
 						v_ae1.start(f_CSE_DMR_UPD_002(int29, m_createTimeSeriesBase,v_updateRequest));//TimeSeries
-						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.timeSeries)) {
@@ -3685,6 +3719,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					 */
 					testcase TC_CSE_DMR_UPD_003_SCH_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"};
@@ -3700,11 +3735,11 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_nullFields := {{"labels", omit}};
 						
 						v_ae1.start(f_CSE_DMR_UPD_003(int18, v_createRequest, v_updateRequest, v_nullFields));//Schedule
-						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.schedule)) {
@@ -3729,6 +3764,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					
 					testcase TC_CSE_DMR_UPD_003_TS_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"};
@@ -3745,11 +3781,11 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_nullFields := {{"labels", omit}};
 	
 						v_ae1.start(f_CSE_DMR_UPD_003(int29, v_createRequest, v_updateRequest, v_nullFields));//TimeSeries
-						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.timeSeries)) {
@@ -3782,6 +3818,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					 */
 					testcase TC_CSE_DMR_UPD_004_ACP_PV_AT_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"};
@@ -3799,11 +3836,11 @@ module OneM2M_Testcases_CSE_Release_3 {
 						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
@@ -3843,6 +3880,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 				
 					testcase TC_CSE_DMR_UPD_004_SCH_SE_AT_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 := {"To be deleted"};
@@ -3860,11 +3898,11 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_nullFields := {{"labels", omit}};
 						
 						v_ae1.start(f_CSE_DMR_UPD_004(int18, v_createRequest, v_updateRequest, v_nullFields));//Schedule
-						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.schedule)) {
 									//Check attribute 1
@@ -3904,6 +3942,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					
 					testcase TC_CSE_DMR_UPD_004_TS_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"};
@@ -3922,9 +3961,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_nullFields := {{"labels", omit}};
 						
 						v_ae1.start(f_CSE_DMR_UPD_004(int29, v_createRequest, v_updateRequest, v_nullFields));//TimeSeries
-						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.timeSeries)) {
 									//Check attribute 1
@@ -3972,6 +4011,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					 */
 					testcase TC_CSE_DMR_UPD_006_SCH_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_updateScheduleBase;
@@ -3980,9 +4020,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_updateRequest.primitiveContent.schedule.labels := v_labels_1;
 										
 						v_ae1.start(f_CSE_DMR_UPD_006(int18, m_createScheduleBase, v_updateRequest));//Schedule
-						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.schedule)) {
@@ -3995,6 +4035,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					
 					testcase TC_CSE_DMR_UPD_006_TS_LBL() runs on Tester system CseSystem {
 						// Local variable
+						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_updateTimeSeriesBase;
@@ -4004,9 +4045,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_updateRequest.primitiveContent.timeSeries.labels := v_labels_1;
 		
 						v_ae1.start(f_CSE_DMR_UPD_006(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
-						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
@@ -4028,6 +4069,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					 */
 					testcase TC_CSE_DMR_UPD_007_SCH_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_updateScheduleBase;
@@ -4037,9 +4079,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_updateRequest.primitiveContent.schedule_invalid.creationTime := v_creationTime;
 										
 						v_ae1.start(f_CSE_DMR_UPD_007(int18, m_createScheduleBase, v_updateRequest));//Schedule
-						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.schedule_invalid)) {
@@ -4052,6 +4094,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					
 					testcase TC_CSE_DMR_UPD_007_TS_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_updateTimeSeriesBase;
@@ -4062,9 +4105,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_updateRequest.primitiveContent.timeSeries_invalid.creationTime := v_creationTime;
 		
 						v_ae1.start(f_CSE_DMR_UPD_007(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
-						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.timeSeries_invalid)) {
@@ -4085,6 +4128,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					 */
 					testcase TC_CSE_DMR_UPD_008_SCH_ET() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var Timestamp v_expirationTime := "21001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
@@ -4096,9 +4140,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_updateRequest.primitiveContent.schedule.expirationTime := v_expirationTime;
 										
 						v_ae1.start(f_CSE_DMR_UPD_008(int18, m_createScheduleBase, v_updateRequest, v_nullFields));//Schedule
-						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.schedule)) {
@@ -4132,7 +4176,6 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_ae1.start(f_CSE_DMR_UPD_009(int18, v_createRequest, v_updateRequest));//Schedule
 						v_ae1.done;
 					}
-					
 					testcase TC_CSE_DMR_UPD_009_TS_EXC() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
@@ -4159,6 +4202,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					 */
 					testcase TC_CSE_DMR_UPD_011_TS_TSI() 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_updateTimeSeriesInstanceBase;
 						var Labels v_labels:= {"LABEL"};
@@ -4170,9 +4214,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_updateRequest.primitiveContent.timeSeriesInstance.labels := v_labels;
 
 						v_ae1.start(f_CSE_DMR_UPD_011(int29, v_createParentRequest, int30, v_createChildRequest, v_updateRequest));//TimeSeriesInstance under TimeSeries
-						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.timeSeriesInstance)) {
@@ -4193,6 +4237,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					 */
 					testcase TC_CSE_DMR_UPD_014_TS_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"};
@@ -4205,9 +4250,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_updateRequest.primitiveContent.timeSeries.accessControlPolicyIDs := v_accessControlPolicyIDs_2;
 	
 						v_ae1.start(f_CSE_DMR_UPD_014(int29, v_createRequest, v_updateRequest));//TimeSeries
-						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.timeSeries)) {
@@ -4222,6 +4267,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					
 					testcase TC_CSE_DMR_UPD_014_TS_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"};
@@ -4234,9 +4280,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_updateRequest.primitiveContent.timeSeries.labels := v_labels_2;
 
 						v_ae1.start(f_CSE_DMR_UPD_014(int29, v_createRequest, v_updateRequest));//TimeSeries
-						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.timeSeries)) {
@@ -4251,6 +4297,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					
 					testcase TC_CSE_DMR_UPD_014_TS_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;
@@ -4263,9 +4310,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_updateRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize_2;
 
 						v_ae1.start(f_CSE_DMR_UPD_014(int29, v_createRequest, v_updateRequest));//TimeSeries
-						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.timeSeries)) {
@@ -4279,6 +4326,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 
 					testcase TC_CSE_DMR_UPD_014_TS_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;
@@ -4291,9 +4339,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_updateRequest.primitiveContent.timeSeries.maxInstanceAge := v_maxInstanceAge_2;
 
 						v_ae1.start(f_CSE_DMR_UPD_014(int29, v_createRequest, v_updateRequest));//TimeSeries
-						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.timeSeries)) {
@@ -4307,6 +4355,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 
 					testcase TC_CSE_DMR_UPD_014_TS_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;
@@ -4320,9 +4369,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_updateRequest.primitiveContent.timeSeries.maxNrOfInstances := v_maxNrOfInstances_2;
 
 						v_ae1.start(f_CSE_DMR_UPD_014(int29, v_createRequest, v_updateRequest));//TimeSeries
-						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.timeSeries)) {
@@ -4336,6 +4385,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					
 					testcase TC_CSE_DMR_UPD_014_TS_PEI() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var XSD.NonNegativeInteger v_periodicInterval_1 := 1;
 						var XSD.NonNegativeInteger v_periodicInterval_2 := 2;
@@ -4349,9 +4399,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_updateRequest.primitiveContent.timeSeries.periodicInterval := v_periodicInterval_2;
 
 						v_ae1.start(f_CSE_DMR_UPD_014(int29, v_createRequest, v_updateRequest));//TimeSeries
-						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.timeSeries)) {
@@ -4365,6 +4415,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					
 					testcase TC_CSE_DMR_UPD_014_TS_MDD() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var XSD.Boolean v_missingDataDetect_1 := true;
 						var XSD.Boolean v_missingDataDetect_2 := false;
@@ -4378,9 +4429,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_updateRequest.primitiveContent.timeSeries.missingDataDetect := v_missingDataDetect_2;
 	
 						v_ae1.start(f_CSE_DMR_UPD_014(int29, v_createRequest, v_updateRequest));//TimeSeries
-						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.timeSeries)) {
@@ -4394,6 +4445,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					
 					testcase TC_CSE_DMR_UPD_014_TS_MDN() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var XSD.NonNegativeInteger v_missingDataMaxNr_1 := 1;
 						var XSD.NonNegativeInteger v_missingDataMaxNr_2 := 2;
@@ -4407,9 +4459,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_updateRequest.primitiveContent.timeSeries.missingDataMaxNr := v_missingDataMaxNr_2;
 
 						v_ae1.start(f_CSE_DMR_UPD_014(int29, v_createRequest, v_updateRequest));//TimeSeries
-						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.timeSeries)) {
@@ -4423,6 +4475,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					
 					testcase TC_CSE_DMR_UPD_014_TS_MDT() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var XSD.NonNegativeInteger v_missingDataDetectTimer_1 := 1;
 						var XSD.NonNegativeInteger v_missingDataDetectTimer_2 := 2;
@@ -4436,9 +4489,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_updateRequest.primitiveContent.timeSeries.missingDataDetectTimer := v_missingDataDetectTimer_2;
 
 						v_ae1.start(f_CSE_DMR_UPD_014(int29, v_createRequest, v_updateRequest));//TimeSeries
-						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.timeSeries)) {
@@ -4452,6 +4505,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					
 					testcase TC_CSE_DMR_UPD_014_TS_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";
@@ -4465,9 +4519,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_updateRequest.primitiveContent.timeSeries.ontologyRef := v_ontologyRef_2;
 
 						v_ae1.start(f_CSE_DMR_UPD_014(int29, v_createRequest, v_updateRequest));//TimeSeries
-						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.timeSeries)) {
@@ -4487,6 +4541,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					 * @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_CNT_OR() runs on Tester system CseSystem {
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var XSD.AnyURI v_ontoLogyRef := "MyOntologyRef";
@@ -4497,11 +4552,11 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_updateRequest.primitiveContent.container.ontologyRef := v_ontoLogyRef;
 						
 						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)) {
@@ -4522,6 +4577,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					}
 					
 					testcase TC_CSE_DMR_UPD_015_CNT_LI() runs on Tester system CseSystem {
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var XSD.AnyURI v_locationID := "MyLocationID";
@@ -4532,11 +4588,11 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_updateRequest.primitiveContent.container.locationID := v_locationID;
 						
 						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)) {
@@ -4557,6 +4613,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					}
 					
 					testcase TC_CSE_DMR_UPD_015_SUB_ENC() runs on Tester system CseSystem {
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var EventNotificationCriteria v_eventNotificationCriteria:= valueof(m_eventNotificationCriteria({int3}, -));
@@ -4566,11 +4623,11 @@ module OneM2M_Testcases_CSE_Release_3 {
 						
 						v_updateRequest.primitiveContent.subscription.eventNotificationCriteria:=v_eventNotificationCriteria ;
 						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)) {
@@ -4591,6 +4648,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					}
 					
 					testcase TC_CSE_DMR_UPD_015_SUB_EXC() runs on Tester system CseSystem {
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var XSD.PositiveInteger v_expirationCounter:=10;
@@ -4600,11 +4658,11 @@ module OneM2M_Testcases_CSE_Release_3 {
 						
 						v_updateRequest.primitiveContent.subscription.expirationCounter:=v_expirationCounter;
 						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)) {
@@ -4625,6 +4683,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					}
 					
 					testcase TC_CSE_DMR_UPD_015_SUB_GPI() runs on Tester system CseSystem {
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var XSD.AnyURI v_groupID := "MyGroupID";
@@ -4634,11 +4693,11 @@ module OneM2M_Testcases_CSE_Release_3 {
 						
 						v_updateRequest.primitiveContent.subscription.groupID:=v_groupID;
 						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)) {
@@ -4659,6 +4718,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					}
 					
 					testcase TC_CSE_DMR_UPD_015_SUB_NFU() runs on Tester system CseSystem {
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var XSD.AnyURI v_notificationForwardingURI:= "MyNotificationForwardingURI";
@@ -4668,11 +4728,11 @@ module OneM2M_Testcases_CSE_Release_3 {
 						
 						v_updateRequest.primitiveContent.subscription.notificationForwardingURI:=v_notificationForwardingURI;
 						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)) {
@@ -4693,6 +4753,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					}
 					
 					testcase TC_CSE_DMR_UPD_015_SUB_BN() runs on Tester system CseSystem {
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var BatchNotify v_batchNotify:= {1, "PT1S"};
@@ -4702,11 +4763,11 @@ module OneM2M_Testcases_CSE_Release_3 {
 						
 						v_updateRequest.primitiveContent.subscription.batchNotify:=v_batchNotify;
 						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)) {
@@ -4727,6 +4788,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					}
 					
 					testcase TC_CSE_DMR_UPD_015_SUB_RL() runs on Tester system CseSystem {
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var RateLimit v_rateLimit:= {2, "PT1S"};
@@ -4736,11 +4798,11 @@ module OneM2M_Testcases_CSE_Release_3 {
 						
 						v_updateRequest.primitiveContent.subscription.rateLimit:=v_rateLimit;
 						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)) {
@@ -4761,6 +4823,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					}
 					
 					testcase TC_CSE_DMR_UPD_015_SUB_PN() runs on Tester system CseSystem {
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var PendingNotification v_pendingNotification:=int2;
@@ -4770,11 +4833,11 @@ module OneM2M_Testcases_CSE_Release_3 {
 						
 						v_updateRequest.primitiveContent.subscription.pendingNotification:=v_pendingNotification;
 						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)) {
@@ -4795,6 +4858,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					}
 					
 					testcase TC_CSE_DMR_UPD_015_SUB_NSP() runs on Tester system CseSystem {
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var XSD.PositiveInteger v_notificationStoragePriority:=10;
@@ -4804,11 +4868,11 @@ module OneM2M_Testcases_CSE_Release_3 {
 						
 						v_updateRequest.primitiveContent.subscription.notificationStoragePriority:=v_notificationStoragePriority;
 						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)) {
@@ -4829,6 +4893,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					}
 					
 					testcase TC_CSE_DMR_UPD_015_SUB_LN() runs on Tester system CseSystem {
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var XSD.Boolean v_latestNotify:=true;
@@ -4838,11 +4903,11 @@ module OneM2M_Testcases_CSE_Release_3 {
 						
 						v_updateRequest.primitiveContent.subscription.latestNotify:=v_latestNotify;
 						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)) {
@@ -4863,6 +4928,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					}
 					
 					testcase TC_CSE_DMR_UPD_015_SUB_NEC() runs on Tester system CseSystem {
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var EventCat v_eventCat:= {alt_1:= 300};
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
@@ -4872,9 +4938,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 						
 						v_updateRequest.primitiveContent.subscription.notificationEventCat:=v_eventCat;
 						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)) {
@@ -4895,6 +4961,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					}
 					
 					testcase TC_CSE_DMR_UPD_015_TS_ACPI() runs on Tester system CseSystem {
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
 						var RequestPrimitive v_updateRequestPrimitive;
@@ -4903,9 +4970,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 	
 						
 						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest, true));//TimeSeries
-						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
@@ -4928,6 +4995,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					}
 					
 					testcase TC_CSE_DMR_UPD_015_TS_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_updateTimeSeriesBase;
@@ -4938,9 +5006,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_updateRequest.primitiveContent.timeSeries.labels := v_labels;
 	
 						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
-						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.timeSeries)) {
@@ -4961,6 +5029,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					}
 					
 					testcase TC_CSE_DMR_UPD_015_TS_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_updateTimeSeriesBase;
@@ -4971,9 +5040,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_updateRequest.primitiveContent.timeSeries.maxNrOfInstances := v_maxNrOfInstances;
 	
 						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
-						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.timeSeries)) {
@@ -4994,6 +5063,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					}
 
 					testcase TC_CSE_DMR_UPD_015_TS_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_updateTimeSeriesBase;
@@ -5004,9 +5074,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_updateRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize;
 	
 						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
-						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.timeSeries)) {
@@ -5027,6 +5097,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					}
 
 					testcase TC_CSE_DMR_UPD_015_TS_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_updateTimeSeriesBase;
@@ -5037,9 +5108,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_updateRequest.primitiveContent.timeSeries.maxInstanceAge := v_maxInstanceAge;
 	
 						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
-						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.timeSeries)) {
@@ -5060,6 +5131,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					}
 					
 					testcase TC_CSE_DMR_UPD_015_TS_PEI() runs on Tester system CseSystem {
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var XSD.NonNegativeInteger v_periodicInterval := 1;
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
@@ -5070,9 +5142,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_updateRequest.primitiveContent.timeSeries.periodicInterval := v_periodicInterval;
 
 						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
-						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.timeSeries)) {
@@ -5093,6 +5165,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					}
 					
 					testcase TC_CSE_DMR_UPD_015_TS_MDD() runs on Tester system CseSystem {
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var XSD.Boolean v_missingDataDetect := true;
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
@@ -5103,9 +5176,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_updateRequest.primitiveContent.timeSeries.missingDataDetect := v_missingDataDetect;
 
 						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
-						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.timeSeries)) {
@@ -5126,6 +5199,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					}
 					
 					testcase TC_CSE_DMR_UPD_015_TS_MDN() runs on Tester system CseSystem {
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var XSD.NonNegativeInteger v_missingDataMaxNr := 1;
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
@@ -5136,9 +5210,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_updateRequest.primitiveContent.timeSeries.missingDataMaxNr := v_missingDataMaxNr;
 
 						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
-						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.timeSeries)) {
@@ -5159,6 +5233,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					}
 					
 					testcase TC_CSE_DMR_UPD_015_TS_MDT() runs on Tester system CseSystem {
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var XSD.NonNegativeInteger v_missingDataDetectTimer := 1;
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
@@ -5169,9 +5244,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_updateRequest.primitiveContent.timeSeries.missingDataDetectTimer := v_missingDataDetectTimer;
 
 						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
-						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.timeSeries)) {
@@ -5192,6 +5267,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					}
 					
 					testcase TC_CSE_DMR_UPD_015_TS_OR() runs on Tester system CseSystem {
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var XSD.AnyURI v_ontoLogyRef := "MyOntologyRef";
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
@@ -5202,9 +5278,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_updateRequest.primitiveContent.timeSeries.ontologyRef := v_ontoLogyRef;
 	
 						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
-						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.timeSeries)) {
@@ -5232,6 +5308,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					 * @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_TS_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_updateTimeSeriesBase;
@@ -5242,9 +5319,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_updateRequest.primitiveContent.timeSeries.expirationTime := v_expirationTime;
 	
 						v_ae1.start(f_CSE_DMR_UPD_016(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
-						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.timeSeries)) {
@@ -11912,6 +11989,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					 */
 					testcase TC_CSE_ANNC_UPD_003_ACP() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
@@ -11928,9 +12006,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_nullFields := {{"announceTo", omit}};
   
 						v_ae1.start(f_CSE_ANNC_UPD_003(int1, v_createRequestAnnc, v_createRequest, v_updateRequest, v_nullFields));//AccessControlPolicy
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 			
-						if(getverdict == pass){
+						if(v_verdict == pass){
 							v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.accessControlPolicy)) {
@@ -11954,6 +12032,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 
 					testcase TC_CSE_ANNC_UPD_003_CNT() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
@@ -11970,9 +12049,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_nullFields := {{"announceTo", omit}};
   
 						v_ae1.start(f_CSE_ANNC_UPD_003(int3, v_createRequestAnnc, v_createRequest, v_updateRequest, v_nullFields));//Container
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 			
-						if(getverdict == pass){
+						if(v_verdict == pass){
 							v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.container)) {
@@ -11996,6 +12075,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 
 					testcase TC_CSE_ANNC_UPD_003_GRP() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
@@ -12012,9 +12092,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_nullFields := {{"announceTo", omit}};
   
 						v_ae1.start(f_CSE_ANNC_UPD_003(int9, v_createRequestAnnc, v_createRequest, v_updateRequest, v_nullFields));//Group
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 			
-						if(getverdict == pass){
+						if(v_verdict == pass){
 							v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
@@ -12037,6 +12117,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					
 					testcase TC_CSE_ANNC_UPD_003_TS() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
@@ -12053,9 +12134,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_nullFields := {{"announceTo", omit}};
   
 						v_ae1.start(f_CSE_ANNC_UPD_003(int29, v_createRequestAnnc, v_createRequest, v_updateRequest, v_nullFields));//TimeSeries
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 
-						if(getverdict == pass){
+						if(v_verdict == pass){
 							v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
@@ -12173,6 +12254,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					 */
 					testcase TC_CSE_ANNC_UPD_005() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
@@ -12190,9 +12272,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_nullFields := {{"labels", omit}};
   
 						v_cse1.start(f_CSE_ANNC_UPD_005(int3, v_createRequest, v_createRequestAnnc, v_updateRequest, v_updateRequestAnnc, v_nullFields));//Container
-						v_cse1.done;
+						v_cse1.done -> value v_verdict;
 						
-						if(getverdict == pass){
+						if(v_verdict == pass){
 							v_requestPrimitive := f_getRequestPrimitive(v_cse1);
 							if(ispresent(v_requestPrimitive.primitiveContent)) {
 								if(ischosen(v_requestPrimitive.primitiveContent.containerAnnc)) {
@@ -12336,6 +12418,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					 */
 					testcase TC_CSE_ANNC_UPD_008_CNT_MBS() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
@@ -12351,9 +12434,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_updateRequest.primitiveContent.container.announcedAttribute := {"mbs"};
   
 						v_ae1.start(f_CSE_ANNC_UPD_008(int3, v_createRequestAnnc, v_createRequest, v_updateRequest));//Container
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 
-						if(getverdict == pass){
+						if(v_verdict == pass){
 							v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.container)) {
@@ -12380,6 +12463,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					
 					testcase TC_CSE_ANNC_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_createRequest := m_createGroupBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
@@ -12395,9 +12479,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_updateRequest.primitiveContent.group_.announcedAttribute := {"mnm"};
   
 						v_ae1.start(f_CSE_ANNC_UPD_008(int9, v_createRequestAnnc, v_createRequest, v_updateRequest));//Group
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 
-						if(getverdict == pass){
+						if(v_verdict == pass){
 							v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
@@ -12424,6 +12508,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					
 					testcase TC_CSE_ANNC_UPD_008_TS_MBS() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
@@ -12439,9 +12524,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_updateRequest.primitiveContent.timeSeries.announcedAttribute := {"mbs"};
   
 						v_ae1.start(f_CSE_ANNC_UPD_008(int29, v_createRequestAnnc, v_createRequest, v_updateRequest));//TimeSeries
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 
-						if(getverdict == pass){
+						if(v_verdict == pass){
 							v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
@@ -12734,6 +12819,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					 */
 					testcase TC_CSE_ANNC_UPD_012_CNT_MBS() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
@@ -12756,9 +12842,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_nullFields := {{"announcedAttribute", omit}};
   
 						v_cse1.start(f_CSE_ANNC_UPD_012(int3, v_createRequest, v_createRequestAnnc, v_updateRequest, v_updateRequestAnnc, v_nullFields, v_attributeToDeannounce));//Container
-						v_cse1.done;
+						v_cse1.done -> value v_verdict;
 						
-						if(getverdict == pass){
+						if(v_verdict == pass){
 							v_requestPrimitive := f_getRequestPrimitive(v_cse1);
 							if(ispresent(v_requestPrimitive.primitiveContent)) {
 								if(ischosen(v_requestPrimitive.primitiveContent.containerAnnc)) {
@@ -12774,6 +12860,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 
 					testcase TC_CSE_ANNC_UPD_012_GRP_MT() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
@@ -12796,9 +12883,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_nullFields := {{"announcedAttribute", omit}};
   
 						v_cse1.start(f_CSE_ANNC_UPD_012(int9, v_createRequest, v_createRequestAnnc, v_updateRequest, v_updateRequestAnnc, v_nullFields, v_attributeToDeannounce));//Group
-						v_cse1.done;
+						v_cse1.done -> value v_verdict;
 						
-						if(getverdict == pass){
+						if(v_verdict == pass){
 							v_requestPrimitive := f_getRequestPrimitive(v_cse1);
 							if(ispresent(v_requestPrimitive.primitiveContent)) {
 								if(ischosen(v_requestPrimitive.primitiveContent.groupAnnc)) {
@@ -12813,6 +12900,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					
 					testcase TC_CSE_ANNC_UPD_012_TS_MBS() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
@@ -12836,9 +12924,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_nullFields := {{"announcedAttribute", omit}};
   
 						v_cse1.start(f_CSE_ANNC_UPD_012(int29, v_createRequest, v_createRequestAnnc, v_updateRequest, v_updateRequestAnnc, v_nullFields, v_attributeToDeannounce));//TimeSeries
-						v_cse1.done;
+						v_cse1.done -> value v_verdict;
 	
-						if(getverdict == pass){
+						if(v_verdict == pass){
 							v_requestPrimitive := f_getRequestPrimitive(v_cse1);
 							if(ispresent(v_requestPrimitive.primitiveContent)) {
 								if(ischosen(v_requestPrimitive.primitiveContent.timeSeriesAnnc)) {
@@ -12862,6 +12950,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					 */
 					testcase TC_CSE_ANNC_UPD_013_CNT_MBS() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
@@ -12882,9 +12971,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_nullFields := {{"announcedAttribute", omit}};
 	  
 						v_ae1.start(f_CSE_ANNC_UPD_013(int3, v_createRequestAnnc, v_createRequest, v_updateRequest, v_nullFields, v_updateResponse));//Container
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 	
-						if(getverdict == pass){
+						if(v_verdict == pass){
 							v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.container)) {
@@ -12908,6 +12997,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 	
 					testcase TC_CSE_ANNC_UPD_013_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_createRequest := m_createGroupBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
@@ -12928,9 +13018,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_nullFields := {{"announcedAttribute", omit}};
 	  
 						v_ae1.start(f_CSE_ANNC_UPD_013(int9, v_createRequestAnnc, v_createRequest, v_updateRequest, v_nullFields, v_updateResponse));//Group
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 	
-						if(getverdict == pass){
+						if(v_verdict == pass){
 							v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
@@ -12953,6 +13043,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					
 					testcase TC_CSE_ANNC_UPD_013_TS_MBS() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
@@ -12973,9 +13064,9 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_nullFields := {{"announcedAttribute", omit}};
   
 						v_ae1.start(f_CSE_ANNC_UPD_013(int29, v_createRequestAnnc, v_createRequest, v_updateRequest, v_nullFields, v_updateResponse));//TimeSeries
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 
-						if(getverdict == pass){
+						if(v_verdict == pass){
 							v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
@@ -13007,27 +13098,27 @@ module OneM2M_Testcases_CSE_Release_3 {
 					 */
 					testcase TC_CSE_ANNC_UPD_014_CNT() runs on Tester system CseSystem {
 						// Local variables
+						var verdicttype v_verdict;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;	
 						var template PrimitiveContent v_updateResponse := {container := mw_contentContainerBase};
-						var ResponsePrimitive v_responsePrimitive;	
+						var PrimitiveContent v_retrievedResource;	
 						 
 						v_updateRequest.primitiveContent.container.announceTo := {PX_TS_CSE1.cseId};
   
 						v_ae1.start(f_CSE_ANNC_UPD_014(int3, v_createRequestAnnc, v_createRequest, v_updateRequest, v_updateResponse));//Container
-						v_ae1.done;
+						v_ae1.done -> value v_verdict;
 						
-						if(getverdict == pass){
-						v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-						if(ispresent(v_responsePrimitive.primitiveContent)) {
-							if(ischosen(v_responsePrimitive.primitiveContent.container)) {
-								if(ispresent(v_responsePrimitive.primitiveContent.container.announcedAttribute)){
-									setverdict(fail, __SCOPE__ & ": Error: announceTo attribute is not set to NULL");
-								}
+						if(v_verdict  == pass){
+						v_retrievedResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+						if(ischosen(v_retrievedResource.container)) {
+							if(ispresent(v_retrievedResource.container.announceTo)){
+								setverdict(fail, __SCOPE__ & ": Error: announceTo attribute is not set to NULL");
 							}
 						}
+						
 					}
 				  }
 				} //end group g_CSE_ANNC_UPD_014