diff --git a/OneM2M_Testcases_CSE_Release_2.ttcn b/OneM2M_Testcases_CSE_Release_2.ttcn
index 373fd0c0bef2f716c4b808deaf34e369219d756d..b1677798c025d73605d3537676e1836dd1c564fa 100644
--- a/OneM2M_Testcases_CSE_Release_2.ttcn
+++ b/OneM2M_Testcases_CSE_Release_2.ttcn
@@ -100,128 +100,6 @@ module OneM2M_Testcases_CSE_Release_2 {
 			
 			group Create{
 				
-				/**
-				  * @desc Check that the IUT accepts an AE registration with the optional attribute OPTIONAL_ATTRIBUTE provided   
-				  * 
-				 */
-				group g_CSE_REG_CRE_012 {
-					
-					testcase TC_CSE_REG_CRE_012_AE_NL() runs on Tester system CseSystem {
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_create.primitiveContent.aE.nodeLink := "http://127.0.0.1/";
-						v_ae1.start(f_CSE_REG_CRE_012(v_create));
-						v_ae1.done;
-					}
-					
-					testcase TC_CSE_REG_CRE_012_AE_OR() runs on Tester system CseSystem {
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_create.primitiveContent.aE.ontologyRef := "MyOntologyRef";
-						v_ae1.start(f_CSE_REG_CRE_012(v_create));
-						v_ae1.done;
-					}
-				
-				}
-				
-				
-				
-				
-				/*testcase TC_CSE_REG_CRE_029() runs on CseSimu system CseSystem {
-  
-					var MsgIn v_response;
-					
-					var RequestPrimitive v_request;
-					var RequestPrimitive v_createRequestPrimitive := valueof(m_createRemoteCSEBase);
-					var ResourceType v_resourceType := int16;
-	
-					// Test control
-	
-					// Test component configuration
-					f_cf04Up();
-	
-					// Test adapter configuration
-	
-					// Preamble
-					v_request := f_getCreateRequestPrimitive(v_resourceType, v_createRequestPrimitive, -1);
-	
-					tc_ac.start;
-					alt {
-						[] mccPort.receive(mw_request(mw_createRemoteCSE(PX_CSE_ID,f_getResourceAddress(-1)))) -> value v_response {
-							tc_ac.stop;
-							setverdict(pass, __SCOPE__ & ": Resource type remoteCSE created successfully");
-						}
-						[] mccPort.receive {
-							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Error while creating resource type remoteCSE");
-						}
-						[] tc_ac.timeout {
-							setverdict(fail, __SCOPE__ & ": No answer while creating resource type remoteCSE");
-						}
-					}	
-	
-					// Postamble
-					f_cse_postamble_deleteResourcesCSE();
-	
-					// Tear down
-					f_cf04Down();
-	
-				}*/
-				
-								/**
-				 * @desc Check that the IUT rejects the create request of <CSEBase> resource.
-				 * 
-				 
-				testcase TC_CSE_REG_CRE_027() runs on AeSimu system CseSystem {
-	
-					// Local variables
-					var RequestPrimitive v_request;
-					var integer v_cseBaseIndex := -1;
-					var ResourceType v_resourceType := int2;
-		   
-					// Test control
-
-					// Test component configuration
-					f_cf02Up();
-
-					// Test adapter configuration
-
-					// Preamble
-					vc_cse1.start(f_cse_registrationRemoteCse(mw_createRemoteCSE));
-
-					// Test Body
-					f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, omit));
-	
-					tc_ac.start;
-					alt {
-						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) {
-							tc_ac.stop;
-							setverdict(pass, __SCOPE__ & ": AE creation successful.");
-						}
-						[] mcaPort.receive {
-							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Error while creating AE");
-						}
-						[] tc_ac.timeout {
-							setverdict(fail, __SCOPE__ & ": No answer while creating AE");
-						}
-					}	
-
-					// Postamble
-					f_cse_postamble_deleteResources();
-
-					// Tear down
-					f_cf02Down();
-
-				}end TC_CSE_REG_CRE_027*/
-				
-				
-				
-				
 				/**
 				 * @desc Check that IUT accepts  a CSE registration request with OPTIONAL_ATTRIBUTE attribute
 				 * 
@@ -277,54 +155,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 			group Retrieve{
 				
 				
-				/**
-				 * @desc Check that the IUT accepts a retrieval request of <AE> resource with optional ATTRIBUTE
-				 * 
-				 */
-				 
-				group g_CSE_REG_RET_004 {
-					
-					testcase TC_CSE_REG_RET_004_NL() runs on Tester system CseSystem {
-						//Local variables
-						 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						 var template RequestPrimitive v_createRequest := m_createAe(PX_APP_ID);
-						 var template PrimitiveContent v_contentResponse;
-						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						 v_createRequest.primitiveContent.aE.nodeLink := "http://127.0.0.1/";
-
-						 v_contentResponse.aE := mw_contentAeBase;
-						 v_contentResponse.aE.nodeLink := ?;
-
-						 v_ae1.start(f_CSE_REG_RET_004(v_createRequest,v_contentResponse));
-						 v_ae1.done;
-					}
-					
-					testcase TC_CSE_REG_RET_004_CSZ() runs on Tester system CseSystem {
-						//Local variables
-						 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						 var template RequestPrimitive v_createRequest := m_createAe(PX_APP_ID);
-						 var template PrimitiveContent v_contentResponse;
-						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						 v_createRequest.primitiveContent.aE.contentSerialization := {applicationxml};
-
-						 v_contentResponse.aE := mw_contentAeBase;
-						 v_contentResponse.aE.contentSerialization := ?; 
-
-						 v_ae1.start(f_CSE_REG_RET_004(v_createRequest,v_contentResponse));
-						 v_ae1.done;
-					}
-	
-				} //end g_CSE_REG_RET_004
-				
 			}//end group Retrieve
 			
 			group Update{
 			
-				
 				/**
 				 * @desc Check that the IUT accepts an update request of <remoteCSE> resource with OPTIONAL_ATTRIBUTE.
 				 * 
@@ -362,14 +196,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 							
 				} //end g_CSE_REG_UPD_002
 			    
-			    
 			}// end group Update
 			
 			group Delete{
 			
-				
-				
-			
 			}// end group Delete
 	  	  	
 		}//end Registration
@@ -503,12031 +333,2873 @@ module OneM2M_Testcases_CSE_Release_2 {
 					 * @desc Check that the IUT accepts the creation of a RESOURCE_TYPE resource on the TARGET_RESOURCE_ADDRESS of type PARENT_RESOURCE_TYPE with resource name not provided
 					 * 
 					 */
-					testcase TC_CSE_DMR_CRE_001_SCH_CB() runs on Tester system CseSystem {
+					testcase TC_CSE_DMR_CRE_001_PCH_AE() runs on Tester system CseSystem {
 						// Local variables
-						var template RequestPrimitive v_createRequest := m_createScheduleBase;
+						var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
 						
-						v_createRequest.primitiveContent.schedule.resourceName := omit;
-						v_ae1.start(f_CSE_DMR_CRE_001(int18, v_createRequest, -));//Schedule
+						
+						v_createRequest.primitiveContent.pollingChannel.resourceName := omit;
+
+						v_ae1.start(f_CSE_DMR_CRE_001(int15, v_createRequest, m_createAeAux(omit,omit)));//PollingChannel
 						v_ae1.done;
 						
 						 
-																	
+												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							if(not ispresent(v_responsePrimitive.primitiveContent.schedule.resourceName)){
+							if(not ispresent(v_responsePrimitive.primitiveContent.pollingChannel.resourceName)){
 								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}
 						
 					}
 					
-					testcase TC_CSE_DMR_CRE_001_SCH_AE() runs on Tester system CseSystem {
+				} // end g_CSE_DMR_CRE_001
+								
+				group g_CSE_DMR_CRE_002 {
+					
+					/**
+					 * @desc Check that the IUT accepts the creation of a RESOURCE_TYPE resource with a non-existing resource name provided by AE
+					 * 
+					 */
+					testcase TC_CSE_DMR_CRE_002_PCH() runs on Tester system CseSystem {
 						// Local variables
-						var template RequestPrimitive v_createRequest := m_createScheduleBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						
-						v_createRequest.primitiveContent.schedule.resourceName := omit;
-						v_ae1.start(f_CSE_DMR_CRE_001(int18, v_createRequest, m_createAeAux(omit,omit)));//Schedule
+			
+						v_ae1.start(f_CSE_DMR_CRE_002(int15, m_createPollingChannelBase));//Pollingchannel
 						v_ae1.done;
 						
 						 
-											
+												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							if(not ispresent(v_responsePrimitive.primitiveContent.schedule.resourceName)){
+							if(not ispresent(v_responsePrimitive.primitiveContent.pollingChannel.resourceName)){
 								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
+							} else {
+								if(v_responsePrimitive.primitiveContent.pollingChannel.resourceName != c_defaultPollingChannelResourceName){
+									setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not correct");
+								}
 							}
 						}
-						
 					}
+					
+				}// end group g_CSE_DMR_CRE_002
 				
-					testcase TC_CSE_DMR_CRE_001_SCH_SUB() runs on Tester system CseSystem {
-						// Local variables
-						var template RequestPrimitive v_createRequest := m_createScheduleBase;
-						var ResponsePrimitive v_responsePrimitive;
+				group g_CSE_DMR_CRE_003 {
+					
+					/**
+					 * @desc Check that the IUT rejects the creation of a RESOURCE_TYPE resource with an existing resource name provided by AE
+					 * 
+					 */
+					testcase TC_CSE_DMR_CRE_003_PCH() runs on Tester system CseSystem {
+						// Local variables                        
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						
-						v_createRequest.primitiveContent.schedule.resourceName := omit;
-						v_ae1.start(f_CSE_DMR_CRE_001(int18, v_createRequest, m_createSubscriptionBase));//Schedule
+
+						v_ae1.start(f_CSE_DMR_CRE_003(int15, m_createPollingChannelBase));//Pollingchannel
 						v_ae1.done;
-						
-						 
-																		
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							if(not ispresent(v_responsePrimitive.primitiveContent.schedule.resourceName)){
-								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
-							}
-						}
-					
 					}
 					
-					testcase TC_CSE_DMR_CRE_001_PCH_AE() runs on Tester system CseSystem {
+				}// end group g_CSE_DMR_CRE_003
+				
+				group g_CSE_DMR_CRE_004 {
+					
+					/**
+					 * @desc Check that the IUT rejects the creation of a RESOURCE_TYPE resource when AE has no privileges
+					 * 
+					 */
+					testcase TC_CSE_DMR_CRE_004_PCH() runs on Tester system CseSystem {
 						// Local variables
-						var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
-						var ResponsePrimitive v_responsePrimitive;
+                        
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						
-						
-						v_createRequest.primitiveContent.pollingChannel.resourceName := omit;
 
-						v_ae1.start(f_CSE_DMR_CRE_001(int15, v_createRequest, m_createAeAux(omit,omit)));//PollingChannel
+						v_ae1.start(f_CSE_DMR_CRE_004(int15, m_createPollingChannelBase));//Pollingchannel
 						v_ae1.done;
-						
-						 
-												
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							if(not ispresent(v_responsePrimitive.primitiveContent.pollingChannel.resourceName)){
-								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
-							}
-						}
-						
 					}
 					
-					testcase TC_CSE_DMR_CRE_001_SUB_SCH() runs on Tester system CseSystem {
+				}// end group g_CSE_DMR_CRE_004
+				
+				group g_CSE_DMR_CRE_006 {
+					
+					/**
+					 * @desc Check that the IUT returns a default value to RW ATTRIBUTE in the response of a RESOURCE_TYPE resource CREATE Request where no a RW ATTRIBUTE is provided by AE
+					 * 
+					 */
+					testcase TC_CSE_DMR_CRE_006_CNT_MNI() runs on Tester system CseSystem {
 						// Local variables
-						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
+						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+		
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						
-						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.start(f_CSE_DMR_CRE_006(int3, v_createRequest));		
+						v_ae1.done;		 
+														
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
-								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
-							}
-						}		
+							if(not ispresent(v_responsePrimitive.primitiveContent.container.maxNrOfInstances)){
+								setverdict(fail, __SCOPE__, ": Error, maxNrOfInstances attribute not provided");
+							} 
+						}	
 					}
-					
-					testcase TC_CSE_DMR_CRE_001_SUB_GRP() runs on Tester system CseSystem {
+	
+					testcase TC_CSE_DMR_CRE_006_CNT_MBS() runs on Tester system CseSystem {
 						// Local variables
-						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
+						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+		
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						
-						v_createRequest.primitiveContent.subscription.resourceName := omit;
-						v_ae1.start(f_CSE_DMR_CRE_001(int23, v_createRequest, m_createGroupBase));//Subscription
+						v_ae1.start(f_CSE_DMR_CRE_006(int3, v_createRequest));
 						v_ae1.done;
-						
-						 
-												
+																				
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
-								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
-							}
-						}		
+							if(not ispresent(v_responsePrimitive.primitiveContent.container.maxByteSize)){
+								setverdict(fail, __SCOPE__, ": Error, maxByteSize attribute not provided");
+							} 
+						}	
+		  
 					}
-					
-					testcase TC_CSE_DMR_CRE_001_SUB_AEA() runs on Tester system CseSystem {
-						//Local variables
-						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
-						var ResponsePrimitive v_responsePrimitive;
-						var RequestPrimitive v_createAEAnnc := valueof(m_createAEAnnc(omit, omit, omit, PX_CSE1_ID));
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 	
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						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;	 
-							
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_cse1);
-							if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
-							}
-						}		
-					}
-					
-					testcase TC_CSE_DMR_CRE_001_CNT_AEA() runs on Tester system CseSystem {
-						//Local variables
+					testcase TC_CSE_DMR_CRE_006_CNT_MIA() runs on Tester system CseSystem {
+						// Local variables
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
-						var RequestPrimitive v_createAEAnnc := valueof(m_createAEAnnc(omit, omit, omit, PX_CSE1_ID));
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						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;	 
-		
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_cse1);
-							if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
-							}
-						}		
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+								
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
+						v_ae1.start(f_CSE_DMR_CRE_006(int3, v_createRequest));
+						v_ae1.done;		 
+														
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							if(not ispresent(v_responsePrimitive.primitiveContent.container.maxInstanceAge)){
+								setverdict(fail, __SCOPE__, ": Error, maxInstanceAge attribute not provided");
+							} 
+						}	
 					}
 					
-					testcase TC_CSE_DMR_CRE_001_GRP_AEA() runs on Tester system CseSystem {
-						// Local variables
-						var template RequestPrimitive v_createRequest := m_createGroupBase;
-						var ResponsePrimitive v_responsePrimitive;
-						var RequestPrimitive v_createAEAnnc := valueof(m_createAEAnnc(omit, omit, omit, PX_CSE1_ID));
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						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;
-
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_cse1);
-							if(not ispresent(v_responsePrimitive.primitiveContent.group_.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
-							}
-						}		
-					}
-					
-					testcase TC_CSE_DMR_CRE_001_ACP_AEA() runs on Tester system CseSystem {
-						// Local variables
-						var template RequestPrimitive v_createRequest := m_createAcpBase;
-						var ResponsePrimitive v_responsePrimitive;
-						var RequestPrimitive v_createAEAnnc := valueof(m_createAEAnnc(omit, omit, omit, PX_CSE1_ID));
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						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;
-
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_cse1);
-							if(not ispresent(v_responsePrimitive.primitiveContent.accessControlPolicy.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
-							}
-						}		
-					}
-										
-					testcase TC_CSE_DMR_CRE_001_NOD_CB() runs on Tester system CseSystem {
-						// Local variables
-						var template RequestPrimitive v_createRequest := m_createNodeBase;
-						var ResponsePrimitive v_responsePrimitive;
+				}// end group g_CSE_DMR_CRE_006
+				
+				group g_CSE_DMR_CRE_007 {
+					
+					/**
+					 * @desc Checks that the IUT accepts a newly created RESOURCE_TYPE when the currentNrOfInstances exceeds the field value set in maxNrOfInstances in the PARENT_RESOURCE_TYPE resource by removing enough of the oldest RESOURCE_TYPE resources to allow the creation of the new RESOURCE_TYPE resource
+					 * 
+					 */
+					testcase TC_CSE_DMR_CRE_007_CNT_CIN() runs on Tester system CseSystem {
+						// Local variables		
+						var template RequestPrimitive v_createRequestContainer := m_createContainerBase;
+						var template RequestPrimitive v_createRequestContentInstance1 := m_createContentInstanceBase;
+						var template RequestPrimitive v_createRequestContentInstance2 := m_createContentInstanceBase;
+						const integer c_maxNumberOfInstances := 1;	
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						 
-						v_createRequest.primitiveContent.node.resourceName := omit;
+						v_createRequestContainer.primitiveContent.container.maxNrOfInstances := c_maxNumberOfInstances;
+						v_createRequestContentInstance2.primitiveContent.contentInstance.resourceName := c_defaultContentInstanceResourceName & "2";	//Resource 2
 
-						v_ae1.start(f_CSE_DMR_CRE_001(int14, v_createRequest, -));//Node
-						v_ae1.done;	
-												
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							if(not ispresent(v_responsePrimitive.primitiveContent.node.resourceName)){
-								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
-							}
-						}
-						
+						v_ae1.start(f_CSE_DMR_CRE_007(int3, v_createRequestContainer, int4, v_createRequestContentInstance1, v_createRequestContentInstance2, c_defaultContentInstanceResourceName));//ContentInstance under Container
+						v_ae1.done;
 					}
+	
+				}// end group g_CSE_DMR_CRE_007
+				
+				group g_CSE_DMR_CRE_008 {
 					
-					testcase TC_CSE_DMR_CRE_001_MGC_CB() runs on Tester system CseSystem {
-						// Local variables
-						var template RequestPrimitive v_createRequest := m_createMgmtCmdBase;
-						var ResponsePrimitive v_responsePrimitive;
+					/**
+					 * @desc Checks that the IUT accepts a newly created RESOURCE_TYPE when the currentNrOfInstances exceeds the field value set in maxNrOfInstances in the PARENT_RESOURCE_TYPE resource by removing enough of the oldest RESOURCE_TYPE resources to allow the creation of the new RESOURCE_TYPE resource
+					 * 
+					 */
+					testcase TC_CSE_DMR_CRE_008_CNT_CIN() runs on Tester system CseSystem {
+						// Local variables		
+						var template RequestPrimitive v_createRequestContainer := m_createContainerBase;
+						var template RequestPrimitive v_createRequestContentInstance1 := m_createContentInstanceBase;
+						var template RequestPrimitive v_createRequestContentInstance2 := m_createContentInstanceBase;
+						const integer c_maxByteSize := 10;	
+						const XSD.String c_primitiveContent1 := "Content1";
+						const XSD.String c_primitiveContent2 := "Content2";		
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+		
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						
-						v_createRequest.primitiveContent.mgmtCmd.resourceName := omit;
-						v_ae1.start(f_CSE_DMR_CRE_001(int12, v_createRequest, -));//Management Command
-						v_ae1.done;						 
-												
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							if(not ispresent(v_responsePrimitive.primitiveContent.mgmtCmd.resourceName)){
-								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
-							}
-						}
-						
+						v_createRequestContainer.primitiveContent.container.maxByteSize := c_maxByteSize;
+						v_createRequestContentInstance1.primitiveContent.contentInstance.content := c_primitiveContent1;	//ContentInstance 1
+						v_createRequestContentInstance2.primitiveContent.contentInstance.content := c_primitiveContent2;	//ContentInstance 2
+						v_createRequestContentInstance2.primitiveContent.contentInstance.resourceName := c_defaultContentInstanceResourceName & "2";	//ContentInstance 2
+
+						v_ae1.start(f_CSE_DMR_CRE_007(int3, v_createRequestContainer, int4, v_createRequestContentInstance1, v_createRequestContentInstance2, c_defaultContentInstanceResourceName));//ContentInstance under Container
+						v_ae1.done;
 					}
+
+				}// end group g_CSE_DMR_CRE_008
+				
+				
+				group g_CSE_DMR_CRE_013 {
 					
-					testcase TC_CSE_DMR_CRE_001_LCP_CB() runs on Tester system CseSystem {
-						// Local variables
-						var template RequestPrimitive v_createRequest := m_createLocationPolicyBase;
-						var ResponsePrimitive v_responsePrimitive;
+					/**
+					 * @desc Check that the IUT rejects the CREATE Request of a RESOURCE_TYPE resource with error “NOT_ACCEPTABLE” when contentSize exceeds maxByteSize of the PARENT_RESOURCE_TYPE
+					 * 
+					 */
+					testcase TC_CSE_DMR_CRE_013_CNT_CIN() runs on Tester system CseSystem {
+						// Local variables		
+						var template RequestPrimitive v_createRequestContainer := m_createContainerBase;
+						var template RequestPrimitive v_createRequestContentInstance := m_createContentInstanceBase;
+						const integer c_maxByteSize := 1;		
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+		
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						
-						v_createRequest.primitiveContent.locationPolicy.resourceName := omit;
-						v_ae1.start(f_CSE_DMR_CRE_001(int10, v_createRequest, -));//Location Policy
+						v_createRequestContainer.primitiveContent.container.maxByteSize := c_maxByteSize;
+
+						v_ae1.start(f_CSE_DMR_CRE_013(int3, v_createRequestContainer, int4, v_createRequestContentInstance));//ContentInstance under Container
 						v_ae1.done;
-												
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							if(not ispresent(v_responsePrimitive.primitiveContent.locationPolicy.resourceName)){
-								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
-							}
-						}
-						
 					}
+
+				}// end group g_CSE_DMR_CRE_013
+				
+				group g_CSE_DMR_CRE_015 {
 					
-					testcase TC_CSE_DMR_CRE_001_STCG_CB() runs on Tester system CseSystem {
+					/**
+					 * @desc Check that the IUT returns successfully after a CREATE request an empty content of created resource when the ResultContent set to 0 (Nothing)
+					 * 
+					 */
+					testcase TC_CSE_DMR_CRE_015_CNT() runs on Tester system CseSystem {
 						// Local variables
-						var template RequestPrimitive v_createRequest := m_createStatsConfigBase;
-						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						
-						v_createRequest.primitiveContent.statsConfig.resourceName := omit;
-						v_ae1.start(f_CSE_DMR_CRE_001(int22, v_createRequest, -));//Stats Config
+						                        
+						v_ae1.start(f_CSE_DMR_CRE_015(int3, m_createContainerBase));//Container
 						v_ae1.done;
-												
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							if(not ispresent(v_responsePrimitive.primitiveContent.statsConfig.resourceName)){
-								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
-							}
-						}
 					}
-					
-					testcase TC_CSE_DMR_CRE_001_STCL_CB() runs on Tester system CseSystem {
+
+					testcase TC_CSE_DMR_CRE_015_GRP() runs on Tester system CseSystem {
 						// Local variables
-						var template RequestPrimitive v_createRequest := m_createStatsCollectBase;
-						var ResponsePrimitive v_responsePrimitive;
+						
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						 
-						v_createRequest.primitiveContent.statsCollect.resourceName := omit;
-						
-						v_ae1.start(f_CSE_DMR_CRE_001(int21, v_createRequest, -));//Stats Collect
+						                        
+						v_ae1.start(f_CSE_DMR_CRE_015(int9, m_createGroupBase));//Group
 						v_ae1.done;
-												
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							if(not ispresent(v_responsePrimitive.primitiveContent.statsCollect.resourceName)){
-								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
-							}
-						}
-						
 					}
 					
-					testcase TC_CSE_DMR_CRE_001_MSSP_CB() runs on Tester system CseSystem {
+					testcase TC_CSE_DMR_CRE_015_ACP() runs on Tester system CseSystem {
 						// Local variables
-						var template RequestPrimitive v_createRequest := m_createM2mServiceSubscriptionProfileBase;
-						var ResponsePrimitive v_responsePrimitive;
+							
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						
-						v_createRequest.primitiveContent.m2mServiceSubscriptionProfile.resourceName := omit;
-						v_ae1.start(f_CSE_DMR_CRE_001(int11, v_createRequest, -));//Subscription Profile
+						                        
+						v_ae1.start(f_CSE_DMR_CRE_015(int1, m_createAcpBase));//AccessControlPolicy
 						v_ae1.done;
-												
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							if(not ispresent(v_responsePrimitive.primitiveContent.m2mServiceSubscriptionProfile.resourceName)){
-								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
-							}
-						}
-						
 					}
-					
-					testcase TC_CSE_DMR_CRE_001_ASAR_CB() runs on Tester system CseSystem {
+				
+					testcase TC_CSE_DMR_CRE_015_SUB() runs on Tester system CseSystem {
 						// Local variables
-						var template RequestPrimitive v_createRequest := m_createServiceSubscribedAppRuleBase;
-						var ResponsePrimitive v_responsePrimitive;
+						
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						 
-						v_createRequest.primitiveContent.serviceSubscribedAppRule.resourceName := omit;
-						v_ae1.start(f_CSE_DMR_CRE_001(int19, v_createRequest, -));//Service Subscribed App
+						                        
+						v_ae1.start(f_CSE_DMR_CRE_015(int23, m_createSubscriptionBase));//Subscription
 						v_ae1.done;
-												
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							if(not ispresent(v_responsePrimitive.primitiveContent.serviceSubscribedAppRule.resourceName)){
-								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
-							}
-						}
-						
 					}
+				
+				} // end g_CSE_DMR_CRE_015							
+
+				group g_CSE_DMR_CRE_016 {
 					
-					testcase TC_CSE_DMR_CRE_001_TS_CB() runs on Tester system CseSystem {
+					/**
+					 * @desc Check that the IUT returns successfully after a CREATE request only hierarchichal address of the created resource when the Result Content is set to 2 (hierarchical address)
+					 * 
+					 */
+					testcase TC_CSE_DMR_CRE_016_CNT() runs on Tester system CseSystem {
 						// Local variables
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var ResponsePrimitive v_responsePrimitive;
+						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-	
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						v_createRequest.primitiveContent.timeSeries.resourceName := omit;
-						v_ae1.start(f_CSE_DMR_CRE_001(int29, v_createRequest, -));//TimeSeries
-						v_ae1.done; 
-												
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							if(not ispresent(v_responsePrimitive.primitiveContent.timeSeries.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
-							}
-						}
-	
-					}
 					
-					testcase TC_CSE_DMR_CRE_001_TS_AE() runs on Tester system CseSystem {
+						v_contentResponse.uRI := mw_contentContainer_rc2;
+					                        
+						v_ae1.start(f_CSE_DMR_CRE_016(int3, m_createContainerBase, v_contentResponse));//Container
+						v_ae1.done;
+					}
+
+					testcase TC_CSE_DMR_CRE_016_GRP() runs on Tester system CseSystem {
 						// Local variables
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var ResponsePrimitive v_responsePrimitive;
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;	
-	
+						var template PrimitiveContent v_contentResponse;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						v_createRequest.primitiveContent.timeSeries.resourceName := omit;
-
-						v_ae1.start(f_CSE_DMR_CRE_001(int29, v_createRequest, m_createAeAux(omit,omit)));//TimeSeries
-						v_ae1.done;	 
-							
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							if(not ispresent(v_responsePrimitive.primitiveContent.timeSeries.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
-							}
-						}
-	
-					}
 					
-					testcase TC_CSE_DMR_CRE_001_TS_CSR() runs on Tester system CseSystem {
-						// Local variables
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var ResponsePrimitive v_responsePrimitive;
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-	
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						v_createRequest.primitiveContent.timeSeries.resourceName := omit;
-						v_cse1.start(f_CSE_DMR_CRE_001_cseSimu(int29, v_createRequest, -, -));//TimeSeries
-						v_cse1.done;	 
-							
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_cse1);
-							if(not ispresent(v_responsePrimitive.primitiveContent.timeSeries.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
-							}
-						}		
-					}
+						v_contentResponse.uRI := mw_contentGroup_rc2;
 					
-					testcase TC_CSE_DMR_CRE_001_TS_AEA() runs on Tester system CseSystem {
-						// Local variables
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var ResponsePrimitive v_responsePrimitive;
-						var RequestPrimitive v_createAEAnnc := valueof(m_createAEAnnc(omit, omit, omit, PX_CSE1_ID));
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						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;
-
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_cse1);
-							if(not ispresent(v_responsePrimitive.primitiveContent.timeSeries.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
-							}
-						}		
+						v_ae1.start(f_CSE_DMR_CRE_016(int9, m_createGroupBase, v_contentResponse));//Group
+						v_ae1.done;
 					}
 					
-					testcase TC_CSE_DMR_CRE_001_TSI_TS() runs on Tester system CseSystem {
+					testcase TC_CSE_DMR_CRE_016_ACP() runs on Tester system CseSystem {
 						// Local variables
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
-						var ResponsePrimitive v_responsePrimitive;
+						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-	
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						v_createRequest.primitiveContent.timeSeriesInstance.resourceName := omit;
-						v_ae1.start(f_CSE_DMR_CRE_001(int30, v_createRequest, m_createTimeSeriesBase));//TimeSeriesInstance
-						v_ae1.done;	 
-							
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							if(not ispresent(v_responsePrimitive.primitiveContent.timeSeriesInstance.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
-							}
-						}
-
+											
+						v_contentResponse.uRI := mw_contentAcp_rc2;
+						
+						v_ae1.start(f_CSE_DMR_CRE_016(int1, m_createAcpBase,v_contentResponse));//AccessControlPolicy
+						v_ae1.done;
 					}
-					
-				} // end g_CSE_DMR_CRE_001
-								
-				group g_CSE_DMR_CRE_002 {
-					
-					/**
-					 * @desc Check that the IUT accepts the creation of a RESOURCE_TYPE resource with a non-existing resource name provided by AE
-					 * 
-					 */
-					testcase TC_CSE_DMR_CRE_002_SCH() runs on Tester system CseSystem {
+				
+					testcase TC_CSE_DMR_CRE_016_SUB() runs on Tester system CseSystem {
 						// Local variables
-						var ResponsePrimitive v_responsePrimitive;
+						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-			
-						v_ae1.start(f_CSE_DMR_CRE_002(int18, m_createScheduleBase));//Schedule
+											
+						v_contentResponse.uRI := mw_contentSubscription_rc2;
+
+						v_ae1.start(f_CSE_DMR_CRE_016(int23, m_createSubscriptionBase, v_contentResponse));//Subscription
 						v_ae1.done;
-						
-						 
-																		
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							if(not ispresent(v_responsePrimitive.primitiveContent.schedule.resourceName)){
-								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
-							} else {
-								if(v_responsePrimitive.primitiveContent.schedule.resourceName != c_defaultScheduleResourceName){
-									setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not correct");
-								}
-							}
-						}
 					}
 					
-					testcase TC_CSE_DMR_CRE_002_PCH() runs on Tester system CseSystem {
+				} // end g_CSE_DMR_CRE_016	
+							
+				group g_CSE_DMR_CRE_017 {
+					
+					/**
+					 * @desc Check that the IUT returns successfully after a CREATE request only attributes and hierarchichal address of the created resource when Result Content is set 3 (attributes and hierarchichal address)
+					 * 
+					 */
+					testcase TC_CSE_DMR_CRE_017_CNT() runs on Tester system CseSystem {
 						// Local variables
-						var ResponsePrimitive v_responsePrimitive;
+						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-			
-						v_ae1.start(f_CSE_DMR_CRE_002(int15, m_createPollingChannelBase));//Pollingchannel
+					
+						v_contentResponse.resource := mw_contentContainer_rc3;
+					                        
+						v_ae1.start(f_CSE_DMR_CRE_017(int3, m_createContainerBase, v_contentResponse));//Container
 						v_ae1.done;
-						
-						 
-												
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							if(not ispresent(v_responsePrimitive.primitiveContent.pollingChannel.resourceName)){
-								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
-							} else {
-								if(v_responsePrimitive.primitiveContent.pollingChannel.resourceName != c_defaultPollingChannelResourceName){
-									setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not correct");
-								}
-							}
-						}
 					}
-					
-					testcase TC_CSE_DMR_CRE_002_TS() runs on Tester system CseSystem {
+
+					testcase TC_CSE_DMR_CRE_017_GRP() runs on Tester system CseSystem {
 						// Local variables
-						var ResponsePrimitive v_responsePrimitive;
+						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						v_ae1.start(f_CSE_DMR_CRE_002(int29, m_createTimeSeriesBase));//TimeSeries
-						v_ae1.done;	 
-							
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							if(not ispresent(v_responsePrimitive.primitiveContent.timeSeries.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
-							} else {
-								if(v_responsePrimitive.primitiveContent.timeSeries.resourceName != c_defaultTimeSeriesResourceName){
-									setverdict(fail, __SCOPE__, ": Error, resourceName attribute not correct");
-								}
-							}
-						}
-					}
 					
-				}// end group g_CSE_DMR_CRE_002
-				
-				group g_CSE_DMR_CRE_003 {
+						v_contentResponse.resource := mw_contentGroup_rc3;
 					
-					/**
-					 * @desc Check that the IUT rejects the creation of a RESOURCE_TYPE resource with an existing resource name provided by AE
-					 * 
-					 */
-					testcase TC_CSE_DMR_CRE_003_SCH() runs on Tester system CseSystem {
+						v_ae1.start(f_CSE_DMR_CRE_017(int9, m_createGroupBase, v_contentResponse));//Group
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_DMR_CRE_017_ACP() runs on Tester system CseSystem {
 						// Local variables
+						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-
-						v_ae1.start(f_CSE_DMR_CRE_003(int18, m_createScheduleBase));//Schedule
+					
+						v_contentResponse.resource := mw_contentAcp_rc3;
+						
+						v_ae1.start(f_CSE_DMR_CRE_017(int1, m_createAcpBase,v_contentResponse));//AccessControlPolicy
 						v_ae1.done;
 					}
-					
-					testcase TC_CSE_DMR_CRE_003_PCH() runs on Tester system CseSystem {
-						// Local variables                        
+
+					testcase TC_CSE_DMR_CRE_017_SUB() runs on Tester system CseSystem {
+						// Local variables
+						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
+					
+						v_contentResponse.resource := mw_contentSubscription_rc3;
 
-						v_ae1.start(f_CSE_DMR_CRE_003(int15, m_createPollingChannelBase));//Pollingchannel
+						v_ae1.start(f_CSE_DMR_CRE_017(int23, m_createSubscriptionBase, v_contentResponse));//Subscription
 						v_ae1.done;
 					}
+				
+				} // end g_CSE_DMR_CRE_017
+
+				
+			}//end group Create
+			
+			group Retrieve {
+				
+				group g_CSE_DMR_RET_001 {
 					
-					testcase TC_CSE_DMR_CRE_003_TS() runs on Tester system CseSystem {
-						// Local variables    
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					/**
+					 * @desc Check that the IUT returns successfully the TARGET_RESOURCE_ADDRESS resource 
+					 * 
+					 */
+					testcase TC_CSE_DMR_RET_001_PCH() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
+						var ResponsePrimitive v_responsePrimitive;
+						var template PrimitiveContent v_contentResponse;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-
-						v_ae1.start(f_CSE_DMR_CRE_003(int29, m_createTimeSeriesBase));//TimeSeries
+						v_contentResponse.pollingChannel := mw_contentPollingChannelBase;
+						
+						v_ae1.start(f_CSE_DMR_RET_001(int15, m_createPollingChannelBase, v_contentResponse));//PollingChannel
 						v_ae1.done;
+						
 					}
 					
-				}// end group g_CSE_DMR_CRE_003
+				} // end g_CSE_DMR_RET_001
 				
-				group g_CSE_DMR_CRE_004 {
+								
+				group g_CSE_DMR_RET_020 {
 					
 					/**
-					 * @desc Check that the IUT rejects the creation of a RESOURCE_TYPE resource when AE has no privileges
+					 * @desc Check that the IUT rejects a RETRIEVE Request target to TARGET_RESOURCE_ADDRESS resource  when the Result Content set to RESULT_CONTENT
 					 * 
 					 */
-					testcase TC_CSE_DMR_CRE_004_SCH() runs on Tester system CseSystem {
+					testcase TC_CSE_DMR_RET_020_RCN_0() runs on Tester system CseSystem {
 						// Local variables
-						
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-
-						v_ae1.start(f_CSE_DMR_CRE_004(int18, m_createScheduleBase));//Schedule
+						v_ae1.start(f_CSE_DMR_RET_020(int3, m_createContainerBase, int0));//ResultContent = 0 (nothing)
 						v_ae1.done;
 					}
-					
-					testcase TC_CSE_DMR_CRE_004_PCH() runs on Tester system CseSystem {
+	
+					testcase TC_CSE_DMR_RET_020_RCN_2() runs on Tester system CseSystem {
 						// Local variables
-                        
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-
-						v_ae1.start(f_CSE_DMR_CRE_004(int15, m_createPollingChannelBase));//Pollingchannel
+						v_ae1.start(f_CSE_DMR_RET_020(int3, m_createContainerBase, int2));//ResultContent = 2 (hierarchical address)
 						v_ae1.done;
 					}
-					
-					testcase TC_CSE_DMR_CRE_004_TS() runs on Tester system CseSystem {
+	
+					testcase TC_CSE_DMR_RET_020_RCN_3() runs on Tester system CseSystem {
 						// Local variables
-    
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						v_ae1.start(f_CSE_DMR_CRE_004(int29, m_createTimeSeriesBase));//TimeSeries
+						v_ae1.start(f_CSE_DMR_RET_020(int3, m_createContainerBase, int3));//ResultContent = 3 (attributes and hierarchichal address)
 						v_ae1.done;
 					}
-					
-				}// end group g_CSE_DMR_CRE_004
-				
-				group g_CSE_DMR_CRE_006 {
-					
+	
+				} // end g_CSE_DMR_RET_020
+
+				group g_CSE_DMR_RET_021 {
+		
 					/**
-					 * @desc Check that the IUT returns a default value to RW ATTRIBUTE in the response of a RESOURCE_TYPE resource CREATE Request where no a RW ATTRIBUTE is provided by AE
+					 * @desc Check that the IUT returns successfully only attributes of TARGET_RESOURCE_ADDRESS resource when the Result Content is set to 1 (attributes)
 					 * 
 					 */
-					testcase TC_CSE_DMR_CRE_006_CNT_MNI() runs on Tester system CseSystem {
+					testcase TC_CSE_DMR_RET_021_CNT() runs on Tester system CseSystem {
 						// Local variables
-						var template RequestPrimitive v_createRequest := m_createContainerBase;
-						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-		
+						
+						var template PrimitiveContent v_contentResponse;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						v_ae1.start(f_CSE_DMR_CRE_006(int3, v_createRequest));		
-						v_ae1.done;		 
-														
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							if(not ispresent(v_responsePrimitive.primitiveContent.container.maxNrOfInstances)){
-								setverdict(fail, __SCOPE__, ": Error, maxNrOfInstances attribute not provided");
-							} 
-						}	
+						v_contentResponse.container := mw_contentContainer_rc1;
+		                        
+						v_ae1.start(f_CSE_DMR_RET_021(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase));//Container
+						v_ae1.done;
 					}
-	
-					testcase TC_CSE_DMR_CRE_006_CNT_MBS() runs on Tester system CseSystem {
+
+					testcase TC_CSE_DMR_RET_021_GRP() runs on Tester system CseSystem {
 						// Local variables
-						var template RequestPrimitive v_createRequest := m_createContainerBase;
-						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-		
+						
+						var template PrimitiveContent v_contentResponse;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						v_ae1.start(f_CSE_DMR_CRE_006(int3, v_createRequest));
+						v_contentResponse.group_ := mw_contentGroup_rc1;
+		
+						v_ae1.start(f_CSE_DMR_RET_021(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase));//Group
 						v_ae1.done;
-																				
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							if(not ispresent(v_responsePrimitive.primitiveContent.container.maxByteSize)){
-								setverdict(fail, __SCOPE__, ": Error, maxByteSize attribute not provided");
-							} 
-						}	
-		  
 					}
-	
-					testcase TC_CSE_DMR_CRE_006_CNT_MIA() runs on Tester system CseSystem {
+		
+					testcase TC_CSE_DMR_RET_021_ACP() runs on Tester system CseSystem {
 						// Local variables
-						var template RequestPrimitive v_createRequest := m_createContainerBase;
-						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-								
+						
+						var template PrimitiveContent v_contentResponse;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						
-						v_ae1.start(f_CSE_DMR_CRE_006(int3, v_createRequest));
-						v_ae1.done;		 
-														
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							if(not ispresent(v_responsePrimitive.primitiveContent.container.maxInstanceAge)){
-								setverdict(fail, __SCOPE__, ": Error, maxInstanceAge attribute not provided");
-							} 
-						}	
+						v_contentResponse.accessControlPolicy := mw_contentAcp_rc1;
+			
+						v_ae1.start(f_CSE_DMR_RET_021(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase));//AccessControlPolicy
+						v_ae1.done;
 					}
-					
-					testcase TC_CSE_DMR_CRE_006_TS_MNI() runs on Tester system CseSystem {
+	
+					testcase TC_CSE_DMR_RET_021_PCH() runs on Tester system CseSystem {
 						// Local variables
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-
+						
+						var template PrimitiveContent v_contentResponse;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						v_ae1.start(f_CSE_DMR_CRE_006(int29, v_createRequest));		
-						v_ae1.done;		 
-									
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							if(not ispresent(v_responsePrimitive.primitiveContent.timeSeries.maxNrOfInstances)){
-								setverdict(fail, __SCOPE__, ": Error, maxNrOfInstances attribute not provided");
-							} 
-						}	
+						v_contentResponse.pollingChannel := mw_contentPollingChannelBase;
+			
+						v_ae1.start(f_CSE_DMR_RET_021(int15, m_createPollingChannelBase, v_contentResponse, omit, omit));//PollingChannel
+						v_ae1.done;
 					}
-
-					testcase TC_CSE_DMR_CRE_006_TS_MBS() runs on Tester system CseSystem {
+		
+					testcase TC_CSE_DMR_RET_021_SUB() runs on Tester system CseSystem {
 						// Local variables
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-
+						
+						var template PrimitiveContent v_contentResponse;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						v_ae1.start(f_CSE_DMR_CRE_006(int29, v_createRequest));
-						v_ae1.done;
-															
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							if(not ispresent(v_responsePrimitive.primitiveContent.timeSeries.maxByteSize)){
-								setverdict(fail, __SCOPE__, ": Error, maxByteSize attribute not provided");
-							} 
-						}	
-  
-								}
+						v_contentResponse.subscription := mw_contentSubscription_rc1;
 
-					testcase TC_CSE_DMR_CRE_006_TS_MIA() runs on Tester system CseSystem {
-						// Local variables
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var ResponsePrimitive v_responsePrimitive;
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-			
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.start(f_CSE_DMR_RET_021(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase));//Subscription
 						v_ae1.done;
-						v_ae1.start(f_CSE_DMR_CRE_006(int29, v_createRequest));
-						v_ae1.done;		 
-									
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							if(not ispresent(v_responsePrimitive.primitiveContent.timeSeries.maxInstanceAge)){
-								setverdict(fail, __SCOPE__, ": Error, maxInstanceAge attribute not provided");
-							} 
-						}	
 					}
+					
+				} // end g_CSE_DMR_RET_021
 
-				}// end group g_CSE_DMR_CRE_006
-				
-				group g_CSE_DMR_CRE_007 {
-					
+				group g_CSE_DMR_RET_022 {
+		
 					/**
-					 * @desc Checks that the IUT accepts a newly created RESOURCE_TYPE when the currentNrOfInstances exceeds the field value set in maxNrOfInstances in the PARENT_RESOURCE_TYPE resource by removing enough of the oldest RESOURCE_TYPE resources to allow the creation of the new RESOURCE_TYPE resource
+					 * @desc Check that the IUT returns successfully only attributes and child resources of TARGET_RESOURCE_ADDRESS resource when the Result Content is set to 4 (attributes and child resources)
 					 * 
 					 */
-					testcase TC_CSE_DMR_CRE_007_CNT_CIN() runs on Tester system CseSystem {
-						// Local variables		
-						var template RequestPrimitive v_createRequestContainer := m_createContainerBase;
-						var template RequestPrimitive v_createRequestContentInstance1 := m_createContentInstanceBase;
-						var template RequestPrimitive v_createRequestContentInstance2 := m_createContentInstanceBase;
-						const integer c_maxNumberOfInstances := 1;	
+					testcase TC_CSE_DMR_RET_022_CNT() runs on Tester system CseSystem {
+						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
+						var template PrimitiveContent v_contentResponse;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						v_createRequestContainer.primitiveContent.container.maxNrOfInstances := c_maxNumberOfInstances;
-						v_createRequestContentInstance2.primitiveContent.contentInstance.resourceName := c_defaultContentInstanceResourceName & "2";	//Resource 2
+						v_contentResponse.container := mw_contentContainer_rc4;
+		                        
+						v_ae1.start(f_CSE_DMR_RET_022(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase));//Container
+						v_ae1.done;
+					}
 
-						v_ae1.start(f_CSE_DMR_CRE_007(int3, v_createRequestContainer, int4, v_createRequestContentInstance1, v_createRequestContentInstance2, c_defaultContentInstanceResourceName));//ContentInstance under Container
+					testcase TC_CSE_DMR_RET_022_GRP() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var template PrimitiveContent v_contentResponse;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.group_ := mw_contentGroup_rc4;
+		
+						v_ae1.start(f_CSE_DMR_RET_022(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase));//Group
 						v_ae1.done;
 					}
-	
-					testcase TC_CSE_DMR_CRE_007_TS_TSI() runs on Tester system CseSystem {
-						//Local variables		
-						var template RequestPrimitive v_createRequestTimeSeries := m_createTimeSeriesBase;
-						var template RequestPrimitive v_createRequestTimeSeriesInstance1 := m_createTimeSeriesInstanceBase;
-						var template RequestPrimitive v_createRequestTimeSeriesInstance2 := m_createTimeSeriesInstanceBase;
-						const integer c_maxNumberOfInstances := 1;	
+		
+					testcase TC_CSE_DMR_RET_022_ACP() runs on Tester system CseSystem {
+						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
+						var template PrimitiveContent v_contentResponse;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						v_createRequestTimeSeries.primitiveContent.timeSeries.maxNrOfInstances := c_maxNumberOfInstances;
-						v_createRequestTimeSeriesInstance2.primitiveContent.timeSeriesInstance.resourceName := c_defaultTimeSeriesInstanceResourceName & "2";	//Resource 2
-
-						v_ae1.start(f_CSE_DMR_CRE_007(int29, v_createRequestTimeSeries, int30, v_createRequestTimeSeriesInstance1, v_createRequestTimeSeriesInstance2, c_defaultTimeSeriesInstanceResourceName));//TimeSeriesInstance under TimeSeries
+						v_contentResponse.accessControlPolicy := mw_contentAcp_rc4;
+			
+						v_ae1.start(f_CSE_DMR_RET_022(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase));//AccessControlPolicy
 						v_ae1.done;
 					}
 	
-				}// end group g_CSE_DMR_CRE_007
-				
-				group g_CSE_DMR_CRE_008 {
-					
-					/**
-					 * @desc Checks that the IUT accepts a newly created RESOURCE_TYPE when the currentNrOfInstances exceeds the field value set in maxNrOfInstances in the PARENT_RESOURCE_TYPE resource by removing enough of the oldest RESOURCE_TYPE resources to allow the creation of the new RESOURCE_TYPE resource
-					 * 
-					 */
-					testcase TC_CSE_DMR_CRE_008_CNT_CIN() runs on Tester system CseSystem {
-						// Local variables		
-						var template RequestPrimitive v_createRequestContainer := m_createContainerBase;
-						var template RequestPrimitive v_createRequestContentInstance1 := m_createContentInstanceBase;
-						var template RequestPrimitive v_createRequestContentInstance2 := m_createContentInstanceBase;
-						const integer c_maxByteSize := 10;	
-						const XSD.String c_primitiveContent1 := "Content1";
-						const XSD.String c_primitiveContent2 := "Content2";		
+					testcase TC_CSE_DMR_RET_022_PCH() runs on Tester system CseSystem {
+						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-		
+						
+						var template PrimitiveContent v_contentResponse;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						v_createRequestContainer.primitiveContent.container.maxByteSize := c_maxByteSize;
-						v_createRequestContentInstance1.primitiveContent.contentInstance.content := c_primitiveContent1;	//ContentInstance 1
-						v_createRequestContentInstance2.primitiveContent.contentInstance.content := c_primitiveContent2;	//ContentInstance 2
-						v_createRequestContentInstance2.primitiveContent.contentInstance.resourceName := c_defaultContentInstanceResourceName & "2";	//ContentInstance 2
-
-						v_ae1.start(f_CSE_DMR_CRE_007(int3, v_createRequestContainer, int4, v_createRequestContentInstance1, v_createRequestContentInstance2, c_defaultContentInstanceResourceName));//ContentInstance under Container
+						v_contentResponse.pollingChannel := mw_contentPollingChannelBase;
+			
+						v_ae1.start(f_CSE_DMR_RET_022(int15, m_createPollingChannelBase, v_contentResponse, omit, omit));//PollingChannel
 						v_ae1.done;
 					}
-
-					testcase TC_CSE_DMR_CRE_008_TS_TSI() runs on Tester system CseSystem {
-						//Local variables		
-						var template RequestPrimitive v_createRequestTimeSeries := m_createTimeSeriesBase;
-						var template RequestPrimitive v_createRequestTimeSeriesInstance1 := m_createTimeSeriesInstanceBase;
-						var template RequestPrimitive v_createRequestTimeSeriesInstance2 := m_createTimeSeriesInstanceBase;
-						const integer c_maxByteSize := 10;	
-						const XSD.String c_primitiveContent1 := "Content1";
-						const XSD.String c_primitiveContent2 := "Content2";		
+		
+					testcase TC_CSE_DMR_RET_022_SUB() runs on Tester system CseSystem {
+						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-
+						
+						var template PrimitiveContent v_contentResponse;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						v_createRequestTimeSeries.primitiveContent.container.maxByteSize := c_maxByteSize;
-						v_createRequestTimeSeriesInstance1.primitiveContent.timeSeriesInstance.content := c_primitiveContent1;	//ContentInstance 1
-						v_createRequestTimeSeriesInstance2.primitiveContent.timeSeriesInstance.content := c_primitiveContent2;	//ContentInstance 2
-						v_createRequestTimeSeriesInstance2.primitiveContent.timeSeriesInstance.resourceName := c_defaultTimeSeriesInstanceResourceName & "2";	//ContentInstance 2
+						v_contentResponse.subscription := mw_contentSubscription_rc4;
 
-						v_ae1.start(f_CSE_DMR_CRE_008(int29, v_createRequestTimeSeries, int30, v_createRequestTimeSeriesInstance1, v_createRequestTimeSeriesInstance2, c_defaultTimeSeriesInstanceResourceName));//TimeSeriesInstance under TimeSeries
+						v_ae1.start(f_CSE_DMR_RET_022(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase));//Subscription
 						v_ae1.done;
 					}
-
-				}// end group g_CSE_DMR_CRE_008
-				
-				group g_CSE_DMR_CRE_012 {
 					
+				} // end g_CSE_DMR_RET_022
+
+				group g_CSE_DMR_RET_023 {
+		
 					/**
-					 * @desc Check that the IUT accepts the creation of a RESOURCE_TYPE resource with the optional attribute OPTIONAL_ATTRIBUTE provided
+					 * @desc Check that the IUT returns successfully only attributes and child resource references of TARGET_RESOURCE_ADDRESS resource when the Result Content is set to 5 (attributes and child resource references)
 					 * 
 					 */
-					testcase TC_CSE_DMR_CRE_012_CNT_ET() runs on Tester system CseSystem {
+					testcase TC_CSE_DMR_RET_023_CNT() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
-						var template RequestPrimitive v_createRequest := m_createContainerBase;
-						const AttributeList c_optionalAttribute := {"expirationTime"};
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var template PrimitiveContent v_contentResponse;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						v_createRequest.primitiveContent.container.expirationTime := "20301231T012345";
-						
-						v_ae1.start(f_CSE_DMR_CRE_012(int3, v_createRequest, c_optionalAttribute));
+						v_contentResponse.container := mw_contentContainer_rc5;
+		                        
+						v_ae1.start(f_CSE_DMR_RET_023(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase));//Container
 						v_ae1.done;
-						  
 					}
-					
-					testcase TC_CSE_DMR_CRE_012_CIN_ET() runs on Tester system CseSystem {//TODO
+
+					testcase TC_CSE_DMR_RET_023_GRP() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
-						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
-						const AttributeList c_optionalAttribute := {"expirationTime"};
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var template PrimitiveContent v_contentResponse;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						v_createRequest.primitiveContent.contentInstance.expirationTime := "20301231T012345";
-						
-						v_ae1.start(f_CSE_DMR_CRE_012(int4, v_createRequest, c_optionalAttribute));			
+						v_contentResponse.group_ := mw_contentGroup_rc5;
+		
+						v_ae1.start(f_CSE_DMR_RET_023(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase));//Group
 						v_ae1.done;
 					}
-					
-					testcase TC_CSE_DMR_CRE_012_CIN_OR() runs on Tester system CseSystem {//TODO
+		
+					testcase TC_CSE_DMR_RET_023_ACP() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;					
-						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
-						const AttributeList c_optionalAttribute := {"ontologyRef"};
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var template PrimitiveContent v_contentResponse;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						v_createRequest.primitiveContent.contentInstance.ontologyRef := "MyOntologyRef";
-						
-						v_ae1.start(f_CSE_DMR_CRE_012(int4, v_createRequest, c_optionalAttribute));
+						v_contentResponse.accessControlPolicy := mw_contentAcp_rc5;
+			
+						v_ae1.start(f_CSE_DMR_RET_023(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase));//AccessControlPolicy
 						v_ae1.done;
-						
 					}
-					
-					testcase TC_CSE_DMR_CRE_012_ACP_ET() runs on Tester system CseSystem {
+	
+					testcase TC_CSE_DMR_RET_023_PCH() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
-						var template RequestPrimitive v_createRequest := m_createAcpBase;
-						const AttributeList c_optionalAttribute := {"expirationTime"};
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template PrimitiveContent v_contentResponse;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						v_createRequest.primitiveContent.accessControlPolicy.expirationTime := "20301231T012345";
-						
-						v_ae1.start(f_CSE_DMR_CRE_012(int1, v_createRequest, c_optionalAttribute));
+						v_contentResponse.pollingChannel := mw_contentPollingChannelBase;
+			
+						v_ae1.start(f_CSE_DMR_RET_023(int15, m_createPollingChannelBase, v_contentResponse, omit, omit));//PollingChannel
 						v_ae1.done;
-						
 					}
-					
-					testcase TC_CSE_DMR_CRE_012_SUB_ET() runs on Tester system CseSystem {
+		
+					testcase TC_CSE_DMR_RET_023_SUB() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
-						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
-						const AttributeList c_optionalAttribute := {"expirationTime"};
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template PrimitiveContent v_contentResponse;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						v_createRequest.primitiveContent.subscription.expirationTime := "20301231T012345";
-						
-						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
+						v_contentResponse.subscription := mw_contentSubscription_rc5;
+
+						v_ae1.start(f_CSE_DMR_RET_023(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase));//Subscription
 						v_ae1.done;
-						  
 					}
 					
-					testcase TC_CSE_DMR_CRE_012_SUB_ENC() runs on Tester system CseSystem {
+				} // end g_CSE_DMR_RET_023
+
+				group g_CSE_DMR_RET_024 {
+		
+					/**
+					 * @desc Check that the IUT returns successfully only child resource references of TARGET_RESOURCE_ADDRESS resource when Result Content is set to 6 (child resource references)
+					 * 
+					 */
+					testcase TC_CSE_DMR_RET_024_CNT() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
-						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
-						const AttributeList c_optionalAttribute := {"eventNotificationCriteria"};
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template PrimitiveContent v_contentResponse;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						v_createRequest.primitiveContent.subscription.eventNotificationCriteria := valueof(m_eventNotificationCriteria({int1}, -));
-						
-						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
+						v_contentResponse.container := mw_contentContainer_rc6;
+		                        
+						v_ae1.start(f_CSE_DMR_RET_024(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase));//Container
 						v_ae1.done;
-						
 					}
-					
-					testcase TC_CSE_DMR_CRE_012_SUB_EXC() runs on Tester system CseSystem {
+
+					testcase TC_CSE_DMR_RET_024_GRP() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
-						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
-						const AttributeList c_optionalAttribute := {"expirationCounter"};
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template PrimitiveContent v_contentResponse;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						v_createRequest.primitiveContent.subscription.expirationCounter := 1;
-						
-						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
+						v_contentResponse.group_ := mw_contentGroup_rc6;
+		
+						v_ae1.start(f_CSE_DMR_RET_024(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase));//Group
 						v_ae1.done;
-						
 					}
-					
-					testcase TC_CSE_DMR_CRE_012_SUB_GPI() runs on Tester system CseSystem {
+		
+					testcase TC_CSE_DMR_RET_024_ACP() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
-						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
-						const AttributeList c_optionalAttribute := {"groupID"};
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template PrimitiveContent v_contentResponse;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						v_createRequest.primitiveContent.subscription.groupID := "MyGroupID";
-						
-						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
+						v_contentResponse.accessControlPolicy := mw_contentAcp_rc6;
+			
+						v_ae1.start(f_CSE_DMR_RET_024(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase));//AccessControlPolicy
 						v_ae1.done;
-						
 					}
-					
-					testcase TC_CSE_DMR_CRE_012_SUB_NFU() runs on Tester system CseSystem {
+	
+					testcase TC_CSE_DMR_RET_024_SUB() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
-						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
-						const AttributeList c_optionalAttribute := {"notificationForwardingURI"};
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template PrimitiveContent v_contentResponse;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						v_createRequest.primitiveContent.subscription.notificationForwardingURI := "MyForwardingURI";
-						
-						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
+						v_contentResponse.subscription := mw_contentSubscription_rc6;
+
+						v_ae1.start(f_CSE_DMR_RET_024(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase));//Subscription
 						v_ae1.done;
-						
 					}
 					
-					testcase TC_CSE_DMR_CRE_012_SUB_BN() runs on Tester system CseSystem {
+				} // end g_CSE_DMR_RET_024
+
+				group g_CSE_DMR_RET_025 {
+		
+					/**
+					 * @desc Check that the IUT returns successfully only child resources of TARGET_RESOURCE_ADDRESS resource when Result Content is set to 8 (child resources)
+					 * 
+					 */
+					testcase TC_CSE_DMR_RET_025_CNT() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
-						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
-						const AttributeList c_optionalAttribute := {"batchNotify"};
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template PrimitiveContent v_contentResponse;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						v_createRequest.primitiveContent.subscription.batchNotify := {0, "PT1S"};
-						
-						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
+						v_contentResponse.container := mw_contentContainer_rc8;
+		                        
+						v_ae1.start(f_CSE_DMR_RET_025(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase));//Container
 						v_ae1.done;
 					}
-					
-					testcase TC_CSE_DMR_CRE_012_SUB_RL() runs on Tester system CseSystem {
+
+					testcase TC_CSE_DMR_RET_025_GRP() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
-						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
-						const AttributeList c_optionalAttribute := {"rateLimit"};
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template PrimitiveContent v_contentResponse;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						v_createRequest.primitiveContent.subscription.rateLimit := {0, omit};
-						
-						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
+						v_contentResponse.group_ := mw_contentGroup_rc8;
+		
+						v_ae1.start(f_CSE_DMR_RET_025(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase));//Group
 						v_ae1.done;
-						
 					}
-					
-					testcase TC_CSE_DMR_CRE_012_SUB_PSN() runs on Tester system CseSystem {
+		
+					testcase TC_CSE_DMR_RET_025_ACP() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
-						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
-						const AttributeList c_optionalAttribute := {"preSubscriptionNotify"};
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template PrimitiveContent v_contentResponse;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						v_createRequest.primitiveContent.subscription.preSubscriptionNotify := 1;
-						
-						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
+						v_contentResponse.accessControlPolicy := mw_contentAcp_rc8;
+			
+						v_ae1.start(f_CSE_DMR_RET_025(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase));//AccessControlPolicy
 						v_ae1.done;
-						
 					}
-					
-					testcase TC_CSE_DMR_CRE_012_SUB_PN() runs on Tester system CseSystem {
+			
+					testcase TC_CSE_DMR_RET_025_SUB() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
-						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
-						const AttributeList c_optionalAttribute := {"pendingNotification"};
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template PrimitiveContent v_contentResponse;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						v_createRequest.primitiveContent.subscription.pendingNotification := int1;
-						
-						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));			
+						v_contentResponse.subscription := mw_contentSubscription_rc8;
+
+						v_ae1.start(f_CSE_DMR_RET_025(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase));//Subscription
 						v_ae1.done;
 					}
 					
-					testcase TC_CSE_DMR_CRE_012_SUB_NSP() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
-						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
-						const AttributeList c_optionalAttribute := {"notificationStoragePriority"};
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.subscription.notificationStoragePriority := 1;
-						
-						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
-						v_ae1.done;
-						  
-					}
+				} // end g_CSE_DMR_RET_025
+			
+			}//end group Retrieve
+			
+			group Update {
+				group g_CSE_DMR_UPD_001 {
 					
-					testcase TC_CSE_DMR_CRE_012_SUB_LN() runs on Tester system CseSystem {
+					/**
+					 * @desc Check that the IUT updates successfully the value of the attribute ATTRIBUTE_NAME of the TARGET_RESOURCE_ADDRESS resource 
+					 * 
+					 */
+					testcase TC_CSE_DMR_UPD_001_PCH_LBL() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
-						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
-						const AttributeList c_optionalAttribute := {"latestNotify"};
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.subscription.latestNotify := true;
-						
-						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
-						v_ae1.done;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
-					}
-					
-					testcase TC_CSE_DMR_CRE_012_SUB_NCT() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
-						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
-						const AttributeList c_optionalAttribute := {"notificationContentType"};
+						var Labels v_labels_1 := {"VALUE_1"};
+						var Labels v_labels_2 := {"VALUE_2"};
+						var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
+						var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						v_createRequest.primitiveContent.subscription.notificationContentType := int1;
-						
-						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
+						v_createRequest.primitiveContent.pollingChannel.labels := v_labels_1;
+						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;
 						
+						 
+																		
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							//Check attribute 1
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.pollingChannel)) {
+									if(v_responsePrimitive.primitiveContent.pollingChannel.labels != v_labels_2){
+										setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
+									}
+								}
+							}
+						
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+	
+							//Check that the resource has been udpated correctly
+							if(ischosen(v_primitiveContentRetrieveResource.pollingChannel)) {
+								if(v_primitiveContentRetrieveResource.pollingChannel.labels != v_labels_2){
+									setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
+								}
+							}
+						}
 					}
 					
-					testcase TC_CSE_DMR_CRE_012_SUB_NEC() runs on Tester system CseSystem {
+					
+				} // end g_CSE_DMR_UPD_001
+				
+				group g_CSE_DMR_UPD_002 {
+					
+					/**
+					 * @desc Check that the IUT adds successfully the attribute ATTRIBUTE_NAME to the TARGET_RESOURCE_ADDRESS resource
+					 * 
+					 */
+					testcase TC_CSE_DMR_UPD_002_PCH_LBL() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
-						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
-						const AttributeList c_optionalAttribute := {"notificationEventCat"};
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var Labels v_labels_1 := {"VALUE_1"};
+						var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						v_createRequest.primitiveContent.subscription.notificationEventCat := {alt_1 := 100};
+						v_updateRequest.primitiveContent.pollingChannel.labels := v_labels_1;
 						
-						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
+						v_ae1.start(f_CSE_DMR_UPD_002(int15, m_createPollingChannelBase,v_updateRequest));//PollingChannel
 						v_ae1.done;
 						
+						 
+																		
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							//Check attribute 1
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.pollingChannel)) {
+									if(v_responsePrimitive.primitiveContent.pollingChannel.labels != v_labels_1){
+										setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
+									}
+								}
+							}
+							
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+							
+							//Check that the resource has been udpated correctly
+						  if(ischosen(v_primitiveContentRetrieveResource.pollingChannel)) {
+							  if(v_primitiveContentRetrieveResource.pollingChannel.labels != v_labels_1){
+										  setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
+								}
+							}
+						}
 					}
 					
-					testcase TC_CSE_DMR_CRE_012_SUB_SU() runs on Tester system CseSystem {
+				} // end g_CSE_DMR_UPD_002
+				
+				group g_CSE_DMR_UPD_003 {
+					
+					/**
+					 * @desc Check that the IUT deletes successfully the attribute ATTRIBUTE_NAME from the TARGET_RESOURCE_ADDRESS resource 
+					 * 
+					 */
+					testcase TC_CSE_DMR_UPD_003_PCH_LBL() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
-						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
-						const AttributeList c_optionalAttribute := {"subscriberURI"};
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var Labels v_labels_1 := {"VALUE_1"};
+						var Labels v_labels_2 := {"To be deleted"};
+						var AttributeAux_list v_nullFields;
+						var ResponsePrimitive v_responsePrimitive;
+						var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
+						var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						v_createRequest.primitiveContent.subscription.subscriberURI := "NotInitialized";
+						v_createRequest.primitiveContent.pollingChannel.labels := v_labels_1;
+						v_updateRequest.primitiveContent.pollingChannel.labels := v_labels_2;
+						
+						v_nullFields := {{"labels", omit}};
 						
-						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
+						v_ae1.start(f_CSE_DMR_UPD_003(int15, v_createRequest, v_updateRequest, v_nullFields));//PollingChannel
 						v_ae1.done;
 						
+						 
+																		
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							//Check attribute 1
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.pollingChannel)) {
+									if(ispresent(v_responsePrimitive.primitiveContent.pollingChannel.labels)){
+										setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly")
+									}
+								}
+							}
+							
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+							
+							//Check that the resource has been udpated correctly
+						  if(ischosen(v_primitiveContentRetrieveResource.pollingChannel)) {
+							  if(ispresent(v_primitiveContentRetrieveResource.pollingChannel.labels)) {
+								if(not(match(v_primitiveContentRetrieveResource.pollingChannel.labels,{""}))){
+								  setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly")
+								}
+							}
+						  }
+						}
 					}
 					
-					testcase TC_CSE_DMR_CRE_012_TS_ACPI() runs on Tester system CseSystem {
+				} // end g_CSE_DMR_UPD_003
+				
+				
+				group g_CSE_DMR_UPD_007{
+					
+					/**
+					 * @desc Check that the IUT responds with an error when the AE tries to update a non-RW attribute ATTRIBUTE_NAME of a TARGET_RESOURCE_ADDRESS resource
+					 * 
+					 */
+					testcase TC_CSE_DMR_UPD_007_PCH_CT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						const AttributeList c_optionalAttribute := {"accessControlPolicyIDs"};
-	
+						var Timestamp v_creationTime := "21001231T012345";
+						var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						v_createRequest.primitiveContent.timeSeries.accessControlPolicyIDs := {"NotInitialized"};
-	
-						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute));			
+						v_updateRequest.primitiveContent := {pollingChannel_update_invalid := m_contentUpdatePollingChannel_invalid};
+						v_updateRequest.primitiveContent.pollingChannel_update_invalid.creationTime := v_creationTime;
+							
+						v_ae1.start(f_CSE_DMR_UPD_007(int15, m_createPollingChannelBase, v_updateRequest));//PollingChannel
 						v_ae1.done;
+						
+						if(getverdict == pass){ 
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+							//Check that the resource has NOT been udpated
+							  if(ischosen(v_primitiveContentRetrieveResource.pollingChannel_update_invalid)) {
+							   if(v_primitiveContentRetrieveResource.pollingChannel_update_invalid.creationTime == v_creationTime){
+								 setverdict(fail, __SCOPE__ & ": Error: Creation Time attribute updated")
+								}
+							}
+						}
 					}
 					
-					testcase TC_CSE_DMR_CRE_012_TS_ET() runs on Tester system CseSystem {
+				} // end g_CSE_DMR_UPD_007			
+				
+				group g_CSE_DMR_UPD_008{
+					
+					/**
+					 * @desc Check that the IUT responds with an error when the AE tries to delete a mandatory RW attribute ATTRIBUTE_NAME of a TARGET_RESOURCE_ADDRESS resource
+					 * 
+					 */
+					testcase TC_CSE_DMR_UPD_008_PCH_ET() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						const AttributeList c_optionalAttribute := {"expirationTime"};
-	
+						var Timestamp v_expirationTime := "21001231T012345";
+						var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
+						var AttributeAux_list v_nullFields;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						v_createRequest.primitiveContent.timeSeries.expirationTime := "20301231T012345";
-	
-						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute));
+						v_nullFields := {{"expirationTime", omit}};
+						
+						v_updateRequest.primitiveContent.pollingChannel.expirationTime := v_expirationTime;
+							
+						v_ae1.start(f_CSE_DMR_UPD_008(int15, m_createPollingChannelBase, v_updateRequest, v_nullFields));//PollingChannel
 						v_ae1.done;
-	  
+						
+						if(getverdict == pass){ 
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+							  //Check that the resource has NOT been udpated
+							  if(ischosen(v_primitiveContentRetrieveResource.pollingChannel)) {
+							   if(v_primitiveContentRetrieveResource.pollingChannel.expirationTime == v_expirationTime){
+								 setverdict(fail, __SCOPE__ & ": Error: Expiration time attribute updated")
+								}
+							}
+						}
 					}
 					
-					testcase TC_CSE_DMR_CRE_012_TS_LBL() runs on Tester system CseSystem {
+				} // end g_CSE_DMR_UPD_008
+				
+				group g_CSE_DMR_UPD_009{
+					
+					/**
+					 * @desc Check that the IUT responds with an error when the AE tries to update an attribute of a  TARGET_RESOURCE_ADDRESS resource which does not exist
+					 * 
+					 */
+					testcase TC_CSE_DMR_UPD_009_PCH_EXC() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						const AttributeList c_optionalAttribute := {"labels"};
-	
+						var XSD.PositiveInteger v_expirationCounter := 1;
+						var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
+						var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						v_createRequest.primitiveContent.timeSeries.labels := {"MyLabel"};
-	
-						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute));
+						v_updateRequest.primitiveContent := {pollingChannel_update_invalid := m_contentUpdatePollingChannel_invalid};
+						
+						v_updateRequest.primitiveContent.pollingChannel_update_invalid.expirationCounter := v_expirationCounter;
+							
+						v_ae1.start(f_CSE_DMR_UPD_009(int15, v_createRequest, v_updateRequest));//PollingChannel
 						v_ae1.done;
-	
 					}
 					
-					testcase TC_CSE_DMR_CRE_012_TS_CR() runs on Tester system CseSystem { 
+				} // end g_CSE_DMR_UPD_009		
+				
+				group g_CSE_DMR_UPD_010{
+					
+					/**
+					 * @desc Check that the stateTag attribute of a RESOURCE_TYPE resource is increased when an update operation has been performed on its child resource
+					 * 
+					 */
+					testcase TC_CSE_DMR_UPD_010_CNT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var AttributeList v_optionalAttribute := {"creator"};
-	
+						var RequestPrimitive v_updateRequest := valueof(m_updateContainerBase);
+						var template RequestPrimitive v_createRequest := m_createContainerBase;
+						var Labels v_labels_1:= {"VALUE_1"};
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+						
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						v_createRequest.primitiveContent.timeSeries.creator := "NullValue";
-	
-						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, v_optionalAttribute));
-						v_ae1.done;
-	
-					}	
-					
-					testcase TC_CSE_DMR_CRE_012_TS_MNI() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						const AttributeList c_optionalAttribute := {"maxNrOfInstances"};
-	
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.timeSeries.maxNrOfInstances := 0;
-	
-						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute));
-						v_ae1.done;
-	
-					}
-
-					testcase TC_CSE_DMR_CRE_012_TS_MBS() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						const AttributeList c_optionalAttribute := {"maxByteSize"};
-	
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.timeSeries.maxByteSize := 0;
-	
-						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute));
+						
+						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;
 	
+						if(getverdict == pass){ 
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+							//Check that stateTag has been incremented
+							  if(ischosen(v_primitiveContentRetrieveResource.container)) {
+							   if(v_primitiveContentRetrieveResource.container.stateTag == 1){
+									setverdict(pass, __SCOPE__ & ": The stateTag attribute is incremented");	
+							   }else{
+									setverdict(fail, __SCOPE__ & ": Error the stateTag attribute is not incremented");
+							   }
+							}
+						}
 					}
-
-					testcase TC_CSE_DMR_CRE_012_TS_MIA() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						const AttributeList c_optionalAttribute := {"maxInstanceAge"};
-	
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.timeSeries.maxInstanceAge := 0;
 	
-						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute));
-						v_ae1.done;
-	
-					}	
+				} // end g_CSE_DMR_UPD_010		
+				
+				group g_CSE_DMR_UPD_011{
 					
-					testcase TC_CSE_DMR_CRE_012_TS_PEI() runs on Tester system CseSystem {
+					/**
+					 * @desc Check that the IUT rejects the UPDATE Request of an existing RESOURCE_TYPE resource with error “OPERATION_NOT_ALLOWED”
+					 * 
+					 */
+					testcase TC_CSE_DMR_UPD_011_CNT_CNI() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						const AttributeList c_optionalAttribute := {"periodicInterval"};
-
+						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;
+		
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						v_createRequest.primitiveContent.timeSeries.periodicInterval := 0;
+						v_updateRequest.primitiveContent.contentInstance.labels := v_labels;
 
-						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute));
+						v_ae1.start(f_CSE_DMR_UPD_011(int3, v_createParentRequest, int4, v_createChildRequest, v_updateRequest));//ContentInstance under Container
 						v_ae1.done;
 
-					}	
-					
-					testcase TC_CSE_DMR_CRE_012_TS_MDD() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						const AttributeList c_optionalAttribute := {"missingDataDetect"};
-
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.timeSeries.missingDataDetect := true;
+						if(getverdict == pass){ 
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+							//Check that the resource has NOT been udpated
+							if(ischosen(v_primitiveContentRetrieveResource.contentInstance)) {
+								if(v_primitiveContentRetrieveResource.contentInstance.labels == v_labels){
+							   		setverdict(fail, __SCOPE__ & ": Error: Labels attribute updated")
+						  		}
+							}
+						}
+					}
 
-						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute));
-						v_ae1.done;
+				} // end g_CSE_DMR_UPD_011
 
-					}	
+				group g_CSE_DMR_UPD_014 {
 					
-					testcase TC_CSE_DMR_CRE_012_TS_MDN() runs on Tester system CseSystem {
+					/**
+					 * @desc Check that the IUT updates successfully the value of the optional attribute OPTIONAL_ATTRIBUTE of the RESOURCE_TYPE resource. 
+					 * 
+					 */
+					testcase TC_CSE_DMR_UPD_014_ACP_ET() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						const AttributeList c_optionalAttribute := {"missingDataMaxNr"};
-
+						var Timestamp v_expirationTime_1 := "20301231T012345";
+						var Timestamp v_expirationTime_2 := "20401020T012345";
+						var template RequestPrimitive v_createRequest := m_createAcpBase;
+						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
+						var ResponsePrimitive v_responsePrimitive;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						v_createRequest.primitiveContent.timeSeries.missingDataMaxNr := 0;
+						v_createRequest.primitiveContent.accessControlPolicy.expirationTime := v_expirationTime_1;
+						v_updateRequest.primitiveContent.accessControlPolicy.expirationTime := v_expirationTime_2;
 
-						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute));
+						v_ae1.start(f_CSE_DMR_UPD_014(int1, v_createRequest, v_updateRequest));//ACP
 						v_ae1.done;
+						
+						 
+						
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							//Check attribute 1
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.accessControlPolicy)) {
+									if(v_responsePrimitive.primitiveContent.accessControlPolicy.expirationTime != v_expirationTime_2){
+										setverdict(fail, __SCOPE__ & ": Error: ExpirationTime attribute not updated correctly")
+									}
+								}
+							}
+						}
 
-					}	
-					
-					testcase TC_CSE_DMR_CRE_012_TS_MDT() runs on Tester system CseSystem {
+					}
+										
+					testcase TC_CSE_DMR_UPD_014_CNT_ET() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						const AttributeList c_optionalAttribute := {"missingDataDetectTimer"};
+						var Timestamp v_expirationTime_1 := "20301231T012345";
+						var Timestamp v_expirationTime_2 := "20401020T012345";
+						var ResponsePrimitive v_responsePrimitive;
 
+						var template RequestPrimitive v_createRequest := m_createContainerBase;
+						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						v_createRequest.primitiveContent.timeSeries.missingDataDetectTimer := 0;
+						v_createRequest.primitiveContent.container.expirationTime := v_expirationTime_1;
+						v_updateRequest.primitiveContent.container.expirationTime := v_expirationTime_2;
 
-						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute));
+						v_ae1.start(f_CSE_DMR_UPD_014(int3, v_createRequest, v_updateRequest));//Container
 						v_ae1.done;
+						
+						 
 
-					}	
-					
-					testcase TC_CSE_DMR_CRE_012_TS_OR() runs on Tester system CseSystem {
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							//Check attribute 1
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.container)) {
+									if(v_responsePrimitive.primitiveContent.container.expirationTime != v_expirationTime_2){
+										setverdict(fail, __SCOPE__ & ": Error: ExpirationTime attribute not updated correctly")
+									}
+								}
+							}
+						}
+					}
+										
+					testcase TC_CSE_DMR_UPD_014_CNT_OR() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						const AttributeList c_optionalAttribute := {"ontologyRef"};
+						var XSD.AnyURI v_ontologyRef_1 := "MyOntologyRef_1";
+						var XSD.AnyURI v_ontologyRef_2 := "MyOntologyRef_2";
+						var ResponsePrimitive v_responsePrimitive;
 	
+						var template RequestPrimitive v_createRequest := m_createContainerBase;
+						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						v_createRequest.primitiveContent.timeSeries.ontologyRef := "MyOntologyRef";
+						v_createRequest.primitiveContent.container.ontologyRef := v_ontologyRef_1;
+						v_updateRequest.primitiveContent.container.ontologyRef := v_ontologyRef_2;
 	
-						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute));
+						v_ae1.start(f_CSE_DMR_UPD_014(int3, v_createRequest, v_updateRequest));//Container
 						v_ae1.done;
+						
+						 
 	
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							//Check attribute 1
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.container)) {
+									if(v_responsePrimitive.primitiveContent.container.ontologyRef != v_ontologyRef_2){
+										setverdict(fail, __SCOPE__ & ": Error: OntologyRef attribute not updated correctly")
+									}
+								}
+							}
+						}
 					}
 					
-					testcase TC_CSE_DMR_CRE_012_TSI_ET() runs on Tester system CseSystem {
+					testcase TC_CSE_DMR_UPD_014_SUB_ACPI() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
-						const AttributeList c_optionalAttribute := {"expirationTime"};
-
+						var AcpType v_accessControlPolicyIDs_1 := {"NotInitialized_1"};
+						var AcpType v_accessControlPolicyIDs_2 := {"NotInitialized_2"};
+						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
+						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
+						var ResponsePrimitive v_responsePrimitive;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						v_createRequest.primitiveContent.timeSeriesInstance.expirationTime := "20301231T012345";
+						v_createRequest.primitiveContent.subscription.accessControlPolicyIDs := v_accessControlPolicyIDs_1;
+						v_updateRequest.primitiveContent.subscription.accessControlPolicyIDs := v_accessControlPolicyIDs_2;
 
-						v_ae1.start(f_CSE_DMR_CRE_012(int30, v_createRequest, c_optionalAttribute));
+						v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription
 						v_ae1.done;
-  
+						
+						 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							//Check attribute 1
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
+									if(v_responsePrimitive.primitiveContent.subscription.accessControlPolicyIDs != v_accessControlPolicyIDs_2){
+										setverdict(fail, __SCOPE__ & ": Error: AccessControlPolicyIDs attribute not updated correctly")
+									}
+								}
+							}
+						}
+
 					}
 					
-					testcase TC_CSE_DMR_CRE_012_TSI_LBL() runs on Tester system CseSystem {
+					testcase TC_CSE_DMR_UPD_014_SUB_BN() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
-						const AttributeList c_optionalAttribute := {"labels"};
-	
+						var BatchNotify v_batchNotify_1 := {1, "PT1S"};
+						var BatchNotify v_batchNotify_2 := {2, "PT1S"};
+						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
+						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
+						var ResponsePrimitive v_responsePrimitive;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						v_createRequest.primitiveContent.timeSeriesInstance.labels := {"MyLabel"};
-	
-						v_ae1.start(f_CSE_DMR_CRE_012(int30, v_createRequest, c_optionalAttribute));
+						v_createRequest.primitiveContent.subscription.batchNotify := v_batchNotify_1;
+						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;
-	
+						
+						 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							//Check attribute 1
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
+									if(v_responsePrimitive.primitiveContent.subscription.batchNotify != v_batchNotify_2){
+										setverdict(fail, __SCOPE__ & ": Error: EventNotificationCriteria attribute not updated correctly")
+									}
+								}
+							}
+						}
+
 					}
 					
-					testcase TC_CSE_DMR_CRE_012_TSI_SNR() runs on Tester system CseSystem {
+					testcase TC_CSE_DMR_UPD_014_SUB_ENC() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
-						const AttributeList c_optionalAttribute := {"labels"};
-
+						
+						var EventNotificationCriteria v_eventNotificationCriteria_1 := valueof(m_eventNotificationCriteria({int1}, -));
+						var EventNotificationCriteria v_eventNotificationCriteria_2 := valueof(m_eventNotificationCriteria({int2}, -));
+						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
+						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
+						var ResponsePrimitive v_responsePrimitive;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						v_createRequest.primitiveContent.timeSeriesInstance.sequenceNr := 0;
+						v_createRequest.primitiveContent.subscription.eventNotificationCriteria := v_eventNotificationCriteria_1;
+						v_updateRequest.primitiveContent.subscription.eventNotificationCriteria := v_eventNotificationCriteria_2;
 
-						v_ae1.start(f_CSE_DMR_CRE_012(int30, v_createRequest, c_optionalAttribute));
+						v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription
 						v_ae1.done;
+						
+						 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							//Check attribute 1
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
+									if(v_responsePrimitive.primitiveContent.subscription.eventNotificationCriteria != v_eventNotificationCriteria_2){
+										setverdict(fail, __SCOPE__ & ": Error: EventNotificationCriteria attribute not updated correctly")
+									}
+								}
+							}
+						}
 
 					}
-				
-				}// end group g_CSE_DMR_CRE_012	
-				
-				group g_CSE_DMR_CRE_013 {
 					
-					/**
-					 * @desc Check that the IUT rejects the CREATE Request of a RESOURCE_TYPE resource with error “NOT_ACCEPTABLE” when contentSize exceeds maxByteSize of the PARENT_RESOURCE_TYPE
-					 * 
-					 */
-					testcase TC_CSE_DMR_CRE_013_CNT_CIN() runs on Tester system CseSystem {
-						// Local variables		
-						var template RequestPrimitive v_createRequestContainer := m_createContainerBase;
-						var template RequestPrimitive v_createRequestContentInstance := m_createContentInstanceBase;
-						const integer c_maxByteSize := 1;		
+					testcase TC_CSE_DMR_UPD_014_SUB_ET() runs on Tester system CseSystem {
+						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-		
+						
+						var Timestamp v_expirationTime_1 := "20301231T012345";
+						var Timestamp v_expirationTime_2 := "20401020T012345";
+						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
+						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
+						var ResponsePrimitive v_responsePrimitive;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						v_createRequestContainer.primitiveContent.container.maxByteSize := c_maxByteSize;
+						v_createRequest.primitiveContent.subscription.expirationTime := v_expirationTime_1;
+						v_updateRequest.primitiveContent.subscription.expirationTime := v_expirationTime_2;
 
-						v_ae1.start(f_CSE_DMR_CRE_013(int3, v_createRequestContainer, int4, v_createRequestContentInstance));//ContentInstance under Container
+						v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription
 						v_ae1.done;
-					}
+						
+						 
 
-					testcase TC_CSE_DMR_CRE_013_TS_TSI() runs on Tester system CseSystem {
-						//Local variables		
-						var template RequestPrimitive v_createRequestTimeSeries := m_createTimeSeriesBase;
-						var template RequestPrimitive v_createRequestTimeSeriesInstance := m_createTimeSeriesInstanceBase;
-						const integer c_maxByteSize := 1;		
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequestTimeSeries.primitiveContent.timeSeries.maxByteSize := c_maxByteSize;
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							//Check attribute 1
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
+									if(v_responsePrimitive.primitiveContent.subscription.expirationTime != v_expirationTime_2){
+										setverdict(fail, __SCOPE__ & ": Error: ExpirationTime attribute not updated correctly")
+									}
+								}
+							}
+						}
 
-						v_ae1.start(f_CSE_DMR_CRE_013(int29, v_createRequestTimeSeries, int30, v_createRequestTimeSeriesInstance));//TimeSeriesInstance under TimeSeries
-						v_ae1.done;
 					}
-
-				}// end group g_CSE_DMR_CRE_013
-				
-				group g_CSE_DMR_CRE_014 {
-				
-					/**
-					 * @desc Check that the IUT updates the currentByteSize attribute in a PARENT_RESOURCE_TYPE when a new RESOURCE_TYPE is created. 
-					 * 
-					 */
-					testcase TC_CSE_DMR_CRE_014_TS_TSI() runs on Tester system CseSystem {
+					
+					testcase TC_CSE_DMR_UPD_014_SUB_EXC() runs on Tester system CseSystem {
 						// Local variables
-						var template RequestPrimitive v_parentResourceRequest := m_createTimeSeriesBase;
-						var template RequestPrimitive v_childResourceRequest := m_createTimeSeriesInstanceBase;//Default content: "AnyValue" (8 bytes length)
-						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						const integer c_maxByteSize := 512;	
-		
+						
+						var XSD.PositiveInteger v_expirationCounter_1 := 10;
+						var XSD.PositiveInteger v_expirationCounter_2 := 20;
+						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
+						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
+						var ResponsePrimitive v_responsePrimitive;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						v_parentResourceRequest.primitiveContent.timeSeries.maxByteSize := c_maxByteSize;
-		
-						v_ae1.start(f_CSE_DMR_CRE_014(int29, v_parentResourceRequest, int30, v_childResourceRequest));		
+						v_createRequest.primitiveContent.subscription.expirationCounter := v_expirationCounter_1;
+						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;
-		
-					}
-				
-				}// end group g_CSE_DMR_CRE_014
+						
+						 
 
-				group g_CSE_DMR_CRE_015 {
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							//Check attribute 1
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
+									if(v_responsePrimitive.primitiveContent.subscription.expirationCounter != v_expirationCounter_2){
+										setverdict(fail, __SCOPE__ & ": Error: ExpirationCounter attribute not updated correctly")
+									}
+								}
+							}
+						}
+
+					}
 					
-					/**
-					 * @desc Check that the IUT returns successfully after a CREATE request an empty content of created resource when the ResultContent set to 0 (Nothing)
-					 * 
-					 */
-					testcase TC_CSE_DMR_CRE_015_CNT() runs on Tester system CseSystem {
+					testcase TC_CSE_DMR_UPD_014_SUB_GPI() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var XSD.AnyURI v_groupID_1 := "MyGroupID_1";
+						var XSD.AnyURI v_groupID_2 := "MyGroupID_2";
+						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
+						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
+						var ResponsePrimitive v_responsePrimitive;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						                        
-						v_ae1.start(f_CSE_DMR_CRE_015(int3, m_createContainerBase));//Container
+						v_createRequest.primitiveContent.subscription.groupID := v_groupID_1;
+						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;
-					}
+						
+						 
 
-					testcase TC_CSE_DMR_CRE_015_GRP() runs on Tester system CseSystem {
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							//Check attribute 1
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
+									if(v_responsePrimitive.primitiveContent.subscription.groupID != v_groupID_2){
+										setverdict(fail, __SCOPE__ & ": Error: GroupID attribute not updated correctly")
+									}
+								}
+							}
+						}
+
+					}
+					
+					testcase TC_CSE_DMR_UPD_014_SUB_LN() runs on Tester system CseSystem {
 						// Local variables
-						
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var XSD.Boolean v_latestNotify_1 := true;
+						var XSD.Boolean v_latestNotify_2 := false;
+						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
+						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
+						var ResponsePrimitive v_responsePrimitive;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						                        
-						v_ae1.start(f_CSE_DMR_CRE_015(int9, m_createGroupBase));//Group
+						v_createRequest.primitiveContent.subscription.latestNotify := v_latestNotify_1;
+						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;
+						
+						 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							//Check attribute 1
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
+									if(v_responsePrimitive.primitiveContent.subscription.latestNotify != v_latestNotify_2){
+										setverdict(fail, __SCOPE__ & ": Error: LatestNotify attribute not updated correctly")
+									}
+								}
+							}
+						}
+
 					}
 					
-					testcase TC_CSE_DMR_CRE_015_ACP() runs on Tester system CseSystem {
+					testcase TC_CSE_DMR_UPD_014_SUB_NCT() runs on Tester system CseSystem {
 						// Local variables
-							
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					
+						var NotificationContentType v_notificationContentType_1 := int1;
+						var NotificationContentType v_notificationContentType_2 := int2;
+						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
+						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
+						var ResponsePrimitive v_responsePrimitive;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						                        
-						v_ae1.start(f_CSE_DMR_CRE_015(int1, m_createAcpBase));//AccessControlPolicy
+						v_createRequest.primitiveContent.subscription.notificationContentType := v_notificationContentType_1;
+						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;
+						
+						 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							//Check attribute 1
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
+									if(v_responsePrimitive.primitiveContent.subscription.notificationContentType != v_notificationContentType_2){
+										setverdict(fail, __SCOPE__ & ": Error: NotificationContentType attribute not updated correctly")
+									}
+								}
+							}
+						}
+
 					}
-				
-					testcase TC_CSE_DMR_CRE_015_SCH() runs on Tester system CseSystem {
+					
+					testcase TC_CSE_DMR_UPD_014_SUB_NEC() runs on Tester system CseSystem {
 						// Local variables
-							
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var EventCat v_notificationEventCat_1 := {alt_1 := 100};
+						var EventCat v_notificationEventCat_2 := {alt_1 := 101};
+						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
+						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
+						var ResponsePrimitive v_responsePrimitive;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						                        
-						v_ae1.start(f_CSE_DMR_CRE_015(int18, m_createScheduleBase));//Schedule
+						v_createRequest.primitiveContent.subscription.notificationEventCat := v_notificationEventCat_1;
+						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;
+						
+						 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							//Check attribute 1
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
+									if(v_responsePrimitive.primitiveContent.subscription.notificationEventCat != v_notificationEventCat_2){
+										setverdict(fail, __SCOPE__ & ": Error: NotificationEventCat attribute not updated correctly")
+									}
+								}
+							}
+						}
+
 					}
 					
-					testcase TC_CSE_DMR_CRE_015_PCH() runs on Tester system CseSystem {
+					testcase TC_CSE_DMR_UPD_014_SUB_NFU() runs on Tester system CseSystem {
 						// Local variables
-							
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var XSD.AnyURI v_notificationForwardingURI_1 := "MyForwardingURI_1";
+						var XSD.AnyURI v_notificationForwardingURI_2 := "MyForwardingURI_2";
+						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
+						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
+						var ResponsePrimitive v_responsePrimitive;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						                        
-						v_ae1.start(f_CSE_DMR_CRE_015(int15, m_createPollingChannelBase));//PollingChannel
+						v_createRequest.primitiveContent.subscription.notificationForwardingURI := v_notificationForwardingURI_1;
+						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;
+						
+						 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							//Check attribute 1
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
+									if(v_responsePrimitive.primitiveContent.subscription.notificationForwardingURI != v_notificationForwardingURI_2){
+										setverdict(fail, __SCOPE__ & ": Error: NotificationForwardingURI attribute not updated correctly")
+									}
+								}
+							}
+						}
+
 					}
 					
-					testcase TC_CSE_DMR_CRE_015_SUB() runs on Tester system CseSystem {
+					testcase TC_CSE_DMR_UPD_014_SUB_NSP() runs on Tester system CseSystem {
 						// Local variables
-						
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var XSD.PositiveInteger v_notificationStoragePriority_1 := 1;
+						var XSD.PositiveInteger v_notificationStoragePriority_2 := 2;
+						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
+						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
+						var ResponsePrimitive v_responsePrimitive;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						                        
-						v_ae1.start(f_CSE_DMR_CRE_015(int23, m_createSubscriptionBase));//Subscription
+						v_createRequest.primitiveContent.subscription.notificationStoragePriority := v_notificationStoragePriority_1;
+						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;
-					}
-				
-				} // end g_CSE_DMR_CRE_015							
+						
+						 
 
-				group g_CSE_DMR_CRE_016 {
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							//Check attribute 1
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
+									if(v_responsePrimitive.primitiveContent.subscription.notificationStoragePriority != v_notificationStoragePriority_2){
+										setverdict(fail, __SCOPE__ & ": Error: NotificationStoragePriority attribute not updated correctly")
+									}
+								}
+							}
+						}
+
+					}
 					
-					/**
-					 * @desc Check that the IUT returns successfully after a CREATE request only hierarchichal address of the created resource when the Result Content is set to 2 (hierarchical address)
-					 * 
-					 */
-					testcase TC_CSE_DMR_CRE_016_CNT() runs on Tester system CseSystem {
+					testcase TC_CSE_DMR_UPD_014_SUB_PN() runs on Tester system CseSystem {
 						// Local variables
-						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var PendingNotification v_pendingNotification_1 := int1;
+						var PendingNotification v_pendingNotification_2 := int2;
+						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
+						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
+						var ResponsePrimitive v_responsePrimitive;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-					
-						v_contentResponse.uRI := mw_contentContainer_rc2;
-					                        
-						v_ae1.start(f_CSE_DMR_CRE_016(int3, m_createContainerBase, v_contentResponse));//Container
-						v_ae1.done;
-					}
+						v_createRequest.primitiveContent.subscription.pendingNotification := v_pendingNotification_1;
+						v_updateRequest.primitiveContent.subscription.pendingNotification := v_pendingNotification_2;
 
-					testcase TC_CSE_DMR_CRE_016_GRP() runs on Tester system CseSystem {
-						// Local variables
-						var template PrimitiveContent v_contentResponse;
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-					
-						v_contentResponse.uRI := mw_contentGroup_rc2;
-					
-						v_ae1.start(f_CSE_DMR_CRE_016(int9, m_createGroupBase, v_contentResponse));//Group
-						v_ae1.done;
-					}
-					
-					testcase TC_CSE_DMR_CRE_016_ACP() runs on Tester system CseSystem {
-						// Local variables
-						var template PrimitiveContent v_contentResponse;
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-											
-						v_contentResponse.uRI := mw_contentAcp_rc2;
-						
-						v_ae1.start(f_CSE_DMR_CRE_016(int1, m_createAcpBase,v_contentResponse));//AccessControlPolicy
-						v_ae1.done;
-					}
-				
-					testcase TC_CSE_DMR_CRE_016_SCH() runs on Tester system CseSystem {
-						// Local variables
-						var template PrimitiveContent v_contentResponse;
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription
 						v_ae1.done;
-											
-						v_contentResponse.uRI := mw_contentSchedule_rc2;
 						
-						v_ae1.start(f_CSE_DMR_CRE_016(int18, m_createScheduleBase, v_contentResponse));//Schedule
-						v_ae1.done;
+						 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							//Check attribute 1
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
+									if(v_responsePrimitive.primitiveContent.subscription.pendingNotification != v_pendingNotification_2){
+										setverdict(fail, __SCOPE__ & ": Error: PendingNotification attribute not updated correctly")
+									}
+								}
+							}
+						}
+
 					}
 					
-					testcase TC_CSE_DMR_CRE_016_PCH() runs on Tester system CseSystem {
+					testcase TC_CSE_DMR_UPD_014_SUB_RL() runs on Tester system CseSystem {
 						// Local variables
-						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-											
-						v_contentResponse.uRI := mw_contentPollingChannel_rc2;
 						
-						v_ae1.start(f_CSE_DMR_CRE_016(int15, m_createPollingChannelBase, v_contentResponse));//PollingChannel
-						v_ae1.done;
-					}
-					
-					testcase TC_CSE_DMR_CRE_016_SUB() runs on Tester system CseSystem {
-						// Local variables
-						var template PrimitiveContent v_contentResponse;
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var RateLimit v_rateLimit_1 := {0, omit};
+						var RateLimit v_rateLimit_2 := {1, omit};
+						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
+						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
+						var ResponsePrimitive v_responsePrimitive;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-											
-						v_contentResponse.uRI := mw_contentSubscription_rc2;
+						v_createRequest.primitiveContent.subscription.rateLimit := v_rateLimit_1;
+						v_updateRequest.primitiveContent.subscription.rateLimit := v_rateLimit_2;
 
-						v_ae1.start(f_CSE_DMR_CRE_016(int23, m_createSubscriptionBase, v_contentResponse));//Subscription
+						v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription
 						v_ae1.done;
-					}
-					
-					testcase TC_CSE_DMR_CRE_016_TS() runs on Tester system CseSystem {
-						// Local variables
-						var template PrimitiveContent v_contentResponse;
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.uRI := mw_contentTimeSeries_rc2;
+						 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							//Check attribute 1
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
+									if(v_responsePrimitive.primitiveContent.subscription.rateLimit != v_rateLimit_2){
+										setverdict(fail, __SCOPE__ & ": Error: RateLimit attribute not updated correctly")
+									}
+								}
+							}
+						}
 
-						v_ae1.start(f_CSE_DMR_CRE_016(int29, m_createTimeSeriesBase, v_contentResponse));//TimeSeries
-						v_ae1.done;
 					}
-				
-				} // end g_CSE_DMR_CRE_016	
-							
-				group g_CSE_DMR_CRE_017 {
 					
+	
+				} // end g_CSE_DMR_UPD_014
+
+			}//end group Update
+			
+			group Delete {
+			
+				group g_CSE_DMR_DEL_001{
+
 					/**
-					 * @desc Check that the IUT returns successfully after a CREATE request only attributes and hierarchichal address of the created resource when Result Content is set 3 (attributes and hierarchichal address)
+					 * @desc Check that the IUT accepts the deletion of a RESOURCE_TYPE resource
 					 * 
 					 */
-					testcase TC_CSE_DMR_CRE_017_CNT() runs on Tester system CseSystem {
-						// Local variables
-						var template PrimitiveContent v_contentResponse;
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-					
-						v_contentResponse.resource := mw_contentContainer_rc3;
-					                        
-						v_ae1.start(f_CSE_DMR_CRE_017(int3, m_createContainerBase, v_contentResponse));//Container
-						v_ae1.done;
-					}
-
-					testcase TC_CSE_DMR_CRE_017_GRP() runs on Tester system CseSystem {
+					testcase TC_CSE_DMR_DEL_001_PCH() runs on Tester system CseSystem {
 						// Local variables
-						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-					
-						v_contentResponse.resource := mw_contentGroup_rc3;
-					
-						v_ae1.start(f_CSE_DMR_CRE_017(int9, m_createGroupBase, v_contentResponse));//Group
-						v_ae1.done;
-					}
-					
-					testcase TC_CSE_DMR_CRE_017_ACP() runs on Tester system CseSystem {
-						// Local variables
-						var template PrimitiveContent v_contentResponse;
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+                
+						v_ae1.start(f_CSE_DMR_DEL_001(int15, m_createPollingChannelBase));//PollingChannel
 						v_ae1.done;
+					};
 					
-						v_contentResponse.resource := mw_contentAcp_rc3;
-						
-						v_ae1.start(f_CSE_DMR_CRE_017(int1, m_createAcpBase,v_contentResponse));//AccessControlPolicy
-						v_ae1.done;
-					}
+				};//end of group g_CSE_DMR_DEL_001
+                
+                
+			}//end group Delete
+			
+		}//end group Data_Management_and_Repository
+		
+		group Location {
+		  		    
+		  
+		}//end group Location
+		
+		group Subscription_And_Notification {
+	
+			group Create {
+				
+				group g_CSE_SUB_CRE_001 {
 				
-					testcase TC_CSE_DMR_CRE_017_SCH() runs on Tester system CseSystem {
+					/**
+					 * @desc Check that the IUT rejects the creation of the <subscription> resource when the target subscribed-to RESOURCE_TYPE resource is not subscribable. 
+					 * 
+					 */
+					testcase TC_CSE_SUB_CRE_001_CIN() runs on Tester system CseSystem {
 						// Local variables
-						var template PrimitiveContent v_contentResponse;
+						var template RequestPrimitive v_parentResourceRequest := m_createContainerBase;
+						var template RequestPrimitive v_childResourceRequest := m_createContentInstanceBase;
+						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						const XSD.String c_content := "Random Value";	
+
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-					
-						v_contentResponse.resource := mw_contentSchedule_rc3;
-						
-						v_ae1.start(f_CSE_DMR_CRE_017(int18, m_createScheduleBase, v_contentResponse));//Schedule
+						v_childResourceRequest.primitiveContent.contentInstance.content := "Random Value";
+
+						v_ae1.start(f_CSE_SUB_CRE_001(int3, v_parentResourceRequest, int4, v_childResourceRequest));		
 						v_ae1.done;
 					}
 					
-					testcase TC_CSE_DMR_CRE_017_PCH() runs on Tester system CseSystem {
+					testcase TC_CSE_SUB_CRE_001_SUB() runs on Tester system CseSystem {
 						// Local variables
-						var template PrimitiveContent v_contentResponse;
+						var template RequestPrimitive v_parentResourceRequest := m_createSubscriptionBase;
+						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-					
-						v_contentResponse.resource := mw_contentPollingChannel_rc3;
-						
-						v_ae1.start(f_CSE_DMR_CRE_017(int15, m_createPollingChannelBase, v_contentResponse));//PollingChannel
+						v_ae1.start(f_CSE_SUB_CRE_001(int23, v_parentResourceRequest, int23, v_parentResourceRequest));		
 						v_ae1.done;
 					}
 					
-					testcase TC_CSE_DMR_CRE_017_SUB() runs on Tester system CseSystem {
+					testcase TC_CSE_SUB_CRE_001_TSI() runs on Tester system CseSystem {
 						// Local variables
-						var template PrimitiveContent v_contentResponse;
+						var template RequestPrimitive v_parentResourceRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_childResourceRequest := m_createTimeSeriesInstanceBase;
+						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						const XSD.String c_content := "Random Value";	
+	
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-					
-						v_contentResponse.resource := mw_contentSubscription_rc3;
-
-						v_ae1.start(f_CSE_DMR_CRE_017(int23, m_createSubscriptionBase, v_contentResponse));//Subscription
+						v_childResourceRequest.primitiveContent.timeSeriesInstance.content := "Random Value";
+	
+						v_ae1.start(f_CSE_SUB_CRE_001(int29, v_parentResourceRequest, int30, v_childResourceRequest));		
 						v_ae1.done;
 					}
-					
-					testcase TC_CSE_DMR_CRE_017_TS() runs on Tester system CseSystem {
-						// Local variables
-						var template PrimitiveContent v_contentResponse;
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.resource := mw_contentTimeSeries_rc3;
 
-						v_ae1.start(f_CSE_DMR_CRE_017(int29, m_createTimeSeriesBase, v_contentResponse));//TimeSeries
-						v_ae1.done;
-					}
+				}// end group g_CSE_DMR_CRE_014
 				
-				} // end g_CSE_DMR_CRE_017
+			}//end group Create
+			
+			group Notify{
 				
-				group g_CSE_DMR_CRE_019 {
+				/**
+				 * @desc Check that the IUT rejects the creation of the <subscription> resource when the notificationURI is not the originator and the IUT have received the Notify response containing Response Status Code indicating SUBSCRIPTION_CREATOR_HAS_NO_PRIVILEGE 
+				 * 
+				 */
+				testcase TC_CSE_SUB_NTF_001() runs on Tester system CseSystem {
 					
-					testcase TC_CSE_DMR_CRE_019_CNTA_AEA() runs on Tester system CseSystem {
-						// Local variables
-						var template RequestPrimitive v_createRequest := m_createContainerAnncBase;
-						var ResponsePrimitive v_responsePrimitive;
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-	
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						v_createRequest.primitiveContent.containerAnnc.resourceName := omit;
-						v_cse1.start(f_CSE_DMR_CRE_019(int10003, v_createRequest));//ContainerAnnc
-						v_cse1.done;
-
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_cse1);
-							if(not ispresent(v_responsePrimitive.primitiveContent.containerAnnc.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
-							}
-						}		
-					}
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+														
+					v_ae1.start(f_CSE_SUB_NTF_001());
+											  	  	
+					v_ae1.done;
+											  	  		
+				}
+													
+				function f_CSE_SUB_NTF_001() runs on AeSimu {
+					// Local variables
+					var MsgIn v_response;
+					var integer v_aeIndex := -1;
+					var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
+					var RequestPrimitive v_request;
+					var integer v_ae2Index := -1;
+						
+					// Test control
 
-					testcase TC_CSE_DMR_CRE_019_GRPA_AEA() runs on Tester system CseSystem {
-						// Local variables
-						var template RequestPrimitive v_createRequest := m_createGroupAnncBase;
-						var ResponsePrimitive v_responsePrimitive;
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+					// Test component configuration
+					f_cf01Up(true);
+										
+					// Test adapter configuration
 
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						v_createRequest.primitiveContent.groupAnnc.resourceName := omit;
-						v_cse1.start(f_CSE_DMR_CRE_019(int10009, v_createRequest));//GroupAnnc
-						v_cse1.done;
-
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_cse1);
-							if(not ispresent(v_responsePrimitive.primitiveContent.groupAnnc.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
-							}
-						}		
+					// Preamble
+					v_aeIndex := f_cse_preamble_registerAe(omit,omit);//c_CUDNDi);
+					
+					f_cse_preamble_subscriptionVerification(v_ae2Index, v_createRequest, int23, int4101);
+						
+					// Test Body
+					v_request := f_getCreateRequestPrimitive(int23, v_createRequest, v_aeIndex);//Subscription 
+					
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
+					
+					tc_ac.start;
+					alt {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int4101))) -> value v_response { //SUBSCRIPTION_CREATOR_HAS_NO_PRIVILEGE 
+							tc_ac.stop;
+							setverdict(pass, __SCOPE__ & ": OK : Subscription creator has no privilege");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Wrong response status code");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Subscription successful whereas Subscription creator has no privilege");
+						}
+						[] tc_ac.timeout {
+							setverdict(fail, __SCOPE__ & ": No answer while creating resource");
+						}
 					}
 
-					testcase TC_CSE_DMR_CRE_019_ACPA_AEA() runs on Tester system CseSystem {
-						// Local variables
-						var template RequestPrimitive v_createRequest := m_createAcpAnncBase;
-						var ResponsePrimitive v_responsePrimitive;
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						v_createRequest.primitiveContent.accessControlPolicyAnnc.resourceName := omit;
-						v_cse1.start(f_CSE_DMR_CRE_019(int10001, v_createRequest));//AccessControlPolicyAnnc
-						v_cse1.done;
-
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_cse1);
-							if(not ispresent(v_responsePrimitive.primitiveContent.accessControlPolicyAnnc.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
-							}
-						}		
+					f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
+    					
+					//Check to see if the resource is NOT present
+					if(f_cse_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
+					  setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
+					} else {
+					  setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
 					}
-					
-					testcase TC_CSE_DMR_CRE_019_TSA_AEA() runs on Tester system CseSystem {
-						// Local variables
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesAnncBase;
-						var ResponsePrimitive v_responsePrimitive;
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						v_createRequest.primitiveContent.timeSeriesAnnc.resourceName := omit;
-						v_cse1.start(f_CSE_DMR_CRE_019(int10029, v_createRequest));//TimeSeriesAnnc
-						v_cse1.done;
+					//Postamble
+					f_cse_postamble_deleteResources();
 
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_cse1);
-							if(not ispresent(v_responsePrimitive.primitiveContent.timeSeriesAnnc.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
-							}
-						}		
-					}
-					
-				} //end g_CSE_DMR_CRE_019
+					//Tear down
+					f_cf01Down();
+
+				} // end TC_CSE_SUB_NTF_001
 				
-				group g_CSE_DMR_CRE_020 {
+				/**
+				 * @desc Check that the IUT rejects the creation of the <subscription> resource when the notificationURI is not the originator and the IUT have received the Notify response containing Response Status Code indicating SUBSCRIPTION_HOST_HAS_NO_PRIVILEGE
+				 * 
+				 */
+				testcase TC_CSE_SUB_NTF_002() runs on Tester system CseSystem {
 					
-					/**
-					 * @desc Check that the IUT accepts the creation of a RESOURCE_TYPE resource with the optional attribute announceTo provided
-					 * 
-					 */
-					testcase TC_CSE_DMR_CRE_020_ACP() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
-						var template RequestPrimitive v_createRequest := m_createAcpBase;
-						
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
-						                    
-						v_ae1.start(f_CSE_DMR_CRE_020(int1, v_createRequest, mw_createAccessControlPolicyAnnc));//AccessControlPolicy
-						v_ae1.done;
-					}
-
-					testcase TC_CSE_DMR_CRE_020_CNT() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
-						var template RequestPrimitive v_createRequest := m_createContainerBase;
+															
+					v_ae1.start(f_CSE_SUB_NTF_002());
+												  	  	
+					v_ae1.done;
+												  	  		
+				}
+														
+				function f_CSE_SUB_NTF_002() runs on AeSimu {
+					// Local variables
+					var MsgIn v_response;
+					var integer v_aeIndex := -1;
+					var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
+					var RequestPrimitive v_request;
+					var integer v_ae2Index := -1;
 						
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
-					
-						v_ae1.start(f_CSE_DMR_CRE_020(int3, v_createRequest, mw_createContainerAnnc));//Container
-						v_ae1.done;
-					}
+					// Test control
+
+					// Test component configuration
+					f_cf01Up(true);
+										
+					// Test adapter configuration
+
+					// Preamble
+					v_aeIndex := f_cse_preamble_registerAe(omit,omit);//c_CUDNDi);
 					
-					testcase TC_CSE_DMR_CRE_020_CIN() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
-						
-						v_ae1.start(f_CSE_DMR_CRE_020(int4, v_createRequest, mw_createContentInstanceAnnc));//ContentInstance
-						v_ae1.done;
-					}
-				
-					testcase TC_CSE_DMR_CRE_020_GRP() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
-						var template RequestPrimitive v_createRequest := m_createGroupBase;
-						
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
+					f_cse_preamble_subscriptionVerification(v_ae2Index, v_createRequest, int23, int5205);
 						
-						v_ae1.start(f_CSE_DMR_CRE_020(int9, v_createRequest, mw_createGroupAnnc));//Group
-						v_ae1.done;
-					}
+					// Test Body
+					v_request := f_getCreateRequestPrimitive(int23, v_createRequest, v_aeIndex);//Subscription 
 					
-					testcase TC_CSE_DMR_CRE_020_LCP() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
-						var template RequestPrimitive v_createRequest := m_createLocationPolicy(int1, omit, omit, omit, omit);
-						
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.locationPolicy.announceTo := {PX_CSE1_ID};
-						
-						v_ae1.start(f_CSE_DMR_CRE_020(int10, v_createRequest, mw_createLocationPolicyAnnc));//LocationPolicy
-						v_ae1.done;
-					}
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 					
-					testcase TC_CSE_DMR_CRE_020_MGO() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
-						var template RequestPrimitive v_createRequest := m_createMgmtObjBase;
-						
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.mgmtResource.announceTo := {PX_CSE1_ID};
+					tc_ac.start;
+					alt {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int5205))) -> value v_response { //SUBSCRIPTION_CREATOR_HAS_NO_PRIVILEGE 
+							tc_ac.stop;
+							setverdict(pass, __SCOPE__ & ": OK : Subscription creator has no privilege");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Wrong response status code");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Subscription successful whereas Subscription creator has no privilege");
+						}
+						[] tc_ac.timeout {
+							setverdict(fail, __SCOPE__ & ": No answer while creating resource");
+						}
+					}
 
-						v_ae1.start(f_CSE_DMR_CRE_020(int13, v_createRequest, mw_createMgmtObjAnnc));//MgmtObj
-						v_ae1.done;
+					f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
+    					
+					//Check to see if the resource is NOT present
+					if(f_cse_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
+					  setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
+					} else {
+					  setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
 					}
+
+					//Postamble
+					f_cse_postamble_deleteResources();
+
+					//Tear down
+					f_cf01Down();
+
+				} // end TC_CSE_SUB_NTF_002
+				
+				/**
+				 * @desc Check that the IUT sends aggregated notification to the subscriber resource when the duration value of the batchNotify attribute is set to TIME_LIMIT and when this timer expires
+				 * 
+				 */
+				testcase TC_CSE_SUB_NTF_003() runs on Tester system CseSystem {
 					
-					testcase TC_CSE_DMR_CRE_020_NOD() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
-						var template RequestPrimitive v_createRequest := m_createNodeBase;
-						
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						v_createRequest.primitiveContent.node.announceTo := {PX_CSE1_ID};
-						
-						v_ae1.start(f_CSE_DMR_CRE_020(int14, v_createRequest, mw_createNodeAnnc));//Node
-						v_ae1.done;
-					}
+															
+					v_ae1.start(f_CSE_SUB_NTF_003());
+												  	  	
+					v_ae1.done;
+												  	  		
+				}
+														
+				function f_CSE_SUB_NTF_003() runs on AeSimu {
+					// Local variables
+					timer t_batchNotificationTimer := PX_TAC * 2.0;
+					var float v_elapsedTime;
+					const integer c_numberOfAggregatedNotification := 2;
+					var Labels v_labels_1:= {"VALUE_1"};
+					var Labels v_labels_2:= {"VALUE_2"};
+					var integer v_aeIndex := -1;
+					var integer v_resourceIndex := -1;
+					var template RequestPrimitive v_createRequest := omit;
+					var template PrimitiveContent v_contentResponse;
+					var template RequestPrimitive v_updateRequest := m_updateAeBase;
+					var RequestPrimitive v_request;
+					var integer v_ae2Index := -1;
 					
-					testcase TC_CSE_DMR_CRE_020_SCH() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
-						var template RequestPrimitive v_createRequest := m_createScheduleBase;
-						
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.schedule.announceTo := {PX_CSE1_ID};
+					v_contentResponse.aE := mw_contentAeBase; // all attributes expected   
 
-						v_ae1.start(f_CSE_DMR_CRE_020(int18, v_createRequest, mw_createScheduleAnnc));//Schedule
-						v_ae1.done;
-					}
+					// Test control
+
+					// Test component configuration
+					f_cf01Up(true);
+
+					// Test adapter configuration
+
+					// Preamble
+					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
 					
-					testcase TC_CSE_DMR_CRE_020_TS() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-	
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.timeSeries.announceTo := {f_getCompletePoA()};
-	
-						v_ae1.start(f_CSE_DMR_CRE_020(int29, v_createRequest, mw_createTimeSeriesAnnc));//TimeSeries
-						v_ae1.done;
-					}
+					f_cse_preamble_subscriptionVerification(v_ae2Index, v_createRequest, int23);
 					
-					testcase TC_CSE_DMR_CRE_020_TSI() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
+					v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)},omit,omit,m_batchNotify(c_numberOfAggregatedNotification + 1, "PT10S" ), omit, omit, -, int2);//batchNotify/number greater than number of notifications to be sent so that batchNotify/duration expires before
 
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.timeSeriesInstance.announceTo := {f_getCompletePoA()};
+					v_resourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex);//Subscription
+					
+					if(vc_ae2.running) {
+						vc_ae2.stop;
+					};
 
-						v_ae1.start(f_CSE_DMR_CRE_020(int30, v_createRequest, mw_createTimeSeriesInstanceAnnc));//TimeSeriesInstance
-						v_ae1.done;
-					}
-				
-				} // end g_CSE_DMR_CRE_020		
-				
-				group g_CSE_DMR_CRE_021 {
+					// Test Body
+					vc_ae2.start(f_cse_notifyProcedure_aggregatedNoficationHandler(v_contentResponse, c_numberOfAggregatedNotification)); 
 
-					/**
-					 * @desc Check that the IUT accepts the creation of a RESOURCE_TYPE resource with the optional attribute announcedAttribute provided
-					 * 
-					 */
-					testcase TC_CSE_DMR_CRE_021_CNT() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
-						var template RequestPrimitive v_createRequest := m_createContainerBase;
-						var RequestPrimitive v_requestPrimitive;
-						var XSD.NonNegativeInteger v_maxByteSize := 512;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
-						v_createRequest.primitiveContent.container.maxByteSize := v_maxByteSize;						
-						v_createRequest.primitiveContent.container.announcedAttribute := {"mbs"};
-	
-						v_ae1.start(f_CSE_DMR_CRE_021(int3, v_createRequest, mw_createContainerAnnc()));//Container
-						v_ae1.done;
-						
-						if(getverdict == pass){ 
-							//Check if maxByteSize attribute has been announced
-							v_requestPrimitive := f_getRequestPrimitive(v_ae1);
-							if (ispresent(v_requestPrimitive.primitiveContent.containerAnnc.maxByteSize)){
-								if(v_requestPrimitive.primitiveContent.containerAnnc.maxByteSize != v_maxByteSize){
-									setverdict(fail, __SCOPE__ & ": Error: Value of maxByteSize has not been announced successfully");
-								}else{
-									setverdict(pass, __SCOPE__ & ": Value of maxByteSize has been announced successfully");
-								}
-							}else{
-								setverdict(fail, __SCOPE__ & ": Error: maxByteSize has not been announced");
-							}
-						}
-					}
-	
-					testcase TC_CSE_DMR_CRE_021_CIN() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
-						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
-						var RequestPrimitive v_requestPrimitive;
-						var XSD.NonNegativeInteger v_contentSize := 512;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
-						v_createRequest.primitiveContent.contentInstance.contentSize := v_contentSize;						
-						v_createRequest.primitiveContent.contentInstance.announcedAttribute := {"cs"};
-		
-						v_ae1.start(f_CSE_DMR_CRE_021(int4, v_createRequest, mw_createContentInstanceAnnc()));//ContentInstance
-						v_ae1.done;
-						
-						if(getverdict == pass){ 
-							//Check if contentSize attribute has been announced
-							v_requestPrimitive := f_getRequestPrimitive(v_ae1);
-							if (ispresent(v_requestPrimitive.primitiveContent.contentInstanceAnnc.contentSize)){
-								if(v_requestPrimitive.primitiveContent.contentInstanceAnnc.contentSize != v_contentSize){
-									setverdict(fail, __SCOPE__ & ": Error: Value of contentSize has not been announced successfully");
-								}else{
-									setverdict(pass, __SCOPE__ & ": Value of contentSize has been announced successfully");
-								}
-							}else{
-								setverdict(fail, __SCOPE__ & ": Error: contentSize has not been announced");
-							}
-						}
-					}
-
-					testcase TC_CSE_DMR_CRE_021_GRP() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
-						var template RequestPrimitive v_createRequest := m_createGroupBase;
-						var RequestPrimitive v_requestPrimitive;
-						var XSD.PositiveInteger v_maxNrOfMembers := 10;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
-						v_createRequest.primitiveContent.group_.maxNrOfMembers := v_maxNrOfMembers;
-						v_createRequest.primitiveContent.group_.announcedAttribute := {"mnm"};
-		
-						v_ae1.start(f_CSE_DMR_CRE_021(int9, v_createRequest, mw_createGroupAnnc()));//Group
-						v_ae1.done;
-						
-						if(getverdict == pass){ 
-							//Check if maxNrOfMembers attribute has been announced
-							v_requestPrimitive := f_getRequestPrimitive(v_ae1);
-							if (ispresent(v_requestPrimitive.primitiveContent.groupAnnc.maxNrOfMembers)){
-								if(v_requestPrimitive.primitiveContent.groupAnnc.maxNrOfMembers != v_maxNrOfMembers){
-									setverdict(fail, __SCOPE__ & ": Error: Value of maxNrOfMembers has not been announced successfully");
-								}else{
-									setverdict(pass, __SCOPE__ & ": Value of maxNrOfMembers has been announced successfully");
-								}
-							}else{
-								setverdict(fail, __SCOPE__ & ": Error: maxNrOfMembers has not been announced");
-							}
-						}
-					}
-	
-					testcase TC_CSE_DMR_CRE_021_LCP() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
-						var template RequestPrimitive v_createRequest := m_createLocationPolicy(int1, omit, omit, omit, omit);
-						var RequestPrimitive v_requestPrimitive;
-						var LocationSource v_locationSource := int1;//Network-based
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.locationPolicy.announceTo := {PX_CSE1_ID};
-						v_createRequest.primitiveContent.locationPolicy.locationSource := v_locationSource;
-						v_createRequest.primitiveContent.locationPolicy.announcedAttribute := {"los"};
-		
-						v_ae1.start(f_CSE_DMR_CRE_021(int10, v_createRequest, mw_createLocationPolicyAnnc()));//LocationPolicy
-						v_ae1.done;
-						
-						if(getverdict == pass){ 
-							//Check if locationSource attribute has been announced
-							v_requestPrimitive := f_getRequestPrimitive(v_ae1);
-							if (ispresent(v_requestPrimitive.primitiveContent.locationPolicyAnnc.locationSource)){
-								if(v_requestPrimitive.primitiveContent.locationPolicyAnnc.locationSource != v_locationSource){
-									setverdict(fail, __SCOPE__ & ": Error: Value of locationSource has not been announced successfully");
-								}else{
-									setverdict(pass, __SCOPE__ & ": Value of locationSource has been announced successfully");
-								}
-							}else{
-								setverdict(fail, __SCOPE__ & ": Error: locationSource has not been announced");
-							}
-						}
-					}
-	
-					testcase TC_CSE_DMR_CRE_021_MGO() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
-						var template RequestPrimitive v_createRequest := m_createMgmtObjBase;
-						var RequestPrimitive v_requestPrimitive;
-						var XSD.String v_description := "Description of mgmtObj";
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.mgmtResource.announceTo := {PX_CSE1_ID};
-						v_createRequest.primitiveContent.mgmtResource.description := v_description;			
-						v_createRequest.primitiveContent.mgmtResource.announcedAttribute := {"dc"};
-
-						v_ae1.start(f_CSE_DMR_CRE_021(int13, v_createRequest, mw_createMgmtObjAnnc()));//MgmtObj
-						v_ae1.done;
-						
-						if(getverdict == pass){ 
-							//Check if description attribute has been announced
-							v_requestPrimitive := f_getRequestPrimitive(v_ae1);
-							if (ispresent(v_requestPrimitive.primitiveContent.announcedMgmtResource.description)){
-								if(v_requestPrimitive.primitiveContent.announcedMgmtResource.description != v_description){
-									setverdict(fail, __SCOPE__ & ": Error: Value of description has not been announced successfully");
-								}else{
-									setverdict(pass, __SCOPE__ & ": Value of description has been announced successfully");
-								}
-							}else{
-								setverdict(fail, __SCOPE__ & ": Error: description has not been announced");
-							}
-						}
-					}
-	
-					testcase TC_CSE_DMR_CRE_021_NOD() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
-						var template RequestPrimitive v_createRequest := m_createNodeBase;
-						var RequestPrimitive v_requestPrimitive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.node.announceTo := {PX_CSE1_ID};
-						
-						//TODO node to be done. hostedCSELink attribute (OA) to be added!!!
-		
-						v_ae1.start(f_CSE_DMR_CRE_021(int14, v_createRequest, mw_createNodeAnnc));//Node
-						v_ae1.done;
-					}
-	
-					testcase TC_CSE_DMR_CRE_021_SCH() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
-						var template RequestPrimitive v_createRequest := m_createScheduleBase;
-						var RequestPrimitive v_requestPrimitive;
-						var ScheduleEntries v_scheduleElement := {{"0 0 0,1,2 1 1 * *"}};
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.schedule.announceTo := {PX_CSE1_ID};
-						v_createRequest.primitiveContent.schedule.scheduleElement := v_scheduleElement;
-						v_createRequest.primitiveContent.schedule.announcedAttribute := {"se"};
-						
-						v_ae1.start(f_CSE_DMR_CRE_021(int18, v_createRequest, mw_createScheduleAnnc()));//Schedule
-						v_ae1.done;
-						
-						if(getverdict == pass){ 
-							//Check if scheduleElement attribute has been announced
-							v_requestPrimitive := f_getRequestPrimitive(v_ae1);
-							if (ispresent(v_requestPrimitive.primitiveContent.scheduleAnnc.scheduleElement)){
-								if(v_requestPrimitive.primitiveContent.scheduleAnnc.scheduleElement != v_scheduleElement){
-									setverdict(fail, __SCOPE__ & ": Error: Value of scheduleElement has not been announced successfully");
-								}else{
-									setverdict(pass, __SCOPE__ & ": Value of scheduleElement has been announced successfully");
-								}
-							}else{
-								setverdict(fail, __SCOPE__ & ": Error: scheduleElement has not been announced");
-							}
-						}
-					}
+					v_updateRequest.primitiveContent.aE.labels := v_labels_1;
+					f_cse_updateResource(int2, v_aeIndex, v_updateRequest); // Update request 1
+					t_batchNotificationTimer.start;					
 					
-					testcase TC_CSE_DMR_CRE_021_TS() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var RequestPrimitive v_requestPrimitive;
-						var XSD.NonNegativeInteger v_maxByteSize := 512;
-
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
-						v_createRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize;						
-						v_createRequest.primitiveContent.timeSeries.announcedAttribute := {"mbs"};
+					v_updateRequest := m_updateAeBase;
+					v_updateRequest.primitiveContent.aE.appName := "MyAppName2"; 
+					f_cse_updateResource(int2, v_aeIndex, v_updateRequest); // Update request 2
 
-						v_ae1.start(f_CSE_DMR_CRE_021(int29, v_createRequest, mw_createTimeSeriesAnnc()));//TimeSeries
-						v_ae1.done;
-	
-						if(getverdict == pass){ 
-							//Check if maxByteSize attribute has been announced
-							v_requestPrimitive := f_getRequestPrimitive(v_ae1);
-							if (ispresent(v_requestPrimitive.primitiveContent.timeSeriesAnnc.maxByteSize)){
-								if(v_requestPrimitive.primitiveContent.timeSeriesAnnc.maxByteSize != v_maxByteSize){
-									setverdict(fail, __SCOPE__ & ": Error: Value of maxByteSize has not been announced successfully");
-								}else{
-									setverdict(pass, __SCOPE__ & ": Value of maxByteSize has been announced successfully");
-								}
-							}else{
-								setverdict(fail, __SCOPE__ & ": Error: maxByteSize has not been announced");
-							}
-						}
+					vc_ae2.done;
+					v_elapsedTime := t_batchNotificationTimer.read;
+					t_batchNotificationTimer.stop;		
+					
+					if(v_elapsedTime < 10.0) {
+						setverdict(fail, __SCOPE__ & ": Notifications sent before bathNotify/duration expired");
 					}
 					
-					testcase TC_CSE_DMR_CRE_021_TSI() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
-						var RequestPrimitive v_requestPrimitive;
-						var XSD.NonNegativeInteger v_sequenceNr := 8;
-
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.timeSeriesInstance.announceTo := {PX_CSE1_ID};
-						v_createRequest.primitiveContent.timeSeriesInstance.sequenceNr := v_sequenceNr;						
-						v_createRequest.primitiveContent.timeSeriesInstance.announcedAttribute := {"snr"};
-
-						v_ae1.start(f_CSE_DMR_CRE_021(int30, v_createRequest, mw_createTimeSeriesInstanceAnnc()));//TimeSeriesInstance
-						v_ae1.done;
+					f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
 
-						if(getverdict == pass){ 
-							//Check if maxByteSize attribute has been announced
-							v_requestPrimitive := f_getRequestPrimitive(v_ae1);
-							if (ispresent(v_requestPrimitive.primitiveContent.timeSeriesInstanceAnnc.sequenceNr)){
-								if(v_requestPrimitive.primitiveContent.timeSeriesInstanceAnnc.sequenceNr != v_sequenceNr){
-									setverdict(fail, __SCOPE__ & ": Error: Value of sequenceNr has not been announced successfully");
-								}else{
-									setverdict(pass, __SCOPE__ & ": Value of sequenceNr has been announced successfully");
-								}
-							}else{
-								setverdict(fail, __SCOPE__ & ": Error: sequenceNr has not been announced");
-							}
-						}
-					}
+					//Postamble
+					f_cse_postamble_deleteResources();
+					
+					//Tear down
+					f_cf01Down();
+    
+				} // end TC_CSE_SUB_NTF_003
 
-				} // end g_CSE_DMR_CRE_021	
-				
-			}//end group Create
+			}//end group Notify
 			
-			group Retrieve {
+			group Update {
 				
-				group g_CSE_DMR_RET_001 {
-					
-					/**
-					 * @desc Check that the IUT returns successfully the TARGET_RESOURCE_ADDRESS resource 
-					 * 
-					 */
-					testcase TC_CSE_DMR_RET_001_SCH() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
-						var ResponsePrimitive v_responsePrimitive;
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.schedule := mw_contentSchedule_rc1;
-						
-						v_ae1.start(f_CSE_DMR_RET_001(int18, m_createScheduleBase, v_contentResponse));//Schedule
-						v_ae1.done;
-						
-					}
+				/**
+				 * @desc Check that the IUT sends a Notify request to the subscriber resource when the notificationContentType attribute is set to “modified attributes” and an update operation has been performed on the subscribed-to resource
+				 * 
+				 */
+				testcase TC_CSE_SUB_UPD_002() runs on Tester system CseSystem {
 					
-					testcase TC_CSE_DMR_RET_001_PCH() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
-						var ResponsePrimitive v_responsePrimitive;
-						var template PrimitiveContent v_contentResponse;
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						v_contentResponse.pollingChannel := mw_contentPollingChannelBase;
-						
-						v_ae1.start(f_CSE_DMR_RET_001(int15, m_createPollingChannelBase, v_contentResponse));//PollingChannel
-						v_ae1.done;
-						
-					}
-					
-					testcase TC_CSE_DMR_RET_001_TS() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var ResponsePrimitive v_responsePrimitive;
-						var template PrimitiveContent v_contentResponse;
+															
+					v_ae1.start(f_CSE_SUB_UPD_002());
+												  	  	
+					v_ae1.done;
+												  	  		
+				}
+														
+				function f_CSE_SUB_UPD_002() runs on AeSimu {
+					// Local variables
+					var MsgIn v_response;
+					var integer v_aeIndex := -1;
+					var integer v_resourceIndex := -1;
+					var Labels v_labels_1:= {"VALUE_1"};
+					var template PrimitiveContent v_contentResponse := {aE := m_contentAe_allOmit};
+					var template RequestPrimitive v_createRequest := omit;
+					var template RequestPrimitive v_updateRequest := m_updateAeBase;
+					var RequestPrimitive v_request;
+					var integer v_ae2Index := -1;
+			
+					// Test control
 
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.timeSeries := mw_contentTimeSeries_rc1;
+					// Test component configuration
+					f_cf01Up(true);
 
-						v_ae1.start(f_CSE_DMR_RET_001(int29, m_createTimeSeriesBase, v_contentResponse));//TimeSeries
-						v_ae1.done;
+					// Test adapter configuration
 
-					}
+					// Preamble
+					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
 					
-				} // end g_CSE_DMR_RET_001
-				
-				group g_CSE_DMR_RET_002 {
+					v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, omit, omit, omit, omit, omit, int2, omit); //notificationContentType ="modified attributes"
 					
-					/**
-					 * @desc Check that the IUT responds with an error when the AE tries to retrieve the resource TARGET_RESOURCE_ADDRESS which does not exist
-					 * 
-					 */
-					testcase TC_CSE_DMR_RET_002() runs on Tester system CseSystem {
+					f_cse_preamble_subscriptionVerification(v_ae2Index, v_createRequest, int23);
 					
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-													
-						v_ae1.start(f_CSE_DMR_RET_002());
-										  	  	
-						v_ae1.done;
-										  	  		
-					}
-												
-					function f_CSE_DMR_RET_002() runs on AeSimu {
-    				
-						// Local variables
-						var MsgIn v_response;
-						
-						var integer v_aeIndex := -1;
-						var XSD.ID v_resourceId := "nonExistingId";
-						var XSD.ID v_resourceName := "nonExistingName";
-						var XSD.ID v_targetResourceAddress;
-    										   
-						// Test control
-    				
-						// Test component configuration
-						f_cf01Up();
-    				
-						// Test adapter configuration
-    				
-						// Preamble
-						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi); 		
-						
-						// Test Body
-						if((PX_ADDRESSING_METHOD == e_nonHierarchical) and (PX_PRIMITIVE_SCOPE == e_cseRelative)) {
-							v_targetResourceAddress := v_resourceId;
-						} else if (PX_ADDRESSING_METHOD == e_nonHierarchical) {
-							v_targetResourceAddress := f_getResourceAddress() & "/" & v_resourceId;
-						} else {
-							v_targetResourceAddress := f_getResourceAddress(v_aeIndex) & "/" & v_resourceName;
-						}
-						
-						mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(v_targetResourceAddress, f_getOriginator(v_aeIndex)))));
-
-						tc_ac.start;
-						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) -> value v_response {
-								tc_ac.stop;
-								setverdict(pass, __SCOPE__ & ": Resource not found");
-							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
-								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Wrong response status code");
-							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
-								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
-							}
-							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
-							}
-						}	
-    								
-						// Postamble
-						f_cse_postamble_deleteResources();
-						
-						// Tear down
-						f_cf01Down();
-    				
-					}//end f_CSE_DMR_RET_002
-    				
-				} // end g_CSE_DMR_RET_002
-				
-				group g_CSE_DMR_RET_003 {
+					v_resourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex); //Subscription
+			
+					if(vc_ae2.running) {
+						vc_ae2.stop;
+					};
+			
+					// Test Body
+					//TODO Use f_getTemplateFromPrimitiveContent() which needs to be modified to receive the template in which the output template will be built upon
+					v_contentResponse.aE.labels := ?;// only modified attribute expected
+					v_contentResponse.aE.lastModifiedTime := ?;// only modified attribute expected //TODO Get it automatically into the expected content template
 					
-					/**
-					 * @desc Check that the IUT responds with an error when the AE tries to retrieve a resource TARGET_RESOURCE_ADDRESS under AE without having privileges for the RETRIEVE operation
-					 * 
-					 */
-					testcase TC_CSE_DMR_RET_003_SCH() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-	
-						v_ae1.start(f_CSE_DMR_RET_003(int18, m_createScheduleBase));//Schedule
-						v_ae1.done;
-					}
+					vc_ae2.start(f_cse_notifyProcedure_representationHandler(v_contentResponse)); // check if the notification is well received and if its content matchs
+			
+					v_updateRequest.primitiveContent.aE.labels := v_labels_1; 
+			
+					v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest);
 					
-					testcase TC_CSE_DMR_RET_003_TS() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_ae1.start(f_CSE_DMR_RET_003(int29, m_createTimeSeriesBase));//TimeSeries
-						v_ae1.done;
-					}
-					
-				} // end g_CSE_DMR_RET_003
-				
-				group g_CSE_DMR_RET_004 {
-					
-					/**
-					 * @desc Check that the IUT returns successfully the ATTRIBUTE of TARGET_RESOURCE_ADDRESS resource (“To” option)
-					 * 
-					 */
-					testcase TC_CSE_DMR_RET_004_CNT() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
-						var template PrimitiveContent v_contentResponse;
-						
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.container := m_contentContainer_allOmit;
-						v_contentResponse.container.parentID := ?;
-                        
-						v_ae1.start(f_CSE_DMR_RET_004(int3, m_createContainerBase, v_contentResponse));//Container
-						v_ae1.done;
-					}
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
+					tc_ac.start;
+					alt {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
+							tc_ac.stop;
+							setverdict(pass, __SCOPE__ & ": Attribute of resource type int2 (Ae) updated successfully");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Wrong response status code");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Error while updating resource type int2 (Ae)");
+						}
+						[] tc_ac.timeout {
+							setverdict(fail, __SCOPE__ & ": No answer while updating resource type int2 (Ae)");
+						}
+					}	
 
-					testcase TC_CSE_DMR_RET_004_GRP() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
-						var template PrimitiveContent v_contentResponse;
-						
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.group_ := m_contentGroup_allOmit;
-						v_contentResponse.group_.parentID := ?;
-												
-						v_ae1.start(f_CSE_DMR_RET_004(int9, m_createGroupBase, v_contentResponse));//Group
-						v_ae1.done;
-					}
-					
-					testcase TC_CSE_DMR_RET_004_ACP() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
-						var template PrimitiveContent v_contentResponse;
+					f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
+
+					//Postamble
+					f_cse_postamble_deleteResources();
+
+					//Tear down
+					f_cf01Down();
+
+				} // end TC_CSE_SUB_UPD_002
 						
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.accessControlPolicy := m_contentAcp_allOmit;
-						v_contentResponse.accessControlPolicy.parentID := ?;
-							
-						v_ae1.start(f_CSE_DMR_RET_004(int1, m_createAcpBase, v_contentResponse));//AccessControlPolicy
-						v_ae1.done;
-					}
-				
-					testcase TC_CSE_DMR_RET_004_SCH() runs on Tester system CseSystem {
-						// Local variables
-						var template PrimitiveContent v_contentResponse;
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-					
-						v_contentResponse.schedule := m_contentSchedule_allOmit;
-						v_contentResponse.schedule.parentID := ?;
-							
-						v_ae1.start(f_CSE_DMR_RET_004(int18, m_createScheduleBase,v_contentResponse));//Schedule
-						v_ae1.done;
-					}
-					
-					testcase TC_CSE_DMR_RET_004_PCH() runs on Tester system CseSystem {
-						// Local variables
-						var template PrimitiveContent v_contentResponse;
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-					
-						v_contentResponse.pollingChannel := m_contentPollingChannel_allOmit;
-						v_contentResponse.pollingChannel.parentID := ?;
-							
-						v_ae1.start(f_CSE_DMR_RET_004(int15, m_createPollingChannelBase, v_contentResponse));//PollingChannel
-						v_ae1.done;
-					}
+				/**
+				 * @desc Check that the IUT sends a Notify request to the subscriber resource when the notificationContentType attribute is set to “ResourceID” and an update operation has been performed on the subscribed-to resource
+				 *  
+				 */
+				testcase TC_CSE_SUB_UPD_003() runs on Tester system CseSystem {
 					
-					testcase TC_CSE_DMR_RET_004_SUB() runs on Tester system CseSystem {
-						// Local variables
-						var template PrimitiveContent v_contentResponse;
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
+																
+					v_ae1.start(f_CSE_SUB_UPD_003());
+													  	  	
+					v_ae1.done;
+													  	  		
+				}
+															
+				function f_CSE_SUB_UPD_003() runs on AeSimu {
+					// Local variables
+					var MsgIn v_response;
+					var integer v_aeIndex := -1;
+					var integer v_resourceIndex := -1;
+					var Labels v_labels_1:= {"VALUE_1"};
+					var template RequestPrimitive v_createRequest := omit;
+					var template PrimitiveContent v_contentResponse;
+					var template RequestPrimitive v_updateRequest := m_updateAeBase;
+					var RequestPrimitive v_request;
+					var integer v_ae2Index := -1;
 					
-						v_contentResponse.subscription := m_contentSubscription_allOmit;
-						v_contentResponse.subscription.parentID := ?;
-							
-						v_ae1.start(f_CSE_DMR_RET_004(int23, m_createSubscriptionBase, v_contentResponse));//Subscription
-						v_ae1.done;
-					}
+					v_updateRequest.primitiveContent.aE.labels := v_labels_1; 
+					v_contentResponse.uRI := ?;
 					
-					testcase TC_CSE_DMR_RET_004_TS() runs on Tester system CseSystem {
-						// Local variables
-						var template PrimitiveContent v_contentResponse;
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.timeSeries := m_contentTimeSeries_allOmit;
-						v_contentResponse.timeSeries.parentID := ?;
-		
-						v_ae1.start(f_CSE_DMR_RET_004(int29, m_createTimeSeriesBase, v_contentResponse));//TimeSeries
-						v_ae1.done;
-					}
-				
-				} // end g_CSE_DMR_RET_004
-				
-				group g_CSE_DMR_RET_005 {
-					
-					/**
-					 * @desc Check that the IUT returns  successfully the ATTRIBUTE of TARGET_RESOURCE_ADDRESS resource (“Content” option)
-					 * 
-					 */
-					testcase TC_CSE_DMR_RET_005_CNT() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
-						var template PrimitiveContent v_contentResponse;
-						
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.container := m_contentContainer_allOmit;
-						v_contentResponse.container.parentID := ?;
-						                       
-						v_ae1.start(f_CSE_DMR_RET_005(int3, m_createContainerBase, v_contentResponse));//Container
-						v_ae1.done;
-					}
+					// Test control
 
-					testcase TC_CSE_DMR_RET_005_GRP() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
-						var template PrimitiveContent v_contentResponse;
-						
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.group_ := m_contentGroup_allOmit;
-						v_contentResponse.group_.parentID := ?;
-																		
-						v_ae1.start(f_CSE_DMR_RET_005(int9, m_createGroupBase, v_contentResponse));//Group
-						v_ae1.done;
-					}
-					
-					testcase TC_CSE_DMR_RET_005_ACP() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;					
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.accessControlPolicy := m_contentAcp_allOmit;
-						v_contentResponse.accessControlPolicy.parentID := ?;
-							
-						v_ae1.start(f_CSE_DMR_RET_005(int1, m_createAcpBase, v_contentResponse));//AccessControlPolicy
-						v_ae1.done;
-					}
-				
-					testcase TC_CSE_DMR_RET_005_SCH() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.schedule := m_contentSchedule_allOmit;
-						v_contentResponse.schedule.parentID := ?;
-								
-						v_ae1.start(f_CSE_DMR_RET_005(int18, m_createScheduleBase, v_contentResponse));//Schedule
-						v_ae1.done;
-					}
+					// Test component configuration
+					f_cf01Up(true);
+
+					// Test adapter configuration
+
+					// Preamble
+					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
 					
-					testcase TC_CSE_DMR_RET_005_PCH() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.pollingChannel := m_contentPollingChannel_allOmit;
-						v_contentResponse.pollingChannel.parentID := ?;
-								
-						v_ae1.start(f_CSE_DMR_RET_005(int15, m_createPollingChannelBase, v_contentResponse));//PollingChannel
-						v_ae1.done;
-					}
+					f_cse_preamble_subscriptionVerification(v_ae2Index, v_createRequest, int23);
 					
-					testcase TC_CSE_DMR_RET_005_SUB() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
-						var template PrimitiveContent v_contentResponse;
-						
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.subscription := m_contentSubscription_allOmit;
-						v_contentResponse.subscription.parentID := ?;
-								
-						v_ae1.start(f_CSE_DMR_RET_005(int23, m_createSubscriptionBase, v_contentResponse));//Subscription
-						v_ae1.done;
-					}
+					v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, omit, omit, omit, omit, omit, int3, omit); // notificationContentType ="ResourceID"
 					
-					testcase TC_CSE_DMR_RET_005_TS() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template PrimitiveContent v_contentResponse;
+					v_resourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex);//Subscription
 
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.timeSeries := m_contentTimeSeries_allOmit;
-						v_contentResponse.timeSeries.parentID := ?;
+					f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
 			
-						v_ae1.start(f_CSE_DMR_RET_005(int29, m_createTimeSeriesBase, v_contentResponse));//TimeSeries
-						v_ae1.done;
-					}
+					// Test Body
+					vc_ae2.start(f_cse_notifyProcedure_representationHandler(v_contentResponse)); // check if the notification is well received and if its content matchs
+					
+					v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest);
+					
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
+					tc_ac.start;
+					alt {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
+							tc_ac.stop;
+							setverdict(pass, __SCOPE__ & ": Attribute of resource type int2 (Ae) updated successfully");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Wrong response status code");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Error while updating resource type int2 (Ae)");
+						}
+						[] tc_ac.timeout {
+							setverdict(fail, __SCOPE__ & ": No answer while updating resource type int2 (Ae) or None notification received");
+						}
+					}	
+
+					f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
+
+					//Postamble
+					f_cse_postamble_deleteResources();
+
+					//Tear down
+					f_cf01Down();
 
+				} // end TC_CSE_SUB_UPD_003
 					
-				} // end g_CSE_DMR_RET_005
-				
-				group g_CSE_DMR_RET_006 {
+				/**
+				 * @desc Check that the IUT decreases the expirationCounter attribute of a subscription resource when the Hosting CSE of the subscribed-to resource successfully sends the notification request to subscriber resource(s)
+				 *  
+				 */
+				testcase TC_CSE_SUB_UPD_004() runs on Tester system CseSystem {
 					
-					/**
-					 * @desc Check that the IUT returns  successfully multiple attributes of TARGET_RESOURCE_ADDRESS resource
-					 * 
-					 */
-					testcase TC_CSE_DMR_RET_006_CNT() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
-						var template PrimitiveContent v_contentResponse;
-						
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						v_contentResponse.container := m_contentContainer_allOmit;
-						v_contentResponse.container.parentID := ?;
-						v_contentResponse.container.creationTime := ?;
-                        
-						v_ae1.start(f_CSE_DMR_RET_006(int3, m_createContainerBase, v_contentResponse));//Container
-						v_ae1.done;
-					}
-
-					testcase TC_CSE_DMR_RET_006_GRP() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
-						var template PrimitiveContent v_contentResponse;
-						
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.group_ := m_contentGroup_allOmit;
-						v_contentResponse.group_.parentID := ?;
-						v_contentResponse.group_.creationTime := ?;
-												
-						v_ae1.start(f_CSE_DMR_RET_006(int9, m_createGroupBase, v_contentResponse));//Group
-						v_ae1.done;
-					}
-					
-					testcase TC_CSE_DMR_RET_006_ACP() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
-						var template PrimitiveContent v_contentResponse;
-						
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.accessControlPolicy := m_contentAcp_allOmit;
-						v_contentResponse.accessControlPolicy.parentID := ?;
-						v_contentResponse.accessControlPolicy.creationTime := ?;
-							
-						v_ae1.start(f_CSE_DMR_RET_006(int1, m_createAcpBase, v_contentResponse));//AccessControlPolicy
-						v_ae1.done;
-					}
-				
-					testcase TC_CSE_DMR_RET_006_SCH() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
-						var template PrimitiveContent v_contentResponse;
-						
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.schedule := m_contentSchedule_allOmit;
-						v_contentResponse.schedule.parentID := ?;
-						v_contentResponse.schedule.creationTime := ?;
-							
-						v_ae1.start(f_CSE_DMR_RET_006(int18, m_createScheduleBase, v_contentResponse));//Schedule
-						v_ae1.done;
-					}
+																
+					v_ae1.start(f_CSE_SUB_UPD_004());
+													  	  	
+					v_ae1.done;
+													  	  		
+				}
+															
+				function f_CSE_SUB_UPD_004() runs on AeSimu {
+					// Local variables
+					var MsgIn v_response;
+					var integer v_aeIndex := -1;
+					var integer v_resourceIndex := -1;
+					var Labels v_labels_1:= {"VALUE_1"};
+					var template PrimitiveContent v_contentResponse;
+					var template RequestPrimitive v_createRequest := omit;
+					var template RequestPrimitive v_updateRequest := m_updateAeBase;
+					var RequestPrimitive v_request;
+					var template PrimitiveContent v_retrieveContentResponse;
+					var integer v_ae2Index := -1;
+
+					v_updateRequest.primitiveContent.aE.labels := v_labels_1; 
+					v_contentResponse.aE := mw_contentAeBase; // all attributes expected  
+					v_retrieveContentResponse.subscription := mw_contentSubscription_rc1;
+
+					// Test control
+
+					// Test component configuration
+					f_cf01Up(true);
+
+					// Test adapter configuration
+
+					// Preamble
+					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
 					
-					testcase TC_CSE_DMR_RET_006_PCH() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;					
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.pollingChannel := m_contentPollingChannel_allOmit;
-						v_contentResponse.pollingChannel.parentID := ?;
-						v_contentResponse.pollingChannel.creationTime := ?;
-							
-						v_ae1.start(f_CSE_DMR_RET_006(int15, m_createPollingChannelBase, v_contentResponse));//PollingChannel
-						v_ae1.done;
-					}
+					f_cse_preamble_subscriptionVerification(v_ae2Index, v_createRequest, int23);
 					
-					testcase TC_CSE_DMR_RET_006_SUB() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
-						var template PrimitiveContent v_contentResponse;
-						
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.subscription := m_contentSubscription_allOmit;
-						v_contentResponse.subscription.parentID := ?;
-						v_contentResponse.subscription.creationTime := ?;
-							
-						v_ae1.start(f_CSE_DMR_RET_006(int23, m_createSubscriptionBase, v_contentResponse));//Subscription
-						v_ae1.done;
-					}
+					v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, omit, 3, omit, omit, omit, -, omit);  //expirationCounter set to 3
 					
-					testcase TC_CSE_DMR_RET_006_TS() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template PrimitiveContent v_contentResponse;
-
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.timeSeries := m_contentTimeSeries_allOmit;
-						v_contentResponse.timeSeries.parentID := ?;
-						v_contentResponse.timeSeries.creationTime := ?;
-		
-						v_ae1.start(f_CSE_DMR_RET_006(int29, m_createTimeSeriesBase, v_contentResponse));//TimeSeries
-						v_ae1.done;
-					}
-
+					v_resourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex); // Subscription
 					
-				} // end g_CSE_DMR_RET_006
-				
-				group g_CSE_DMR_RET_007 {
+					if(vc_ae2.running) {
+						vc_ae2.stop;
+					};
 					
-					/**
-					 * @desc Check that the IUT responds with an error when the AE tries to retrieve a non-existing attribute of the TARGET_RESOURCE_ADDRESS resource (“single” attribute case)
-					 * 
-					 */
-					testcase TC_CSE_DMR_RET_007_CNT_LBL() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-                        
-						v_ae1.start(f_CSE_DMR_RET_007(int3, m_createContainerBase));//Container
-						v_ae1.done;
-					}
+					// Test Body
+					vc_ae2.start(f_cse_notifyProcedure_representationHandler(v_contentResponse)); // check if the notification is well received and if its content matchs
 
-					testcase TC_CSE_DMR_RET_007_GRP_LBL() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						
-						v_ae1.start(f_CSE_DMR_RET_007(int9, m_createGroupBase));//Group
-						v_ae1.done;
-					}
-					
-					testcase TC_CSE_DMR_RET_007_ACP_LBL() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-	
-						v_ae1.start(f_CSE_DMR_RET_007(int1, m_createAcpBase));//AccessControlPolicy
-						v_ae1.done;
-					}
-				
-					testcase TC_CSE_DMR_RET_007_SCH_LBL() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-	
-						v_ae1.start(f_CSE_DMR_RET_007(int18, m_createScheduleBase));//Schedule
-						v_ae1.done;
-					}
+					f_cse_updateResource(int2, v_aeIndex, v_updateRequest); // AE update request
 					
-					testcase TC_CSE_DMR_RET_007_PCH_LBL() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-	
-						v_ae1.start(f_CSE_DMR_RET_007(int15, m_createPollingChannelBase));//PollingChannel
-						v_ae1.done;
-					}
+					f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
 					
-					testcase TC_CSE_DMR_RET_007_SUB_LBL() runs on AeSimu system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
+					mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)))));
 	
-						v_ae1.start(f_CSE_DMR_RET_007(int23, m_createSubscriptionBase));//Subscription
-						v_ae1.done;
+					tc_ac.start;
+					alt {
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(v_retrieveContentResponse))) -> value v_response {
+							tc_ac.stop;
+							if(v_response.primitive.responsePrimitive.primitiveContent.subscription.expirationCounter == 2 ){
+								setverdict(pass, __SCOPE__ & ": expirationCounter has been successfully decreased by one");
+							}
+							else{
+								setverdict(fail, __SCOPE__ & ": Error expirationCounter hasn't been decreased by one");
+							}
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Error, resource elements provided not matching expected resource elements");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
+						}
+						[] tc_ac.timeout {
+							setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
+						}
 					}
 					
-					testcase TC_CSE_DMR_RET_007_TS_LBL() runs on AeSimu system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
 
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_ae1.start(f_CSE_DMR_RET_007(int29, m_createSubscriptionBase));//TimeSeries
-						v_ae1.done;
-					}
+					//Postamble
+					f_cse_postamble_deleteResources();
 
-				} // end g_CSE_DMR_RET_007
-				
-				group g_CSE_DMR_RET_008 {
-					
-					/**
-					 * @desc Check that the IUT responds with an error when the AE tries to retrieve a non-existing attributes of the TARGET_RESOURCE_ADDRESS resource (“multiple” attributes case)
-					 * 
-					 */
-					testcase TC_CSE_DMR_RET_008_CNT_LBL_AT() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-                        
-						v_ae1.start(f_CSE_DMR_RET_008(int3, m_createContainerBase, {"lbl", "at"}));//Container
-						v_ae1.done;
-					}
+					//Tear down
+					f_cf01Down();
 
-					testcase TC_CSE_DMR_RET_008_GRP_LBL_AT() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
+				} // end TC_CSE_SUB_UPD_004
 						
-						v_ae1.start(f_CSE_DMR_RET_008(int9, m_createGroupBase, {"lbl", "at"}));//Group
-						v_ae1.done;
-					}
-					
-					testcase TC_CSE_DMR_RET_008_ACP_LBL_AT() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-	
-						v_ae1.start(f_CSE_DMR_RET_008(int1, m_createAcpBase, {"lbl", "at"}));//AccessControlPolicy
-						v_ae1.done;
-					}
-				
-					testcase TC_CSE_DMR_RET_008_SCH_LBL_AT() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-	
-						v_ae1.start(f_CSE_DMR_RET_008(int18, m_createScheduleBase, {"lbl", "at"}));//Schedule
-						v_ae1.done;
-					}
+				/**
+				 * @desc Check that the IUT deletes the subscription resource when the the expirationCounter meets zero
+				 * 
+				 */
+				testcase TC_CSE_SUB_UPD_005() runs on Tester system CseSystem {
 					
-					testcase TC_CSE_DMR_RET_008_SUB_LBL_AT() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-	
-						v_ae1.start(f_CSE_DMR_RET_008(int23, m_createSubscriptionBase, {"lbl", "at"}));//Subscription
-						v_ae1.done;
-					}
+																
+					v_ae1.start(f_CSE_SUB_UPD_005());
+													  	  	
+					v_ae1.done;
+													  	  		
+				}
+															
+				function f_CSE_SUB_UPD_005() runs on AeSimu {
+					// Local variables
+					var MsgIn v_response;
+					var integer v_aeIndex := -1;
+					var integer v_resourceIndex := -1;
+					var Labels v_labels_1:= {"VALUE_1"};
+					var template PrimitiveContent v_contentResponse;
+					var template RequestPrimitive v_createRequest := omit;
+					var template RequestPrimitive v_updateRequest := m_updateAeBase;
+					var RequestPrimitive v_request;
+					var integer v_ae2Index := -1;
 					
-					testcase TC_CSE_DMR_RET_008_PCH_LBL_PI() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					v_updateRequest.primitiveContent.aE.labels := v_labels_1; 
+					v_contentResponse.aE := mw_contentAeBase; // all attributes expected  
 
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_ae1.start(f_CSE_DMR_RET_008(int15, m_createPollingChannelBase, {"lbl", "pi"}));//PollingChannel
-						v_ae1.done;
-					}
-					
-					testcase TC_CSE_DMR_RET_008_TS_LBL_AT() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					// Test control
 
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_ae1.start(f_CSE_DMR_RET_008(int29, m_createTimeSeriesBase, {"lbl", "at"}));//TimeSeries
-						v_ae1.done;
-					}
+					// Test component configuration
+					f_cf01Up(true);
 
-				} // end f_CSE_DMR_RET_008
-				
-				group g_CSE_DMR_RET_009{
+					// Test adapter configuration
 
-					/**
-					 * @desc Check that the IUT rejects the RETRIEVE Request of a latest resource target to a container resource that has no direct child contentInstance resources.
-					 * 
-					 */
-					testcase TC_CSE_DMR_RET_009() runs on Tester system CseSystem {
+					// Preamble
+					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
 					
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-														
-						v_ae1.start(f_CSE_DMR_RET_009());
-											  	  	
-						v_ae1.done;
-											  	  		
-					}
-													
-					function f_CSE_DMR_RET_009() runs on AeSimu {
-						// Local variables
-						var integer v_aeIndex := -1;
-						var integer v_containerIndex := -1;
-		    										   
-						// Test control
-	
-						// Test component configuration
-						f_cf01Up();
-	
-						// Test adapter configuration
-	
-						// Preamble
-						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-		
-						v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); 	
-		
-						// Test Body
-						mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameLatest, f_getOriginator(v_containerIndex)))));
-
-						tc_ac.start;
-						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))){
-								tc_ac.stop;
-								setverdict(pass, __SCOPE__ & ": Resource not found");
-							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
-								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Wrong response status code");
-							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
-								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
-							}
-							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
-							}
-						}	
+					f_cse_preamble_subscriptionVerification(v_ae2Index, v_createRequest, int23);
 					
-						// Postamble
-						f_cse_postamble_deleteResources();
-		
-						// Tear down
-						f_cf01Down();
+					v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, omit, 1, omit, omit, omit, -, omit);  //expirationCounter set to 1
+					
+					v_resourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex);// Subscription
 
-					}//end TC_CSE_DMR_RET_009
+					if(vc_ae2.running) {
+						vc_ae2.stop;
+					};
+	
+					// Test Body
+					vc_ae2.start(f_cse_notifyProcedure_representationHandler(v_contentResponse)); // check if the notification is well received and if its content matchs
+					f_cse_updateResource(int2, v_aeIndex, v_updateRequest); // AE update request
+					
+					f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
 
-				} // end group g_CSE_DMR_RET_009
-			  					
-				group g_CSE_DMR_RET_011{
+					mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)))));
 
-					/**
-					 * @desc Check that the IUT rejects the RETRIEVE Request of a oldest resource target to a container resource that has no direct child contentInstance resources.
-					 * 
-					 */
-					testcase TC_CSE_DMR_RET_011() runs on Tester system CseSystem {
-					
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-														
-						v_ae1.start(f_CSE_DMR_RET_011());
-											  	  	
-						v_ae1.done;
-											  	  		
+					tc_ac.start;
+					alt {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) -> value v_response {
+							tc_ac.stop;
+							setverdict(pass, __SCOPE__ & ": Subscription Resource have been successfully deleted");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Wrong response status code");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Error Subscription Resource has not been deleted");
+						}
+						[] tc_ac.timeout {
+							setverdict(fail, __SCOPE__ & ": No answer while retrieving Subscription Resource");
+						}
 					}
-													
-					function f_CSE_DMR_RET_011() runs on AeSimu {
-						// Local variables
-						var integer v_aeIndex := -1;
-						var integer v_containerIndex := -1;
-		    										   
-						// Test control
-	
-						// Test component configuration
-						f_cf01Up();
-	
-						// Test adapter configuration
-	
-						// Preamble
-						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-		
-						v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); 	
-		
-						// Test Body
-						mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameOldest, f_getOriginator(v_containerIndex)))));
-
-						tc_ac.start;
-						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))){
-								tc_ac.stop;
-								setverdict(pass, __SCOPE__ & ": Resource not found");
-							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
-								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Wrong response status code");
-							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
-								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
-							}
-							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
-							}
-						}	
 					
-						// Postamble
-						f_cse_postamble_deleteResources();
-		
-						// Tear down
-						f_cf01Down();
+					f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
 
-					}//end TC_CSE_DMR_RET_011
+					//Postamble
+					f_cse_postamble_deleteResources();
+
+					//Tear down
+					f_cf01Down();
 
-				} // end group g_CSE_DMR_RET_011
+				} // end TC_CSE_SUB_UPD_005
 				
-				group g_CSE_DMR_RET_013 {
+				/**
+				 * @desc Check that the IUT doesn’t send a Notify request to the subscriber resource when the “attribute” condition tag of eventNotificationCriteria attribute is set to LIST_OF_ATTRIBUTE and doesn’t contain the ATTRIBUTE_NAME attribute updated.
+				 * 
+				 */
+				testcase TC_CSE_SUB_UPD_006() runs on Tester system CseSystem {
 					
-					/**
-					 * @desc Check that the IUT returns successfully the TARGET_RESOURCE_ADDRESS resource under CSEBase
-					 * 
-					 */
-					testcase TC_CSE_DMR_RET_013_SCH() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var template PrimitiveContent v_contentResponse;
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						v_contentResponse.schedule := mw_contentSchedule_rc1;
-						
-						v_ae1.start(f_CSE_DMR_RET_013(int18, m_createScheduleBase, v_contentResponse));//Schedule
-						v_ae1.done;
-						
-					}
-					
-					testcase TC_CSE_DMR_RET_013_TS() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template PrimitiveContent v_contentResponse;
+																
+					v_ae1.start(f_CSE_SUB_UPD_006());
+													  	  	
+					v_ae1.done;
+													  	  		
+				}
+															
+				function f_CSE_SUB_UPD_006() runs on AeSimu {
+					// Local variables
+					var MsgIn v_response;
+					var Labels v_labels_1:= {"VALUE_1"};
+					var AttributeList_1 v_attributeList := {"apn"};
+					var integer v_aeIndex := -1;
+					var integer v_resourceIndex := -1;
+					var template RequestPrimitive v_createRequest := omit;
+					var template RequestPrimitive v_updateRequest := m_updateAeBase;
+					var RequestPrimitive v_request;
+					var integer v_ae2Index := -1;
 
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.timeSeries := mw_contentTimeSeries_rc1;
-	
-						v_ae1.start(f_CSE_DMR_RET_013(int29, m_createTimeSeriesBase, v_contentResponse));//TimeSeries
-						v_ae1.done;
-	
-					}
+					v_updateRequest.primitiveContent.aE.labels := v_labels_1;
+
+					// Test control
+
+					// Test component configuration
+					f_cf01Up(true);
+
+					// Test adapter configuration
+
+					// Preamble
+					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+					
+					f_cse_preamble_subscriptionVerification(v_ae2Index, v_createRequest, int23);
 					
-				} // end g_CSE_DMR_RET_013
+					v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, m_eventNotificationCriteria({int1}, v_attributeList), omit, omit, omit, omit, -, omit);
+
+					v_resourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex);//Subscription
+
+					v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest); // Update request
+
+					if(vc_ae2.running) {
+						vc_ae2.stop;
+					};
+
+					// Test Body
+					vc_ae2.start(f_cse_notifyProcedure_noNotificationHandler()); // check that no notification is received
+		
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
+					tc_ac.start;
+					alt {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
+							tc_ac.stop;
+							setverdict(pass, __SCOPE__ & ": Attribute of resource type int2 (Ae) updated successfully");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Wrong response status code");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Error while updating resource type int2 (Ae)");
+						}
+						[] tc_ac.timeout {
+							setverdict(fail, __SCOPE__ & ": No answer while updating resource type int2 (Ae) or None notification received");
+						}
+					}	
+
+					f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
+
+					//Postamble
+					f_cse_postamble_deleteResources();
+
+					//Tear down
+					f_cf01Down();
 
-				group g_CSE_DMR_RET_014 {
+				} // end TC_CSE_SUB_UPD_006
+				
+				/**
+				 * @desc Check that the IUT sends aggregated notification to the subscriber resource when the number value of the batchNotify attribute is set to GROUP_LIMIT and when this number have been reached
+				 * 
+				 */
+				testcase TC_CSE_SUB_UPD_007() runs on Tester system CseSystem {
 					
-					/**
-					 * @desc Check that the IUT responds with an error when the AE tries to retrieve a resource TARGET_RESOURCE_ADDRESS under CSEBase without having privileges for the RETRIEVE operation
-					 * 
-					 */
-					testcase TC_CSE_DMR_RET_014_SCH() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-	
-						v_ae1.start(f_CSE_DMR_RET_014(int18, m_createScheduleBase));//Schedule
-						v_ae1.done;
-					}
+																
+					v_ae1.start(f_CSE_SUB_UPD_007());
+													  	  	
+					v_ae1.done;
+													  	  		
+				}
+															
+				function f_CSE_SUB_UPD_007() runs on AeSimu {
+					// Local variables
+					const integer numberOfAggregatedNotification := 3;
+					var Labels v_labels_1:= {"VALUE_1"};
+					var Labels v_labels_2:= {"VALUE_2"};
+					var Labels v_labels_3:= {"VALUE_3"};
+					var integer v_aeIndex := -1;
+					var integer v_resourceIndex := -1;
+					var template RequestPrimitive v_createRequest := omit;
+					var template PrimitiveContent v_contentResponse;
+					var template RequestPrimitive v_updateRequest := m_updateAeBase;
+					var RequestPrimitive v_request;
+					var integer v_ae2Index := -1;
 					
-					testcase TC_CSE_DMR_RET_014_TS() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					v_contentResponse.aE := mw_contentAeBase; // all attributes expected   
 
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_ae1.start(f_CSE_DMR_RET_014(int29, m_createTimeSeriesBase));//TimeSeries
-						v_ae1.done;
-					}
-										
-				} // end g_CSE_DMR_RET_014
+					// Test control
+
+					// Test component configuration
+					f_cf01Up(true);
 
-				group g_CSE_DMR_RET_015 {
+					// Test adapter configuration
+
+					// Preamble
+					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
 					
-					/**
-					 * @desc Check that the IUT returns successfully the ATTRIBUTE of TARGET_RESOURCE_ADDRESS resource (“To” option) under CSEBase
-					 * 
-					 */
-					testcase TC_CSE_DMR_RET_015_ACP() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					f_cse_preamble_subscriptionVerification(v_ae2Index, v_createRequest, int23);
 					
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.accessControlPolicy := m_contentAcp_allOmit;
-						v_contentResponse.accessControlPolicy.parentID := ?;
-							
-						v_ae1.start(f_CSE_DMR_RET_015(int1, m_createAcpBase, v_contentResponse));//AccessControlPolicy
-						v_ae1.done;
-					}
+					v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)},omit,omit,m_batchNotify(numberOfAggregatedNotification), omit, omit, -, omit );
+		
+					v_resourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex);//Subscription
 					
-					testcase TC_CSE_DMR_RET_015_AE() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.aE := m_contentAe_allOmit;
-						v_contentResponse.aE.parentID := ?;
-							
-						v_ae1.start(f_CSE_DMR_RET_015(int2, m_createAe(PX_APP_ID), v_contentResponse));//AE
-						v_ae1.done;
-					}
-															
-					testcase TC_CSE_DMR_RET_015_CNT() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.container := m_contentContainer_allOmit;
-						v_contentResponse.container.parentID := ?;
-                        
-						v_ae1.start(f_CSE_DMR_RET_015(int3, m_createContainerBase, v_contentResponse));//Container
-						v_ae1.done;
-					}
-
-					testcase TC_CSE_DMR_RET_015_GRP() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.group_ := m_contentGroup_allOmit;
-						v_contentResponse.group_.parentID := ?;
-												
-						v_ae1.start(f_CSE_DMR_RET_015(int9, m_createGroupBase, v_contentResponse));//Group
-						v_ae1.done;
-					}
-				
-					testcase TC_CSE_DMR_RET_015_CSR() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.remoteCSE := m_contentRemoteCSE_allOmit;
-						v_contentResponse.remoteCSE.parentID := ?;
-		
-						v_ae1.start(f_CSE_DMR_RET_015(int16, m_createRemoteCSEBase, v_contentResponse));//RemoteCSE
-						v_ae1.done;
-					}
-				
-					testcase TC_CSE_DMR_RET_015_SCH() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.schedule := m_contentSchedule_allOmit;
-						v_contentResponse.schedule.parentID := ?;
-							
-						v_ae1.start(f_CSE_DMR_RET_015(int18, m_createScheduleBase,v_contentResponse));//Schedule
-						v_ae1.done;
-					}
-					
-					testcase TC_CSE_DMR_RET_015_SUB() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.subscription := m_contentSubscription_allOmit;
-						v_contentResponse.subscription.parentID := ?;
-							
-						v_ae1.start(f_CSE_DMR_RET_015(int23, m_createSubscriptionBase, v_contentResponse));//Subscription
-						v_ae1.done;
-					}
-					
-					testcase TC_CSE_DMR_RET_015_TS() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template PrimitiveContent v_contentResponse;
-
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.timeSeries := m_contentTimeSeries_allOmit;
-						v_contentResponse.timeSeries.parentID := ?;
-		
-						v_ae1.start(f_CSE_DMR_RET_015(int29, m_createTimeSeriesBase, v_contentResponse));//TimeSeries
-						v_ae1.done;
-					}
-				
-				} // end g_CSE_DMR_RET_015
-
-				group g_CSE_DMR_RET_016 {
-					
-					/**
-					 * @desc Check that the IUT returns successfully the ATTRIBUTE of TARGET_RESOURCE_ADDRESS resource (“Content” option) under CSEBase
-					 * 
-					 */
-					testcase TC_CSE_DMR_RET_016_ACP() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.accessControlPolicy := m_contentAcp_allOmit;
-						v_contentResponse.accessControlPolicy.parentID := ?;
-							
-						v_ae1.start(f_CSE_DMR_RET_016(int1, m_createAcpBase, v_contentResponse));//AccessControlPolicy
-						v_ae1.done;
-					}
-					
-					testcase TC_CSE_DMR_RET_016_AE() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-					
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.aE := m_contentAe_allOmit;
-						v_contentResponse.aE.parentID := ?;
-								
-						v_ae1.start(f_CSE_DMR_RET_016(int2, m_createAe(PX_APP_ID), v_contentResponse));//AE
-						v_ae1.done;
-					}
-										
-					testcase TC_CSE_DMR_RET_016_CNT() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.container := m_contentContainer_allOmit;
-						v_contentResponse.container.parentID := ?;
-						                       
-						v_ae1.start(f_CSE_DMR_RET_016(int3, m_createContainerBase, v_contentResponse));//Container
-						v_ae1.done;
-					}
-
-					testcase TC_CSE_DMR_RET_016_GRP() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.group_ := m_contentGroup_allOmit;
-						v_contentResponse.group_.parentID := ?;
-																		
-						v_ae1.start(f_CSE_DMR_RET_016(int9, m_createGroupBase, v_contentResponse));//Group
-						v_ae1.done;
-					}
-				
-					testcase TC_CSE_DMR_RET_016_CSR() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.remoteCSE := m_contentRemoteCSE_allOmit;
-						v_contentResponse.remoteCSE.parentID := ?;
-								
-						v_ae1.start(f_CSE_DMR_RET_016(int16, m_createRemoteCSEBase, v_contentResponse));//RemoteCSE
-						v_ae1.done;
-					}
-				
-					testcase TC_CSE_DMR_RET_016_SCH() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.schedule := m_contentSchedule_allOmit;
-						v_contentResponse.schedule.parentID := ?;
-								
-						v_ae1.start(f_CSE_DMR_RET_016(int18, m_createScheduleBase, v_contentResponse));//Schedule
-						v_ae1.done;
-					}
-					
-					testcase TC_CSE_DMR_RET_016_SUB() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-					
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.subscription := m_contentSubscription_allOmit;
-						v_contentResponse.subscription.parentID := ?;
-								
-						v_ae1.start(f_CSE_DMR_RET_016(int23, m_createSubscriptionBase, v_contentResponse));//Subscription
-						v_ae1.done;
-					}
-					
-					testcase TC_CSE_DMR_RET_016_TS() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template PrimitiveContent v_contentResponse;
-
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.timeSeries := m_contentTimeSeries_allOmit;
-						v_contentResponse.timeSeries.parentID := ?;
-			
-						v_ae1.start(f_CSE_DMR_RET_016(int29, m_createTimeSeriesBase, v_contentResponse));//TimeSeries
-						v_ae1.done;
-					}
-
-				} // end g_CSE_DMR_RET_016
-
-				group g_CSE_DMR_RET_017 {
-					
-					/**
-					 * @desc Check that the IUT returns  successfully multiple attributes of TARGET_RESOURCE_ADDRESS resource under CSEBase
-					 * 
-					 */
-					testcase TC_CSE_DMR_RET_017_ACP() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.accessControlPolicy := m_contentAcp_allOmit;
-						v_contentResponse.accessControlPolicy.parentID := ?;
-						v_contentResponse.accessControlPolicy.creationTime := ?;
-							
-						v_ae1.start(f_CSE_DMR_RET_017(int1, m_createAcpBase, v_contentResponse));//AccessControlPolicy
-						v_ae1.done;
-					}
-										
-					testcase TC_CSE_DMR_RET_017_AE() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.aE := m_contentAe_allOmit;
-						v_contentResponse.aE.parentID := ?;
-						v_contentResponse.aE.creationTime := ?;
-							
-						v_ae1.start(f_CSE_DMR_RET_017(int2, m_createAe(PX_APP_ID), v_contentResponse));//AE
-						v_ae1.done;
-					}
-										
-					testcase TC_CSE_DMR_RET_017_CNT() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						
-						v_contentResponse.container := m_contentContainer_allOmit;
-						v_contentResponse.container.parentID := ?;
-						v_contentResponse.container.creationTime := ?;
-                        
-						v_ae1.start(f_CSE_DMR_RET_017(int3, m_createContainerBase, v_contentResponse));//Container
-						v_ae1.done;
-					}
-
-					/*testcase TC_CSE_DMR_RET_017_DLV() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						var template PrimitiveContent v_contentResponse;
-					
-						v_contentResponse.delivery := m_contentDelivery_allOmit;
-						v_contentResponse.delivery.parentID := ?;
-						v_contentResponse.delivery.creationTime := ?;
-
-						v_ae1.start(f_CSE_DMR_RET_017(int6, m_createDeliveryBase, v_contentResponse));//Delivery
-						v_ae1.done;
-					}*/
-
-					testcase TC_CSE_DMR_RET_017_GRP() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.group_ := m_contentGroup_allOmit;
-						v_contentResponse.group_.parentID := ?;
-						v_contentResponse.group_.creationTime := ?;
-												
-						v_ae1.start(f_CSE_DMR_RET_017(int9, m_createGroupBase, v_contentResponse));//Group
-						v_ae1.done;
-					}
-				
-					testcase TC_CSE_DMR_RET_017_LCP() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.locationPolicy := m_contentLocationPolicy_allOmit;
-						v_contentResponse.locationPolicy.parentID := ?;
-						v_contentResponse.locationPolicy.creationTime := ?;
-
-						v_ae1.start(f_CSE_DMR_RET_017(int10, m_createLocationPolicyBase, v_contentResponse));//LocationPolicy
-						v_ae1.done;
-					}
-					
-					testcase TC_CSE_DMR_RET_017_MGC() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-					
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.mgmtCmd := m_contentMgmtCmd_allOmit;
-						v_contentResponse.mgmtCmd.parentID := ?;
-						v_contentResponse.mgmtCmd.creationTime := ?;
-
-						v_ae1.start(f_CSE_DMR_RET_017(int12, m_createMgmtCmdBase, v_contentResponse));//MgmtCmd
-						v_ae1.done;
-					}
-					
-					testcase TC_CSE_DMR_RET_017_NOD() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.node := m_contentNode_allOmit;
-						v_contentResponse.node.parentID := ?;
-						v_contentResponse.node.creationTime := ?;
-
-						v_ae1.start(f_CSE_DMR_RET_017(int14, m_createNodeBase, v_contentResponse));//Node
-						v_ae1.done;
-					}
-				
-					testcase TC_CSE_DMR_RET_017_CSR() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.remoteCSE := m_contentRemoteCSE_allOmit;
-						v_contentResponse.remoteCSE.parentID := ?;
-						v_contentResponse.remoteCSE.creationTime := ?;
-		
-						v_ae1.start(f_CSE_DMR_RET_017(int16, m_createRemoteCSEBase, v_contentResponse));//RemoteCSE
-						v_ae1.done;
-					}
-				
-					testcase TC_CSE_DMR_RET_017_SCH() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-					
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.schedule := m_contentSchedule_allOmit;
-						v_contentResponse.schedule.parentID := ?;
-						v_contentResponse.schedule.creationTime := ?;
-							
-						v_ae1.start(f_CSE_DMR_RET_017(int18, m_createScheduleBase, v_contentResponse));//Schedule
-						v_ae1.done;
-					}
-					
-					testcase TC_CSE_DMR_RET_017_STCL() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.statsCollect := m_contentStatsCollect_allOmit;
-						v_contentResponse.statsCollect.parentID := ?;
-						v_contentResponse.statsCollect.creationTime := ?;
-
-						v_ae1.start(f_CSE_DMR_RET_017(int21, m_createStatsCollectBase, v_contentResponse));//StatsCollect
-						v_ae1.done;
-					}
-					
-					testcase TC_CSE_DMR_RET_017_STCG() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.statsConfig := m_contentStatsConfig_allOmit;
-						v_contentResponse.statsConfig.parentID := ?;
-						v_contentResponse.statsConfig.creationTime := ?;
-		
-						v_ae1.start(f_CSE_DMR_RET_017(int22, m_createStatsConfigBase, v_contentResponse));//StatsConfig
-						v_ae1.done;
-					}
-					
-					testcase TC_CSE_DMR_RET_017_SUB() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.subscription := m_contentSubscription_allOmit;
-						v_contentResponse.subscription.parentID := ?;
-						v_contentResponse.subscription.creationTime := ?;
-							
-						v_ae1.start(f_CSE_DMR_RET_017(int23, m_createSubscriptionBase, v_contentResponse));//Subscription
-						v_ae1.done;
-					}
-					
-					testcase TC_CSE_DMR_RET_017_TS() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template PrimitiveContent v_contentResponse;
-
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.timeSeries := m_contentTimeSeries_allOmit;
-						v_contentResponse.timeSeries.parentID := ?;
-						v_contentResponse.timeSeries.creationTime := ?;
-		
-						v_ae1.start(f_CSE_DMR_RET_017(int23, m_createTimeSeriesBase, v_contentResponse));//TimeSeries
-						v_ae1.done;
-					}
-
-				} // end g_CSE_DMR_RET_017
-
-				group g_CSE_DMR_RET_018 {
-					
-					/**
-					 * @desc Check that the IUT responds with an error when the AE tries to retrieve a non-existing attribute of the TARGET_RESOURCE_ADDRESS resource (“single” attribute case) under CSEBase
-					 * 
-					 */
-					testcase TC_CSE_DMR_RET_018_ACP_LBL() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-	
-						v_ae1.start(f_CSE_DMR_RET_018(int1, m_createAcpBase));//AccessControlPolicy
-						v_ae1.done;
-					}
-					
-					testcase TC_CSE_DMR_RET_018_AE_LBL() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-	
-						v_ae1.start(f_CSE_DMR_RET_018(int2, m_createAe(PX_APP_ID)));//AE
-						v_ae1.done;
-					}
-										
-					testcase TC_CSE_DMR_RET_018_CNT_LBL() runs on Tester system CseSystem {
-						// Local variables
- 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-                        
-						v_ae1.start(f_CSE_DMR_RET_018(int3, m_createContainerBase));//Container
-						v_ae1.done;
-					}
-
-					testcase TC_CSE_DMR_RET_018_GRP_LBL() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						
-						v_ae1.start(f_CSE_DMR_RET_018(int9, m_createGroupBase));//Group
-						v_ae1.done;
-					}
-				
-					testcase TC_CSE_DMR_RET_018_CSR_LBL() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-
-						v_ae1.start(f_CSE_DMR_RET_018(int16, m_createRemoteCSEBase));//RemoteCSE
-						v_ae1.done;
-					}
-				
-					testcase TC_CSE_DMR_RET_018_SCH_LBL() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-	
-						v_ae1.start(f_CSE_DMR_RET_018(int18, m_createScheduleBase));//Schedule
-						v_ae1.done;
-					}
-										
-					testcase TC_CSE_DMR_RET_018_SUB_LBL() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-	
-						v_ae1.start(f_CSE_DMR_RET_018(int23, m_createSubscriptionBase));//Subscription
-						v_ae1.done;
-					}
-					
-					testcase TC_CSE_DMR_RET_018_TS_LBL() runs on AeSimu system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_ae1.start(f_CSE_DMR_RET_018(int29, m_createTimeSeriesBase));//TimeSeries
-						v_ae1.done;
-					}
-
-				} // end g_CSE_DMR_RET_018
-
-				group g_CSE_DMR_RET_019 {
-					
-					/**
-					 * @desc Check that the IUT responds with an error when the AE tries to retrieve a non-existing attribute of the TARGET_RESOURCE_ADDRESS resource (“multiple” attributes case) under CSEBase
-					 * 
-					 */
-					testcase TC_CSE_DMR_RET_019_ACP_LBL_AT() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-	
-						v_ae1.start(f_CSE_DMR_RET_019(int1, m_createAcpBase));//AccessControlPolicy
-						v_ae1.done;
-					}
-					
-					testcase TC_CSE_DMR_RET_019_AE_LBL_AT() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-	
-						v_ae1.start(f_CSE_DMR_RET_019(int2, m_createAe(PX_APP_ID)));//AE
-						v_ae1.done;
-					}
-					
-					testcase TC_CSE_DMR_RET_019_CNT_LBL_AT() runs on Tester system CseSystem {
-						// Local variables
- 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-                        
-						v_ae1.start(f_CSE_DMR_RET_019(int3, m_createContainerBase));//Container
-						v_ae1.done;
-					}
-
-					testcase TC_CSE_DMR_RET_019_GRP_LBL_AT() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						
-						v_ae1.start(f_CSE_DMR_RET_019(int9, m_createGroupBase));//Group
-						v_ae1.done;
-					}					
-				
-					testcase TC_CSE_DMR_RET_019_CSR_LBL_AT() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-
-						v_ae1.start(f_CSE_DMR_RET_019(int16, m_createRemoteCSEBase));//RemoteCSE
-						v_ae1.done;
-					}				
-				
-					testcase TC_CSE_DMR_RET_019_SCH_LBL_AT() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-	
-						v_ae1.start(f_CSE_DMR_RET_019(int18, m_createScheduleBase));//Schedule
-						v_ae1.done;
-					}
-					
-					testcase TC_CSE_DMR_RET_019_SUB_LBL_AT() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-	
-						v_ae1.start(f_CSE_DMR_RET_019(int23, m_createSubscriptionBase));//Subscription
-						v_ae1.done;
-					}
-					
-					testcase TC_CSE_DMR_RET_019_TS_LBL_AT() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_ae1.start(f_CSE_DMR_RET_019(int29, m_createTimeSeriesBase));//TimeSeries
-						v_ae1.done;
-					}
-
-				} // end f_CSE_DMR_RET_019
-				
-				group g_CSE_DMR_RET_020 {
-					
-					/**
-					 * @desc Check that the IUT rejects a RETRIEVE Request target to TARGET_RESOURCE_ADDRESS resource  when the Result Content set to RESULT_CONTENT
-					 * 
-					 */
-					testcase TC_CSE_DMR_RET_020_RCN_0() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_ae1.start(f_CSE_DMR_RET_020(int3, m_createContainerBase, int0));//ResultContent = 0 (nothing)
-						v_ae1.done;
-					}
-	
-					testcase TC_CSE_DMR_RET_020_RCN_2() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_ae1.start(f_CSE_DMR_RET_020(int3, m_createContainerBase, int2));//ResultContent = 2 (hierarchical address)
-						v_ae1.done;
-					}
-	
-					testcase TC_CSE_DMR_RET_020_RCN_3() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_ae1.start(f_CSE_DMR_RET_020(int3, m_createContainerBase, int3));//ResultContent = 3 (attributes and hierarchichal address)
-						v_ae1.done;
-					}
-	
-				} // end g_CSE_DMR_RET_020
-
-				group g_CSE_DMR_RET_021 {
-		
-					/**
-					 * @desc Check that the IUT returns successfully only attributes of TARGET_RESOURCE_ADDRESS resource when the Result Content is set to 1 (attributes)
-					 * 
-					 */
-					testcase TC_CSE_DMR_RET_021_CNT() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.container := mw_contentContainer_rc1;
-		                        
-						v_ae1.start(f_CSE_DMR_RET_021(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase));//Container
-						v_ae1.done;
-					}
-
-					testcase TC_CSE_DMR_RET_021_GRP() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.group_ := mw_contentGroup_rc1;
-		
-						v_ae1.start(f_CSE_DMR_RET_021(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase));//Group
-						v_ae1.done;
-					}
-		
-					testcase TC_CSE_DMR_RET_021_ACP() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.accessControlPolicy := mw_contentAcp_rc1;
-			
-						v_ae1.start(f_CSE_DMR_RET_021(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase));//AccessControlPolicy
-						v_ae1.done;
-					}
-	
-					testcase TC_CSE_DMR_RET_021_SCH() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.schedule := mw_contentSchedule_rc1;
-			
-						v_ae1.start(f_CSE_DMR_RET_021(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase));//Schedule 
-						v_ae1.done;
-					}
-		
-					testcase TC_CSE_DMR_RET_021_PCH() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.pollingChannel := mw_contentPollingChannelBase;
-			
-						v_ae1.start(f_CSE_DMR_RET_021(int15, m_createPollingChannelBase, v_contentResponse, omit, omit));//PollingChannel
-						v_ae1.done;
-					}
-		
-					testcase TC_CSE_DMR_RET_021_SUB() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.subscription := mw_contentSubscription_rc1;
-
-						v_ae1.start(f_CSE_DMR_RET_021(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase));//Subscription
-						v_ae1.done;
-					}
-					
-					testcase TC_CSE_DMR_RET_021_TS() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template PrimitiveContent v_contentResponse;
-
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.timeSeries := mw_contentTimeSeries_rc1;
-
-						v_ae1.start(f_CSE_DMR_RET_021(int29, m_createTimeSeriesBase, v_contentResponse, int23, m_createSubscriptionBase));//TimeSeries
-						v_ae1.done;
-					}
-	
-				} // end g_CSE_DMR_RET_021
-
-				group g_CSE_DMR_RET_022 {
-		
-					/**
-					 * @desc Check that the IUT returns successfully only attributes and child resources of TARGET_RESOURCE_ADDRESS resource when the Result Content is set to 4 (attributes and child resources)
-					 * 
-					 */
-					testcase TC_CSE_DMR_RET_022_CNT() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.container := mw_contentContainer_rc4;
-		                        
-						v_ae1.start(f_CSE_DMR_RET_022(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase));//Container
-						v_ae1.done;
-					}
-
-					testcase TC_CSE_DMR_RET_022_GRP() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.group_ := mw_contentGroup_rc4;
-		
-						v_ae1.start(f_CSE_DMR_RET_022(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase));//Group
-						v_ae1.done;
-					}
-		
-					testcase TC_CSE_DMR_RET_022_ACP() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.accessControlPolicy := mw_contentAcp_rc4;
-			
-						v_ae1.start(f_CSE_DMR_RET_022(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase));//AccessControlPolicy
-						v_ae1.done;
-					}
-	
-					testcase TC_CSE_DMR_RET_022_SCH() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.schedule := mw_contentSchedule_rc4;
-			
-						v_ae1.start(f_CSE_DMR_RET_022(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase));//Schedule
-						v_ae1.done;
-					}
-		
-					testcase TC_CSE_DMR_RET_022_PCH() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.pollingChannel := mw_contentPollingChannelBase;
-			
-						v_ae1.start(f_CSE_DMR_RET_022(int15, m_createPollingChannelBase, v_contentResponse, omit, omit));//PollingChannel
-						v_ae1.done;
-					}
-		
-					testcase TC_CSE_DMR_RET_022_SUB() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.subscription := mw_contentSubscription_rc4;
-
-						v_ae1.start(f_CSE_DMR_RET_022(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase));//Subscription
-						v_ae1.done;
-					}
-					
-					testcase TC_CSE_DMR_RET_022_TS() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template PrimitiveContent v_contentResponse;
-
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.timeSeries := mw_contentTimeSeries_rc4;
-
-						v_ae1.start(f_CSE_DMR_RET_022(int29, m_createTimeSeriesBase, v_contentResponse, int23, m_createSubscriptionBase));//TimeSeries
-						v_ae1.done;
-					}
-	
-				} // end g_CSE_DMR_RET_022
-
-				group g_CSE_DMR_RET_023 {
-		
-					/**
-					 * @desc Check that the IUT returns successfully only attributes and child resource references of TARGET_RESOURCE_ADDRESS resource when the Result Content is set to 5 (attributes and child resource references)
-					 * 
-					 */
-					testcase TC_CSE_DMR_RET_023_CNT() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.container := mw_contentContainer_rc5;
-		                        
-						v_ae1.start(f_CSE_DMR_RET_023(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase));//Container
-						v_ae1.done;
-					}
-
-					testcase TC_CSE_DMR_RET_023_GRP() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.group_ := mw_contentGroup_rc5;
-		
-						v_ae1.start(f_CSE_DMR_RET_023(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase));//Group
-						v_ae1.done;
-					}
-		
-					testcase TC_CSE_DMR_RET_023_ACP() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.accessControlPolicy := mw_contentAcp_rc5;
-			
-						v_ae1.start(f_CSE_DMR_RET_023(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase));//AccessControlPolicy
-						v_ae1.done;
-					}
-	
-					testcase TC_CSE_DMR_RET_023_SCH() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.schedule := mw_contentSchedule_rc5;
-			
-						v_ae1.start(f_CSE_DMR_RET_023(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase));//Schedule 
-						v_ae1.done;
-					}
-		
-					testcase TC_CSE_DMR_RET_023_PCH() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.pollingChannel := mw_contentPollingChannelBase;
-			
-						v_ae1.start(f_CSE_DMR_RET_023(int15, m_createPollingChannelBase, v_contentResponse, omit, omit));//PollingChannel
-						v_ae1.done;
-					}
-		
-					testcase TC_CSE_DMR_RET_023_SUB() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.subscription := mw_contentSubscription_rc5;
-
-						v_ae1.start(f_CSE_DMR_RET_023(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase));//Subscription
-						v_ae1.done;
-					}
-					
-					testcase TC_CSE_DMR_RET_023_TS() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template PrimitiveContent v_contentResponse;
-
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.timeSeries := mw_contentTimeSeries_rc5;
-
-						v_ae1.start(f_CSE_DMR_RET_023(int29, m_createTimeSeriesBase, v_contentResponse, int23, m_createSubscriptionBase));//TimeSeries
-						v_ae1.done;
-					}
-	
-				} // end g_CSE_DMR_RET_023
-
-				group g_CSE_DMR_RET_024 {
-		
-					/**
-					 * @desc Check that the IUT returns successfully only child resource references of TARGET_RESOURCE_ADDRESS resource when Result Content is set to 6 (child resource references)
-					 * 
-					 */
-					testcase TC_CSE_DMR_RET_024_CNT() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.container := mw_contentContainer_rc6;
-		                        
-						v_ae1.start(f_CSE_DMR_RET_024(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase));//Container
-						v_ae1.done;
-					}
-
-					testcase TC_CSE_DMR_RET_024_GRP() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.group_ := mw_contentGroup_rc6;
-		
-						v_ae1.start(f_CSE_DMR_RET_024(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase));//Group
-						v_ae1.done;
-					}
-		
-					testcase TC_CSE_DMR_RET_024_ACP() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.accessControlPolicy := mw_contentAcp_rc6;
-			
-						v_ae1.start(f_CSE_DMR_RET_024(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase));//AccessControlPolicy
-						v_ae1.done;
-					}
-	
-					testcase TC_CSE_DMR_RET_024_SCH() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.schedule := mw_contentSchedule_rc6;
-			
-						v_ae1.start(f_CSE_DMR_RET_024(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase));//Schedule
-						v_ae1.done;
-					}
-		
-					//Only Release 3
-					testcase TC_CSE_DMR_RET_024_PCH() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.pollingChannel := mw_contentPollingChannelBase;
-			
-						v_ae1.start(f_CSE_DMR_RET_024(int15, m_createPollingChannelBase, v_contentResponse, omit, omit));//PollingChannel
-						v_ae1.done;
-					}
-		
-					testcase TC_CSE_DMR_RET_024_SUB() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.subscription := mw_contentSubscription_rc6;
-
-						v_ae1.start(f_CSE_DMR_RET_024(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase));//Subscription
-						v_ae1.done;
-					}
-					
-					testcase TC_CSE_DMR_RET_024_TS() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template PrimitiveContent v_contentResponse;
-
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.timeSeries := mw_contentTimeSeries_rc6;
-
-						v_ae1.start(f_CSE_DMR_RET_024(int29, m_createTimeSeriesBase, v_contentResponse, int23, m_createSubscriptionBase));//TimeSeries
-						v_ae1.done;
-					}
-	
-				} // end g_CSE_DMR_RET_024
-
-				group g_CSE_DMR_RET_025 {
-		
-					/**
-					 * @desc Check that the IUT returns successfully only child resources of TARGET_RESOURCE_ADDRESS resource when Result Content is set to 8 (child resources)
-					 * 
-					 */
-					testcase TC_CSE_DMR_RET_025_CNT() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.container := mw_contentContainer_rc8;
-		                        
-						v_ae1.start(f_CSE_DMR_RET_025(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase));//Container
-						v_ae1.done;
-					}
-
-					testcase TC_CSE_DMR_RET_025_GRP() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.group_ := mw_contentGroup_rc8;
-		
-						v_ae1.start(f_CSE_DMR_RET_025(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase));//Group
-						v_ae1.done;
-					}
-		
-					testcase TC_CSE_DMR_RET_025_ACP() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.accessControlPolicy := mw_contentAcp_rc8;
-			
-						v_ae1.start(f_CSE_DMR_RET_025(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase));//AccessControlPolicy
-						v_ae1.done;
-					}
-	
-					testcase TC_CSE_DMR_RET_025_SCH() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.schedule := mw_contentSchedule_rc8;
-			
-						v_ae1.start(f_CSE_DMR_RET_025(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase));//Schedule 
-						v_ae1.done;
-					}
-		
-					//Only Release 3
-					testcase TC_CSE_DMR_RET_025_PCH() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.pollingChannel := mw_contentPollingChannelBase;
-			
-						v_ae1.start(f_CSE_DMR_RET_025(int15, m_createPollingChannelBase, v_contentResponse, omit, omit));//PollingChannel
-						v_ae1.done;
-					}
-		
-					testcase TC_CSE_DMR_RET_025_SUB() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.subscription := mw_contentSubscription_rc8;
-
-						v_ae1.start(f_CSE_DMR_RET_025(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase));//Subscription
-						v_ae1.done;
-					}
-					
-					testcase TC_CSE_DMR_RET_025_TS() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template PrimitiveContent v_contentResponse;
-
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_contentResponse.timeSeries := mw_contentTimeSeries_rc8;
-
-						v_ae1.start(f_CSE_DMR_RET_025(int29, m_createTimeSeriesBase, v_contentResponse, int23, m_createSubscriptionBase));//TimeSeries
-						v_ae1.done;
-					}
-	
-				} // end g_CSE_DMR_RET_025
-			
-			}//end group Retrieve
-			
-			group Update {
-				group g_CSE_DMR_UPD_001 {
-					
-					/**
-					 * @desc Check that the IUT updates successfully the value of the attribute ATTRIBUTE_NAME of the TARGET_RESOURCE_ADDRESS resource 
-					 * 
-					 */
-					testcase TC_CSE_DMR_UPD_001_SCH_LBL() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var Labels v_labels_1 := {"VALUE_1"};
-						var Labels v_labels_2 := {"VALUE_2"};
-						var template RequestPrimitive v_createRequest := m_createScheduleBase;
-						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
-						var ResponsePrimitive v_responsePrimitive;
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.schedule.labels := v_labels_1;
-						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;
-						
-						 
-																		
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							//Check attribute 1
-							if(ispresent(v_responsePrimitive.primitiveContent)) {
-								if(ischosen(v_responsePrimitive.primitiveContent.schedule)) {
-									if(v_responsePrimitive.primitiveContent.schedule.labels != v_labels_2){
-										setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
-									}
-								}
-							}
-						
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
-	
-							//Check that the resource has been udpated correctly
-							if(ischosen(v_primitiveContentRetrieveResource.schedule)) {
-								if(v_primitiveContentRetrieveResource.schedule.labels != v_labels_2){
-									setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
-								}
-							}
-						}						
-					
-					}
-					
-					testcase TC_CSE_DMR_UPD_001_PCH_LBL() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var Labels v_labels_1 := {"VALUE_1"};
-						var Labels v_labels_2 := {"VALUE_2"};
-						var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
-						var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
-						var ResponsePrimitive v_responsePrimitive;
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.pollingChannel.labels := v_labels_1;
-						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;
-						
-						 
-																		
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							//Check attribute 1
-							if(ispresent(v_responsePrimitive.primitiveContent)) {
-								if(ischosen(v_responsePrimitive.primitiveContent.pollingChannel)) {
-									if(v_responsePrimitive.primitiveContent.pollingChannel.labels != v_labels_2){
-										setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
-									}
-								}
-							}
-						
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
-	
-							//Check that the resource has been udpated correctly
-							if(ischosen(v_primitiveContentRetrieveResource.pollingChannel)) {
-								if(v_primitiveContentRetrieveResource.pollingChannel.labels != v_labels_2){
-									setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
-								}
-							}
-						}
-					}
-					
-					testcase TC_CSE_DMR_UPD_001_TS_LBL() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var Labels v_labels_1 := {"VALUE_1"};
-						var Labels v_labels_2 := {"VALUE_2"};
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
-						var ResponsePrimitive v_responsePrimitive;
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.timeSeries.labels := v_labels_1;
-						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;
-	
-	 
-													
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							//Check attribute 1
-							if(ispresent(v_responsePrimitive.primitiveContent)) {
-								if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
-									if(v_responsePrimitive.primitiveContent.timeSeries.labels != v_labels_2){
-										setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
-									}
-								}
-							}
-	
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
-
-							//Check that the resource has been udpated correctly
-							if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
-								if(v_primitiveContentRetrieveResource.timeSeries.labels != v_labels_2){
-									setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
-								}
-							}
-						}
-					}
-					
-				} // end g_CSE_DMR_UPD_001
-				
-				group g_CSE_DMR_UPD_002 {
-					
-					/**
-					 * @desc Check that the IUT adds successfully the attribute ATTRIBUTE_NAME to the TARGET_RESOURCE_ADDRESS resource
-					 * 
-					 */
-					testcase TC_CSE_DMR_UPD_002_SCH_LBL() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var Labels v_labels_1 := {"VALUE_1"};
-						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
-						var ResponsePrimitive v_responsePrimitive;
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						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;
-						
-						 
-																		
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							//Check attribute 1
-							if(ispresent(v_responsePrimitive.primitiveContent)) {
-								if(ischosen(v_responsePrimitive.primitiveContent.schedule)) {
-									if(v_responsePrimitive.primitiveContent.schedule.labels != v_labels_1){
-										setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
-									}
-								}
-							}
-							
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
-							
-							//Check that the resource has been udpated correctly
-							if(ischosen(v_primitiveContentRetrieveResource.schedule)) {
-								if(v_primitiveContentRetrieveResource.schedule.labels != v_labels_1){
-									setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
-								}
-							}
-						}
-					}
-					
-					testcase TC_CSE_DMR_UPD_002_PCH_LBL() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var Labels v_labels_1 := {"VALUE_1"};
-						var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
-						var ResponsePrimitive v_responsePrimitive;
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						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;
-						
-						 
-																		
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							//Check attribute 1
-							if(ispresent(v_responsePrimitive.primitiveContent)) {
-								if(ischosen(v_responsePrimitive.primitiveContent.pollingChannel)) {
-									if(v_responsePrimitive.primitiveContent.pollingChannel.labels != v_labels_1){
-										setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
-									}
-								}
-							}
-							
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
-							
-							//Check that the resource has been udpated correctly
-						  if(ischosen(v_primitiveContentRetrieveResource.pollingChannel)) {
-							  if(v_primitiveContentRetrieveResource.pollingChannel.labels != v_labels_1){
-										  setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
-								}
-							}
-						}
-					}
-					
-					testcase TC_CSE_DMR_UPD_002_TS_LBL() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var Labels v_labels_1 := {"VALUE_1"};
-						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
-						var ResponsePrimitive v_responsePrimitive;
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						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;
-	
-	 
-													
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							//Check attribute 1
-							if(ispresent(v_responsePrimitive.primitiveContent)) {
-								if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
-									if(v_responsePrimitive.primitiveContent.timeSeries.labels != v_labels_1){
-										setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
-									}
-								}
-							}
-		
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
-		
-							//Check that the resource has been udpated correctly
-						  if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
-							  if(v_primitiveContentRetrieveResource.timeSeries.labels != v_labels_1){
-										  setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
-								}
-							}
-						}
-					}
-					
-				} // end g_CSE_DMR_UPD_002
-				
-				group g_CSE_DMR_UPD_003 {
-					
-					/**
-					 * @desc Check that the IUT deletes successfully the attribute ATTRIBUTE_NAME from the TARGET_RESOURCE_ADDRESS resource 
-					 * 
-					 */
-					testcase TC_CSE_DMR_UPD_003_SCH_LBL() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var Labels v_labels_1 := {"VALUE_1"};
-						var Labels v_labels_2 := {"To be deleted"};
-						var AttributeAux_list v_nullFields;
-						var ResponsePrimitive v_responsePrimitive;
-						var template RequestPrimitive v_createRequest := m_createScheduleBase;
-						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.schedule.labels := v_labels_1;
-						v_updateRequest.primitiveContent.schedule.labels := v_labels_2;
-						
-						v_nullFields := {{"labels", omit}};
-						
-						v_ae1.start(f_CSE_DMR_UPD_003(int18, v_createRequest, v_updateRequest, v_nullFields));//Schedule
-						v_ae1.done;
-						
-						 
-																		
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							//Check attribute 1
-							if(ispresent(v_responsePrimitive.primitiveContent)) {
-								if(ischosen(v_responsePrimitive.primitiveContent.schedule)) {
-									if(ispresent(v_responsePrimitive.primitiveContent.schedule.labels)){
-										setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly")
-									}
-								}
-							}
-							
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
-							
-							//Check that the resource has been udpated correctly
-							if(ischosen(v_primitiveContentRetrieveResource.schedule)) {
-								if(ispresent(v_primitiveContentRetrieveResource.schedule.labels)) {
-								  if(not(match(v_primitiveContentRetrieveResource.schedule.labels,{""}))){
-									setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly")
-									}
-								}
-							}
-						}
-					}
-					
-					testcase TC_CSE_DMR_UPD_003_PCH_LBL() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var Labels v_labels_1 := {"VALUE_1"};
-						var Labels v_labels_2 := {"To be deleted"};
-						var AttributeAux_list v_nullFields;
-						var ResponsePrimitive v_responsePrimitive;
-						var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
-						var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.pollingChannel.labels := v_labels_1;
-						v_updateRequest.primitiveContent.pollingChannel.labels := v_labels_2;
-						
-						v_nullFields := {{"labels", omit}};
-						
-						v_ae1.start(f_CSE_DMR_UPD_003(int15, v_createRequest, v_updateRequest, v_nullFields));//PollingChannel
-						v_ae1.done;
-						
-						 
-																		
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							//Check attribute 1
-							if(ispresent(v_responsePrimitive.primitiveContent)) {
-								if(ischosen(v_responsePrimitive.primitiveContent.pollingChannel)) {
-									if(ispresent(v_responsePrimitive.primitiveContent.pollingChannel.labels)){
-										setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly")
-									}
-								}
-							}
-							
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
-							
-							//Check that the resource has been udpated correctly
-						  if(ischosen(v_primitiveContentRetrieveResource.pollingChannel)) {
-							  if(ispresent(v_primitiveContentRetrieveResource.pollingChannel.labels)) {
-								if(not(match(v_primitiveContentRetrieveResource.pollingChannel.labels,{""}))){
-								  setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly")
-								}
-							}
-						  }
-						}
-					}
-					
-					testcase TC_CSE_DMR_UPD_003_TS_LBL() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var Labels v_labels_1 := {"VALUE_1"};
-						var Labels v_labels_2 := {"To be deleted"};
-						var AttributeAux_list v_nullFields;
-						var ResponsePrimitive v_responsePrimitive;
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.timeSeries.labels := v_labels_1;
-						v_updateRequest.primitiveContent.timeSeries.labels := v_labels_2;
-	
-						v_nullFields := {{"labels", omit}};
-	
-						v_ae1.start(f_CSE_DMR_UPD_003(int29, v_createRequest, v_updateRequest, v_nullFields));//TimeSeries
-						v_ae1.done;
-	
-	 
-													
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							//Check attribute 1
-							if(ispresent(v_responsePrimitive.primitiveContent)) {
-								if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
-									if(ispresent(v_responsePrimitive.primitiveContent.timeSeries.labels)){
-										setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly")
-									}
-								}
-							}
-		
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
-		
-							//Check that the resource has been udpated correctly
-							if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
-								if(ispresent(v_primitiveContentRetrieveResource.timeSeries.labels)) {
-								  if(not(match(v_primitiveContentRetrieveResource.timeSeries.labels,{""}))){
-									setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly")
-									}
-								}
-							}
-						}
-					}
-					
-				} // end g_CSE_DMR_UPD_003
-				
-				group g_CSE_DMR_UPD_004 {
-					
-					/**
-					 * @desc Check that the IUT updates  the value of the attribute ATTRIBUTE_NAME_1, and creates the ATTRIBUTE_NAME_2 and deletes the ATTRIBUTE_NAME_3 of the TARGET_RESOURCE_ADDRESS resource
-					 * 
-					 */
-					testcase TC_CSE_DMR_UPD_004_SCH_SE_AT_LBL() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var Labels v_labels_1 := {"To be deleted"};
-						var AttributeAux_list v_nullFields;
-						var template RequestPrimitive v_createRequest := m_createScheduleBase;
-						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
-						var ResponsePrimitive v_responsePrimitive;
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.schedule.scheduleElement := {{"0 0 0,1,2 1 1 * *"}};//Attribute 1
-						v_updateRequest.primitiveContent.schedule.scheduleElement := {{"1 1 1,2 1 1 * *"}}; //Attribute 1
-						v_updateRequest.primitiveContent.schedule.announceTo := {f_getCompletePoA()};//Attribute 2
-						v_updateRequest.primitiveContent.schedule.labels := v_labels_1;//Attribute 3
-                						
-						v_nullFields := {{"labels", omit}};
-						
-						v_ae1.start(f_CSE_DMR_UPD_004(int18, v_createRequest, v_updateRequest, v_nullFields));//Schedule
-						v_ae1.done;
-						
-						 
-																		
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							if(ispresent(v_responsePrimitive.primitiveContent)) {
-								if(ischosen(v_responsePrimitive.primitiveContent.schedule)) {
-									//Check attribute 1
-									if(v_responsePrimitive.primitiveContent.schedule.scheduleElement != valueof(v_updateRequest.primitiveContent.schedule.scheduleElement)){
-										setverdict(fail, __SCOPE__ & ": Error: Schedule Element attribute not updated correctly")
-									}
-									//Check attribute 2
-									if(v_responsePrimitive.primitiveContent.schedule.announceTo != valueof(v_updateRequest.primitiveContent.schedule.announceTo)){
-										setverdict(fail, __SCOPE__ & ": Error: Announce_To attribute not updated correctly")
-									}
-									//Check attribute 3
-									if(ispresent(v_responsePrimitive.primitiveContent.schedule.labels)){
-										setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly")
-									}
-								}
-							}
-							
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
-							
-							//Check that the resource has been udpated correctly
-							if(ischosen(v_primitiveContentRetrieveResource.schedule)) {
-								//Check attribute 1
-								if(v_primitiveContentRetrieveResource.schedule.scheduleElement != valueof(v_updateRequest.primitiveContent.schedule.scheduleElement)){
-									setverdict(fail, __SCOPE__ & ": Error: Schedule Element attribute not updated correctly")
-						}
-								//Check attribute 2
-								if(v_primitiveContentRetrieveResource.schedule.announceTo != valueof(v_updateRequest.primitiveContent.schedule.announceTo)){
-									setverdict(fail, __SCOPE__ & ": Error: Announce_To attribute not updated correctly")
-					}
-								//Check attribute 3
-								if(ispresent(v_primitiveContentRetrieveResource.schedule.labels)){
-									setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly")
-								}
-							}
-						}
-					}
-					
-					testcase TC_CSE_DMR_UPD_004_TS_ET_MNI_LBL() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var Labels v_labels_1 := {"VALUE_1"};
-						var Labels v_labels_2 := {"To be deleted"};
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
-						var ResponsePrimitive v_responsePrimitive;
-						var AttributeAux_list v_nullFields;
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.timeSeries.labels := v_labels_1;//Attribute 3
-						v_updateRequest.primitiveContent.timeSeries.expirationTime := "20301231T012345";//Attribute 1
-						v_updateRequest.primitiveContent.timeSeries.maxNrOfInstances := 5;//Attribute 2
-						v_updateRequest.primitiveContent.timeSeries.labels := v_labels_2;//Attribute 3
-						
-						v_nullFields := {{"labels", omit}};
-						
-						v_ae1.start(f_CSE_DMR_UPD_004(int29, v_createRequest, v_updateRequest, v_nullFields));//TimeSeries
-						v_ae1.done;					 
-																		
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							if(ispresent(v_responsePrimitive.primitiveContent)) {
-								if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
-									//Check attribute 1
-									if(v_responsePrimitive.primitiveContent.timeSeries.expirationTime != valueof(v_updateRequest.primitiveContent.timeSeries.expirationTime)){
-										setverdict(fail, __SCOPE__ & ": Error: Expiration Time attribute not updated correctly")
-									}
-									//Check attribute 2
-									if(v_responsePrimitive.primitiveContent.timeSeries.maxNrOfInstances != valueof(v_updateRequest.primitiveContent.timeSeries.maxNrOfInstances)){
-										setverdict(fail, __SCOPE__ & ": Error: MaxNrOfInstances attribute not updated correctly")
-									}
-									//Check attribute 3
-									if(ispresent(v_responsePrimitive.primitiveContent.timeSeries.labels)){
-										setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly")
-									}
-								}
-							}
-							
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
-							
-							//Check that the resource has been udpated correctly
-							  if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
-								  //Check attribute 1
-								  if(v_primitiveContentRetrieveResource.timeSeries.expirationTime != valueof(v_updateRequest.primitiveContent.timeSeries.expirationTime)){
-									  setverdict(fail, __SCOPE__ & ": Error: Expiration Time attribute not updated correctly")
-								  }
-								  //Check attribute 2
-								  if(v_primitiveContentRetrieveResource.timeSeries.maxNrOfInstances != valueof(v_updateRequest.primitiveContent.timeSeries.maxNrOfInstances)){
-									  setverdict(fail, __SCOPE__ & ": Error: MaxNrOfInstances attribute not updated correctly")
-								  }
-								  //Check attribute 3
-								  if(ispresent(v_primitiveContentRetrieveResource.timeSeries.labels)){
-									  setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly")
-								  }
-							  }
-						}
-					}
-					
-				} // end g_CSE_DMR_UPD_004
-				
-				group g_CSE_DMR_UPD_006{
-					
-					/**
-					 * @desc Check that the IUT responds with an error when the AE tries to update the attribute ATTRIBUTE_NAME of a TARGET_RESOURCE_ADDRESS resource without having privileges for the UPDATE operation
-					 * 
-					 */
-					testcase TC_CSE_DMR_UPD_006_SCH_LBL() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var Labels v_labels_1 := {"VALUE_1"};
-						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						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;
-						
-						if(getverdict == pass){ 
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
-							//Check that the resource has NOT been udpated
-							  if(ischosen(v_primitiveContentRetrieveResource.schedule)) {
-							   if(v_primitiveContentRetrieveResource.schedule.labels == v_labels_1){
-								 setverdict(fail, __SCOPE__ & ": Error: Labels attribute updated")
-								}
-							}
-						}
-					}
-					
-					testcase TC_CSE_DMR_UPD_006_TS_LBL() runs on Tester system CseSystem {
-						// Local variable
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var Labels v_labels_1 := {"VALUE_1"};
-						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						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;
-	
-						if(getverdict == pass){ 
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
-
-							//Check that the resource has NOT been udpated
-							  if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
-							   if(v_primitiveContentRetrieveResource.timeSeries.labels == v_labels_1){
-								 setverdict(fail, __SCOPE__ & ": Error: Labels attribute updated")
-								}
-							}
-						}
-					}
-					
-				} // end g_CSE_DMR_UPD_006
-				
-				group g_CSE_DMR_UPD_007{
-					
-					/**
-					 * @desc Check that the IUT responds with an error when the AE tries to update a non-RW attribute ATTRIBUTE_NAME of a TARGET_RESOURCE_ADDRESS resource
-					 * 
-					 */
-					testcase TC_CSE_DMR_UPD_007_SCH_CT() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var Timestamp v_creationTime := "21001231T012345";
-						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_updateRequest.primitiveContent := {schedule_update_invalid := m_contentUpdateSchedule_invalid};
-						v_updateRequest.primitiveContent.schedule_update_invalid.creationTime := v_creationTime;
-										
-						v_ae1.start(f_CSE_DMR_UPD_007(int18, m_createScheduleBase, v_updateRequest));//Schedule
-						v_ae1.done;
-						
-						if(getverdict == pass){ 
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
-							//Check that the resource has NOT been udpated
-							  if(ischosen(v_primitiveContentRetrieveResource.schedule_update_invalid)) {
-							   if(v_primitiveContentRetrieveResource.schedule_update_invalid.creationTime == v_creationTime){
-								 setverdict(fail, __SCOPE__ & ": Error: Creation Time attribute updated")
-								}
-							}
-						}
-					}
-					
-					testcase TC_CSE_DMR_UPD_007_PCH_CT() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var Timestamp v_creationTime := "21001231T012345";
-						var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_updateRequest.primitiveContent := {pollingChannel_update_invalid := m_contentUpdatePollingChannel_invalid};
-						v_updateRequest.primitiveContent.pollingChannel_update_invalid.creationTime := v_creationTime;
-							
-						v_ae1.start(f_CSE_DMR_UPD_007(int15, m_createPollingChannelBase, v_updateRequest));//PollingChannel
-						v_ae1.done;
-						
-						if(getverdict == pass){ 
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
-							//Check that the resource has NOT been udpated
-							  if(ischosen(v_primitiveContentRetrieveResource.pollingChannel_update_invalid)) {
-							   if(v_primitiveContentRetrieveResource.pollingChannel_update_invalid.creationTime == v_creationTime){
-								 setverdict(fail, __SCOPE__ & ": Error: Creation Time attribute updated")
-								}
-							}
-						}
-					}
-					
-					testcase TC_CSE_DMR_UPD_007_TS_CT() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var Timestamp v_creationTime := "21001231T012345";
-						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_updateRequest.primitiveContent := {timeSeries_update_invalid := m_contentUpdateTimeSeries_invalid};
-						v_updateRequest.primitiveContent.timeSeries_update_invalid.creationTime := v_creationTime;
-		
-						v_ae1.start(f_CSE_DMR_UPD_007(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
-						v_ae1.done;
-	
-						if(getverdict == pass){ 
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
-							//Check that the resource has NOT been udpated
-							  if(ischosen(v_primitiveContentRetrieveResource.timeSeries_update_invalid)) {
-							   if(v_primitiveContentRetrieveResource.timeSeries_update_invalid.creationTime == v_creationTime){
-								 setverdict(fail, __SCOPE__ & ": Error: Creation Time attribute updated")
-								}
-							}
-						}
-					}
-					
-				} // end g_CSE_DMR_UPD_007			
-				
-				group g_CSE_DMR_UPD_008{
-					
-					/**
-					 * @desc Check that the IUT responds with an error when the AE tries to delete a mandatory RW attribute ATTRIBUTE_NAME of a TARGET_RESOURCE_ADDRESS resource
-					 * 
-					 */
-					testcase TC_CSE_DMR_UPD_008_SCH_ET() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var Timestamp v_expirationTime := "21001231T012345";
-						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
-						var AttributeAux_list v_nullFields;
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_nullFields := {{"expirationTime", omit}};
-						
-						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;
-						
-						if(getverdict == pass){ 
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
-							  //Check that the resource has NOT been udpated
-							  if(ischosen(v_primitiveContentRetrieveResource.schedule)) {
-							   if(v_primitiveContentRetrieveResource.schedule.expirationTime == v_expirationTime){
-								 setverdict(fail, __SCOPE__ & ": Error: Expiration time attribute updated")
-								}
-							}
-						}
-					}
-					
-					testcase TC_CSE_DMR_UPD_008_PCH_ET() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var Timestamp v_expirationTime := "21001231T012345";
-						var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
-						var AttributeAux_list v_nullFields;
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_nullFields := {{"expirationTime", omit}};
-						
-						v_updateRequest.primitiveContent.pollingChannel.expirationTime := v_expirationTime;
-							
-						v_ae1.start(f_CSE_DMR_UPD_008(int15, m_createPollingChannelBase, v_updateRequest, v_nullFields));//PollingChannel
-						v_ae1.done;
-						
-						if(getverdict == pass){ 
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
-							  //Check that the resource has NOT been udpated
-							  if(ischosen(v_primitiveContentRetrieveResource.pollingChannel)) {
-							   if(v_primitiveContentRetrieveResource.pollingChannel.expirationTime == v_expirationTime){
-								 setverdict(fail, __SCOPE__ & ": Error: Expiration time attribute updated")
-								}
-							}
-						}
-					}
-					
-				} // end g_CSE_DMR_UPD_008
-				
-				group g_CSE_DMR_UPD_009{
-					
-					/**
-					 * @desc Check that the IUT responds with an error when the AE tries to update an attribute of a  TARGET_RESOURCE_ADDRESS resource which does not exist
-					 * 
-					 */
-					testcase TC_CSE_DMR_UPD_009_SCH_EXC() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var XSD.PositiveInteger v_expirationCounter := 1;
-						var template RequestPrimitive v_createRequest := m_createScheduleBase;
-						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_updateRequest.primitiveContent := {schedule_update_invalid := m_contentUpdateSchedule_invalid};
-
-						v_updateRequest.primitiveContent.schedule_update_invalid.expirationCounter := v_expirationCounter;
-										
-						v_ae1.start(f_CSE_DMR_UPD_009(int18, v_createRequest, v_updateRequest));//Schedule
-						v_ae1.done;
-					}
-					
-					testcase TC_CSE_DMR_UPD_009_PCH_EXC() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var XSD.PositiveInteger v_expirationCounter := 1;
-						var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
-						var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_updateRequest.primitiveContent := {pollingChannel_update_invalid := m_contentUpdatePollingChannel_invalid};
-						
-						v_updateRequest.primitiveContent.pollingChannel_update_invalid.expirationCounter := v_expirationCounter;
-							
-						v_ae1.start(f_CSE_DMR_UPD_009(int15, v_createRequest, v_updateRequest));//PollingChannel
-						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;
-						var XSD.PositiveInteger v_expirationCounter := 1;
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
-
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_updateRequest.primitiveContent := {timeSeries_update_invalid := m_contentUpdateTimeSeries_invalid};
-	
-						v_updateRequest.primitiveContent.timeSeries_update_invalid.expirationCounter := v_expirationCounter;
-		
-						v_ae1.start(f_CSE_DMR_UPD_009(int29, v_createRequest, v_updateRequest));//TimeSeries
-						v_ae1.done;
-					}
-					
-				} // end g_CSE_DMR_UPD_009		
-				
-				group g_CSE_DMR_UPD_010{
-					
-					/**
-					 * @desc Check that the stateTag attribute of a RESOURCE_TYPE resource is increased when an update operation has been performed on its child resource
-					 * 
-					 */
-					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 template RequestPrimitive v_createRequest := m_createContainerBase;
-						var Labels v_labels_1:= {"VALUE_1"};
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						
-						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;
-	
-						if(getverdict == pass){ 
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
-							//Check that stateTag has been incremented
-							  if(ischosen(v_primitiveContentRetrieveResource.container)) {
-							   if(v_primitiveContentRetrieveResource.container.stateTag == 1){
-									setverdict(pass, __SCOPE__ & ": The stateTag attribute is incremented");	
-							   }else{
-									setverdict(fail, __SCOPE__ & ": Error the stateTag attribute is not incremented");
-							   }
-							}
-						}
-					}
-	
-					testcase TC_CSE_DMR_UPD_010_TS() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var RequestPrimitive v_updateRequest := valueof(m_updateTimeSeriesBase);
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var Labels v_labels_1:= {"VALUE_1"};
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_updateRequest.primitiveContent.timeSeries.labels := v_labels_1;
-		
-						v_ae1.start(f_CSE_DMR_UPD_010(int29, v_createRequest, v_updateRequest));//TimeSeries
-						v_ae1.done;
-	
-						if(getverdict == pass){ 
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
-							//Check that stateTag has been incremented
-							  if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
-							   if(v_primitiveContentRetrieveResource.timeSeries.stateTag == 1){
-									setverdict(pass, __SCOPE__ & ": The stateTag attribute is incremented");	
-							   }else{
-									setverdict(fail, __SCOPE__ & ": Error the stateTag attribute is not incremented");
-							   }
-							}
-						}
-					}
-	
-				} // end g_CSE_DMR_UPD_010		
-				
-				group g_CSE_DMR_UPD_011{
-					
-					/**
-					 * @desc Check that the IUT rejects the UPDATE Request of an existing RESOURCE_TYPE resource with error “OPERATION_NOT_ALLOWED”
-					 * 
-					 */
-					testcase TC_CSE_DMR_UPD_011_CNT_CNI() 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 template RequestPrimitive v_createParentRequest := m_createContainerBase;
-						var template RequestPrimitive v_createChildRequest := m_createContentInstanceBase;
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-		
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						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;
-
-						if(getverdict == pass){ 
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
-							//Check that the resource has NOT been udpated
-							if(ischosen(v_primitiveContentRetrieveResource.contentInstance)) {
-								if(v_primitiveContentRetrieveResource.contentInstance.labels == v_labels){
-							   		setverdict(fail, __SCOPE__ & ": Error: Labels attribute updated")
-						  		}
-							}
-						}
-					}
-
-					testcase TC_CSE_DMR_UPD_011_TS_TSI() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesInstanceBase;
-						var Labels v_labels:= {"LABEL"};
-						var template RequestPrimitive v_createParentRequest := m_createTimeSeriesBase;
-						var template RequestPrimitive v_createChildRequest := m_createTimeSeriesInstanceBase;
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-		
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						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;
-
-						if(getverdict == pass){ 
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
-							//Check that the resource has NOT been udpated
-							if(ischosen(v_primitiveContentRetrieveResource.timeSeriesInstance)) {
-								if(v_primitiveContentRetrieveResource.timeSeriesInstance.labels == v_labels){
-									setverdict(fail, __SCOPE__ & ": Error: Labels attribute updated")
-								}
-							}
-						}
-					}
-
-				} // end g_CSE_DMR_UPD_011
-
-				group g_CSE_DMR_UPD_014 {
-					
-					/**
-					 * @desc Check that the IUT updates successfully the value of the optional attribute OPTIONAL_ATTRIBUTE of the RESOURCE_TYPE resource. 
-					 * 
-					 */
-					testcase TC_CSE_DMR_UPD_014_ACP_ET() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var Timestamp v_expirationTime_1 := "20301231T012345";
-						var Timestamp v_expirationTime_2 := "20401020T012345";
-						var template RequestPrimitive v_createRequest := m_createAcpBase;
-						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
-						var ResponsePrimitive v_responsePrimitive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.accessControlPolicy.expirationTime := v_expirationTime_1;
-						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;
-						
-						 
-						
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							//Check attribute 1
-							if(ispresent(v_responsePrimitive.primitiveContent)) {
-								if(ischosen(v_responsePrimitive.primitiveContent.accessControlPolicy)) {
-									if(v_responsePrimitive.primitiveContent.accessControlPolicy.expirationTime != v_expirationTime_2){
-										setverdict(fail, __SCOPE__ & ": Error: ExpirationTime attribute not updated correctly")
-									}
-								}
-							}
-						}
-
-					}
-										
-					testcase TC_CSE_DMR_UPD_014_CNT_ET() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var Timestamp v_expirationTime_1 := "20301231T012345";
-						var Timestamp v_expirationTime_2 := "20401020T012345";
-						var ResponsePrimitive v_responsePrimitive;
-
-						var template RequestPrimitive v_createRequest := m_createContainerBase;
-						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.container.expirationTime := v_expirationTime_1;
-						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;
-						
-						 
-
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							//Check attribute 1
-							if(ispresent(v_responsePrimitive.primitiveContent)) {
-								if(ischosen(v_responsePrimitive.primitiveContent.container)) {
-									if(v_responsePrimitive.primitiveContent.container.expirationTime != v_expirationTime_2){
-										setverdict(fail, __SCOPE__ & ": Error: ExpirationTime attribute not updated correctly")
-									}
-								}
-							}
-						}
-					}
-										
-					testcase TC_CSE_DMR_UPD_014_CNT_OR() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var XSD.AnyURI v_ontologyRef_1 := "MyOntologyRef_1";
-						var XSD.AnyURI v_ontologyRef_2 := "MyOntologyRef_2";
-						var ResponsePrimitive v_responsePrimitive;
-	
-						var template RequestPrimitive v_createRequest := m_createContainerBase;
-						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.container.ontologyRef := v_ontologyRef_1;
-						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;
-						
-						 
-	
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							//Check attribute 1
-							if(ispresent(v_responsePrimitive.primitiveContent)) {
-								if(ischosen(v_responsePrimitive.primitiveContent.container)) {
-									if(v_responsePrimitive.primitiveContent.container.ontologyRef != v_ontologyRef_2){
-										setverdict(fail, __SCOPE__ & ": Error: OntologyRef attribute not updated correctly")
-									}
-								}
-							}
-						}
-					}
-					
-					testcase TC_CSE_DMR_UPD_014_SUB_ACPI() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var AcpType v_accessControlPolicyIDs_1 := {"NotInitialized_1"};
-						var AcpType v_accessControlPolicyIDs_2 := {"NotInitialized_2"};
-						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
-						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
-						var ResponsePrimitive v_responsePrimitive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.subscription.accessControlPolicyIDs := v_accessControlPolicyIDs_1;
-						v_updateRequest.primitiveContent.subscription.accessControlPolicyIDs := v_accessControlPolicyIDs_2;
-
-						v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription
-						v_ae1.done;
-						
-						 
-
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							//Check attribute 1
-							if(ispresent(v_responsePrimitive.primitiveContent)) {
-								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
-									if(v_responsePrimitive.primitiveContent.subscription.accessControlPolicyIDs != v_accessControlPolicyIDs_2){
-										setverdict(fail, __SCOPE__ & ": Error: AccessControlPolicyIDs attribute not updated correctly")
-									}
-								}
-							}
-						}
-
-					}
-					
-					testcase TC_CSE_DMR_UPD_014_SUB_BN() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var BatchNotify v_batchNotify_1 := {1, "PT1S"};
-						var BatchNotify v_batchNotify_2 := {2, "PT1S"};
-						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
-						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
-						var ResponsePrimitive v_responsePrimitive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.subscription.batchNotify := v_batchNotify_1;
-						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;
-						
-						 
-
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							//Check attribute 1
-							if(ispresent(v_responsePrimitive.primitiveContent)) {
-								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
-									if(v_responsePrimitive.primitiveContent.subscription.batchNotify != v_batchNotify_2){
-										setverdict(fail, __SCOPE__ & ": Error: EventNotificationCriteria attribute not updated correctly")
-									}
-								}
-							}
-						}
-
-					}
-					
-					testcase TC_CSE_DMR_UPD_014_SUB_ENC() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var EventNotificationCriteria v_eventNotificationCriteria_1 := valueof(m_eventNotificationCriteria({int1}, -));
-						var EventNotificationCriteria v_eventNotificationCriteria_2 := valueof(m_eventNotificationCriteria({int2}, -));
-						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
-						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
-						var ResponsePrimitive v_responsePrimitive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.subscription.eventNotificationCriteria := v_eventNotificationCriteria_1;
-						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;
-						
-						 
-
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							//Check attribute 1
-							if(ispresent(v_responsePrimitive.primitiveContent)) {
-								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
-									if(v_responsePrimitive.primitiveContent.subscription.eventNotificationCriteria != v_eventNotificationCriteria_2){
-										setverdict(fail, __SCOPE__ & ": Error: EventNotificationCriteria attribute not updated correctly")
-									}
-								}
-							}
-						}
-
-					}
-					
-					testcase TC_CSE_DMR_UPD_014_SUB_ET() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var Timestamp v_expirationTime_1 := "20301231T012345";
-						var Timestamp v_expirationTime_2 := "20401020T012345";
-						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
-						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
-						var ResponsePrimitive v_responsePrimitive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.subscription.expirationTime := v_expirationTime_1;
-						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;
-						
-						 
-
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							//Check attribute 1
-							if(ispresent(v_responsePrimitive.primitiveContent)) {
-								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
-									if(v_responsePrimitive.primitiveContent.subscription.expirationTime != v_expirationTime_2){
-										setverdict(fail, __SCOPE__ & ": Error: ExpirationTime attribute not updated correctly")
-									}
-								}
-							}
-						}
-
-					}
-					
-					testcase TC_CSE_DMR_UPD_014_SUB_EXC() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var XSD.PositiveInteger v_expirationCounter_1 := 10;
-						var XSD.PositiveInteger v_expirationCounter_2 := 20;
-						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
-						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
-						var ResponsePrimitive v_responsePrimitive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.subscription.expirationCounter := v_expirationCounter_1;
-						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;
-						
-						 
-
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							//Check attribute 1
-							if(ispresent(v_responsePrimitive.primitiveContent)) {
-								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
-									if(v_responsePrimitive.primitiveContent.subscription.expirationCounter != v_expirationCounter_2){
-										setverdict(fail, __SCOPE__ & ": Error: ExpirationCounter attribute not updated correctly")
-									}
-								}
-							}
-						}
-
-					}
-					
-					testcase TC_CSE_DMR_UPD_014_SUB_GPI() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var XSD.AnyURI v_groupID_1 := "MyGroupID_1";
-						var XSD.AnyURI v_groupID_2 := "MyGroupID_2";
-						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
-						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
-						var ResponsePrimitive v_responsePrimitive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.subscription.groupID := v_groupID_1;
-						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;
-						
-						 
-
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							//Check attribute 1
-							if(ispresent(v_responsePrimitive.primitiveContent)) {
-								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
-									if(v_responsePrimitive.primitiveContent.subscription.groupID != v_groupID_2){
-										setverdict(fail, __SCOPE__ & ": Error: GroupID attribute not updated correctly")
-									}
-								}
-							}
-						}
-
-					}
-					
-					testcase TC_CSE_DMR_UPD_014_SUB_LN() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var XSD.Boolean v_latestNotify_1 := true;
-						var XSD.Boolean v_latestNotify_2 := false;
-						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
-						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
-						var ResponsePrimitive v_responsePrimitive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.subscription.latestNotify := v_latestNotify_1;
-						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;
-						
-						 
-
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							//Check attribute 1
-							if(ispresent(v_responsePrimitive.primitiveContent)) {
-								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
-									if(v_responsePrimitive.primitiveContent.subscription.latestNotify != v_latestNotify_2){
-										setverdict(fail, __SCOPE__ & ": Error: LatestNotify attribute not updated correctly")
-									}
-								}
-							}
-						}
-
-					}
-					
-					testcase TC_CSE_DMR_UPD_014_SUB_NCT() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-					
-						var NotificationContentType v_notificationContentType_1 := int1;
-						var NotificationContentType v_notificationContentType_2 := int2;
-						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
-						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
-						var ResponsePrimitive v_responsePrimitive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.subscription.notificationContentType := v_notificationContentType_1;
-						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;
-						
-						 
-
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							//Check attribute 1
-							if(ispresent(v_responsePrimitive.primitiveContent)) {
-								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
-									if(v_responsePrimitive.primitiveContent.subscription.notificationContentType != v_notificationContentType_2){
-										setverdict(fail, __SCOPE__ & ": Error: NotificationContentType attribute not updated correctly")
-									}
-								}
-							}
-						}
-
-					}
-					
-					testcase TC_CSE_DMR_UPD_014_SUB_NEC() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var EventCat v_notificationEventCat_1 := {alt_1 := 100};
-						var EventCat v_notificationEventCat_2 := {alt_1 := 101};
-						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
-						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
-						var ResponsePrimitive v_responsePrimitive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.subscription.notificationEventCat := v_notificationEventCat_1;
-						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;
-						
-						 
-
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							//Check attribute 1
-							if(ispresent(v_responsePrimitive.primitiveContent)) {
-								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
-									if(v_responsePrimitive.primitiveContent.subscription.notificationEventCat != v_notificationEventCat_2){
-										setverdict(fail, __SCOPE__ & ": Error: NotificationEventCat attribute not updated correctly")
-									}
-								}
-							}
-						}
-
-					}
-					
-					testcase TC_CSE_DMR_UPD_014_SUB_NFU() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var XSD.AnyURI v_notificationForwardingURI_1 := "MyForwardingURI_1";
-						var XSD.AnyURI v_notificationForwardingURI_2 := "MyForwardingURI_2";
-						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
-						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
-						var ResponsePrimitive v_responsePrimitive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.subscription.notificationForwardingURI := v_notificationForwardingURI_1;
-						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;
-						
-						 
-
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							//Check attribute 1
-							if(ispresent(v_responsePrimitive.primitiveContent)) {
-								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
-									if(v_responsePrimitive.primitiveContent.subscription.notificationForwardingURI != v_notificationForwardingURI_2){
-										setverdict(fail, __SCOPE__ & ": Error: NotificationForwardingURI attribute not updated correctly")
-									}
-								}
-							}
-						}
-
-					}
-					
-					testcase TC_CSE_DMR_UPD_014_SUB_NSP() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var XSD.PositiveInteger v_notificationStoragePriority_1 := 1;
-						var XSD.PositiveInteger v_notificationStoragePriority_2 := 2;
-						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
-						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
-						var ResponsePrimitive v_responsePrimitive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.subscription.notificationStoragePriority := v_notificationStoragePriority_1;
-						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;
-						
-						 
-
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							//Check attribute 1
-							if(ispresent(v_responsePrimitive.primitiveContent)) {
-								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
-									if(v_responsePrimitive.primitiveContent.subscription.notificationStoragePriority != v_notificationStoragePriority_2){
-										setverdict(fail, __SCOPE__ & ": Error: NotificationStoragePriority attribute not updated correctly")
-									}
-								}
-							}
-						}
-
-					}
-					
-					testcase TC_CSE_DMR_UPD_014_SUB_PN() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var PendingNotification v_pendingNotification_1 := int1;
-						var PendingNotification v_pendingNotification_2 := int2;
-						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
-						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
-						var ResponsePrimitive v_responsePrimitive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.subscription.pendingNotification := v_pendingNotification_1;
-						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;
-						
-						 
-
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							//Check attribute 1
-							if(ispresent(v_responsePrimitive.primitiveContent)) {
-								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
-									if(v_responsePrimitive.primitiveContent.subscription.pendingNotification != v_pendingNotification_2){
-										setverdict(fail, __SCOPE__ & ": Error: PendingNotification attribute not updated correctly")
-									}
-								}
-							}
-						}
-
-					}
-					
-					testcase TC_CSE_DMR_UPD_014_SUB_RL() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var RateLimit v_rateLimit_1 := {0, omit};
-						var RateLimit v_rateLimit_2 := {1, omit};
-						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
-						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
-						var ResponsePrimitive v_responsePrimitive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.subscription.rateLimit := v_rateLimit_1;
-						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;
-						
-						 
-
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							//Check attribute 1
-							if(ispresent(v_responsePrimitive.primitiveContent)) {
-								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
-									if(v_responsePrimitive.primitiveContent.subscription.rateLimit != v_rateLimit_2){
-										setverdict(fail, __SCOPE__ & ": Error: RateLimit attribute not updated correctly")
-									}
-								}
-							}
-						}
-
-					}
-					
-					testcase TC_CSE_DMR_UPD_014_TS_ACPI() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var AcpType v_accessControlPolicyIDs_1 := {"NotInitialized_1"};
-						var AcpType v_accessControlPolicyIDs_2 := {"NotInitialized_2"};
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
-						var ResponsePrimitive v_responsePrimitive;
-	
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.timeSeries.accessControlPolicyIDs := v_accessControlPolicyIDs_1;
-						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;	 
-	
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							//Check attribute 1
-							if(ispresent(v_responsePrimitive.primitiveContent)) {
-								if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
-									if(v_responsePrimitive.primitiveContent.timeSeries.accessControlPolicyIDs != v_accessControlPolicyIDs_2){
-										setverdict(fail, __SCOPE__ & ": Error: AccessControlPolicyIDs attribute not updated correctly")
-									}
-								}
-							}
-						}
-	
-					}
-					
-					testcase TC_CSE_DMR_UPD_014_TS_LBL() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var Labels v_labels_1 := {"VALUE_1"};
-						var Labels v_labels_2 := {"VALUE_2"};
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
-						var ResponsePrimitive v_responsePrimitive;
-
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.timeSeries.labels := v_labels_1;
-						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;	 
-
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							//Check attribute 1
-							if(ispresent(v_responsePrimitive.primitiveContent)) {
-								if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
-									if(v_responsePrimitive.primitiveContent.timeSeries.labels != v_labels_2){
-										setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
-									}
-								}
-							}
-						}
-
-					}
-					
-					testcase TC_CSE_DMR_UPD_014_TS_MBS() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var XSD.NonNegativeInteger v_maxByteSize_1 := 256;
-						var XSD.NonNegativeInteger v_maxByteSize_2 := 512;
-						var ResponsePrimitive v_responsePrimitive;
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
-
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize_1;
-						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;	 
-
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							//Check attribute 1
-							if(ispresent(v_responsePrimitive.primitiveContent)) {
-								if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
-									if(v_responsePrimitive.primitiveContent.timeSeries.maxByteSize != v_maxByteSize_2){
-										setverdict(fail, __SCOPE__ & ": Error: MaxByteSize attribute not updated correctly")
-									}
-								}
-							}
-						}
-					}
-
-					testcase TC_CSE_DMR_UPD_014_TS_MIA() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var XSD.NonNegativeInteger v_maxInstanceAge_1 := 60;
-						var XSD.NonNegativeInteger v_maxInstanceAge_2 := 120;
-						var ResponsePrimitive v_responsePrimitive;
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
-
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.timeSeries.maxInstanceAge := v_maxInstanceAge_1;
-						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;	 
-
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							//Check attribute 1
-							if(ispresent(v_responsePrimitive.primitiveContent)) {
-								if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
-									if(v_responsePrimitive.primitiveContent.timeSeries.maxInstanceAge != v_maxInstanceAge_2){
-										setverdict(fail, __SCOPE__ & ": Error: MaxInstanceAge attribute not updated correctly")
-									}
-								}
-							}
-						}
-					}
-
-					testcase TC_CSE_DMR_UPD_014_TS_MNI() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var XSD.NonNegativeInteger v_maxNrOfInstances_1 := 1;
-						var XSD.NonNegativeInteger v_maxNrOfInstances_2 := 2;
-						var ResponsePrimitive v_responsePrimitive;
-
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
-
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.timeSeries.maxNrOfInstances := v_maxNrOfInstances_1;
-						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;	 
-
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							//Check attribute 1
-							if(ispresent(v_responsePrimitive.primitiveContent)) {
-								if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
-									if(v_responsePrimitive.primitiveContent.timeSeries.maxNrOfInstances != v_maxNrOfInstances_2){
-										setverdict(fail, __SCOPE__ & ": Error: MaxNrOfInstances attribute not updated correctly")
-									}
-								}
-							}
-						}
-					}
-					
-					testcase TC_CSE_DMR_UPD_014_TS_PEI() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var XSD.NonNegativeInteger v_periodicInterval_1 := 1;
-						var XSD.NonNegativeInteger v_periodicInterval_2 := 2;
-						var ResponsePrimitive v_responsePrimitive;
-
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
-
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.timeSeries.periodicInterval := v_periodicInterval_1;
-						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;	 
-
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							//Check attribute 1
-							if(ispresent(v_responsePrimitive.primitiveContent)) {
-								if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
-									if(v_responsePrimitive.primitiveContent.timeSeries.periodicInterval != v_periodicInterval_2){
-										setverdict(fail, __SCOPE__ & ": Error: PeriodicInterval attribute not updated correctly")
-									}
-								}
-							}
-						}
-					}
-					
-					testcase TC_CSE_DMR_UPD_014_TS_MDD() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var XSD.Boolean v_missingDataDetect_1 := true;
-						var XSD.Boolean v_missingDataDetect_2 := false;
-						var ResponsePrimitive v_responsePrimitive;
-	
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
-	
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.timeSeries.missingDataDetect := v_missingDataDetect_1;
-						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;	 
-	
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							//Check attribute 1
-							if(ispresent(v_responsePrimitive.primitiveContent)) {
-								if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
-									if(v_responsePrimitive.primitiveContent.timeSeries.missingDataDetect != v_missingDataDetect_2){
-										setverdict(fail, __SCOPE__ & ": Error: MissingDataDetect attribute not updated correctly")
-									}
-								}
-							}
-						}
-					}
-					
-					testcase TC_CSE_DMR_UPD_014_TS_MDN() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var XSD.NonNegativeInteger v_missingDataMaxNr_1 := 1;
-						var XSD.NonNegativeInteger v_missingDataMaxNr_2 := 2;
-						var ResponsePrimitive v_responsePrimitive;
-
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
-
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.timeSeries.missingDataMaxNr := v_missingDataMaxNr_1;
-						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;	 
-
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							//Check attribute 1
-							if(ispresent(v_responsePrimitive.primitiveContent)) {
-								if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
-									if(v_responsePrimitive.primitiveContent.timeSeries.missingDataMaxNr != v_missingDataMaxNr_2){
-										setverdict(fail, __SCOPE__ & ": Error: MissingDataMaxNr attribute not updated correctly")
-									}
-								}
-							}
-						}
-					}
-					
-					testcase TC_CSE_DMR_UPD_014_TS_MDT() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var XSD.NonNegativeInteger v_missingDataDetectTimer_1 := 1;
-						var XSD.NonNegativeInteger v_missingDataDetectTimer_2 := 2;
-						var ResponsePrimitive v_responsePrimitive;
-
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
-
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.timeSeries.missingDataDetectTimer := v_missingDataDetectTimer_1;
-						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;	 
-
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							//Check attribute 1
-							if(ispresent(v_responsePrimitive.primitiveContent)) {
-								if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
-									if(v_responsePrimitive.primitiveContent.timeSeries.missingDataDetectTimer != v_missingDataDetectTimer_2){
-										setverdict(fail, __SCOPE__ & ": Error: MissingDataDetectTimer attribute not updated correctly")
-									}
-								}
-							}
-						}
-					}
-					
-					testcase TC_CSE_DMR_UPD_014_TS_OR() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var XSD.AnyURI v_ontologyRef_1 := "MyOntologyRef_1";
-						var XSD.AnyURI v_ontologyRef_2 := "MyOntologyRef_2";
-						var ResponsePrimitive v_responsePrimitive;
-
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
-
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.timeSeries.ontologyRef := v_ontologyRef_1;
-						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;	 
-
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							//Check attribute 1
-							if(ispresent(v_responsePrimitive.primitiveContent)) {
-								if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
-									if(v_responsePrimitive.primitiveContent.timeSeries.ontologyRef != v_ontologyRef_2){
-										setverdict(fail, __SCOPE__ & ": Error: OntologyRef attribute not updated correctly")
-									}
-								}
-							}
-						}
-					}
-	
-				} // end g_CSE_DMR_UPD_014
-
-				group g_CSE_DMR_UPD_015{
-			  		
-					/**
-					 * @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_NOD_LBL() runs on Tester system CseSystem {
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var Labels v_labels := {"MyLabel"};
-						var template RequestPrimitive v_updateRequest := m_updateNodeBase;
-						var ResponsePrimitive v_responsePrimitive;
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_updateRequest.primitiveContent.node.labels := v_labels;
-						
-						v_ae1.start(f_CSE_DMR_UPD_015(int9, m_createNodeBase, v_updateRequest));//Node
-						v_ae1.done;
-						
-						 
-
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							 //Check attribute 1
-							 if(ispresent(v_responsePrimitive.primitiveContent)) {
-								 if(ischosen(v_responsePrimitive.primitiveContent.node)) {
-									 if(v_responsePrimitive.primitiveContent.node.labels != v_labels){
-										 setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
-									 }
-								 }
-							 }
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
-							 
-							//Check that the resource has been udpated correctly
-							  if(ischosen(v_primitiveContentRetrieveResource.node)) {
-							   if(v_primitiveContentRetrieveResource.node.labels != v_labels){
-								setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
-							  }
-							}
-						 }
-					}
-					
-					testcase TC_CSE_DMR_UPD_015_NOD_ACPI() runs on Tester system CseSystem {
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var template RequestPrimitive v_updateRequest := m_updateNodeBase;
-						var RequestPrimitive v_updateRequestPrimitive;
-						var ResponsePrimitive v_responsePrimitive;
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_ae1.start(f_CSE_DMR_UPD_015(int9, m_createNodeBase, v_updateRequest, true));//Node
-						v_ae1.done;
-						
-						 
-
-						if(getverdict == pass){
-							 v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							 
-							 v_updateRequestPrimitive := f_getRequestPrimitive(v_ae1);	
-							 //Check attribute 1
-							 if(ispresent(v_responsePrimitive.primitiveContent)) {
-								 if(ischosen(v_responsePrimitive.primitiveContent.node)) {
-									 if(v_responsePrimitive.primitiveContent.node.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.node.accessControlPolicyIDs)){
-										 setverdict(fail, __SCOPE__ & ": Error: Access Control Policy attribute not updated correctly")
-									 }
-								 }
-							 }
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);						
-	 
-							//Check that the resource has been udpated correctly
-							  if(ischosen(v_primitiveContentRetrieveResource.node)) {
-							   if(v_primitiveContentRetrieveResource.node.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.node.accessControlPolicyIDs)){
-								setverdict(fail, __SCOPE__ & ": Error: Access Control Policy attribute not updated correctly")
-							  }
-							}
-						 }
-					}
-					
-					testcase TC_CSE_DMR_UPD_015_NOD_HCL() runs on Tester system CseSystem {
-						
-						/* TO BE DONE */
-					}
-					
-					testcase TC_CSE_DMR_UPD_015_AE_OR() runs on Tester system CseSystem {
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var XSD.AnyURI v_ontoLogyRef := "MyOntologyRef";
-						var template RequestPrimitive v_updateRequest := m_updateAeBase;
-						var ResponsePrimitive v_responsePrimitive;
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_updateRequest.primitiveContent.aE.ontologyRef := v_ontoLogyRef;
-						v_ae1.start(f_CSE_DMR_UPD_015(int2, m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM), v_updateRequest));//AE
-						v_ae1.done;
-						
-						 
-
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							 //Check attribute 1
-							 if(ispresent(v_responsePrimitive.primitiveContent)) {
-								 if(ischosen(v_responsePrimitive.primitiveContent.aE)) {
-									 if(v_responsePrimitive.primitiveContent.aE.ontologyRef != v_ontoLogyRef){
-										 setverdict(fail, __SCOPE__ & ": Error: Ontology Ref attribute not updated correctly")
-									 }
-								 }
-							 }
- 							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
- 
-							  //Check that the resource has been udpated correctly
-							  if(ischosen(v_primitiveContentRetrieveResource.aE)) {
-							   if(v_primitiveContentRetrieveResource.aE.ontologyRef != v_ontoLogyRef){
-								setverdict(fail, __SCOPE__ & ": Error: Ontology Ref attribute not updated correctly")
-							  }
-							}
-						 }
-					}
-					
-					testcase TC_CSE_DMR_UPD_015_CNT_OR() runs on Tester system CseSystem {
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var XSD.AnyURI v_ontoLogyRef := "MyOntologyRef";
-						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
-						var ResponsePrimitive v_responsePrimitive;
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_updateRequest.primitiveContent.container.ontologyRef := v_ontoLogyRef;
-						
-						v_ae1.start(f_CSE_DMR_UPD_015(int3, m_createContainerBase, v_updateRequest));//Container
-						v_ae1.done;
-						
-						 
-
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							 //Check attribute 1
-							 if(ispresent(v_responsePrimitive.primitiveContent)) {
-								 if(ischosen(v_responsePrimitive.primitiveContent.container)) {
-									 if(v_responsePrimitive.primitiveContent.container.ontologyRef != v_ontoLogyRef){
-										 setverdict(fail, __SCOPE__ & ": Error: Ontology Ref attribute not updated correctly")
-									 }
-								 }
-							 }
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
-	 
-							  //Check that the resource has been udpated correctly
-							  if(ischosen(v_primitiveContentRetrieveResource.container)) {
-							   if(v_primitiveContentRetrieveResource.container.ontologyRef != v_ontoLogyRef){
-								setverdict(fail, __SCOPE__ & ": Error: Ontology Ref attribute not updated correctly")
-							  }
-							}
-						 }
-					}
-					
-					testcase TC_CSE_DMR_UPD_015_CNT_LI() runs on Tester system CseSystem {
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var XSD.AnyURI v_locationID := "MyLocationID";
-						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
-						var ResponsePrimitive v_responsePrimitive;
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_updateRequest.primitiveContent.container.locationID := v_locationID;
-						
-						v_ae1.start(f_CSE_DMR_UPD_015(int3, m_createContainerBase, v_updateRequest));//Container
-						v_ae1.done;
-						
-						 
-
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							 //Check attribute 1
-							 if(ispresent(v_responsePrimitive.primitiveContent)) {
-								 if(ischosen(v_responsePrimitive.primitiveContent.container)) {
-									 if(v_responsePrimitive.primitiveContent.container.locationID != v_locationID){
-										 setverdict(fail, __SCOPE__ & ": Error: Location ID attribute not updated correctly")
-									 }
-								 }
-							 }
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
-	 
-													  //Check that the resource has been udpated correctly
-							  if(ischosen(v_primitiveContentRetrieveResource.container)) {
-							   if(v_primitiveContentRetrieveResource.container.locationID != v_locationID){
-								setverdict(fail, __SCOPE__ & ": Error: Location ID attribute not updated correctly")
-							  }
-							}
-						 }
-					}
-					
-					testcase TC_CSE_DMR_UPD_015_SUB_ENC() runs on Tester system CseSystem {
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var EventNotificationCriteria v_eventNotificationCriteria:= valueof(m_eventNotificationCriteria({int3}, -));
-						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
-						var ResponsePrimitive v_responsePrimitive;
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_updateRequest.primitiveContent.subscription.eventNotificationCriteria:=v_eventNotificationCriteria ;
-						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
-						v_ae1.done;
-						
-						 
-
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							 //Check attribute 1
-							 if(ispresent(v_responsePrimitive.primitiveContent)) {
-								 if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
-									 if(v_responsePrimitive.primitiveContent.subscription.eventNotificationCriteria != v_eventNotificationCriteria){
-										 setverdict(fail, __SCOPE__ & ": Error: Event Notification Criteria attribute not updated correctly")
-									 }
-								 }
-							 }
- 							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
- 
-							  //Check that the resource has been udpated correctly
-							  if(ischosen(v_primitiveContentRetrieveResource.subscription)) {
-							   if(v_primitiveContentRetrieveResource.subscription.eventNotificationCriteria != v_eventNotificationCriteria){
-								setverdict(fail, __SCOPE__ & ": Error: Event Notofication Criteria attribute not updated correctly")
-							  }
-							}
-						 }
-					}
-					
-					testcase TC_CSE_DMR_UPD_015_SUB_EXC() runs on Tester system CseSystem {
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var XSD.PositiveInteger v_expirationCounter:=10;
-						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
-						var ResponsePrimitive v_responsePrimitive;
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_updateRequest.primitiveContent.subscription.expirationCounter:=v_expirationCounter;
-						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
-						v_ae1.done;
-						
-						 
-
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							 //Check attribute 1
-							 if(ispresent(v_responsePrimitive.primitiveContent)) {
-								 if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
-									 if(v_responsePrimitive.primitiveContent.subscription.expirationCounter != v_expirationCounter){
-										 setverdict(fail, __SCOPE__ & ": Error: Expiration Counter attribute not updated correctly")
-									 }
-								 }
-							 }
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
- 
-							  //Check that the resource has been udpated correctly
-							  if(ischosen(v_primitiveContentRetrieveResource.subscription)) {
-							   if(v_primitiveContentRetrieveResource.subscription.expirationCounter != v_expirationCounter){
-								setverdict(fail, __SCOPE__ & ": Error: Expiration Counter attribute not updated correctly")
-							  }
-							}
-						 }
-					}
-					
-					testcase TC_CSE_DMR_UPD_015_SUB_GPI() runs on Tester system CseSystem {
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var XSD.AnyURI v_groupID := "MyGroupID";
-						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
-						var ResponsePrimitive v_responsePrimitive;
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_updateRequest.primitiveContent.subscription.groupID:=v_groupID;
-						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
-						v_ae1.done;
-						
-						 
-
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							 //Check attribute 1
-							 if(ispresent(v_responsePrimitive.primitiveContent)) {
-								 if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
-									 if(v_responsePrimitive.primitiveContent.subscription.groupID != v_groupID){
-										 setverdict(fail, __SCOPE__ & ": Error: Group ID attribute not updated correctly")
-									 }
-								 }
-							 }
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
-	 
-							  //Check that the resource has been udpated correctly
-							  if(ischosen(v_primitiveContentRetrieveResource.subscription)) {
-							   if(v_primitiveContentRetrieveResource.subscription.groupID != v_groupID){
-								setverdict(fail, __SCOPE__ & ": Error: Group ID attribute not updated correctly")
-							  }
-							}
-						 } 
-					}
-					
-					testcase TC_CSE_DMR_UPD_015_SUB_NFU() runs on Tester system CseSystem {
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var XSD.AnyURI v_notificationForwardingURI:= "MyNotificationForwardingURI";
-						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
-						var ResponsePrimitive v_responsePrimitive;
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_updateRequest.primitiveContent.subscription.notificationForwardingURI:=v_notificationForwardingURI;
-						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
-						v_ae1.done;
-						
-						 
-
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							 //Check attribute 1
-							 if(ispresent(v_responsePrimitive.primitiveContent)) {
-								 if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
-									 if(v_responsePrimitive.primitiveContent.subscription.notificationForwardingURI != v_notificationForwardingURI){
-										 setverdict(fail, __SCOPE__ & ": Error: Notification Forwarding URI attribute not updated correctly")
-									 }
-								 }
-							 }
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
-	 
-							  //Check that the resource has been udpated correctly
-							  if(ischosen(v_primitiveContentRetrieveResource.subscription)) {
-							   if(v_primitiveContentRetrieveResource.subscription.notificationForwardingURI != v_notificationForwardingURI){
-								setverdict(fail, __SCOPE__ & ": Error: Notification Forwarding URI attribute not updated correctly")
-							  }
-							}
-						 }
-					}
-					
-					testcase TC_CSE_DMR_UPD_015_SUB_BN() runs on Tester system CseSystem {
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var BatchNotify v_batchNotify:= {1, "PT1S"};
-						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
-						var ResponsePrimitive v_responsePrimitive;
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_updateRequest.primitiveContent.subscription.batchNotify:=v_batchNotify;
-						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
-						v_ae1.done;
-						
-						 
-
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							 //Check attribute 1
-							 if(ispresent(v_responsePrimitive.primitiveContent)) {
-								 if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
-									 if(v_responsePrimitive.primitiveContent.subscription.batchNotify != v_batchNotify){
-										 setverdict(fail, __SCOPE__ & ": Error: Batch Notify attribute not updated correctly")
-									 }
-								 }
-							 }
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
- 
-							  //Check that the resource has been udpated correctly
-							  if(ischosen(v_primitiveContentRetrieveResource.subscription)) {
-							   if(v_primitiveContentRetrieveResource.subscription.batchNotify != v_batchNotify){
-								setverdict(fail, __SCOPE__ & ": Error: Batch Notify attribute not updated correctly")
-							  }
-							}
-						 }
-					}
-					
-					testcase TC_CSE_DMR_UPD_015_SUB_RL() runs on Tester system CseSystem {
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var RateLimit v_rateLimit:= {2, "PT1S"};
-						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
-						var ResponsePrimitive v_responsePrimitive;
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_updateRequest.primitiveContent.subscription.rateLimit:=v_rateLimit;
-						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
-						v_ae1.done;
-						
-						 
-
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							 //Check attribute 1
-							 if(ispresent(v_responsePrimitive.primitiveContent)) {
-								 if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
-									 if(v_responsePrimitive.primitiveContent.subscription.rateLimit != v_rateLimit){
-										 setverdict(fail, __SCOPE__ & ": Error: Rate Limit attribute not updated correctly")
-									 }
-								 }
-							 }
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
-	 
-							  //Check that the resource has been udpated correctly
-							  if(ischosen(v_primitiveContentRetrieveResource.subscription)) {
-							   if(v_primitiveContentRetrieveResource.subscription.rateLimit != v_rateLimit){
-								setverdict(fail, __SCOPE__ & ": Error: Rate Limit attribute not updated correctly")
-							  }
-							}
-						 }
-					}
-					
-					testcase TC_CSE_DMR_UPD_015_SUB_PN() runs on Tester system CseSystem {
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var PendingNotification v_pendingNotification:=int2;
-						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
-						var ResponsePrimitive v_responsePrimitive;
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_updateRequest.primitiveContent.subscription.pendingNotification:=v_pendingNotification;
-						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
-						v_ae1.done;
-						
-						 
-
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							 //Check attribute 1
-							 if(ispresent(v_responsePrimitive.primitiveContent)) {
-								 if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
-									 if(v_responsePrimitive.primitiveContent.subscription.pendingNotification != v_pendingNotification){
-										 setverdict(fail, __SCOPE__ & ": Error: Pending Notification attribute not updated correctly")
-									 }
-								 }
-							 }
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
- 
-							//Check that the resource has been udpated correctly
-							  if(ischosen(v_primitiveContentRetrieveResource.subscription)) {
-							   if(v_primitiveContentRetrieveResource.subscription.pendingNotification != v_pendingNotification){
-								setverdict(fail, __SCOPE__ & ": Error: Pending Notification attribute not updated correctly")
-							  }
-							}
-						 }
-					}
-					
-					testcase TC_CSE_DMR_UPD_015_SUB_NSP() runs on Tester system CseSystem {
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var XSD.PositiveInteger v_notificationStoragePriority:=10;
-						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
-						var ResponsePrimitive v_responsePrimitive;
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_updateRequest.primitiveContent.subscription.notificationStoragePriority:=v_notificationStoragePriority;
-						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
-						v_ae1.done;
-						
-						 
-
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							 //Check attribute 1
-							 if(ispresent(v_responsePrimitive.primitiveContent)) {
-								 if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
-									 if(v_responsePrimitive.primitiveContent.subscription.notificationStoragePriority != v_notificationStoragePriority){
-										 setverdict(fail, __SCOPE__ & ": Error: Notification Storage priority attribute not updated correctly")
-									 }
-								 }
-							 }
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
-	 
-														//Check that the resource has been udpated correctly
-							  if(ischosen(v_primitiveContentRetrieveResource.subscription)) {
-							   if(v_primitiveContentRetrieveResource.subscription.notificationStoragePriority != v_notificationStoragePriority){
-								setverdict(fail, __SCOPE__ & ": Error: Notification Storage priority attribute not updated correctly")
-							  }
-							}
-						 }
-					}
-					
-					testcase TC_CSE_DMR_UPD_015_SUB_LN() runs on Tester system CseSystem {
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var XSD.Boolean v_latestNotify:=true;
-						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
-						var ResponsePrimitive v_responsePrimitive;
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_updateRequest.primitiveContent.subscription.latestNotify:=v_latestNotify;
-						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
-						v_ae1.done;
-						
-						 
-
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							 //Check attribute 1
-							 if(ispresent(v_responsePrimitive.primitiveContent)) {
-								 if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
-									 if(v_responsePrimitive.primitiveContent.subscription.latestNotify != v_latestNotify){
-										 setverdict(fail, __SCOPE__ & ": Error: Latest Notify priority attribute not updated correctly")
-									 }
-								 }
-							 }
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
-	 
-							  //Check that the resource has been udpated correctly
-							  if(ischosen(v_primitiveContentRetrieveResource.subscription)) {
-							   if(v_primitiveContentRetrieveResource.subscription.latestNotify != v_latestNotify){
-								setverdict(fail, __SCOPE__ & ": Error: Latest Notify attribute not updated correctly")
-							  }
-							}
-						 }
-					}
-					
-					testcase TC_CSE_DMR_UPD_015_SUB_NEC() runs on Tester system CseSystem {
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
-						var EventCat v_eventCat:= {alt_1:= 300};
-						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
-						var ResponsePrimitive v_responsePrimitive;
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_updateRequest.primitiveContent.subscription.notificationEventCat:=v_eventCat;
-						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
-						v_ae1.done;						 
-
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							 //Check attribute 1
-							 if(ispresent(v_responsePrimitive.primitiveContent)) {
-								 if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
-									 if(v_responsePrimitive.primitiveContent.subscription.notificationEventCat != v_eventCat){
-										 setverdict(fail, __SCOPE__ & ": Error: Notification Event Cat attribute not updated correctly")
-									 }
-								 }
-							 }
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
-	 
-													  //Check that the resource has been udpated correctly
-							  if(ischosen(v_primitiveContentRetrieveResource.subscription)) {
-							   if(v_primitiveContentRetrieveResource.subscription.notificationEventCat != v_eventCat){
-								setverdict(fail, __SCOPE__ & ": Error: Notification Event Cat attribute not updated correctly")
-							  }
-							}
-						 }
-					}
-					
-					testcase TC_CSE_DMR_UPD_015_TS_ACPI() runs on Tester system CseSystem {
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
-						var RequestPrimitive v_updateRequestPrimitive;
-						var ResponsePrimitive v_responsePrimitive;
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-	
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest, true));//TimeSeries
-						v_ae1.done;	 
-
-						if(getverdict == pass){
-							 v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							 v_updateRequestPrimitive := f_getRequestPrimitive(v_ae1);	
-							 //Check attribute 1
-							 if(ispresent(v_responsePrimitive.primitiveContent)) {
-								 if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
-									 if(v_responsePrimitive.primitiveContent.timeSeries.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.timeSeries.accessControlPolicyIDs)){
-										 setverdict(fail, __SCOPE__, ": Error: Access Control Policy IDs attribute not updated correctly")
-									 }
-								 }
-							 }
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
- 
-							//Check that the resource has been udpated correctly
-							  if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
-							   if(v_primitiveContentRetrieveResource.timeSeries.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.timeSeries.accessControlPolicyIDs)){
-								setverdict(fail, __SCOPE__ & ": Error: Access Control Policy IDs attribute not updated correctly")
-							  }
-							}
-						 }
-					}
-					
-					testcase TC_CSE_DMR_UPD_015_TS_LBL() runs on Tester system CseSystem {
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var Labels v_labels := {"MyLabel"};
-						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
-						var ResponsePrimitive v_responsePrimitive;
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-	
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_updateRequest.primitiveContent.timeSeries.labels := v_labels;
-	
-						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
-						v_ae1.done;	 
-
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							 //Check attribute 1
-							 if(ispresent(v_responsePrimitive.primitiveContent)) {
-								 if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
-									 if(v_responsePrimitive.primitiveContent.timeSeries.labels != v_labels){
-										 setverdict(fail, __SCOPE__, ": Error: Labels attribute not updated correctly")
-									 }
-								 }
-							 }
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
-		 
-							//Check that the resource has been udpated correctly
-							  if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
-							   if(v_primitiveContentRetrieveResource.timeSeries.labels != v_labels){
-								setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
-							  }
-							}
-						 }
-					}
-					
-					testcase TC_CSE_DMR_UPD_015_TS_MNI() runs on Tester system CseSystem {
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var XSD.NonNegativeInteger v_maxNrOfInstances := 5;
-						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
-						var ResponsePrimitive v_responsePrimitive;
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-	
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_updateRequest.primitiveContent.timeSeries.maxNrOfInstances := v_maxNrOfInstances;
-	
-						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
-						v_ae1.done;	 
-
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							 //Check attribute 1
-							 if(ispresent(v_responsePrimitive.primitiveContent)) {
-								 if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
-									 if(v_responsePrimitive.primitiveContent.timeSeries.maxNrOfInstances != v_maxNrOfInstances){
-										 setverdict(fail, __SCOPE__, ": Error: Maximum number of instances attribute not updated correctly")
-									 }
-								 }
-							 }
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
- 
-							//Check that the resource has been udpated correctly
-							  if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
-							   if(v_primitiveContentRetrieveResource.timeSeries.maxNrOfInstances != v_maxNrOfInstances){
-								setverdict(fail, __SCOPE__ & ": Error: Maximum number of instances attribute not updated correctly")
-							  }
-							}
-						 }
-					}
-
-					testcase TC_CSE_DMR_UPD_015_TS_MBS() runs on Tester system CseSystem {
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var XSD.NonNegativeInteger v_maxByteSize := 512;
-						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
-						var ResponsePrimitive v_responsePrimitive;
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-	
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_updateRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize;
-	
-						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
-						v_ae1.done;	 
-
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							 //Check attribute 1
-							 if(ispresent(v_responsePrimitive.primitiveContent)) {
-								 if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
-									 if(v_responsePrimitive.primitiveContent.timeSeries.maxByteSize != v_maxByteSize){
-										 setverdict(fail, __SCOPE__, ": Error: Maximum Byte size attribute not updated correctly")
-									 }
-								 }
-							 }
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
- 
-												  //Check that the resource has been udpated correctly
-							  if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
-							   if(v_primitiveContentRetrieveResource.timeSeries.maxByteSize != v_maxByteSize){
-								setverdict(fail, __SCOPE__ & ": Error: Maximum Byte Size attribute not updated correctly")
-							  }
-							}
-						 }
-					}
-
-					testcase TC_CSE_DMR_UPD_015_TS_MIA() runs on Tester system CseSystem {
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var XSD.NonNegativeInteger v_maxInstanceAge := 1;
-						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
-						var ResponsePrimitive v_responsePrimitive;
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-	
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_updateRequest.primitiveContent.timeSeries.maxInstanceAge := v_maxInstanceAge;
-	
-						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
-						v_ae1.done;	 
-
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							 //Check attribute 1
-							 if(ispresent(v_responsePrimitive.primitiveContent)) {
-								 if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
-									 if(v_responsePrimitive.primitiveContent.timeSeries.maxInstanceAge != v_maxInstanceAge){
-										 setverdict(fail, __SCOPE__, ": Error: Maximum Instance Age attribute not updated correctly")
-									 }
-								 }
-							 }
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
- 
-							//Check that the resource has been udpated correctly
-							  if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
-							   if(v_primitiveContentRetrieveResource.timeSeries.maxInstanceAge != v_maxInstanceAge){
-								setverdict(fail, __SCOPE__ & ": Error: Maximum Instance Age attribute not updated correctly")
-							  }
-							}
-						 }
-					}
-					
-					testcase TC_CSE_DMR_UPD_015_TS_PEI() runs on Tester system CseSystem {
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var XSD.NonNegativeInteger v_periodicInterval := 1;
-						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
-						var ResponsePrimitive v_responsePrimitive;
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_updateRequest.primitiveContent.timeSeries.periodicInterval := v_periodicInterval;
-
-						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
-						v_ae1.done;	 
-
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							 //Check attribute 1
-							 if(ispresent(v_responsePrimitive.primitiveContent)) {
-								 if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
-									 if(v_responsePrimitive.primitiveContent.timeSeries.periodicInterval != v_periodicInterval){
-										 setverdict(fail, __SCOPE__, ": Error: Periodic Interval attribute not updated correctly")
-									 }
-								 }
-							 }
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
- 
-												//Check that the resource has been udpated correctly
-							  if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
-							   if(v_primitiveContentRetrieveResource.timeSeries.periodicInterval != v_periodicInterval){
-								setverdict(fail, __SCOPE__ & ": Error: Periodic Interval attribute not updated correctly")
-							  }
-							}
-						 }
-					}
-					
-					testcase TC_CSE_DMR_UPD_015_TS_MDD() runs on Tester system CseSystem {
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var XSD.Boolean v_missingDataDetect := true;
-						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
-						var ResponsePrimitive v_responsePrimitive;
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_updateRequest.primitiveContent.timeSeries.missingDataDetect := v_missingDataDetect;
-
-						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
-						v_ae1.done;	 
-
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							 //Check attribute 1
-							 if(ispresent(v_responsePrimitive.primitiveContent)) {
-								 if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
-									 if(v_responsePrimitive.primitiveContent.timeSeries.missingDataDetect != v_missingDataDetect){
-										 setverdict(fail, __SCOPE__, ": Error: MissingDataDetect attribute not updated correctly")
-									 }
-								 }
-							 }
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
- 
-																	//Check that the resource has been udpated correctly
-							  if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
-							   if(v_primitiveContentRetrieveResource.timeSeries.missingDataDetect != v_missingDataDetect){
-								setverdict(fail, __SCOPE__ & ": Error: MissingDataDetect attribute not updated correctly")
-							  }
-							}
-						 }
-					}
-					
-					testcase TC_CSE_DMR_UPD_015_TS_MDN() runs on Tester system CseSystem {
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var XSD.NonNegativeInteger v_missingDataMaxNr := 1;
-						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
-						var ResponsePrimitive v_responsePrimitive;
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_updateRequest.primitiveContent.timeSeries.missingDataMaxNr := v_missingDataMaxNr;
-
-						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
-						v_ae1.done;	 
-
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							 //Check attribute 1
-							 if(ispresent(v_responsePrimitive.primitiveContent)) {
-								 if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
-									 if(v_responsePrimitive.primitiveContent.timeSeries.missingDataMaxNr != v_missingDataMaxNr){
-										 setverdict(fail, __SCOPE__, ": Error: MissingDataMaxNr attribute not updated correctly")
-									 }
-								 }
-							 }
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
- 
-							//Check that the resource has been udpated correctly
-							  if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
-							   if(v_primitiveContentRetrieveResource.timeSeries.missingDataMaxNr != v_missingDataMaxNr){
-								setverdict(fail, __SCOPE__ & ": Error: MissingDataMaxNr attribute not updated correctly")
-							  }
-							}
-						 }
-					}
-					
-					testcase TC_CSE_DMR_UPD_015_TS_MDT() runs on Tester system CseSystem {
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var XSD.NonNegativeInteger v_missingDataDetectTimer := 1;
-						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
-						var ResponsePrimitive v_responsePrimitive;
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_updateRequest.primitiveContent.timeSeries.missingDataDetectTimer := v_missingDataDetectTimer;
-
-						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
-						v_ae1.done;	 
-
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							 //Check attribute 1
-							 if(ispresent(v_responsePrimitive.primitiveContent)) {
-								 if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
-									 if(v_responsePrimitive.primitiveContent.timeSeries.missingDataDetectTimer != v_missingDataDetectTimer){
-										 setverdict(fail, __SCOPE__, ": Error: MissingDataDetectTimer attribute not updated correctly")
-									 }
-								 }
-							 }
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
- 
-												//Check that the resource has been udpated correctly
-							  if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
-							   if(v_primitiveContentRetrieveResource.timeSeries.missingDataDetectTimer != v_missingDataDetectTimer){
-								setverdict(fail, __SCOPE__ & ": Error: MissingDataDetectTimer attribute not updated correctly")
-							  }
-							}
-						 }
-					}
-					
-					testcase TC_CSE_DMR_UPD_015_TS_OR() runs on Tester system CseSystem {
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var XSD.AnyURI v_ontoLogyRef := "MyOntologyRef";
-						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
-						var ResponsePrimitive v_responsePrimitive;
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-	
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_updateRequest.primitiveContent.timeSeries.ontologyRef := v_ontoLogyRef;
-	
-						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
-						v_ae1.done;	 
-
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							 //Check attribute 1
-							 if(ispresent(v_responsePrimitive.primitiveContent)) {
-								 if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
-									 if(v_responsePrimitive.primitiveContent.timeSeries.ontologyRef != v_ontoLogyRef){
-										 setverdict(fail, __SCOPE__, ": Error: Ontology Ref attribute not updated correctly")
-									 }
-								 }
-							 }
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
- 
-											  //Check that the resource has been udpated correctly
-							  if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
-							   if(v_primitiveContentRetrieveResource.timeSeries.ontologyRef != v_ontoLogyRef){
-								setverdict(fail, __SCOPE__ & ": Error: Ontology Ref attribute not updated correctly")
-							  }
-							}
-						 }
-					}
-					
-				} // end group g_CSE_DMR_UPD_015
-			  	
-				group g_CSE_DMR_UPD_016 {
-			  		
-					/**
-					 * @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_NOD_ET() runs on Tester system CseSystem {
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var Timestamp v_expirationTime := "21001231T012345";
-						var template RequestPrimitive v_updateRequest := m_updateNodeBase;
-						var ResponsePrimitive v_responsePrimitive;
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_updateRequest.primitiveContent.node.expirationTime := v_expirationTime;
-						
-						v_ae1.start(f_CSE_DMR_UPD_016(int9, m_createNodeBase, v_updateRequest));//Node
-						v_ae1.done;
-						
-						 
-
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							//Check attribute 1
-							if(ispresent(v_responsePrimitive.primitiveContent)) {
-								if(ischosen(v_responsePrimitive.primitiveContent.node)) {
-									if(v_responsePrimitive.primitiveContent.node.expirationTime != v_expirationTime){
-										setverdict(fail, __SCOPE__ & ": Error: Expiration time attribute not updated correctly")
-									}
-								}
-							}
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
-							
-						  //Check that the resource has been udpated correctly
-						  if(ischosen(v_primitiveContentRetrieveResource.node)) {
-							if(v_primitiveContentRetrieveResource.node.expirationTime != v_expirationTime){
-							  setverdict(fail, __SCOPE__ & ": Error: Expiration time attribute not updated correctly")
-							}
-						  }
-						}
-					}
-					
-					testcase TC_CSE_DMR_UPD_016_NOD_NI() runs on Tester system CseSystem {
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-					
-						var template RequestPrimitive v_updateRequest := m_updateNodeBase;
-						var XSD.Token v_targetId := "TARGET-ID";
-						var ResponsePrimitive v_responsePrimitive;
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_updateRequest.primitiveContent.node.nodeID := v_targetId;
-						
-						v_ae1.start(f_CSE_DMR_UPD_016(int9, m_createNodeBase, v_updateRequest));//Node
-						v_ae1.done;
-						
-						 
-
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							//Check attribute 1
-							if(ispresent(v_responsePrimitive.primitiveContent)) {
-								if(ischosen(v_responsePrimitive.primitiveContent.node)) {
-									if(v_responsePrimitive.primitiveContent.node.nodeID != v_targetId){
-										setverdict(fail, __SCOPE__ & ": Error: NodeID attribute not updated correctly")
-									}
-								}
-							}
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
-							
-							//Check that the resource has been udpated correctly
-							if(ischosen(v_primitiveContentRetrieveResource.node)) {
-							  if(v_primitiveContentRetrieveResource.node.nodeID != v_targetId){
-								setverdict(fail, __SCOPE__ & ": Error: NodeID attribute not updated correctly")
-							  }
-							}	
-						}
-					}
-					
-					testcase TC_CSE_DMR_UPD_016_TS_ET() runs on Tester system CseSystem {
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var Timestamp v_expirationTime := "21001231T012345";
-						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
-						var ResponsePrimitive v_responsePrimitive;
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-	
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_updateRequest.primitiveContent.timeSeries.expirationTime := v_expirationTime;
-	
-						v_ae1.start(f_CSE_DMR_UPD_016(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
-						v_ae1.done;	 
-
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							//Check attribute 1
-							if(ispresent(v_responsePrimitive.primitiveContent)) {
-								if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
-									if(v_responsePrimitive.primitiveContent.timeSeries.expirationTime != v_expirationTime){
-										setverdict(fail, __SCOPE__, ": Error: Expiration time attribute not updated correctly")
-									}
-								}
-							}
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
-		
-						  //Check that the resource has been udpated correctly
-						  if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
-							if(v_primitiveContentRetrieveResource.timeSeries.expirationTime != v_expirationTime){
-							  setverdict(fail, __SCOPE__ & ": Error: Expiration time attribute not updated correctly")
-							}
-						  }
-						}
-					}
-					
-				} // end group g_CSE_DMR_UPD_016
-				
-				group g_CSE_DMR_UPD_017 {
-				    
-					/**
-					 * @desc Check that the IUT updates successfully the value of the announceTo optional attribute of the RESOURCE_TYPE resource
-					*/
-					testcase TC_CSE_DMR_UPD_017_ACP() runs on Tester system CseSystem {
-						// Local variables
-						var MnCseSimu v_cse1 := MnCseSimu.create("CSE1") alive;
-						var template RequestPrimitive v_createRequest := m_createAcpBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
-						var template RequestPrimitive v_updateRequest := m_updateAcpBase;	
-			
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						
-						v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};					
-			
-						v_cse1.start(f_CSE_DMR_UPD_017(int1, v_createRequest, v_createRequestAnnc, v_updateRequest));//AccessControlPolicy
-						v_cse1.done;
-					}
-					
-					testcase TC_CSE_DMR_UPD_017_CNT() runs on Tester system CseSystem {
-						// Local variables
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var template RequestPrimitive v_createRequest := m_createContainerBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
-						var template RequestPrimitive v_updateRequest := m_updateContainerBase;	
-
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						
-						v_updateRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
-  
-						v_cse1.start(f_CSE_DMR_UPD_017(int3, v_createRequest, v_createRequestAnnc, v_updateRequest));//Container
-						v_cse1.done;
-					}
-
-					testcase TC_CSE_DMR_UPD_017_GRP() runs on Tester system CseSystem {
-						// Local variables
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var template RequestPrimitive v_createRequest := m_createGroupBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
-						var template RequestPrimitive v_updateRequest := m_updateGroupBase;	
-
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						v_updateRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
-  
-						v_cse1.start(f_CSE_DMR_UPD_017(int9, v_createRequest, v_createRequestAnnc, v_updateRequest));//Group
-						v_cse1.done;
-					}
-					
-					testcase TC_CSE_DMR_UPD_017_SCH() runs on Tester system CseSystem {
-						// Local variables
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var template RequestPrimitive v_createRequest := m_createScheduleBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createScheduleAnnc;
-						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
-
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						v_updateRequest.primitiveContent.schedule.announceTo := {PX_CSE1_ID};
-  
-						v_cse1.start(f_CSE_DMR_UPD_017(int18, v_createRequest, v_createRequestAnnc, v_updateRequest));//Schedule
-						v_cse1.done;
-					}
-					
-					testcase TC_CSE_DMR_UPD_017_TS() runs on Tester system CseSystem {
-						// Local variables
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
-						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
-
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_cse1.done;
-						v_updateRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
-  
-						v_cse1.start(f_CSE_DMR_UPD_017(int29, v_createRequest, v_createRequestAnnc, v_updateRequest));//TimeSeries
-						v_cse1.done;
-					}
-					
-					testcase TC_CSE_DMR_UPD_017_TSI() runs on Tester system CseSystem {
-						// Local variables
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnnc;
-						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesInstanceBase;
-
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_cse1.done;
-						v_updateRequest.primitiveContent.timeSeriesInstance.announceTo := {PX_CSE1_ID};
-  
-						v_cse1.start(f_CSE_DMR_UPD_017(int29, v_createRequest, v_createRequestAnnc, v_updateRequest));//TimeSeriesInstance
-						v_cse1.done;
-					}
-				  
-				} //end group g_CSE_DMR_UPD_017
-				
-				group g_CSE_DMR_UPD_018 {
-					
-					testcase TC_CSE_DMR_UPD_018_CNT_MBS() runs on Tester system CseSystem {
-						// Local variables
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var template RequestPrimitive v_createRequest := m_createContainerBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
-						var template RequestPrimitive v_updateRequest := m_updateContainerBase;	
-						var template RequestPrimitive v_updateRequestAnnc := mw_updateContainerAnnc;
-						var XSD.NonNegativeInteger v_maxByteSize := 512;
-
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
-						v_createRequest.primitiveContent.container.maxByteSize := v_maxByteSize;	
-	
-						v_createRequestAnnc.primitiveContent.containerAnnc.maxByteSize := v_maxByteSize;
-	
-						v_updateRequest.primitiveContent.container.announcedAttribute := {"mbs"};
-	
-						v_updateRequestAnnc.primitiveContent.containerAnnc.maxByteSize := v_maxByteSize;
-  
-						v_cse1.start(f_CSE_DMR_UPD_018(int3, v_createRequest, v_createRequestAnnc, v_updateRequest, v_updateRequestAnnc));//Container
-						v_cse1.done;
-					}
-
-					testcase TC_CSE_DMR_UPD_018_GRP_MT() runs on Tester system CseSystem {
-						// Local variables
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var template RequestPrimitive v_createRequest := m_createGroupBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
-						var template RequestPrimitive v_updateRequest := m_updateGroupBase;	
-						var template RequestPrimitive v_updateRequestAnnc := mw_updateGroupAnnc;
-						var MemberType v_memberType := int3;
-
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
-						v_createRequest.primitiveContent.group_.memberType := v_memberType;
-	
-						v_createRequestAnnc.primitiveContent.groupAnnc.memberType := v_memberType;
-	
-						v_updateRequest.primitiveContent.group_.announcedAttribute := {"mt"};
-	
-						v_updateRequestAnnc.primitiveContent.groupAnnc.memberType := v_memberType;
-  
-						v_cse1.start(f_CSE_DMR_UPD_018(int9, v_createRequest, v_createRequestAnnc, v_updateRequest, v_updateRequestAnnc));//Group
-						v_cse1.done;
-					}
-					
-					testcase TC_CSE_DMR_UPD_018_SCH_SE() runs on Tester system CseSystem {
-						// Local variables
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var template RequestPrimitive v_createRequest := m_createGroupBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
-						var template RequestPrimitive v_updateRequest := m_updateGroupBase;	
-						var template RequestPrimitive v_updateRequestAnnc := mw_updateGroupAnnc;
-
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						v_createRequest.primitiveContent.schedule.announceTo := {PX_CSE1_ID};
-						v_createRequestAnnc.primitiveContent.scheduleAnnc.scheduleElement := {{"0 0 0,1,2 1 1 * *"}};//Attribute 1
-
-						v_updateRequest.primitiveContent.schedule.announcedAttribute := {"se"};
-						v_updateRequestAnnc.primitiveContent.scheduleAnnc.scheduleElement := {{"1 1 1,2 1 1 * *"}}; //Attribute 1
-  
-						v_cse1.start(f_CSE_DMR_UPD_018(int18, v_createRequest, v_createRequestAnnc, v_updateRequest, v_updateRequestAnnc));//Group
-						v_cse1.done;
-					}
-					
-					testcase TC_CSE_DMR_UPD_018_TS_MBS() runs on Tester system CseSystem {
-						// Local variables
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
-						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;	
-						var template RequestPrimitive v_updateRequestAnnc := mw_updateTimeSeriesAnnc;
-						var XSD.NonNegativeInteger v_maxByteSize := 512;
-
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_cse1.done;
-						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
-						v_createRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize;	
-
-						v_createRequestAnnc.primitiveContent.timeSeriesAnnc.maxByteSize := v_maxByteSize;
-
-						v_updateRequest.primitiveContent.timeSeries.announcedAttribute := {"mbs"};
-
-						v_updateRequestAnnc.primitiveContent.timeSeriesAnnc.maxByteSize := v_maxByteSize;
-  
-						v_cse1.start(f_CSE_DMR_UPD_018(int29, v_createRequest, v_createRequestAnnc, v_updateRequest, v_updateRequestAnnc));//TimeSeries
-						v_cse1.done;
-					}
-					
-				} //end group g_CSE_DMR_UPD_018
-			}//end group Update
-			
-			group Delete {
-			
-				group g_CSE_DMR_DEL_001{
-
-					/**
-					 * @desc Check that the IUT accepts the deletion of a RESOURCE_TYPE resource
-					 * 
-					 */
-					testcase TC_CSE_DMR_DEL_001_SCH() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-                
-						v_ae1.start(f_CSE_DMR_DEL_001(int18, m_createScheduleBase));//Schedule
-						v_ae1.done;
-					};
-                
-					testcase TC_CSE_DMR_DEL_001_PCH() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-                
-						v_ae1.start(f_CSE_DMR_DEL_001(int15, m_createPollingChannelBase));//PollingChannel
-						v_ae1.done;
-					};
-					
-					testcase TC_CSE_DMR_DEL_001_TS() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_ae1.start(f_CSE_DMR_DEL_001(int29, m_createTimeSeriesBase));//TimeSeries
-						v_ae1.done;
-					};
-					
-					testcase TC_CSE_DMR_DEL_001_TSI() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_ae1.start(f_CSE_DMR_DEL_001(int30, m_createTimeSeriesInstanceBase));//TimeSeriesInstance
-						v_ae1.done;
-					};
-                
-				};//end of group g_CSE_DMR_DEL_001
-                
-				group g_CSE_DMR_DEL_002{
-                
-					/**
-					 * @desc Check that the IUT responds with an error when the AE tries to delete the resource TARGET_RESOURCE_ADDRESS without having privileges for the DELETE operation
-					 * 
-					 */
-					testcase TC_CSE_DMR_DEL_002_SCH() runs on Tester system CseSystem {
-						// Local variables
-  						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-                
-						v_ae1.start(f_CSE_DMR_DEL_002(int18, m_createScheduleBase));//Schedule
-						v_ae1.done;
-					};
-					
-					testcase TC_CSE_DMR_DEL_002_TS() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_ae1.start(f_CSE_DMR_DEL_002(int29, m_createTimeSeriesBase));//TimeSeries
-						v_ae1.done;
-					};
-                
-				};//end of group g_CSE_DMR_DEL_002
-                
-				group g_CSE_DMR_DEL_003{
-                	
-					/**
-					 * @desc Check that the IUT responds with an error when the AE tries to delete the resource TARGET_RESOURCE_ADDRESS which does not exist
-					 * 
-					 */
-					testcase TC_CSE_DMR_DEL_003() runs on Tester system CseSystem {
-					
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-														
-						v_ae1.start(f_CSE_DMR_DEL_003());
-											  	  	
-						v_ae1.done;
-											  	  		
-					}
-													
-					function f_CSE_DMR_DEL_003() runs on AeSimu {
-                	
-						// Local variables
-						var MsgIn v_response;
-						var RequestPrimitive v_request;
-						var integer v_aeIndex := -1;
-						var charstring v_resourceIdOrName := "NotExistingResource";
-                							   
-						// Test control
-                
-						// Test component configuration
-						f_cf01Up();
-                
-						// Test adapter configuration
-                
-						// Preamble
-						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi); 				
-                												
-						// Test Body
-						if(PX_ADDRESSING_METHOD == e_nonHierarchical and (PX_PRIMITIVE_SCOPE == e_cseRelative)) {
-							v_request := valueof(m_delete(v_resourceIdOrName, f_getOriginator(v_aeIndex)));
-						} else {
-							v_request := valueof(m_delete(f_getResourceAddress(v_aeIndex) & "/" & v_resourceIdOrName, f_getOriginator(v_aeIndex)));
-						}
-                		
-						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
-						tc_ac.start;
-						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) -> value v_response {
-								tc_ac.stop;
-								setverdict(pass, __SCOPE__ & ": Unexisting resource cannot be deleted");
-							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
-								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Error while deleting non existing resource");
-							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
-								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Error while deleting non existing resource");
-							}
-							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__ & ": No answer while deleting resource");
-							}
-						}		
-                					
-						// Postamble
-						f_cse_postamble_deleteResources();
-                		
-						// Tear down
-						f_cf01Down();
-                							
-					};//end f_CSE_DMR_DEL003
-				};//end of group g_CSE_DMR_DEL_003
-                
-				group g_CSE_DMR_DEL_004{
-                	
-					/**
-					 * @desc Check that the IUT responds with an error when AE tries to delete a child resource of a RESOURCE_TYPE resource when this resource has been already deleted
-					 * 
-					 */
-					testcase TC_CSE_DMR_DEL_004_CNT() runs on Tester system CseSystem {
-						// Local variables
- 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-                		
-						v_ae1.start(f_CSE_DMR_DEL_004(int3, m_createContainerBase, int3, m_createContainerBase));//Container
-						v_ae1.done;
-					};
-                
-					testcase TC_CSE_DMR_DEL_004_GRP() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-                		
-						v_ae1.start(f_CSE_DMR_DEL_004(int9, m_createGroupBase, int23, m_createSubscriptionBase));//Group
-						v_ae1.done;
-					};
-                
-					testcase TC_CSE_DMR_DEL_004_ACP() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-                
-						v_ae1.start(f_CSE_DMR_DEL_004(int1, m_createAcpBase, int23, m_createSubscriptionBase));//AccessControlPolicy
-						v_ae1.done;
-					};
-                
-					testcase TC_CSE_DMR_DEL_004_SCH() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-                
-						v_ae1.start(f_CSE_DMR_DEL_004(int18, m_createScheduleBase, int23, m_createSubscriptionBase));//Schedule
-						v_ae1.done;
-					};
-                        
-					testcase TC_CSE_DMR_DEL_004_SUB() runs on Tester system CseSystem {
-							// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-                
-						v_ae1.start(f_CSE_DMR_DEL_004(int23, m_createSubscriptionBase, int18, m_createScheduleBase));//Subscription
-						v_ae1.done;
-					};	
-					
-					testcase TC_CSE_DMR_DEL_004_TS() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_ae1.start(f_CSE_DMR_DEL_004(int29, m_createTimeSeriesBase, int23, m_createSubscriptionBase));//TimeSeries
-						v_ae1.done;
-					};	
-                
-				};//end of group g_CSE_DMR_DEL_004
-				
-				group g_CSE_DMR_DEL_005{
-                	
-					/**
-					 * @desc Check that the stateTag attribute of a RESOURCE_TYPE resource is increased when a child resource is deleted
-					 * 
-					 */
-					testcase TC_CSE_DMR_DEL_005_CNT() runs on Tester system CseSystem {
-						// Local variables
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-		
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_ae1.start(f_CSE_DMR_DEL_005(int3, m_createContainerBase, int3, m_createContainerBase));//Container
-						v_ae1.done;
-						
-						if(getverdict == pass){ 
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
-							//Check that stateTag has been incremented
-							  if(ischosen(v_primitiveContentRetrieveResource.container)) {
-							   if(v_primitiveContentRetrieveResource.container.stateTag == 2){	//(Create and Delete)
-									setverdict(pass, __SCOPE__ & ": The stateTag attribute is incremented");	
-							   }else{
-									setverdict(fail, __SCOPE__ & ": Error the stateTag attribute is not incremented");
-							   }
-							}
-						}
-					};
-
-					testcase TC_CSE_DMR_DEL_005_TS() runs on Tester system CseSystem {
-						// Local variables
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-		
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_ae1.start(f_CSE_DMR_DEL_005(int29, m_createTimeSeriesBase, int30, m_createTimeSeriesInstanceBase));//TimeSeries
-						v_ae1.done;
-						
-						if(getverdict == pass){ 
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
-							//Check that stateTag has been incremented
-							  if(ischosen(v_primitiveContentRetrieveResource.container)) {
-							   if(v_primitiveContentRetrieveResource.timeSeries.stateTag == 2){	//(Create and Delete)
-									setverdict(pass, __SCOPE__ & ": The stateTag attribute is incremented");	
-							   }else{
-									setverdict(fail, __SCOPE__ & ": Error the stateTag attribute is not incremented");
-							   }
-							}
-						}
-					};
-
-				};//end of group g_CSE_DMR_DEL_005
-				
-				group g_CSE_DMR_DEL_006{
-                	
-					/**
-					 * @desc Check that the IUT decreases the field value of attribute currentNrOfInstances and currentByteSize of parent RESOURCE_TYPE when a latest RESOURCE_TYPE resource is deleted successfully
-					 * 
-					 */
-					testcase TC_CSE_DMR_DEL_006_CNT_CIN() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_ae1.start(f_CSE_DMR_DEL_006(int3, m_createContainerBase, int4, m_createContentInstanceBase));//ContentInstance under Container
-						v_ae1.done;
-	
-					};
-
-					testcase TC_CSE_DMR_DEL_006_TS_TSI() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_ae1.start(f_CSE_DMR_DEL_006(int29, m_createTimeSeriesBase, int30, m_createTimeSeriesInstanceBase));//TimeSeriesInstance under TimeSeries
-						v_ae1.done;
-						
-					};
-
-				};//end of group g_CSE_DMR_DEL_006
-
-				group g_CSE_DMR_DEL_008{
-
-					/**
-					 * @desc Check that the IUT rejects the DELETE  request of a latest resource in a container resource that has no direct child contentInstance resources.
-					 * 
-					 */
-					testcase TC_CSE_DMR_DEL_008() runs on Tester system CseSystem {
-					
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-														
-						v_ae1.start(f_CSE_DMR_DEL_008());
-											  	  	
-						v_ae1.done;
-											  	  		
-					}
-													
-					function f_CSE_DMR_DEL_008() runs on AeSimu {
-						// Local variables
-						var MsgIn v_response;
-						var RequestPrimitive v_request;
-						var integer v_aeIndex := -1;
-						var integer v_containerIndex := -1;
-						const ResourceType c_containerResourceType := int4; 
-						
-								   
-						// Test control
-            
-						// Test component configuration
-						f_cf01Up();
-            
-						// Test adapter configuration
-            
-						// Preamble
-						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-						
-						v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); 
-							
-						// Test Body
-						v_request := valueof(m_delete(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameLatest, f_getOriginator(v_containerIndex)));
-						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
-						tc_ac.start;
-						alt {
-								[] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) -> value v_response {
-									tc_ac.stop;
-									setverdict(pass, __SCOPE__ & ": Resource type  " & int2str(enum2int(c_containerResourceType)) & " NOT FOUND");
-								}
-								[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
-									tc_ac.stop;
-									setverdict(fail, __SCOPE__ & ": Wrong response status code");
-								}
-								[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
-									tc_ac.stop;
-									setverdict(fail, __SCOPE__ & ": Resource type  " & int2str(enum2int(c_containerResourceType)) & " has not been created");
-								}
-								[] tc_ac.timeout {
-									setverdict(fail, __SCOPE__ & ": No answer while deleting resource type " & int2str(enum2int(c_containerResourceType)));
-								}
-							}					    
-						
-						// Postamble
-						f_cse_postamble_deleteResources();
-            
-						// Tear down
-						f_cf01Down();
-            				
-					}//end f_CSE_DMR_DEL_008
-				} // end group g_CSE_DMR_DEL_008
-				
-				group g_CSE_DMR_DEL_010{
-
-					/**
-					 * @desc Check that the IUT rejects the DELETE  request of a oldest resource in a container resource that has no direct child contentInstance resources.
-					 * 
-					 */
-					testcase TC_CSE_DMR_DEL_010() runs on Tester system CseSystem {
-					
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-														
-						v_ae1.start(f_CSE_DMR_DEL_010());
-											  	  	
-						v_ae1.done;
-											  	  		
-					}
-													
-					function f_CSE_DMR_DEL_010() runs on AeSimu {
-						// Local variables
-						var MsgIn v_response;
-						var RequestPrimitive v_request;
-						var integer v_aeIndex := -1;
-						var integer v_containerIndex := -1;
-						const ResourceType c_containerResourceType := int4; 
-						
-								   
-						// Test control
-            
-						// Test component configuration
-						f_cf01Up();
-            
-						// Test adapter configuration
-            
-						// Preamble
-						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-						
-						v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); 
-							
-						// Test Body
-						v_request := valueof(m_delete(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameOldest, f_getOriginator(v_containerIndex)));
-						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
-						tc_ac.start;
-						alt {
-								[] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) -> value v_response {
-									tc_ac.stop;
-									setverdict(pass, __SCOPE__ & ": Resource type" & int2str(enum2int(c_containerResourceType)) & " NOT FOUND");
-								}
-								[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
-									tc_ac.stop;
-									setverdict(fail, __SCOPE__ & ": Wrong response status code");
-								}
-								[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
-									tc_ac.stop;
-									setverdict(fail, __SCOPE__ & ": Resource type" & int2str(enum2int(c_containerResourceType)) & " has not been created");
-								}
-								[] tc_ac.timeout {
-									setverdict(fail, __SCOPE__ & ": No answer while deleting resource type " & int2str(enum2int(c_containerResourceType)));
-								}
-							}					    
-						
-						// Postamble
-						f_cse_postamble_deleteResources();
-            
-						// Tear down
-						f_cf01Down();	
-					}//end f_CSE_DMR_DEL_010
-				} // end group g_CSE_DMR_DEL_010
-				
-			}//end group Delete
-			
-		}//end group Data_Management_and_Repository
-		
-		group Location {
-		  		    
-			group g_CSE_LOC_001{  		    
-		    
-			 testcase TC_CSE_LOC_001() runs on Tester system CseSystem {
-					
-				 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-																
-				 v_ae1.start(f_CSE_LOC_001());
-													  	  	
-				 v_ae1.done;
-													  	  		
-			 }
-															
-			 function f_CSE_LOC_001() runs on AeSimu {
-     	    	
-				var integer v_aeIndex := -1;	
-				var RequestPrimitive v_request;
-				var MsgIn v_response;
-				var LocationSource v_locationSource := int1;//Network-based
-     	     	
-				//Test component configuration
-				f_cf01Up();
-     	     	
-				//Preamble
-				v_aeIndex := f_cse_preamble_registerAe();
-     	     	     	     	
-				//Set requestPrimitive
-				v_request	 := f_getCreateRequestPrimitive(int10, m_createLocationPolicy(v_locationSource, omit, omit, omit, omit), v_aeIndex);
-     	     	
-				//Test Body
-				mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
-				tc_ac.start;
-				alt{
-				  [] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) -> value v_response { //BAD REQUEST
-					tc_ac.stop;
-					setverdict(pass, __SCOPE__ & "Resource <locationPolicy> create request is rejected due to invalid request body message!!");     	    	    
-				  }
-				  [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
-					tc_ac.stop;
-					setverdict(fail, __SCOPE__ & ": Wrong response status code");     	    	    
-				  }
-				   [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
-					tc_ac.stop;
-					setverdict(fail, __SCOPE__ & ": Created a locationPolicy resource for an invalid create request with response status code:" & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)));     	    	    
-				  } 
-				  [] tc_ac.timeout {
-						setverdict(fail, __SCOPE__ & ": Timeout due to no response received from requested server!");
-				  }   	    	  
-     	    	      	    	  
-				}
-     	    	
-				f_checkAeSimuStatus();
-    					
-				//Check to see if the resource is NOT present
-				if(f_cse_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
-				  setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
-				} else {
-				  setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
-				}
-				
-				// Postamble
-				f_cse_postamble_deleteResources();	
-    			
-				// Tear down
-				f_cf01Down();
-     	    
-			}// end testcase TC_CSE_LOC_001
-		}//end group g_CSE_LOC_001
-			
-			
-		group g_CSE_LOC_002{  	    
-			testcase TC_CSE_LOC_002() runs on Tester system CseSystem {
-					
-				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-																	
-				v_ae1.start(f_CSE_LOC_002());
-														  	  	
-				v_ae1.done;
-														  	  		
-			}
-																
-			function f_CSE_LOC_002() runs on AeSimu {
-				
-				var integer v_aeAuxIndex 				:= -1;				
-				var LocationSource v_locationSource		:= int1;//Network-based	
-				var XSD.Duration locationUpdatePeriod 	:= PX_LOCATION_UPDATE_PERIOD;  
-				var LocationTargetID locationTargetID			:= PX_LOCATION_TARGET_ID;
-				var XSD.AnyURI locationServerAddress	:= PX_LOCATION_SERVER_ADDRESS;
-				var RequestPrimitive v_request;
-				var MsgIn v_response;
-				var integer v_resourceIndex := -1;
-     	     	
-				//Test component configuration
-				f_cf01Up();
-     	     	
-				//Preamble
-				v_aeAuxIndex := f_cse_preamble_registerAe();
-     	     	     	     	
-				//Set requestPrimitive
-				v_request	 := f_getCreateRequestPrimitive(int10, m_createLocationPolicy(v_locationSource, omit, locationUpdatePeriod, locationTargetID, locationServerAddress), v_aeAuxIndex);
-     	     	    									
-				// Test Body					
-				mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
-				tc_ac.start;
-				alt {
-					[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
-						tc_ac.stop;
-						setverdict(pass, __SCOPE__ & ": Resource locationPolicy is created successfully with response status code: " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode))&"!");
-						f_checkAttributesToBeSaved(int10, v_request, v_response.primitive.responsePrimitive);
-						v_resourceIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int10, v_aeAuxIndex);
-					}
-					[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
-						tc_ac.stop;
-						setverdict(fail, __SCOPE__ & ": Wrong response status code");
-					}
-					[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
-						tc_ac.stop;
-						setverdict(fail, __SCOPE__ & ": Error occurrs with response status code: " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)) & "while handling a valid locationPolicy resource create request!");
-					}
-					[] tc_ac.timeout {
-						setverdict(fail, __SCOPE__ & ": Timeout due to no response from requested server!");
-					}
-				}	
-    								
-				f_checkAeSimuStatus();
-    						
-				//Check to see if the resource is present or not
-				if(f_cse_isResourcePresent(v_resourceIndex)) {
-					setverdict(pass, __SCOPE__ & ":INFO: Resource created");
-				} else {
-					setverdict(fail, __SCOPE__ & ":ERROR: Resource not created");
-				}
-    								
-				// Postamble
-				f_cse_postamble_deleteResources();	
-    			
-				// Tear down
-				f_cf01Down();                        
-				
-			 }// end testcase TC_CSE_LOC_002	
-			
-		}//end group g_CSE_LOC_002
-	
-			  
-		  group g_CSE_LOC_003{
-		    
-			testcase TC_CSE_LOC_003() runs on Tester system CseSystem {
-					
-				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-																	
-				v_ae1.start(f_CSE_LOC_003());
-														  	  	
-				v_ae1.done;
-														  	  		
-			}
-																
-			function f_CSE_LOC_003() runs on AeSimu {//the originator has no privileges to create a locationPolicy resource!!
-		      	
-				var integer v_aeIndex 				:= -1;
-				var integer v_acpAuxIndex 				:= -1;
-				var LocationSource v_locationSource		:= int1;//Network-based
-				var XSD.Duration locationUpdatePeriod 	:= PX_LOCATION_UPDATE_PERIOD;      
-				var LocationTargetID locationTargetID			:= PX_LOCATION_TARGET_ID;
-				var XSD.AnyURI locationServerAddress	:= PX_LOCATION_SERVER_ADDRESS;
-				var RequestPrimitive v_request;	
-				var MsgIn v_response;
-				
-				// Test control
-				if(not(PICS_ACP_SUPPORT)) {
-					setverdict(inconc, __SCOPE__ & ": AccessControlPolicy support is required to run this test case");
-					stop;
-				}
-				     	     	
-				//Test component configuration
-				f_cf01Up();
-     	     	
-				//Preamble
-				v_acpAuxIndex := f_cse_preamble_createAcpAux(-, int62);//c_RUDNDi) //No resource creation privilege
-							
-				v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);
-						     	     	
-				//Set requestPrimitive
-				v_request				:= f_getCreateRequestPrimitive(int10, m_createLocationPolicy(v_locationSource,omit, locationUpdatePeriod, locationTargetID, locationServerAddress), v_aeIndex);
-     	        									
-				// Test Body					
-				mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
-				tc_ac.start;
-				alt {
-					[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response {
-						tc_ac.stop;
-						setverdict(pass, __SCOPE__ & ": Access denied to create a resource including locationPolicy!");
-					}
-					[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
-						tc_ac.stop;
-						setverdict(fail, __SCOPE__ & ": Wrong response status code");
-					}
-					[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
-						tc_ac.stop;
-						setverdict(fail, __SCOPE__ & ": Error occurrs with response status code: " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)) & "due to IUT failed to check the access privilege of originator!");
-					}
-					[] tc_ac.timeout {
-						setverdict(fail, __SCOPE__ & ": Timeout due to no response from requested server!");
-					}
-				}
-    								
-				f_checkAeSimuStatus();
-    					
-				//Check to see if the resource is NOT present
-				if(f_cse_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
-				  setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
-				} else {
-				  setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
-				}
-    								
-				// Postamble
-				f_cse_postamble_deleteResources();	
-    			
-				// Tear down
-				f_cf01Down();				
-		      
-		      
-			} // end testcase TC_CSE_LOC_003
-		    
-		}//end group g_CSE_LOC_003
-		    
-		group g_CSE_LOC_004{  	
-			testcase TC_CSE_LOC_004() runs on Tester system CseSystem {
-					
-				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-																	
-				v_ae1.start(f_CSE_LOC_004());
-														  	  	
-				v_ae1.done;
-														  	  		
-			}
-																
-			function f_CSE_LOC_004() runs on AeSimu {
-		      	
-				var integer v_aeIndex 				:= -1;
-				var LocationSource v_locationSource		:= int1;//Netwok-based		        
-				var XSD.Duration locationUpdatePeriod 	:= PX_LOCATION_UPDATE_PERIOD;   
-				var LocationTargetID locationTargetID			:= PX_LOCATION_TARGET_ID;
-				var XSD.AnyURI locationServerAddress	:= PX_LOCATION_SERVER_ADDRESS;
-				var RequestPrimitive v_request;
-				var MsgIn v_response;
-								    				
-				//Test component configuration
-				f_cf01Up();
-     	     	
-				//Preamble
-				v_aeIndex 	:= f_cse_preamble_registerAe();
-     	     	
-				//Set requestPrimitive
-				v_request		:= f_getCreateRequestPrimitive(int10, m_createLocationPolicy(v_locationSource, omit, locationUpdatePeriod, locationTargetID, locationServerAddress), v_aeIndex);
-     	    							
-				// Test Body					
-				mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
-				tc_ac.start;
-				alt {
-					[] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) -> value v_response {
-						tc_ac.stop;
-						setverdict(pass, __SCOPE__ & ": The targeted resource is not found!!");
-					}
-					[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
-						tc_ac.stop;
-						setverdict(fail, __SCOPE__ & ": Wrong response status code");
-					}
-					[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
-						tc_ac.stop;
-						setverdict(fail, __SCOPE__ & ": Error occurrs with response status code: "& int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)) & "due to IUT created a locationPolicy resource under a non-existed parent resource!");
-					}
-					[] tc_ac.timeout {
-						setverdict(fail, __SCOPE__ & ": Timeout due to no response from requested server!");
-					}
-				}	
-    								
-				f_checkAeSimuStatus();
-    					
-				//Check to see if the resource is NOT present
-				if(f_cse_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
-				  setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
-				} else {
-				  setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
-				}				
-				// Postamble
-				f_cse_postamble_deleteResources();	
-    			
-				// Tear down
-				f_cf01Down();
-				
-			}// end testcase TC_CSE_LOC_004
-		    
-		  }//end group g_CSE_LOC_004
-		
-		  
-		  group g_CSE_LOC_005{
-		    
-			testcase TC_CSE_LOC_005() runs on Tester system CseSystem {
-					
-				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-																	
-				v_ae1.start(f_CSE_LOC_005());
-														  	  	
-				v_ae1.done;
-														  	  		
-			}
-																
-			function f_CSE_LOC_005() runs on AeSimu {//reject an invalid update request with invalid attribtue locationUpdatePeriod
-		      
-				var integer v_aeAuxIndex 						:= -1;
-				var integer v_locPolicyResourceIndex			:= -1;
-				var LocationSource v_locationSource				:= int1;//Netwok-based	
-				var XSD.Duration locationUpdatePeriod 	:= PX_LOCATION_UPDATE_PERIOD;  	      	
-				var XSD.Duration locationUpdatePeriod_invalid 	:= c_invalid_location_update_period;				 
-				var LocationTargetID locationTargetID					:= PX_LOCATION_TARGET_ID;
-				var XSD.AnyURI locationServerAddress			:= PX_LOCATION_SERVER_ADDRESS;
-				var RequestPrimitive v_request;
-				var RequestPrimitive v_locpolicy_request_preamble;
-				var MsgIn v_response;
-								    				
-				//Test component configuration
-				f_cf01Up();
-     	     	
-				//Preamble - register AE
-				v_aeAuxIndex 				:= f_cse_preamble_registerAe();
-				//Preamble - create a valid locationPolicy resource for later update use
-				v_locpolicy_request_preamble:= valueof(m_createLocationPolicy(v_locationSource, omit, locationUpdatePeriod, locationTargetID, locationServerAddress));
-				v_locPolicyResourceIndex	:= f_cse_createResource(int10, v_locpolicy_request_preamble, v_aeAuxIndex);     	     	
-     	     	
-				//Set requestPrimitive
-				v_request					:= f_getUpdateRequestPrimitive(int10, v_locPolicyResourceIndex, m_updateLocationPolicy(f_getResourceAddress(v_locPolicyResourceIndex), omit, locationUpdatePeriod_invalid));
-     	     	    									
-				// Test Body					
-				mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
-				tc_ac.start;
-				alt {
-					[] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) -> value v_response {
-						tc_ac.stop;
-						setverdict(pass, __SCOPE__ & ": Update locationPolicy resource is rejected!!");
-					}
-					[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
-						tc_ac.stop;
-						setverdict(fail, __SCOPE__ & ": Wrong response status code");
-					}
-					[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
-						tc_ac.stop;
-						setverdict(fail, __SCOPE__ & ": Error occurrs with response status code: "& int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)) & "due to IUT failed to handle an invalid locationPolicy update request");
-					}
-					[] tc_ac.timeout {
-						setverdict(fail, __SCOPE__ & ": Timeout due to no response from requested server!");
-					}
-				}	
-    								
-				f_checkAeSimuStatus();
-    						
-				//TODO: Check to see if the resource has been updated or not
-				
-				// Postamble
-				f_cse_postamble_deleteResources();	 
-    			
-				// Tear down
-				f_cf01Down();      
-		      
-			}//end testcase TC_CSE_LOC_005
-		    
-		  }//end group g_CSE_LOC_005
-		  
-		  group g_CSE_LOC_006 {
-		  
-			testcase TC_CSE_LOC_006() runs on Tester system CseSystem {
-					
-				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-																	
-				v_ae1.start(f_CSE_LOC_006());
-														  	  	
-				v_ae1.done;
-														  	  		
-			}
-																
-			function f_CSE_LOC_006() runs on AeSimu {
-			  //TO RETRIEVE a <container> resource that has created in cse and linked with a <locationPolicy> resource (network-based case)
-		     
-			  var integer v_aeAuxIndex				    :=	-1;
-			  var integer v_locPolicyResourceIndex	    := 	-1;
-			  var integer v_locContainerResourceIndex	:= 	-1;
-			  var XSD.Duration locationUpdatePeriod 	:= PX_LOCATION_UPDATE_PERIOD;  
-			  var LocationTargetID locationTargetID			:= PX_LOCATION_TARGET_ID;
-			  var XSD.AnyURI locationServerAddress	    := PX_LOCATION_SERVER_ADDRESS;
-			  var RequestPrimitive v_loc_request_preamble;
-			  var RequestPrimitive v_container_request_preamble;
-			  var MsgIn v_response;
-			  var LocationSource v_locationSource := int1;//Network-based      
-		      
-			  //Test component configuration
-			  f_cf01Up();
-		 	  
-			  //Preamble - register AE
-			  v_aeAuxIndex				:= f_cse_preamble_registerAe();
-			  //Preamble - create a valid locationPolicy resource for later container resource creation
-			  v_loc_request_preamble		:= valueof(m_createLocationPolicy(v_locationSource, omit, locationUpdatePeriod, locationTargetID, locationServerAddress));
-			  v_container_request_preamble	:= valueof(m_createContainer(f_getResourceAddress(v_aeAuxIndex), omit));//no location-container name provided?
-			  v_locPolicyResourceIndex	:= f_cse_createResource(int10, v_loc_request_preamble, v_aeAuxIndex);//created locationpolicy index
-			  v_locContainerResourceIndex	:= f_cse_createResource(int3, v_container_request_preamble, v_locPolicyResourceIndex);//created container index
-			  			  	
-			  //Test Body - retrieve the created container resource
-			  mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(m_retrieve(f_getResourceAddress(v_locContainerResourceIndex), f_getOriginator(v_locContainerResourceIndex)))))); 
-			  tc_ac.start;
-			  alt{
-				[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response{
-				  tc_ac.stop;
-				  if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.container.locationID)){		            
-						setverdict(fail, __SCOPE__ & "No locationID is included in the response!");
-				  }else{
-						setverdict(pass, __SCOPE__ & "Container resource associated with locationPolicy resource is successfully retrieved with locationID included in the response!");		            
-				  }		          
-		          
-				}
-				[] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) -> value v_response{
-						tc_ac.stop;
-						setverdict(fail, __SCOPE__ & "Requested container resource is not found!");
-				}
-				[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
-						tc_ac.stop;
-						setverdict(fail, __SCOPE__ & ": Error while retrieving resource!");
-				}
-				[] tc_ac.timeout {
-						setverdict(fail, __SCOPE__ & ": No answer while retrieving resource!");
-				}
-		        
-			  }
-		      
-			  f_checkAeSimuStatus();
-    									  
-			  // Postamble
-				f_cse_postamble_deleteResources();	 
-    			
-				// Tear down
-				f_cf01Down(); 		      
-		      
-			}//end testcase TC_CSE_LOC_006 		    
-		    
-		  }//end group g_CSE_LOC_006
-		  		 
-		  group g_CSE_LOC_007 {
-		    
-			testcase TC_CSE_LOC_007() runs on Tester system CseSystem {
-					
-				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-																	
-				v_ae1.start(f_CSE_LOC_007());
-														  	  	
-				v_ae1.done;
-														  	  		
-			}
-																
-			function f_CSE_LOC_007() runs on AeSimu {
-			  //TO create a <locationPolicy> resource with locationSource set to Device-based
-		     
-			   var integer v_aeAuxIndex 					:= -1;	
-			   var XSD.Duration locationUpdatePeriod 	:= PX_LOCATION_UPDATE_PERIOD;
-				var RequestPrimitive v_request;
-				var MsgIn v_response;
-				var LocationSource v_locationSource		:= int2;//Device-based
-				var integer v_resourceIndex := -1;
-				
-				//Test control
-				if(not(PICS_ASN_CSE)) {
-					setverdict(inconc, __SCOPE__ & ": IUT shall support ASN-CSE to run this test case. Set PX_ASN_CSE to true to run this test case");
-					stop;
-				}
-				
-				//Test component configuration
-				f_cf01Up();
-     	     	
- 	     		//Preamble
-				v_aeAuxIndex := f_cse_preamble_registerAe();
-				//Set requestPrimitive
-				v_request	  := f_getCreateRequestPrimitive(int10, m_createLocationPolicy(v_locationSource, omit, locationUpdatePeriod, omit, omit), v_aeAuxIndex);
-			   									
-				// Test Body					
-				mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
-				tc_ac.start;
-				alt {
-					[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
-						tc_ac.stop;
-						setverdict(pass, __SCOPE__ & ": Resource locationPolicy is created successfully with response status code: " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode))&"!");
-						f_checkAttributesToBeSaved(int10, v_request, v_response.primitive.responsePrimitive);
-						v_resourceIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int10, v_aeAuxIndex);
-					}
-					[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
-						tc_ac.stop;
-						setverdict(fail, __SCOPE__ & ": Wrong response status code");
-					}
-					[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
-						tc_ac.stop;
-						setverdict(fail, __SCOPE__ & ": Error occurrs with response status code: " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)) & "while handling a valid locationPolicy resource create request!");
-					}
-					[] tc_ac.timeout {
-						setverdict(fail, __SCOPE__ & ": Timeout due to no response from requested server!");
-					}
-				}	
-  		      
-				f_checkAeSimuStatus();
-						
-				//Check to see if the resource is present or not
-				if(f_cse_isResourcePresent(v_resourceIndex)) {
-					setverdict(pass, __SCOPE__ & ":INFO: Resource created");
-				} else {
-					setverdict(fail, __SCOPE__ & ":ERROR: Resource not created");
-				}
-  		      
-			  // Postamble
-				f_cse_postamble_deleteResources();	 
-    				
-				// Tear down
-				f_cf01Down(); 		      
-		      
-			}//end testcase TC_CSE_LOC_007
-		    
-		  }//end group g_CSE_LOC_007
-		  		
-		 group g_CSE_LOC_008 {
-		    
-			testcase TC_CSE_LOC_008() runs on Tester system CseSystem {
-					
-				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-																	
-				v_ae1.start(f_CSE_LOC_008());
-														  	  	
-				v_ae1.done;
-														  	  		
-			}
-																
-			function f_CSE_LOC_008() runs on AeSimu {
-			  //TO create a <locationPolicy> resource with locationSource set to Share-based
-		     
-			   var integer v_aeAuxIndex 				:= -1;	 
-			   var LocationSource v_locationSource		:= int3;//Share-based
-				var RequestPrimitive v_request;
-				var MsgIn v_response;
-				var integer v_resourceIndex := -1;
-     	     	
-     	     	//Test control
-				if(not(PICS_MN_CSE)) {
-					setverdict(inconc, __SCOPE__ & ": IUT shall support MN-CSE to run this test case. Set PX_MN_CSE to true to run this test case");
-					stop;
-				}
-				
-				//Test component configuration
-				f_cf01Up();
- 	     	      	     	    
-				//Preamble
-				v_aeAuxIndex := f_cse_preamble_registerAe();
-				//Set requestPrimitive
-				v_request	  := f_getCreateRequestPrimitive(int10, m_createLocationPolicy(v_locationSource, omit, omit, omit, omit), v_aeAuxIndex);
-			  									
-				// Test Body					
-				mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
-				tc_ac.start;
-				alt {
-					[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
-						tc_ac.stop;
-						setverdict(pass, __SCOPE__ & ": Resource locationPolicy is created successfully with response status code: " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode))&"!");
-						f_checkAttributesToBeSaved(int10, v_request, v_response.primitive.responsePrimitive);
-						v_resourceIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int10, v_aeAuxIndex);
-					}
-					[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
-						tc_ac.stop;
-						setverdict(fail, __SCOPE__ & ": Wrong response status code");
-					}
-					[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
-						tc_ac.stop;
-						setverdict(fail, __SCOPE__ & ": Error occurrs with response status code: " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)) & "while handling a valid locationPolicy resource create request!");
-					}
-					[] tc_ac.timeout {
-						setverdict(fail, __SCOPE__ & ": Timeout due to no response from requested server!");
-					}
-				}	
-		      
-				f_checkAeSimuStatus();
-						
-				//Check to see if the resource is present or not
-				if(f_cse_isResourcePresent(v_resourceIndex)) {
-					setverdict(pass, __SCOPE__ & ":INFO: Resource created");
-				} else {
-					setverdict(fail, __SCOPE__ & ":ERROR: Resource not created");
-				}
-		      
-				//Postamble
-				f_cse_postamble_deleteResources();	 
-				
-				// Tear down
-				f_cf01Down(); 		      
-		      
-			}//end testcase TC_CSE_LOC_008
-		    
-		  }//end group g_CSE_LOC_008
-		 		 		
-		 group g_CSE_LOC_009 {
-		    
-			testcase TC_CSE_LOC_009_01() runs on Tester system CseSystem {
-					
-				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-																	
-				v_ae1.start(f_CSE_LOC_009_01());
-														  	  	
-				v_ae1.done;
-														  	  		
-			}
-																
-			function f_CSE_LOC_009_01() runs on AeSimu {
-			  //TO NOTIFY a location information 
-		     
-			  var integer v_aeAuxIndex					:=	-1;
-			  var integer v_locPolicyResourceIndex		:= 	-1;
-			  var integer v_locContainerResourceIndex	:=	-1;
-			  var integer v_subscriptionResourceIndex	:= 	-1;
-			  var LocationSource v_locationSource	:= int1;//Netwok-based
-			  var XSD.Duration locationUpdatePeriod 	:= PX_LOCATION_UPDATE_PERIOD;  
-			  var LocationTargetID locationTargetID			:= PX_LOCATION_TARGET_ID;
-			  var XSD.AnyURI locationServerAddress	    := PX_LOCATION_SERVER_ADDRESS;
-			  var RequestPrimitive v_locpolicy_request_preamble;
-			  var RequestPrimitive v_container_request_preamble;
-			  var RequestPrimitive v_subscription_request_preamble;
-			  var MsgIn v_response;
-		      		      
-			  //Test component configuration
-			  f_cf01Up();
-		 	  
-			  //Preamble - register AE
-				v_aeAuxIndex						:= f_cse_preamble_registerAe();
-			  //Preamble - create a valid locationPolicy resource 
-				v_locpolicy_request_preamble		:= valueof(m_createLocationPolicy(v_locationSource, omit, locationUpdatePeriod, locationTargetID, locationServerAddress));
-				v_container_request_preamble		:= valueof(m_createContainer(f_getResourceAddress(v_aeAuxIndex), omit));//no location-container name provided?
-		 	  	
-				v_locPolicyResourceIndex			:= f_cse_createResource(int10, v_locpolicy_request_preamble, v_aeAuxIndex);//created locationpolicy index
-				v_locContainerResourceIndex		:= f_cse_createResource(int3, v_container_request_preamble, v_locPolicyResourceIndex);//created container index
-				v_subscription_request_preamble	:= valueof(m_createSubscription(f_getResourceAddress(v_locContainerResourceIndex), c_defaultResourceName, -));
-				v_subscriptionResourceIndex		:= f_cse_createResource(int23, v_subscription_request_preamble, v_locContainerResourceIndex);
-				
-			  //Test Body - retrieve the <latest> resource of the created container resource linked with the locationPolicy resource
-			  mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(m_retrieve(f_getResourceAddress(v_locContainerResourceIndex) & "/" & "latest", f_getOriginator(v_locContainerResourceIndex))))));
-			  tc_ac.start;
-			  alt{
-				[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response{
-				  tc_ac.stop;
-				  if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.notification.notificationEvent)){		            
-						setverdict(fail, __SCOPE__ & "No NotificationEvent is included in the response!");
-				  }else{
-						setverdict(pass, __SCOPE__ & "Location information is successfully sent!");		            
-				  }		          
-		          
-				}
-				[] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) -> value v_response{
-						tc_ac.stop;
-						setverdict(fail, __SCOPE__ & "Requested container resource is not found!");
-				}
-				[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
-						tc_ac.stop;
-						setverdict(fail, __SCOPE__ & ": Error while retrieving resource!");
-				}
-				[] tc_ac.timeout {
-						setverdict(fail, __SCOPE__ & ": No answer while retrieving resource!");
-				}		        
-			  }
-		      
-			  // Postamble
-			  f_cse_postamble_deleteResources();	 
-    			
-			  // Tear down
-			  f_cf01Down(); 		      
-		      
-			}//end testcase TC_CSE_LOC_009_01
-		    
-			testcase TC_CSE_LOC_BV_009_02() runs on Tester system CseSystem {
-					
-				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-																	
-				v_ae1.start(f_CSE_LOC_009_02());
-														  	  	
-				v_ae1.done;
-														  	  		
-			}
-																
-			function f_CSE_LOC_009_02() runs on AeSimu {
-			  //TO NOTIFY a location information 
-		     
-			  var integer v_aeAuxIndex					:=	-1;
-			  var integer v_locPolicyResourceIndex		:= 	-1;
-			  var integer v_locContainerResourceIndex	:=	-1;
-			  var integer v_subscriptionResourceIndex	:= 	-1;
-			  var LocationSource v_locationSource	    := int2;//Device-based
-			  var XSD.Duration locationUpdatePeriod 	:= PX_LOCATION_UPDATE_PERIOD;  
-			  var RequestPrimitive v_locpolicy_request_preamble;
-			  var RequestPrimitive v_container_request_preamble;
-			  var RequestPrimitive v_subscription_request_preamble;
-			  var MsgIn v_response;
-		      		      
-			  //Test component configuration
-			  f_cf01Up();
-		 	  
-			  //Preamble - register AE
-				v_aeAuxIndex						:= f_cse_preamble_registerAe();
-			  //Preamble - create a valid locationPolicy resource
-		 	  	 
-				v_locpolicy_request_preamble		:= valueof(m_createLocationPolicy(v_locationSource, omit, locationUpdatePeriod, omit, omit));
-				v_container_request_preamble		:= valueof(m_createContainer(f_getResourceAddress(v_aeAuxIndex), omit));//no location-container name provided?
-		 	  	
-				v_locPolicyResourceIndex			:= f_cse_createResource(int10, v_locpolicy_request_preamble, v_aeAuxIndex);//created locationpolicy index
-				v_locContainerResourceIndex		:= f_cse_createResource(int3, v_container_request_preamble, v_locPolicyResourceIndex);//created container index
-				v_subscription_request_preamble	:= valueof(m_createSubscription(f_getResourceAddress(v_locContainerResourceIndex), c_defaultResourceName, -));
-				v_subscriptionResourceIndex		:= f_cse_createResource(int23, v_subscription_request_preamble, v_locContainerResourceIndex);
-				
-			  //Test Body - retrieve the <latest> resource of the created container resource linked with the locationPolicy resource
-			  mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(m_retrieve(f_getResourceAddress(v_locContainerResourceIndex) & "/" & "latest", f_getOriginator(v_locContainerResourceIndex))))));
-			  tc_ac.start;
-			  alt{
-				[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response{
-				  tc_ac.stop;
-				  if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.notification.notificationEvent)){		            
-						setverdict(fail, __SCOPE__ & "No NotificationEvent is included in the response!");
-				  }else{
-						setverdict(pass, __SCOPE__ & "Location information is successfully sent!");		            
-				  }		          
-		          
-				}
-				[] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) -> value v_response{
-						tc_ac.stop;
-						setverdict(fail, __SCOPE__ & "Requested container resource is not found!");
-				}
-				[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
-						tc_ac.stop;
-						setverdict(fail, __SCOPE__ & ": Error while retrieving resource!");
-				}
-				[] tc_ac.timeout {
-						setverdict(fail, __SCOPE__ & ": No answer while retrieving resource!");
-				}		        
-			  }
-		      
-			  // Postamble
-			  f_cse_postamble_deleteResources();	 
-    			
-			  // Tear down
-			  f_cf01Down(); 		      
-		      
-			}//end testcase TC_CSE_LOC_009_02 		    
-		    
-			testcase TC_CSE_LOC_009_03() runs on Tester system CseSystem {
-					
-				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-																	
-				v_ae1.start(f_CSE_LOC_009_03());
-														  	  	
-				v_ae1.done;
-														  	  		
-			}
-																
-			function f_CSE_LOC_009_03() runs on AeSimu {
-			  //TO NOTIFY a location information 
-		     
-			  var integer v_aeAuxIndex					:=	-1;
-			  var integer v_locPolicyResourceIndex		:= 	-1;
-			  var integer v_locContainerResourceIndex	:=	-1;
-			  var integer v_subscriptionResourceIndex	:= 	-1;
-			  var LocationSource v_locationSource	:= int3;//Sharing-based
-			  var RequestPrimitive v_locpolicy_request_preamble;
-			  var RequestPrimitive v_container_request_preamble;
-			  var RequestPrimitive v_subscription_request_preamble;
-			  var MsgIn v_response;
-		      		      
-			  //Test component configuration
-			  f_cf01Up();
-		 	  
-			  //Preamble - register AE
-				v_aeAuxIndex						:= f_cse_preamble_registerAe();
-			  //Preamble - create a valid locationPolicy resource
-		 	  	 
-				v_locpolicy_request_preamble		:= valueof(m_createLocationPolicy(v_locationSource, omit, omit, omit, omit));
-				v_container_request_preamble		:= valueof(m_createContainer(f_getResourceAddress(v_aeAuxIndex), omit));//no location-container name provided?
-		 	  	
-				v_locPolicyResourceIndex			:= f_cse_createResource(int10, v_locpolicy_request_preamble, v_aeAuxIndex);//created locationpolicy index
-				v_locContainerResourceIndex		:= f_cse_createResource(int3, v_container_request_preamble, v_locPolicyResourceIndex);//created container index
-				v_subscription_request_preamble	:= valueof(m_createSubscription(f_getResourceAddress(v_locContainerResourceIndex), c_defaultResourceName, -));
-				v_subscriptionResourceIndex		:= f_cse_createResource(int23, v_subscription_request_preamble, v_locContainerResourceIndex);
-				
-			  //Test Body - retrieve the <latest> resource of the created container resource linked with the locationPolicy resource
-			  mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(m_retrieve(f_getResourceAddress(v_locContainerResourceIndex) & "/" & "latest", f_getOriginator(v_locContainerResourceIndex))))));
-			  tc_ac.start;
-			  alt{
-				[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response{
-				  tc_ac.stop;
-				  if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.notification.notificationEvent)){		            
-						setverdict(fail, __SCOPE__ & "No NotificationEvent is included in the response!");
-				  }else{
-						setverdict(pass, __SCOPE__ & "Location information is successfully sent!");		            
-				  }		          
-		          
-				}
-				[] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) -> value v_response{
-						tc_ac.stop;
-						setverdict(fail, __SCOPE__ & "Requested container resource is not found!");
-				}
-				[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
-						tc_ac.stop;
-						setverdict(fail, __SCOPE__ & ": Error while retrieving resource!");
-				}
-				[] tc_ac.timeout {
-						setverdict(fail, __SCOPE__ & ": No answer while retrieving resource!");
-				}		        
-			  }
-		      
-			  // Postamble
-			  f_cse_postamble_deleteResources();	 
-    			
-			  // Tear down
-			  f_cf01Down(); 		      
-		      
-			}//end testcase TC_CSE_LOC_009_03 
-		  }//end group g_CSE_LOC_009
-		  
-		  /*group g_CSE_LOC_007 {
-			  testcase TC_CSE_LOC_007() runs on AeSimu system CseSystem{		    
-				//TODO
-			  }//end testcase TC_CSE_LOC_007
-		  }//end group g_CSE_LOC_007
-		  
-		  group g_CSE_LOC_008 {
-			  testcase TC_CSE_LOC_008() runs on AeSimu system CseSystem{		    
-				//TODO
-			  }//end testcase TC_CSE_LOC_008
-		  }//end group g_CSE_LOC_008
-		  */
-
-		  group g_CSE_LOC_012 {
-			testcase TC_CSE_LOC_012() runs on Tester system CseSystem {
-					
-				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-																	
-				v_ae1.start(f_CSE_LOC_012());
-														  	  	
-				v_ae1.done;
-														  	  		
-			}
-																
-			function f_CSE_LOC_012() runs on AeSimu {		    
-				//To CREATE a <subscription> resource as a child resource of the created <container> 
-    		    
-				  var integer v_aeAuxIndex					:=	-1;
-				  var integer v_locPolicyResourceIndex		:= 	-1;
-				  var integer v_locContainerResourceIndex	:=	-1;
-				  var LocationSource v_locationSource		:= int1;//Netwok-based
-				  var XSD.Duration locationUpdatePeriod 	:= PX_LOCATION_UPDATE_PERIOD;  
-				  var LocationTargetID locationTargetID			:= PX_LOCATION_TARGET_ID;
-				  var XSD.AnyURI locationServerAddress	    := PX_LOCATION_SERVER_ADDRESS;
-				  var RequestPrimitive v_locpolicy_request_preamble;
-				  var RequestPrimitive v_container_request_preamble;
-				  var RequestPrimitive v_subscription_request_preamble;
-				  var MsgIn v_response;
-    		      		      
-				  //Test component configuration
-				  f_cf01Up();
-    		 	  
-				  //Preamble - register AE
-					v_aeAuxIndex						:= f_cse_preamble_registerAe();
-				  //Preamble - create a valid locationPolicy resource 
-					v_locpolicy_request_preamble		:= valueof(m_createLocationPolicy(v_locationSource, omit, locationUpdatePeriod, locationTargetID, locationServerAddress));
-					v_container_request_preamble		:= valueof(m_createContainer(f_getResourceAddress(v_aeAuxIndex), omit));//no location-container name provided?
-    		 	  	
-					v_locPolicyResourceIndex			:= f_cse_createResource(int10, v_locpolicy_request_preamble, v_aeAuxIndex);//created locationpolicy index
-					v_locContainerResourceIndex		:= f_cse_createResource(int3, v_container_request_preamble, v_locPolicyResourceIndex);//created container index
-					v_subscription_request_preamble	:= valueof(m_createSubscription(f_getResourceAddress(v_locContainerResourceIndex), c_defaultResourceName, -));
-    				    				
-				  //Test Body
-				  mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(f_getCreateRequestPrimitive(int23, v_subscription_request_preamble, v_locContainerResourceIndex))))); 
-				  tc_ac.start;
-				  alt{
-					[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response{
-					  tc_ac.stop;    		         
-					  setverdict(pass, __SCOPE__ & "Subscription resource is successfully!");
-					}
-					[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response{
-					  tc_ac.stop;    		         
-						setverdict(fail, __SCOPE__ & ": Wrong response status code");
-					}
-					[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response{
-							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & "Requested container resource is not found!");
-					}    		        
-					[] tc_ac.timeout {
-							setverdict(fail, __SCOPE__ & ": No answer while creating subscription resource!");
-					}		        
-				  }
-    		      
-				  // Postamble
-				  f_cse_postamble_deleteResources();	 
-        			
-				  // Tear down
-				  f_cf01Down(); 		
-    		    
-			  }//end testcase TC_CSE_LOC_012
-		  }//end group g_CSE_LOC_012
-		
-		  group g_CSE_LOC_013 {
-		    
-			testcase TC_CSE_LOC_013() runs on Tester system CseSystem {
-					
-				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-																	
-				v_ae1.start(f_CSE_LOC_013());
-														  	  	
-				v_ae1.done;
-														  	  		
-			}
-																
-			function f_CSE_LOC_013() runs on AeSimu {
-			  //TO RETRIEVE a <locationPolicy> resource that has created in cse
-		     
-			  var integer v_aeAuxIndex				:=	-1;
-			  var integer v_locPolicyResourceIndex	:= 	-1;
-			  var RequestPrimitive v_locpolicy_request_preamble;
-			  var MsgIn v_response;
-			  var LocationSource v_locationSource	:= int1;//Netwok-based
-			  var XSD.Duration locationUpdatePeriod 	:= PX_LOCATION_UPDATE_PERIOD;
-			  var LocationTargetID locationTargetID		:= PX_LOCATION_TARGET_ID;
-			  var XSD.AnyURI locationServerAddress	:= PX_LOCATION_SERVER_ADDRESS;
-		      
-		      
-			  //Test component configuration
-			  f_cf01Up();
-		 	  
-			  //Preamble - register AE
-			  v_aeAuxIndex				:= f_cse_preamble_registerAe();
-			  //Preamble - create a valid locationPolicy resource for later container resource creation
-			  v_locpolicy_request_preamble		:= valueof(m_createLocationPolicy(v_locationSource, omit, locationUpdatePeriod, locationTargetID, locationServerAddress));
-			  v_locPolicyResourceIndex	:= f_cse_createResource(int10, v_locpolicy_request_preamble, v_aeAuxIndex);//created locationpolicy index
-				
-			  //Test Body - retrieve the created locationpolicy resource
-			  mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(m_retrieve(f_getResourceAddress(v_locPolicyResourceIndex), f_getOriginator(v_locPolicyResourceIndex)))))); 
-			  tc_ac.start;
-			  alt{
-				[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response{
-				  tc_ac.stop;
-				  if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.locationPolicy.locationContainerID)){		            
-						setverdict(fail, __SCOPE__ & "No locationContainerID is included in the response!");
-				  }else{
-						setverdict(pass, __SCOPE__ & "LocationPolicy resource is successfully retrieved with locationContainerID included in the response!");		            
-				  }		          
-		          
-				}
-				[] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) -> value v_response{
-						tc_ac.stop;
-						setverdict(fail, __SCOPE__ & "Requested locationPolicy is not found!");
-				}
-				[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
-						tc_ac.stop;
-						setverdict(fail, __SCOPE__ & ": Error while retrieving resource!");
-				}
-				[] tc_ac.timeout {
-						setverdict(fail, __SCOPE__ & ": No answer while retrieving resource!");
-				}
-		        
-			  }
-		      
-			  // Postamble
-			  f_cse_postamble_deleteResources();	 
-    			
-			  // Tear down
-			  f_cf01Down(); 		      
-		      
-			}//end testcase TC_CSE_LOC_013 		    
-		    
-		  }//end group g_CSE_LOC_013
-		  
-		  
-		}//end group Location
-		
-		group Subscription_And_Notification {
-	
-			group Create {
-				
-				group g_CSE_SUB_CRE_001 {
-				
-					/**
-					 * @desc Check that the IUT rejects the creation of the <subscription> resource when the target subscribed-to RESOURCE_TYPE resource is not subscribable. 
-					 * 
-					 */
-					testcase TC_CSE_SUB_CRE_001_CIN() runs on Tester system CseSystem {
-						// Local variables
-						var template RequestPrimitive v_parentResourceRequest := m_createContainerBase;
-						var template RequestPrimitive v_childResourceRequest := m_createContentInstanceBase;
-						var ResponsePrimitive v_responsePrimitive;
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						const XSD.String c_content := "Random Value";	
-
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_childResourceRequest.primitiveContent.contentInstance.content := "Random Value";
-
-						v_ae1.start(f_CSE_SUB_CRE_001(int3, v_parentResourceRequest, int4, v_childResourceRequest));		
-						v_ae1.done;
-					}
-					
-					testcase TC_CSE_SUB_CRE_001_SUB() runs on Tester system CseSystem {
-						// Local variables
-						var template RequestPrimitive v_parentResourceRequest := m_createSubscriptionBase;
-						var ResponsePrimitive v_responsePrimitive;
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_ae1.start(f_CSE_SUB_CRE_001(int23, v_parentResourceRequest, int23, v_parentResourceRequest));		
-						v_ae1.done;
-					}
-					
-					testcase TC_CSE_SUB_CRE_001_TSI() runs on Tester system CseSystem {
-						// Local variables
-						var template RequestPrimitive v_parentResourceRequest := m_createTimeSeriesBase;
-						var template RequestPrimitive v_childResourceRequest := m_createTimeSeriesInstanceBase;
-						var ResponsePrimitive v_responsePrimitive;
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						const XSD.String c_content := "Random Value";	
-	
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_childResourceRequest.primitiveContent.timeSeriesInstance.content := "Random Value";
-	
-						v_ae1.start(f_CSE_SUB_CRE_001(int29, v_parentResourceRequest, int30, v_childResourceRequest));		
-						v_ae1.done;
-					}
-
-				}// end group g_CSE_DMR_CRE_014
-				
-			}//end group Create
-			
-			group Notify{
-				
-				/**
-				 * @desc Check that the IUT rejects the creation of the <subscription> resource when the notificationURI is not the originator and the IUT have received the Notify response containing Response Status Code indicating SUBSCRIPTION_CREATOR_HAS_NO_PRIVILEGE 
-				 * 
-				 */
-				testcase TC_CSE_SUB_NTF_001() runs on Tester system CseSystem {
-					
-					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-														
-					v_ae1.start(f_CSE_SUB_NTF_001());
-											  	  	
-					v_ae1.done;
-											  	  		
-				}
-													
-				function f_CSE_SUB_NTF_001() runs on AeSimu {
-					// Local variables
-					var MsgIn v_response;
-					var integer v_aeIndex := -1;
-					var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
-					var RequestPrimitive v_request;
-					var integer v_ae2Index := -1;
-						
-					// Test control
-
-					// Test component configuration
-					f_cf01Up(true);
-										
-					// Test adapter configuration
-
-					// Preamble
-					v_aeIndex := f_cse_preamble_registerAe(omit,omit);//c_CUDNDi);
-					
-					f_cse_preamble_subscriptionVerification(v_ae2Index, v_createRequest, int23, int4101);
-						
-					// Test Body
-					v_request := f_getCreateRequestPrimitive(int23, v_createRequest, v_aeIndex);//Subscription 
-					
-					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
-					
-					tc_ac.start;
-					alt {
-						[] mcaPort.receive(mw_response(mw_responsePrimitive(int4101))) -> value v_response { //SUBSCRIPTION_CREATOR_HAS_NO_PRIVILEGE 
-							tc_ac.stop;
-							setverdict(pass, __SCOPE__ & ": OK : Subscription creator has no privilege");
-						}
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
-							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Wrong response status code");
-						}
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
-							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Subscription successful whereas Subscription creator has no privilege");
-						}
-						[] tc_ac.timeout {
-							setverdict(fail, __SCOPE__ & ": No answer while creating resource");
-						}
-					}
-
-					f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
-    					
-					//Check to see if the resource is NOT present
-					if(f_cse_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
-					  setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
-					} else {
-					  setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
-					}
-
-					//Postamble
-					f_cse_postamble_deleteResources();
-
-					//Tear down
-					f_cf01Down();
-
-				} // end TC_CSE_SUB_NTF_001
-				
-				/**
-				 * @desc Check that the IUT rejects the creation of the <subscription> resource when the notificationURI is not the originator and the IUT have received the Notify response containing Response Status Code indicating SUBSCRIPTION_HOST_HAS_NO_PRIVILEGE
-				 * 
-				 */
-				testcase TC_CSE_SUB_NTF_002() runs on Tester system CseSystem {
-					
-					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-															
-					v_ae1.start(f_CSE_SUB_NTF_002());
-												  	  	
-					v_ae1.done;
-												  	  		
-				}
-														
-				function f_CSE_SUB_NTF_002() runs on AeSimu {
-					// Local variables
-					var MsgIn v_response;
-					var integer v_aeIndex := -1;
-					var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
-					var RequestPrimitive v_request;
-					var integer v_ae2Index := -1;
-						
-					// Test control
-
-					// Test component configuration
-					f_cf01Up(true);
-										
-					// Test adapter configuration
-
-					// Preamble
-					v_aeIndex := f_cse_preamble_registerAe(omit,omit);//c_CUDNDi);
-					
-					f_cse_preamble_subscriptionVerification(v_ae2Index, v_createRequest, int23, int5205);
-						
-					// Test Body
-					v_request := f_getCreateRequestPrimitive(int23, v_createRequest, v_aeIndex);//Subscription 
-					
-					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
-					
-					tc_ac.start;
-					alt {
-						[] mcaPort.receive(mw_response(mw_responsePrimitive(int5205))) -> value v_response { //SUBSCRIPTION_CREATOR_HAS_NO_PRIVILEGE 
-							tc_ac.stop;
-							setverdict(pass, __SCOPE__ & ": OK : Subscription creator has no privilege");
-						}
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
-							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Wrong response status code");
-						}
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
-							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Subscription successful whereas Subscription creator has no privilege");
-						}
-						[] tc_ac.timeout {
-							setverdict(fail, __SCOPE__ & ": No answer while creating resource");
-						}
-					}
-
-					f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
-    					
-					//Check to see if the resource is NOT present
-					if(f_cse_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
-					  setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
-					} else {
-					  setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
-					}
-
-					//Postamble
-					f_cse_postamble_deleteResources();
-
-					//Tear down
-					f_cf01Down();
-
-				} // end TC_CSE_SUB_NTF_002
-				
-				/**
-				 * @desc Check that the IUT sends aggregated notification to the subscriber resource when the duration value of the batchNotify attribute is set to TIME_LIMIT and when this timer expires
-				 * 
-				 */
-				testcase TC_CSE_SUB_NTF_003() runs on Tester system CseSystem {
-					
-					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-															
-					v_ae1.start(f_CSE_SUB_NTF_003());
-												  	  	
-					v_ae1.done;
-												  	  		
-				}
-														
-				function f_CSE_SUB_NTF_003() runs on AeSimu {
-					// Local variables
-					timer t_batchNotificationTimer := PX_TAC * 2.0;
-					var float v_elapsedTime;
-					const integer c_numberOfAggregatedNotification := 2;
-					var Labels v_labels_1:= {"VALUE_1"};
-					var Labels v_labels_2:= {"VALUE_2"};
-					var integer v_aeIndex := -1;
-					var integer v_resourceIndex := -1;
-					var template RequestPrimitive v_createRequest := omit;
-					var template PrimitiveContent v_contentResponse;
-					var template RequestPrimitive v_updateRequest := m_updateAeBase;
-					var RequestPrimitive v_request;
-					var integer v_ae2Index := -1;
-					
-					v_contentResponse.aE := mw_contentAeBase; // all attributes expected   
-
-					// Test control
-
-					// Test component configuration
-					f_cf01Up(true);
-
-					// Test adapter configuration
-
-					// Preamble
-					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-					
-					f_cse_preamble_subscriptionVerification(v_ae2Index, v_createRequest, int23);
-					
-					v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)},omit,omit,m_batchNotify(c_numberOfAggregatedNotification + 1, "PT10S" ), omit, omit, -, int2);//batchNotify/number greater than number of notifications to be sent so that batchNotify/duration expires before
-
-					v_resourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex);//Subscription
-					
-					if(vc_ae2.running) {
-						vc_ae2.stop;
-					};
-
-					// Test Body
-					vc_ae2.start(f_cse_notifyProcedure_aggregatedNoficationHandler(v_contentResponse, c_numberOfAggregatedNotification)); 
-
-					v_updateRequest.primitiveContent.aE.labels := v_labels_1;
-					f_cse_updateResource(int2, v_aeIndex, v_updateRequest); // Update request 1
-					t_batchNotificationTimer.start;					
-					
-					v_updateRequest := m_updateAeBase;
-					v_updateRequest.primitiveContent.aE.appName := "MyAppName2"; 
-					f_cse_updateResource(int2, v_aeIndex, v_updateRequest); // Update request 2
-
-					vc_ae2.done;
-					v_elapsedTime := t_batchNotificationTimer.read;
-					t_batchNotificationTimer.stop;		
-					
-					if(v_elapsedTime < 10.0) {
-						setverdict(fail, __SCOPE__ & ": Notifications sent before bathNotify/duration expired");
-					}
-					
-					f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
-
-					//Postamble
-					f_cse_postamble_deleteResources();
-					
-					//Tear down
-					f_cf01Down();
-    
-				} // end TC_CSE_SUB_NTF_003
-
-			}//end group Notify
-			
-			group Update {
-				
-				/**
-				 * @desc Check that the IUT sends a Notify request to the subscriber resource when the notificationContentType attribute is set to “modified attributes” and an update operation has been performed on the subscribed-to resource
-				 * 
-				 */
-				testcase TC_CSE_SUB_UPD_002() runs on Tester system CseSystem {
-					
-					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-															
-					v_ae1.start(f_CSE_SUB_UPD_002());
-												  	  	
-					v_ae1.done;
-												  	  		
-				}
-														
-				function f_CSE_SUB_UPD_002() runs on AeSimu {
-					// Local variables
-					var MsgIn v_response;
-					var integer v_aeIndex := -1;
-					var integer v_resourceIndex := -1;
-					var Labels v_labels_1:= {"VALUE_1"};
-					var template PrimitiveContent v_contentResponse := {aE := m_contentAe_allOmit};
-					var template RequestPrimitive v_createRequest := omit;
-					var template RequestPrimitive v_updateRequest := m_updateAeBase;
-					var RequestPrimitive v_request;
-					var integer v_ae2Index := -1;
-			
-					// Test control
-
-					// Test component configuration
-					f_cf01Up(true);
-
-					// Test adapter configuration
-
-					// Preamble
-					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-					
-					v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, omit, omit, omit, omit, omit, int2, omit); //notificationContentType ="modified attributes"
-					
-					f_cse_preamble_subscriptionVerification(v_ae2Index, v_createRequest, int23);
-					
-					v_resourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex); //Subscription
-			
-					if(vc_ae2.running) {
-						vc_ae2.stop;
-					};
-			
-					// Test Body
-					//TODO Use f_getTemplateFromPrimitiveContent() which needs to be modified to receive the template in which the output template will be built upon
-					v_contentResponse.aE.labels := ?;// only modified attribute expected
-					v_contentResponse.aE.lastModifiedTime := ?;// only modified attribute expected //TODO Get it automatically into the expected content template
-					
-					vc_ae2.start(f_cse_notifyProcedure_representationHandler(v_contentResponse)); // check if the notification is well received and if its content matchs
-			
-					v_updateRequest.primitiveContent.aE.labels := v_labels_1; 
-			
-					v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest);
-					
-					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
-					tc_ac.start;
-					alt {
-						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
-							tc_ac.stop;
-							setverdict(pass, __SCOPE__ & ": Attribute of resource type int2 (Ae) updated successfully");
-						}
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
-							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Wrong response status code");
-						}
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
-							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Error while updating resource type int2 (Ae)");
-						}
-						[] tc_ac.timeout {
-							setverdict(fail, __SCOPE__ & ": No answer while updating resource type int2 (Ae)");
-						}
-					}	
-
-					f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
-
-					//Postamble
-					f_cse_postamble_deleteResources();
-
-					//Tear down
-					f_cf01Down();
-
-				} // end TC_CSE_SUB_UPD_002
-						
-				/**
-				 * @desc Check that the IUT sends a Notify request to the subscriber resource when the notificationContentType attribute is set to “ResourceID” and an update operation has been performed on the subscribed-to resource
-				 *  
-				 */
-				testcase TC_CSE_SUB_UPD_003() runs on Tester system CseSystem {
-					
-					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-																
-					v_ae1.start(f_CSE_SUB_UPD_003());
-													  	  	
-					v_ae1.done;
-													  	  		
-				}
-															
-				function f_CSE_SUB_UPD_003() runs on AeSimu {
-					// Local variables
-					var MsgIn v_response;
-					var integer v_aeIndex := -1;
-					var integer v_resourceIndex := -1;
-					var Labels v_labels_1:= {"VALUE_1"};
-					var template RequestPrimitive v_createRequest := omit;
-					var template PrimitiveContent v_contentResponse;
-					var template RequestPrimitive v_updateRequest := m_updateAeBase;
-					var RequestPrimitive v_request;
-					var integer v_ae2Index := -1;
-					
-					v_updateRequest.primitiveContent.aE.labels := v_labels_1; 
-					v_contentResponse.uRI := ?;
-					
-
-					// Test control
-
-					// Test component configuration
-					f_cf01Up(true);
-
-					// Test adapter configuration
-
-					// Preamble
-					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-					
-					f_cse_preamble_subscriptionVerification(v_ae2Index, v_createRequest, int23);
-					
-					v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, omit, omit, omit, omit, omit, int3, omit); // notificationContentType ="ResourceID"
-					
-					v_resourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex);//Subscription
-
-					f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
-			
-					// Test Body
-					vc_ae2.start(f_cse_notifyProcedure_representationHandler(v_contentResponse)); // check if the notification is well received and if its content matchs
-					
-					v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest);
-					
-					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
-					tc_ac.start;
-					alt {
-						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
-							tc_ac.stop;
-							setverdict(pass, __SCOPE__ & ": Attribute of resource type int2 (Ae) updated successfully");
-						}
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
-							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Wrong response status code");
-						}
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
-							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Error while updating resource type int2 (Ae)");
-						}
-						[] tc_ac.timeout {
-							setverdict(fail, __SCOPE__ & ": No answer while updating resource type int2 (Ae) or None notification received");
-						}
-					}	
-
-					f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
-
-					//Postamble
-					f_cse_postamble_deleteResources();
-
-					//Tear down
-					f_cf01Down();
-
-				} // end TC_CSE_SUB_UPD_003
-					
-				/**
-				 * @desc Check that the IUT decreases the expirationCounter attribute of a subscription resource when the Hosting CSE of the subscribed-to resource successfully sends the notification request to subscriber resource(s)
-				 *  
-				 */
-				testcase TC_CSE_SUB_UPD_004() runs on Tester system CseSystem {
-					
-					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-																
-					v_ae1.start(f_CSE_SUB_UPD_004());
-													  	  	
-					v_ae1.done;
-													  	  		
-				}
-															
-				function f_CSE_SUB_UPD_004() runs on AeSimu {
-					// Local variables
-					var MsgIn v_response;
-					var integer v_aeIndex := -1;
-					var integer v_resourceIndex := -1;
-					var Labels v_labels_1:= {"VALUE_1"};
-					var template PrimitiveContent v_contentResponse;
-					var template RequestPrimitive v_createRequest := omit;
-					var template RequestPrimitive v_updateRequest := m_updateAeBase;
-					var RequestPrimitive v_request;
-					var template PrimitiveContent v_retrieveContentResponse;
-					var integer v_ae2Index := -1;
-
-					v_updateRequest.primitiveContent.aE.labels := v_labels_1; 
-					v_contentResponse.aE := mw_contentAeBase; // all attributes expected  
-					v_retrieveContentResponse.subscription := mw_contentSubscription_rc1;
-
-					// Test control
-
-					// Test component configuration
-					f_cf01Up(true);
-
-					// Test adapter configuration
-
-					// Preamble
-					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-					
-					f_cse_preamble_subscriptionVerification(v_ae2Index, v_createRequest, int23);
-					
-					v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, omit, 3, omit, omit, omit, -, omit);  //expirationCounter set to 3
-					
-					v_resourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex); // Subscription
-					
-					if(vc_ae2.running) {
-						vc_ae2.stop;
-					};
-					
-					// Test Body
-					vc_ae2.start(f_cse_notifyProcedure_representationHandler(v_contentResponse)); // check if the notification is well received and if its content matchs
-
-					f_cse_updateResource(int2, v_aeIndex, v_updateRequest); // AE update request
-					
-					f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
-					
-					mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)))));
-	
-					tc_ac.start;
-					alt {
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(v_retrieveContentResponse))) -> value v_response {
-							tc_ac.stop;
-							if(v_response.primitive.responsePrimitive.primitiveContent.subscription.expirationCounter == 2 ){
-								setverdict(pass, __SCOPE__ & ": expirationCounter has been successfully decreased by one");
-							}
-							else{
-								setverdict(fail, __SCOPE__ & ": Error expirationCounter hasn't been decreased by one");
-							}
-						}
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
-							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Error, resource elements provided not matching expected resource elements");
-						}
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
-							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
-						}
-						[] tc_ac.timeout {
-							setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
-						}
-					}
-					
-					f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
-
-					//Postamble
-					f_cse_postamble_deleteResources();
-
-					//Tear down
-					f_cf01Down();
-
-				} // end TC_CSE_SUB_UPD_004
-						
-				/**
-				 * @desc Check that the IUT deletes the subscription resource when the the expirationCounter meets zero
-				 * 
-				 */
-				testcase TC_CSE_SUB_UPD_005() runs on Tester system CseSystem {
-					
-					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-																
-					v_ae1.start(f_CSE_SUB_UPD_005());
-													  	  	
-					v_ae1.done;
-													  	  		
-				}
-															
-				function f_CSE_SUB_UPD_005() runs on AeSimu {
-					// Local variables
-					var MsgIn v_response;
-					var integer v_aeIndex := -1;
-					var integer v_resourceIndex := -1;
-					var Labels v_labels_1:= {"VALUE_1"};
-					var template PrimitiveContent v_contentResponse;
-					var template RequestPrimitive v_createRequest := omit;
-					var template RequestPrimitive v_updateRequest := m_updateAeBase;
-					var RequestPrimitive v_request;
-					var integer v_ae2Index := -1;
-					
-					v_updateRequest.primitiveContent.aE.labels := v_labels_1; 
-					v_contentResponse.aE := mw_contentAeBase; // all attributes expected  
-
-					// Test control
-
-					// Test component configuration
-					f_cf01Up(true);
-
-					// Test adapter configuration
-
-					// Preamble
-					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-					
-					f_cse_preamble_subscriptionVerification(v_ae2Index, v_createRequest, int23);
-					
-					v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, omit, 1, omit, omit, omit, -, omit);  //expirationCounter set to 1
-					
-					v_resourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex);// Subscription
-
-					if(vc_ae2.running) {
-						vc_ae2.stop;
-					};
-	
-					// Test Body
-					vc_ae2.start(f_cse_notifyProcedure_representationHandler(v_contentResponse)); // check if the notification is well received and if its content matchs
-					f_cse_updateResource(int2, v_aeIndex, v_updateRequest); // AE update request
-					
-					f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
-
-					mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)))));
-
-					tc_ac.start;
-					alt {
-						[] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) -> value v_response {
-							tc_ac.stop;
-							setverdict(pass, __SCOPE__ & ": Subscription Resource have been successfully deleted");
-						}
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
-							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Wrong response status code");
-						}
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
-							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Error Subscription Resource has not been deleted");
-						}
-						[] tc_ac.timeout {
-							setverdict(fail, __SCOPE__ & ": No answer while retrieving Subscription Resource");
-						}
-					}
-					
-					f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
-
-					//Postamble
-					f_cse_postamble_deleteResources();
-
-					//Tear down
-					f_cf01Down();
-
-				} // end TC_CSE_SUB_UPD_005
-				
-				/**
-				 * @desc Check that the IUT doesn’t send a Notify request to the subscriber resource when the “attribute” condition tag of eventNotificationCriteria attribute is set to LIST_OF_ATTRIBUTE and doesn’t contain the ATTRIBUTE_NAME attribute updated.
-				 * 
-				 */
-				testcase TC_CSE_SUB_UPD_006() runs on Tester system CseSystem {
-					
-					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-																
-					v_ae1.start(f_CSE_SUB_UPD_006());
-													  	  	
-					v_ae1.done;
-													  	  		
-				}
-															
-				function f_CSE_SUB_UPD_006() runs on AeSimu {
-					// Local variables
-					var MsgIn v_response;
-					var Labels v_labels_1:= {"VALUE_1"};
-					var AttributeList_1 v_attributeList := {"apn"};
-					var integer v_aeIndex := -1;
-					var integer v_resourceIndex := -1;
-					var template RequestPrimitive v_createRequest := omit;
-					var template RequestPrimitive v_updateRequest := m_updateAeBase;
-					var RequestPrimitive v_request;
-					var integer v_ae2Index := -1;
-
-					v_updateRequest.primitiveContent.aE.labels := v_labels_1;
-
-					// Test control
-
-					// Test component configuration
-					f_cf01Up(true);
-
-					// Test adapter configuration
-
-					// Preamble
-					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-					
-					f_cse_preamble_subscriptionVerification(v_ae2Index, v_createRequest, int23);
-					
-					v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, m_eventNotificationCriteria({int1}, v_attributeList), omit, omit, omit, omit, -, omit);
-
-					v_resourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex);//Subscription
-
-					v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest); // Update request
-
-					if(vc_ae2.running) {
-						vc_ae2.stop;
-					};
-
-					// Test Body
-					vc_ae2.start(f_cse_notifyProcedure_noNotificationHandler()); // check that no notification is received
-		
-					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
-					tc_ac.start;
-					alt {
-						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
-							tc_ac.stop;
-							setverdict(pass, __SCOPE__ & ": Attribute of resource type int2 (Ae) updated successfully");
-						}
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
-							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Wrong response status code");
-						}
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
-							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Error while updating resource type int2 (Ae)");
-						}
-						[] tc_ac.timeout {
-							setverdict(fail, __SCOPE__ & ": No answer while updating resource type int2 (Ae) or None notification received");
-						}
-					}	
-
-					f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
-
-					//Postamble
-					f_cse_postamble_deleteResources();
-
-					//Tear down
-					f_cf01Down();
-
-				} // end TC_CSE_SUB_UPD_006
-				
-				/**
-				 * @desc Check that the IUT sends aggregated notification to the subscriber resource when the number value of the batchNotify attribute is set to GROUP_LIMIT and when this number have been reached
-				 * 
-				 */
-				testcase TC_CSE_SUB_UPD_007() runs on Tester system CseSystem {
-					
-					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-																
-					v_ae1.start(f_CSE_SUB_UPD_007());
-													  	  	
-					v_ae1.done;
-													  	  		
-				}
-															
-				function f_CSE_SUB_UPD_007() runs on AeSimu {
-					// Local variables
-					const integer numberOfAggregatedNotification := 3;
-					var Labels v_labels_1:= {"VALUE_1"};
-					var Labels v_labels_2:= {"VALUE_2"};
-					var Labels v_labels_3:= {"VALUE_3"};
-					var integer v_aeIndex := -1;
-					var integer v_resourceIndex := -1;
-					var template RequestPrimitive v_createRequest := omit;
-					var template PrimitiveContent v_contentResponse;
-					var template RequestPrimitive v_updateRequest := m_updateAeBase;
-					var RequestPrimitive v_request;
-					var integer v_ae2Index := -1;
-					
-					v_contentResponse.aE := mw_contentAeBase; // all attributes expected   
-
-					// Test control
-
-					// Test component configuration
-					f_cf01Up(true);
-
-					// Test adapter configuration
-
-					// Preamble
-					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-					
-					f_cse_preamble_subscriptionVerification(v_ae2Index, v_createRequest, int23);
-					
-					v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)},omit,omit,m_batchNotify(numberOfAggregatedNotification), omit, omit, -, omit );
-		
-					v_resourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex);//Subscription
-					
-					if(vc_ae2.running) {
-						vc_ae2.stop;
-					};
-
-					// Test Body
-					vc_ae2.start(f_cse_notifyProcedure_aggregatedNoficationHandler(v_contentResponse, numberOfAggregatedNotification)); // check that no notification is received
-					
-					v_updateRequest.primitiveContent.aE.labels := v_labels_1;
-					f_cse_updateResource(int2, v_aeIndex, v_updateRequest); // Update request 1
-					
-					v_updateRequest.primitiveContent.aE.labels := v_labels_2; 
-					f_cse_updateResource(int2, v_aeIndex, v_updateRequest); // Update request 2
-					
-					v_updateRequest.primitiveContent.aE.labels := v_labels_3; 
-					f_cse_updateResource(int2, v_aeIndex, v_updateRequest); // Update request 3
-
-					f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
-
-					//Postamble
-					f_cse_postamble_deleteResources();
-
-					//Tear down
-					f_cf01Down();
-
-				} // end TC_CSE_SUB_UPD_007
-					
-				/**
-				 * @desc Check that the IUT sends the latest notification to the subscriber resource when latestNotify is set to TRUE, the number value of the batchNotify attribute is set to GROUP_LIMIT and when this number have been reached
-				 * 
-				 */
-				testcase TC_CSE_SUB_UPD_008() runs on Tester system CseSystem {
-					
-					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-																
-					v_ae1.start(f_CSE_SUB_UPD_008());
-													  	  	
-					v_ae1.done;
-													  	  		
-				}
-															
-				function f_CSE_SUB_UPD_008() runs on AeSimu {
-					// Local variables
-					const integer numberOfAggregatedNotification := 3;
-					var Labels v_labels_1:= {"VALUE_1"};
-					var Labels v_labels_2:= {"VALUE_2"};
-					var Labels v_labels_3:= {"VALUE_3"};
-					var integer v_aeIndex := -1;
-					var integer v_resourceIndex := -1;
-					var template RequestPrimitive v_createRequest := omit;
-					var template PrimitiveContent v_contentResponse;
-					var template RequestPrimitive v_updateRequest := m_updateAeBase;
-					var RequestPrimitive v_request;
-					var integer v_ae2Index := -1;
-            
-					v_contentResponse.aE := mw_contentAeBase; // all attributes expected   
-            
-					// Test control
-            
-					// Test component configuration
-					f_cf01Up(true);
-            
-					// Test adapter configuration
-            
-					// Preamble
-					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-					
-					f_cse_preamble_subscriptionVerification(v_ae2Index, v_createRequest, int23);
-						
-					v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)},omit,omit,m_batchNotify(numberOfAggregatedNotification), true, omit,  -, omit);
-            		
-					//TODO We Need to check if the IUT send a notification only for the latest update operation
-					// like we match a Notification we have to verify if it is the first (unvalid behavior) or the last (valid behavior)
-					// maybe we need to synchronise our components
-            		
-					v_resourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex);//Subscription
-            					
-					if(vc_ae2.running) {
-						vc_ae2.stop;
-					};
-					
-					// Test Body
-					vc_ae2.start(f_cse_notifyProcedure_representationHandler(v_contentResponse)); // check if the notification is well received and if its content matchs
-            					
-					v_updateRequest.primitiveContent.aE.labels := v_labels_1; 
-					f_cse_updateResource(int2, v_aeIndex, v_updateRequest); // Update request 1
-            					
-					v_updateRequest.primitiveContent.aE.labels := v_labels_2; 
-					f_cse_updateResource(int2, v_aeIndex, v_updateRequest); // Update request 2
-            					
-					v_updateRequest.primitiveContent.aE.labels := v_labels_3; 
-					f_cse_updateResource(int2, v_aeIndex, v_updateRequest); // Update request 3
-					
-					f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
-
-					//Postamble
-					f_cse_postamble_deleteResources();
-            
-					//Tear down
-					f_cf01Down();
-            
-				} // end TC_CSE_SUB_UPD_008
-
-				/**
-				 * @desc Check that the IUT sends a Notify request to the subscriber resource when the “attribute” condition tag of eventNotificationCriteria attribute is set to ATTRIBUTE_NAME and an update operation has been performed on the subscribed-to resource
-				 * 
-				 */
-				testcase TC_CSE_SUB_UPD_009() runs on Tester system CseSystem {
-					
-					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-																
-					v_ae1.start(f_CSE_SUB_UPD_009());
-													  	  	
-					v_ae1.done;
-													  	  		
-				}
-															
-				function f_CSE_SUB_UPD_009() runs on AeSimu {
-					// Local variables
-					var MsgIn v_response;
-					var Labels v_labels_1:= {"VALUE_1"};
-					var AttributeList_1 v_attributeList := {"lbl"};
-					var integer v_aeIndex := -1;
-					var integer v_resourceIndex := -1;
-					var template RequestPrimitive v_createRequest := omit;
-					var template PrimitiveContent v_contentResponse;
-					var template RequestPrimitive v_updateRequest := m_updateAeBase;
-					var RequestPrimitive v_request;
-					var integer v_ae2Index := -1;
-					
-					v_updateRequest.primitiveContent.aE.labels := v_labels_1; 
-					v_contentResponse.aE := mw_contentAeBase; // all attributes expected   
-
-					// Test control
-
-					// Test component configuration
-					f_cf01Up(true);
-
-					// Test adapter configuration
-
-					// Preamble
-					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-					
-					f_cse_preamble_subscriptionVerification(v_ae2Index, v_createRequest, int23);
-					
-					v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, m_eventNotificationCriteria({int1}, v_attributeList), omit, omit, omit, omit, -, omit);
-
-					v_resourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex);//Subscription
-
-					v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest); // Update request
-					
-					if(vc_ae2.running) {
-						vc_ae2.stop;
-					};
-			
-					// Test Body
-					vc_ae2.start(f_cse_notifyProcedure_representationHandler(v_contentResponse)); // check if the notification is well received and if its content matchs
-					
-					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
-					tc_ac.start;
-					alt {
-						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
-							tc_ac.stop;
-							setverdict(pass, __SCOPE__ & ": Attribute of resource type int2 (Ae) updated successfully");
-						}
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
-							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Wrong response status code");
-						}
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
-							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Error while updating resource type int2 (Ae)");
-						}
-						[] tc_ac.timeout {
-							setverdict(fail, __SCOPE__ & ": No answer while updating resource type int2 (Ae) or None notification received");
-						}
-					}	
-					
-					f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
-
-					//Postamble
-					f_cse_postamble_deleteResources();
-
-					//Tear down
-					f_cf01Down();
-
-				} // end TC_CSE_SUB_UPD_009
-
-
-
-			}//end group Update
-			
-			group Delete {
-				
-				/**
-				 * @desc Check that the IUT sends a Notify request to the subscriber resource when eventType attribute is set to "Delete_of_Resource"  and an delete operation has been performed the subscribed-to resource
-				 * 
-				 */
-				testcase TC_CSE_SUB_DEL_002() runs on Tester system CseSystem {
-					
-					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-																
-					v_ae1.start(f_CSE_SUB_DEL_002());
-													  	  	
-					v_ae1.done;
-													  	  		
-				}
-															
-				function f_CSE_SUB_DEL_002() runs on AeSimu {
-					// Local variables
-					var MsgIn v_response;
-					var integer v_aeIndex := -1;
-					var integer v_subscriptionResourceIndex := -1;
-					var template RequestPrimitive v_createRequest := omit; 
-					var template PrimitiveContent v_notificationContent;
-					var RequestPrimitive v_deleteRequest;
-					var integer v_ae2Index := -1;
-				
-					// Test control
-
-					// Test component configuration
-					f_cf01Up(true);
-
-					// Test adapter configuration
-
-					// Preamble
-					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-					
-					v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, m_eventNotificationCriteria({int2}, -), omit, omit, omit, omit, -, omit);
-					
-					f_cse_preamble_subscriptionVerification(v_ae2Index, v_createRequest, int23);
-								
-					v_subscriptionResourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex );//Subscription
-					
-					if(vc_ae2.running) {
-						vc_ae2.stop;
-					};
-
-					//Test Body
-					v_notificationContent := {aE:= mw_contentAeBase}; // all attributes expected;
-					
-					vc_ae2.start(f_cse_notifyProcedure_representationHandler(v_notificationContent)); // check if the notification is well received and if its content matchs
-					
-					v_deleteRequest:= valueof(m_delete(f_getResourceAddress(v_aeIndex), f_getOriginator(v_aeIndex))); // Ae delete request
-										
-					mcaPort.send(f_getMsgOutPrimitive(m_request(v_deleteRequest)));
-					tc_ac.start;
-					alt {
-						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) -> value v_response {
-							tc_ac.stop;
-							//Update vc_resourcesIndexToBeDeleted 
-							f_removeElementFromList (vc_resourcesIndexToBeDeleted, v_aeIndex);
-							setverdict(pass, __SCOPE__ & ": resource type int2 (AE) deleted successfully");
-						}
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
-							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Wrong response status code");
-						}
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
-							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Error while deleting resource type int2 (AE)");
-						}
-						[] tc_ac.timeout {
-							setverdict(fail, __SCOPE__ & ": No answer while deleting resource type int2 (AE)");
-						}
-					}
-					
-					f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
-
-					//Postamble
-					f_cse_postamble_deleteResources();
-
-					//Tear down
-					f_cf01Down();
-
-				} // end TC_CSE_SUB_DEL_002
-									
-				/**
-				 * @desc Check that the IUT sends a Notify request to the subscriber resource when eventType attribute is set to "Delete_of_Direct_Child_Resource"  and an delete operation has been performed on a child resource of the subscribed-to resource
-				 *  
-				 */
-				testcase TC_CSE_SUB_DEL_003() runs on Tester system CseSystem {
-					
-					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-																
-					v_ae1.start(f_CSE_SUB_DEL_003());
-													  	  	
-					v_ae1.done;
-													  	  		
-				}
-															
-				function f_CSE_SUB_DEL_003() runs on AeSimu {
-					// Local variables
-					var MsgIn v_response;
-					var integer v_aeIndex := -1;
-					var integer v_subscriptionResourceIndex := -1;
-					var integer v_containerResourceIndex := -1;
-					var template RequestPrimitive v_createRequest := omit;
-					var RequestPrimitive v_deleteRequest;
-					var template PrimitiveContent v_notificationContent;
-					var integer v_ae2Index := -1;
-
-					// Test component configuration
-					f_cf01Up(true);
-
-					// Test adapter configuration
-
-					// Preamble
-					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi;
-
-					v_containerResourceIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);//Container
-					
-					v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, m_eventNotificationCriteria({int4}, -), omit, omit, omit, omit, -, omit);
-					
-					f_cse_preamble_subscriptionVerification(v_ae2Index, v_createRequest, int23);
-					
-					v_subscriptionResourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex);//Subscription (with name attribute omitted) 									
-					
-					if(vc_ae2.running) {
-						vc_ae2.stop;
-					};
-
-					//Test Body
-					v_notificationContent := {container := mw_contentContainer_rc1}; // all attributes expected;
-					
-					vc_ae2.start(f_cse_notifyProcedure_representationHandler(v_notificationContent)); // check if the notification is well received and if its content matchs
-					
-					v_deleteRequest := valueof(m_delete(f_getResourceAddress(v_containerResourceIndex), f_getOriginator(v_containerResourceIndex)));// Container deletion request
-										
-					mcaPort.send(f_getMsgOutPrimitive(m_request(v_deleteRequest)));
-					tc_ac.start;
-					alt {
-						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) -> value v_response {
-							tc_ac.stop;
-							setverdict(pass, __SCOPE__ & ": Container resource deleted successfully");
-						}
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
-							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Wrong response status code");
-						}
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
-							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Error while deleting resource type int3 (Container)");
-						}
-						[] tc_ac.timeout {
-							setverdict(fail, __SCOPE__ & ": No answer while deleting resource type int3 (Container)");
-						}
-					}	
-
-					f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
-
-					//Postamble
-					f_cse_postamble_deleteResources();
-
-					//Tear down
-					f_cf01Down();
-
-				} // end TC_CSE_SUB_DEL_003
-				
-			}//end group Delete
-			
-		}//end group Subscription_And_Notification
-		
-		group Security {
-	
-			group Access_Control_Policy {
-				
-				group Create {
-	
-				}// end of group Create
-			
-				group Update {
-				
-				}// end of group Update
-				
-				group Basic_Operations {
-				
-				}// end of Basic_Operations
-				
-			}//end group AccessControlPolicy
-			
-		}//end group Security
-		
-		group Announcement {
-			
-			group Basic {
-		
-				group g_CSE_ANNC_001 {
-
-					/**
-					 * @desc Check that the IUT provides confirmation of the announcement of a resource to the originator of the initiating request after a successful resource announcement procedure
-					 *  
-					 */
-					testcase TC_CSE_ANNC_001_ACP_UPD() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
-                  
-						v_ae1.start(f_CSE_ANNC_001(int1, v_createRequestAnnc, omit, v_updateRequest));//AccessControlPolicy
-						v_ae1.done;
-					}
-					
-					testcase TC_CSE_ANNC_001_ACP_CRE() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var template RequestPrimitive v_createRequest := m_createAcpBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
-  
-						v_ae1.start(f_CSE_ANNC_001(int1, v_createRequestAnnc, v_createRequest, omit));//AccessControlPolicy
-						v_ae1.done;
-					}
-					
-					testcase TC_CSE_ANNC_001_CNT_UPD() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_updateRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
-  
-						v_ae1.start(f_CSE_ANNC_001(int3, v_createRequestAnnc, omit, v_updateRequest));//Container
-						v_ae1.done;
-					}
-					
-					testcase TC_CSE_ANNC_001_CNT_CRE() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var template RequestPrimitive v_createRequest := m_createContainerBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
-  
-						v_ae1.start(f_CSE_ANNC_001(int3, v_createRequestAnnc, v_createRequest, omit));//Container
-						v_ae1.done;
-					}
-					
-					testcase TC_CSE_ANNC_001_GRP_UPD() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_updateRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
-  
-						v_ae1.start(f_CSE_ANNC_001(int9, v_createRequestAnnc, omit, v_updateRequest));//Group
-						v_ae1.done;
-					}
-					
-					testcase TC_CSE_ANNC_001_GRP_CRE() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var template RequestPrimitive v_createRequest := m_createGroupBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
-  
-						v_ae1.start(f_CSE_ANNC_001(int9, v_createRequestAnnc, v_createRequest, omit));//Group
-						v_ae1.done;
-					}
-					
-					testcase TC_CSE_ANNC_001_CIN_CRE() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
-						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
-  
-						v_ae1.start(f_CSE_ANNC_001(int4, v_createRequestAnnc, v_createRequest, omit));//ContentInstance
-						v_ae1.done;
-					}
-					
-					testcase TC_CSE_ANNC_001_TS_UPD() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
-  
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_updateRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
-  
-						v_ae1.start(f_CSE_ANNC_001(int29, v_createRequestAnnc, omit, v_updateRequest));//TimeSeries
-						v_ae1.done;
-					}
-					
-					testcase TC_CSE_ANNC_001_TS_CRE() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
-  
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
-  
-						v_ae1.start(f_CSE_ANNC_001(int29, v_createRequestAnnc, v_createRequest, omit));//TimeSeries
-						v_ae1.done;
-					}
-					
-					testcase TC_CSE_ANNC_001_TSI_CRE() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnnc;
-  
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.timeSeriesInstance.announceTo := {PX_CSE1_ID};
-  
-						v_ae1.start(f_CSE_ANNC_001(int30, v_createRequestAnnc, v_createRequest, omit));//TimeSeriesInstance
-						v_ae1.done;
-					}
-			
-				}// end group g_CSE_ANNC_001
-		
-			}//end group Basic
-			
-			group Create {
-				
-				group g_CSE_ANNC_CRE_001 {
-					
-					/**
-					 * @desc Check that the accessControlPolicyIDs attribute is announced when accessControlPolicyIDs attribute of the original resource is not present
-					 *  
-					 */
-					testcase TC_CSE_ANNC_CRE_001() runs on Tester system CseSystem {
-						//Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template RequestPrimitive v_createRequest := m_createContainerBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
-											
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;	
-						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
-						
-						v_ae1.start(f_CSE_ANNC_CRE_001(int3, v_createRequestAnnc, v_createRequest));//Container
-						v_ae1.done;
-						
-					} //end TC_CSE_ANNC_CRE_001
-				} // end group g_CSE_ANNC_CRE_001
-				
-				group g_CSE_ANNC_CRE_002 {
-					
-					/**
-					 * @desc Check that the IUT announces successfully the RESOURCE_TYPE resource when a new CSE-ID is provided in announcedTo optional attribute and IUT having not been announced to announcement target CSE
-					 *  
-					 */
-					testcase TC_CSE_ANNC_CRE_002_ACP() runs on Tester system CseSystem {
-						// Local variables
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
-						var template RequestPrimitive v_createRequest := m_createAcpBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
-						
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {"/CSE2_ID"};
-  
-						v_cse1.start(f_CSE_ANNC_CRE_002(int1, v_createRequest, v_updateRequest, v_createRequestAnnc));//AccessControlPolicy
-						v_cse1.done;
-					}
-
-					testcase TC_CSE_ANNC_CRE_002_CNT() runs on Tester system CseSystem {
-						// Local variables
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
-						var template RequestPrimitive v_createRequest := m_createContainerBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
-						
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						v_updateRequest.primitiveContent.container.announceTo := {"/CSE2_ID"};
-  
-						v_cse1.start(f_CSE_ANNC_CRE_002(int3, v_createRequest, v_updateRequest, v_createRequestAnnc));//Container
-						v_cse1.done;
-					}
-
-					testcase TC_CSE_ANNC_CRE_002_GRP() runs on Tester system CseSystem {
-						// Local variables
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
-						var template RequestPrimitive v_createRequest := m_createGroupBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
-						
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						v_updateRequest.primitiveContent.group_.announceTo := {"/CSE2_ID"};
-  
-						v_cse1.start(f_CSE_ANNC_CRE_002(int9, v_createRequest, v_updateRequest, v_createRequestAnnc));//Group
-						v_cse1.done;
-					}
-					
-					testcase TC_CSE_ANNC_CRE_002_TS() runs on Tester system CseSystem {
-						// Local variables
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
-  
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						v_updateRequest.primitiveContent.timeSeries.announceTo := {"/CSE2_ID"};
-  
-						v_cse1.start(f_CSE_ANNC_CRE_002(int29, v_createRequest, v_updateRequest, v_createRequestAnnc));//TimeSeries
-						v_cse1.done;
-					}
-				} //end group g_CSE_ANNC_CRE_002
-				
-				group g_CSE_ANNC_CRE_003 {
-					
-					/**
-					 * @desc Host CSE of original resource removes an announcement target CSE from the announceTo attribute if it does not return successful CREATE response for the announced resource (for a CREATE initiating resource announcement)
-					 *  
-					 */
-					testcase TC_CSE_ANNC_CRE_003() runs on Tester system CseSystem {
-						//Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
-							
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
-	
-						v_ae1.start(f_CSE_ANNC_CRE_003(int4, v_createRequestAnnc, v_createRequest));//ContentInstance
-						v_ae1.done;
-						
-					} //end TC_CSE_ANNC_CRE_003
-					
-				} //end group g_CSE_ANNC_CRE_003
-				
-				group g_CSE_ANNC_CRE_004 {
-					
-					/**
-					 * @desc Check that the IUT announces successfully the RESOURCE_TYPE resource during its creation when announceTo optional attribute is provided and its parent resource having been announced to the announcement target CSE
-					 *  
-					 */
-					testcase TC_CSE_ANNC_CRE_004_ACP() runs on Tester system CseSystem {
-						// Local variables
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var template RequestPrimitive v_createRequest := m_createAcpBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
-  
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
-  
-						v_cse1.start(f_CSE_ANNC_CRE_004_CseSimu(int1, v_createRequestAnnc, v_createRequest));//AccessControlPolicy
-						v_cse1.done;
-					}
-					
-					testcase TC_CSE_ANNC_CRE_004_CNT() runs on Tester system CseSystem {
-						// Local variables
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var template RequestPrimitive v_createRequest := m_createContainerBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
-  
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
-  
-						v_cse1.start(f_CSE_ANNC_CRE_004_CseSimu(int3, v_createRequestAnnc, v_createRequest));//Container
-						v_cse1.done;
-					}
-					
-					testcase TC_CSE_ANNC_CRE_004_CIN() runs on Tester system CseSystem {
-						// Local variables
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
-  
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
-  
-						v_cse1.start(f_CSE_ANNC_CRE_004_CseSimu(int4, v_createRequestAnnc, v_createRequest));//ContentInstance
-						v_cse1.done;
-					}
-					
-					testcase TC_CSE_ANNC_CRE_004_GRP() runs on Tester system CseSystem {
-						// Local variables
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var template RequestPrimitive v_createRequest := m_createGroupBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
-  
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
-  
-						v_cse1.start(f_CSE_ANNC_CRE_004_CseSimu(int9, v_createRequestAnnc, v_createRequest));//Group
-						v_cse1.done;
-					}
-					
-					testcase TC_CSE_ANNC_CRE_004_TS() runs on Tester system CseSystem {
-						// Local variables
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
-  
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
-  
-						v_cse1.start(f_CSE_ANNC_CRE_004_CseSimu(int29, v_createRequestAnnc, v_createRequest));//TimeSeries
-						v_cse1.done;
-					}
-					
-				}// end group g_CSE_ANNC_CRE_004
-				
-				group g_CSE_ANNC_CRE_005 {
-					
-					/**
-					 * @desc Check that the IUT announces successfully the RESOURCE_TYPE resource during its creation when announceTo optional attribute is provided and IUT having been already announced to announcement target CSE
-					 *  
-					 */
-					testcase TC_CSE_ANNC_CRE_005_ACP() runs on Tester system CseSystem {
-						//Local variables
-						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						 var template RequestPrimitive v_createRequest := m_createAcpBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
-	  
-						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						 v_createRequest.primitiveContent.accessControlPolicy.announceTo := {"/CSE2_ID"};
-	  
-						 v_cse1.start(f_CSE_ANNC_CRE_005_CseSimu(int1, v_createRequestAnnc, v_createRequest));//AccessControlPolicy
-						 v_cse1.done;
-					}
-					
-					testcase TC_CSE_ANNC_CRE_005_CNT() runs on Tester system CseSystem {
-						//Local variables
-						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						 var template RequestPrimitive v_createRequest := m_createContainerBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
-  
-						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						 v_createRequest.primitiveContent.container.announceTo := {"/CSE2_ID"};
-  
-						 v_cse1.start(f_CSE_ANNC_CRE_005_CseSimu(int3, v_createRequestAnnc, v_createRequest));//Container
-						 v_cse1.done;
-					}
-					
-					testcase TC_CSE_ANNC_CRE_005_CIN() runs on Tester system CseSystem {
-						//Local variables
-						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						 var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
-  
-						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						 v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
-  
-						 v_cse1.start(f_CSE_ANNC_CRE_005_CseSimu(int4, v_createRequestAnnc, v_createRequest));//ContentInstance
-						 v_cse1.done;
-						
-					}
-					
-					testcase TC_CSE_ANNC_CRE_005_GRP() runs on Tester system CseSystem {
-						//Local variables
-						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						 var template RequestPrimitive v_createRequest := m_createGroupBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
-  
-						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						 v_createRequest.primitiveContent.group_.announceTo := {"/CSE2_ID"};
-  
-						 v_cse1.start(f_CSE_ANNC_CRE_005_CseSimu(int9, v_createRequestAnnc, v_createRequest));//Group
-						 v_cse1.done;
-					}
-					
-					testcase TC_CSE_ANNC_CRE_005_TS() runs on Tester system CseSystem {
-						//Local variables
-						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
-  
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						 v_createRequest.primitiveContent.timeSeries.announceTo := {"/CSE2_ID"};
-  
-						 v_cse1.start(f_CSE_ANNC_CRE_005_CseSimu(int29, v_createRequestAnnc, v_createRequest));//TimeSeries
-						 v_cse1.done;
-					}
-					
-					testcase TC_CSE_ANNC_CRE_005_TSI() runs on Tester system CseSystem {
-						//Local variables
-						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						 var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnnc;
-  
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						 v_createRequest.primitiveContent.timeSeriesInstance.announceTo := {"/CSE2_ID"};
-  
-						 v_cse1.start(f_CSE_ANNC_CRE_005_CseSimu(int30, v_createRequestAnnc, v_createRequest));//TimeSeriesInstance
-						 v_cse1.done;
-					}
-					
-				} //end group g_CSE_ANNC_CRE_005
-				
-				group g_CSE_ANNC_CRE_006 {
-					
-					/**
-					 * @desc Check that the IUT announces successfully the RESOURCE_TYPE resource during its creation when announceTo optional attribute is provided and IUT has registered and created a <remoteCSE> resource to the announcement target CSE
-					 *  
-					 */
-					testcase TC_CSE_ANNC_CRE_006_ACP() runs on Tester system CseSystem {
-						//Local variables
-						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						 var template RequestPrimitive v_createRequest := m_createAcpBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
-  
-						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						 v_cse1.done;
-						 v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
-  
-						 v_cse1.start(f_CSE_ANNC_CRE_006_CseSimu(int1, v_createRequestAnnc, v_createRequest));//AccessControlPolicy
-						 v_cse1.done;
-					}
-	
-					testcase TC_CSE_ANNC_CRE_006_CNT() runs on Tester system CseSystem {
-						//Local variables
-						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						 var template RequestPrimitive v_createRequest := m_createContainerBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
-  
-						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						 v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
-  
-						 v_cse1.start(f_CSE_ANNC_CRE_006_CseSimu(int3, v_createRequestAnnc, v_createRequest));//Container
-						 v_cse1.done;
-					}
-	
-					testcase TC_CSE_ANNC_CRE_006_CIN() runs on Tester system CseSystem {
-						//Local variables
-						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						 var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
-  
-						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						 v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
-  
-						 v_cse1.start(f_CSE_ANNC_CRE_006_CseSimu(int4, v_createRequestAnnc, v_createRequest));//ContentInstance
-						 v_cse1.done;
-		
-					}
-	
-					testcase TC_CSE_ANNC_CRE_006_GRP() runs on Tester system CseSystem {
-						//Local variables
-						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						 var template RequestPrimitive v_createRequest := m_createGroupBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
-  
-						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						 v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
-  
-						 v_cse1.start(f_CSE_ANNC_CRE_006_CseSimu(int9, v_createRequestAnnc, v_createRequest));//Group
-						 v_cse1.done;
-					}
-					
-					testcase TC_CSE_ANNC_CRE_006_TS() runs on Tester system CseSystem {
-						//Local variables
-						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
-	  
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						 v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
-	  
-						 v_cse1.start(f_CSE_ANNC_CRE_006_CseSimu(int29, v_createRequestAnnc, v_createRequest));//TimeSeries
-						 v_cse1.done;
-					}
-					
-					testcase TC_CSE_ANNC_CRE_006_TSI() runs on Tester system CseSystem {
-						//Local variables
-						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						 var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnnc;
-  
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						 v_createRequest.primitiveContent.timeSeriesInstance.announceTo := {PX_CSE1_ID};
-  
-						 v_cse1.start(f_CSE_ANNC_CRE_006_CseSimu(int30, v_createRequestAnnc, v_createRequest));//TimeSeriesInstance
-						 v_cse1.done;
-					}
-	
-				} //end group g_CSE_ANNC_CRE_006
-				
-				group g_CSE_ANNC_CRE_007 {
-					
-					/**
-					 * @desc Check that the IUT announces successfully the RESOURCE_TYPE resource during its creation when announceTo optional attribute is provided and IUT having not been announced to announcement target CSE
-					 *  
-					 */
-					testcase TC_CSE_ANNC_CRE_007_ACP() runs on Tester system CseSystem {
-						//Local variables
-						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						 var template RequestPrimitive v_createRequest := m_createAcpBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
-	  
-						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						 v_cse1.done;
-						 v_createRequest.primitiveContent.accessControlPolicy.announceTo := {"/CSE2_ID"};
-	  
-						 v_cse1.start(f_CSE_ANNC_CRE_007_CseSimu(int1, v_createRequestAnnc, v_createRequest));//AccessControlPolicy
-						 v_cse1.done;
-					}
-	
-					testcase TC_CSE_ANNC_CRE_007_CNT() runs on Tester system CseSystem {
-						//Local variables
-						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						 var template RequestPrimitive v_createRequest := m_createContainerBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
-	  
-						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						 v_cse1.done;
-						 v_createRequest.primitiveContent.container.announceTo := {"/CSE2_ID"};
-	  
-						 v_cse1.start(f_CSE_ANNC_CRE_007_CseSimu(int3, v_createRequestAnnc, v_createRequest));//Container
-						 v_cse1.done;
-					}
-	
-					testcase TC_CSE_ANNC_CRE_007_CIN() runs on Tester system CseSystem {
-						//Local variables
-						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						 var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
-	  
-						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						 v_cse1.done;
-						 v_createRequest.primitiveContent.contentInstance.announceTo := {"/CSE2_ID"};
-	  
-						 v_cse1.start(f_CSE_ANNC_CRE_007_CseSimu(int4, v_createRequestAnnc, v_createRequest));//ContentInstance
-						 v_cse1.done;
-	
-					}
-	
-					testcase TC_CSE_ANNC_CRE_007_GRP() runs on Tester system CseSystem {
-						//Local variables
-						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						 var template RequestPrimitive v_createRequest := m_createGroupBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
-	  
-						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						 v_cse1.done;
-						 v_createRequest.primitiveContent.group_.announceTo := {"/CSE2_ID"};
-	  
-						 v_cse1.start(f_CSE_ANNC_CRE_007_CseSimu(int9, v_createRequestAnnc, v_createRequest));//Group
-						 v_cse1.done;
-					}
-					
-					testcase TC_CSE_ANNC_CRE_007_TS() runs on Tester system CseSystem {
-						//Local variables
-						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
-  
-						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						 v_cse1.done;
-						 v_createRequest.primitiveContent.accessControlPolicy.announceTo := {"/CSE2_ID"};
-						 
-						 v_cse1.start(f_CSE_ANNC_CRE_007_CseSimu(int29, v_createRequestAnnc, v_createRequest));//TimeSeries
-						 v_cse1.done;
-					}
-					
-					testcase TC_CSE_ANNC_CRE_007_TSI() runs on Tester system CseSystem {
-						//Local variables
-						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						 var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnnc;
-						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						 v_cse1.done;
-						 
-						 v_createRequest.primitiveContent.timeSeriesInstance.announceTo := {"/CSE2_ID"};
-  
-						 v_cse1.start(f_CSE_ANNC_CRE_007_CseSimu(int30, v_createRequestAnnc, v_createRequest));//TimeSeriesInstance
-						 v_cse1.done;
-					}
-	
-				} //end group g_CSE_ANNC_CRE_007
-				
-				group g_CSE_ANNC_CRE_008 {
-					
-					/**
-					 * @desc Check that the IUT announces successfully the RESOURCE_TYPE resource during its creation when announceTo and announcedAttribute optional attributes are provided and its parent resource having been announced to the announcement target CSE
-					 *  
-					 */
-					testcase TC_CSE_ANNC_CRE_008_CNT_MBS() runs on Tester system CseSystem {
-						//Local variables
-						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						 var template RequestPrimitive v_createRequest := m_createContainerBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
-  
-						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						 v_cse1.done;
-						 v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
-						 v_createRequest.primitiveContent.container.announcedAttribute := {"mbs"};
-						 v_createRequestAnnc.primitiveContent.containerAnnc.maxByteSize := ?;
-						 
-						 v_cse1.start(f_CSE_ANNC_CRE_008_CseSimu(int3, v_createRequestAnnc, v_createRequest));//Container
-						 v_cse1.done;
-					}
-
-					testcase TC_CSE_ANNC_CRE_008_CIN_CNF() runs on Tester system CseSystem {
-						//Local variables
-						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						 var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
-  
-						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						 v_cse1.done;
-						 v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
-						 v_createRequest.primitiveContent.contentInstance.announcedAttribute := {"cnf"};
-						 v_createRequestAnnc.primitiveContent.contentInstanceAnnc.contentInfo:= ?;
-						 
-						 v_cse1.start(f_CSE_ANNC_CRE_008_CseSimu(int4, v_createRequestAnnc, v_createRequest));//ContentInstance
-						 v_cse1.done;
-					}
-
-					testcase TC_CSE_ANNC_CRE_008_GRP_MT() runs on Tester system CseSystem {
-						//Local variables
-						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						 var template RequestPrimitive v_createRequest := m_createGroupBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
-  
-						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						 v_cse1.done;
-						 v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
-						 v_createRequest.primitiveContent.group_.announcedAttribute := {"mt"};
-						 v_createRequestAnnc.primitiveContent.groupAnnc.memberType:= ?;
-						 
-						 v_cse1.start(f_CSE_ANNC_CRE_008_CseSimu(int9, v_createRequestAnnc, v_createRequest));//Group
-						 v_cse1.done;
-
-					}
-					
-					testcase TC_CSE_ANNC_CRE_008_TS_MBS() runs on Tester system CseSystem {
-						//Local variables
-						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
-						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						 v_cse1.done;
-						 
-						 v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
-						 v_createRequest.primitiveContent.timeSeries.announcedAttribute := {"mbs"};
-						 v_createRequestAnnc.primitiveContent.timeSeriesAnnc.maxByteSize := ?;
-						 
-						 v_cse1.start(f_CSE_ANNC_CRE_008_CseSimu(int29, v_createRequestAnnc, v_createRequest));//TimeSeries
-						 v_cse1.done;
-					}
-					
-					testcase TC_CSE_ANNC_CRE_008_TSI_CS() runs on Tester system CseSystem {
-						//Local variables
-						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						 var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnnc;
-	  
-						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						 v_cse1.done;
-						 v_createRequest.primitiveContent.timeSeriesInstance.announceTo := {PX_CSE1_ID};
-						 v_createRequest.primitiveContent.timeSeriesInstance.announcedAttribute := {"cs"};
-						 v_createRequestAnnc.primitiveContent.timeSeriesInstanceAnnc.contentSize := ?;
-						 
-						 v_cse1.start(f_CSE_ANNC_CRE_008_CseSimu(int30, v_createRequestAnnc, v_createRequest));//TimeSeriesInstance
-						 v_cse1.done;
-					}
-
-				} //end group g_CSE_ANNC_CRE_008
-				
-				group g_CSE_ANNC_CRE_009 {
-					
-					/**
-					 * @desc Check that the labels attribute is announced when such attribute is present in the original resource
-					 *  
-					 */
-					testcase TC_CSE_ANNC_CRE_009_CNT() runs on Tester system CseSystem {
-						//Local variables
-						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						 var template RequestPrimitive v_createRequest := m_createContainerBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
-	    				 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						 v_cse1.done;
-						 
-						 v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
-						 v_createRequest.primitiveContent.container.labels := {"MyLabel"};
-						 v_createRequestAnnc.primitiveContent.containerAnnc.labels := ?;
-	  
-						 v_cse1.start(f_CSE_ANNC_CRE_009_CseSimu(int3, v_createRequestAnnc, v_createRequest));//Container
-						 v_cse1.done;
-					}
-				} //end group g_CSE_ANNC_CRE_009
-			} //end group Create
-			
-			group Retrieve {
-				
-				group g_CSE_ANNC_RET_001 {
-					
-					/**
-					 * @desc Host of <resourceAnnc> returns the <resourceAnnc> representation in a RETRIEVE response
-					 *  
-					 */
-					testcase TC_CSE_ANNC_RET_001_ACP() runs on Tester system CseSystem {
-						//Local variables
-						 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						 var template RequestPrimitive v_createRequest := m_createAcpBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
-  
-						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						 v_ae1.start(f_CSE_ANNC_RET_001(int1, v_createRequestAnnc, v_createRequest));//AccessControlPolicy
-						 v_ae1.done;
-					}
-					
-					testcase TC_CSE_ANNC_RET_001_CNT() runs on Tester system CseSystem {
-						 //Local variables
-						 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						 var template RequestPrimitive v_createRequest := m_createContainerBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
-	  
-						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						 v_ae1.start(f_CSE_ANNC_RET_001(int3, v_createRequestAnnc, v_createRequest));//Container
-						 v_ae1.done;
-					}
-					
-					testcase TC_CSE_ANNC_RET_001_CIN() runs on Tester system CseSystem {
-						 //Local variables
-						 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						 var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
-  
-						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						 v_ae1.start(f_CSE_ANNC_RET_001(int4, v_createRequestAnnc, v_createRequest));//ContentInstance
-						 v_ae1.done;
-					}
-					
-					testcase TC_CSE_ANNC_RET_001_GRP() runs on Tester system CseSystem {
-						 //Local variables
-						 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						 var template RequestPrimitive v_createRequest := m_createGroupBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
-  
-						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						 v_ae1.start(f_CSE_ANNC_RET_001(int9, v_createRequestAnnc, v_createRequest));//Group
-						 v_ae1.done;
-					}
-					
-					testcase TC_CSE_ANNC_RET_001_TS() runs on Tester system CseSystem {
-						 //Local variables
-						 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
-  
-						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						 v_ae1.start(f_CSE_ANNC_RET_001(int29, v_createRequestAnnc, v_createRequest));//TimeSeries
-						 v_ae1.done;
-					}
-					
-					testcase TC_CSE_ANNC_RET_001_TSI() runs on Tester system CseSystem {
-						 //Local variables
-						 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						 var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnnc;
-  
-						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						 v_ae1.start(f_CSE_ANNC_RET_001(int30, v_createRequestAnnc, v_createRequest));//TimeSeriesInstance
-						 v_ae1.done;
-					}
-					
-				} //end group g_CSE_ANNC_RET_001
-				
-				group g_CSE_ANNC_RET_002 {
-					
-					/**
-					 * @desc Host of <resourceAnnc> returns the original <resource> representation from the original resource hosting CSE in a RETRIEVE response when result content is set to “original-resource”
-					 *  
-					 */
-					testcase TC_CSE_ANNC_RET_002_ACP() runs on Tester system CseSystem {
-						//Local variables
-						 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						 var template RequestPrimitive v_createRequest := m_createAcpBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
-  
-						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						 v_ae1.start(f_CSE_ANNC_RET_002(int1, v_createRequestAnnc, v_createRequest));//AccessControlPolicy
-						 v_ae1.done;
-					}
-					
-					testcase TC_CSE_ANNC_RET_002_CNT() runs on Tester system CseSystem {
-						 //Local variables
-						 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						 var template RequestPrimitive v_createRequest := m_createContainerBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
-	  
-						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						 v_ae1.start(f_CSE_ANNC_RET_002(int3, v_createRequestAnnc, v_createRequest));//Container
-						 v_ae1.done;
-					}
-					
-					testcase TC_CSE_ANNC_RET_002_CIN() runs on Tester system CseSystem {
-						 //Local variables
-						 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						 var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
-  
-						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						 v_ae1.start(f_CSE_ANNC_RET_002(int4, v_createRequestAnnc, v_createRequest));//ContentInstance
-						 v_ae1.done;
-					}
-					
-					testcase TC_CSE_ANNC_RET_002_GRP() runs on Tester system CseSystem {
-						 //Local variables
-						 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						 var template RequestPrimitive v_createRequest := m_createGroupBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
-  
-						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						 v_ae1.start(f_CSE_ANNC_RET_002(int9, v_createRequestAnnc, v_createRequest));//Group
-						 v_ae1.done;
-					}
-					
-					testcase TC_CSE_ANNC_RET_002_TS() runs on Tester system CseSystem {
-						 //Local variables
-						 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
-	  
-						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						 v_ae1.start(f_CSE_ANNC_RET_002(int29, v_createRequestAnnc, v_createRequest));//TimeSeries
-						 v_ae1.done;
-					}
-					
-					testcase TC_CSE_ANNC_RET_002_TSI() runs on Tester system CseSystem {
-						 //Local variables
-						 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						 var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnnc;
-  
-						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						 v_ae1.start(f_CSE_ANNC_RET_002(int30, v_createRequestAnnc, v_createRequest));//TimeSeriesInstance
-						 v_ae1.done;
-					}
-					
-				} //end group g_CSE_ANNC_RET_002
-				
-			} //end group Retrieve
-			
-			group Update{
-
-				group g_CSE_ANNC_UPD_001{
-
-					/**
-					 * @desc Check that the IUT announces successfully the RESOURCE_TYPE resource when a new CSE-ID is provided in announcedTo optional attribute and its parent resource having been announced to the announcement target CSE
-					 *  
-					 */
-					testcase TC_CSE_ANNC_UPD_001_ACP() runs on Tester system CseSystem {
-						// Local variables
-						var MnCseSimu v_cse1 := MnCseSimu.create("CSE1") alive;
-						var template RequestPrimitive v_createRequest := m_createAcpBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
-						var template RequestPrimitive v_updateRequest := m_updateAcpBase;	
-			
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};					
-			
-						v_cse1.start(f_CSE_ANNC_UPD_001(int1, v_createRequest, v_createRequestAnnc, v_updateRequest));//AccessControlPolicy
-						v_cse1.done;
-					}
-
-					testcase TC_CSE_ANNC_UPD_001_CNT() runs on Tester system CseSystem {
-						// Local variables
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var template RequestPrimitive v_createRequest := m_createContainerBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
-						var template RequestPrimitive v_updateRequest := m_updateContainerBase;	
-			
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						v_updateRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
-  
-						v_cse1.start(f_CSE_ANNC_UPD_001(int3, v_createRequest, v_createRequestAnnc, v_updateRequest));//Container
-						v_cse1.done;
-					}
-
-					testcase TC_CSE_ANNC_UPD_001_GRP() runs on Tester system CseSystem {
-						// Local variables
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var template RequestPrimitive v_createRequest := m_createGroupBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
-						var template RequestPrimitive v_updateRequest := m_updateGroupBase;	
-			
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						v_updateRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
-  
-						v_cse1.start(f_CSE_ANNC_UPD_001(int9, v_createRequest, v_createRequestAnnc, v_updateRequest));//Group
-						v_cse1.done;
-					}
-					
-					testcase TC_CSE_ANNC_UPD_001_TS() runs on Tester system CseSystem {
-						// Local variables
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
-						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;	
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						v_updateRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
-  
-						v_cse1.start(f_CSE_ANNC_UPD_001(int29, v_createRequest, v_createRequestAnnc, v_updateRequest));//TimeSeries
-						v_cse1.done;
-					}
-
-				}// end group g_CSE_ANNC_UPD_001
-	
-				group g_CSE_ANNC_UPD_002{
-
-					/**
-					 * @desc Check that the IUT initiates de-announcement of the RESOURCE_TYPE resource when a CSE-ID is deleted from the announceTo optional attribute
-					 *  
-					 */
-					testcase TC_CSE_ANNC_UPD_002_ACP() runs on Tester system CseSystem {
-						// Local variables
-						var MnCseSimu v_cse1 := MnCseSimu.create("CSE1") alive;
-						var template RequestPrimitive v_createRequest := m_createAcpBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
-						var template RequestPrimitive v_updateRequest := m_updateAcpBase;	
-						var AttributeAux_list v_nullFields;
-						var ListOfURIs v_announceTo := {"To be deleted"};
-
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};		
-						
-						v_updateRequest.primitiveContent.accessControlPolicy.announceTo := v_announceTo;
-						v_nullFields := {{"announceTo", omit}};
-
-						v_cse1.start(f_CSE_ANNC_UPD_002(int1, v_createRequest, v_createRequestAnnc, v_updateRequest, v_nullFields));//AccessControlPolicy
-						v_cse1.done;
-					}
-
-					testcase TC_CSE_ANNC_UPD_002_CNT() runs on Tester system CseSystem {
-						// Local variables
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var template RequestPrimitive v_createRequest := m_createContainerBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
-						var template RequestPrimitive v_updateRequest := m_updateContainerBase;	
-						var AttributeAux_list v_nullFields;
-						var ListOfURIs v_announceTo := {"To be deleted"};
-
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
-						
-						v_updateRequest.primitiveContent.container.announceTo := v_announceTo;
-						v_nullFields := {{"announceTo", omit}};
-  
-						v_cse1.start(f_CSE_ANNC_UPD_002(int3, v_createRequest, v_createRequestAnnc, v_updateRequest, v_nullFields));//Container
-						v_cse1.done;
-					}
-
-					testcase TC_CSE_ANNC_UPD_002_GRP() runs on Tester system CseSystem {
-						// Local variables
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var template RequestPrimitive v_createRequest := m_createGroupBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
-						var template RequestPrimitive v_updateRequest := m_updateGroupBase;	
-						var AttributeAux_list v_nullFields;
-						var ListOfURIs v_announceTo := {"To be deleted"};
-
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
-						
-						v_updateRequest.primitiveContent.group_.announceTo := v_announceTo;
-						v_nullFields := {{"announceTo", omit}};
-  
-						v_cse1.start(f_CSE_ANNC_UPD_002(int9, v_createRequest, v_createRequestAnnc, v_updateRequest, v_nullFields));//Group
-						v_cse1.done;
-					}
-					
-					testcase TC_CSE_ANNC_UPD_002_TS() runs on Tester system CseSystem {
-						// Local variables
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
-						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;	
-						var AttributeAux_list v_nullFields;
-						var ListOfURIs v_announceTo := {"To be deleted"};
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
-	
-						v_updateRequest.primitiveContent.timeSeries.announceTo := v_announceTo;
-						v_nullFields := {{"announceTo", omit}};
-  
-						v_cse1.start(f_CSE_ANNC_UPD_002(int29, v_createRequest, v_createRequestAnnc, v_updateRequest, v_nullFields));//TimeSeries
-						v_cse1.done;
-					}
-
-				}// end group g_CSE_ANNC_UPD_002
-	
-				group g_CSE_ANNC_UPD_003{
-
-					/**
-					 * @desc Check that the IUT provides confirmation of resource de-announcement to the originator of the initiating request after a successful resource de-announcement procedure originator (for an UPDATE initiating resource de-announcement)
-					 *  
-					 */
-					testcase TC_CSE_ANNC_UPD_003_ACP() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template RequestPrimitive v_createRequest := m_createAcpBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
-						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
-						var ResponsePrimitive v_responsePrimitive;	
-						var AttributeAux_list v_nullFields;
-						var ListOfURIs v_announceTo := {"To be deleted"};
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-  
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
-						
-						v_updateRequest.primitiveContent.accessControlPolicy.announceTo := v_announceTo;
-						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;
-			
-						if(getverdict == pass){
-							v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							if(ispresent(v_responsePrimitive.primitiveContent)) {
-								if(ischosen(v_responsePrimitive.primitiveContent.accessControlPolicy)) {
-									if(ispresent(v_responsePrimitive.primitiveContent.accessControlPolicy.announceTo)){
-										setverdict(fail, __SCOPE__ & ": Error: announceTo attribute is not set to NULL");
-									}
-								}
-							}
-							
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
-
-							//Check that the resource has been udpated correctly
-							if(ischosen(v_primitiveContentRetrieveResource.accessControlPolicy)) {
-								if(ispresent(v_primitiveContentRetrieveResource.accessControlPolicy.announceTo)){
-									setverdict(fail, __SCOPE__ & ": Error: announceTo attribute not updated correctly");
-								}
-							}
-						}		
-				
-					}
-
-					testcase TC_CSE_ANNC_UPD_003_CNT() runs on Tester system CseSystem {
-						// Local variables
-						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 ResponsePrimitive v_responsePrimitive;	
-						var AttributeAux_list v_nullFields;
-						var ListOfURIs v_announceTo := {"To be deleted"};
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-  
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
-						
-						v_updateRequest.primitiveContent.container.announceTo := v_announceTo;
-						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;
-			
-						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.announceTo)){
-										setverdict(fail, __SCOPE__ & ": Error: announceTo attribute is not set to NULL");
-									}
-								}
-							}
-							
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
-
-							//Check that the resource has been udpated correctly
-							if(ischosen(v_primitiveContentRetrieveResource.container)) {
-								if(ispresent(v_primitiveContentRetrieveResource.container.announceTo)){
-									setverdict(fail, __SCOPE__ & ": Error: announceTo attribute not updated correctly");
-								}
-							}
-						}	
-									
-					}
-
-					testcase TC_CSE_ANNC_UPD_003_GRP() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template RequestPrimitive v_createRequest := m_createGroupBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
-						var template RequestPrimitive v_updateRequest := m_updateGroupBase;	
-						var ResponsePrimitive v_responsePrimitive;	
-						var AttributeAux_list v_nullFields;
-						var ListOfURIs v_announceTo := {"To be deleted"};
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-  
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
-						
-						v_updateRequest.primitiveContent.group_.announceTo := v_announceTo;
-						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;
-			
-						if(getverdict == pass){
-							v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							if(ispresent(v_responsePrimitive.primitiveContent)) {
-								if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
-									if(ispresent(v_responsePrimitive.primitiveContent.group_.announceTo)){
-										setverdict(fail, __SCOPE__ & ": Error: announceTo attribute is not set to NULL");
-									}
-								}
-							}
-							
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
-
-							//Check that the resource has been udpated correctly
-							if(ischosen(v_primitiveContentRetrieveResource.group_)) {
-								if(ispresent(v_primitiveContentRetrieveResource.group_.announceTo)){
-									setverdict(fail, __SCOPE__ & ": Error: announceTo attribute not updated correctly");
-								}
-							}
-						}	
-					}
-					
-					testcase TC_CSE_ANNC_UPD_003_TS() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
-						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;	
-						var ResponsePrimitive v_responsePrimitive;	
-						var AttributeAux_list v_nullFields;
-						var ListOfURIs v_announceTo := {"To be deleted"};
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-  
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
-	
-						v_updateRequest.primitiveContent.timeSeries.announceTo := v_announceTo;
-						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;
-
-						if(getverdict == pass){
-							v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							if(ispresent(v_responsePrimitive.primitiveContent)) {
-								if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
-									if(ispresent(v_responsePrimitive.primitiveContent.timeSeries.announceTo)){
-										setverdict(fail, __SCOPE__ & ": Error: announceTo attribute is not set to NULL");
-									}
-								}
-							}
-		
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
-
-							//Check that the resource has been udpated correctly
-							if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
-								if(ispresent(v_primitiveContentRetrieveResource.timeSeries.announceTo)){
-									setverdict(fail, __SCOPE__ & ": Error: announceTo attribute not updated correctly");
-								}
-							}
-						}	
-					}
-
-				}// end group g_CSE_ANNC_UPD_003
-				
-				group g_CSE_ANNC_UPD_004 {
-		
-					/**
-					 * @desc HOST CSE of original resource returns INVALID response if announcedAttributes contains an attribute that is not marked OA
-					 *  
-					 */
-					testcase TC_CSE_ANNC_UPD_004_ACP() runs on Tester system CseSystem {
-						// Local variables
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var template RequestPrimitive v_createRequest := m_createAcpBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
-						var template RequestPrimitive v_updateRequest := m_updateAcpBase;	
-
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
-						v_updateRequest.primitiveContent.accessControlPolicy.announcedAttribute := {"ToBeDeleted"};
-						v_updateRequest.primitiveContent.accessControlPolicy.parentID := PX_CSE1_ID;			
-
-						v_cse1.start(f_CSE_ANNC_UPD_004(int1, v_createRequest, v_createRequestAnnc, v_updateRequest));//AccessControlPolicy
-						v_cse1.done;
-					}
-
-					testcase TC_CSE_ANNC_UPD_004_CNT() runs on Tester system CseSystem {
-						// Local variables
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var template RequestPrimitive v_createRequest := m_createContainerBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
-						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
-
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						v_updateRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
-						v_updateRequest.primitiveContent.container.announcedAttribute := {"ToBeDeleted"};
-						v_updateRequest.primitiveContent.container.parentID := PX_CSE1_ID;
-  
-						v_cse1.start(f_CSE_ANNC_UPD_004(int3, v_createRequest, v_createRequestAnnc, v_updateRequest));//Container
-						v_cse1.done;
-					}
-
-					testcase TC_CSE_ANNC_UPD_004_GRP() runs on Tester system CseSystem {
-						// Local variables
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var template RequestPrimitive v_createRequest := m_createGroupBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
-						var template RequestPrimitive v_updateRequest := m_updateGroupBase;	
-
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						v_updateRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
-						v_updateRequest.primitiveContent.group_.announcedAttribute := {"ToBeDeleted"};
-						v_updateRequest.primitiveContent.group_.parentID := PX_CSE1_ID;
-  
-						v_cse1.start(f_CSE_ANNC_UPD_004(int9, v_createRequest, v_createRequestAnnc, v_updateRequest));//Group
-						v_cse1.done;
-					}
-					
-					testcase TC_CSE_ANNC_UPD_004_TS() runs on Tester system CseSystem {
-						// Local variables
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
-						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;	
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						v_updateRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
-						v_updateRequest.primitiveContent.timeSeries.announcedAttribute := {"ToBeDeleted"};
-						v_updateRequest.primitiveContent.timeSeries.parentID := PX_CSE1_ID;
-  
-						v_cse1.start(f_CSE_ANNC_UPD_004(int29, v_createRequest, v_createRequestAnnc, v_updateRequest));//TimeSeries
-						v_cse1.done;
-					}
-				} // end group g_CSE_ANNC_UPD_004
-	
-				group g_CSE_ANNC_UPD_005 {
-		
-					/**
-					 * @desc Check that the labels attribute is de-announced when such attribute is deleted from the original resource
-					 *  
-					 */
-					testcase TC_CSE_ANNC_UPD_005() runs on Tester system CseSystem {
-						// Local variables
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var template RequestPrimitive v_createRequest := m_createContainerBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
-						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
-						var template RequestPrimitive v_updateRequestAnnc := mw_updateContainerAnnc;
-						var RequestPrimitive v_requestPrimitive;	
-						var Labels v_labels_1 := {"VALUE_1"};
-						var AttributeAux_list v_nullFields;
-						var Labels v_labels_2 := {"To be deleted"};	
-
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
-						v_createRequest.primitiveContent.container.labels := v_labels_1;
-						
-						v_updateRequest.primitiveContent.container.labels := v_labels_2;
-						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;
-						
-						if(getverdict == pass){
-							v_requestPrimitive := f_getRequestPrimitive(v_cse1);
-							if(ispresent(v_requestPrimitive.primitiveContent)) {
-								if(ischosen(v_requestPrimitive.primitiveContent.containerAnnc)) {
-									if(ispresent(v_requestPrimitive.primitiveContent.containerAnnc.labels)){
-										setverdict(fail, __SCOPE__ & ": Error: labels attribute is not set to NULL");
-									}
-								}
-							}
-
-						}	
-
-					}
-				} // end group g_CSE_ANNC_UPD_005
-				
-				group g_CSE_ANNC_UPD_006 {
-					
-					/**
-					 * @desc Check that the IUT announces successfully the RESOURCE_TYPE resource when a new CSE-ID is provided in announcedTo optional attribute and IUT having been already announced to announcement target CSE
-					 *  
-					 */
-					testcase TC_CSE_ANNC_UPD_006_ACP() runs on Tester system CseSystem {
-						//Local variables
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var template RequestPrimitive v_createRequest := m_createAcpBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
-						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
-						
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
-						
-						v_cse1.start(f_CSE_ANNC_UPD_006(int1, v_createRequest, v_createRequestAnnc, v_updateRequest));//AccessControlPolicy
-						v_cse1.done;
-					}
-					
-					testcase TC_CSE_ANNC_UPD_006_CNT() runs on Tester system CseSystem {
-						//Local variables
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var template RequestPrimitive v_createRequest := m_createContainerBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
-						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
-	
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						v_updateRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
-	
-						v_cse1.start(f_CSE_ANNC_UPD_006(int3, v_createRequest, v_createRequestAnnc, v_updateRequest));//Container
-						v_cse1.done;
-					}
-					
-					testcase TC_CSE_ANNC_UPD_006_GRP() runs on Tester system CseSystem {
-						//Local variables
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var template RequestPrimitive v_createRequest := m_createGroupBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
-						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
-
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						v_updateRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
-
-						v_cse1.start(f_CSE_ANNC_UPD_006(int9, v_createRequest, v_createRequestAnnc, v_updateRequest));//Group
-						v_cse1.done;
-					}
-					
-					testcase TC_CSE_ANNC_UPD_006_TS() runs on Tester system CseSystem {
-						//Local variables
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
-						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						v_updateRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
-
-						v_cse1.start(f_CSE_ANNC_UPD_006(int29, v_createRequest, v_createRequestAnnc, v_updateRequest));//TimeSeries
-						v_cse1.done;
-					}
-				}// end group g_CSE_ANNC_UPD_006
-				
-				group g_CSE_ANNC_UPD_007 {
-					
-					/**
-					 * @desc Check that the IUT announces successfully the RESOURCE_TYPE resource when a new CSE-ID is provided in announcedTo optional attribute and IUT has registered and created a <remoteCSE> resource to the announcement target CSE
-					 *  
-					 */
-					testcase TC_CSE_ANNC_UPD_007_ACP() runs on Tester system CseSystem {
-						//Local variables
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var template RequestPrimitive v_createRequest := m_createAcpBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
-						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
-	
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
-	
-						v_cse1.start(f_CSE_ANNC_UPD_007(int1, v_createRequest, v_createRequestAnnc, v_updateRequest));//AccessControlPolicy
-						v_cse1.done;
-					}
-
-					testcase TC_CSE_ANNC_UPD_007_CNT() runs on Tester system CseSystem {
-						//Local variables
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var template RequestPrimitive v_createRequest := m_createContainerBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
-						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
-
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						v_updateRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
-
-						v_cse1.start(f_CSE_ANNC_UPD_007(int3, v_createRequest, v_createRequestAnnc, v_updateRequest));//Container
-						v_cse1.done;
-					}
-
-					testcase TC_CSE_ANNC_UPD_007_GRP() runs on Tester system CseSystem {
-						//Local variables
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var template RequestPrimitive v_createRequest := m_createGroupBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
-						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
-
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						v_updateRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
-
-						v_cse1.start(f_CSE_ANNC_UPD_007(int9, v_createRequest, v_createRequestAnnc, v_updateRequest));//Group
-						v_cse1.done;
-					}
-					
-					testcase TC_CSE_ANNC_UPD_007_TS() runs on Tester system CseSystem {
-						//Local variables
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
-						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						v_updateRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
+					if(vc_ae2.running) {
+						vc_ae2.stop;
+					};
 
-						v_cse1.start(f_CSE_ANNC_UPD_007(int29, v_createRequest, v_createRequestAnnc, v_updateRequest));//TimeSeries
-						v_cse1.done;
-					}
-				} //end group g_CSE_ANNC_UPD_007
-				
-				group g_CSE_ANNC_UPD_008 {
+					// Test Body
+					vc_ae2.start(f_cse_notifyProcedure_aggregatedNoficationHandler(v_contentResponse, numberOfAggregatedNotification)); // check that no notification is received
 					
-					/**
-					 * @desc Check that the IUT provides confirmation of the announcement of an attribute to the originator of the initiating request after a successful attribute announcement procedure
-					 *  
-					 */
-					testcase TC_CSE_ANNC_UPD_008_CNT_MBS() runs on Tester system CseSystem {
-						// Local variables
-						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 ResponsePrimitive v_responsePrimitive;	
-						var AttributeAux_list v_nullFields;
-						var ListOfNCNames v_announcedAttribute := {"ToBeDeleted"};
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-						var XSD.NonNegativeInteger v_maxByteSize := 512;
-  
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
-						v_createRequest.primitiveContent.container.maxByteSize := v_maxByteSize;
-						v_createRequest.primitiveContent.container.announcedAttribute := v_announcedAttribute;
-
-						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;
-
-						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(pass, __SCOPE__ & ": announcedAttribute attribute is present");
-									} else {
-										setverdict(fail, __SCOPE__ & ": announcedAttribute attribute is not present");
-									}
-								}
-							}
-
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
-
-							//Check that the resource has been udpated correctly
-							if(ischosen(v_primitiveContentRetrieveResource.container)) {
-								if(ispresent(v_primitiveContentRetrieveResource.container.announcedAttribute)){
-									setverdict(pass, __SCOPE__ & "announcedAttribute attribute updated correctly");
-								} else {
-									setverdict(fail, __SCOPE__ & "announcedAttribute attribute not updated correctly");
-								}
-							}
-						}	
-					}
+					v_updateRequest.primitiveContent.aE.labels := v_labels_1;
+					f_cse_updateResource(int2, v_aeIndex, v_updateRequest); // Update request 1
 					
-					testcase TC_CSE_ANNC_UPD_008_GRP_MT() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template RequestPrimitive v_createRequest := m_createGroupBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
-						var template RequestPrimitive v_updateRequest := m_updateGroupBase;	
-						var ResponsePrimitive v_responsePrimitive;	
-						var AttributeAux_list v_nullFields;
-						var ListOfNCNames v_announcedAttribute := {"ToBeDeleted"};
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-						var MemberType v_memberType := int3;
-  
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
-						v_createRequest.primitiveContent.group_.memberType := v_memberType;
-						v_createRequest.primitiveContent.group_.announcedAttribute := v_announcedAttribute;
+					v_updateRequest.primitiveContent.aE.labels := v_labels_2; 
+					f_cse_updateResource(int2, v_aeIndex, v_updateRequest); // Update request 2
+					
+					v_updateRequest.primitiveContent.aE.labels := v_labels_3; 
+					f_cse_updateResource(int2, v_aeIndex, v_updateRequest); // Update request 3
 
-						v_updateRequest.primitiveContent.group_.announcedAttribute := {"mt"};
-  
-						v_ae1.start(f_CSE_ANNC_UPD_008(int9, v_createRequestAnnc, v_createRequest, v_updateRequest));//Group
-						v_ae1.done;
+					f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
 
-						if(getverdict == pass){
-							v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							if(ispresent(v_responsePrimitive.primitiveContent)) {
-								if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
-									if(ispresent(v_responsePrimitive.primitiveContent.group_.announcedAttribute)){
-										setverdict(pass, __SCOPE__ & ": announcedAttribute attribute is present");
-									} else {
-										setverdict(fail, __SCOPE__ & ": announcedAttribute attribute is not present");
-									}
-								}
-							}
+					//Postamble
+					f_cse_postamble_deleteResources();
 
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+					//Tear down
+					f_cf01Down();
 
-							//Check that the resource has been udpated correctly
-							if(ischosen(v_primitiveContentRetrieveResource.group_)) {
-								if(ispresent(v_primitiveContentRetrieveResource.group_.announcedAttribute)){
-									setverdict(pass, __SCOPE__ & "announcedAttribute attribute updated correctly");
-								} else {
-									setverdict(fail, __SCOPE__ & "announcedAttribute attribute not updated correctly");
-								}
-							}
-						}
-					}
+				} // end TC_CSE_SUB_UPD_007
 					
-					testcase TC_CSE_ANNC_UPD_008_TS_MBS() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
-						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;	
-						var ResponsePrimitive v_responsePrimitive;	
-						var AttributeAux_list v_nullFields;
-						var ListOfNCNames v_announcedAttribute := {"ToBeDeleted"};
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-						var XSD.NonNegativeInteger v_maxByteSize := 512;
-  
+				/**
+				 * @desc Check that the IUT sends the latest notification to the subscriber resource when latestNotify is set to TRUE, the number value of the batchNotify attribute is set to GROUP_LIMIT and when this number have been reached
+				 * 
+				 */
+				testcase TC_CSE_SUB_UPD_008() runs on Tester system CseSystem {
+					
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
-						v_createRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize;
-						v_createRequest.primitiveContent.timeSeries.announcedAttribute := v_announcedAttribute;
-
-						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;
-
-						if(getverdict == pass){
-							v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							if(ispresent(v_responsePrimitive.primitiveContent)) {
-								if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
-									if(ispresent(v_responsePrimitive.primitiveContent.timeSeries.announcedAttribute)){
-										setverdict(pass, __SCOPE__ & ": announcedAttribute attribute is present");
-									} else {
-										setverdict(fail, __SCOPE__ & ": announcedAttribute attribute is not present");
-									}
-								}
-							}
-
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
-
-							//Check that the resource has been udpated correctly
-							if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
-								if(ispresent(v_primitiveContentRetrieveResource.timeSeries.announcedAttribute)){
-									setverdict(pass, __SCOPE__ & "announcedAttribute attribute updated correctly");
-								} else {
-									setverdict(fail, __SCOPE__ & "announcedAttribute attribute not updated correctly");
-								}
-							}
-						}	
-					}
-				} //end group g_CSE_ANNC_UPD_008
-				
-				group g_CSE_ANNC_UPD_009{
-
-					/**
-					 * @desc Check that the IUT updates successfully RESOURCE_TYPE announced variant resource when a new OA attribute is provided to announcedAttribute attribute of the original resource
-					 *  
-					 */
-					testcase TC_CSE_ANNC_UPD_009_CNT_MBS() runs on Tester system CseSystem {
-						// Local variables
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var template RequestPrimitive v_createRequest := m_createContainerBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
-						var template RequestPrimitive v_updateRequest := m_updateContainerBase;	
-						var template RequestPrimitive v_updateRequestAnnc := mw_updateContainerAnnc;
-						var XSD.NonNegativeInteger v_maxByteSize := 512;
-
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
-						v_createRequest.primitiveContent.container.maxByteSize := v_maxByteSize;	
-						
-						v_createRequestAnnc.primitiveContent.containerAnnc.maxByteSize := v_maxByteSize;
-						
-						v_updateRequest.primitiveContent.container.announcedAttribute := {"mbs"};
-						
-						v_updateRequestAnnc.primitiveContent.containerAnnc.maxByteSize := v_maxByteSize;
-  
-						v_cse1.start(f_CSE_ANNC_UPD_009(int3, v_createRequest, v_createRequestAnnc, v_updateRequest, v_updateRequestAnnc));//Container
-						v_cse1.done;
-					}
-
-					testcase TC_CSE_ANNC_UPD_009_GRP_MT() runs on Tester system CseSystem {
-						// Local variables
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var template RequestPrimitive v_createRequest := m_createGroupBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
-						var template RequestPrimitive v_updateRequest := m_updateGroupBase;	
-						var template RequestPrimitive v_updateRequestAnnc := mw_updateGroupAnnc;
-						var MemberType v_memberType := int3;
-
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
-						v_createRequest.primitiveContent.group_.memberType := v_memberType;
-						
-						v_createRequestAnnc.primitiveContent.groupAnnc.memberType := v_memberType;
-						
-						v_updateRequest.primitiveContent.group_.announcedAttribute := {"mt"};
-						
-						v_updateRequestAnnc.primitiveContent.groupAnnc.memberType := v_memberType;
-  
-						v_cse1.start(f_CSE_ANNC_UPD_009(int9, v_createRequest, v_createRequestAnnc, v_updateRequest, v_updateRequestAnnc));//Group
-						v_cse1.done;
-					}
+																
+					v_ae1.start(f_CSE_SUB_UPD_008());
+													  	  	
+					v_ae1.done;
+													  	  		
+				}
+															
+				function f_CSE_SUB_UPD_008() runs on AeSimu {
+					// Local variables
+					const integer numberOfAggregatedNotification := 3;
+					var Labels v_labels_1:= {"VALUE_1"};
+					var Labels v_labels_2:= {"VALUE_2"};
+					var Labels v_labels_3:= {"VALUE_3"};
+					var integer v_aeIndex := -1;
+					var integer v_resourceIndex := -1;
+					var template RequestPrimitive v_createRequest := omit;
+					var template PrimitiveContent v_contentResponse;
+					var template RequestPrimitive v_updateRequest := m_updateAeBase;
+					var RequestPrimitive v_request;
+					var integer v_ae2Index := -1;
+            
+					v_contentResponse.aE := mw_contentAeBase; // all attributes expected   
+            
+					// Test control
+            
+					// Test component configuration
+					f_cf01Up(true);
+            
+					// Test adapter configuration
+            
+					// Preamble
+					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
 					
-					testcase TC_CSE_ANNC_UPD_009_TS_MBS() runs on Tester system CseSystem {
-						// Local variables
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
-						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;	
-						var template RequestPrimitive v_updateRequestAnnc := mw_updateTimeSeriesAnnc;
-						var XSD.NonNegativeInteger v_maxByteSize := 512;
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
+					f_cse_preamble_subscriptionVerification(v_ae2Index, v_createRequest, int23);
 						
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
-						v_createRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize;	
-	
-						v_createRequestAnnc.primitiveContent.timeSeriesAnnc.maxByteSize := v_maxByteSize;
-	
-						v_updateRequest.primitiveContent.timeSeries.announcedAttribute := {"mbs"};
-	
-						v_updateRequestAnnc.primitiveContent.timeSeriesAnnc.maxByteSize := v_maxByteSize;
-  
-						v_cse1.start(f_CSE_ANNC_UPD_009(int29, v_createRequest, v_createRequestAnnc, v_updateRequest, v_updateRequestAnnc));//TimeSeries
-						v_cse1.done;
-					}
-
-				}// end group g_CSE_ANNC_UPD_009
-				
-				group g_CSE_ANNC_UPD_010{
-					
-					/**
-					 * @desc Check that the IUT updates successfully the RESOURCE_TYPE announced variant resource when a MA attribute of its original resource is updated.
-					 *  
-					 */
-					testcase TC_CSE_ANNC_UPD_010_ACP() runs on Tester system CseSystem {
-						// Local variables
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var template RequestPrimitive v_createRequest := m_createAcpBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
-						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
-						var template RequestPrimitive v_updateRequestAnnc := mw_updateAccessControlPolicyAnnc;
-						var Timestamp v_expirationTime_1 := "21001231T012345";
-						var Timestamp v_expirationTime_2 := "21101231T012345";
-
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
-						v_createRequest.primitiveContent.accessControlPolicy.expirationTime := v_expirationTime_1;	
-
-						v_createRequestAnnc.primitiveContent.accessControlPolicyAnnc.expirationTime := v_expirationTime_1;
-
-						v_updateRequest.primitiveContent.accessControlPolicy.expirationTime := v_expirationTime_2;
-
-						v_updateRequestAnnc.primitiveContent.accessControlPolicyAnnc.expirationTime := v_expirationTime_2;
-  
-						v_cse1.start(f_CSE_ANNC_UPD_010(int3, v_createRequest, v_createRequestAnnc, v_updateRequest, v_updateRequestAnnc));//Container
-						v_cse1.done;
-					}
-
-					testcase TC_CSE_ANNC_UPD_010_CNT() runs on Tester system CseSystem {
-						// Local variables
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var template RequestPrimitive v_createRequest := m_createContainerBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
-						var template RequestPrimitive v_updateRequest := m_updateContainerBase;	
-						var template RequestPrimitive v_updateRequestAnnc := mw_updateContainerAnnc;
-						var Timestamp v_expirationTime_1 := "21001231T012345";
-						var Timestamp v_expirationTime_2 := "21101231T012345";
-
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
-						v_createRequest.primitiveContent.container.expirationTime := v_expirationTime_1;	
-		
-						v_createRequestAnnc.primitiveContent.containerAnnc.expirationTime := v_expirationTime_1;
-		
-						v_updateRequest.primitiveContent.container.expirationTime := v_expirationTime_2;
-		
-						v_updateRequestAnnc.primitiveContent.containerAnnc.expirationTime := v_expirationTime_2;
-  
-						v_cse1.start(f_CSE_ANNC_UPD_010(int3, v_createRequest, v_createRequestAnnc, v_updateRequest, v_updateRequestAnnc));//Container
-						v_cse1.done;
-					}
-
-					testcase TC_CSE_ANNC_UPD_010_GRP() runs on Tester system CseSystem {
-						// Local variables
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var template RequestPrimitive v_createRequest := m_createGroupBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
-						var template RequestPrimitive v_updateRequest := m_updateGroupBase;	
-						var template RequestPrimitive v_updateRequestAnnc := mw_updateGroupAnnc;
-						var Timestamp v_expirationTime_1 := "21001231T012345";
-						var Timestamp v_expirationTime_2 := "21101231T012345";
-
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
-						v_createRequest.primitiveContent.group_.expirationTime := v_expirationTime_1;
-		
-						v_createRequestAnnc.primitiveContent.groupAnnc.expirationTime := v_expirationTime_1;
-		
-						v_updateRequest.primitiveContent.group_.expirationTime := v_expirationTime_2;
-		
-						v_updateRequestAnnc.primitiveContent.groupAnnc.expirationTime := v_expirationTime_2;
-  
-						v_cse1.start(f_CSE_ANNC_UPD_010(int9, v_createRequest, v_createRequestAnnc, v_updateRequest, v_updateRequestAnnc));//Group
-						v_cse1.done;
-					}
+					v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)},omit,omit,m_batchNotify(numberOfAggregatedNotification), true, omit,  -, omit);
+            		
+					//TODO We Need to check if the IUT send a notification only for the latest update operation
+					// like we match a Notification we have to verify if it is the first (unvalid behavior) or the last (valid behavior)
+					// maybe we need to synchronise our components
+            		
+					v_resourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex);//Subscription
+            					
+					if(vc_ae2.running) {
+						vc_ae2.stop;
+					};
 					
-					testcase TC_CSE_ANNC_UPD_010_TS() runs on Tester system CseSystem {
-						// Local variables
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
-						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;	
-						var template RequestPrimitive v_updateRequestAnnc := mw_updateTimeSeriesAnnc;
-						var Timestamp v_expirationTime_1 := "21001231T012345";
-						var Timestamp v_expirationTime_2 := "21101231T012345";
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
-						v_createRequest.primitiveContent.timeSeries.expirationTime := v_expirationTime_1;
-
-						v_createRequestAnnc.primitiveContent.timeSeriesAnnc.expirationTime := v_expirationTime_1;
-
-						v_updateRequest.primitiveContent.timeSeries.expirationTime := v_expirationTime_2;
-
-						v_updateRequestAnnc.primitiveContent.timeSeriesAnnc.expirationTime := v_expirationTime_2;
-  
-						v_cse1.start(f_CSE_ANNC_UPD_010(int29, v_createRequest, v_createRequestAnnc, v_updateRequest, v_updateRequestAnnc));//TimeSeries
-						v_cse1.done;
-					}
-
-				}// end group g_CSE_ANNC_UPD_010
-				
-				group g_CSE_ANNC_UPD_011{
-
-					/**
-					 * @desc Check that the IUT updates successfully the RESOURCE_TYPE announced variant resource when a optional attribute present in the announcedAttribute attribute of its original resource is updated.
-					 *  
-					 */
-					testcase TC_CSE_ANNC_UPD_011_CNT_MBS() runs on Tester system CseSystem {
-						// Local variables
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var template RequestPrimitive v_createRequest := m_createContainerBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
-						var template RequestPrimitive v_updateRequest := m_updateContainerBase;	
-						var template RequestPrimitive v_updateRequestAnnc := mw_updateContainerAnnc;
-						var XSD.NonNegativeInteger v_maxByteSize_1 := 512;
-						var XSD.NonNegativeInteger v_maxByteSize_2 := 1024;
-
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
-						v_createRequest.primitiveContent.container.maxByteSize := v_maxByteSize_1;
-						v_createRequest.primitiveContent.container.announcedAttribute := {"mbs"};	
-		
-						v_createRequestAnnc.primitiveContent.containerAnnc.maxByteSize := v_maxByteSize_1;
-		
-						v_updateRequest.primitiveContent.container.maxByteSize := v_maxByteSize_2;
-		
-						v_updateRequestAnnc.primitiveContent.containerAnnc.maxByteSize := v_maxByteSize_2;
-  
-						v_cse1.start(f_CSE_ANNC_UPD_011(int3, v_createRequest, v_createRequestAnnc, v_updateRequest, v_updateRequestAnnc));//Container
-						v_cse1.done;
-					}
+					// Test Body
+					vc_ae2.start(f_cse_notifyProcedure_representationHandler(v_contentResponse)); // check if the notification is well received and if its content matchs
+            					
+					v_updateRequest.primitiveContent.aE.labels := v_labels_1; 
+					f_cse_updateResource(int2, v_aeIndex, v_updateRequest); // Update request 1
+            					
+					v_updateRequest.primitiveContent.aE.labels := v_labels_2; 
+					f_cse_updateResource(int2, v_aeIndex, v_updateRequest); // Update request 2
+            					
+					v_updateRequest.primitiveContent.aE.labels := v_labels_3; 
+					f_cse_updateResource(int2, v_aeIndex, v_updateRequest); // Update request 3
+					
+					f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
 
-					testcase TC_CSE_ANNC_UPD_011_GRP_MT() runs on Tester system CseSystem {
-						// Local variables
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var template RequestPrimitive v_createRequest := m_createGroupBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
-						var template RequestPrimitive v_updateRequest := m_updateGroupBase;	
-						var template RequestPrimitive v_updateRequestAnnc := mw_updateGroupAnnc;
-						var MemberType v_memberType_1 := int3;
-						var MemberType v_memberType_2 := int4;
+					//Postamble
+					f_cse_postamble_deleteResources();
+            
+					//Tear down
+					f_cf01Down();
+            
+				} // end TC_CSE_SUB_UPD_008
 
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
-						v_createRequest.primitiveContent.group_.memberType := v_memberType_1;
-						v_createRequest.primitiveContent.group_.announcedAttribute := {"mt"};
-		
-						v_createRequestAnnc.primitiveContent.groupAnnc.memberType := v_memberType_1;
-		
-						v_updateRequest.primitiveContent.group_.memberType := v_memberType_2;
-		
-						v_updateRequestAnnc.primitiveContent.groupAnnc.memberType := v_memberType_2;
-  
-						v_cse1.start(f_CSE_ANNC_UPD_011(int9, v_createRequest, v_createRequestAnnc, v_updateRequest, v_updateRequestAnnc));//Group
-						v_cse1.done;
-					}
+				/**
+				 * @desc Check that the IUT sends a Notify request to the subscriber resource when the “attribute” condition tag of eventNotificationCriteria attribute is set to ATTRIBUTE_NAME and an update operation has been performed on the subscribed-to resource
+				 * 
+				 */
+				testcase TC_CSE_SUB_UPD_009() runs on Tester system CseSystem {
 					
-					testcase TC_CSE_ANNC_UPD_011_TS_MBS() runs on Tester system CseSystem {
-						// Local variables
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
-						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;	
-						var template RequestPrimitive v_updateRequestAnnc := mw_updateTimeSeriesAnnc;
-						var XSD.NonNegativeInteger v_maxByteSize_1 := 512;
-						var XSD.NonNegativeInteger v_maxByteSize_2 := 1024;
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
-						v_createRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize_1;
-						v_createRequest.primitiveContent.timeSeries.announcedAttribute := {"mbs"};	
-
-						v_createRequestAnnc.primitiveContent.timeSeriesAnnc.maxByteSize := v_maxByteSize_1;
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+																
+					v_ae1.start(f_CSE_SUB_UPD_009());
+													  	  	
+					v_ae1.done;
+													  	  		
+				}
+															
+				function f_CSE_SUB_UPD_009() runs on AeSimu {
+					// Local variables
+					var MsgIn v_response;
+					var Labels v_labels_1:= {"VALUE_1"};
+					var AttributeList_1 v_attributeList := {"lbl"};
+					var integer v_aeIndex := -1;
+					var integer v_resourceIndex := -1;
+					var template RequestPrimitive v_createRequest := omit;
+					var template PrimitiveContent v_contentResponse;
+					var template RequestPrimitive v_updateRequest := m_updateAeBase;
+					var RequestPrimitive v_request;
+					var integer v_ae2Index := -1;
+					
+					v_updateRequest.primitiveContent.aE.labels := v_labels_1; 
+					v_contentResponse.aE := mw_contentAeBase; // all attributes expected   
 
-						v_updateRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize_2;
+					// Test control
 
-						v_updateRequestAnnc.primitiveContent.timeSeriesAnnc.maxByteSize := v_maxByteSize_2;
-  
-						v_cse1.start(f_CSE_ANNC_UPD_011(int29, v_createRequest, v_createRequestAnnc, v_updateRequest, v_updateRequestAnnc));//TimeSeries
-						v_cse1.done;
-					}
+					// Test component configuration
+					f_cf01Up(true);
 
-				}// end group g_CSE_ANNC_UPD_011
-				
-				group g_CSE_ANNC_UPD_012{
+					// Test adapter configuration
 
-					/**
-					 * @desc Check that the IUT de-announces successfully an announced attribute when such attribute is deleted from announcedAttribute attribute.
-					 *  
-					 */
-					testcase TC_CSE_ANNC_UPD_012_CNT_MBS() runs on Tester system CseSystem {
-						// Local variables
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var template RequestPrimitive v_createRequest := m_createContainerBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
-						var template RequestPrimitive v_updateRequest := m_updateContainerBase;	
-						var template RequestPrimitive v_updateRequestAnnc := mw_updateContainerAnnc;
-						var RequestPrimitive v_requestPrimitive;	
-						var XSD.NonNegativeInteger v_maxByteSize := 512;
-						var AttributeAux_list v_nullFields;
-						var ListOfNCNames v_announcedAttribute := {"ToBeDeleted"};
+					// Preamble
+					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+					
+					f_cse_preamble_subscriptionVerification(v_ae2Index, v_createRequest, int23);
+					
+					v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, m_eventNotificationCriteria({int1}, v_attributeList), omit, omit, omit, omit, -, omit);
 
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
-						v_createRequest.primitiveContent.container.maxByteSize := v_maxByteSize;
-						v_createRequest.primitiveContent.container.announcedAttribute := {"mbs"};	
+					v_resourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex);//Subscription
 
-						v_createRequestAnnc.primitiveContent.containerAnnc.maxByteSize := v_maxByteSize;
-						
-						v_updateRequest.primitiveContent.container.announcedAttribute := v_announcedAttribute;
-						v_nullFields := {{"announcedAttribute", omit}};
-  
-						v_cse1.start(f_CSE_ANNC_UPD_012(int3, v_createRequest, v_createRequestAnnc, v_updateRequest, v_updateRequestAnnc, v_nullFields));//Container
-						v_cse1.done;
-						
-						if(getverdict == pass){
-							v_requestPrimitive := f_getRequestPrimitive(v_cse1);
-							if(ispresent(v_requestPrimitive.primitiveContent)) {
-								if(ischosen(v_requestPrimitive.primitiveContent.containerAnnc)) {
-									if(ispresent(v_requestPrimitive.primitiveContent.containerAnnc.maxByteSize)){
-										setverdict(fail, __SCOPE__ & ": Error: maxByteSize attribute is not set to NULL");
-									}
-								}
-							}
+					v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest); // Update request
+					
+					if(vc_ae2.running) {
+						vc_ae2.stop;
+					};
+			
+					// Test Body
+					vc_ae2.start(f_cse_notifyProcedure_representationHandler(v_contentResponse)); // check if the notification is well received and if its content matchs
+					
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
+					tc_ac.start;
+					alt {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
+							tc_ac.stop;
+							setverdict(pass, __SCOPE__ & ": Attribute of resource type int2 (Ae) updated successfully");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Wrong response status code");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Error while updating resource type int2 (Ae)");
+						}
+						[] tc_ac.timeout {
+							setverdict(fail, __SCOPE__ & ": No answer while updating resource type int2 (Ae) or None notification received");
+						}
+					}	
+					
+					f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
 
-						}	
-						
-					}
+					//Postamble
+					f_cse_postamble_deleteResources();
 
-					testcase TC_CSE_ANNC_UPD_012_GRP_MT() runs on Tester system CseSystem {
-						// Local variables
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var template RequestPrimitive v_createRequest := m_createGroupBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
-						var template RequestPrimitive v_updateRequest := m_updateGroupBase;	
-						var template RequestPrimitive v_updateRequestAnnc := mw_updateGroupAnnc;
-						var RequestPrimitive v_requestPrimitive;	
-						var MemberType v_memberType := int3;
-						var AttributeAux_list v_nullFields;
-						var ListOfNCNames v_announcedAttribute := {"ToBeDeleted"};
+					//Tear down
+					f_cf01Down();
 
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
-						v_createRequest.primitiveContent.group_.memberType := v_memberType;
-						v_createRequest.primitiveContent.group_.announcedAttribute := {"mt"};
+				} // end TC_CSE_SUB_UPD_009
 
-						v_createRequestAnnc.primitiveContent.groupAnnc.memberType := v_memberType;
 
-						v_updateRequest.primitiveContent.group_.announcedAttribute := v_announcedAttribute;
-						v_nullFields := {{"announcedAttribute", omit}};
-  
-						v_cse1.start(f_CSE_ANNC_UPD_012(int9, v_createRequest, v_createRequestAnnc, v_updateRequest, v_updateRequestAnnc, v_nullFields));//Group
-						v_cse1.done;
-						
-						if(getverdict == pass){
-							v_requestPrimitive := f_getRequestPrimitive(v_cse1);
-							if(ispresent(v_requestPrimitive.primitiveContent)) {
-								if(ischosen(v_requestPrimitive.primitiveContent.groupAnnc)) {
-									if(ispresent(v_requestPrimitive.primitiveContent.groupAnnc.memberType)){
-										setverdict(fail, __SCOPE__ & ": Error: memberType attribute is not set to NULL");
-									}
-								}
-							}
 
-						}	
-					}
+			}//end group Update
+			
+			group Delete {
+				
+				/**
+				 * @desc Check that the IUT sends a Notify request to the subscriber resource when eventType attribute is set to "Delete_of_Resource"  and an delete operation has been performed the subscribed-to resource
+				 * 
+				 */
+				testcase TC_CSE_SUB_DEL_002() runs on Tester system CseSystem {
 					
-					testcase TC_CSE_ANNC_UPD_012_TS_MBS() runs on Tester system CseSystem {
-						// Local variables
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
-						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;	
-						var template RequestPrimitive v_updateRequestAnnc := mw_updateTimeSeriesAnnc;
-						var RequestPrimitive v_requestPrimitive;	
-						var XSD.NonNegativeInteger v_maxByteSize := 512;
-						var AttributeAux_list v_nullFields;
-						var ListOfNCNames v_announcedAttribute := {"ToBeDeleted"};
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
-						v_createRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize;
-						v_createRequest.primitiveContent.timeSeries.announcedAttribute := {"mbs"};	
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+																
+					v_ae1.start(f_CSE_SUB_DEL_002());
+													  	  	
+					v_ae1.done;
+													  	  		
+				}
+															
+				function f_CSE_SUB_DEL_002() runs on AeSimu {
+					// Local variables
+					var MsgIn v_response;
+					var integer v_aeIndex := -1;
+					var integer v_subscriptionResourceIndex := -1;
+					var template RequestPrimitive v_createRequest := omit; 
+					var template PrimitiveContent v_notificationContent;
+					var RequestPrimitive v_deleteRequest;
+					var integer v_ae2Index := -1;
+				
+					// Test control
 
-						v_createRequestAnnc.primitiveContent.timeSeriesAnnc.maxByteSize := v_maxByteSize;
-	
-						v_updateRequest.primitiveContent.timeSeries.announcedAttribute := v_announcedAttribute;
-						v_nullFields := {{"announcedAttribute", omit}};
-  
-						v_cse1.start(f_CSE_ANNC_UPD_012(int29, v_createRequest, v_createRequestAnnc, v_updateRequest, v_updateRequestAnnc, v_nullFields));//TimeSeries
-						v_cse1.done;
-	
-						if(getverdict == pass){
-							v_requestPrimitive := f_getRequestPrimitive(v_cse1);
-							if(ispresent(v_requestPrimitive.primitiveContent)) {
-								if(ischosen(v_requestPrimitive.primitiveContent.timeSeriesAnnc)) {
-									if(ispresent(v_requestPrimitive.primitiveContent.timeSeriesAnnc.maxByteSize)){
-										setverdict(fail, __SCOPE__ & ": Error: maxByteSize attribute is not set to NULL");
-									}
-								}
-							}
+					// Test component configuration
+					f_cf01Up(true);
 
-						}	
-	
-					}
+					// Test adapter configuration
 
-				}// end group g_CSE_ANNC_UPD_012
-				
-				group g_CSE_ANNC_UPD_013{
-	
-					/**
-					 * @desc Check that the IUT provides confirmation of the de-announcement of an attribute to the originator of the initiating request after a successful attribute de-announcement procedure
-					 *  
-					 */
-					testcase TC_CSE_ANNC_UPD_013_CNT_MBS() runs on Tester system CseSystem {
-						// Local variables
-						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 ResponsePrimitive v_responsePrimitive;	
-						var AttributeAux_list v_nullFields;
-						var ListOfNCNames v_announcedAttribute := {"ToBeDeleted"};
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-						var XSD.NonNegativeInteger v_maxByteSize := 512;
-	  
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
-						v_createRequest.primitiveContent.container.maxByteSize := v_maxByteSize;
-						v_createRequest.primitiveContent.container.announcedAttribute := {"mbs"};
-		
-						v_updateRequest.primitiveContent.container.announcedAttribute := v_announcedAttribute;
-						v_nullFields := {{"announcedAttribute", omit}};
-	  
-						v_ae1.start(f_CSE_ANNC_UPD_013(int3, v_createRequestAnnc, v_createRequest, v_updateRequest, v_nullFields));//Container
-						v_ae1.done;
-	
-						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: announcedAttribute attribute is not set to NULL");
-									}
-								}
-							}
-			
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
-	
-							//Check that the resource has been udpated correctly
-							if(ischosen(v_primitiveContentRetrieveResource.container)) {
-								if(ispresent(v_primitiveContentRetrieveResource.container.announcedAttribute)){
-									setverdict(fail, __SCOPE__ & ": Error: announcedAttribute attribute not updated correctly");
-								}
-							}
-						}	
+					// Preamble
+					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
 					
-					}
-	
-					testcase TC_CSE_ANNC_UPD_013_GRP_MT() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template RequestPrimitive v_createRequest := m_createGroupBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
-						var template RequestPrimitive v_updateRequest := m_updateGroupBase;	
-						var ResponsePrimitive v_responsePrimitive;	
-						var AttributeAux_list v_nullFields;
-						var ListOfNCNames v_announcedAttribute := {"ToBeDeleted"};
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-						var MemberType v_memberType := int3;
-	  
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
-						v_createRequest.primitiveContent.group_.memberType := v_memberType;
-						v_createRequest.primitiveContent.group_.announcedAttribute := {"mt"};
-		
-						v_updateRequest.primitiveContent.group_.announcedAttribute := v_announcedAttribute;
-						v_nullFields := {{"announcedAttribute", omit}};
-	  
-						v_ae1.start(f_CSE_ANNC_UPD_013(int9, v_createRequestAnnc, v_createRequest, v_updateRequest, v_nullFields));//Group
-						v_ae1.done;
-	
-						if(getverdict == pass){
-							v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							if(ispresent(v_responsePrimitive.primitiveContent)) {
-								if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
-									if(ispresent(v_responsePrimitive.primitiveContent.group_.announcedAttribute)){
-										setverdict(fail, __SCOPE__ & ": Error: announcedAttribute attribute is not set to NULL");
-									}
-								}
-							}
-			
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
-	
-							//Check that the resource has been udpated correctly
-							if(ischosen(v_primitiveContentRetrieveResource.group_)) {
-								if(ispresent(v_primitiveContentRetrieveResource.group_.announcedAttribute)){
-									setverdict(fail, __SCOPE__ & ": Error: announcedAttribute attribute not updated correctly");
-								}
-							}
-						}	
+					v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, m_eventNotificationCriteria({int2}, -), omit, omit, omit, omit, -, omit);
+					
+					f_cse_preamble_subscriptionVerification(v_ae2Index, v_createRequest, int23);
+								
+					v_subscriptionResourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex );//Subscription
+					
+					if(vc_ae2.running) {
+						vc_ae2.stop;
+					};
+
+					//Test Body
+					v_notificationContent := {aE:= mw_contentAeBase}; // all attributes expected;
+					
+					vc_ae2.start(f_cse_notifyProcedure_representationHandler(v_notificationContent)); // check if the notification is well received and if its content matchs
+					
+					v_deleteRequest:= valueof(m_delete(f_getResourceAddress(v_aeIndex), f_getOriginator(v_aeIndex))); // Ae delete request
+										
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_deleteRequest)));
+					tc_ac.start;
+					alt {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) -> value v_response {
+							tc_ac.stop;
+							//Update vc_resourcesIndexToBeDeleted 
+							f_removeElementFromList (vc_resourcesIndexToBeDeleted, v_aeIndex);
+							setverdict(pass, __SCOPE__ & ": resource type int2 (AE) deleted successfully");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Wrong response status code");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Error while deleting resource type int2 (AE)");
+						}
+						[] tc_ac.timeout {
+							setverdict(fail, __SCOPE__ & ": No answer while deleting resource type int2 (AE)");
+						}
 					}
 					
-					testcase TC_CSE_ANNC_UPD_013_TS_MBS() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
-						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;	
-						var ResponsePrimitive v_responsePrimitive;	
-						var AttributeAux_list v_nullFields;
-						var ListOfNCNames v_announcedAttribute := {"ToBeDeleted"};
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-						var XSD.NonNegativeInteger v_maxByteSize := 512;
-  
+					f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
+
+					//Postamble
+					f_cse_postamble_deleteResources();
+
+					//Tear down
+					f_cf01Down();
+
+				} // end TC_CSE_SUB_DEL_002
+									
+				/**
+				 * @desc Check that the IUT sends a Notify request to the subscriber resource when eventType attribute is set to "Delete_of_Direct_Child_Resource"  and an delete operation has been performed on a child resource of the subscribed-to resource
+				 *  
+				 */
+				testcase TC_CSE_SUB_DEL_003() runs on Tester system CseSystem {
+					
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
-						v_createRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize;
-						v_createRequest.primitiveContent.timeSeries.announcedAttribute := {"mbs"};
+																
+					v_ae1.start(f_CSE_SUB_DEL_003());
+													  	  	
+					v_ae1.done;
+													  	  		
+				}
+															
+				function f_CSE_SUB_DEL_003() runs on AeSimu {
+					// Local variables
+					var MsgIn v_response;
+					var integer v_aeIndex := -1;
+					var integer v_subscriptionResourceIndex := -1;
+					var integer v_containerResourceIndex := -1;
+					var template RequestPrimitive v_createRequest := omit;
+					var RequestPrimitive v_deleteRequest;
+					var template PrimitiveContent v_notificationContent;
+					var integer v_ae2Index := -1;
 
-						v_updateRequest.primitiveContent.container.announcedAttribute := v_announcedAttribute;
-						v_nullFields := {{"announcedAttribute", omit}};
-  
-						v_ae1.start(f_CSE_ANNC_UPD_013(int29, v_createRequestAnnc, v_createRequest, v_updateRequest, v_nullFields));//TimeSeries
-						v_ae1.done;
+					// Test component configuration
+					f_cf01Up(true);
 
-						if(getverdict == pass){
-							v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							if(ispresent(v_responsePrimitive.primitiveContent)) {
-								if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
-									if(ispresent(v_responsePrimitive.primitiveContent.timeSeries.announcedAttribute)){
-										setverdict(fail, __SCOPE__ & ": Error: announcedAttribute attribute is not set to NULL");
-									}
-								}
-							}
+					// Test adapter configuration
 
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+					// Preamble
+					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi;
 
-							//Check that the resource has been udpated correctly
-							if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
-								if(ispresent(v_primitiveContentRetrieveResource.timeSeries.announcedAttribute)){
-									setverdict(fail, __SCOPE__ & ": Error: announcedAttribute attribute not updated correctly");
-								}
-							}
-						}	
+					v_containerResourceIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);//Container
+					
+					v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, m_eventNotificationCriteria({int4}, -), omit, omit, omit, omit, -, omit);
+					
+					f_cse_preamble_subscriptionVerification(v_ae2Index, v_createRequest, int23);
+					
+					v_subscriptionResourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex);//Subscription (with name attribute omitted) 									
+					
+					if(vc_ae2.running) {
+						vc_ae2.stop;
+					};
 
-					}
-	
-				}// end group g_CSE_ANNC_UPD_013
-				
-				group g_CSE_ANNC_UPD_014{
+					//Test Body
+					v_notificationContent := {container := mw_contentContainer_rc1}; // all attributes expected;
 					
-					/**
-					 * @desc Host CSE of original resource removes an announcement target CSE from the announceTo attribute if it does not return successful CREATE response for the announced resource (for an UPDATE initiating resource announcement)
-					 *  
-					 */
-					testcase TC_CSE_ANNC_UPD_014_CNT() runs on Tester system CseSystem {
-						// Local variables
-						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 ResponsePrimitive v_responsePrimitive;	
-						 
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_updateRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
-  
-						v_ae1.start(f_CSE_ANNC_UPD_014(int3, v_createRequestAnnc, v_createRequest, v_updateRequest));//Container
-						v_ae1.done;
-						
-						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: announcedAttribute attribute is not set to NULL");
-								}
-							}
+					vc_ae2.start(f_cse_notifyProcedure_representationHandler(v_notificationContent)); // check if the notification is well received and if its content matchs
+					
+					v_deleteRequest := valueof(m_delete(f_getResourceAddress(v_containerResourceIndex), f_getOriginator(v_containerResourceIndex)));// Container deletion request
+										
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_deleteRequest)));
+					tc_ac.start;
+					alt {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) -> value v_response {
+							tc_ac.stop;
+							setverdict(pass, __SCOPE__ & ": Container resource deleted successfully");
 						}
-					}
-				  }
-				} //end group g_CSE_ANNC_UPD_014
-			}//end group Update
-			
-			group Delete{
-				
-				group g_CSE_ANNC_DEL_001{
-		
-					/**
-					 * @desc Check that the IUT provides confirmation of resource de-announcement to the originator of the initiating request after a successful resource de-announcement procedure (for a DELETE initiating resource de-announcement)
-					 *  
-					 */
-					testcase TC_CSE_ANNC_DEL_001_ACP() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template RequestPrimitive v_createRequest := m_createAcpBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
-  
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
-  
-						v_ae1.start(f_CSE_ANNC_DEL_001(int1, v_createRequestAnnc, v_createRequest));//AccessControlPolicy
-						v_ae1.done;
-					}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Wrong response status code");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Error while deleting resource type int3 (Container)");
+						}
+						[] tc_ac.timeout {
+							setverdict(fail, __SCOPE__ & ": No answer while deleting resource type int3 (Container)");
+						}
+					}	
 
-					testcase TC_CSE_ANNC_DEL_001_CNT() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template RequestPrimitive v_createRequest := m_createContainerBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
-  
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
-  
-						v_ae1.start(f_CSE_ANNC_DEL_001(int3, v_createRequestAnnc, v_createRequest));//Container
-						v_ae1.done;
-					}
+					f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
 
-					testcase TC_CSE_ANNC_DEL_001_GRP() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template RequestPrimitive v_createRequest := m_createGroupBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
-  
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
-  
-						v_ae1.start(f_CSE_ANNC_DEL_001(int9, v_createRequestAnnc, v_createRequest));//Group
-						v_ae1.done;
-					}
-					
-					testcase TC_CSE_ANNC_DEL_001_TS() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
-  
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
-  
-						v_ae1.start(f_CSE_ANNC_DEL_001(int29, v_createRequestAnnc, v_createRequest));//TimeSeries
-						v_ae1.done;
-					}
+					//Postamble
+					f_cse_postamble_deleteResources();
+
+					//Tear down
+					f_cf01Down();
 
-				}// end group g_CSE_ANNC_DEL_001
+				} // end TC_CSE_SUB_DEL_003
+				
+			}//end group Delete
+			
+		}//end group Subscription_And_Notification
+		
+		group Security {
+	
+			group Access_Control_Policy {
+				
+				group Create {
 	
-				group g_CSE_ANNC_DEL_002{
+				}// end of group Create
+			
+				group Update {
+				
+				}// end of group Update
+				
+				group Basic_Operations {
+				
+				}// end of Basic_Operations
+				
+			}//end group AccessControlPolicy
+			
+		}//end group Security
 		
-					/**
-					 * @desc Check that the IUT deletes all announced resources when the original resource is deleted.
-					 *  
-					 */
-					testcase TC_CSE_ANNC_DEL_002_ACP() runs on Tester system CseSystem {
-						// Local variables
-						var MnCseSimu v_cse1 := MnCseSimu.create("CSE1") alive;
-						var template RequestPrimitive v_createRequest := m_createAcpBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
-  
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
-  
-						v_cse1.start(f_CSE_ANNC_DEL_002(int1, v_createRequestAnnc, v_createRequest));//AccessControlPolicy
-						v_cse1.done;
-					}
+		group Announcement {
+			
+			group Basic {
 		
-					testcase TC_CSE_ANNC_DEL_002_CNT() runs on Tester system CseSystem {
-						// Local variables
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var template RequestPrimitive v_createRequest := m_createContainerBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
-  
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
-  
-						v_cse1.start(f_CSE_ANNC_DEL_002(int3, v_createRequestAnnc, v_createRequest));//Container
-						v_cse1.done;
-					}
 		
-					testcase TC_CSE_ANNC_DEL_002_GRP() runs on Tester system CseSystem {
-						// Local variables
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var template RequestPrimitive v_createRequest := m_createGroupBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
-  
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
-  
-						v_cse1.start(f_CSE_ANNC_DEL_002(int9, v_createRequestAnnc, v_createRequest));//Group
-						v_cse1.done;
-					}
-					
-					testcase TC_CSE_ANNC_DEL_002_TS() runs on Tester system CseSystem {
-						// Local variables
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						
-						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
-						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
-  
-						v_cse1.start(f_CSE_ANNC_DEL_002(int29, v_createRequestAnnc, v_createRequest));//TimeSeries
-						v_cse1.done;
-					}
+			}//end group Basic
+			
+			group Create {
+				
+			} //end group Create
+			
+			group Retrieve {
+				
+				
+			} //end group Retrieve
+			
+			group Update{
 
-				}// end group g_CSE_ANNC_DEL_002
+			}//end group Update
+			
+			group Delete{
+				
 			}//end group Delete
 			
 		}//end group Announcement
@@ -13496,404 +4168,6 @@ module OneM2M_Testcases_CSE_Release_2 {
 		group Device_Management {
 			group timeSeries {
 				
-				/**
-				 * @desc Check that the IUT inserts the dataGenerationTime informantion of a missing data point and increases the missingDataCurrentNr attribute when a missing data point is detected
-				 *  
-				 */
-				 testcase TC_CSE_TS_001() runs on Tester system CseSystem {
-					
-					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-					
-					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-					v_ae1.start(f_CSE_TS_001());
-		  	  	
-					v_ae1.done;
-		  	  		
-				}
-				
-				function f_CSE_TS_001() runs on AeSimu return ResponsePrimitive {
-    				
-					// Local variables
-					var MsgIn v_response;
-					var RequestPrimitive v_request;
-					var integer v_aeIndex := -1;
-					var integer v_resourceIndex := -1;
-											   
-					// Test control
-    				
-					// Test component configuration
-					f_cf01Up();
-						
-					// Test adapter configuration
-    				
-					// Preamble
-    					
-					v_aeIndex := f_cse_preamble_registerAe();
-					
-					v_resourceIndex := f_cse_createResource(int29, m_createTimeSeries(-, -, 5, -, 2000), v_aeIndex);
-									
-					//Create data points and force a missingDataPoint
-					f_cse_generateMissingDataPoint(v_resourceIndex);
-					// Test Body
-    				mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)))));
-					tc_ac.start;
-					alt {
-						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) -> value v_response {
-							tc_ac.stop;
-							setverdict(pass, __SCOPE__ & ": Response OK for retrieving");
-							if(not(ispresent(v_response.primitive.responsePrimitive.primitiveContent.timeSeries.missingDataList))) {
-								setverdict(fail, __SCOPE__ & ": missingDataList attribute not present");
-							}
-							if(not(ispresent(v_response.primitive.responsePrimitive.primitiveContent.timeSeries.missingDataCurrentNr))) {
-								setverdict(fail, __SCOPE__ & ": missingDataCurrentNr attribute not present");
-							} else {
-								if(v_response.primitive.responsePrimitive.primitiveContent.timeSeries.missingDataCurrentNr != 1) {
-									setverdict(fail, __SCOPE__ & ": missingDataCurrentNr attribute wrong value");
-								}
-							}
-						}
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK())) -> value v_response {
-							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Wrong response status code");
-						}
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
-							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
-						}
-						[] tc_ac.timeout {
-							setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
-						}
-					}	
-    					
-					// Postamble
-					f_cse_postamble_deleteResources();
-						
-					// Tear down
-					f_cf01Down();
-						
-					return vc_response.primitive.responsePrimitive;
-    					    				
-				}//end f_CSE_DMR_TS_001
-					
-				/**
-				 * @desc Check that the IUT removes the oldest element in MissingDataList when MissingDataCurrentNr reaches MissingDataMaxNr to enable insertion of a new missing data point
-				 *  
-				 */
-				 testcase TC_CSE_TS_002() runs on Tester system CseSystem {
-					
-					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-					
-					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-					v_ae1.start(f_CSE_TS_002());
-		  	  	
-					v_ae1.done;
-		  	  		
-				}
-				
-				function f_CSE_TS_002() runs on AeSimu return ResponsePrimitive {
-    				
-					// Local variables
-					var MsgIn v_response;
-					var RequestPrimitive v_request := valueof(m_createTimeSeriesBase);
-					var integer v_aeIndex := -1;
-					var integer v_resourceIndex := -1;
-					var Timestamp v_missingDataPointTimestamp;
-					var XSD.Long v_missingDataPointRel;
-											   
-					// Test control
-    				
-					// Test component configuration
-					f_cf01Up();
-						
-					// Test adapter configuration
-    				
-					// Preamble
-    					
-					v_aeIndex := f_cse_preamble_registerAe();
-					
-					v_resourceIndex := f_cse_createResource(int29, m_createTimeSeries(-, -, 5, 1, 2000), v_aeIndex);
-									
-					//Create data points and force a missingDataPoint
-					f_cse_generateMissingDataPoint(v_resourceIndex);
-					
-					//Retrieve first missing data point
-    				mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)))));
-
-					tc_ac.start;
-					alt {
-						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) -> value v_response {
-							tc_ac.stop;
-							setverdict(pass, __SCOPE__ & ": Response OK for retrieving");
-							if(not(ispresent(v_response.primitive.responsePrimitive.primitiveContent.timeSeries.missingDataList))) {
-								setverdict(inconc, __SCOPE__ & ": missingDataList attribute not present");
-							} else {
-								if(ischosen(v_response.primitive.responsePrimitive.primitiveContent.timeSeries.missingDataList.alt_)) {
-									v_missingDataPointTimestamp := v_response.primitive.responsePrimitive.primitiveContent.timeSeries.missingDataList.alt_[0];
-								} else {
-									v_missingDataPointRel := v_response.primitive.responsePrimitive.primitiveContent.timeSeries.missingDataList.alt_1[0];
-								}
-							}
-							if(not(ispresent(v_response.primitive.responsePrimitive.primitiveContent.timeSeries.missingDataCurrentNr))) {
-								setverdict(inconc, __SCOPE__ & ": missingDataCurrentNr attribute not present");
-							} else {
-								if(v_response.primitive.responsePrimitive.primitiveContent.timeSeries.missingDataCurrentNr != 1) {
-									setverdict(inconc, __SCOPE__ & ": missingDataCurrentNr attribute wrong value");
-								}
-							}
-						}
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK())) -> value v_response {
-							tc_ac.stop;
-							setverdict(inconc, __SCOPE__ & ": Wrong response status code");
-						}
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
-							tc_ac.stop;
-							setverdict(inconc, __SCOPE__ & ": Error while retrieving resource");
-						}
-						[] tc_ac.timeout {
-							setverdict(inconc, __SCOPE__ & ": No answer while retrieving resource");
-						}
-					}	
-					
-					f_checkAeSimuStatus();
-					
-					//Test body
-					//Create data points and force a second missingDataPoint
-					f_cse_generateMissingDataPoint(v_resourceIndex);
-					
-					//Retrieve second missing data point
-					mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)))));
-	
-					tc_ac.start;
-					alt {
-						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) -> value v_response {
-							tc_ac.stop;
-							setverdict(pass, __SCOPE__ & ": Response OK for retrieving");
-							if(not(ispresent(v_response.primitive.responsePrimitive.primitiveContent.timeSeries.missingDataList))) {
-								setverdict(inconc, __SCOPE__ & ": missingDataList attribute not present");
-							} else {
-								if(ischosen(v_response.primitive.responsePrimitive.primitiveContent.timeSeries.missingDataList.alt_)) {
-									if(f_getTime(v_missingDataPointTimestamp) < f_getTime(v_response.primitive.responsePrimitive.primitiveContent.timeSeries.missingDataList.alt_[0])) {
-										setverdict(pass, __SCOPE__ & ": missingData point inserted in missingDataList");
-									} else {
-										setverdict(fail, __SCOPE__ & ": missingData point not inserted in missingDataList");
-									}
-								} else {
-									if(v_missingDataPointRel < v_response.primitive.responsePrimitive.primitiveContent.timeSeries.missingDataList.alt_1[0]) {
-										setverdict(pass, __SCOPE__ & ": missingData point inserted in missingDataList");
-									} else {
-										setverdict(fail, __SCOPE__ & ": missingData point not inserted in missingDataList");
-									}
-								}
-							}
-							if(not(ispresent(v_response.primitive.responsePrimitive.primitiveContent.timeSeries.missingDataCurrentNr))) {
-								setverdict(fail, __SCOPE__ & ": missingDataCurrentNr attribute not present");
-							} else {
-								if(v_response.primitive.responsePrimitive.primitiveContent.timeSeries.missingDataCurrentNr != 1) {
-									setverdict(fail, __SCOPE__ & ": missingDataCurrentNr attribute wrong value");
-								}
-							}
-						}
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK())) -> value v_response {
-							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Wrong response status code");
-						}
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
-							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
-						}
-						[] tc_ac.timeout {
-							setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
-						}
-					}	  
-					// Postamble
-					f_cse_postamble_deleteResources();
-						
-					// Tear down
-					f_cf01Down();
-						
-					return vc_response.primitive.responsePrimitive;
-    					    				
-				}//end f_CSE_DMR_TS_002
-				
-				/**
-				 * @desc Check that the IUT sends a notification with missing data points information when the number of missing data points detected becomes equal to the minimum specified missing number of the Time Series Data specified in missingData condition of the subscription resource
-				 * 
-				 */
-				testcase TC_CSE_TS_003() runs on Tester system CseSystem {
-	
-					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-											
-					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-					v_ae1.start(f_CSE_TS_003());
-								  	  	
-					v_ae1.done;
-								  	  		
-				}
-										
-				function f_CSE_TS_003() runs on AeSimu {
-					// Local variables
-					var integer v_aeIndex := -1;
-					var integer v_timeSeriesIndex := -1;
-					var integer v_subscriptionIndex := -1;
-					var EventNotificationCriteria v_eventNotificationCriteria := valueof(m_eventNotificationCriteria({int1}, -));
-					var template RequestPrimitive v_createRequest := omit;
-					var RequestPrimitive v_request;
-					var integer v_ae2Index := -1;
-					var XSD.NonNegativeInteger v_missingDataPointNumber := 1;
-					var template PrimitiveContent v_contentNotification := {timeSeries := mw_contentTimeSeries(?,v_missingDataPointNumber)}; 
-	
-					v_eventNotificationCriteria.missingData := valueof(m_missingData(v_missingDataPointNumber, "PT0H"));
-
-					// Test control
-
-					// Test component configuration
-					f_cf01Up(true);
-
-					// Test adapter configuration
-
-					// Preamble
-					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-					
-					v_timeSeriesIndex := f_cse_createResource(int29, m_createTimeSeries(-, true, 5, -, 2000), v_aeIndex);//TimeSeries
-	
-					f_cse_preamble_subscriptionVerification(v_ae2Index, v_createRequest, int23);//AE2 registered
-	
-					v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_timeSeriesIndex), -, {f_getResourceAddress(v_aeIndex)}, v_eventNotificationCriteria, omit, omit, omit, omit, omit, omit);
-
-					v_subscriptionIndex := f_cse_createResource(int23, v_createRequest, v_timeSeriesIndex);//Subscription under TimeSeries
-	
-					if(vc_ae2.running) {
-						vc_ae2.stop;
-					};
-
-					// Test Body
-					
-					//Create data points and force a missingDataPoint
-					vc_ae2.start(f_cse_generateMissingDataPoint(v_timeSeriesIndex)); 	
-					vc_ae2.done;				
-
-					f_cse_notifyProcedure_representationHandler(v_contentNotification);
-
-					//Postamble
-					f_cse_postamble_deleteResources();
-	
-					//Tear down
-					f_cf01Down();
-
-				} // end f_CSE_TS_003
-				
-				/**
-				 * @desc Check that the IUT does not send notification when the total number of missing data points does not exceed the minimum specified missing number of the Time Series Data specified in missingData condition of the subscription resource during the window duration specified in the same missingData condition
-				 * 
-				 */
-				testcase TC_CSE_TS_004() runs on Tester system CseSystem {
-
-					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-							
-					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-					v_ae1.start(f_CSE_TS_004());
-				  	  	
-					v_ae1.done;
-				  	  		
-				}
-						
-				function f_CSE_TS_004() runs on AeSimu {
-					// Local variables
-					var integer v_aeIndex := -1;
-					var integer v_timeSeriesIndex := -1;
-					var integer v_subscriptionIndex := -1;
-					var EventNotificationCriteria v_eventNotificationCriteria := valueof(m_eventNotificationCriteria({int1}, -));
-					var template RequestPrimitive v_createRequest := omit;
-					var ResponsePrimitive v_responsePrimitive;
-					var integer v_ae2Index := -1;
-					var XSD.NonNegativeInteger v_missingDataPointNumber := 100;
-					var template PrimitiveContent v_contentResponse;
-
-					v_eventNotificationCriteria.missingData := valueof(m_missingData(v_missingDataPointNumber, "PT0H"));
-
-					// Test control
-
-					// Test component configuration
-					f_cf01Up(true);
-
-					// Test adapter configuration
-
-					// Preamble
-					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-	
-					v_timeSeriesIndex := f_cse_createResource(int29, m_createTimeSeries(-, true, 5, -, 2000), v_aeIndex);//TimeSeries
-
-					f_cse_preamble_subscriptionVerification(v_ae2Index, v_createRequest, int23);//AE2 registered
-
-					v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_timeSeriesIndex), -, {f_getResourceAddress(v_aeIndex)}, v_eventNotificationCriteria, omit, omit, omit, omit, omit, omit);
-
-					v_subscriptionIndex := f_cse_createResource(int23, v_createRequest, v_timeSeriesIndex);//Subscription under TimeSeries
-
-					if(vc_ae2.running) {
-						vc_ae2.stop;
-					};
-
-					// Test Body
-	
-					//Create data points and force a missingDataPoint
-					vc_ae2.start(f_cse_generateMissingDataPoint(v_timeSeriesIndex)); 	
-					vc_ae2.done;				
-
-					tc_ac.start;
-					alt {
-						[] mcaPortIn.receive(mw_request(mw_notifyNotification(?))){
-							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ":ERROR: Notification received");
-							//Send response in any case
-							v_responsePrimitive := valueof(m_responseNotification(int2000, omit));
-							v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
-							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
-						}
-						[] tc_ac.timeout {
-							setverdict(pass, __SCOPE__ & ": Notification not received");
-						}
-					}	
-					
-					//Check if the IUT restarts missing data point counter and timer
-					mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_timeSeriesIndex), f_getOriginator(v_timeSeriesIndex)))));
-					
-					v_contentResponse.timeSeries := mw_contentTimeSeries_rc1;
-					v_contentResponse.timeSeries.missingDataCurrentNr := 0;
-
-					tc_ac.start;
-					alt {
-						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, v_contentResponse))){
-							tc_ac.stop;
-							setverdict(pass, __SCOPE__ & ": Response OK for retrieving. MissingDataCurrentNr has been restarted");
-						}
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(v_contentResponse))){
-							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Wrong response status code");
-						}
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)){
-							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Error, resource elements provided not matching expected resource elements");
-						}
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)){
-							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
-						}
-						[] tc_ac.timeout {
-							setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
-						}
-					}					
-
-					//Postamble
-					f_cse_postamble_deleteResources();
-
-					//Tear down
-					f_cf01Down();
-
-				} // end f_CSE_TS_004
 				
 			}//end group timeSeries
 			
diff --git a/OneM2M_Testcases_CSE_Release_3.ttcn b/OneM2M_Testcases_CSE_Release_3.ttcn
new file mode 100644
index 0000000000000000000000000000000000000000..286da5c8eb546520739714e8d04b668f36e5c4fd
--- /dev/null
+++ b/OneM2M_Testcases_CSE_Release_3.ttcn
@@ -0,0 +1,10175 @@
+/**
+ *  Copyright Notification
+ *  No part of this document may be reproduced, in an electronic retrieval system or otherwise, except as authorized by written permission.
+ *  The copyright and the foregoing restriction extend to reproduction in all media.
+ *  © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
+ *  All rights reserved.
+ *  
+ *  @author     ETSI
+ *  @version    $URL: https://oldforge.etsi.org/svn/oneM2M/branches/Release1/ttcn/OneM2M_Testcases.ttcn $
+ *              $Id: OneM2M_Testcases.ttcn 347 2017-08-11 08:48:20Z reinaortega $
+ *  @desc       Module containing test cases for oneM2M
+ *
+ */
+module OneM2M_Testcases_CSE_Release_3 {
+
+	import from OneM2M_TestSystem all;
+	import from OneM2M_Templates all;
+	import from OneM2M_Types all;//{type XSD.ID};
+	import from OneM2M_TypesAndValues all;
+	import from OneM2M_Pixits all;
+	import from LibCommon_Time all;
+	import from OneM2M_Pics all;
+	import from OneM2M_Functions all;
+	import from OneM2M_PermutationFunctions all;
+	import from XSD all;
+	
+	//Demos used for validation purposes
+	group oneM2M_demos {
+	
+		group helpingTestCases {//These are not part of the test suite, just for verification purposes
+			
+			testcase TC_DELETE_RESOURCES() runs on AeSimu system CseSystem {
+				
+				timer t_ac := 5.0;
+				var integer i; 
+				var XSD.ID v_resourceAddress;
+				var RequestPrimitive v_request;
+				map(self:mcaPort, system:mcaPort); 
+					
+				for (i:=0; i<lengthof(PX_RESOURCES_TO_BE_DELETED); i:= i+1) {  
+					
+					v_resourceAddress := f_getResourceAddress() & "/" & PX_RESOURCES_TO_BE_DELETED[i]; 
+						
+					v_request := valueof(m_delete(v_resourceAddress, PX_SUPER_AE_ID));
+					    
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
+					
+					t_ac.start;
+					alt {
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
+							t_ac.stop;
+							log(__SCOPE__ & ":Resource deleted");
+							setverdict(pass);
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
+							t_ac.stop;
+							log(__SCOPE__ & ":Error while deleting resource");
+							setverdict(fail);
+						}
+						[] mcaPort.receive {
+							t_ac.stop;
+							log(__SCOPE__ & ":Unexpected message received");
+							setverdict(inconc);
+						}
+						[] t_ac.timeout {
+							log(__SCOPE__ & ":No answer while deleting resource");
+							setverdict(inconc);
+						}	
+					}	
+				}
+			
+				unmap(self:mcaPort, system:mcaPort); 
+				stop;
+			}	
+		
+		}//end group helpingTestCases
+	
+	}//end group oneM2M_demos
+	
+	group CSE {
+		
+		group Generic {
+			
+			group Create {
+				
+			} // end of group Create
+			
+			group Retrieve {
+			} // end of group Retrieve
+			
+			group Update {
+			} // end of group Update
+			
+			group Delete {
+			} // end of group Delete
+		
+		} // end of group Generic
+		
+		group Registration {
+			
+			group Create{
+				
+				/**
+				  * @desc Check that the IUT accepts an AE registration with the optional attribute OPTIONAL_ATTRIBUTE provided   
+				  * 
+				 */
+				group g_CSE_REG_CRE_012 {
+					
+					testcase TC_CSE_REG_CRE_012_AE_NL() runs on Tester system CseSystem {
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_create.primitiveContent.aE.nodeLink := "http://127.0.0.1/";
+						v_ae1.start(f_CSE_REG_CRE_012(v_create));
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_REG_CRE_012_AE_OR() runs on Tester system CseSystem {
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_create.primitiveContent.aE.ontologyRef := "MyOntologyRef";
+						v_ae1.start(f_CSE_REG_CRE_012(v_create));
+						v_ae1.done;
+					}
+				
+				}
+				
+				
+				
+				
+				/*testcase TC_CSE_REG_CRE_029() runs on CseSimu system CseSystem {
+  
+					var MsgIn v_response;
+					
+					var RequestPrimitive v_request;
+					var RequestPrimitive v_createRequestPrimitive := valueof(m_createRemoteCSEBase);
+					var ResourceType v_resourceType := int16;
+	
+					// Test control
+	
+					// Test component configuration
+					f_cf04Up();
+	
+					// Test adapter configuration
+	
+					// Preamble
+					v_request := f_getCreateRequestPrimitive(v_resourceType, v_createRequestPrimitive, -1);
+	
+					tc_ac.start;
+					alt {
+						[] mccPort.receive(mw_request(mw_createRemoteCSE(PX_CSE_ID,f_getResourceAddress(-1)))) -> value v_response {
+							tc_ac.stop;
+							setverdict(pass, __SCOPE__ & ": Resource type remoteCSE created successfully");
+						}
+						[] mccPort.receive {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Error while creating resource type remoteCSE");
+						}
+						[] tc_ac.timeout {
+							setverdict(fail, __SCOPE__ & ": No answer while creating resource type remoteCSE");
+						}
+					}	
+	
+					// Postamble
+					f_cse_postamble_deleteResourcesCSE();
+	
+					// Tear down
+					f_cf04Down();
+	
+				}*/
+				
+								/**
+				 * @desc Check that the IUT rejects the create request of <CSEBase> resource.
+				 * 
+				 
+				testcase TC_CSE_REG_CRE_027() runs on AeSimu system CseSystem {
+	
+					// Local variables
+					var RequestPrimitive v_request;
+					var integer v_cseBaseIndex := -1;
+					var ResourceType v_resourceType := int2;
+		   
+					// Test control
+
+					// Test component configuration
+					f_cf02Up();
+
+					// Test adapter configuration
+
+					// Preamble
+					vc_cse1.start(f_cse_registrationRemoteCse(mw_createRemoteCSE));
+
+					// Test Body
+					f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, omit));
+	
+					tc_ac.start;
+					alt {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) {
+							tc_ac.stop;
+							setverdict(pass, __SCOPE__ & ": AE creation successful.");
+						}
+						[] mcaPort.receive {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Error while creating AE");
+						}
+						[] tc_ac.timeout {
+							setverdict(fail, __SCOPE__ & ": No answer while creating AE");
+						}
+					}	
+
+					// Postamble
+					f_cse_postamble_deleteResources();
+
+					// Tear down
+					f_cf02Down();
+
+				}end TC_CSE_REG_CRE_027*/
+				
+				
+				
+				
+			
+			}	//end group Create
+			
+			group Retrieve{
+				
+				
+				/**
+				 * @desc Check that the IUT accepts a retrieval request of <AE> resource with optional ATTRIBUTE
+				 * 
+				 */
+				 
+				group g_CSE_REG_RET_004 {
+					
+					testcase TC_CSE_REG_RET_004_NL() runs on Tester system CseSystem {
+						//Local variables
+						 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						 var template RequestPrimitive v_createRequest := m_createAe(PX_APP_ID);
+						 var template PrimitiveContent v_contentResponse;
+						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						 v_createRequest.primitiveContent.aE.nodeLink := "http://127.0.0.1/";
+
+						 v_contentResponse.aE := mw_contentAeBase;
+						 v_contentResponse.aE.nodeLink := ?;
+
+						 v_ae1.start(f_CSE_REG_RET_004(v_createRequest,v_contentResponse));
+						 v_ae1.done;
+					}
+					
+					testcase TC_CSE_REG_RET_004_CSZ() runs on Tester system CseSystem {
+						//Local variables
+						 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						 var template RequestPrimitive v_createRequest := m_createAe(PX_APP_ID);
+						 var template PrimitiveContent v_contentResponse;
+						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						 v_createRequest.primitiveContent.aE.contentSerialization := {applicationxml};
+
+						 v_contentResponse.aE := mw_contentAeBase;
+						 v_contentResponse.aE.contentSerialization := ?; 
+
+						 v_ae1.start(f_CSE_REG_RET_004(v_createRequest,v_contentResponse));
+						 v_ae1.done;
+					}
+	
+				} //end g_CSE_REG_RET_004
+				
+			}//end group Retrieve
+			
+			group Update{
+			
+				
+			}// end group Update
+			
+			group Delete{
+			
+				
+				
+			
+			}// end group Delete
+	  	  	
+		}//end Registration
+		
+		group Data_Management_and_Repository {
+									
+			group Create {
+				
+				group g_CSE_DMR_CRE_001 {
+					
+					/**
+					 * @desc Check that the IUT accepts the creation of a RESOURCE_TYPE resource on the TARGET_RESOURCE_ADDRESS of type PARENT_RESOURCE_TYPE with resource name not provided
+					 * 
+					 */
+					testcase TC_CSE_DMR_CRE_001_SCH_CB() runs on Tester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createScheduleBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						
+						v_createRequest.primitiveContent.schedule.resourceName := omit;
+						v_ae1.start(f_CSE_DMR_CRE_001(int18, v_createRequest, -));//Schedule
+						v_ae1.done;
+						
+						 
+																	
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							if(not ispresent(v_responsePrimitive.primitiveContent.schedule.resourceName)){
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
+							}
+						}
+						
+					}
+					
+					testcase TC_CSE_DMR_CRE_001_SCH_AE() runs on Tester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createScheduleBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						
+						v_createRequest.primitiveContent.schedule.resourceName := omit;
+						v_ae1.start(f_CSE_DMR_CRE_001(int18, v_createRequest, m_createAeAux(omit,omit)));//Schedule
+						v_ae1.done;
+						
+						 
+											
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							if(not ispresent(v_responsePrimitive.primitiveContent.schedule.resourceName)){
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
+							}
+						}
+						
+					}
+				
+					testcase TC_CSE_DMR_CRE_001_SCH_SUB() runs on Tester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createScheduleBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						
+						v_createRequest.primitiveContent.schedule.resourceName := omit;
+						v_ae1.start(f_CSE_DMR_CRE_001(int18, v_createRequest, m_createSubscriptionBase));//Schedule
+						v_ae1.done;
+						
+						 
+																		
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							if(not ispresent(v_responsePrimitive.primitiveContent.schedule.resourceName)){
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
+							}
+						}
+					
+					}
+										
+					testcase TC_CSE_DMR_CRE_001_SUB_SCH() runs on Tester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						
+						v_createRequest.primitiveContent.subscription.resourceName := omit;
+						v_ae1.start(f_CSE_DMR_CRE_001(int23, v_createRequest, m_createScheduleBase));//Subscription
+						v_ae1.done;
+						
+						 
+												
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
+							}
+						}		
+					}
+					
+					testcase TC_CSE_DMR_CRE_001_SUB_GRP() runs on Tester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						
+						v_createRequest.primitiveContent.subscription.resourceName := omit;
+						v_ae1.start(f_CSE_DMR_CRE_001(int23, v_createRequest, m_createGroupBase));//Subscription
+						v_ae1.done;
+						
+						 
+												
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
+							}
+						}		
+					}
+					
+					testcase TC_CSE_DMR_CRE_001_SUB_AEA() runs on Tester system CseSystem {
+						//Local variables
+						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var RequestPrimitive v_createAEAnnc := valueof(m_createAEAnnc(omit, omit, omit, PX_CSE1_ID));
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+	
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						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;	 
+							
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_cse1);
+							if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
+								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+							}
+						}		
+					}
+					
+					testcase TC_CSE_DMR_CRE_001_CNT_AEA() runs on Tester system CseSystem {
+						//Local variables
+						var template RequestPrimitive v_createRequest := m_createContainerBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var RequestPrimitive v_createAEAnnc := valueof(m_createAEAnnc(omit, omit, omit, PX_CSE1_ID));
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						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;	 
+		
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_cse1);
+							if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
+								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+							}
+						}		
+						
+					}
+					
+					testcase TC_CSE_DMR_CRE_001_GRP_AEA() runs on Tester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createGroupBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var RequestPrimitive v_createAEAnnc := valueof(m_createAEAnnc(omit, omit, omit, PX_CSE1_ID));
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						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;
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_cse1);
+							if(not ispresent(v_responsePrimitive.primitiveContent.group_.resourceName)){
+								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+							}
+						}		
+					}
+					
+					testcase TC_CSE_DMR_CRE_001_ACP_AEA() runs on Tester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createAcpBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var RequestPrimitive v_createAEAnnc := valueof(m_createAEAnnc(omit, omit, omit, PX_CSE1_ID));
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						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;
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_cse1);
+							if(not ispresent(v_responsePrimitive.primitiveContent.accessControlPolicy.resourceName)){
+								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+							}
+						}		
+					}
+										
+					testcase TC_CSE_DMR_CRE_001_NOD_CB() runs on Tester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createNodeBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						 
+						v_createRequest.primitiveContent.node.resourceName := omit;
+
+						v_ae1.start(f_CSE_DMR_CRE_001(int14, v_createRequest, -));//Node
+						v_ae1.done;	
+												
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							if(not ispresent(v_responsePrimitive.primitiveContent.node.resourceName)){
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
+							}
+						}
+						
+					}
+					
+					testcase TC_CSE_DMR_CRE_001_MGC_CB() runs on Tester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createMgmtCmdBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						
+						v_createRequest.primitiveContent.mgmtCmd.resourceName := omit;
+						v_ae1.start(f_CSE_DMR_CRE_001(int12, v_createRequest, -));//Management Command
+						v_ae1.done;						 
+												
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							if(not ispresent(v_responsePrimitive.primitiveContent.mgmtCmd.resourceName)){
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
+							}
+						}
+						
+					}
+					
+					testcase TC_CSE_DMR_CRE_001_LCP_CB() runs on Tester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createLocationPolicyBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						
+						v_createRequest.primitiveContent.locationPolicy.resourceName := omit;
+						v_ae1.start(f_CSE_DMR_CRE_001(int10, v_createRequest, -));//Location Policy
+						v_ae1.done;
+												
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							if(not ispresent(v_responsePrimitive.primitiveContent.locationPolicy.resourceName)){
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
+							}
+						}
+						
+					}
+					
+					testcase TC_CSE_DMR_CRE_001_STCG_CB() runs on Tester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createStatsConfigBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						
+						v_createRequest.primitiveContent.statsConfig.resourceName := omit;
+						v_ae1.start(f_CSE_DMR_CRE_001(int22, v_createRequest, -));//Stats Config
+						v_ae1.done;
+												
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							if(not ispresent(v_responsePrimitive.primitiveContent.statsConfig.resourceName)){
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
+							}
+						}
+					}
+					
+					testcase TC_CSE_DMR_CRE_001_STCL_CB() runs on Tester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createStatsCollectBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						 
+						v_createRequest.primitiveContent.statsCollect.resourceName := omit;
+						
+						v_ae1.start(f_CSE_DMR_CRE_001(int21, v_createRequest, -));//Stats Collect
+						v_ae1.done;
+												
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							if(not ispresent(v_responsePrimitive.primitiveContent.statsCollect.resourceName)){
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
+							}
+						}
+						
+					}
+					
+					testcase TC_CSE_DMR_CRE_001_MSSP_CB() runs on Tester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createM2mServiceSubscriptionProfileBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						
+						v_createRequest.primitiveContent.m2mServiceSubscriptionProfile.resourceName := omit;
+						v_ae1.start(f_CSE_DMR_CRE_001(int11, v_createRequest, -));//Subscription Profile
+						v_ae1.done;
+												
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							if(not ispresent(v_responsePrimitive.primitiveContent.m2mServiceSubscriptionProfile.resourceName)){
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
+							}
+						}
+						
+					}
+					
+					testcase TC_CSE_DMR_CRE_001_ASAR_CB() runs on Tester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createServiceSubscribedAppRuleBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						 
+						v_createRequest.primitiveContent.serviceSubscribedAppRule.resourceName := omit;
+						v_ae1.start(f_CSE_DMR_CRE_001(int19, v_createRequest, -));//Service Subscribed App
+						v_ae1.done;
+												
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							if(not ispresent(v_responsePrimitive.primitiveContent.serviceSubscribedAppRule.resourceName)){
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
+							}
+						}
+						
+					}
+					
+					testcase TC_CSE_DMR_CRE_001_TS_CB() runs on Tester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+	
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.timeSeries.resourceName := omit;
+						v_ae1.start(f_CSE_DMR_CRE_001(int29, v_createRequest, -));//TimeSeries
+						v_ae1.done; 
+												
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							if(not ispresent(v_responsePrimitive.primitiveContent.timeSeries.resourceName)){
+								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+							}
+						}
+	
+					}
+					
+					testcase TC_CSE_DMR_CRE_001_TS_AE() runs on Tester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;	
+	
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.timeSeries.resourceName := omit;
+
+						v_ae1.start(f_CSE_DMR_CRE_001(int29, v_createRequest, m_createAeAux(omit,omit)));//TimeSeries
+						v_ae1.done;	 
+							
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							if(not ispresent(v_responsePrimitive.primitiveContent.timeSeries.resourceName)){
+								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+							}
+						}
+	
+					}
+					
+					testcase TC_CSE_DMR_CRE_001_TS_CSR() runs on Tester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+	
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_createRequest.primitiveContent.timeSeries.resourceName := omit;
+						v_cse1.start(f_CSE_DMR_CRE_001_cseSimu(int29, v_createRequest, -, -));//TimeSeries
+						v_cse1.done;	 
+							
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_cse1);
+							if(not ispresent(v_responsePrimitive.primitiveContent.timeSeries.resourceName)){
+								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+							}
+						}		
+					}
+					
+					testcase TC_CSE_DMR_CRE_001_TS_AEA() runs on Tester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var RequestPrimitive v_createAEAnnc := valueof(m_createAEAnnc(omit, omit, omit, PX_CSE1_ID));
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						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;
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_cse1);
+							if(not ispresent(v_responsePrimitive.primitiveContent.timeSeries.resourceName)){
+								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+							}
+						}		
+					}
+					
+					testcase TC_CSE_DMR_CRE_001_TSI_TS() runs on Tester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+	
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.timeSeriesInstance.resourceName := omit;
+						v_ae1.start(f_CSE_DMR_CRE_001(int30, v_createRequest, m_createTimeSeriesBase));//TimeSeriesInstance
+						v_ae1.done;	 
+							
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							if(not ispresent(v_responsePrimitive.primitiveContent.timeSeriesInstance.resourceName)){
+								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+							}
+						}
+
+					}
+					
+				} // end g_CSE_DMR_CRE_001
+								
+				group g_CSE_DMR_CRE_002 {
+					
+					/**
+					 * @desc Check that the IUT accepts the creation of a RESOURCE_TYPE resource with a non-existing resource name provided by AE
+					 * 
+					 */
+					testcase TC_CSE_DMR_CRE_002_SCH() runs on Tester system CseSystem {
+						// Local variables
+						var ResponsePrimitive v_responsePrimitive;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+			
+						v_ae1.start(f_CSE_DMR_CRE_002(int18, m_createScheduleBase));//Schedule
+						v_ae1.done;
+						
+						 
+																		
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							if(not ispresent(v_responsePrimitive.primitiveContent.schedule.resourceName)){
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
+							} else {
+								if(v_responsePrimitive.primitiveContent.schedule.resourceName != c_defaultScheduleResourceName){
+									setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not correct");
+								}
+							}
+						}
+					}
+										
+					testcase TC_CSE_DMR_CRE_002_TS() runs on Tester system CseSystem {
+						// Local variables
+						var ResponsePrimitive v_responsePrimitive;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_ae1.start(f_CSE_DMR_CRE_002(int29, m_createTimeSeriesBase));//TimeSeries
+						v_ae1.done;	 
+							
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							if(not ispresent(v_responsePrimitive.primitiveContent.timeSeries.resourceName)){
+								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+							} else {
+								if(v_responsePrimitive.primitiveContent.timeSeries.resourceName != c_defaultTimeSeriesResourceName){
+									setverdict(fail, __SCOPE__, ": Error, resourceName attribute not correct");
+								}
+							}
+						}
+					}
+					
+				}// end group g_CSE_DMR_CRE_002
+				
+				group g_CSE_DMR_CRE_003 {
+					
+					/**
+					 * @desc Check that the IUT rejects the creation of a RESOURCE_TYPE resource with an existing resource name provided by AE
+					 * 
+					 */
+					testcase TC_CSE_DMR_CRE_003_SCH() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+
+						v_ae1.start(f_CSE_DMR_CRE_003(int18, m_createScheduleBase));//Schedule
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_DMR_CRE_003_TS() runs on Tester system CseSystem {
+						// Local variables    
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+
+						v_ae1.start(f_CSE_DMR_CRE_003(int29, m_createTimeSeriesBase));//TimeSeries
+						v_ae1.done;
+					}
+					
+				}// end group g_CSE_DMR_CRE_003
+				
+				group g_CSE_DMR_CRE_004 {
+					
+					/**
+					 * @desc Check that the IUT rejects the creation of a RESOURCE_TYPE resource when AE has no privileges
+					 * 
+					 */
+					testcase TC_CSE_DMR_CRE_004_SCH() runs on Tester system CseSystem {
+						// Local variables
+						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+
+						v_ae1.start(f_CSE_DMR_CRE_004(int18, m_createScheduleBase));//Schedule
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_DMR_CRE_004_TS() runs on Tester system CseSystem {
+						// Local variables
+    
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_ae1.start(f_CSE_DMR_CRE_004(int29, m_createTimeSeriesBase));//TimeSeries
+						v_ae1.done;
+					}
+					
+				}// end group g_CSE_DMR_CRE_004
+				
+				group g_CSE_DMR_CRE_006 {
+					
+					/**
+					 * @desc Check that the IUT returns a default value to RW ATTRIBUTE in the response of a RESOURCE_TYPE resource CREATE Request where no a RW ATTRIBUTE is provided by AE
+					 * 
+					 */
+					testcase TC_CSE_DMR_CRE_006_TS_MNI() runs on Tester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_ae1.start(f_CSE_DMR_CRE_006(int29, v_createRequest));		
+						v_ae1.done;		 
+									
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							if(not ispresent(v_responsePrimitive.primitiveContent.timeSeries.maxNrOfInstances)){
+								setverdict(fail, __SCOPE__, ": Error, maxNrOfInstances attribute not provided");
+							} 
+						}	
+					}
+
+					testcase TC_CSE_DMR_CRE_006_TS_MBS() runs on Tester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_ae1.start(f_CSE_DMR_CRE_006(int29, v_createRequest));
+						v_ae1.done;
+															
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							if(not ispresent(v_responsePrimitive.primitiveContent.timeSeries.maxByteSize)){
+								setverdict(fail, __SCOPE__, ": Error, maxByteSize attribute not provided");
+							} 
+						}	
+  
+								}
+
+					testcase TC_CSE_DMR_CRE_006_TS_MIA() runs on Tester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+			
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_ae1.start(f_CSE_DMR_CRE_006(int29, v_createRequest));
+						v_ae1.done;		 
+									
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							if(not ispresent(v_responsePrimitive.primitiveContent.timeSeries.maxInstanceAge)){
+								setverdict(fail, __SCOPE__, ": Error, maxInstanceAge attribute not provided");
+							} 
+						}	
+					}
+
+				}// end group g_CSE_DMR_CRE_006
+				
+				group g_CSE_DMR_CRE_007 {
+					
+					/**
+					 * @desc Checks that the IUT accepts a newly created RESOURCE_TYPE when the currentNrOfInstances exceeds the field value set in maxNrOfInstances in the PARENT_RESOURCE_TYPE resource by removing enough of the oldest RESOURCE_TYPE resources to allow the creation of the new RESOURCE_TYPE resource
+					 * 
+					 */
+					testcase TC_CSE_DMR_CRE_007_TS_TSI() runs on Tester system CseSystem {
+						//Local variables		
+						var template RequestPrimitive v_createRequestTimeSeries := m_createTimeSeriesBase;
+						var template RequestPrimitive v_createRequestTimeSeriesInstance1 := m_createTimeSeriesInstanceBase;
+						var template RequestPrimitive v_createRequestTimeSeriesInstance2 := m_createTimeSeriesInstanceBase;
+						const integer c_maxNumberOfInstances := 1;	
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequestTimeSeries.primitiveContent.timeSeries.maxNrOfInstances := c_maxNumberOfInstances;
+						v_createRequestTimeSeriesInstance2.primitiveContent.timeSeriesInstance.resourceName := c_defaultTimeSeriesInstanceResourceName & "2";	//Resource 2
+
+						v_ae1.start(f_CSE_DMR_CRE_007(int29, v_createRequestTimeSeries, int30, v_createRequestTimeSeriesInstance1, v_createRequestTimeSeriesInstance2, c_defaultTimeSeriesInstanceResourceName));//TimeSeriesInstance under TimeSeries
+						v_ae1.done;
+					}
+	
+				}// end group g_CSE_DMR_CRE_007
+				
+				group g_CSE_DMR_CRE_008 {
+					
+					/**
+					 * @desc Checks that the IUT accepts a newly created RESOURCE_TYPE when the currentNrOfInstances exceeds the field value set in maxNrOfInstances in the PARENT_RESOURCE_TYPE resource by removing enough of the oldest RESOURCE_TYPE resources to allow the creation of the new RESOURCE_TYPE resource
+					 * 
+					 */
+					testcase TC_CSE_DMR_CRE_008_TS_TSI() runs on Tester system CseSystem {
+						//Local variables		
+						var template RequestPrimitive v_createRequestTimeSeries := m_createTimeSeriesBase;
+						var template RequestPrimitive v_createRequestTimeSeriesInstance1 := m_createTimeSeriesInstanceBase;
+						var template RequestPrimitive v_createRequestTimeSeriesInstance2 := m_createTimeSeriesInstanceBase;
+						const integer c_maxByteSize := 10;	
+						const XSD.String c_primitiveContent1 := "Content1";
+						const XSD.String c_primitiveContent2 := "Content2";		
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequestTimeSeries.primitiveContent.container.maxByteSize := c_maxByteSize;
+						v_createRequestTimeSeriesInstance1.primitiveContent.timeSeriesInstance.content := c_primitiveContent1;	//ContentInstance 1
+						v_createRequestTimeSeriesInstance2.primitiveContent.timeSeriesInstance.content := c_primitiveContent2;	//ContentInstance 2
+						v_createRequestTimeSeriesInstance2.primitiveContent.timeSeriesInstance.resourceName := c_defaultTimeSeriesInstanceResourceName & "2";	//ContentInstance 2
+
+						v_ae1.start(f_CSE_DMR_CRE_008(int29, v_createRequestTimeSeries, int30, v_createRequestTimeSeriesInstance1, v_createRequestTimeSeriesInstance2, c_defaultTimeSeriesInstanceResourceName));//TimeSeriesInstance under TimeSeries
+						v_ae1.done;
+					}
+
+				}// end group g_CSE_DMR_CRE_008
+				
+				group g_CSE_DMR_CRE_012 {
+					
+					/**
+					 * @desc Check that the IUT accepts the creation of a RESOURCE_TYPE resource with the optional attribute OPTIONAL_ATTRIBUTE provided
+					 * 
+					 */
+					testcase TC_CSE_DMR_CRE_012_CNT_ET() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
+						var template RequestPrimitive v_createRequest := m_createContainerBase;
+						const AttributeList c_optionalAttribute := {"expirationTime"};
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.container.expirationTime := "20301231T012345";
+						
+						v_ae1.start(f_CSE_DMR_CRE_012(int3, v_createRequest, c_optionalAttribute));
+						v_ae1.done;
+						  
+					}
+					
+					testcase TC_CSE_DMR_CRE_012_CIN_ET() runs on Tester system CseSystem {//TODO
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
+						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
+						const AttributeList c_optionalAttribute := {"expirationTime"};
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.contentInstance.expirationTime := "20301231T012345";
+						
+						v_ae1.start(f_CSE_DMR_CRE_012(int4, v_createRequest, c_optionalAttribute));			
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_DMR_CRE_012_CIN_OR() runs on Tester system CseSystem {//TODO
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;					
+						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
+						const AttributeList c_optionalAttribute := {"ontologyRef"};
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.contentInstance.ontologyRef := "MyOntologyRef";
+						
+						v_ae1.start(f_CSE_DMR_CRE_012(int4, v_createRequest, c_optionalAttribute));
+						v_ae1.done;
+						
+					}
+					
+					testcase TC_CSE_DMR_CRE_012_ACP_ET() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
+						var template RequestPrimitive v_createRequest := m_createAcpBase;
+						const AttributeList c_optionalAttribute := {"expirationTime"};
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.accessControlPolicy.expirationTime := "20301231T012345";
+						
+						v_ae1.start(f_CSE_DMR_CRE_012(int1, v_createRequest, c_optionalAttribute));
+						v_ae1.done;
+						
+					}
+					
+					testcase TC_CSE_DMR_CRE_012_SUB_ET() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
+						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
+						const AttributeList c_optionalAttribute := {"expirationTime"};
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.subscription.expirationTime := "20301231T012345";
+						
+						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
+						v_ae1.done;
+						  
+					}
+					
+					testcase TC_CSE_DMR_CRE_012_SUB_ENC() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
+						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
+						const AttributeList c_optionalAttribute := {"eventNotificationCriteria"};
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.subscription.eventNotificationCriteria := valueof(m_eventNotificationCriteria({int1}, -));
+						
+						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
+						v_ae1.done;
+						
+					}
+					
+					testcase TC_CSE_DMR_CRE_012_SUB_EXC() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
+						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
+						const AttributeList c_optionalAttribute := {"expirationCounter"};
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.subscription.expirationCounter := 1;
+						
+						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
+						v_ae1.done;
+						
+					}
+					
+					testcase TC_CSE_DMR_CRE_012_SUB_GPI() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
+						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
+						const AttributeList c_optionalAttribute := {"groupID"};
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.subscription.groupID := "MyGroupID";
+						
+						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
+						v_ae1.done;
+						
+					}
+					
+					testcase TC_CSE_DMR_CRE_012_SUB_NFU() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
+						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
+						const AttributeList c_optionalAttribute := {"notificationForwardingURI"};
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.subscription.notificationForwardingURI := "MyForwardingURI";
+						
+						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
+						v_ae1.done;
+						
+					}
+					
+					testcase TC_CSE_DMR_CRE_012_SUB_BN() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
+						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
+						const AttributeList c_optionalAttribute := {"batchNotify"};
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.subscription.batchNotify := {0, "PT1S"};
+						
+						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_DMR_CRE_012_SUB_RL() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
+						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
+						const AttributeList c_optionalAttribute := {"rateLimit"};
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.subscription.rateLimit := {0, omit};
+						
+						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
+						v_ae1.done;
+						
+					}
+					
+					testcase TC_CSE_DMR_CRE_012_SUB_PSN() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
+						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
+						const AttributeList c_optionalAttribute := {"preSubscriptionNotify"};
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.subscription.preSubscriptionNotify := 1;
+						
+						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
+						v_ae1.done;
+						
+					}
+					
+					testcase TC_CSE_DMR_CRE_012_SUB_PN() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
+						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
+						const AttributeList c_optionalAttribute := {"pendingNotification"};
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.subscription.pendingNotification := int1;
+						
+						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));			
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_DMR_CRE_012_SUB_NSP() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
+						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
+						const AttributeList c_optionalAttribute := {"notificationStoragePriority"};
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.subscription.notificationStoragePriority := 1;
+						
+						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
+						v_ae1.done;
+						  
+					}
+					
+					testcase TC_CSE_DMR_CRE_012_SUB_LN() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
+						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
+						const AttributeList c_optionalAttribute := {"latestNotify"};
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.subscription.latestNotify := true;
+						
+						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
+						v_ae1.done;
+						
+					}
+					
+					testcase TC_CSE_DMR_CRE_012_SUB_NCT() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
+						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
+						const AttributeList c_optionalAttribute := {"notificationContentType"};
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.subscription.notificationContentType := int1;
+						
+						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
+						v_ae1.done;
+						
+					}
+					
+					testcase TC_CSE_DMR_CRE_012_SUB_NEC() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
+						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
+						const AttributeList c_optionalAttribute := {"notificationEventCat"};
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.subscription.notificationEventCat := {alt_1 := 100};
+						
+						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
+						v_ae1.done;
+						
+					}
+					
+					testcase TC_CSE_DMR_CRE_012_SUB_SU() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
+						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
+						const AttributeList c_optionalAttribute := {"subscriberURI"};
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.subscription.subscriberURI := "NotInitialized";
+						
+						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
+						v_ae1.done;
+						
+					}
+					
+					testcase TC_CSE_DMR_CRE_012_TS_ACPI() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						const AttributeList c_optionalAttribute := {"accessControlPolicyIDs"};
+	
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.timeSeries.accessControlPolicyIDs := {"NotInitialized"};
+	
+						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute));			
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_DMR_CRE_012_TS_ET() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						const AttributeList c_optionalAttribute := {"expirationTime"};
+	
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.timeSeries.expirationTime := "20301231T012345";
+	
+						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute));
+						v_ae1.done;
+	  
+					}
+					
+					testcase TC_CSE_DMR_CRE_012_TS_LBL() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						const AttributeList c_optionalAttribute := {"labels"};
+	
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.timeSeries.labels := {"MyLabel"};
+	
+						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute));
+						v_ae1.done;
+	
+					}
+					
+					testcase TC_CSE_DMR_CRE_012_TS_CR() runs on Tester system CseSystem { 
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var AttributeList v_optionalAttribute := {"creator"};
+	
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.timeSeries.creator := "NullValue";
+	
+						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, v_optionalAttribute));
+						v_ae1.done;
+	
+					}	
+					
+					testcase TC_CSE_DMR_CRE_012_TS_MNI() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						const AttributeList c_optionalAttribute := {"maxNrOfInstances"};
+	
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.timeSeries.maxNrOfInstances := 0;
+	
+						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute));
+						v_ae1.done;
+	
+					}
+
+					testcase TC_CSE_DMR_CRE_012_TS_MBS() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						const AttributeList c_optionalAttribute := {"maxByteSize"};
+	
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.timeSeries.maxByteSize := 0;
+	
+						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute));
+						v_ae1.done;
+	
+					}
+
+					testcase TC_CSE_DMR_CRE_012_TS_MIA() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						const AttributeList c_optionalAttribute := {"maxInstanceAge"};
+	
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.timeSeries.maxInstanceAge := 0;
+	
+						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute));
+						v_ae1.done;
+	
+					}	
+					
+					testcase TC_CSE_DMR_CRE_012_TS_PEI() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						const AttributeList c_optionalAttribute := {"periodicInterval"};
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.timeSeries.periodicInterval := 0;
+
+						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute));
+						v_ae1.done;
+
+					}	
+					
+					testcase TC_CSE_DMR_CRE_012_TS_MDD() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						const AttributeList c_optionalAttribute := {"missingDataDetect"};
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.timeSeries.missingDataDetect := true;
+
+						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute));
+						v_ae1.done;
+
+					}	
+					
+					testcase TC_CSE_DMR_CRE_012_TS_MDN() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						const AttributeList c_optionalAttribute := {"missingDataMaxNr"};
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.timeSeries.missingDataMaxNr := 0;
+
+						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute));
+						v_ae1.done;
+
+					}	
+					
+					testcase TC_CSE_DMR_CRE_012_TS_MDT() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						const AttributeList c_optionalAttribute := {"missingDataDetectTimer"};
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.timeSeries.missingDataDetectTimer := 0;
+
+						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute));
+						v_ae1.done;
+
+					}	
+					
+					testcase TC_CSE_DMR_CRE_012_TS_OR() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						const AttributeList c_optionalAttribute := {"ontologyRef"};
+	
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.timeSeries.ontologyRef := "MyOntologyRef";
+	
+						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute));
+						v_ae1.done;
+	
+					}
+					
+					testcase TC_CSE_DMR_CRE_012_TSI_ET() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
+						const AttributeList c_optionalAttribute := {"expirationTime"};
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.timeSeriesInstance.expirationTime := "20301231T012345";
+
+						v_ae1.start(f_CSE_DMR_CRE_012(int30, v_createRequest, c_optionalAttribute));
+						v_ae1.done;
+  
+					}
+					
+					testcase TC_CSE_DMR_CRE_012_TSI_LBL() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
+						const AttributeList c_optionalAttribute := {"labels"};
+	
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.timeSeriesInstance.labels := {"MyLabel"};
+	
+						v_ae1.start(f_CSE_DMR_CRE_012(int30, v_createRequest, c_optionalAttribute));
+						v_ae1.done;
+	
+					}
+					
+					testcase TC_CSE_DMR_CRE_012_TSI_SNR() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
+						const AttributeList c_optionalAttribute := {"labels"};
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.timeSeriesInstance.sequenceNr := 0;
+
+						v_ae1.start(f_CSE_DMR_CRE_012(int30, v_createRequest, c_optionalAttribute));
+						v_ae1.done;
+
+					}
+				
+				}// end group g_CSE_DMR_CRE_012	
+				
+				group g_CSE_DMR_CRE_013 {
+					
+					/**
+					 * @desc Check that the IUT rejects the CREATE Request of a RESOURCE_TYPE resource with error “NOT_ACCEPTABLE” when contentSize exceeds maxByteSize of the PARENT_RESOURCE_TYPE
+					 * 
+					 */
+					testcase TC_CSE_DMR_CRE_013_TS_TSI() runs on Tester system CseSystem {
+						//Local variables		
+						var template RequestPrimitive v_createRequestTimeSeries := m_createTimeSeriesBase;
+						var template RequestPrimitive v_createRequestTimeSeriesInstance := m_createTimeSeriesInstanceBase;
+						const integer c_maxByteSize := 1;		
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequestTimeSeries.primitiveContent.timeSeries.maxByteSize := c_maxByteSize;
+
+						v_ae1.start(f_CSE_DMR_CRE_013(int29, v_createRequestTimeSeries, int30, v_createRequestTimeSeriesInstance));//TimeSeriesInstance under TimeSeries
+						v_ae1.done;
+					}
+
+				}// end group g_CSE_DMR_CRE_013
+				
+				group g_CSE_DMR_CRE_014 {
+				
+					/**
+					 * @desc Check that the IUT updates the currentByteSize attribute in a PARENT_RESOURCE_TYPE when a new RESOURCE_TYPE is created. 
+					 * 
+					 */
+					testcase TC_CSE_DMR_CRE_014_TS_TSI() runs on Tester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_parentResourceRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_childResourceRequest := m_createTimeSeriesInstanceBase;//Default content: "AnyValue" (8 bytes length)
+						var ResponsePrimitive v_responsePrimitive;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						const integer c_maxByteSize := 512;	
+		
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_parentResourceRequest.primitiveContent.timeSeries.maxByteSize := c_maxByteSize;
+		
+						v_ae1.start(f_CSE_DMR_CRE_014(int29, v_parentResourceRequest, int30, v_childResourceRequest));		
+						v_ae1.done;
+		
+					}
+				
+				}// end group g_CSE_DMR_CRE_014
+
+				group g_CSE_DMR_CRE_015 {
+					
+					/**
+					 * @desc Check that the IUT returns successfully after a CREATE request an empty content of created resource when the ResultContent set to 0 (Nothing)
+					 * 
+					 */
+					testcase TC_CSE_DMR_CRE_015_SCH() runs on Tester system CseSystem {
+						// Local variables
+							
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						                        
+						v_ae1.start(f_CSE_DMR_CRE_015(int18, m_createScheduleBase));//Schedule
+						v_ae1.done;
+					}
+				} // end g_CSE_DMR_CRE_015							
+
+				group g_CSE_DMR_CRE_016 {
+					
+					/**
+					 * @desc Check that the IUT returns successfully after a CREATE request only hierarchichal address of the created resource when the Result Content is set to 2 (hierarchical address)
+					 * 
+					 */
+					testcase TC_CSE_DMR_CRE_016_SCH() runs on Tester system CseSystem {
+						// Local variables
+						var template PrimitiveContent v_contentResponse;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+											
+						v_contentResponse.uRI := mw_contentSchedule_rc2;
+						
+						v_ae1.start(f_CSE_DMR_CRE_016(int18, m_createScheduleBase, v_contentResponse));//Schedule
+						v_ae1.done;
+					}
+
+					testcase TC_CSE_DMR_CRE_016_TS() runs on Tester system CseSystem {
+						// Local variables
+						var template PrimitiveContent v_contentResponse;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.uRI := mw_contentTimeSeries_rc2;
+
+						v_ae1.start(f_CSE_DMR_CRE_016(int29, m_createTimeSeriesBase, v_contentResponse));//TimeSeries
+						v_ae1.done;
+					}
+				
+				} // end g_CSE_DMR_CRE_016	
+							
+				group g_CSE_DMR_CRE_017 {
+					
+					/**
+					 * @desc Check that the IUT returns successfully after a CREATE request only attributes and hierarchichal address of the created resource when Result Content is set 3 (attributes and hierarchichal address)
+					 * 
+					 */
+					testcase TC_CSE_DMR_CRE_017_SCH() runs on Tester system CseSystem {
+						// Local variables
+						var template PrimitiveContent v_contentResponse;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+					
+						v_contentResponse.resource := mw_contentSchedule_rc3;
+						
+						v_ae1.start(f_CSE_DMR_CRE_017(int18, m_createScheduleBase, v_contentResponse));//Schedule
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_DMR_CRE_017_TS() runs on Tester system CseSystem {
+						// Local variables
+						var template PrimitiveContent v_contentResponse;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.resource := mw_contentTimeSeries_rc3;
+
+						v_ae1.start(f_CSE_DMR_CRE_017(int29, m_createTimeSeriesBase, v_contentResponse));//TimeSeries
+						v_ae1.done;
+					}
+				
+				} // end g_CSE_DMR_CRE_017
+				
+				group g_CSE_DMR_CRE_019 {
+					
+					testcase TC_CSE_DMR_CRE_019_CNTA_AEA() runs on Tester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createContainerAnncBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+	
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_createRequest.primitiveContent.containerAnnc.resourceName := omit;
+						v_cse1.start(f_CSE_DMR_CRE_019(int10003, v_createRequest));//ContainerAnnc
+						v_cse1.done;
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_cse1);
+							if(not ispresent(v_responsePrimitive.primitiveContent.containerAnnc.resourceName)){
+								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+							}
+						}		
+					}
+
+					testcase TC_CSE_DMR_CRE_019_GRPA_AEA() runs on Tester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createGroupAnncBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_createRequest.primitiveContent.groupAnnc.resourceName := omit;
+						v_cse1.start(f_CSE_DMR_CRE_019(int10009, v_createRequest));//GroupAnnc
+						v_cse1.done;
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_cse1);
+							if(not ispresent(v_responsePrimitive.primitiveContent.groupAnnc.resourceName)){
+								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+							}
+						}		
+					}
+
+					testcase TC_CSE_DMR_CRE_019_ACPA_AEA() runs on Tester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createAcpAnncBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_createRequest.primitiveContent.accessControlPolicyAnnc.resourceName := omit;
+						v_cse1.start(f_CSE_DMR_CRE_019(int10001, v_createRequest));//AccessControlPolicyAnnc
+						v_cse1.done;
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_cse1);
+							if(not ispresent(v_responsePrimitive.primitiveContent.accessControlPolicyAnnc.resourceName)){
+								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+							}
+						}		
+					}
+					
+					testcase TC_CSE_DMR_CRE_019_TSA_AEA() runs on Tester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesAnncBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_createRequest.primitiveContent.timeSeriesAnnc.resourceName := omit;
+						v_cse1.start(f_CSE_DMR_CRE_019(int10029, v_createRequest));//TimeSeriesAnnc
+						v_cse1.done;
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_cse1);
+							if(not ispresent(v_responsePrimitive.primitiveContent.timeSeriesAnnc.resourceName)){
+								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+							}
+						}		
+					}
+					
+				} //end g_CSE_DMR_CRE_019
+				
+				group g_CSE_DMR_CRE_020 {
+					
+					/**
+					 * @desc Check that the IUT accepts the creation of a RESOURCE_TYPE resource with the optional attribute announceTo provided
+					 * 
+					 */
+					testcase TC_CSE_DMR_CRE_020_ACP() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
+						var template RequestPrimitive v_createRequest := m_createAcpBase;
+						
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
+						                    
+						v_ae1.start(f_CSE_DMR_CRE_020(int1, v_createRequest, mw_createAccessControlPolicyAnnc));//AccessControlPolicy
+						v_ae1.done;
+					}
+
+					testcase TC_CSE_DMR_CRE_020_CNT() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
+						var template RequestPrimitive v_createRequest := m_createContainerBase;
+						
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
+					
+						v_ae1.start(f_CSE_DMR_CRE_020(int3, v_createRequest, mw_createContainerAnnc));//Container
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_DMR_CRE_020_CIN() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
+						
+						v_ae1.start(f_CSE_DMR_CRE_020(int4, v_createRequest, mw_createContentInstanceAnnc));//ContentInstance
+						v_ae1.done;
+					}
+				
+					testcase TC_CSE_DMR_CRE_020_GRP() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
+						var template RequestPrimitive v_createRequest := m_createGroupBase;
+						
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
+						
+						v_ae1.start(f_CSE_DMR_CRE_020(int9, v_createRequest, mw_createGroupAnnc));//Group
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_DMR_CRE_020_LCP() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
+						var template RequestPrimitive v_createRequest := m_createLocationPolicy(int1, omit, omit, omit, omit);
+						
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.locationPolicy.announceTo := {PX_CSE1_ID};
+						
+						v_ae1.start(f_CSE_DMR_CRE_020(int10, v_createRequest, mw_createLocationPolicyAnnc));//LocationPolicy
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_DMR_CRE_020_MGO() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
+						var template RequestPrimitive v_createRequest := m_createMgmtObjBase;
+						
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.mgmtResource.announceTo := {PX_CSE1_ID};
+
+						v_ae1.start(f_CSE_DMR_CRE_020(int13, v_createRequest, mw_createMgmtObjAnnc));//MgmtObj
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_DMR_CRE_020_NOD() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
+						var template RequestPrimitive v_createRequest := m_createNodeBase;
+						
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.node.announceTo := {PX_CSE1_ID};
+						
+						v_ae1.start(f_CSE_DMR_CRE_020(int14, v_createRequest, mw_createNodeAnnc));//Node
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_DMR_CRE_020_SCH() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
+						var template RequestPrimitive v_createRequest := m_createScheduleBase;
+						
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.schedule.announceTo := {PX_CSE1_ID};
+
+						v_ae1.start(f_CSE_DMR_CRE_020(int18, v_createRequest, mw_createScheduleAnnc));//Schedule
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_DMR_CRE_020_TS() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+	
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.timeSeries.announceTo := {f_getCompletePoA()};
+	
+						v_ae1.start(f_CSE_DMR_CRE_020(int29, v_createRequest, mw_createTimeSeriesAnnc));//TimeSeries
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_DMR_CRE_020_TSI() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.timeSeriesInstance.announceTo := {f_getCompletePoA()};
+
+						v_ae1.start(f_CSE_DMR_CRE_020(int30, v_createRequest, mw_createTimeSeriesInstanceAnnc));//TimeSeriesInstance
+						v_ae1.done;
+					}
+				
+				} // end g_CSE_DMR_CRE_020		
+				
+				group g_CSE_DMR_CRE_021 {
+
+					/**
+					 * @desc Check that the IUT accepts the creation of a RESOURCE_TYPE resource with the optional attribute announcedAttribute provided
+					 * 
+					 */
+					testcase TC_CSE_DMR_CRE_021_CNT() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
+						var template RequestPrimitive v_createRequest := m_createContainerBase;
+						var RequestPrimitive v_requestPrimitive;
+						var XSD.NonNegativeInteger v_maxByteSize := 512;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
+						v_createRequest.primitiveContent.container.maxByteSize := v_maxByteSize;						
+						v_createRequest.primitiveContent.container.announcedAttribute := {"mbs"};
+	
+						v_ae1.start(f_CSE_DMR_CRE_021(int3, v_createRequest, mw_createContainerAnnc()));//Container
+						v_ae1.done;
+						
+						if(getverdict == pass){ 
+							//Check if maxByteSize attribute has been announced
+							v_requestPrimitive := f_getRequestPrimitive(v_ae1);
+							if (ispresent(v_requestPrimitive.primitiveContent.containerAnnc.maxByteSize)){
+								if(v_requestPrimitive.primitiveContent.containerAnnc.maxByteSize != v_maxByteSize){
+									setverdict(fail, __SCOPE__ & ": Error: Value of maxByteSize has not been announced successfully");
+								}else{
+									setverdict(pass, __SCOPE__ & ": Value of maxByteSize has been announced successfully");
+								}
+							}else{
+								setverdict(fail, __SCOPE__ & ": Error: maxByteSize has not been announced");
+							}
+						}
+					}
+	
+					testcase TC_CSE_DMR_CRE_021_CIN() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
+						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
+						var RequestPrimitive v_requestPrimitive;
+						var XSD.NonNegativeInteger v_contentSize := 512;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
+						v_createRequest.primitiveContent.contentInstance.contentSize := v_contentSize;						
+						v_createRequest.primitiveContent.contentInstance.announcedAttribute := {"cs"};
+		
+						v_ae1.start(f_CSE_DMR_CRE_021(int4, v_createRequest, mw_createContentInstanceAnnc()));//ContentInstance
+						v_ae1.done;
+						
+						if(getverdict == pass){ 
+							//Check if contentSize attribute has been announced
+							v_requestPrimitive := f_getRequestPrimitive(v_ae1);
+							if (ispresent(v_requestPrimitive.primitiveContent.contentInstanceAnnc.contentSize)){
+								if(v_requestPrimitive.primitiveContent.contentInstanceAnnc.contentSize != v_contentSize){
+									setverdict(fail, __SCOPE__ & ": Error: Value of contentSize has not been announced successfully");
+								}else{
+									setverdict(pass, __SCOPE__ & ": Value of contentSize has been announced successfully");
+								}
+							}else{
+								setverdict(fail, __SCOPE__ & ": Error: contentSize has not been announced");
+							}
+						}
+					}
+
+					testcase TC_CSE_DMR_CRE_021_GRP() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
+						var template RequestPrimitive v_createRequest := m_createGroupBase;
+						var RequestPrimitive v_requestPrimitive;
+						var XSD.PositiveInteger v_maxNrOfMembers := 10;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
+						v_createRequest.primitiveContent.group_.maxNrOfMembers := v_maxNrOfMembers;
+						v_createRequest.primitiveContent.group_.announcedAttribute := {"mnm"};
+		
+						v_ae1.start(f_CSE_DMR_CRE_021(int9, v_createRequest, mw_createGroupAnnc()));//Group
+						v_ae1.done;
+						
+						if(getverdict == pass){ 
+							//Check if maxNrOfMembers attribute has been announced
+							v_requestPrimitive := f_getRequestPrimitive(v_ae1);
+							if (ispresent(v_requestPrimitive.primitiveContent.groupAnnc.maxNrOfMembers)){
+								if(v_requestPrimitive.primitiveContent.groupAnnc.maxNrOfMembers != v_maxNrOfMembers){
+									setverdict(fail, __SCOPE__ & ": Error: Value of maxNrOfMembers has not been announced successfully");
+								}else{
+									setverdict(pass, __SCOPE__ & ": Value of maxNrOfMembers has been announced successfully");
+								}
+							}else{
+								setverdict(fail, __SCOPE__ & ": Error: maxNrOfMembers has not been announced");
+							}
+						}
+					}
+	
+					testcase TC_CSE_DMR_CRE_021_LCP() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
+						var template RequestPrimitive v_createRequest := m_createLocationPolicy(int1, omit, omit, omit, omit);
+						var RequestPrimitive v_requestPrimitive;
+						var LocationSource v_locationSource := int1;//Network-based
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.locationPolicy.announceTo := {PX_CSE1_ID};
+						v_createRequest.primitiveContent.locationPolicy.locationSource := v_locationSource;
+						v_createRequest.primitiveContent.locationPolicy.announcedAttribute := {"los"};
+		
+						v_ae1.start(f_CSE_DMR_CRE_021(int10, v_createRequest, mw_createLocationPolicyAnnc()));//LocationPolicy
+						v_ae1.done;
+						
+						if(getverdict == pass){ 
+							//Check if locationSource attribute has been announced
+							v_requestPrimitive := f_getRequestPrimitive(v_ae1);
+							if (ispresent(v_requestPrimitive.primitiveContent.locationPolicyAnnc.locationSource)){
+								if(v_requestPrimitive.primitiveContent.locationPolicyAnnc.locationSource != v_locationSource){
+									setverdict(fail, __SCOPE__ & ": Error: Value of locationSource has not been announced successfully");
+								}else{
+									setverdict(pass, __SCOPE__ & ": Value of locationSource has been announced successfully");
+								}
+							}else{
+								setverdict(fail, __SCOPE__ & ": Error: locationSource has not been announced");
+							}
+						}
+					}
+	
+					testcase TC_CSE_DMR_CRE_021_MGO() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
+						var template RequestPrimitive v_createRequest := m_createMgmtObjBase;
+						var RequestPrimitive v_requestPrimitive;
+						var XSD.String v_description := "Description of mgmtObj";
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.mgmtResource.announceTo := {PX_CSE1_ID};
+						v_createRequest.primitiveContent.mgmtResource.description := v_description;			
+						v_createRequest.primitiveContent.mgmtResource.announcedAttribute := {"dc"};
+
+						v_ae1.start(f_CSE_DMR_CRE_021(int13, v_createRequest, mw_createMgmtObjAnnc()));//MgmtObj
+						v_ae1.done;
+						
+						if(getverdict == pass){ 
+							//Check if description attribute has been announced
+							v_requestPrimitive := f_getRequestPrimitive(v_ae1);
+							if (ispresent(v_requestPrimitive.primitiveContent.announcedMgmtResource.description)){
+								if(v_requestPrimitive.primitiveContent.announcedMgmtResource.description != v_description){
+									setverdict(fail, __SCOPE__ & ": Error: Value of description has not been announced successfully");
+								}else{
+									setverdict(pass, __SCOPE__ & ": Value of description has been announced successfully");
+								}
+							}else{
+								setverdict(fail, __SCOPE__ & ": Error: description has not been announced");
+							}
+						}
+					}
+	
+					testcase TC_CSE_DMR_CRE_021_NOD() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
+						var template RequestPrimitive v_createRequest := m_createNodeBase;
+						var RequestPrimitive v_requestPrimitive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.node.announceTo := {PX_CSE1_ID};
+						
+						//TODO node to be done. hostedCSELink attribute (OA) to be added!!!
+		
+						v_ae1.start(f_CSE_DMR_CRE_021(int14, v_createRequest, mw_createNodeAnnc));//Node
+						v_ae1.done;
+					}
+	
+					testcase TC_CSE_DMR_CRE_021_SCH() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
+						var template RequestPrimitive v_createRequest := m_createScheduleBase;
+						var RequestPrimitive v_requestPrimitive;
+						var ScheduleEntries v_scheduleElement := {{"0 0 0,1,2 1 1 * *"}};
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.schedule.announceTo := {PX_CSE1_ID};
+						v_createRequest.primitiveContent.schedule.scheduleElement := v_scheduleElement;
+						v_createRequest.primitiveContent.schedule.announcedAttribute := {"se"};
+						
+						v_ae1.start(f_CSE_DMR_CRE_021(int18, v_createRequest, mw_createScheduleAnnc()));//Schedule
+						v_ae1.done;
+						
+						if(getverdict == pass){ 
+							//Check if scheduleElement attribute has been announced
+							v_requestPrimitive := f_getRequestPrimitive(v_ae1);
+							if (ispresent(v_requestPrimitive.primitiveContent.scheduleAnnc.scheduleElement)){
+								if(v_requestPrimitive.primitiveContent.scheduleAnnc.scheduleElement != v_scheduleElement){
+									setverdict(fail, __SCOPE__ & ": Error: Value of scheduleElement has not been announced successfully");
+								}else{
+									setverdict(pass, __SCOPE__ & ": Value of scheduleElement has been announced successfully");
+								}
+							}else{
+								setverdict(fail, __SCOPE__ & ": Error: scheduleElement has not been announced");
+							}
+						}
+					}
+					
+					testcase TC_CSE_DMR_CRE_021_TS() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var RequestPrimitive v_requestPrimitive;
+						var XSD.NonNegativeInteger v_maxByteSize := 512;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
+						v_createRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize;						
+						v_createRequest.primitiveContent.timeSeries.announcedAttribute := {"mbs"};
+
+						v_ae1.start(f_CSE_DMR_CRE_021(int29, v_createRequest, mw_createTimeSeriesAnnc()));//TimeSeries
+						v_ae1.done;
+	
+						if(getverdict == pass){ 
+							//Check if maxByteSize attribute has been announced
+							v_requestPrimitive := f_getRequestPrimitive(v_ae1);
+							if (ispresent(v_requestPrimitive.primitiveContent.timeSeriesAnnc.maxByteSize)){
+								if(v_requestPrimitive.primitiveContent.timeSeriesAnnc.maxByteSize != v_maxByteSize){
+									setverdict(fail, __SCOPE__ & ": Error: Value of maxByteSize has not been announced successfully");
+								}else{
+									setverdict(pass, __SCOPE__ & ": Value of maxByteSize has been announced successfully");
+								}
+							}else{
+								setverdict(fail, __SCOPE__ & ": Error: maxByteSize has not been announced");
+							}
+						}
+					}
+					
+					testcase TC_CSE_DMR_CRE_021_TSI() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
+						var RequestPrimitive v_requestPrimitive;
+						var XSD.NonNegativeInteger v_sequenceNr := 8;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.timeSeriesInstance.announceTo := {PX_CSE1_ID};
+						v_createRequest.primitiveContent.timeSeriesInstance.sequenceNr := v_sequenceNr;						
+						v_createRequest.primitiveContent.timeSeriesInstance.announcedAttribute := {"snr"};
+
+						v_ae1.start(f_CSE_DMR_CRE_021(int30, v_createRequest, mw_createTimeSeriesInstanceAnnc()));//TimeSeriesInstance
+						v_ae1.done;
+
+						if(getverdict == pass){ 
+							//Check if maxByteSize attribute has been announced
+							v_requestPrimitive := f_getRequestPrimitive(v_ae1);
+							if (ispresent(v_requestPrimitive.primitiveContent.timeSeriesInstanceAnnc.sequenceNr)){
+								if(v_requestPrimitive.primitiveContent.timeSeriesInstanceAnnc.sequenceNr != v_sequenceNr){
+									setverdict(fail, __SCOPE__ & ": Error: Value of sequenceNr has not been announced successfully");
+								}else{
+									setverdict(pass, __SCOPE__ & ": Value of sequenceNr has been announced successfully");
+								}
+							}else{
+								setverdict(fail, __SCOPE__ & ": Error: sequenceNr has not been announced");
+							}
+						}
+					}
+
+				} // end g_CSE_DMR_CRE_021	
+				
+			}//end group Create
+			
+			group Retrieve {
+				
+				group g_CSE_DMR_RET_001 {
+					
+					/**
+					 * @desc Check that the IUT returns successfully the TARGET_RESOURCE_ADDRESS resource 
+					 * 
+					 */
+					testcase TC_CSE_DMR_RET_001_SCH() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
+						var ResponsePrimitive v_responsePrimitive;
+						var template PrimitiveContent v_contentResponse;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.schedule := mw_contentSchedule_rc1;
+						
+						v_ae1.start(f_CSE_DMR_RET_001(int18, m_createScheduleBase, v_contentResponse));//Schedule
+						v_ae1.done;
+						
+					}
+					
+					testcase TC_CSE_DMR_RET_001_TS() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var ResponsePrimitive v_responsePrimitive;
+						var template PrimitiveContent v_contentResponse;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.timeSeries := mw_contentTimeSeries_rc1;
+
+						v_ae1.start(f_CSE_DMR_RET_001(int29, m_createTimeSeriesBase, v_contentResponse));//TimeSeries
+						v_ae1.done;
+
+					}
+					
+				} // end g_CSE_DMR_RET_001
+				
+				group g_CSE_DMR_RET_002 {
+					
+					/**
+					 * @desc Check that the IUT responds with an error when the AE tries to retrieve the resource TARGET_RESOURCE_ADDRESS which does not exist
+					 * 
+					 */
+					testcase TC_CSE_DMR_RET_002() runs on Tester system CseSystem {
+					
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+													
+						v_ae1.start(f_CSE_DMR_RET_002());
+										  	  	
+						v_ae1.done;
+										  	  		
+					}
+												
+					function f_CSE_DMR_RET_002() runs on AeSimu {
+    				
+						// Local variables
+						var MsgIn v_response;
+						
+						var integer v_aeIndex := -1;
+						var XSD.ID v_resourceId := "nonExistingId";
+						var XSD.ID v_resourceName := "nonExistingName";
+						var XSD.ID v_targetResourceAddress;
+    										   
+						// Test control
+    				
+						// Test component configuration
+						f_cf01Up();
+    				
+						// Test adapter configuration
+    				
+						// Preamble
+						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi); 		
+						
+						// Test Body
+						if((PX_ADDRESSING_METHOD == e_nonHierarchical) and (PX_PRIMITIVE_SCOPE == e_cseRelative)) {
+							v_targetResourceAddress := v_resourceId;
+						} else if (PX_ADDRESSING_METHOD == e_nonHierarchical) {
+							v_targetResourceAddress := f_getResourceAddress() & "/" & v_resourceId;
+						} else {
+							v_targetResourceAddress := f_getResourceAddress(v_aeIndex) & "/" & v_resourceName;
+						}
+						
+						mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(v_targetResourceAddress, f_getOriginator(v_aeIndex)))));
+
+						tc_ac.start;
+						alt {
+							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) -> value v_response {
+								tc_ac.stop;
+								setverdict(pass, __SCOPE__ & ": Resource not found");
+							}
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
+								tc_ac.stop;
+								setverdict(fail, __SCOPE__ & ": Wrong response status code");
+							}
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
+								tc_ac.stop;
+								setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
+							}
+							[] tc_ac.timeout {
+								setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
+							}
+						}	
+    								
+						// Postamble
+						f_cse_postamble_deleteResources();
+						
+						// Tear down
+						f_cf01Down();
+    				
+					}//end f_CSE_DMR_RET_002
+    				
+				} // end g_CSE_DMR_RET_002
+				
+				group g_CSE_DMR_RET_003 {
+					
+					/**
+					 * @desc Check that the IUT responds with an error when the AE tries to retrieve a resource TARGET_RESOURCE_ADDRESS under AE without having privileges for the RETRIEVE operation
+					 * 
+					 */
+					testcase TC_CSE_DMR_RET_003_SCH() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+	
+						v_ae1.start(f_CSE_DMR_RET_003(int18, m_createScheduleBase));//Schedule
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_DMR_RET_003_TS() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_ae1.start(f_CSE_DMR_RET_003(int29, m_createTimeSeriesBase));//TimeSeries
+						v_ae1.done;
+					}
+					
+				} // end g_CSE_DMR_RET_003
+				
+				group g_CSE_DMR_RET_004 {
+					
+					/**
+					 * @desc Check that the IUT returns successfully the ATTRIBUTE of TARGET_RESOURCE_ADDRESS resource (“To” option)
+					 * 
+					 */
+					testcase TC_CSE_DMR_RET_004_CNT() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
+						var template PrimitiveContent v_contentResponse;
+						
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.container := m_contentContainer_allOmit;
+						v_contentResponse.container.parentID := ?;
+                        
+						v_ae1.start(f_CSE_DMR_RET_004(int3, m_createContainerBase, v_contentResponse));//Container
+						v_ae1.done;
+					}
+
+					testcase TC_CSE_DMR_RET_004_GRP() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
+						var template PrimitiveContent v_contentResponse;
+						
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.group_ := m_contentGroup_allOmit;
+						v_contentResponse.group_.parentID := ?;
+												
+						v_ae1.start(f_CSE_DMR_RET_004(int9, m_createGroupBase, v_contentResponse));//Group
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_DMR_RET_004_ACP() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
+						var template PrimitiveContent v_contentResponse;
+						
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.accessControlPolicy := m_contentAcp_allOmit;
+						v_contentResponse.accessControlPolicy.parentID := ?;
+							
+						v_ae1.start(f_CSE_DMR_RET_004(int1, m_createAcpBase, v_contentResponse));//AccessControlPolicy
+						v_ae1.done;
+					}
+				
+					testcase TC_CSE_DMR_RET_004_SCH() runs on Tester system CseSystem {
+						// Local variables
+						var template PrimitiveContent v_contentResponse;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+					
+						v_contentResponse.schedule := m_contentSchedule_allOmit;
+						v_contentResponse.schedule.parentID := ?;
+							
+						v_ae1.start(f_CSE_DMR_RET_004(int18, m_createScheduleBase,v_contentResponse));//Schedule
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_DMR_RET_004_PCH() runs on Tester system CseSystem {
+						// Local variables
+						var template PrimitiveContent v_contentResponse;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+					
+						v_contentResponse.pollingChannel := m_contentPollingChannel_allOmit;
+						v_contentResponse.pollingChannel.parentID := ?;
+							
+						v_ae1.start(f_CSE_DMR_RET_004(int15, m_createPollingChannelBase, v_contentResponse));//PollingChannel
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_DMR_RET_004_SUB() runs on Tester system CseSystem {
+						// Local variables
+						var template PrimitiveContent v_contentResponse;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+					
+						v_contentResponse.subscription := m_contentSubscription_allOmit;
+						v_contentResponse.subscription.parentID := ?;
+							
+						v_ae1.start(f_CSE_DMR_RET_004(int23, m_createSubscriptionBase, v_contentResponse));//Subscription
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_DMR_RET_004_TS() runs on Tester system CseSystem {
+						// Local variables
+						var template PrimitiveContent v_contentResponse;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.timeSeries := m_contentTimeSeries_allOmit;
+						v_contentResponse.timeSeries.parentID := ?;
+		
+						v_ae1.start(f_CSE_DMR_RET_004(int29, m_createTimeSeriesBase, v_contentResponse));//TimeSeries
+						v_ae1.done;
+					}
+				
+				} // end g_CSE_DMR_RET_004
+				
+				group g_CSE_DMR_RET_005 {
+					
+					/**
+					 * @desc Check that the IUT returns  successfully the ATTRIBUTE of TARGET_RESOURCE_ADDRESS resource (“Content” option)
+					 * 
+					 */
+					testcase TC_CSE_DMR_RET_005_CNT() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
+						var template PrimitiveContent v_contentResponse;
+						
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.container := m_contentContainer_allOmit;
+						v_contentResponse.container.parentID := ?;
+						                       
+						v_ae1.start(f_CSE_DMR_RET_005(int3, m_createContainerBase, v_contentResponse));//Container
+						v_ae1.done;
+					}
+
+					testcase TC_CSE_DMR_RET_005_GRP() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
+						var template PrimitiveContent v_contentResponse;
+						
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.group_ := m_contentGroup_allOmit;
+						v_contentResponse.group_.parentID := ?;
+																		
+						v_ae1.start(f_CSE_DMR_RET_005(int9, m_createGroupBase, v_contentResponse));//Group
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_DMR_RET_005_ACP() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;					
+						var template PrimitiveContent v_contentResponse;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.accessControlPolicy := m_contentAcp_allOmit;
+						v_contentResponse.accessControlPolicy.parentID := ?;
+							
+						v_ae1.start(f_CSE_DMR_RET_005(int1, m_createAcpBase, v_contentResponse));//AccessControlPolicy
+						v_ae1.done;
+					}
+				
+					testcase TC_CSE_DMR_RET_005_SCH() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template PrimitiveContent v_contentResponse;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.schedule := m_contentSchedule_allOmit;
+						v_contentResponse.schedule.parentID := ?;
+								
+						v_ae1.start(f_CSE_DMR_RET_005(int18, m_createScheduleBase, v_contentResponse));//Schedule
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_DMR_RET_005_PCH() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template PrimitiveContent v_contentResponse;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.pollingChannel := m_contentPollingChannel_allOmit;
+						v_contentResponse.pollingChannel.parentID := ?;
+								
+						v_ae1.start(f_CSE_DMR_RET_005(int15, m_createPollingChannelBase, v_contentResponse));//PollingChannel
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_DMR_RET_005_SUB() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
+						var template PrimitiveContent v_contentResponse;
+						
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.subscription := m_contentSubscription_allOmit;
+						v_contentResponse.subscription.parentID := ?;
+								
+						v_ae1.start(f_CSE_DMR_RET_005(int23, m_createSubscriptionBase, v_contentResponse));//Subscription
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_DMR_RET_005_TS() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template PrimitiveContent v_contentResponse;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.timeSeries := m_contentTimeSeries_allOmit;
+						v_contentResponse.timeSeries.parentID := ?;
+			
+						v_ae1.start(f_CSE_DMR_RET_005(int29, m_createTimeSeriesBase, v_contentResponse));//TimeSeries
+						v_ae1.done;
+					}
+
+					
+				} // end g_CSE_DMR_RET_005
+				
+				group g_CSE_DMR_RET_006 {
+					
+					/**
+					 * @desc Check that the IUT returns  successfully multiple attributes of TARGET_RESOURCE_ADDRESS resource
+					 * 
+					 */
+					testcase TC_CSE_DMR_RET_006_CNT() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
+						var template PrimitiveContent v_contentResponse;
+						
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.container := m_contentContainer_allOmit;
+						v_contentResponse.container.parentID := ?;
+						v_contentResponse.container.creationTime := ?;
+                        
+						v_ae1.start(f_CSE_DMR_RET_006(int3, m_createContainerBase, v_contentResponse));//Container
+						v_ae1.done;
+					}
+
+					testcase TC_CSE_DMR_RET_006_GRP() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
+						var template PrimitiveContent v_contentResponse;
+						
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.group_ := m_contentGroup_allOmit;
+						v_contentResponse.group_.parentID := ?;
+						v_contentResponse.group_.creationTime := ?;
+												
+						v_ae1.start(f_CSE_DMR_RET_006(int9, m_createGroupBase, v_contentResponse));//Group
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_DMR_RET_006_ACP() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
+						var template PrimitiveContent v_contentResponse;
+						
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.accessControlPolicy := m_contentAcp_allOmit;
+						v_contentResponse.accessControlPolicy.parentID := ?;
+						v_contentResponse.accessControlPolicy.creationTime := ?;
+							
+						v_ae1.start(f_CSE_DMR_RET_006(int1, m_createAcpBase, v_contentResponse));//AccessControlPolicy
+						v_ae1.done;
+					}
+				
+					testcase TC_CSE_DMR_RET_006_SCH() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
+						var template PrimitiveContent v_contentResponse;
+						
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.schedule := m_contentSchedule_allOmit;
+						v_contentResponse.schedule.parentID := ?;
+						v_contentResponse.schedule.creationTime := ?;
+							
+						v_ae1.start(f_CSE_DMR_RET_006(int18, m_createScheduleBase, v_contentResponse));//Schedule
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_DMR_RET_006_PCH() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;					
+						var template PrimitiveContent v_contentResponse;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.pollingChannel := m_contentPollingChannel_allOmit;
+						v_contentResponse.pollingChannel.parentID := ?;
+						v_contentResponse.pollingChannel.creationTime := ?;
+							
+						v_ae1.start(f_CSE_DMR_RET_006(int15, m_createPollingChannelBase, v_contentResponse));//PollingChannel
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_DMR_RET_006_SUB() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
+						var template PrimitiveContent v_contentResponse;
+						
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.subscription := m_contentSubscription_allOmit;
+						v_contentResponse.subscription.parentID := ?;
+						v_contentResponse.subscription.creationTime := ?;
+							
+						v_ae1.start(f_CSE_DMR_RET_006(int23, m_createSubscriptionBase, v_contentResponse));//Subscription
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_DMR_RET_006_TS() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template PrimitiveContent v_contentResponse;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.timeSeries := m_contentTimeSeries_allOmit;
+						v_contentResponse.timeSeries.parentID := ?;
+						v_contentResponse.timeSeries.creationTime := ?;
+		
+						v_ae1.start(f_CSE_DMR_RET_006(int29, m_createTimeSeriesBase, v_contentResponse));//TimeSeries
+						v_ae1.done;
+					}
+
+					
+				} // end g_CSE_DMR_RET_006
+				
+				group g_CSE_DMR_RET_007 {
+					
+					/**
+					 * @desc Check that the IUT responds with an error when the AE tries to retrieve a non-existing attribute of the TARGET_RESOURCE_ADDRESS resource (“single” attribute case)
+					 * 
+					 */
+					testcase TC_CSE_DMR_RET_007_CNT_LBL() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+                        
+						v_ae1.start(f_CSE_DMR_RET_007(int3, m_createContainerBase));//Container
+						v_ae1.done;
+					}
+
+					testcase TC_CSE_DMR_RET_007_GRP_LBL() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						
+						v_ae1.start(f_CSE_DMR_RET_007(int9, m_createGroupBase));//Group
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_DMR_RET_007_ACP_LBL() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+	
+						v_ae1.start(f_CSE_DMR_RET_007(int1, m_createAcpBase));//AccessControlPolicy
+						v_ae1.done;
+					}
+				
+					testcase TC_CSE_DMR_RET_007_SCH_LBL() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+	
+						v_ae1.start(f_CSE_DMR_RET_007(int18, m_createScheduleBase));//Schedule
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_DMR_RET_007_PCH_LBL() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+	
+						v_ae1.start(f_CSE_DMR_RET_007(int15, m_createPollingChannelBase));//PollingChannel
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_DMR_RET_007_SUB_LBL() runs on AeSimu system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+	
+						v_ae1.start(f_CSE_DMR_RET_007(int23, m_createSubscriptionBase));//Subscription
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_DMR_RET_007_TS_LBL() runs on AeSimu system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_ae1.start(f_CSE_DMR_RET_007(int29, m_createSubscriptionBase));//TimeSeries
+						v_ae1.done;
+					}
+
+				} // end g_CSE_DMR_RET_007
+				
+				group g_CSE_DMR_RET_008 {
+					
+					/**
+					 * @desc Check that the IUT responds with an error when the AE tries to retrieve a non-existing attributes of the TARGET_RESOURCE_ADDRESS resource (“multiple” attributes case)
+					 * 
+					 */
+					testcase TC_CSE_DMR_RET_008_CNT_LBL_AT() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+                        
+						v_ae1.start(f_CSE_DMR_RET_008(int3, m_createContainerBase, {"lbl", "at"}));//Container
+						v_ae1.done;
+					}
+
+					testcase TC_CSE_DMR_RET_008_GRP_LBL_AT() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						
+						v_ae1.start(f_CSE_DMR_RET_008(int9, m_createGroupBase, {"lbl", "at"}));//Group
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_DMR_RET_008_ACP_LBL_AT() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+	
+						v_ae1.start(f_CSE_DMR_RET_008(int1, m_createAcpBase, {"lbl", "at"}));//AccessControlPolicy
+						v_ae1.done;
+					}
+				
+					testcase TC_CSE_DMR_RET_008_SCH_LBL_AT() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+	
+						v_ae1.start(f_CSE_DMR_RET_008(int18, m_createScheduleBase, {"lbl", "at"}));//Schedule
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_DMR_RET_008_SUB_LBL_AT() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+	
+						v_ae1.start(f_CSE_DMR_RET_008(int23, m_createSubscriptionBase, {"lbl", "at"}));//Subscription
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_DMR_RET_008_PCH_LBL_PI() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_ae1.start(f_CSE_DMR_RET_008(int15, m_createPollingChannelBase, {"lbl", "pi"}));//PollingChannel
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_DMR_RET_008_TS_LBL_AT() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_ae1.start(f_CSE_DMR_RET_008(int29, m_createTimeSeriesBase, {"lbl", "at"}));//TimeSeries
+						v_ae1.done;
+					}
+
+				} // end f_CSE_DMR_RET_008
+				
+				group g_CSE_DMR_RET_009{
+
+					/**
+					 * @desc Check that the IUT rejects the RETRIEVE Request of a latest resource target to a container resource that has no direct child contentInstance resources.
+					 * 
+					 */
+					testcase TC_CSE_DMR_RET_009() runs on Tester system CseSystem {
+					
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+														
+						v_ae1.start(f_CSE_DMR_RET_009());
+											  	  	
+						v_ae1.done;
+											  	  		
+					}
+													
+					function f_CSE_DMR_RET_009() runs on AeSimu {
+						// Local variables
+						var integer v_aeIndex := -1;
+						var integer v_containerIndex := -1;
+		    										   
+						// Test control
+	
+						// Test component configuration
+						f_cf01Up();
+	
+						// Test adapter configuration
+	
+						// Preamble
+						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+		
+						v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); 	
+		
+						// Test Body
+						mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameLatest, f_getOriginator(v_containerIndex)))));
+
+						tc_ac.start;
+						alt {
+							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))){
+								tc_ac.stop;
+								setverdict(pass, __SCOPE__ & ": Resource not found");
+							}
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
+								tc_ac.stop;
+								setverdict(fail, __SCOPE__ & ": Wrong response status code");
+							}
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
+								tc_ac.stop;
+								setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
+							}
+							[] tc_ac.timeout {
+								setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
+							}
+						}	
+					
+						// Postamble
+						f_cse_postamble_deleteResources();
+		
+						// Tear down
+						f_cf01Down();
+
+					}//end TC_CSE_DMR_RET_009
+
+				} // end group g_CSE_DMR_RET_009
+			  					
+				group g_CSE_DMR_RET_011{
+
+					/**
+					 * @desc Check that the IUT rejects the RETRIEVE Request of a oldest resource target to a container resource that has no direct child contentInstance resources.
+					 * 
+					 */
+					testcase TC_CSE_DMR_RET_011() runs on Tester system CseSystem {
+					
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+														
+						v_ae1.start(f_CSE_DMR_RET_011());
+											  	  	
+						v_ae1.done;
+											  	  		
+					}
+													
+					function f_CSE_DMR_RET_011() runs on AeSimu {
+						// Local variables
+						var integer v_aeIndex := -1;
+						var integer v_containerIndex := -1;
+		    										   
+						// Test control
+	
+						// Test component configuration
+						f_cf01Up();
+	
+						// Test adapter configuration
+	
+						// Preamble
+						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+		
+						v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); 	
+		
+						// Test Body
+						mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameOldest, f_getOriginator(v_containerIndex)))));
+
+						tc_ac.start;
+						alt {
+							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))){
+								tc_ac.stop;
+								setverdict(pass, __SCOPE__ & ": Resource not found");
+							}
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
+								tc_ac.stop;
+								setverdict(fail, __SCOPE__ & ": Wrong response status code");
+							}
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
+								tc_ac.stop;
+								setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
+							}
+							[] tc_ac.timeout {
+								setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
+							}
+						}	
+					
+						// Postamble
+						f_cse_postamble_deleteResources();
+		
+						// Tear down
+						f_cf01Down();
+
+					}//end TC_CSE_DMR_RET_011
+
+				} // end group g_CSE_DMR_RET_011
+				
+				group g_CSE_DMR_RET_013 {
+					
+					/**
+					 * @desc Check that the IUT returns successfully the TARGET_RESOURCE_ADDRESS resource under CSEBase
+					 * 
+					 */
+					testcase TC_CSE_DMR_RET_013_SCH() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var template PrimitiveContent v_contentResponse;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.schedule := mw_contentSchedule_rc1;
+						
+						v_ae1.start(f_CSE_DMR_RET_013(int18, m_createScheduleBase, v_contentResponse));//Schedule
+						v_ae1.done;
+						
+					}
+					
+					testcase TC_CSE_DMR_RET_013_TS() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template PrimitiveContent v_contentResponse;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.timeSeries := mw_contentTimeSeries_rc1;
+	
+						v_ae1.start(f_CSE_DMR_RET_013(int29, m_createTimeSeriesBase, v_contentResponse));//TimeSeries
+						v_ae1.done;
+	
+					}
+					
+				} // end g_CSE_DMR_RET_013
+
+				group g_CSE_DMR_RET_014 {
+					
+					/**
+					 * @desc Check that the IUT responds with an error when the AE tries to retrieve a resource TARGET_RESOURCE_ADDRESS under CSEBase without having privileges for the RETRIEVE operation
+					 * 
+					 */
+					testcase TC_CSE_DMR_RET_014_SCH() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+	
+						v_ae1.start(f_CSE_DMR_RET_014(int18, m_createScheduleBase));//Schedule
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_DMR_RET_014_TS() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_ae1.start(f_CSE_DMR_RET_014(int29, m_createTimeSeriesBase));//TimeSeries
+						v_ae1.done;
+					}
+										
+				} // end g_CSE_DMR_RET_014
+
+				group g_CSE_DMR_RET_015 {
+					
+					/**
+					 * @desc Check that the IUT returns successfully the ATTRIBUTE of TARGET_RESOURCE_ADDRESS resource (“To” option) under CSEBase
+					 * 
+					 */
+					testcase TC_CSE_DMR_RET_015_ACP() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					
+						var template PrimitiveContent v_contentResponse;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.accessControlPolicy := m_contentAcp_allOmit;
+						v_contentResponse.accessControlPolicy.parentID := ?;
+							
+						v_ae1.start(f_CSE_DMR_RET_015(int1, m_createAcpBase, v_contentResponse));//AccessControlPolicy
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_DMR_RET_015_AE() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var template PrimitiveContent v_contentResponse;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.aE := m_contentAe_allOmit;
+						v_contentResponse.aE.parentID := ?;
+							
+						v_ae1.start(f_CSE_DMR_RET_015(int2, m_createAe(PX_APP_ID), v_contentResponse));//AE
+						v_ae1.done;
+					}
+															
+					testcase TC_CSE_DMR_RET_015_CNT() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var template PrimitiveContent v_contentResponse;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.container := m_contentContainer_allOmit;
+						v_contentResponse.container.parentID := ?;
+                        
+						v_ae1.start(f_CSE_DMR_RET_015(int3, m_createContainerBase, v_contentResponse));//Container
+						v_ae1.done;
+					}
+
+					testcase TC_CSE_DMR_RET_015_GRP() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var template PrimitiveContent v_contentResponse;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.group_ := m_contentGroup_allOmit;
+						v_contentResponse.group_.parentID := ?;
+												
+						v_ae1.start(f_CSE_DMR_RET_015(int9, m_createGroupBase, v_contentResponse));//Group
+						v_ae1.done;
+					}
+				
+					testcase TC_CSE_DMR_RET_015_CSR() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var template PrimitiveContent v_contentResponse;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.remoteCSE := m_contentRemoteCSE_allOmit;
+						v_contentResponse.remoteCSE.parentID := ?;
+		
+						v_ae1.start(f_CSE_DMR_RET_015(int16, m_createRemoteCSEBase, v_contentResponse));//RemoteCSE
+						v_ae1.done;
+					}
+				
+					testcase TC_CSE_DMR_RET_015_SCH() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template PrimitiveContent v_contentResponse;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.schedule := m_contentSchedule_allOmit;
+						v_contentResponse.schedule.parentID := ?;
+							
+						v_ae1.start(f_CSE_DMR_RET_015(int18, m_createScheduleBase,v_contentResponse));//Schedule
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_DMR_RET_015_SUB() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var template PrimitiveContent v_contentResponse;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.subscription := m_contentSubscription_allOmit;
+						v_contentResponse.subscription.parentID := ?;
+							
+						v_ae1.start(f_CSE_DMR_RET_015(int23, m_createSubscriptionBase, v_contentResponse));//Subscription
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_DMR_RET_015_TS() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template PrimitiveContent v_contentResponse;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.timeSeries := m_contentTimeSeries_allOmit;
+						v_contentResponse.timeSeries.parentID := ?;
+		
+						v_ae1.start(f_CSE_DMR_RET_015(int29, m_createTimeSeriesBase, v_contentResponse));//TimeSeries
+						v_ae1.done;
+					}
+				
+				} // end g_CSE_DMR_RET_015
+
+				group g_CSE_DMR_RET_016 {
+					
+					/**
+					 * @desc Check that the IUT returns successfully the ATTRIBUTE of TARGET_RESOURCE_ADDRESS resource (“Content” option) under CSEBase
+					 * 
+					 */
+					testcase TC_CSE_DMR_RET_016_ACP() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var template PrimitiveContent v_contentResponse;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.accessControlPolicy := m_contentAcp_allOmit;
+						v_contentResponse.accessControlPolicy.parentID := ?;
+							
+						v_ae1.start(f_CSE_DMR_RET_016(int1, m_createAcpBase, v_contentResponse));//AccessControlPolicy
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_DMR_RET_016_AE() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					
+						var template PrimitiveContent v_contentResponse;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.aE := m_contentAe_allOmit;
+						v_contentResponse.aE.parentID := ?;
+								
+						v_ae1.start(f_CSE_DMR_RET_016(int2, m_createAe(PX_APP_ID), v_contentResponse));//AE
+						v_ae1.done;
+					}
+										
+					testcase TC_CSE_DMR_RET_016_CNT() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var template PrimitiveContent v_contentResponse;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.container := m_contentContainer_allOmit;
+						v_contentResponse.container.parentID := ?;
+						                       
+						v_ae1.start(f_CSE_DMR_RET_016(int3, m_createContainerBase, v_contentResponse));//Container
+						v_ae1.done;
+					}
+
+					testcase TC_CSE_DMR_RET_016_GRP() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var template PrimitiveContent v_contentResponse;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.group_ := m_contentGroup_allOmit;
+						v_contentResponse.group_.parentID := ?;
+																		
+						v_ae1.start(f_CSE_DMR_RET_016(int9, m_createGroupBase, v_contentResponse));//Group
+						v_ae1.done;
+					}
+				
+					testcase TC_CSE_DMR_RET_016_CSR() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var template PrimitiveContent v_contentResponse;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.remoteCSE := m_contentRemoteCSE_allOmit;
+						v_contentResponse.remoteCSE.parentID := ?;
+								
+						v_ae1.start(f_CSE_DMR_RET_016(int16, m_createRemoteCSEBase, v_contentResponse));//RemoteCSE
+						v_ae1.done;
+					}
+				
+					testcase TC_CSE_DMR_RET_016_SCH() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template PrimitiveContent v_contentResponse;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.schedule := m_contentSchedule_allOmit;
+						v_contentResponse.schedule.parentID := ?;
+								
+						v_ae1.start(f_CSE_DMR_RET_016(int18, m_createScheduleBase, v_contentResponse));//Schedule
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_DMR_RET_016_SUB() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					
+						var template PrimitiveContent v_contentResponse;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.subscription := m_contentSubscription_allOmit;
+						v_contentResponse.subscription.parentID := ?;
+								
+						v_ae1.start(f_CSE_DMR_RET_016(int23, m_createSubscriptionBase, v_contentResponse));//Subscription
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_DMR_RET_016_TS() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template PrimitiveContent v_contentResponse;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.timeSeries := m_contentTimeSeries_allOmit;
+						v_contentResponse.timeSeries.parentID := ?;
+			
+						v_ae1.start(f_CSE_DMR_RET_016(int29, m_createTimeSeriesBase, v_contentResponse));//TimeSeries
+						v_ae1.done;
+					}
+
+				} // end g_CSE_DMR_RET_016
+
+				group g_CSE_DMR_RET_017 {
+					
+					/**
+					 * @desc Check that the IUT returns  successfully multiple attributes of TARGET_RESOURCE_ADDRESS resource under CSEBase
+					 * 
+					 */
+					testcase TC_CSE_DMR_RET_017_ACP() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var template PrimitiveContent v_contentResponse;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.accessControlPolicy := m_contentAcp_allOmit;
+						v_contentResponse.accessControlPolicy.parentID := ?;
+						v_contentResponse.accessControlPolicy.creationTime := ?;
+							
+						v_ae1.start(f_CSE_DMR_RET_017(int1, m_createAcpBase, v_contentResponse));//AccessControlPolicy
+						v_ae1.done;
+					}
+										
+					testcase TC_CSE_DMR_RET_017_AE() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var template PrimitiveContent v_contentResponse;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.aE := m_contentAe_allOmit;
+						v_contentResponse.aE.parentID := ?;
+						v_contentResponse.aE.creationTime := ?;
+							
+						v_ae1.start(f_CSE_DMR_RET_017(int2, m_createAe(PX_APP_ID), v_contentResponse));//AE
+						v_ae1.done;
+					}
+										
+					testcase TC_CSE_DMR_RET_017_CNT() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var template PrimitiveContent v_contentResponse;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						
+						v_contentResponse.container := m_contentContainer_allOmit;
+						v_contentResponse.container.parentID := ?;
+						v_contentResponse.container.creationTime := ?;
+                        
+						v_ae1.start(f_CSE_DMR_RET_017(int3, m_createContainerBase, v_contentResponse));//Container
+						v_ae1.done;
+					}
+
+					/*testcase TC_CSE_DMR_RET_017_DLV() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						var template PrimitiveContent v_contentResponse;
+					
+						v_contentResponse.delivery := m_contentDelivery_allOmit;
+						v_contentResponse.delivery.parentID := ?;
+						v_contentResponse.delivery.creationTime := ?;
+
+						v_ae1.start(f_CSE_DMR_RET_017(int6, m_createDeliveryBase, v_contentResponse));//Delivery
+						v_ae1.done;
+					}*/
+
+					testcase TC_CSE_DMR_RET_017_GRP() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var template PrimitiveContent v_contentResponse;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.group_ := m_contentGroup_allOmit;
+						v_contentResponse.group_.parentID := ?;
+						v_contentResponse.group_.creationTime := ?;
+												
+						v_ae1.start(f_CSE_DMR_RET_017(int9, m_createGroupBase, v_contentResponse));//Group
+						v_ae1.done;
+					}
+				
+					testcase TC_CSE_DMR_RET_017_LCP() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var template PrimitiveContent v_contentResponse;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.locationPolicy := m_contentLocationPolicy_allOmit;
+						v_contentResponse.locationPolicy.parentID := ?;
+						v_contentResponse.locationPolicy.creationTime := ?;
+
+						v_ae1.start(f_CSE_DMR_RET_017(int10, m_createLocationPolicyBase, v_contentResponse));//LocationPolicy
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_DMR_RET_017_MGC() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					
+						var template PrimitiveContent v_contentResponse;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.mgmtCmd := m_contentMgmtCmd_allOmit;
+						v_contentResponse.mgmtCmd.parentID := ?;
+						v_contentResponse.mgmtCmd.creationTime := ?;
+
+						v_ae1.start(f_CSE_DMR_RET_017(int12, m_createMgmtCmdBase, v_contentResponse));//MgmtCmd
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_DMR_RET_017_NOD() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var template PrimitiveContent v_contentResponse;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.node := m_contentNode_allOmit;
+						v_contentResponse.node.parentID := ?;
+						v_contentResponse.node.creationTime := ?;
+
+						v_ae1.start(f_CSE_DMR_RET_017(int14, m_createNodeBase, v_contentResponse));//Node
+						v_ae1.done;
+					}
+				
+					testcase TC_CSE_DMR_RET_017_CSR() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var template PrimitiveContent v_contentResponse;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.remoteCSE := m_contentRemoteCSE_allOmit;
+						v_contentResponse.remoteCSE.parentID := ?;
+						v_contentResponse.remoteCSE.creationTime := ?;
+		
+						v_ae1.start(f_CSE_DMR_RET_017(int16, m_createRemoteCSEBase, v_contentResponse));//RemoteCSE
+						v_ae1.done;
+					}
+				
+					testcase TC_CSE_DMR_RET_017_SCH() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					
+						var template PrimitiveContent v_contentResponse;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.schedule := m_contentSchedule_allOmit;
+						v_contentResponse.schedule.parentID := ?;
+						v_contentResponse.schedule.creationTime := ?;
+							
+						v_ae1.start(f_CSE_DMR_RET_017(int18, m_createScheduleBase, v_contentResponse));//Schedule
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_DMR_RET_017_STCL() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var template PrimitiveContent v_contentResponse;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.statsCollect := m_contentStatsCollect_allOmit;
+						v_contentResponse.statsCollect.parentID := ?;
+						v_contentResponse.statsCollect.creationTime := ?;
+
+						v_ae1.start(f_CSE_DMR_RET_017(int21, m_createStatsCollectBase, v_contentResponse));//StatsCollect
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_DMR_RET_017_STCG() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var template PrimitiveContent v_contentResponse;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.statsConfig := m_contentStatsConfig_allOmit;
+						v_contentResponse.statsConfig.parentID := ?;
+						v_contentResponse.statsConfig.creationTime := ?;
+		
+						v_ae1.start(f_CSE_DMR_RET_017(int22, m_createStatsConfigBase, v_contentResponse));//StatsConfig
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_DMR_RET_017_SUB() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var template PrimitiveContent v_contentResponse;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.subscription := m_contentSubscription_allOmit;
+						v_contentResponse.subscription.parentID := ?;
+						v_contentResponse.subscription.creationTime := ?;
+							
+						v_ae1.start(f_CSE_DMR_RET_017(int23, m_createSubscriptionBase, v_contentResponse));//Subscription
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_DMR_RET_017_TS() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template PrimitiveContent v_contentResponse;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.timeSeries := m_contentTimeSeries_allOmit;
+						v_contentResponse.timeSeries.parentID := ?;
+						v_contentResponse.timeSeries.creationTime := ?;
+		
+						v_ae1.start(f_CSE_DMR_RET_017(int23, m_createTimeSeriesBase, v_contentResponse));//TimeSeries
+						v_ae1.done;
+					}
+
+				} // end g_CSE_DMR_RET_017
+
+				group g_CSE_DMR_RET_018 {
+					
+					/**
+					 * @desc Check that the IUT responds with an error when the AE tries to retrieve a non-existing attribute of the TARGET_RESOURCE_ADDRESS resource (“single” attribute case) under CSEBase
+					 * 
+					 */
+					testcase TC_CSE_DMR_RET_018_ACP_LBL() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+	
+						v_ae1.start(f_CSE_DMR_RET_018(int1, m_createAcpBase));//AccessControlPolicy
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_DMR_RET_018_AE_LBL() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+	
+						v_ae1.start(f_CSE_DMR_RET_018(int2, m_createAe(PX_APP_ID)));//AE
+						v_ae1.done;
+					}
+										
+					testcase TC_CSE_DMR_RET_018_CNT_LBL() runs on Tester system CseSystem {
+						// Local variables
+ 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+                        
+						v_ae1.start(f_CSE_DMR_RET_018(int3, m_createContainerBase));//Container
+						v_ae1.done;
+					}
+
+					testcase TC_CSE_DMR_RET_018_GRP_LBL() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						
+						v_ae1.start(f_CSE_DMR_RET_018(int9, m_createGroupBase));//Group
+						v_ae1.done;
+					}
+				
+					testcase TC_CSE_DMR_RET_018_CSR_LBL() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+
+						v_ae1.start(f_CSE_DMR_RET_018(int16, m_createRemoteCSEBase));//RemoteCSE
+						v_ae1.done;
+					}
+				
+					testcase TC_CSE_DMR_RET_018_SCH_LBL() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+	
+						v_ae1.start(f_CSE_DMR_RET_018(int18, m_createScheduleBase));//Schedule
+						v_ae1.done;
+					}
+										
+					testcase TC_CSE_DMR_RET_018_SUB_LBL() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+	
+						v_ae1.start(f_CSE_DMR_RET_018(int23, m_createSubscriptionBase));//Subscription
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_DMR_RET_018_TS_LBL() runs on AeSimu system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_ae1.start(f_CSE_DMR_RET_018(int29, m_createTimeSeriesBase));//TimeSeries
+						v_ae1.done;
+					}
+
+				} // end g_CSE_DMR_RET_018
+
+				group g_CSE_DMR_RET_019 {
+					
+					/**
+					 * @desc Check that the IUT responds with an error when the AE tries to retrieve a non-existing attribute of the TARGET_RESOURCE_ADDRESS resource (“multiple” attributes case) under CSEBase
+					 * 
+					 */
+					testcase TC_CSE_DMR_RET_019_ACP_LBL_AT() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+	
+						v_ae1.start(f_CSE_DMR_RET_019(int1, m_createAcpBase));//AccessControlPolicy
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_DMR_RET_019_AE_LBL_AT() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+	
+						v_ae1.start(f_CSE_DMR_RET_019(int2, m_createAe(PX_APP_ID)));//AE
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_DMR_RET_019_CNT_LBL_AT() runs on Tester system CseSystem {
+						// Local variables
+ 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+                        
+						v_ae1.start(f_CSE_DMR_RET_019(int3, m_createContainerBase));//Container
+						v_ae1.done;
+					}
+
+					testcase TC_CSE_DMR_RET_019_GRP_LBL_AT() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						
+						v_ae1.start(f_CSE_DMR_RET_019(int9, m_createGroupBase));//Group
+						v_ae1.done;
+					}					
+				
+					testcase TC_CSE_DMR_RET_019_CSR_LBL_AT() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+
+						v_ae1.start(f_CSE_DMR_RET_019(int16, m_createRemoteCSEBase));//RemoteCSE
+						v_ae1.done;
+					}				
+				
+					testcase TC_CSE_DMR_RET_019_SCH_LBL_AT() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+	
+						v_ae1.start(f_CSE_DMR_RET_019(int18, m_createScheduleBase));//Schedule
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_DMR_RET_019_SUB_LBL_AT() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+	
+						v_ae1.start(f_CSE_DMR_RET_019(int23, m_createSubscriptionBase));//Subscription
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_DMR_RET_019_TS_LBL_AT() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_ae1.start(f_CSE_DMR_RET_019(int29, m_createTimeSeriesBase));//TimeSeries
+						v_ae1.done;
+					}
+
+				} // end f_CSE_DMR_RET_019
+				
+				group g_CSE_DMR_RET_021 {
+		
+					/**
+					 * @desc Check that the IUT returns successfully only attributes of TARGET_RESOURCE_ADDRESS resource when the Result Content is set to 1 (attributes)
+					 * 
+					 */
+					testcase TC_CSE_DMR_RET_021_SCH() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var template PrimitiveContent v_contentResponse;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.schedule := mw_contentSchedule_rc1;
+			
+						v_ae1.start(f_CSE_DMR_RET_021(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase));//Schedule 
+						v_ae1.done;
+					}
+					testcase TC_CSE_DMR_RET_021_TS() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template PrimitiveContent v_contentResponse;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.timeSeries := mw_contentTimeSeries_rc1;
+
+						v_ae1.start(f_CSE_DMR_RET_021(int29, m_createTimeSeriesBase, v_contentResponse, int23, m_createSubscriptionBase));//TimeSeries
+						v_ae1.done;
+					}
+	
+				} // end g_CSE_DMR_RET_021
+
+				group g_CSE_DMR_RET_022 {
+		
+					/**
+					 * @desc Check that the IUT returns successfully only attributes and child resources of TARGET_RESOURCE_ADDRESS resource when the Result Content is set to 4 (attributes and child resources)
+					 * 
+					 */
+					testcase TC_CSE_DMR_RET_022_SCH() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var template PrimitiveContent v_contentResponse;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.schedule := mw_contentSchedule_rc4;
+			
+						v_ae1.start(f_CSE_DMR_RET_022(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase));//Schedule
+						v_ae1.done;
+					}
+		
+					testcase TC_CSE_DMR_RET_022_TS() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template PrimitiveContent v_contentResponse;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.timeSeries := mw_contentTimeSeries_rc4;
+
+						v_ae1.start(f_CSE_DMR_RET_022(int29, m_createTimeSeriesBase, v_contentResponse, int23, m_createSubscriptionBase));//TimeSeries
+						v_ae1.done;
+					}
+	
+				} // end g_CSE_DMR_RET_022
+
+				group g_CSE_DMR_RET_023 {
+		
+					/**
+					 * @desc Check that the IUT returns successfully only attributes and child resource references of TARGET_RESOURCE_ADDRESS resource when the Result Content is set to 5 (attributes and child resource references)
+					 * 
+					 */
+					testcase TC_CSE_DMR_RET_023_SCH() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var template PrimitiveContent v_contentResponse;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.schedule := mw_contentSchedule_rc5;
+			
+						v_ae1.start(f_CSE_DMR_RET_023(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase));//Schedule 
+						v_ae1.done;
+					}
+		
+					testcase TC_CSE_DMR_RET_023_TS() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template PrimitiveContent v_contentResponse;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.timeSeries := mw_contentTimeSeries_rc5;
+
+						v_ae1.start(f_CSE_DMR_RET_023(int29, m_createTimeSeriesBase, v_contentResponse, int23, m_createSubscriptionBase));//TimeSeries
+						v_ae1.done;
+					}
+	
+				} // end g_CSE_DMR_RET_023
+
+				group g_CSE_DMR_RET_024 {
+		
+					/**
+					 * @desc Check that the IUT returns successfully only child resource references of TARGET_RESOURCE_ADDRESS resource when Result Content is set to 6 (child resource references)
+					 * 
+					 */
+					testcase TC_CSE_DMR_RET_024_SCH() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template PrimitiveContent v_contentResponse;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.schedule := mw_contentSchedule_rc6;
+			
+						v_ae1.start(f_CSE_DMR_RET_024(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase));//Schedule
+						v_ae1.done;
+					}
+		
+					//Only Release 3
+					testcase TC_CSE_DMR_RET_024_PCH() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template PrimitiveContent v_contentResponse;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.pollingChannel := mw_contentPollingChannelBase;
+			
+						v_ae1.start(f_CSE_DMR_RET_024(int15, m_createPollingChannelBase, v_contentResponse, omit, omit));//PollingChannel
+						v_ae1.done;
+					}
+		
+					testcase TC_CSE_DMR_RET_024_TS() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template PrimitiveContent v_contentResponse;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.timeSeries := mw_contentTimeSeries_rc6;
+
+						v_ae1.start(f_CSE_DMR_RET_024(int29, m_createTimeSeriesBase, v_contentResponse, int23, m_createSubscriptionBase));//TimeSeries
+						v_ae1.done;
+					}
+	
+				} // end g_CSE_DMR_RET_024
+
+				group g_CSE_DMR_RET_025 {
+		
+					/**
+					 * @desc Check that the IUT returns successfully only child resources of TARGET_RESOURCE_ADDRESS resource when Result Content is set to 8 (child resources)
+					 * 
+					 */
+					testcase TC_CSE_DMR_RET_025_SCH() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template PrimitiveContent v_contentResponse;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.schedule := mw_contentSchedule_rc8;
+			
+						v_ae1.start(f_CSE_DMR_RET_025(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase));//Schedule 
+						v_ae1.done;
+					}
+		
+					//Only Release 3
+					testcase TC_CSE_DMR_RET_025_PCH() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template PrimitiveContent v_contentResponse;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.pollingChannel := mw_contentPollingChannelBase;
+			
+						v_ae1.start(f_CSE_DMR_RET_025(int15, m_createPollingChannelBase, v_contentResponse, omit, omit));//PollingChannel
+						v_ae1.done;
+					}
+		
+					testcase TC_CSE_DMR_RET_025_TS() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template PrimitiveContent v_contentResponse;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_contentResponse.timeSeries := mw_contentTimeSeries_rc8;
+
+						v_ae1.start(f_CSE_DMR_RET_025(int29, m_createTimeSeriesBase, v_contentResponse, int23, m_createSubscriptionBase));//TimeSeries
+						v_ae1.done;
+					}
+	
+				} // end g_CSE_DMR_RET_025
+			
+			}//end group Retrieve
+			
+			group Update {
+				group g_CSE_DMR_UPD_001 {
+					
+					/**
+					 * @desc Check that the IUT updates successfully the value of the attribute ATTRIBUTE_NAME of the TARGET_RESOURCE_ADDRESS resource 
+					 * 
+					 */
+					testcase TC_CSE_DMR_UPD_001_SCH_LBL() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var Labels v_labels_1 := {"VALUE_1"};
+						var Labels v_labels_2 := {"VALUE_2"};
+						var template RequestPrimitive v_createRequest := m_createScheduleBase;
+						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.schedule.labels := v_labels_1;
+						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;
+						
+						 
+																		
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							//Check attribute 1
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.schedule)) {
+									if(v_responsePrimitive.primitiveContent.schedule.labels != v_labels_2){
+										setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
+									}
+								}
+							}
+						
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+	
+							//Check that the resource has been udpated correctly
+							if(ischosen(v_primitiveContentRetrieveResource.schedule)) {
+								if(v_primitiveContentRetrieveResource.schedule.labels != v_labels_2){
+									setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
+								}
+							}
+						}						
+					
+					}
+					
+					testcase TC_CSE_DMR_UPD_001_TS_LBL() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var Labels v_labels_1 := {"VALUE_1"};
+						var Labels v_labels_2 := {"VALUE_2"};
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.timeSeries.labels := v_labels_1;
+						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;
+	
+	 
+													
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							//Check attribute 1
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
+									if(v_responsePrimitive.primitiveContent.timeSeries.labels != v_labels_2){
+										setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
+									}
+								}
+							}
+	
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+
+							//Check that the resource has been udpated correctly
+							if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
+								if(v_primitiveContentRetrieveResource.timeSeries.labels != v_labels_2){
+									setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
+								}
+							}
+						}
+					}
+					
+				} // end g_CSE_DMR_UPD_001
+				
+				group g_CSE_DMR_UPD_002 {
+					
+					/**
+					 * @desc Check that the IUT adds successfully the attribute ATTRIBUTE_NAME to the TARGET_RESOURCE_ADDRESS resource
+					 * 
+					 */
+					testcase TC_CSE_DMR_UPD_002_SCH_LBL() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var Labels v_labels_1 := {"VALUE_1"};
+						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						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;
+						
+						 
+																		
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							//Check attribute 1
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.schedule)) {
+									if(v_responsePrimitive.primitiveContent.schedule.labels != v_labels_1){
+										setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
+									}
+								}
+							}
+							
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+							
+							//Check that the resource has been udpated correctly
+							if(ischosen(v_primitiveContentRetrieveResource.schedule)) {
+								if(v_primitiveContentRetrieveResource.schedule.labels != v_labels_1){
+									setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
+								}
+							}
+						}
+					}
+					
+					testcase TC_CSE_DMR_UPD_002_TS_LBL() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var Labels v_labels_1 := {"VALUE_1"};
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						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;
+	
+	 
+													
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							//Check attribute 1
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
+									if(v_responsePrimitive.primitiveContent.timeSeries.labels != v_labels_1){
+										setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
+									}
+								}
+							}
+		
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+		
+							//Check that the resource has been udpated correctly
+						  if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
+							  if(v_primitiveContentRetrieveResource.timeSeries.labels != v_labels_1){
+										  setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
+								}
+							}
+						}
+					}
+					
+				} // end g_CSE_DMR_UPD_002
+				
+				group g_CSE_DMR_UPD_003 {
+					
+					/**
+					 * @desc Check that the IUT deletes successfully the attribute ATTRIBUTE_NAME from the TARGET_RESOURCE_ADDRESS resource 
+					 * 
+					 */
+					testcase TC_CSE_DMR_UPD_003_SCH_LBL() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var Labels v_labels_1 := {"VALUE_1"};
+						var Labels v_labels_2 := {"To be deleted"};
+						var AttributeAux_list v_nullFields;
+						var ResponsePrimitive v_responsePrimitive;
+						var template RequestPrimitive v_createRequest := m_createScheduleBase;
+						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.schedule.labels := v_labels_1;
+						v_updateRequest.primitiveContent.schedule.labels := v_labels_2;
+						
+						v_nullFields := {{"labels", omit}};
+						
+						v_ae1.start(f_CSE_DMR_UPD_003(int18, v_createRequest, v_updateRequest, v_nullFields));//Schedule
+						v_ae1.done;
+						
+						 
+																		
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							//Check attribute 1
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.schedule)) {
+									if(ispresent(v_responsePrimitive.primitiveContent.schedule.labels)){
+										setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly")
+									}
+								}
+							}
+							
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+							
+							//Check that the resource has been udpated correctly
+							if(ischosen(v_primitiveContentRetrieveResource.schedule)) {
+								if(ispresent(v_primitiveContentRetrieveResource.schedule.labels)) {
+								  if(not(match(v_primitiveContentRetrieveResource.schedule.labels,{""}))){
+									setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly")
+									}
+								}
+							}
+						}
+					}
+					
+					testcase TC_CSE_DMR_UPD_003_TS_LBL() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var Labels v_labels_1 := {"VALUE_1"};
+						var Labels v_labels_2 := {"To be deleted"};
+						var AttributeAux_list v_nullFields;
+						var ResponsePrimitive v_responsePrimitive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.timeSeries.labels := v_labels_1;
+						v_updateRequest.primitiveContent.timeSeries.labels := v_labels_2;
+	
+						v_nullFields := {{"labels", omit}};
+	
+						v_ae1.start(f_CSE_DMR_UPD_003(int29, v_createRequest, v_updateRequest, v_nullFields));//TimeSeries
+						v_ae1.done;
+	
+	 
+													
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							//Check attribute 1
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
+									if(ispresent(v_responsePrimitive.primitiveContent.timeSeries.labels)){
+										setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly")
+									}
+								}
+							}
+		
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+		
+							//Check that the resource has been udpated correctly
+							if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
+								if(ispresent(v_primitiveContentRetrieveResource.timeSeries.labels)) {
+								  if(not(match(v_primitiveContentRetrieveResource.timeSeries.labels,{""}))){
+									setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly")
+									}
+								}
+							}
+						}
+					}
+					
+				} // end g_CSE_DMR_UPD_003
+				
+				group g_CSE_DMR_UPD_004 {
+					
+					/**
+					 * @desc Check that the IUT updates  the value of the attribute ATTRIBUTE_NAME_1, and creates the ATTRIBUTE_NAME_2 and deletes the ATTRIBUTE_NAME_3 of the TARGET_RESOURCE_ADDRESS resource
+					 * 
+					 */
+					testcase TC_CSE_DMR_UPD_004_SCH_SE_AT_LBL() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var Labels v_labels_1 := {"To be deleted"};
+						var AttributeAux_list v_nullFields;
+						var template RequestPrimitive v_createRequest := m_createScheduleBase;
+						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.schedule.scheduleElement := {{"0 0 0,1,2 1 1 * *"}};//Attribute 1
+						v_updateRequest.primitiveContent.schedule.scheduleElement := {{"1 1 1,2 1 1 * *"}}; //Attribute 1
+						v_updateRequest.primitiveContent.schedule.announceTo := {f_getCompletePoA()};//Attribute 2
+						v_updateRequest.primitiveContent.schedule.labels := v_labels_1;//Attribute 3
+                						
+						v_nullFields := {{"labels", omit}};
+						
+						v_ae1.start(f_CSE_DMR_UPD_004(int18, v_createRequest, v_updateRequest, v_nullFields));//Schedule
+						v_ae1.done;
+						
+						 
+																		
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.schedule)) {
+									//Check attribute 1
+									if(v_responsePrimitive.primitiveContent.schedule.scheduleElement != valueof(v_updateRequest.primitiveContent.schedule.scheduleElement)){
+										setverdict(fail, __SCOPE__ & ": Error: Schedule Element attribute not updated correctly")
+									}
+									//Check attribute 2
+									if(v_responsePrimitive.primitiveContent.schedule.announceTo != valueof(v_updateRequest.primitiveContent.schedule.announceTo)){
+										setverdict(fail, __SCOPE__ & ": Error: Announce_To attribute not updated correctly")
+									}
+									//Check attribute 3
+									if(ispresent(v_responsePrimitive.primitiveContent.schedule.labels)){
+										setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly")
+									}
+								}
+							}
+							
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+							
+							//Check that the resource has been udpated correctly
+							if(ischosen(v_primitiveContentRetrieveResource.schedule)) {
+								//Check attribute 1
+								if(v_primitiveContentRetrieveResource.schedule.scheduleElement != valueof(v_updateRequest.primitiveContent.schedule.scheduleElement)){
+									setverdict(fail, __SCOPE__ & ": Error: Schedule Element attribute not updated correctly")
+						}
+								//Check attribute 2
+								if(v_primitiveContentRetrieveResource.schedule.announceTo != valueof(v_updateRequest.primitiveContent.schedule.announceTo)){
+									setverdict(fail, __SCOPE__ & ": Error: Announce_To attribute not updated correctly")
+					}
+								//Check attribute 3
+								if(ispresent(v_primitiveContentRetrieveResource.schedule.labels)){
+									setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly")
+								}
+							}
+						}
+					}
+					
+					testcase TC_CSE_DMR_UPD_004_TS_ET_MNI_LBL() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var Labels v_labels_1 := {"VALUE_1"};
+						var Labels v_labels_2 := {"To be deleted"};
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var AttributeAux_list v_nullFields;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.timeSeries.labels := v_labels_1;//Attribute 3
+						v_updateRequest.primitiveContent.timeSeries.expirationTime := "20301231T012345";//Attribute 1
+						v_updateRequest.primitiveContent.timeSeries.maxNrOfInstances := 5;//Attribute 2
+						v_updateRequest.primitiveContent.timeSeries.labels := v_labels_2;//Attribute 3
+						
+						v_nullFields := {{"labels", omit}};
+						
+						v_ae1.start(f_CSE_DMR_UPD_004(int29, v_createRequest, v_updateRequest, v_nullFields));//TimeSeries
+						v_ae1.done;					 
+																		
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
+									//Check attribute 1
+									if(v_responsePrimitive.primitiveContent.timeSeries.expirationTime != valueof(v_updateRequest.primitiveContent.timeSeries.expirationTime)){
+										setverdict(fail, __SCOPE__ & ": Error: Expiration Time attribute not updated correctly")
+									}
+									//Check attribute 2
+									if(v_responsePrimitive.primitiveContent.timeSeries.maxNrOfInstances != valueof(v_updateRequest.primitiveContent.timeSeries.maxNrOfInstances)){
+										setverdict(fail, __SCOPE__ & ": Error: MaxNrOfInstances attribute not updated correctly")
+									}
+									//Check attribute 3
+									if(ispresent(v_responsePrimitive.primitiveContent.timeSeries.labels)){
+										setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly")
+									}
+								}
+							}
+							
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+							
+							//Check that the resource has been udpated correctly
+							  if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
+								  //Check attribute 1
+								  if(v_primitiveContentRetrieveResource.timeSeries.expirationTime != valueof(v_updateRequest.primitiveContent.timeSeries.expirationTime)){
+									  setverdict(fail, __SCOPE__ & ": Error: Expiration Time attribute not updated correctly")
+								  }
+								  //Check attribute 2
+								  if(v_primitiveContentRetrieveResource.timeSeries.maxNrOfInstances != valueof(v_updateRequest.primitiveContent.timeSeries.maxNrOfInstances)){
+									  setverdict(fail, __SCOPE__ & ": Error: MaxNrOfInstances attribute not updated correctly")
+								  }
+								  //Check attribute 3
+								  if(ispresent(v_primitiveContentRetrieveResource.timeSeries.labels)){
+									  setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly")
+								  }
+							  }
+						}
+					}
+					
+				} // end g_CSE_DMR_UPD_004
+				
+				group g_CSE_DMR_UPD_006{
+					
+					/**
+					 * @desc Check that the IUT responds with an error when the AE tries to update the attribute ATTRIBUTE_NAME of a TARGET_RESOURCE_ADDRESS resource without having privileges for the UPDATE operation
+					 * 
+					 */
+					testcase TC_CSE_DMR_UPD_006_SCH_LBL() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var Labels v_labels_1 := {"VALUE_1"};
+						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						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;
+						
+						if(getverdict == pass){ 
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+							//Check that the resource has NOT been udpated
+							  if(ischosen(v_primitiveContentRetrieveResource.schedule)) {
+							   if(v_primitiveContentRetrieveResource.schedule.labels == v_labels_1){
+								 setverdict(fail, __SCOPE__ & ": Error: Labels attribute updated")
+								}
+							}
+						}
+					}
+					
+					testcase TC_CSE_DMR_UPD_006_TS_LBL() runs on Tester system CseSystem {
+						// Local variable
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var Labels v_labels_1 := {"VALUE_1"};
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						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;
+	
+						if(getverdict == pass){ 
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+
+							//Check that the resource has NOT been udpated
+							  if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
+							   if(v_primitiveContentRetrieveResource.timeSeries.labels == v_labels_1){
+								 setverdict(fail, __SCOPE__ & ": Error: Labels attribute updated")
+								}
+							}
+						}
+					}
+					
+				} // end g_CSE_DMR_UPD_006
+				
+				group g_CSE_DMR_UPD_007{
+					
+					/**
+					 * @desc Check that the IUT responds with an error when the AE tries to update a non-RW attribute ATTRIBUTE_NAME of a TARGET_RESOURCE_ADDRESS resource
+					 * 
+					 */
+					testcase TC_CSE_DMR_UPD_007_SCH_CT() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var Timestamp v_creationTime := "21001231T012345";
+						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_updateRequest.primitiveContent := {schedule_update_invalid := m_contentUpdateSchedule_invalid};
+						v_updateRequest.primitiveContent.schedule_update_invalid.creationTime := v_creationTime;
+										
+						v_ae1.start(f_CSE_DMR_UPD_007(int18, m_createScheduleBase, v_updateRequest));//Schedule
+						v_ae1.done;
+						
+						if(getverdict == pass){ 
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+							//Check that the resource has NOT been udpated
+							  if(ischosen(v_primitiveContentRetrieveResource.schedule_update_invalid)) {
+							   if(v_primitiveContentRetrieveResource.schedule_update_invalid.creationTime == v_creationTime){
+								 setverdict(fail, __SCOPE__ & ": Error: Creation Time attribute updated")
+								}
+							}
+						}
+					}
+					
+					testcase TC_CSE_DMR_UPD_007_TS_CT() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var Timestamp v_creationTime := "21001231T012345";
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_updateRequest.primitiveContent := {timeSeries_update_invalid := m_contentUpdateTimeSeries_invalid};
+						v_updateRequest.primitiveContent.timeSeries_update_invalid.creationTime := v_creationTime;
+		
+						v_ae1.start(f_CSE_DMR_UPD_007(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
+						v_ae1.done;
+	
+						if(getverdict == pass){ 
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+							//Check that the resource has NOT been udpated
+							  if(ischosen(v_primitiveContentRetrieveResource.timeSeries_update_invalid)) {
+							   if(v_primitiveContentRetrieveResource.timeSeries_update_invalid.creationTime == v_creationTime){
+								 setverdict(fail, __SCOPE__ & ": Error: Creation Time attribute updated")
+								}
+							}
+						}
+					}
+					
+				} // end g_CSE_DMR_UPD_007			
+				
+				group g_CSE_DMR_UPD_008{
+					
+					/**
+					 * @desc Check that the IUT responds with an error when the AE tries to delete a mandatory RW attribute ATTRIBUTE_NAME of a TARGET_RESOURCE_ADDRESS resource
+					 * 
+					 */
+					testcase TC_CSE_DMR_UPD_008_SCH_ET() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var Timestamp v_expirationTime := "21001231T012345";
+						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
+						var AttributeAux_list v_nullFields;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_nullFields := {{"expirationTime", omit}};
+						
+						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;
+						
+						if(getverdict == pass){ 
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+							  //Check that the resource has NOT been udpated
+							  if(ischosen(v_primitiveContentRetrieveResource.schedule)) {
+							   if(v_primitiveContentRetrieveResource.schedule.expirationTime == v_expirationTime){
+								 setverdict(fail, __SCOPE__ & ": Error: Expiration time attribute updated")
+								}
+							}
+						}
+					}
+					
+					
+				} // end g_CSE_DMR_UPD_008
+				
+				group g_CSE_DMR_UPD_009{
+					
+					/**
+					 * @desc Check that the IUT responds with an error when the AE tries to update an attribute of a  TARGET_RESOURCE_ADDRESS resource which does not exist
+					 * 
+					 */
+					testcase TC_CSE_DMR_UPD_009_SCH_EXC() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var XSD.PositiveInteger v_expirationCounter := 1;
+						var template RequestPrimitive v_createRequest := m_createScheduleBase;
+						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_updateRequest.primitiveContent := {schedule_update_invalid := m_contentUpdateSchedule_invalid};
+
+						v_updateRequest.primitiveContent.schedule_update_invalid.expirationCounter := v_expirationCounter;
+										
+						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;
+						var XSD.PositiveInteger v_expirationCounter := 1;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_updateRequest.primitiveContent := {timeSeries_update_invalid := m_contentUpdateTimeSeries_invalid};
+	
+						v_updateRequest.primitiveContent.timeSeries_update_invalid.expirationCounter := v_expirationCounter;
+		
+						v_ae1.start(f_CSE_DMR_UPD_009(int29, v_createRequest, v_updateRequest));//TimeSeries
+						v_ae1.done;
+					}
+					
+				} // end g_CSE_DMR_UPD_009		
+				
+				group g_CSE_DMR_UPD_010{
+					
+					/**
+					 * @desc Check that the stateTag attribute of a RESOURCE_TYPE resource is increased when an update operation has been performed on its child resource
+					 * 
+					 */
+					testcase TC_CSE_DMR_UPD_010_TS() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var RequestPrimitive v_updateRequest := valueof(m_updateTimeSeriesBase);
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var Labels v_labels_1:= {"VALUE_1"};
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+						
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_updateRequest.primitiveContent.timeSeries.labels := v_labels_1;
+		
+						v_ae1.start(f_CSE_DMR_UPD_010(int29, v_createRequest, v_updateRequest));//TimeSeries
+						v_ae1.done;
+	
+						if(getverdict == pass){ 
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+							//Check that stateTag has been incremented
+							  if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
+							   if(v_primitiveContentRetrieveResource.timeSeries.stateTag == 1){
+									setverdict(pass, __SCOPE__ & ": The stateTag attribute is incremented");	
+							   }else{
+									setverdict(fail, __SCOPE__ & ": Error the stateTag attribute is not incremented");
+							   }
+							}
+						}
+					}
+	
+				} // end g_CSE_DMR_UPD_010		
+				
+				group g_CSE_DMR_UPD_011{
+					
+					/**
+					 * @desc Check that the IUT rejects the UPDATE Request of an existing RESOURCE_TYPE resource with error “OPERATION_NOT_ALLOWED”
+					 * 
+					 */
+					testcase TC_CSE_DMR_UPD_011_TS_TSI() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesInstanceBase;
+						var Labels v_labels:= {"LABEL"};
+						var template RequestPrimitive v_createParentRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_createChildRequest := m_createTimeSeriesInstanceBase;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+		
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						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;
+
+						if(getverdict == pass){ 
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+							//Check that the resource has NOT been udpated
+							if(ischosen(v_primitiveContentRetrieveResource.timeSeriesInstance)) {
+								if(v_primitiveContentRetrieveResource.timeSeriesInstance.labels == v_labels){
+									setverdict(fail, __SCOPE__ & ": Error: Labels attribute updated")
+								}
+							}
+						}
+					}
+
+				} // end g_CSE_DMR_UPD_011
+
+				group g_CSE_DMR_UPD_014 {
+					
+					/**
+					 * @desc Check that the IUT updates successfully the value of the optional attribute OPTIONAL_ATTRIBUTE of the RESOURCE_TYPE resource. 
+					 * 
+					 */
+					testcase TC_CSE_DMR_UPD_014_TS_ACPI() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var AcpType v_accessControlPolicyIDs_1 := {"NotInitialized_1"};
+						var AcpType v_accessControlPolicyIDs_2 := {"NotInitialized_2"};
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+						var ResponsePrimitive v_responsePrimitive;
+	
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.timeSeries.accessControlPolicyIDs := v_accessControlPolicyIDs_1;
+						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;	 
+	
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							//Check attribute 1
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
+									if(v_responsePrimitive.primitiveContent.timeSeries.accessControlPolicyIDs != v_accessControlPolicyIDs_2){
+										setverdict(fail, __SCOPE__ & ": Error: AccessControlPolicyIDs attribute not updated correctly")
+									}
+								}
+							}
+						}
+	
+					}
+					
+					testcase TC_CSE_DMR_UPD_014_TS_LBL() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var Labels v_labels_1 := {"VALUE_1"};
+						var Labels v_labels_2 := {"VALUE_2"};
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+						var ResponsePrimitive v_responsePrimitive;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.timeSeries.labels := v_labels_1;
+						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;	 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							//Check attribute 1
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
+									if(v_responsePrimitive.primitiveContent.timeSeries.labels != v_labels_2){
+										setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
+									}
+								}
+							}
+						}
+
+					}
+					
+					testcase TC_CSE_DMR_UPD_014_TS_MBS() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var XSD.NonNegativeInteger v_maxByteSize_1 := 256;
+						var XSD.NonNegativeInteger v_maxByteSize_2 := 512;
+						var ResponsePrimitive v_responsePrimitive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize_1;
+						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;	 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							//Check attribute 1
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
+									if(v_responsePrimitive.primitiveContent.timeSeries.maxByteSize != v_maxByteSize_2){
+										setverdict(fail, __SCOPE__ & ": Error: MaxByteSize attribute not updated correctly")
+									}
+								}
+							}
+						}
+					}
+
+					testcase TC_CSE_DMR_UPD_014_TS_MIA() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var XSD.NonNegativeInteger v_maxInstanceAge_1 := 60;
+						var XSD.NonNegativeInteger v_maxInstanceAge_2 := 120;
+						var ResponsePrimitive v_responsePrimitive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.timeSeries.maxInstanceAge := v_maxInstanceAge_1;
+						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;	 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							//Check attribute 1
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
+									if(v_responsePrimitive.primitiveContent.timeSeries.maxInstanceAge != v_maxInstanceAge_2){
+										setverdict(fail, __SCOPE__ & ": Error: MaxInstanceAge attribute not updated correctly")
+									}
+								}
+							}
+						}
+					}
+
+					testcase TC_CSE_DMR_UPD_014_TS_MNI() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var XSD.NonNegativeInteger v_maxNrOfInstances_1 := 1;
+						var XSD.NonNegativeInteger v_maxNrOfInstances_2 := 2;
+						var ResponsePrimitive v_responsePrimitive;
+
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.timeSeries.maxNrOfInstances := v_maxNrOfInstances_1;
+						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;	 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							//Check attribute 1
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
+									if(v_responsePrimitive.primitiveContent.timeSeries.maxNrOfInstances != v_maxNrOfInstances_2){
+										setverdict(fail, __SCOPE__ & ": Error: MaxNrOfInstances attribute not updated correctly")
+									}
+								}
+							}
+						}
+					}
+					
+					testcase TC_CSE_DMR_UPD_014_TS_PEI() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var XSD.NonNegativeInteger v_periodicInterval_1 := 1;
+						var XSD.NonNegativeInteger v_periodicInterval_2 := 2;
+						var ResponsePrimitive v_responsePrimitive;
+
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.timeSeries.periodicInterval := v_periodicInterval_1;
+						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;	 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							//Check attribute 1
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
+									if(v_responsePrimitive.primitiveContent.timeSeries.periodicInterval != v_periodicInterval_2){
+										setverdict(fail, __SCOPE__ & ": Error: PeriodicInterval attribute not updated correctly")
+									}
+								}
+							}
+						}
+					}
+					
+					testcase TC_CSE_DMR_UPD_014_TS_MDD() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var XSD.Boolean v_missingDataDetect_1 := true;
+						var XSD.Boolean v_missingDataDetect_2 := false;
+						var ResponsePrimitive v_responsePrimitive;
+	
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+	
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.timeSeries.missingDataDetect := v_missingDataDetect_1;
+						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;	 
+	
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							//Check attribute 1
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
+									if(v_responsePrimitive.primitiveContent.timeSeries.missingDataDetect != v_missingDataDetect_2){
+										setverdict(fail, __SCOPE__ & ": Error: MissingDataDetect attribute not updated correctly")
+									}
+								}
+							}
+						}
+					}
+					
+					testcase TC_CSE_DMR_UPD_014_TS_MDN() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var XSD.NonNegativeInteger v_missingDataMaxNr_1 := 1;
+						var XSD.NonNegativeInteger v_missingDataMaxNr_2 := 2;
+						var ResponsePrimitive v_responsePrimitive;
+
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.timeSeries.missingDataMaxNr := v_missingDataMaxNr_1;
+						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;	 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							//Check attribute 1
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
+									if(v_responsePrimitive.primitiveContent.timeSeries.missingDataMaxNr != v_missingDataMaxNr_2){
+										setverdict(fail, __SCOPE__ & ": Error: MissingDataMaxNr attribute not updated correctly")
+									}
+								}
+							}
+						}
+					}
+					
+					testcase TC_CSE_DMR_UPD_014_TS_MDT() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var XSD.NonNegativeInteger v_missingDataDetectTimer_1 := 1;
+						var XSD.NonNegativeInteger v_missingDataDetectTimer_2 := 2;
+						var ResponsePrimitive v_responsePrimitive;
+
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.timeSeries.missingDataDetectTimer := v_missingDataDetectTimer_1;
+						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;	 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							//Check attribute 1
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
+									if(v_responsePrimitive.primitiveContent.timeSeries.missingDataDetectTimer != v_missingDataDetectTimer_2){
+										setverdict(fail, __SCOPE__ & ": Error: MissingDataDetectTimer attribute not updated correctly")
+									}
+								}
+							}
+						}
+					}
+					
+					testcase TC_CSE_DMR_UPD_014_TS_OR() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var XSD.AnyURI v_ontologyRef_1 := "MyOntologyRef_1";
+						var XSD.AnyURI v_ontologyRef_2 := "MyOntologyRef_2";
+						var ResponsePrimitive v_responsePrimitive;
+
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.timeSeries.ontologyRef := v_ontologyRef_1;
+						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;	 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							//Check attribute 1
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
+									if(v_responsePrimitive.primitiveContent.timeSeries.ontologyRef != v_ontologyRef_2){
+										setverdict(fail, __SCOPE__ & ": Error: OntologyRef attribute not updated correctly")
+									}
+								}
+							}
+						}
+					}
+	
+				} // end g_CSE_DMR_UPD_014
+
+				group g_CSE_DMR_UPD_015{
+			  		
+					/**
+					 * @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_NOD_LBL() runs on Tester system CseSystem {
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var Labels v_labels := {"MyLabel"};
+						var template RequestPrimitive v_updateRequest := m_updateNodeBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_updateRequest.primitiveContent.node.labels := v_labels;
+						
+						v_ae1.start(f_CSE_DMR_UPD_015(int9, m_createNodeBase, v_updateRequest));//Node
+						v_ae1.done;
+						
+						 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							 //Check attribute 1
+							 if(ispresent(v_responsePrimitive.primitiveContent)) {
+								 if(ischosen(v_responsePrimitive.primitiveContent.node)) {
+									 if(v_responsePrimitive.primitiveContent.node.labels != v_labels){
+										 setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
+									 }
+								 }
+							 }
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
+							 
+							//Check that the resource has been udpated correctly
+							  if(ischosen(v_primitiveContentRetrieveResource.node)) {
+							   if(v_primitiveContentRetrieveResource.node.labels != v_labels){
+								setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
+							  }
+							}
+						 }
+					}
+					
+					testcase TC_CSE_DMR_UPD_015_NOD_ACPI() runs on Tester system CseSystem {
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var template RequestPrimitive v_updateRequest := m_updateNodeBase;
+						var RequestPrimitive v_updateRequestPrimitive;
+						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+						
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_ae1.start(f_CSE_DMR_UPD_015(int9, m_createNodeBase, v_updateRequest, true));//Node
+						v_ae1.done;
+						
+						 
+
+						if(getverdict == pass){
+							 v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							 
+							 v_updateRequestPrimitive := f_getRequestPrimitive(v_ae1);	
+							 //Check attribute 1
+							 if(ispresent(v_responsePrimitive.primitiveContent)) {
+								 if(ischosen(v_responsePrimitive.primitiveContent.node)) {
+									 if(v_responsePrimitive.primitiveContent.node.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.node.accessControlPolicyIDs)){
+										 setverdict(fail, __SCOPE__ & ": Error: Access Control Policy attribute not updated correctly")
+									 }
+								 }
+							 }
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);						
+	 
+							//Check that the resource has been udpated correctly
+							  if(ischosen(v_primitiveContentRetrieveResource.node)) {
+							   if(v_primitiveContentRetrieveResource.node.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.node.accessControlPolicyIDs)){
+								setverdict(fail, __SCOPE__ & ": Error: Access Control Policy attribute not updated correctly")
+							  }
+							}
+						 }
+					}
+					
+					testcase TC_CSE_DMR_UPD_015_NOD_HCL() runs on Tester system CseSystem {
+						
+						/* TO BE DONE */
+					}
+					
+					testcase TC_CSE_DMR_UPD_015_AE_OR() runs on Tester system CseSystem {
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var XSD.AnyURI v_ontoLogyRef := "MyOntologyRef";
+						var template RequestPrimitive v_updateRequest := m_updateAeBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_updateRequest.primitiveContent.aE.ontologyRef := v_ontoLogyRef;
+						v_ae1.start(f_CSE_DMR_UPD_015(int2, m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM), v_updateRequest));//AE
+						v_ae1.done;
+						
+						 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							 //Check attribute 1
+							 if(ispresent(v_responsePrimitive.primitiveContent)) {
+								 if(ischosen(v_responsePrimitive.primitiveContent.aE)) {
+									 if(v_responsePrimitive.primitiveContent.aE.ontologyRef != v_ontoLogyRef){
+										 setverdict(fail, __SCOPE__ & ": Error: Ontology Ref attribute not updated correctly")
+									 }
+								 }
+							 }
+ 							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
+ 
+							  //Check that the resource has been udpated correctly
+							  if(ischosen(v_primitiveContentRetrieveResource.aE)) {
+							   if(v_primitiveContentRetrieveResource.aE.ontologyRef != v_ontoLogyRef){
+								setverdict(fail, __SCOPE__ & ": Error: Ontology Ref attribute not updated correctly")
+							  }
+							}
+						 }
+					}
+					
+					testcase TC_CSE_DMR_UPD_015_CNT_OR() runs on Tester system CseSystem {
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var XSD.AnyURI v_ontoLogyRef := "MyOntologyRef";
+						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_updateRequest.primitiveContent.container.ontologyRef := v_ontoLogyRef;
+						
+						v_ae1.start(f_CSE_DMR_UPD_015(int3, m_createContainerBase, v_updateRequest));//Container
+						v_ae1.done;
+						
+						 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							 //Check attribute 1
+							 if(ispresent(v_responsePrimitive.primitiveContent)) {
+								 if(ischosen(v_responsePrimitive.primitiveContent.container)) {
+									 if(v_responsePrimitive.primitiveContent.container.ontologyRef != v_ontoLogyRef){
+										 setverdict(fail, __SCOPE__ & ": Error: Ontology Ref attribute not updated correctly")
+									 }
+								 }
+							 }
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
+	 
+							  //Check that the resource has been udpated correctly
+							  if(ischosen(v_primitiveContentRetrieveResource.container)) {
+							   if(v_primitiveContentRetrieveResource.container.ontologyRef != v_ontoLogyRef){
+								setverdict(fail, __SCOPE__ & ": Error: Ontology Ref attribute not updated correctly")
+							  }
+							}
+						 }
+					}
+					
+					testcase TC_CSE_DMR_UPD_015_CNT_LI() runs on Tester system CseSystem {
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var XSD.AnyURI v_locationID := "MyLocationID";
+						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_updateRequest.primitiveContent.container.locationID := v_locationID;
+						
+						v_ae1.start(f_CSE_DMR_UPD_015(int3, m_createContainerBase, v_updateRequest));//Container
+						v_ae1.done;
+						
+						 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							 //Check attribute 1
+							 if(ispresent(v_responsePrimitive.primitiveContent)) {
+								 if(ischosen(v_responsePrimitive.primitiveContent.container)) {
+									 if(v_responsePrimitive.primitiveContent.container.locationID != v_locationID){
+										 setverdict(fail, __SCOPE__ & ": Error: Location ID attribute not updated correctly")
+									 }
+								 }
+							 }
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
+	 
+													  //Check that the resource has been udpated correctly
+							  if(ischosen(v_primitiveContentRetrieveResource.container)) {
+							   if(v_primitiveContentRetrieveResource.container.locationID != v_locationID){
+								setverdict(fail, __SCOPE__ & ": Error: Location ID attribute not updated correctly")
+							  }
+							}
+						 }
+					}
+					
+					testcase TC_CSE_DMR_UPD_015_SUB_ENC() runs on Tester system CseSystem {
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var EventNotificationCriteria v_eventNotificationCriteria:= valueof(m_eventNotificationCriteria({int3}, -));
+						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_updateRequest.primitiveContent.subscription.eventNotificationCriteria:=v_eventNotificationCriteria ;
+						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
+						v_ae1.done;
+						
+						 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							 //Check attribute 1
+							 if(ispresent(v_responsePrimitive.primitiveContent)) {
+								 if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
+									 if(v_responsePrimitive.primitiveContent.subscription.eventNotificationCriteria != v_eventNotificationCriteria){
+										 setverdict(fail, __SCOPE__ & ": Error: Event Notification Criteria attribute not updated correctly")
+									 }
+								 }
+							 }
+ 							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
+ 
+							  //Check that the resource has been udpated correctly
+							  if(ischosen(v_primitiveContentRetrieveResource.subscription)) {
+							   if(v_primitiveContentRetrieveResource.subscription.eventNotificationCriteria != v_eventNotificationCriteria){
+								setverdict(fail, __SCOPE__ & ": Error: Event Notofication Criteria attribute not updated correctly")
+							  }
+							}
+						 }
+					}
+					
+					testcase TC_CSE_DMR_UPD_015_SUB_EXC() runs on Tester system CseSystem {
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var XSD.PositiveInteger v_expirationCounter:=10;
+						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_updateRequest.primitiveContent.subscription.expirationCounter:=v_expirationCounter;
+						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
+						v_ae1.done;
+						
+						 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							 //Check attribute 1
+							 if(ispresent(v_responsePrimitive.primitiveContent)) {
+								 if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
+									 if(v_responsePrimitive.primitiveContent.subscription.expirationCounter != v_expirationCounter){
+										 setverdict(fail, __SCOPE__ & ": Error: Expiration Counter attribute not updated correctly")
+									 }
+								 }
+							 }
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
+ 
+							  //Check that the resource has been udpated correctly
+							  if(ischosen(v_primitiveContentRetrieveResource.subscription)) {
+							   if(v_primitiveContentRetrieveResource.subscription.expirationCounter != v_expirationCounter){
+								setverdict(fail, __SCOPE__ & ": Error: Expiration Counter attribute not updated correctly")
+							  }
+							}
+						 }
+					}
+					
+					testcase TC_CSE_DMR_UPD_015_SUB_GPI() runs on Tester system CseSystem {
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var XSD.AnyURI v_groupID := "MyGroupID";
+						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_updateRequest.primitiveContent.subscription.groupID:=v_groupID;
+						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
+						v_ae1.done;
+						
+						 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							 //Check attribute 1
+							 if(ispresent(v_responsePrimitive.primitiveContent)) {
+								 if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
+									 if(v_responsePrimitive.primitiveContent.subscription.groupID != v_groupID){
+										 setverdict(fail, __SCOPE__ & ": Error: Group ID attribute not updated correctly")
+									 }
+								 }
+							 }
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
+	 
+							  //Check that the resource has been udpated correctly
+							  if(ischosen(v_primitiveContentRetrieveResource.subscription)) {
+							   if(v_primitiveContentRetrieveResource.subscription.groupID != v_groupID){
+								setverdict(fail, __SCOPE__ & ": Error: Group ID attribute not updated correctly")
+							  }
+							}
+						 } 
+					}
+					
+					testcase TC_CSE_DMR_UPD_015_SUB_NFU() runs on Tester system CseSystem {
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var XSD.AnyURI v_notificationForwardingURI:= "MyNotificationForwardingURI";
+						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_updateRequest.primitiveContent.subscription.notificationForwardingURI:=v_notificationForwardingURI;
+						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
+						v_ae1.done;
+						
+						 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							 //Check attribute 1
+							 if(ispresent(v_responsePrimitive.primitiveContent)) {
+								 if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
+									 if(v_responsePrimitive.primitiveContent.subscription.notificationForwardingURI != v_notificationForwardingURI){
+										 setverdict(fail, __SCOPE__ & ": Error: Notification Forwarding URI attribute not updated correctly")
+									 }
+								 }
+							 }
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
+	 
+							  //Check that the resource has been udpated correctly
+							  if(ischosen(v_primitiveContentRetrieveResource.subscription)) {
+							   if(v_primitiveContentRetrieveResource.subscription.notificationForwardingURI != v_notificationForwardingURI){
+								setverdict(fail, __SCOPE__ & ": Error: Notification Forwarding URI attribute not updated correctly")
+							  }
+							}
+						 }
+					}
+					
+					testcase TC_CSE_DMR_UPD_015_SUB_BN() runs on Tester system CseSystem {
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var BatchNotify v_batchNotify:= {1, "PT1S"};
+						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_updateRequest.primitiveContent.subscription.batchNotify:=v_batchNotify;
+						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
+						v_ae1.done;
+						
+						 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							 //Check attribute 1
+							 if(ispresent(v_responsePrimitive.primitiveContent)) {
+								 if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
+									 if(v_responsePrimitive.primitiveContent.subscription.batchNotify != v_batchNotify){
+										 setverdict(fail, __SCOPE__ & ": Error: Batch Notify attribute not updated correctly")
+									 }
+								 }
+							 }
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
+ 
+							  //Check that the resource has been udpated correctly
+							  if(ischosen(v_primitiveContentRetrieveResource.subscription)) {
+							   if(v_primitiveContentRetrieveResource.subscription.batchNotify != v_batchNotify){
+								setverdict(fail, __SCOPE__ & ": Error: Batch Notify attribute not updated correctly")
+							  }
+							}
+						 }
+					}
+					
+					testcase TC_CSE_DMR_UPD_015_SUB_RL() runs on Tester system CseSystem {
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var RateLimit v_rateLimit:= {2, "PT1S"};
+						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_updateRequest.primitiveContent.subscription.rateLimit:=v_rateLimit;
+						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
+						v_ae1.done;
+						
+						 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							 //Check attribute 1
+							 if(ispresent(v_responsePrimitive.primitiveContent)) {
+								 if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
+									 if(v_responsePrimitive.primitiveContent.subscription.rateLimit != v_rateLimit){
+										 setverdict(fail, __SCOPE__ & ": Error: Rate Limit attribute not updated correctly")
+									 }
+								 }
+							 }
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
+	 
+							  //Check that the resource has been udpated correctly
+							  if(ischosen(v_primitiveContentRetrieveResource.subscription)) {
+							   if(v_primitiveContentRetrieveResource.subscription.rateLimit != v_rateLimit){
+								setverdict(fail, __SCOPE__ & ": Error: Rate Limit attribute not updated correctly")
+							  }
+							}
+						 }
+					}
+					
+					testcase TC_CSE_DMR_UPD_015_SUB_PN() runs on Tester system CseSystem {
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var PendingNotification v_pendingNotification:=int2;
+						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_updateRequest.primitiveContent.subscription.pendingNotification:=v_pendingNotification;
+						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
+						v_ae1.done;
+						
+						 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							 //Check attribute 1
+							 if(ispresent(v_responsePrimitive.primitiveContent)) {
+								 if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
+									 if(v_responsePrimitive.primitiveContent.subscription.pendingNotification != v_pendingNotification){
+										 setverdict(fail, __SCOPE__ & ": Error: Pending Notification attribute not updated correctly")
+									 }
+								 }
+							 }
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
+ 
+							//Check that the resource has been udpated correctly
+							  if(ischosen(v_primitiveContentRetrieveResource.subscription)) {
+							   if(v_primitiveContentRetrieveResource.subscription.pendingNotification != v_pendingNotification){
+								setverdict(fail, __SCOPE__ & ": Error: Pending Notification attribute not updated correctly")
+							  }
+							}
+						 }
+					}
+					
+					testcase TC_CSE_DMR_UPD_015_SUB_NSP() runs on Tester system CseSystem {
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var XSD.PositiveInteger v_notificationStoragePriority:=10;
+						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_updateRequest.primitiveContent.subscription.notificationStoragePriority:=v_notificationStoragePriority;
+						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
+						v_ae1.done;
+						
+						 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							 //Check attribute 1
+							 if(ispresent(v_responsePrimitive.primitiveContent)) {
+								 if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
+									 if(v_responsePrimitive.primitiveContent.subscription.notificationStoragePriority != v_notificationStoragePriority){
+										 setverdict(fail, __SCOPE__ & ": Error: Notification Storage priority attribute not updated correctly")
+									 }
+								 }
+							 }
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
+	 
+														//Check that the resource has been udpated correctly
+							  if(ischosen(v_primitiveContentRetrieveResource.subscription)) {
+							   if(v_primitiveContentRetrieveResource.subscription.notificationStoragePriority != v_notificationStoragePriority){
+								setverdict(fail, __SCOPE__ & ": Error: Notification Storage priority attribute not updated correctly")
+							  }
+							}
+						 }
+					}
+					
+					testcase TC_CSE_DMR_UPD_015_SUB_LN() runs on Tester system CseSystem {
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var XSD.Boolean v_latestNotify:=true;
+						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_updateRequest.primitiveContent.subscription.latestNotify:=v_latestNotify;
+						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
+						v_ae1.done;
+						
+						 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							 //Check attribute 1
+							 if(ispresent(v_responsePrimitive.primitiveContent)) {
+								 if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
+									 if(v_responsePrimitive.primitiveContent.subscription.latestNotify != v_latestNotify){
+										 setverdict(fail, __SCOPE__ & ": Error: Latest Notify priority attribute not updated correctly")
+									 }
+								 }
+							 }
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
+	 
+							  //Check that the resource has been udpated correctly
+							  if(ischosen(v_primitiveContentRetrieveResource.subscription)) {
+							   if(v_primitiveContentRetrieveResource.subscription.latestNotify != v_latestNotify){
+								setverdict(fail, __SCOPE__ & ": Error: Latest Notify attribute not updated correctly")
+							  }
+							}
+						 }
+					}
+					
+					testcase TC_CSE_DMR_UPD_015_SUB_NEC() runs on Tester system CseSystem {
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
+						var EventCat v_eventCat:= {alt_1:= 300};
+						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+						
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_updateRequest.primitiveContent.subscription.notificationEventCat:=v_eventCat;
+						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
+						v_ae1.done;						 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							 //Check attribute 1
+							 if(ispresent(v_responsePrimitive.primitiveContent)) {
+								 if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
+									 if(v_responsePrimitive.primitiveContent.subscription.notificationEventCat != v_eventCat){
+										 setverdict(fail, __SCOPE__ & ": Error: Notification Event Cat attribute not updated correctly")
+									 }
+								 }
+							 }
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
+	 
+													  //Check that the resource has been udpated correctly
+							  if(ischosen(v_primitiveContentRetrieveResource.subscription)) {
+							   if(v_primitiveContentRetrieveResource.subscription.notificationEventCat != v_eventCat){
+								setverdict(fail, __SCOPE__ & ": Error: Notification Event Cat attribute not updated correctly")
+							  }
+							}
+						 }
+					}
+					
+					testcase TC_CSE_DMR_UPD_015_TS_ACPI() runs on Tester system CseSystem {
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+						var RequestPrimitive v_updateRequestPrimitive;
+						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+	
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest, true));//TimeSeries
+						v_ae1.done;	 
+
+						if(getverdict == pass){
+							 v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							 v_updateRequestPrimitive := f_getRequestPrimitive(v_ae1);	
+							 //Check attribute 1
+							 if(ispresent(v_responsePrimitive.primitiveContent)) {
+								 if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
+									 if(v_responsePrimitive.primitiveContent.timeSeries.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.timeSeries.accessControlPolicyIDs)){
+										 setverdict(fail, __SCOPE__, ": Error: Access Control Policy IDs attribute not updated correctly")
+									 }
+								 }
+							 }
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
+ 
+							//Check that the resource has been udpated correctly
+							  if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
+							   if(v_primitiveContentRetrieveResource.timeSeries.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.timeSeries.accessControlPolicyIDs)){
+								setverdict(fail, __SCOPE__ & ": Error: Access Control Policy IDs attribute not updated correctly")
+							  }
+							}
+						 }
+					}
+					
+					testcase TC_CSE_DMR_UPD_015_TS_LBL() runs on Tester system CseSystem {
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var Labels v_labels := {"MyLabel"};
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+	
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_updateRequest.primitiveContent.timeSeries.labels := v_labels;
+	
+						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
+						v_ae1.done;	 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							 //Check attribute 1
+							 if(ispresent(v_responsePrimitive.primitiveContent)) {
+								 if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
+									 if(v_responsePrimitive.primitiveContent.timeSeries.labels != v_labels){
+										 setverdict(fail, __SCOPE__, ": Error: Labels attribute not updated correctly")
+									 }
+								 }
+							 }
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
+		 
+							//Check that the resource has been udpated correctly
+							  if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
+							   if(v_primitiveContentRetrieveResource.timeSeries.labels != v_labels){
+								setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
+							  }
+							}
+						 }
+					}
+					
+					testcase TC_CSE_DMR_UPD_015_TS_MNI() runs on Tester system CseSystem {
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var XSD.NonNegativeInteger v_maxNrOfInstances := 5;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+	
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_updateRequest.primitiveContent.timeSeries.maxNrOfInstances := v_maxNrOfInstances;
+	
+						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
+						v_ae1.done;	 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							 //Check attribute 1
+							 if(ispresent(v_responsePrimitive.primitiveContent)) {
+								 if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
+									 if(v_responsePrimitive.primitiveContent.timeSeries.maxNrOfInstances != v_maxNrOfInstances){
+										 setverdict(fail, __SCOPE__, ": Error: Maximum number of instances attribute not updated correctly")
+									 }
+								 }
+							 }
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
+ 
+							//Check that the resource has been udpated correctly
+							  if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
+							   if(v_primitiveContentRetrieveResource.timeSeries.maxNrOfInstances != v_maxNrOfInstances){
+								setverdict(fail, __SCOPE__ & ": Error: Maximum number of instances attribute not updated correctly")
+							  }
+							}
+						 }
+					}
+
+					testcase TC_CSE_DMR_UPD_015_TS_MBS() runs on Tester system CseSystem {
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var XSD.NonNegativeInteger v_maxByteSize := 512;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+	
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_updateRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize;
+	
+						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
+						v_ae1.done;	 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							 //Check attribute 1
+							 if(ispresent(v_responsePrimitive.primitiveContent)) {
+								 if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
+									 if(v_responsePrimitive.primitiveContent.timeSeries.maxByteSize != v_maxByteSize){
+										 setverdict(fail, __SCOPE__, ": Error: Maximum Byte size attribute not updated correctly")
+									 }
+								 }
+							 }
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
+ 
+												  //Check that the resource has been udpated correctly
+							  if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
+							   if(v_primitiveContentRetrieveResource.timeSeries.maxByteSize != v_maxByteSize){
+								setverdict(fail, __SCOPE__ & ": Error: Maximum Byte Size attribute not updated correctly")
+							  }
+							}
+						 }
+					}
+
+					testcase TC_CSE_DMR_UPD_015_TS_MIA() runs on Tester system CseSystem {
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var XSD.NonNegativeInteger v_maxInstanceAge := 1;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+	
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_updateRequest.primitiveContent.timeSeries.maxInstanceAge := v_maxInstanceAge;
+	
+						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
+						v_ae1.done;	 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							 //Check attribute 1
+							 if(ispresent(v_responsePrimitive.primitiveContent)) {
+								 if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
+									 if(v_responsePrimitive.primitiveContent.timeSeries.maxInstanceAge != v_maxInstanceAge){
+										 setverdict(fail, __SCOPE__, ": Error: Maximum Instance Age attribute not updated correctly")
+									 }
+								 }
+							 }
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
+ 
+							//Check that the resource has been udpated correctly
+							  if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
+							   if(v_primitiveContentRetrieveResource.timeSeries.maxInstanceAge != v_maxInstanceAge){
+								setverdict(fail, __SCOPE__ & ": Error: Maximum Instance Age attribute not updated correctly")
+							  }
+							}
+						 }
+					}
+					
+					testcase TC_CSE_DMR_UPD_015_TS_PEI() runs on Tester system CseSystem {
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var XSD.NonNegativeInteger v_periodicInterval := 1;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_updateRequest.primitiveContent.timeSeries.periodicInterval := v_periodicInterval;
+
+						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
+						v_ae1.done;	 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							 //Check attribute 1
+							 if(ispresent(v_responsePrimitive.primitiveContent)) {
+								 if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
+									 if(v_responsePrimitive.primitiveContent.timeSeries.periodicInterval != v_periodicInterval){
+										 setverdict(fail, __SCOPE__, ": Error: Periodic Interval attribute not updated correctly")
+									 }
+								 }
+							 }
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
+ 
+												//Check that the resource has been udpated correctly
+							  if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
+							   if(v_primitiveContentRetrieveResource.timeSeries.periodicInterval != v_periodicInterval){
+								setverdict(fail, __SCOPE__ & ": Error: Periodic Interval attribute not updated correctly")
+							  }
+							}
+						 }
+					}
+					
+					testcase TC_CSE_DMR_UPD_015_TS_MDD() runs on Tester system CseSystem {
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var XSD.Boolean v_missingDataDetect := true;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_updateRequest.primitiveContent.timeSeries.missingDataDetect := v_missingDataDetect;
+
+						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
+						v_ae1.done;	 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							 //Check attribute 1
+							 if(ispresent(v_responsePrimitive.primitiveContent)) {
+								 if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
+									 if(v_responsePrimitive.primitiveContent.timeSeries.missingDataDetect != v_missingDataDetect){
+										 setverdict(fail, __SCOPE__, ": Error: MissingDataDetect attribute not updated correctly")
+									 }
+								 }
+							 }
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
+ 
+																	//Check that the resource has been udpated correctly
+							  if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
+							   if(v_primitiveContentRetrieveResource.timeSeries.missingDataDetect != v_missingDataDetect){
+								setverdict(fail, __SCOPE__ & ": Error: MissingDataDetect attribute not updated correctly")
+							  }
+							}
+						 }
+					}
+					
+					testcase TC_CSE_DMR_UPD_015_TS_MDN() runs on Tester system CseSystem {
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var XSD.NonNegativeInteger v_missingDataMaxNr := 1;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_updateRequest.primitiveContent.timeSeries.missingDataMaxNr := v_missingDataMaxNr;
+
+						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
+						v_ae1.done;	 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							 //Check attribute 1
+							 if(ispresent(v_responsePrimitive.primitiveContent)) {
+								 if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
+									 if(v_responsePrimitive.primitiveContent.timeSeries.missingDataMaxNr != v_missingDataMaxNr){
+										 setverdict(fail, __SCOPE__, ": Error: MissingDataMaxNr attribute not updated correctly")
+									 }
+								 }
+							 }
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
+ 
+							//Check that the resource has been udpated correctly
+							  if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
+							   if(v_primitiveContentRetrieveResource.timeSeries.missingDataMaxNr != v_missingDataMaxNr){
+								setverdict(fail, __SCOPE__ & ": Error: MissingDataMaxNr attribute not updated correctly")
+							  }
+							}
+						 }
+					}
+					
+					testcase TC_CSE_DMR_UPD_015_TS_MDT() runs on Tester system CseSystem {
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var XSD.NonNegativeInteger v_missingDataDetectTimer := 1;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_updateRequest.primitiveContent.timeSeries.missingDataDetectTimer := v_missingDataDetectTimer;
+
+						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
+						v_ae1.done;	 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							 //Check attribute 1
+							 if(ispresent(v_responsePrimitive.primitiveContent)) {
+								 if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
+									 if(v_responsePrimitive.primitiveContent.timeSeries.missingDataDetectTimer != v_missingDataDetectTimer){
+										 setverdict(fail, __SCOPE__, ": Error: MissingDataDetectTimer attribute not updated correctly")
+									 }
+								 }
+							 }
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
+ 
+												//Check that the resource has been udpated correctly
+							  if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
+							   if(v_primitiveContentRetrieveResource.timeSeries.missingDataDetectTimer != v_missingDataDetectTimer){
+								setverdict(fail, __SCOPE__ & ": Error: MissingDataDetectTimer attribute not updated correctly")
+							  }
+							}
+						 }
+					}
+					
+					testcase TC_CSE_DMR_UPD_015_TS_OR() runs on Tester system CseSystem {
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var XSD.AnyURI v_ontoLogyRef := "MyOntologyRef";
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+	
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_updateRequest.primitiveContent.timeSeries.ontologyRef := v_ontoLogyRef;
+	
+						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
+						v_ae1.done;	 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							 //Check attribute 1
+							 if(ispresent(v_responsePrimitive.primitiveContent)) {
+								 if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
+									 if(v_responsePrimitive.primitiveContent.timeSeries.ontologyRef != v_ontoLogyRef){
+										 setverdict(fail, __SCOPE__, ": Error: Ontology Ref attribute not updated correctly")
+									 }
+								 }
+							 }
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
+ 
+											  //Check that the resource has been udpated correctly
+							  if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
+							   if(v_primitiveContentRetrieveResource.timeSeries.ontologyRef != v_ontoLogyRef){
+								setverdict(fail, __SCOPE__ & ": Error: Ontology Ref attribute not updated correctly")
+							  }
+							}
+						 }
+					}
+					
+				} // end group g_CSE_DMR_UPD_015
+			  	
+				group g_CSE_DMR_UPD_016 {
+			  		
+					/**
+					 * @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_NOD_ET() runs on Tester system CseSystem {
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var Timestamp v_expirationTime := "21001231T012345";
+						var template RequestPrimitive v_updateRequest := m_updateNodeBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_updateRequest.primitiveContent.node.expirationTime := v_expirationTime;
+						
+						v_ae1.start(f_CSE_DMR_UPD_016(int9, m_createNodeBase, v_updateRequest));//Node
+						v_ae1.done;
+						
+						 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							//Check attribute 1
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.node)) {
+									if(v_responsePrimitive.primitiveContent.node.expirationTime != v_expirationTime){
+										setverdict(fail, __SCOPE__ & ": Error: Expiration time attribute not updated correctly")
+									}
+								}
+							}
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
+							
+						  //Check that the resource has been udpated correctly
+						  if(ischosen(v_primitiveContentRetrieveResource.node)) {
+							if(v_primitiveContentRetrieveResource.node.expirationTime != v_expirationTime){
+							  setverdict(fail, __SCOPE__ & ": Error: Expiration time attribute not updated correctly")
+							}
+						  }
+						}
+					}
+					
+					testcase TC_CSE_DMR_UPD_016_NOD_NI() runs on Tester system CseSystem {
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					
+						var template RequestPrimitive v_updateRequest := m_updateNodeBase;
+						var XSD.Token v_targetId := "TARGET-ID";
+						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_updateRequest.primitiveContent.node.nodeID := v_targetId;
+						
+						v_ae1.start(f_CSE_DMR_UPD_016(int9, m_createNodeBase, v_updateRequest));//Node
+						v_ae1.done;
+						
+						 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							//Check attribute 1
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.node)) {
+									if(v_responsePrimitive.primitiveContent.node.nodeID != v_targetId){
+										setverdict(fail, __SCOPE__ & ": Error: NodeID attribute not updated correctly")
+									}
+								}
+							}
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
+							
+							//Check that the resource has been udpated correctly
+							if(ischosen(v_primitiveContentRetrieveResource.node)) {
+							  if(v_primitiveContentRetrieveResource.node.nodeID != v_targetId){
+								setverdict(fail, __SCOPE__ & ": Error: NodeID attribute not updated correctly")
+							  }
+							}	
+						}
+					}
+					
+					testcase TC_CSE_DMR_UPD_016_TS_ET() runs on Tester system CseSystem {
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var Timestamp v_expirationTime := "21001231T012345";
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+	
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_updateRequest.primitiveContent.timeSeries.expirationTime := v_expirationTime;
+	
+						v_ae1.start(f_CSE_DMR_UPD_016(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
+						v_ae1.done;	 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							//Check attribute 1
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
+									if(v_responsePrimitive.primitiveContent.timeSeries.expirationTime != v_expirationTime){
+										setverdict(fail, __SCOPE__, ": Error: Expiration time attribute not updated correctly")
+									}
+								}
+							}
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
+		
+						  //Check that the resource has been udpated correctly
+						  if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
+							if(v_primitiveContentRetrieveResource.timeSeries.expirationTime != v_expirationTime){
+							  setverdict(fail, __SCOPE__ & ": Error: Expiration time attribute not updated correctly")
+							}
+						  }
+						}
+					}
+					
+				} // end group g_CSE_DMR_UPD_016
+				
+				group g_CSE_DMR_UPD_017 {
+				    
+					/**
+					 * @desc Check that the IUT updates successfully the value of the announceTo optional attribute of the RESOURCE_TYPE resource
+					*/
+					testcase TC_CSE_DMR_UPD_017_ACP() runs on Tester system CseSystem {
+						// Local variables
+						var MnCseSimu v_cse1 := MnCseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createAcpBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
+						var template RequestPrimitive v_updateRequest := m_updateAcpBase;	
+			
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						
+						v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};					
+			
+						v_cse1.start(f_CSE_DMR_UPD_017(int1, v_createRequest, v_createRequestAnnc, v_updateRequest));//AccessControlPolicy
+						v_cse1.done;
+					}
+					
+					testcase TC_CSE_DMR_UPD_017_CNT() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createContainerBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
+						var template RequestPrimitive v_updateRequest := m_updateContainerBase;	
+
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						
+						v_updateRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
+  
+						v_cse1.start(f_CSE_DMR_UPD_017(int3, v_createRequest, v_createRequestAnnc, v_updateRequest));//Container
+						v_cse1.done;
+					}
+
+					testcase TC_CSE_DMR_UPD_017_GRP() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createGroupBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
+						var template RequestPrimitive v_updateRequest := m_updateGroupBase;	
+
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_updateRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
+  
+						v_cse1.start(f_CSE_DMR_UPD_017(int9, v_createRequest, v_createRequestAnnc, v_updateRequest));//Group
+						v_cse1.done;
+					}
+					
+					testcase TC_CSE_DMR_UPD_017_SCH() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createScheduleBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createScheduleAnnc;
+						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
+
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_updateRequest.primitiveContent.schedule.announceTo := {PX_CSE1_ID};
+  
+						v_cse1.start(f_CSE_DMR_UPD_017(int18, v_createRequest, v_createRequestAnnc, v_updateRequest));//Schedule
+						v_cse1.done;
+					}
+					
+					testcase TC_CSE_DMR_UPD_017_TS() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_cse1.done;
+						v_updateRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
+  
+						v_cse1.start(f_CSE_DMR_UPD_017(int29, v_createRequest, v_createRequestAnnc, v_updateRequest));//TimeSeries
+						v_cse1.done;
+					}
+					
+					testcase TC_CSE_DMR_UPD_017_TSI() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnnc;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesInstanceBase;
+
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_cse1.done;
+						v_updateRequest.primitiveContent.timeSeriesInstance.announceTo := {PX_CSE1_ID};
+  
+						v_cse1.start(f_CSE_DMR_UPD_017(int29, v_createRequest, v_createRequestAnnc, v_updateRequest));//TimeSeriesInstance
+						v_cse1.done;
+					}
+				  
+				} //end group g_CSE_DMR_UPD_017
+				
+				group g_CSE_DMR_UPD_018 {
+					
+					testcase TC_CSE_DMR_UPD_018_CNT_MBS() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createContainerBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
+						var template RequestPrimitive v_updateRequest := m_updateContainerBase;	
+						var template RequestPrimitive v_updateRequestAnnc := mw_updateContainerAnnc;
+						var XSD.NonNegativeInteger v_maxByteSize := 512;
+
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
+						v_createRequest.primitiveContent.container.maxByteSize := v_maxByteSize;	
+	
+						v_createRequestAnnc.primitiveContent.containerAnnc.maxByteSize := v_maxByteSize;
+	
+						v_updateRequest.primitiveContent.container.announcedAttribute := {"mbs"};
+	
+						v_updateRequestAnnc.primitiveContent.containerAnnc.maxByteSize := v_maxByteSize;
+  
+						v_cse1.start(f_CSE_DMR_UPD_018(int3, v_createRequest, v_createRequestAnnc, v_updateRequest, v_updateRequestAnnc));//Container
+						v_cse1.done;
+					}
+
+					testcase TC_CSE_DMR_UPD_018_GRP_MT() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createGroupBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
+						var template RequestPrimitive v_updateRequest := m_updateGroupBase;	
+						var template RequestPrimitive v_updateRequestAnnc := mw_updateGroupAnnc;
+						var MemberType v_memberType := int3;
+
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
+						v_createRequest.primitiveContent.group_.memberType := v_memberType;
+	
+						v_createRequestAnnc.primitiveContent.groupAnnc.memberType := v_memberType;
+	
+						v_updateRequest.primitiveContent.group_.announcedAttribute := {"mt"};
+	
+						v_updateRequestAnnc.primitiveContent.groupAnnc.memberType := v_memberType;
+  
+						v_cse1.start(f_CSE_DMR_UPD_018(int9, v_createRequest, v_createRequestAnnc, v_updateRequest, v_updateRequestAnnc));//Group
+						v_cse1.done;
+					}
+					
+					testcase TC_CSE_DMR_UPD_018_SCH_SE() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createGroupBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
+						var template RequestPrimitive v_updateRequest := m_updateGroupBase;	
+						var template RequestPrimitive v_updateRequestAnnc := mw_updateGroupAnnc;
+
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_createRequest.primitiveContent.schedule.announceTo := {PX_CSE1_ID};
+						v_createRequestAnnc.primitiveContent.scheduleAnnc.scheduleElement := {{"0 0 0,1,2 1 1 * *"}};//Attribute 1
+
+						v_updateRequest.primitiveContent.schedule.announcedAttribute := {"se"};
+						v_updateRequestAnnc.primitiveContent.scheduleAnnc.scheduleElement := {{"1 1 1,2 1 1 * *"}}; //Attribute 1
+  
+						v_cse1.start(f_CSE_DMR_UPD_018(int18, v_createRequest, v_createRequestAnnc, v_updateRequest, v_updateRequestAnnc));//Group
+						v_cse1.done;
+					}
+					
+					testcase TC_CSE_DMR_UPD_018_TS_MBS() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;	
+						var template RequestPrimitive v_updateRequestAnnc := mw_updateTimeSeriesAnnc;
+						var XSD.NonNegativeInteger v_maxByteSize := 512;
+
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_cse1.done;
+						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
+						v_createRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize;	
+
+						v_createRequestAnnc.primitiveContent.timeSeriesAnnc.maxByteSize := v_maxByteSize;
+
+						v_updateRequest.primitiveContent.timeSeries.announcedAttribute := {"mbs"};
+
+						v_updateRequestAnnc.primitiveContent.timeSeriesAnnc.maxByteSize := v_maxByteSize;
+  
+						v_cse1.start(f_CSE_DMR_UPD_018(int29, v_createRequest, v_createRequestAnnc, v_updateRequest, v_updateRequestAnnc));//TimeSeries
+						v_cse1.done;
+					}
+					
+				} //end group g_CSE_DMR_UPD_018
+			}//end group Update
+			
+			group Delete {
+			
+				group g_CSE_DMR_DEL_001{
+
+					/**
+					 * @desc Check that the IUT accepts the deletion of a RESOURCE_TYPE resource
+					 * 
+					 */
+					testcase TC_CSE_DMR_DEL_001_SCH() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+                
+						v_ae1.start(f_CSE_DMR_DEL_001(int18, m_createScheduleBase));//Schedule
+						v_ae1.done;
+					};
+                
+					testcase TC_CSE_DMR_DEL_001_TS() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_ae1.start(f_CSE_DMR_DEL_001(int29, m_createTimeSeriesBase));//TimeSeries
+						v_ae1.done;
+					};
+					
+					testcase TC_CSE_DMR_DEL_001_TSI() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_ae1.start(f_CSE_DMR_DEL_001(int30, m_createTimeSeriesInstanceBase));//TimeSeriesInstance
+						v_ae1.done;
+					};
+                
+				};//end of group g_CSE_DMR_DEL_001
+                
+				group g_CSE_DMR_DEL_002{
+                
+					/**
+					 * @desc Check that the IUT responds with an error when the AE tries to delete the resource TARGET_RESOURCE_ADDRESS without having privileges for the DELETE operation
+					 * 
+					 */
+					testcase TC_CSE_DMR_DEL_002_SCH() runs on Tester system CseSystem {
+						// Local variables
+  						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+                
+						v_ae1.start(f_CSE_DMR_DEL_002(int18, m_createScheduleBase));//Schedule
+						v_ae1.done;
+					};
+					
+					testcase TC_CSE_DMR_DEL_002_TS() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_ae1.start(f_CSE_DMR_DEL_002(int29, m_createTimeSeriesBase));//TimeSeries
+						v_ae1.done;
+					};
+                
+				};//end of group g_CSE_DMR_DEL_002
+                
+				group g_CSE_DMR_DEL_003{
+                	
+					/**
+					 * @desc Check that the IUT responds with an error when the AE tries to delete the resource TARGET_RESOURCE_ADDRESS which does not exist
+					 * 
+					 */
+					testcase TC_CSE_DMR_DEL_003() runs on Tester system CseSystem {
+					
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+														
+						v_ae1.start(f_CSE_DMR_DEL_003());
+											  	  	
+						v_ae1.done;
+											  	  		
+					}
+													
+					function f_CSE_DMR_DEL_003() runs on AeSimu {
+                	
+						// Local variables
+						var MsgIn v_response;
+						var RequestPrimitive v_request;
+						var integer v_aeIndex := -1;
+						var charstring v_resourceIdOrName := "NotExistingResource";
+                							   
+						// Test control
+                
+						// Test component configuration
+						f_cf01Up();
+                
+						// Test adapter configuration
+                
+						// Preamble
+						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi); 				
+                												
+						// Test Body
+						if(PX_ADDRESSING_METHOD == e_nonHierarchical and (PX_PRIMITIVE_SCOPE == e_cseRelative)) {
+							v_request := valueof(m_delete(v_resourceIdOrName, f_getOriginator(v_aeIndex)));
+						} else {
+							v_request := valueof(m_delete(f_getResourceAddress(v_aeIndex) & "/" & v_resourceIdOrName, f_getOriginator(v_aeIndex)));
+						}
+                		
+						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
+						tc_ac.start;
+						alt {
+							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) -> value v_response {
+								tc_ac.stop;
+								setverdict(pass, __SCOPE__ & ": Unexisting resource cannot be deleted");
+							}
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+								tc_ac.stop;
+								setverdict(fail, __SCOPE__ & ": Error while deleting non existing resource");
+							}
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+								tc_ac.stop;
+								setverdict(fail, __SCOPE__ & ": Error while deleting non existing resource");
+							}
+							[] tc_ac.timeout {
+								setverdict(fail, __SCOPE__ & ": No answer while deleting resource");
+							}
+						}		
+                					
+						// Postamble
+						f_cse_postamble_deleteResources();
+                		
+						// Tear down
+						f_cf01Down();
+                							
+					};//end f_CSE_DMR_DEL003
+				};//end of group g_CSE_DMR_DEL_003
+                
+				group g_CSE_DMR_DEL_004{
+                	
+					/**
+					 * @desc Check that the IUT responds with an error when AE tries to delete a child resource of a RESOURCE_TYPE resource when this resource has been already deleted
+					 * 
+					 */
+					testcase TC_CSE_DMR_DEL_004_CNT() runs on Tester system CseSystem {
+						// Local variables
+ 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+                		
+						v_ae1.start(f_CSE_DMR_DEL_004(int3, m_createContainerBase, int3, m_createContainerBase));//Container
+						v_ae1.done;
+					};
+                
+					testcase TC_CSE_DMR_DEL_004_GRP() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+                		
+						v_ae1.start(f_CSE_DMR_DEL_004(int9, m_createGroupBase, int23, m_createSubscriptionBase));//Group
+						v_ae1.done;
+					};
+                
+					testcase TC_CSE_DMR_DEL_004_ACP() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+                
+						v_ae1.start(f_CSE_DMR_DEL_004(int1, m_createAcpBase, int23, m_createSubscriptionBase));//AccessControlPolicy
+						v_ae1.done;
+					};
+                
+					testcase TC_CSE_DMR_DEL_004_SCH() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+                
+						v_ae1.start(f_CSE_DMR_DEL_004(int18, m_createScheduleBase, int23, m_createSubscriptionBase));//Schedule
+						v_ae1.done;
+					};
+                        
+					testcase TC_CSE_DMR_DEL_004_SUB() runs on Tester system CseSystem {
+							// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+                
+						v_ae1.start(f_CSE_DMR_DEL_004(int23, m_createSubscriptionBase, int18, m_createScheduleBase));//Subscription
+						v_ae1.done;
+					};	
+					
+					testcase TC_CSE_DMR_DEL_004_TS() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_ae1.start(f_CSE_DMR_DEL_004(int29, m_createTimeSeriesBase, int23, m_createSubscriptionBase));//TimeSeries
+						v_ae1.done;
+					};	
+                
+				};//end of group g_CSE_DMR_DEL_004
+				
+				group g_CSE_DMR_DEL_005{
+                	
+					/**
+					 * @desc Check that the stateTag attribute of a RESOURCE_TYPE resource is increased when a child resource is deleted
+					 * 
+					 */
+					testcase TC_CSE_DMR_DEL_005_CNT() runs on Tester system CseSystem {
+						// Local variables
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+		
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_ae1.start(f_CSE_DMR_DEL_005(int3, m_createContainerBase, int3, m_createContainerBase));//Container
+						v_ae1.done;
+						
+						if(getverdict == pass){ 
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+							//Check that stateTag has been incremented
+							  if(ischosen(v_primitiveContentRetrieveResource.container)) {
+							   if(v_primitiveContentRetrieveResource.container.stateTag == 2){	//(Create and Delete)
+									setverdict(pass, __SCOPE__ & ": The stateTag attribute is incremented");	
+							   }else{
+									setverdict(fail, __SCOPE__ & ": Error the stateTag attribute is not incremented");
+							   }
+							}
+						}
+					};
+
+					testcase TC_CSE_DMR_DEL_005_TS() runs on Tester system CseSystem {
+						// Local variables
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+		
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_ae1.start(f_CSE_DMR_DEL_005(int29, m_createTimeSeriesBase, int30, m_createTimeSeriesInstanceBase));//TimeSeries
+						v_ae1.done;
+						
+						if(getverdict == pass){ 
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+							//Check that stateTag has been incremented
+							  if(ischosen(v_primitiveContentRetrieveResource.container)) {
+							   if(v_primitiveContentRetrieveResource.timeSeries.stateTag == 2){	//(Create and Delete)
+									setverdict(pass, __SCOPE__ & ": The stateTag attribute is incremented");	
+							   }else{
+									setverdict(fail, __SCOPE__ & ": Error the stateTag attribute is not incremented");
+							   }
+							}
+						}
+					};
+
+				};//end of group g_CSE_DMR_DEL_005
+				
+				group g_CSE_DMR_DEL_006{
+                	
+					/**
+					 * @desc Check that the IUT decreases the field value of attribute currentNrOfInstances and currentByteSize of parent RESOURCE_TYPE when a latest RESOURCE_TYPE resource is deleted successfully
+					 * 
+					 */
+					testcase TC_CSE_DMR_DEL_006_CNT_CIN() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_ae1.start(f_CSE_DMR_DEL_006(int3, m_createContainerBase, int4, m_createContentInstanceBase));//ContentInstance under Container
+						v_ae1.done;
+	
+					};
+
+					testcase TC_CSE_DMR_DEL_006_TS_TSI() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_ae1.start(f_CSE_DMR_DEL_006(int29, m_createTimeSeriesBase, int30, m_createTimeSeriesInstanceBase));//TimeSeriesInstance under TimeSeries
+						v_ae1.done;
+						
+					};
+
+				};//end of group g_CSE_DMR_DEL_006
+
+				group g_CSE_DMR_DEL_008{
+
+					/**
+					 * @desc Check that the IUT rejects the DELETE  request of a latest resource in a container resource that has no direct child contentInstance resources.
+					 * 
+					 */
+					testcase TC_CSE_DMR_DEL_008() runs on Tester system CseSystem {
+					
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+														
+						v_ae1.start(f_CSE_DMR_DEL_008());
+											  	  	
+						v_ae1.done;
+											  	  		
+					}
+													
+					function f_CSE_DMR_DEL_008() runs on AeSimu {
+						// Local variables
+						var MsgIn v_response;
+						var RequestPrimitive v_request;
+						var integer v_aeIndex := -1;
+						var integer v_containerIndex := -1;
+						const ResourceType c_containerResourceType := int4; 
+						
+								   
+						// Test control
+            
+						// Test component configuration
+						f_cf01Up();
+            
+						// Test adapter configuration
+            
+						// Preamble
+						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+						
+						v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); 
+							
+						// Test Body
+						v_request := valueof(m_delete(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameLatest, f_getOriginator(v_containerIndex)));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
+						tc_ac.start;
+						alt {
+								[] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) -> value v_response {
+									tc_ac.stop;
+									setverdict(pass, __SCOPE__ & ": Resource type  " & int2str(enum2int(c_containerResourceType)) & " NOT FOUND");
+								}
+								[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+									tc_ac.stop;
+									setverdict(fail, __SCOPE__ & ": Wrong response status code");
+								}
+								[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+									tc_ac.stop;
+									setverdict(fail, __SCOPE__ & ": Resource type  " & int2str(enum2int(c_containerResourceType)) & " has not been created");
+								}
+								[] tc_ac.timeout {
+									setverdict(fail, __SCOPE__ & ": No answer while deleting resource type " & int2str(enum2int(c_containerResourceType)));
+								}
+							}					    
+						
+						// Postamble
+						f_cse_postamble_deleteResources();
+            
+						// Tear down
+						f_cf01Down();
+            				
+					}//end f_CSE_DMR_DEL_008
+				} // end group g_CSE_DMR_DEL_008
+				
+				group g_CSE_DMR_DEL_010{
+
+					/**
+					 * @desc Check that the IUT rejects the DELETE  request of a oldest resource in a container resource that has no direct child contentInstance resources.
+					 * 
+					 */
+					testcase TC_CSE_DMR_DEL_010() runs on Tester system CseSystem {
+					
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+														
+						v_ae1.start(f_CSE_DMR_DEL_010());
+											  	  	
+						v_ae1.done;
+											  	  		
+					}
+													
+					function f_CSE_DMR_DEL_010() runs on AeSimu {
+						// Local variables
+						var MsgIn v_response;
+						var RequestPrimitive v_request;
+						var integer v_aeIndex := -1;
+						var integer v_containerIndex := -1;
+						const ResourceType c_containerResourceType := int4; 
+						
+								   
+						// Test control
+            
+						// Test component configuration
+						f_cf01Up();
+            
+						// Test adapter configuration
+            
+						// Preamble
+						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+						
+						v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); 
+							
+						// Test Body
+						v_request := valueof(m_delete(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameOldest, f_getOriginator(v_containerIndex)));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
+						tc_ac.start;
+						alt {
+								[] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) -> value v_response {
+									tc_ac.stop;
+									setverdict(pass, __SCOPE__ & ": Resource type" & int2str(enum2int(c_containerResourceType)) & " NOT FOUND");
+								}
+								[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+									tc_ac.stop;
+									setverdict(fail, __SCOPE__ & ": Wrong response status code");
+								}
+								[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+									tc_ac.stop;
+									setverdict(fail, __SCOPE__ & ": Resource type" & int2str(enum2int(c_containerResourceType)) & " has not been created");
+								}
+								[] tc_ac.timeout {
+									setverdict(fail, __SCOPE__ & ": No answer while deleting resource type " & int2str(enum2int(c_containerResourceType)));
+								}
+							}					    
+						
+						// Postamble
+						f_cse_postamble_deleteResources();
+            
+						// Tear down
+						f_cf01Down();	
+					}//end f_CSE_DMR_DEL_010
+				} // end group g_CSE_DMR_DEL_010
+				
+			}//end group Delete
+			
+		}//end group Data_Management_and_Repository
+		
+		group Location {
+		  		    
+			group g_CSE_LOC_001{  		    
+		    
+			 testcase TC_CSE_LOC_001() runs on Tester system CseSystem {
+					
+				 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+																
+				 v_ae1.start(f_CSE_LOC_001());
+													  	  	
+				 v_ae1.done;
+													  	  		
+			 }
+															
+			 function f_CSE_LOC_001() runs on AeSimu {
+     	    	
+				var integer v_aeIndex := -1;	
+				var RequestPrimitive v_request;
+				var MsgIn v_response;
+				var LocationSource v_locationSource := int1;//Network-based
+     	     	
+				//Test component configuration
+				f_cf01Up();
+     	     	
+				//Preamble
+				v_aeIndex := f_cse_preamble_registerAe();
+     	     	     	     	
+				//Set requestPrimitive
+				v_request	 := f_getCreateRequestPrimitive(int10, m_createLocationPolicy(v_locationSource, omit, omit, omit, omit), v_aeIndex);
+     	     	
+				//Test Body
+				mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
+				tc_ac.start;
+				alt{
+				  [] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) -> value v_response { //BAD REQUEST
+					tc_ac.stop;
+					setverdict(pass, __SCOPE__ & "Resource <locationPolicy> create request is rejected due to invalid request body message!!");     	    	    
+				  }
+				  [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+					tc_ac.stop;
+					setverdict(fail, __SCOPE__ & ": Wrong response status code");     	    	    
+				  }
+				   [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+					tc_ac.stop;
+					setverdict(fail, __SCOPE__ & ": Created a locationPolicy resource for an invalid create request with response status code:" & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)));     	    	    
+				  } 
+				  [] tc_ac.timeout {
+						setverdict(fail, __SCOPE__ & ": Timeout due to no response received from requested server!");
+				  }   	    	  
+     	    	      	    	  
+				}
+     	    	
+				f_checkAeSimuStatus();
+    					
+				//Check to see if the resource is NOT present
+				if(f_cse_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
+				  setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
+				} else {
+				  setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
+				}
+				
+				// Postamble
+				f_cse_postamble_deleteResources();	
+    			
+				// Tear down
+				f_cf01Down();
+     	    
+			}// end testcase TC_CSE_LOC_001
+		}//end group g_CSE_LOC_001
+			
+			
+		group g_CSE_LOC_002{  	    
+			testcase TC_CSE_LOC_002() runs on Tester system CseSystem {
+					
+				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+																	
+				v_ae1.start(f_CSE_LOC_002());
+														  	  	
+				v_ae1.done;
+														  	  		
+			}
+																
+			function f_CSE_LOC_002() runs on AeSimu {
+				
+				var integer v_aeAuxIndex 				:= -1;				
+				var LocationSource v_locationSource		:= int1;//Network-based	
+				var XSD.Duration locationUpdatePeriod 	:= PX_LOCATION_UPDATE_PERIOD;  
+				var LocationTargetID locationTargetID			:= PX_LOCATION_TARGET_ID;
+				var XSD.AnyURI locationServerAddress	:= PX_LOCATION_SERVER_ADDRESS;
+				var RequestPrimitive v_request;
+				var MsgIn v_response;
+				var integer v_resourceIndex := -1;
+     	     	
+				//Test component configuration
+				f_cf01Up();
+     	     	
+				//Preamble
+				v_aeAuxIndex := f_cse_preamble_registerAe();
+     	     	     	     	
+				//Set requestPrimitive
+				v_request	 := f_getCreateRequestPrimitive(int10, m_createLocationPolicy(v_locationSource, omit, locationUpdatePeriod, locationTargetID, locationServerAddress), v_aeAuxIndex);
+     	     	    									
+				// Test Body					
+				mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
+				tc_ac.start;
+				alt {
+					[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
+						tc_ac.stop;
+						setverdict(pass, __SCOPE__ & ": Resource locationPolicy is created successfully with response status code: " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode))&"!");
+						f_checkAttributesToBeSaved(int10, v_request, v_response.primitive.responsePrimitive);
+						v_resourceIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int10, v_aeAuxIndex);
+					}
+					[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+						tc_ac.stop;
+						setverdict(fail, __SCOPE__ & ": Wrong response status code");
+					}
+					[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+						tc_ac.stop;
+						setverdict(fail, __SCOPE__ & ": Error occurrs with response status code: " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)) & "while handling a valid locationPolicy resource create request!");
+					}
+					[] tc_ac.timeout {
+						setverdict(fail, __SCOPE__ & ": Timeout due to no response from requested server!");
+					}
+				}	
+    								
+				f_checkAeSimuStatus();
+    						
+				//Check to see if the resource is present or not
+				if(f_cse_isResourcePresent(v_resourceIndex)) {
+					setverdict(pass, __SCOPE__ & ":INFO: Resource created");
+				} else {
+					setverdict(fail, __SCOPE__ & ":ERROR: Resource not created");
+				}
+    								
+				// Postamble
+				f_cse_postamble_deleteResources();	
+    			
+				// Tear down
+				f_cf01Down();                        
+				
+			 }// end testcase TC_CSE_LOC_002	
+			
+		}//end group g_CSE_LOC_002
+	
+			  
+		  group g_CSE_LOC_003{
+		    
+			testcase TC_CSE_LOC_003() runs on Tester system CseSystem {
+					
+				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+																	
+				v_ae1.start(f_CSE_LOC_003());
+														  	  	
+				v_ae1.done;
+														  	  		
+			}
+																
+			function f_CSE_LOC_003() runs on AeSimu {//the originator has no privileges to create a locationPolicy resource!!
+		      	
+				var integer v_aeIndex 				:= -1;
+				var integer v_acpAuxIndex 				:= -1;
+				var LocationSource v_locationSource		:= int1;//Network-based
+				var XSD.Duration locationUpdatePeriod 	:= PX_LOCATION_UPDATE_PERIOD;      
+				var LocationTargetID locationTargetID			:= PX_LOCATION_TARGET_ID;
+				var XSD.AnyURI locationServerAddress	:= PX_LOCATION_SERVER_ADDRESS;
+				var RequestPrimitive v_request;	
+				var MsgIn v_response;
+				
+				// Test control
+				if(not(PICS_ACP_SUPPORT)) {
+					setverdict(inconc, __SCOPE__ & ": AccessControlPolicy support is required to run this test case");
+					stop;
+				}
+				     	     	
+				//Test component configuration
+				f_cf01Up();
+     	     	
+				//Preamble
+				v_acpAuxIndex := f_cse_preamble_createAcpAux(-, int62);//c_RUDNDi) //No resource creation privilege
+							
+				v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);
+						     	     	
+				//Set requestPrimitive
+				v_request				:= f_getCreateRequestPrimitive(int10, m_createLocationPolicy(v_locationSource,omit, locationUpdatePeriod, locationTargetID, locationServerAddress), v_aeIndex);
+     	        									
+				// Test Body					
+				mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
+				tc_ac.start;
+				alt {
+					[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response {
+						tc_ac.stop;
+						setverdict(pass, __SCOPE__ & ": Access denied to create a resource including locationPolicy!");
+					}
+					[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+						tc_ac.stop;
+						setverdict(fail, __SCOPE__ & ": Wrong response status code");
+					}
+					[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+						tc_ac.stop;
+						setverdict(fail, __SCOPE__ & ": Error occurrs with response status code: " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)) & "due to IUT failed to check the access privilege of originator!");
+					}
+					[] tc_ac.timeout {
+						setverdict(fail, __SCOPE__ & ": Timeout due to no response from requested server!");
+					}
+				}
+    								
+				f_checkAeSimuStatus();
+    					
+				//Check to see if the resource is NOT present
+				if(f_cse_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
+				  setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
+				} else {
+				  setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
+				}
+    								
+				// Postamble
+				f_cse_postamble_deleteResources();	
+    			
+				// Tear down
+				f_cf01Down();				
+		      
+		      
+			} // end testcase TC_CSE_LOC_003
+		    
+		}//end group g_CSE_LOC_003
+		    
+		group g_CSE_LOC_004{  	
+			testcase TC_CSE_LOC_004() runs on Tester system CseSystem {
+					
+				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+																	
+				v_ae1.start(f_CSE_LOC_004());
+														  	  	
+				v_ae1.done;
+														  	  		
+			}
+																
+			function f_CSE_LOC_004() runs on AeSimu {
+		      	
+				var integer v_aeIndex 				:= -1;
+				var LocationSource v_locationSource		:= int1;//Netwok-based		        
+				var XSD.Duration locationUpdatePeriod 	:= PX_LOCATION_UPDATE_PERIOD;   
+				var LocationTargetID locationTargetID			:= PX_LOCATION_TARGET_ID;
+				var XSD.AnyURI locationServerAddress	:= PX_LOCATION_SERVER_ADDRESS;
+				var RequestPrimitive v_request;
+				var MsgIn v_response;
+								    				
+				//Test component configuration
+				f_cf01Up();
+     	     	
+				//Preamble
+				v_aeIndex 	:= f_cse_preamble_registerAe();
+     	     	
+				//Set requestPrimitive
+				v_request		:= f_getCreateRequestPrimitive(int10, m_createLocationPolicy(v_locationSource, omit, locationUpdatePeriod, locationTargetID, locationServerAddress), v_aeIndex);
+     	    							
+				// Test Body					
+				mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
+				tc_ac.start;
+				alt {
+					[] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) -> value v_response {
+						tc_ac.stop;
+						setverdict(pass, __SCOPE__ & ": The targeted resource is not found!!");
+					}
+					[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+						tc_ac.stop;
+						setverdict(fail, __SCOPE__ & ": Wrong response status code");
+					}
+					[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+						tc_ac.stop;
+						setverdict(fail, __SCOPE__ & ": Error occurrs with response status code: "& int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)) & "due to IUT created a locationPolicy resource under a non-existed parent resource!");
+					}
+					[] tc_ac.timeout {
+						setverdict(fail, __SCOPE__ & ": Timeout due to no response from requested server!");
+					}
+				}	
+    								
+				f_checkAeSimuStatus();
+    					
+				//Check to see if the resource is NOT present
+				if(f_cse_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
+				  setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
+				} else {
+				  setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
+				}				
+				// Postamble
+				f_cse_postamble_deleteResources();	
+    			
+				// Tear down
+				f_cf01Down();
+				
+			}// end testcase TC_CSE_LOC_004
+		    
+		  }//end group g_CSE_LOC_004
+		
+		  
+		  group g_CSE_LOC_005{
+		    
+			testcase TC_CSE_LOC_005() runs on Tester system CseSystem {
+					
+				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+																	
+				v_ae1.start(f_CSE_LOC_005());
+														  	  	
+				v_ae1.done;
+														  	  		
+			}
+																
+			function f_CSE_LOC_005() runs on AeSimu {//reject an invalid update request with invalid attribtue locationUpdatePeriod
+		      
+				var integer v_aeAuxIndex 						:= -1;
+				var integer v_locPolicyResourceIndex			:= -1;
+				var LocationSource v_locationSource				:= int1;//Netwok-based	
+				var XSD.Duration locationUpdatePeriod 	:= PX_LOCATION_UPDATE_PERIOD;  	      	
+				var XSD.Duration locationUpdatePeriod_invalid 	:= c_invalid_location_update_period;				 
+				var LocationTargetID locationTargetID					:= PX_LOCATION_TARGET_ID;
+				var XSD.AnyURI locationServerAddress			:= PX_LOCATION_SERVER_ADDRESS;
+				var RequestPrimitive v_request;
+				var RequestPrimitive v_locpolicy_request_preamble;
+				var MsgIn v_response;
+								    				
+				//Test component configuration
+				f_cf01Up();
+     	     	
+				//Preamble - register AE
+				v_aeAuxIndex 				:= f_cse_preamble_registerAe();
+				//Preamble - create a valid locationPolicy resource for later update use
+				v_locpolicy_request_preamble:= valueof(m_createLocationPolicy(v_locationSource, omit, locationUpdatePeriod, locationTargetID, locationServerAddress));
+				v_locPolicyResourceIndex	:= f_cse_createResource(int10, v_locpolicy_request_preamble, v_aeAuxIndex);     	     	
+     	     	
+				//Set requestPrimitive
+				v_request					:= f_getUpdateRequestPrimitive(int10, v_locPolicyResourceIndex, m_updateLocationPolicy(f_getResourceAddress(v_locPolicyResourceIndex), omit, locationUpdatePeriod_invalid));
+     	     	    									
+				// Test Body					
+				mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
+				tc_ac.start;
+				alt {
+					[] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) -> value v_response {
+						tc_ac.stop;
+						setverdict(pass, __SCOPE__ & ": Update locationPolicy resource is rejected!!");
+					}
+					[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+						tc_ac.stop;
+						setverdict(fail, __SCOPE__ & ": Wrong response status code");
+					}
+					[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+						tc_ac.stop;
+						setverdict(fail, __SCOPE__ & ": Error occurrs with response status code: "& int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)) & "due to IUT failed to handle an invalid locationPolicy update request");
+					}
+					[] tc_ac.timeout {
+						setverdict(fail, __SCOPE__ & ": Timeout due to no response from requested server!");
+					}
+				}	
+    								
+				f_checkAeSimuStatus();
+    						
+				//TODO: Check to see if the resource has been updated or not
+				
+				// Postamble
+				f_cse_postamble_deleteResources();	 
+    			
+				// Tear down
+				f_cf01Down();      
+		      
+			}//end testcase TC_CSE_LOC_005
+		    
+		  }//end group g_CSE_LOC_005
+		  
+		  group g_CSE_LOC_006 {
+		  
+			testcase TC_CSE_LOC_006() runs on Tester system CseSystem {
+					
+				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+																	
+				v_ae1.start(f_CSE_LOC_006());
+														  	  	
+				v_ae1.done;
+														  	  		
+			}
+																
+			function f_CSE_LOC_006() runs on AeSimu {
+			  //TO RETRIEVE a <container> resource that has created in cse and linked with a <locationPolicy> resource (network-based case)
+		     
+			  var integer v_aeAuxIndex				    :=	-1;
+			  var integer v_locPolicyResourceIndex	    := 	-1;
+			  var integer v_locContainerResourceIndex	:= 	-1;
+			  var XSD.Duration locationUpdatePeriod 	:= PX_LOCATION_UPDATE_PERIOD;  
+			  var LocationTargetID locationTargetID			:= PX_LOCATION_TARGET_ID;
+			  var XSD.AnyURI locationServerAddress	    := PX_LOCATION_SERVER_ADDRESS;
+			  var RequestPrimitive v_loc_request_preamble;
+			  var RequestPrimitive v_container_request_preamble;
+			  var MsgIn v_response;
+			  var LocationSource v_locationSource := int1;//Network-based      
+		      
+			  //Test component configuration
+			  f_cf01Up();
+		 	  
+			  //Preamble - register AE
+			  v_aeAuxIndex				:= f_cse_preamble_registerAe();
+			  //Preamble - create a valid locationPolicy resource for later container resource creation
+			  v_loc_request_preamble		:= valueof(m_createLocationPolicy(v_locationSource, omit, locationUpdatePeriod, locationTargetID, locationServerAddress));
+			  v_container_request_preamble	:= valueof(m_createContainer(f_getResourceAddress(v_aeAuxIndex), omit));//no location-container name provided?
+			  v_locPolicyResourceIndex	:= f_cse_createResource(int10, v_loc_request_preamble, v_aeAuxIndex);//created locationpolicy index
+			  v_locContainerResourceIndex	:= f_cse_createResource(int3, v_container_request_preamble, v_locPolicyResourceIndex);//created container index
+			  			  	
+			  //Test Body - retrieve the created container resource
+			  mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(m_retrieve(f_getResourceAddress(v_locContainerResourceIndex), f_getOriginator(v_locContainerResourceIndex)))))); 
+			  tc_ac.start;
+			  alt{
+				[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response{
+				  tc_ac.stop;
+				  if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.container.locationID)){		            
+						setverdict(fail, __SCOPE__ & "No locationID is included in the response!");
+				  }else{
+						setverdict(pass, __SCOPE__ & "Container resource associated with locationPolicy resource is successfully retrieved with locationID included in the response!");		            
+				  }		          
+		          
+				}
+				[] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) -> value v_response{
+						tc_ac.stop;
+						setverdict(fail, __SCOPE__ & "Requested container resource is not found!");
+				}
+				[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
+						tc_ac.stop;
+						setverdict(fail, __SCOPE__ & ": Error while retrieving resource!");
+				}
+				[] tc_ac.timeout {
+						setverdict(fail, __SCOPE__ & ": No answer while retrieving resource!");
+				}
+		        
+			  }
+		      
+			  f_checkAeSimuStatus();
+    									  
+			  // Postamble
+				f_cse_postamble_deleteResources();	 
+    			
+				// Tear down
+				f_cf01Down(); 		      
+		      
+			}//end testcase TC_CSE_LOC_006 		    
+		    
+		  }//end group g_CSE_LOC_006
+		  		 
+		  group g_CSE_LOC_007 {
+		    
+			testcase TC_CSE_LOC_007() runs on Tester system CseSystem {
+					
+				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+																	
+				v_ae1.start(f_CSE_LOC_007());
+														  	  	
+				v_ae1.done;
+														  	  		
+			}
+																
+			function f_CSE_LOC_007() runs on AeSimu {
+			  //TO create a <locationPolicy> resource with locationSource set to Device-based
+		     
+			   var integer v_aeAuxIndex 					:= -1;	
+			   var XSD.Duration locationUpdatePeriod 	:= PX_LOCATION_UPDATE_PERIOD;
+				var RequestPrimitive v_request;
+				var MsgIn v_response;
+				var LocationSource v_locationSource		:= int2;//Device-based
+				var integer v_resourceIndex := -1;
+				
+				//Test control
+				if(not(PICS_ASN_CSE)) {
+					setverdict(inconc, __SCOPE__ & ": IUT shall support ASN-CSE to run this test case. Set PX_ASN_CSE to true to run this test case");
+					stop;
+				}
+				
+				//Test component configuration
+				f_cf01Up();
+     	     	
+ 	     		//Preamble
+				v_aeAuxIndex := f_cse_preamble_registerAe();
+				//Set requestPrimitive
+				v_request	  := f_getCreateRequestPrimitive(int10, m_createLocationPolicy(v_locationSource, omit, locationUpdatePeriod, omit, omit), v_aeAuxIndex);
+			   									
+				// Test Body					
+				mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
+				tc_ac.start;
+				alt {
+					[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
+						tc_ac.stop;
+						setverdict(pass, __SCOPE__ & ": Resource locationPolicy is created successfully with response status code: " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode))&"!");
+						f_checkAttributesToBeSaved(int10, v_request, v_response.primitive.responsePrimitive);
+						v_resourceIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int10, v_aeAuxIndex);
+					}
+					[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+						tc_ac.stop;
+						setverdict(fail, __SCOPE__ & ": Wrong response status code");
+					}
+					[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+						tc_ac.stop;
+						setverdict(fail, __SCOPE__ & ": Error occurrs with response status code: " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)) & "while handling a valid locationPolicy resource create request!");
+					}
+					[] tc_ac.timeout {
+						setverdict(fail, __SCOPE__ & ": Timeout due to no response from requested server!");
+					}
+				}	
+  		      
+				f_checkAeSimuStatus();
+						
+				//Check to see if the resource is present or not
+				if(f_cse_isResourcePresent(v_resourceIndex)) {
+					setverdict(pass, __SCOPE__ & ":INFO: Resource created");
+				} else {
+					setverdict(fail, __SCOPE__ & ":ERROR: Resource not created");
+				}
+  		      
+			  // Postamble
+				f_cse_postamble_deleteResources();	 
+    				
+				// Tear down
+				f_cf01Down(); 		      
+		      
+			}//end testcase TC_CSE_LOC_007
+		    
+		  }//end group g_CSE_LOC_007
+		  		
+		 group g_CSE_LOC_008 {
+		    
+			testcase TC_CSE_LOC_008() runs on Tester system CseSystem {
+					
+				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+																	
+				v_ae1.start(f_CSE_LOC_008());
+														  	  	
+				v_ae1.done;
+														  	  		
+			}
+																
+			function f_CSE_LOC_008() runs on AeSimu {
+			  //TO create a <locationPolicy> resource with locationSource set to Share-based
+		     
+			   var integer v_aeAuxIndex 				:= -1;	 
+			   var LocationSource v_locationSource		:= int3;//Share-based
+				var RequestPrimitive v_request;
+				var MsgIn v_response;
+				var integer v_resourceIndex := -1;
+     	     	
+     	     	//Test control
+				if(not(PICS_MN_CSE)) {
+					setverdict(inconc, __SCOPE__ & ": IUT shall support MN-CSE to run this test case. Set PX_MN_CSE to true to run this test case");
+					stop;
+				}
+				
+				//Test component configuration
+				f_cf01Up();
+ 	     	      	     	    
+				//Preamble
+				v_aeAuxIndex := f_cse_preamble_registerAe();
+				//Set requestPrimitive
+				v_request	  := f_getCreateRequestPrimitive(int10, m_createLocationPolicy(v_locationSource, omit, omit, omit, omit), v_aeAuxIndex);
+			  									
+				// Test Body					
+				mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
+				tc_ac.start;
+				alt {
+					[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
+						tc_ac.stop;
+						setverdict(pass, __SCOPE__ & ": Resource locationPolicy is created successfully with response status code: " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode))&"!");
+						f_checkAttributesToBeSaved(int10, v_request, v_response.primitive.responsePrimitive);
+						v_resourceIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int10, v_aeAuxIndex);
+					}
+					[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+						tc_ac.stop;
+						setverdict(fail, __SCOPE__ & ": Wrong response status code");
+					}
+					[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+						tc_ac.stop;
+						setverdict(fail, __SCOPE__ & ": Error occurrs with response status code: " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)) & "while handling a valid locationPolicy resource create request!");
+					}
+					[] tc_ac.timeout {
+						setverdict(fail, __SCOPE__ & ": Timeout due to no response from requested server!");
+					}
+				}	
+		      
+				f_checkAeSimuStatus();
+						
+				//Check to see if the resource is present or not
+				if(f_cse_isResourcePresent(v_resourceIndex)) {
+					setverdict(pass, __SCOPE__ & ":INFO: Resource created");
+				} else {
+					setverdict(fail, __SCOPE__ & ":ERROR: Resource not created");
+				}
+		      
+				//Postamble
+				f_cse_postamble_deleteResources();	 
+				
+				// Tear down
+				f_cf01Down(); 		      
+		      
+			}//end testcase TC_CSE_LOC_008
+		    
+		  }//end group g_CSE_LOC_008
+		 		 		
+		 group g_CSE_LOC_009 {
+		    
+			testcase TC_CSE_LOC_009_01() runs on Tester system CseSystem {
+					
+				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+																	
+				v_ae1.start(f_CSE_LOC_009_01());
+														  	  	
+				v_ae1.done;
+														  	  		
+			}
+																
+			function f_CSE_LOC_009_01() runs on AeSimu {
+			  //TO NOTIFY a location information 
+		     
+			  var integer v_aeAuxIndex					:=	-1;
+			  var integer v_locPolicyResourceIndex		:= 	-1;
+			  var integer v_locContainerResourceIndex	:=	-1;
+			  var integer v_subscriptionResourceIndex	:= 	-1;
+			  var LocationSource v_locationSource	:= int1;//Netwok-based
+			  var XSD.Duration locationUpdatePeriod 	:= PX_LOCATION_UPDATE_PERIOD;  
+			  var LocationTargetID locationTargetID			:= PX_LOCATION_TARGET_ID;
+			  var XSD.AnyURI locationServerAddress	    := PX_LOCATION_SERVER_ADDRESS;
+			  var RequestPrimitive v_locpolicy_request_preamble;
+			  var RequestPrimitive v_container_request_preamble;
+			  var RequestPrimitive v_subscription_request_preamble;
+			  var MsgIn v_response;
+		      		      
+			  //Test component configuration
+			  f_cf01Up();
+		 	  
+			  //Preamble - register AE
+				v_aeAuxIndex						:= f_cse_preamble_registerAe();
+			  //Preamble - create a valid locationPolicy resource 
+				v_locpolicy_request_preamble		:= valueof(m_createLocationPolicy(v_locationSource, omit, locationUpdatePeriod, locationTargetID, locationServerAddress));
+				v_container_request_preamble		:= valueof(m_createContainer(f_getResourceAddress(v_aeAuxIndex), omit));//no location-container name provided?
+		 	  	
+				v_locPolicyResourceIndex			:= f_cse_createResource(int10, v_locpolicy_request_preamble, v_aeAuxIndex);//created locationpolicy index
+				v_locContainerResourceIndex		:= f_cse_createResource(int3, v_container_request_preamble, v_locPolicyResourceIndex);//created container index
+				v_subscription_request_preamble	:= valueof(m_createSubscription(f_getResourceAddress(v_locContainerResourceIndex), c_defaultResourceName, -));
+				v_subscriptionResourceIndex		:= f_cse_createResource(int23, v_subscription_request_preamble, v_locContainerResourceIndex);
+				
+			  //Test Body - retrieve the <latest> resource of the created container resource linked with the locationPolicy resource
+			  mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(m_retrieve(f_getResourceAddress(v_locContainerResourceIndex) & "/" & "latest", f_getOriginator(v_locContainerResourceIndex))))));
+			  tc_ac.start;
+			  alt{
+				[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response{
+				  tc_ac.stop;
+				  if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.notification.notificationEvent)){		            
+						setverdict(fail, __SCOPE__ & "No NotificationEvent is included in the response!");
+				  }else{
+						setverdict(pass, __SCOPE__ & "Location information is successfully sent!");		            
+				  }		          
+		          
+				}
+				[] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) -> value v_response{
+						tc_ac.stop;
+						setverdict(fail, __SCOPE__ & "Requested container resource is not found!");
+				}
+				[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
+						tc_ac.stop;
+						setverdict(fail, __SCOPE__ & ": Error while retrieving resource!");
+				}
+				[] tc_ac.timeout {
+						setverdict(fail, __SCOPE__ & ": No answer while retrieving resource!");
+				}		        
+			  }
+		      
+			  // Postamble
+			  f_cse_postamble_deleteResources();	 
+    			
+			  // Tear down
+			  f_cf01Down(); 		      
+		      
+			}//end testcase TC_CSE_LOC_009_01
+		    
+			testcase TC_CSE_LOC_BV_009_02() runs on Tester system CseSystem {
+					
+				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+																	
+				v_ae1.start(f_CSE_LOC_009_02());
+														  	  	
+				v_ae1.done;
+														  	  		
+			}
+																
+			function f_CSE_LOC_009_02() runs on AeSimu {
+			  //TO NOTIFY a location information 
+		     
+			  var integer v_aeAuxIndex					:=	-1;
+			  var integer v_locPolicyResourceIndex		:= 	-1;
+			  var integer v_locContainerResourceIndex	:=	-1;
+			  var integer v_subscriptionResourceIndex	:= 	-1;
+			  var LocationSource v_locationSource	    := int2;//Device-based
+			  var XSD.Duration locationUpdatePeriod 	:= PX_LOCATION_UPDATE_PERIOD;  
+			  var RequestPrimitive v_locpolicy_request_preamble;
+			  var RequestPrimitive v_container_request_preamble;
+			  var RequestPrimitive v_subscription_request_preamble;
+			  var MsgIn v_response;
+		      		      
+			  //Test component configuration
+			  f_cf01Up();
+		 	  
+			  //Preamble - register AE
+				v_aeAuxIndex						:= f_cse_preamble_registerAe();
+			  //Preamble - create a valid locationPolicy resource
+		 	  	 
+				v_locpolicy_request_preamble		:= valueof(m_createLocationPolicy(v_locationSource, omit, locationUpdatePeriod, omit, omit));
+				v_container_request_preamble		:= valueof(m_createContainer(f_getResourceAddress(v_aeAuxIndex), omit));//no location-container name provided?
+		 	  	
+				v_locPolicyResourceIndex			:= f_cse_createResource(int10, v_locpolicy_request_preamble, v_aeAuxIndex);//created locationpolicy index
+				v_locContainerResourceIndex		:= f_cse_createResource(int3, v_container_request_preamble, v_locPolicyResourceIndex);//created container index
+				v_subscription_request_preamble	:= valueof(m_createSubscription(f_getResourceAddress(v_locContainerResourceIndex), c_defaultResourceName, -));
+				v_subscriptionResourceIndex		:= f_cse_createResource(int23, v_subscription_request_preamble, v_locContainerResourceIndex);
+				
+			  //Test Body - retrieve the <latest> resource of the created container resource linked with the locationPolicy resource
+			  mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(m_retrieve(f_getResourceAddress(v_locContainerResourceIndex) & "/" & "latest", f_getOriginator(v_locContainerResourceIndex))))));
+			  tc_ac.start;
+			  alt{
+				[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response{
+				  tc_ac.stop;
+				  if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.notification.notificationEvent)){		            
+						setverdict(fail, __SCOPE__ & "No NotificationEvent is included in the response!");
+				  }else{
+						setverdict(pass, __SCOPE__ & "Location information is successfully sent!");		            
+				  }		          
+		          
+				}
+				[] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) -> value v_response{
+						tc_ac.stop;
+						setverdict(fail, __SCOPE__ & "Requested container resource is not found!");
+				}
+				[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
+						tc_ac.stop;
+						setverdict(fail, __SCOPE__ & ": Error while retrieving resource!");
+				}
+				[] tc_ac.timeout {
+						setverdict(fail, __SCOPE__ & ": No answer while retrieving resource!");
+				}		        
+			  }
+		      
+			  // Postamble
+			  f_cse_postamble_deleteResources();	 
+    			
+			  // Tear down
+			  f_cf01Down(); 		      
+		      
+			}//end testcase TC_CSE_LOC_009_02 		    
+		    
+			testcase TC_CSE_LOC_009_03() runs on Tester system CseSystem {
+					
+				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+																	
+				v_ae1.start(f_CSE_LOC_009_03());
+														  	  	
+				v_ae1.done;
+														  	  		
+			}
+																
+			function f_CSE_LOC_009_03() runs on AeSimu {
+			  //TO NOTIFY a location information 
+		     
+			  var integer v_aeAuxIndex					:=	-1;
+			  var integer v_locPolicyResourceIndex		:= 	-1;
+			  var integer v_locContainerResourceIndex	:=	-1;
+			  var integer v_subscriptionResourceIndex	:= 	-1;
+			  var LocationSource v_locationSource	:= int3;//Sharing-based
+			  var RequestPrimitive v_locpolicy_request_preamble;
+			  var RequestPrimitive v_container_request_preamble;
+			  var RequestPrimitive v_subscription_request_preamble;
+			  var MsgIn v_response;
+		      		      
+			  //Test component configuration
+			  f_cf01Up();
+		 	  
+			  //Preamble - register AE
+				v_aeAuxIndex						:= f_cse_preamble_registerAe();
+			  //Preamble - create a valid locationPolicy resource
+		 	  	 
+				v_locpolicy_request_preamble		:= valueof(m_createLocationPolicy(v_locationSource, omit, omit, omit, omit));
+				v_container_request_preamble		:= valueof(m_createContainer(f_getResourceAddress(v_aeAuxIndex), omit));//no location-container name provided?
+		 	  	
+				v_locPolicyResourceIndex			:= f_cse_createResource(int10, v_locpolicy_request_preamble, v_aeAuxIndex);//created locationpolicy index
+				v_locContainerResourceIndex		:= f_cse_createResource(int3, v_container_request_preamble, v_locPolicyResourceIndex);//created container index
+				v_subscription_request_preamble	:= valueof(m_createSubscription(f_getResourceAddress(v_locContainerResourceIndex), c_defaultResourceName, -));
+				v_subscriptionResourceIndex		:= f_cse_createResource(int23, v_subscription_request_preamble, v_locContainerResourceIndex);
+				
+			  //Test Body - retrieve the <latest> resource of the created container resource linked with the locationPolicy resource
+			  mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(m_retrieve(f_getResourceAddress(v_locContainerResourceIndex) & "/" & "latest", f_getOriginator(v_locContainerResourceIndex))))));
+			  tc_ac.start;
+			  alt{
+				[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response{
+				  tc_ac.stop;
+				  if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.notification.notificationEvent)){		            
+						setverdict(fail, __SCOPE__ & "No NotificationEvent is included in the response!");
+				  }else{
+						setverdict(pass, __SCOPE__ & "Location information is successfully sent!");		            
+				  }		          
+		          
+				}
+				[] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) -> value v_response{
+						tc_ac.stop;
+						setverdict(fail, __SCOPE__ & "Requested container resource is not found!");
+				}
+				[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
+						tc_ac.stop;
+						setverdict(fail, __SCOPE__ & ": Error while retrieving resource!");
+				}
+				[] tc_ac.timeout {
+						setverdict(fail, __SCOPE__ & ": No answer while retrieving resource!");
+				}		        
+			  }
+		      
+			  // Postamble
+			  f_cse_postamble_deleteResources();	 
+    			
+			  // Tear down
+			  f_cf01Down(); 		      
+		      
+			}//end testcase TC_CSE_LOC_009_03 
+		  }//end group g_CSE_LOC_009
+		  
+		  /*group g_CSE_LOC_007 {
+			  testcase TC_CSE_LOC_007() runs on AeSimu system CseSystem{		    
+				//TODO
+			  }//end testcase TC_CSE_LOC_007
+		  }//end group g_CSE_LOC_007
+		  
+		  group g_CSE_LOC_008 {
+			  testcase TC_CSE_LOC_008() runs on AeSimu system CseSystem{		    
+				//TODO
+			  }//end testcase TC_CSE_LOC_008
+		  }//end group g_CSE_LOC_008
+		  */
+
+		  group g_CSE_LOC_012 {
+			testcase TC_CSE_LOC_012() runs on Tester system CseSystem {
+					
+				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+																	
+				v_ae1.start(f_CSE_LOC_012());
+														  	  	
+				v_ae1.done;
+														  	  		
+			}
+																
+			function f_CSE_LOC_012() runs on AeSimu {		    
+				//To CREATE a <subscription> resource as a child resource of the created <container> 
+    		    
+				  var integer v_aeAuxIndex					:=	-1;
+				  var integer v_locPolicyResourceIndex		:= 	-1;
+				  var integer v_locContainerResourceIndex	:=	-1;
+				  var LocationSource v_locationSource		:= int1;//Netwok-based
+				  var XSD.Duration locationUpdatePeriod 	:= PX_LOCATION_UPDATE_PERIOD;  
+				  var LocationTargetID locationTargetID			:= PX_LOCATION_TARGET_ID;
+				  var XSD.AnyURI locationServerAddress	    := PX_LOCATION_SERVER_ADDRESS;
+				  var RequestPrimitive v_locpolicy_request_preamble;
+				  var RequestPrimitive v_container_request_preamble;
+				  var RequestPrimitive v_subscription_request_preamble;
+				  var MsgIn v_response;
+    		      		      
+				  //Test component configuration
+				  f_cf01Up();
+    		 	  
+				  //Preamble - register AE
+					v_aeAuxIndex						:= f_cse_preamble_registerAe();
+				  //Preamble - create a valid locationPolicy resource 
+					v_locpolicy_request_preamble		:= valueof(m_createLocationPolicy(v_locationSource, omit, locationUpdatePeriod, locationTargetID, locationServerAddress));
+					v_container_request_preamble		:= valueof(m_createContainer(f_getResourceAddress(v_aeAuxIndex), omit));//no location-container name provided?
+    		 	  	
+					v_locPolicyResourceIndex			:= f_cse_createResource(int10, v_locpolicy_request_preamble, v_aeAuxIndex);//created locationpolicy index
+					v_locContainerResourceIndex		:= f_cse_createResource(int3, v_container_request_preamble, v_locPolicyResourceIndex);//created container index
+					v_subscription_request_preamble	:= valueof(m_createSubscription(f_getResourceAddress(v_locContainerResourceIndex), c_defaultResourceName, -));
+    				    				
+				  //Test Body
+				  mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(f_getCreateRequestPrimitive(int23, v_subscription_request_preamble, v_locContainerResourceIndex))))); 
+				  tc_ac.start;
+				  alt{
+					[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response{
+					  tc_ac.stop;    		         
+					  setverdict(pass, __SCOPE__ & "Subscription resource is successfully!");
+					}
+					[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response{
+					  tc_ac.stop;    		         
+						setverdict(fail, __SCOPE__ & ": Wrong response status code");
+					}
+					[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response{
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & "Requested container resource is not found!");
+					}    		        
+					[] tc_ac.timeout {
+							setverdict(fail, __SCOPE__ & ": No answer while creating subscription resource!");
+					}		        
+				  }
+    		      
+				  // Postamble
+				  f_cse_postamble_deleteResources();	 
+        			
+				  // Tear down
+				  f_cf01Down(); 		
+    		    
+			  }//end testcase TC_CSE_LOC_012
+		  }//end group g_CSE_LOC_012
+		
+		  group g_CSE_LOC_013 {
+		    
+			testcase TC_CSE_LOC_013() runs on Tester system CseSystem {
+					
+				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+																	
+				v_ae1.start(f_CSE_LOC_013());
+														  	  	
+				v_ae1.done;
+														  	  		
+			}
+																
+			function f_CSE_LOC_013() runs on AeSimu {
+			  //TO RETRIEVE a <locationPolicy> resource that has created in cse
+		     
+			  var integer v_aeAuxIndex				:=	-1;
+			  var integer v_locPolicyResourceIndex	:= 	-1;
+			  var RequestPrimitive v_locpolicy_request_preamble;
+			  var MsgIn v_response;
+			  var LocationSource v_locationSource	:= int1;//Netwok-based
+			  var XSD.Duration locationUpdatePeriod 	:= PX_LOCATION_UPDATE_PERIOD;
+			  var LocationTargetID locationTargetID		:= PX_LOCATION_TARGET_ID;
+			  var XSD.AnyURI locationServerAddress	:= PX_LOCATION_SERVER_ADDRESS;
+		      
+		      
+			  //Test component configuration
+			  f_cf01Up();
+		 	  
+			  //Preamble - register AE
+			  v_aeAuxIndex				:= f_cse_preamble_registerAe();
+			  //Preamble - create a valid locationPolicy resource for later container resource creation
+			  v_locpolicy_request_preamble		:= valueof(m_createLocationPolicy(v_locationSource, omit, locationUpdatePeriod, locationTargetID, locationServerAddress));
+			  v_locPolicyResourceIndex	:= f_cse_createResource(int10, v_locpolicy_request_preamble, v_aeAuxIndex);//created locationpolicy index
+				
+			  //Test Body - retrieve the created locationpolicy resource
+			  mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(m_retrieve(f_getResourceAddress(v_locPolicyResourceIndex), f_getOriginator(v_locPolicyResourceIndex)))))); 
+			  tc_ac.start;
+			  alt{
+				[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response{
+				  tc_ac.stop;
+				  if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.locationPolicy.locationContainerID)){		            
+						setverdict(fail, __SCOPE__ & "No locationContainerID is included in the response!");
+				  }else{
+						setverdict(pass, __SCOPE__ & "LocationPolicy resource is successfully retrieved with locationContainerID included in the response!");		            
+				  }		          
+		          
+				}
+				[] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) -> value v_response{
+						tc_ac.stop;
+						setverdict(fail, __SCOPE__ & "Requested locationPolicy is not found!");
+				}
+				[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
+						tc_ac.stop;
+						setverdict(fail, __SCOPE__ & ": Error while retrieving resource!");
+				}
+				[] tc_ac.timeout {
+						setverdict(fail, __SCOPE__ & ": No answer while retrieving resource!");
+				}
+		        
+			  }
+		      
+			  // Postamble
+			  f_cse_postamble_deleteResources();	 
+    			
+			  // Tear down
+			  f_cf01Down(); 		      
+		      
+			}//end testcase TC_CSE_LOC_013 		    
+		    
+		  }//end group g_CSE_LOC_013
+		  
+		  
+		}//end group Location
+		
+		group Subscription_And_Notification {
+	
+			group Create {
+				
+				group g_CSE_SUB_CRE_001 {
+				
+					/**
+					 * @desc Check that the IUT rejects the creation of the <subscription> resource when the target subscribed-to RESOURCE_TYPE resource is not subscribable. 
+					 * 
+					 */
+					testcase TC_CSE_SUB_CRE_001_TSI() runs on Tester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_parentResourceRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_childResourceRequest := m_createTimeSeriesInstanceBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						const XSD.String c_content := "Random Value";	
+	
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_childResourceRequest.primitiveContent.timeSeriesInstance.content := "Random Value";
+	
+						v_ae1.start(f_CSE_SUB_CRE_001(int29, v_parentResourceRequest, int30, v_childResourceRequest));		
+						v_ae1.done;
+					}
+
+				}// end group g_CSE_DMR_CRE_014
+				
+			}//end group Create
+			
+			group Notify{
+				
+
+			}//end group Notify
+			
+			group Update {
+				
+			}//end group Update
+			
+			group Delete {
+				
+				
+			}//end group Delete
+			
+		}//end group Subscription_And_Notification
+		
+		group Security {
+	
+			group Access_Control_Policy {
+				
+				group Create {
+	
+				}// end of group Create
+			
+				group Update {
+				
+				}// end of group Update
+				
+				group Basic_Operations {
+				
+				}// end of Basic_Operations
+				
+			}//end group AccessControlPolicy
+			
+		}//end group Security
+		
+		group Announcement {
+			
+			group Basic {
+		
+				group g_CSE_ANNC_001 {
+
+					/**
+					 * @desc Check that the IUT provides confirmation of the announcement of a resource to the originator of the initiating request after a successful resource announcement procedure
+					 *  
+					 */
+					testcase TC_CSE_ANNC_001_ACP_UPD() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
+                  
+						v_ae1.start(f_CSE_ANNC_001(int1, v_createRequestAnnc, omit, v_updateRequest));//AccessControlPolicy
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_ANNC_001_ACP_CRE() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var template RequestPrimitive v_createRequest := m_createAcpBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
+  
+						v_ae1.start(f_CSE_ANNC_001(int1, v_createRequestAnnc, v_createRequest, omit));//AccessControlPolicy
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_ANNC_001_CNT_UPD() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_updateRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
+  
+						v_ae1.start(f_CSE_ANNC_001(int3, v_createRequestAnnc, omit, v_updateRequest));//Container
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_ANNC_001_CNT_CRE() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var template RequestPrimitive v_createRequest := m_createContainerBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
+  
+						v_ae1.start(f_CSE_ANNC_001(int3, v_createRequestAnnc, v_createRequest, omit));//Container
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_ANNC_001_GRP_UPD() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_updateRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
+  
+						v_ae1.start(f_CSE_ANNC_001(int9, v_createRequestAnnc, omit, v_updateRequest));//Group
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_ANNC_001_GRP_CRE() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var template RequestPrimitive v_createRequest := m_createGroupBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
+  
+						v_ae1.start(f_CSE_ANNC_001(int9, v_createRequestAnnc, v_createRequest, omit));//Group
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_ANNC_001_CIN_CRE() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
+  
+						v_ae1.start(f_CSE_ANNC_001(int4, v_createRequestAnnc, v_createRequest, omit));//ContentInstance
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_ANNC_001_TS_UPD() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
+  
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_updateRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
+  
+						v_ae1.start(f_CSE_ANNC_001(int29, v_createRequestAnnc, omit, v_updateRequest));//TimeSeries
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_ANNC_001_TS_CRE() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
+  
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
+  
+						v_ae1.start(f_CSE_ANNC_001(int29, v_createRequestAnnc, v_createRequest, omit));//TimeSeries
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_ANNC_001_TSI_CRE() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnnc;
+  
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.timeSeriesInstance.announceTo := {PX_CSE1_ID};
+  
+						v_ae1.start(f_CSE_ANNC_001(int30, v_createRequestAnnc, v_createRequest, omit));//TimeSeriesInstance
+						v_ae1.done;
+					}
+			
+				}// end group g_CSE_ANNC_001
+		
+			}//end group Basic
+			
+			group Create {
+				
+				group g_CSE_ANNC_CRE_001 {
+					
+					/**
+					 * @desc Check that the accessControlPolicyIDs attribute is announced when accessControlPolicyIDs attribute of the original resource is not present
+					 *  
+					 */
+					testcase TC_CSE_ANNC_CRE_001() runs on Tester system CseSystem {
+						//Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_createRequest := m_createContainerBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
+											
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;	
+						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
+						
+						v_ae1.start(f_CSE_ANNC_CRE_001(int3, v_createRequestAnnc, v_createRequest));//Container
+						v_ae1.done;
+						
+					} //end TC_CSE_ANNC_CRE_001
+				} // end group g_CSE_ANNC_CRE_001
+				
+				group g_CSE_ANNC_CRE_002 {
+					
+					/**
+					 * @desc Check that the IUT announces successfully the RESOURCE_TYPE resource when a new CSE-ID is provided in announcedTo optional attribute and IUT having not been announced to announcement target CSE
+					 *  
+					 */
+					testcase TC_CSE_ANNC_CRE_002_ACP() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
+						var template RequestPrimitive v_createRequest := m_createAcpBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
+						
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {"/CSE2_ID"};
+  
+						v_cse1.start(f_CSE_ANNC_CRE_002(int1, v_createRequest, v_updateRequest, v_createRequestAnnc));//AccessControlPolicy
+						v_cse1.done;
+					}
+
+					testcase TC_CSE_ANNC_CRE_002_CNT() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
+						var template RequestPrimitive v_createRequest := m_createContainerBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
+						
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_updateRequest.primitiveContent.container.announceTo := {"/CSE2_ID"};
+  
+						v_cse1.start(f_CSE_ANNC_CRE_002(int3, v_createRequest, v_updateRequest, v_createRequestAnnc));//Container
+						v_cse1.done;
+					}
+
+					testcase TC_CSE_ANNC_CRE_002_GRP() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
+						var template RequestPrimitive v_createRequest := m_createGroupBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
+						
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_updateRequest.primitiveContent.group_.announceTo := {"/CSE2_ID"};
+  
+						v_cse1.start(f_CSE_ANNC_CRE_002(int9, v_createRequest, v_updateRequest, v_createRequestAnnc));//Group
+						v_cse1.done;
+					}
+					
+					testcase TC_CSE_ANNC_CRE_002_TS() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
+  
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_updateRequest.primitiveContent.timeSeries.announceTo := {"/CSE2_ID"};
+  
+						v_cse1.start(f_CSE_ANNC_CRE_002(int29, v_createRequest, v_updateRequest, v_createRequestAnnc));//TimeSeries
+						v_cse1.done;
+					}
+				} //end group g_CSE_ANNC_CRE_002
+				
+				group g_CSE_ANNC_CRE_003 {
+					
+					/**
+					 * @desc Host CSE of original resource removes an announcement target CSE from the announceTo attribute if it does not return successful CREATE response for the announced resource (for a CREATE initiating resource announcement)
+					 *  
+					 */
+					testcase TC_CSE_ANNC_CRE_003() runs on Tester system CseSystem {
+						//Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
+							
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
+	
+						v_ae1.start(f_CSE_ANNC_CRE_003(int4, v_createRequestAnnc, v_createRequest));//ContentInstance
+						v_ae1.done;
+						
+					} //end TC_CSE_ANNC_CRE_003
+					
+				} //end group g_CSE_ANNC_CRE_003
+				
+				group g_CSE_ANNC_CRE_004 {
+					
+					/**
+					 * @desc Check that the IUT announces successfully the RESOURCE_TYPE resource during its creation when announceTo optional attribute is provided and its parent resource having been announced to the announcement target CSE
+					 *  
+					 */
+					testcase TC_CSE_ANNC_CRE_004_ACP() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createAcpBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
+  
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
+  
+						v_cse1.start(f_CSE_ANNC_CRE_004_CseSimu(int1, v_createRequestAnnc, v_createRequest));//AccessControlPolicy
+						v_cse1.done;
+					}
+					
+					testcase TC_CSE_ANNC_CRE_004_CNT() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createContainerBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
+  
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
+  
+						v_cse1.start(f_CSE_ANNC_CRE_004_CseSimu(int3, v_createRequestAnnc, v_createRequest));//Container
+						v_cse1.done;
+					}
+					
+					testcase TC_CSE_ANNC_CRE_004_CIN() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
+  
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
+  
+						v_cse1.start(f_CSE_ANNC_CRE_004_CseSimu(int4, v_createRequestAnnc, v_createRequest));//ContentInstance
+						v_cse1.done;
+					}
+					
+					testcase TC_CSE_ANNC_CRE_004_GRP() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createGroupBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
+  
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
+  
+						v_cse1.start(f_CSE_ANNC_CRE_004_CseSimu(int9, v_createRequestAnnc, v_createRequest));//Group
+						v_cse1.done;
+					}
+					
+					testcase TC_CSE_ANNC_CRE_004_TS() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
+  
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
+  
+						v_cse1.start(f_CSE_ANNC_CRE_004_CseSimu(int29, v_createRequestAnnc, v_createRequest));//TimeSeries
+						v_cse1.done;
+					}
+					
+				}// end group g_CSE_ANNC_CRE_004
+				
+				group g_CSE_ANNC_CRE_005 {
+					
+					/**
+					 * @desc Check that the IUT announces successfully the RESOURCE_TYPE resource during its creation when announceTo optional attribute is provided and IUT having been already announced to announcement target CSE
+					 *  
+					 */
+					testcase TC_CSE_ANNC_CRE_005_ACP() runs on Tester system CseSystem {
+						//Local variables
+						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						 var template RequestPrimitive v_createRequest := m_createAcpBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
+	  
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						 v_createRequest.primitiveContent.accessControlPolicy.announceTo := {"/CSE2_ID"};
+	  
+						 v_cse1.start(f_CSE_ANNC_CRE_005_CseSimu(int1, v_createRequestAnnc, v_createRequest));//AccessControlPolicy
+						 v_cse1.done;
+					}
+					
+					testcase TC_CSE_ANNC_CRE_005_CNT() runs on Tester system CseSystem {
+						//Local variables
+						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						 var template RequestPrimitive v_createRequest := m_createContainerBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
+  
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						 v_createRequest.primitiveContent.container.announceTo := {"/CSE2_ID"};
+  
+						 v_cse1.start(f_CSE_ANNC_CRE_005_CseSimu(int3, v_createRequestAnnc, v_createRequest));//Container
+						 v_cse1.done;
+					}
+					
+					testcase TC_CSE_ANNC_CRE_005_CIN() runs on Tester system CseSystem {
+						//Local variables
+						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						 var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
+  
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						 v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
+  
+						 v_cse1.start(f_CSE_ANNC_CRE_005_CseSimu(int4, v_createRequestAnnc, v_createRequest));//ContentInstance
+						 v_cse1.done;
+						
+					}
+					
+					testcase TC_CSE_ANNC_CRE_005_GRP() runs on Tester system CseSystem {
+						//Local variables
+						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						 var template RequestPrimitive v_createRequest := m_createGroupBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
+  
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						 v_createRequest.primitiveContent.group_.announceTo := {"/CSE2_ID"};
+  
+						 v_cse1.start(f_CSE_ANNC_CRE_005_CseSimu(int9, v_createRequestAnnc, v_createRequest));//Group
+						 v_cse1.done;
+					}
+					
+					testcase TC_CSE_ANNC_CRE_005_TS() runs on Tester system CseSystem {
+						//Local variables
+						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
+  
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						 v_createRequest.primitiveContent.timeSeries.announceTo := {"/CSE2_ID"};
+  
+						 v_cse1.start(f_CSE_ANNC_CRE_005_CseSimu(int29, v_createRequestAnnc, v_createRequest));//TimeSeries
+						 v_cse1.done;
+					}
+					
+					testcase TC_CSE_ANNC_CRE_005_TSI() runs on Tester system CseSystem {
+						//Local variables
+						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						 var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnnc;
+  
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						 v_createRequest.primitiveContent.timeSeriesInstance.announceTo := {"/CSE2_ID"};
+  
+						 v_cse1.start(f_CSE_ANNC_CRE_005_CseSimu(int30, v_createRequestAnnc, v_createRequest));//TimeSeriesInstance
+						 v_cse1.done;
+					}
+					
+				} //end group g_CSE_ANNC_CRE_005
+				
+				group g_CSE_ANNC_CRE_006 {
+					
+					/**
+					 * @desc Check that the IUT announces successfully the RESOURCE_TYPE resource during its creation when announceTo optional attribute is provided and IUT has registered and created a <remoteCSE> resource to the announcement target CSE
+					 *  
+					 */
+					testcase TC_CSE_ANNC_CRE_006_ACP() runs on Tester system CseSystem {
+						//Local variables
+						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						 var template RequestPrimitive v_createRequest := m_createAcpBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
+  
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						 v_cse1.done;
+						 v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
+  
+						 v_cse1.start(f_CSE_ANNC_CRE_006_CseSimu(int1, v_createRequestAnnc, v_createRequest));//AccessControlPolicy
+						 v_cse1.done;
+					}
+	
+					testcase TC_CSE_ANNC_CRE_006_CNT() runs on Tester system CseSystem {
+						//Local variables
+						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						 var template RequestPrimitive v_createRequest := m_createContainerBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
+  
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						 v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
+  
+						 v_cse1.start(f_CSE_ANNC_CRE_006_CseSimu(int3, v_createRequestAnnc, v_createRequest));//Container
+						 v_cse1.done;
+					}
+	
+					testcase TC_CSE_ANNC_CRE_006_CIN() runs on Tester system CseSystem {
+						//Local variables
+						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						 var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
+  
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						 v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
+  
+						 v_cse1.start(f_CSE_ANNC_CRE_006_CseSimu(int4, v_createRequestAnnc, v_createRequest));//ContentInstance
+						 v_cse1.done;
+		
+					}
+	
+					testcase TC_CSE_ANNC_CRE_006_GRP() runs on Tester system CseSystem {
+						//Local variables
+						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						 var template RequestPrimitive v_createRequest := m_createGroupBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
+  
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						 v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
+  
+						 v_cse1.start(f_CSE_ANNC_CRE_006_CseSimu(int9, v_createRequestAnnc, v_createRequest));//Group
+						 v_cse1.done;
+					}
+					
+					testcase TC_CSE_ANNC_CRE_006_TS() runs on Tester system CseSystem {
+						//Local variables
+						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
+	  
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						 v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
+	  
+						 v_cse1.start(f_CSE_ANNC_CRE_006_CseSimu(int29, v_createRequestAnnc, v_createRequest));//TimeSeries
+						 v_cse1.done;
+					}
+					
+					testcase TC_CSE_ANNC_CRE_006_TSI() runs on Tester system CseSystem {
+						//Local variables
+						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						 var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnnc;
+  
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						 v_createRequest.primitiveContent.timeSeriesInstance.announceTo := {PX_CSE1_ID};
+  
+						 v_cse1.start(f_CSE_ANNC_CRE_006_CseSimu(int30, v_createRequestAnnc, v_createRequest));//TimeSeriesInstance
+						 v_cse1.done;
+					}
+	
+				} //end group g_CSE_ANNC_CRE_006
+				
+				group g_CSE_ANNC_CRE_007 {
+					
+					/**
+					 * @desc Check that the IUT announces successfully the RESOURCE_TYPE resource during its creation when announceTo optional attribute is provided and IUT having not been announced to announcement target CSE
+					 *  
+					 */
+					testcase TC_CSE_ANNC_CRE_007_ACP() runs on Tester system CseSystem {
+						//Local variables
+						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						 var template RequestPrimitive v_createRequest := m_createAcpBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
+	  
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						 v_cse1.done;
+						 v_createRequest.primitiveContent.accessControlPolicy.announceTo := {"/CSE2_ID"};
+	  
+						 v_cse1.start(f_CSE_ANNC_CRE_007_CseSimu(int1, v_createRequestAnnc, v_createRequest));//AccessControlPolicy
+						 v_cse1.done;
+					}
+	
+					testcase TC_CSE_ANNC_CRE_007_CNT() runs on Tester system CseSystem {
+						//Local variables
+						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						 var template RequestPrimitive v_createRequest := m_createContainerBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
+	  
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						 v_cse1.done;
+						 v_createRequest.primitiveContent.container.announceTo := {"/CSE2_ID"};
+	  
+						 v_cse1.start(f_CSE_ANNC_CRE_007_CseSimu(int3, v_createRequestAnnc, v_createRequest));//Container
+						 v_cse1.done;
+					}
+	
+					testcase TC_CSE_ANNC_CRE_007_CIN() runs on Tester system CseSystem {
+						//Local variables
+						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						 var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
+	  
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						 v_cse1.done;
+						 v_createRequest.primitiveContent.contentInstance.announceTo := {"/CSE2_ID"};
+	  
+						 v_cse1.start(f_CSE_ANNC_CRE_007_CseSimu(int4, v_createRequestAnnc, v_createRequest));//ContentInstance
+						 v_cse1.done;
+	
+					}
+	
+					testcase TC_CSE_ANNC_CRE_007_GRP() runs on Tester system CseSystem {
+						//Local variables
+						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						 var template RequestPrimitive v_createRequest := m_createGroupBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
+	  
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						 v_cse1.done;
+						 v_createRequest.primitiveContent.group_.announceTo := {"/CSE2_ID"};
+	  
+						 v_cse1.start(f_CSE_ANNC_CRE_007_CseSimu(int9, v_createRequestAnnc, v_createRequest));//Group
+						 v_cse1.done;
+					}
+					
+					testcase TC_CSE_ANNC_CRE_007_TS() runs on Tester system CseSystem {
+						//Local variables
+						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
+  
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						 v_cse1.done;
+						 v_createRequest.primitiveContent.accessControlPolicy.announceTo := {"/CSE2_ID"};
+						 
+						 v_cse1.start(f_CSE_ANNC_CRE_007_CseSimu(int29, v_createRequestAnnc, v_createRequest));//TimeSeries
+						 v_cse1.done;
+					}
+					
+					testcase TC_CSE_ANNC_CRE_007_TSI() runs on Tester system CseSystem {
+						//Local variables
+						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						 var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnnc;
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						 v_cse1.done;
+						 
+						 v_createRequest.primitiveContent.timeSeriesInstance.announceTo := {"/CSE2_ID"};
+  
+						 v_cse1.start(f_CSE_ANNC_CRE_007_CseSimu(int30, v_createRequestAnnc, v_createRequest));//TimeSeriesInstance
+						 v_cse1.done;
+					}
+	
+				} //end group g_CSE_ANNC_CRE_007
+				
+				group g_CSE_ANNC_CRE_008 {
+					
+					/**
+					 * @desc Check that the IUT announces successfully the RESOURCE_TYPE resource during its creation when announceTo and announcedAttribute optional attributes are provided and its parent resource having been announced to the announcement target CSE
+					 *  
+					 */
+					testcase TC_CSE_ANNC_CRE_008_CNT_MBS() runs on Tester system CseSystem {
+						//Local variables
+						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						 var template RequestPrimitive v_createRequest := m_createContainerBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
+  
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						 v_cse1.done;
+						 v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
+						 v_createRequest.primitiveContent.container.announcedAttribute := {"mbs"};
+						 v_createRequestAnnc.primitiveContent.containerAnnc.maxByteSize := ?;
+						 
+						 v_cse1.start(f_CSE_ANNC_CRE_008_CseSimu(int3, v_createRequestAnnc, v_createRequest));//Container
+						 v_cse1.done;
+					}
+
+					testcase TC_CSE_ANNC_CRE_008_CIN_CNF() runs on Tester system CseSystem {
+						//Local variables
+						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						 var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
+  
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						 v_cse1.done;
+						 v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
+						 v_createRequest.primitiveContent.contentInstance.announcedAttribute := {"cnf"};
+						 v_createRequestAnnc.primitiveContent.contentInstanceAnnc.contentInfo:= ?;
+						 
+						 v_cse1.start(f_CSE_ANNC_CRE_008_CseSimu(int4, v_createRequestAnnc, v_createRequest));//ContentInstance
+						 v_cse1.done;
+					}
+
+					testcase TC_CSE_ANNC_CRE_008_GRP_MT() runs on Tester system CseSystem {
+						//Local variables
+						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						 var template RequestPrimitive v_createRequest := m_createGroupBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
+  
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						 v_cse1.done;
+						 v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
+						 v_createRequest.primitiveContent.group_.announcedAttribute := {"mt"};
+						 v_createRequestAnnc.primitiveContent.groupAnnc.memberType:= ?;
+						 
+						 v_cse1.start(f_CSE_ANNC_CRE_008_CseSimu(int9, v_createRequestAnnc, v_createRequest));//Group
+						 v_cse1.done;
+
+					}
+					
+					testcase TC_CSE_ANNC_CRE_008_TS_MBS() runs on Tester system CseSystem {
+						//Local variables
+						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						 v_cse1.done;
+						 
+						 v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
+						 v_createRequest.primitiveContent.timeSeries.announcedAttribute := {"mbs"};
+						 v_createRequestAnnc.primitiveContent.timeSeriesAnnc.maxByteSize := ?;
+						 
+						 v_cse1.start(f_CSE_ANNC_CRE_008_CseSimu(int29, v_createRequestAnnc, v_createRequest));//TimeSeries
+						 v_cse1.done;
+					}
+					
+					testcase TC_CSE_ANNC_CRE_008_TSI_CS() runs on Tester system CseSystem {
+						//Local variables
+						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						 var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnnc;
+	  
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						 v_cse1.done;
+						 v_createRequest.primitiveContent.timeSeriesInstance.announceTo := {PX_CSE1_ID};
+						 v_createRequest.primitiveContent.timeSeriesInstance.announcedAttribute := {"cs"};
+						 v_createRequestAnnc.primitiveContent.timeSeriesInstanceAnnc.contentSize := ?;
+						 
+						 v_cse1.start(f_CSE_ANNC_CRE_008_CseSimu(int30, v_createRequestAnnc, v_createRequest));//TimeSeriesInstance
+						 v_cse1.done;
+					}
+
+				} //end group g_CSE_ANNC_CRE_008
+				
+				group g_CSE_ANNC_CRE_009 {
+					
+					/**
+					 * @desc Check that the labels attribute is announced when such attribute is present in the original resource
+					 *  
+					 */
+					testcase TC_CSE_ANNC_CRE_009_CNT() runs on Tester system CseSystem {
+						//Local variables
+						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						 var template RequestPrimitive v_createRequest := m_createContainerBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
+	    				 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						 v_cse1.done;
+						 
+						 v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
+						 v_createRequest.primitiveContent.container.labels := {"MyLabel"};
+						 v_createRequestAnnc.primitiveContent.containerAnnc.labels := ?;
+	  
+						 v_cse1.start(f_CSE_ANNC_CRE_009_CseSimu(int3, v_createRequestAnnc, v_createRequest));//Container
+						 v_cse1.done;
+					}
+				} //end group g_CSE_ANNC_CRE_009
+			} //end group Create
+			
+			group Retrieve {
+				
+				group g_CSE_ANNC_RET_001 {
+					
+					/**
+					 * @desc Host of <resourceAnnc> returns the <resourceAnnc> representation in a RETRIEVE response
+					 *  
+					 */
+					testcase TC_CSE_ANNC_RET_001_ACP() runs on Tester system CseSystem {
+						//Local variables
+						 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						 var template RequestPrimitive v_createRequest := m_createAcpBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
+  
+						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						 v_ae1.start(f_CSE_ANNC_RET_001(int1, v_createRequestAnnc, v_createRequest));//AccessControlPolicy
+						 v_ae1.done;
+					}
+					
+					testcase TC_CSE_ANNC_RET_001_CNT() runs on Tester system CseSystem {
+						 //Local variables
+						 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						 var template RequestPrimitive v_createRequest := m_createContainerBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
+	  
+						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						 v_ae1.start(f_CSE_ANNC_RET_001(int3, v_createRequestAnnc, v_createRequest));//Container
+						 v_ae1.done;
+					}
+					
+					testcase TC_CSE_ANNC_RET_001_CIN() runs on Tester system CseSystem {
+						 //Local variables
+						 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						 var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
+  
+						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						 v_ae1.start(f_CSE_ANNC_RET_001(int4, v_createRequestAnnc, v_createRequest));//ContentInstance
+						 v_ae1.done;
+					}
+					
+					testcase TC_CSE_ANNC_RET_001_GRP() runs on Tester system CseSystem {
+						 //Local variables
+						 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						 var template RequestPrimitive v_createRequest := m_createGroupBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
+  
+						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						 v_ae1.start(f_CSE_ANNC_RET_001(int9, v_createRequestAnnc, v_createRequest));//Group
+						 v_ae1.done;
+					}
+					
+					testcase TC_CSE_ANNC_RET_001_TS() runs on Tester system CseSystem {
+						 //Local variables
+						 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
+  
+						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						 v_ae1.start(f_CSE_ANNC_RET_001(int29, v_createRequestAnnc, v_createRequest));//TimeSeries
+						 v_ae1.done;
+					}
+					
+					testcase TC_CSE_ANNC_RET_001_TSI() runs on Tester system CseSystem {
+						 //Local variables
+						 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						 var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnnc;
+  
+						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						 v_ae1.start(f_CSE_ANNC_RET_001(int30, v_createRequestAnnc, v_createRequest));//TimeSeriesInstance
+						 v_ae1.done;
+					}
+					
+				} //end group g_CSE_ANNC_RET_001
+				
+				group g_CSE_ANNC_RET_002 {
+					
+					/**
+					 * @desc Host of <resourceAnnc> returns the original <resource> representation from the original resource hosting CSE in a RETRIEVE response when result content is set to “original-resource”
+					 *  
+					 */
+					testcase TC_CSE_ANNC_RET_002_ACP() runs on Tester system CseSystem {
+						//Local variables
+						 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						 var template RequestPrimitive v_createRequest := m_createAcpBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
+  
+						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						 v_ae1.start(f_CSE_ANNC_RET_002(int1, v_createRequestAnnc, v_createRequest));//AccessControlPolicy
+						 v_ae1.done;
+					}
+					
+					testcase TC_CSE_ANNC_RET_002_CNT() runs on Tester system CseSystem {
+						 //Local variables
+						 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						 var template RequestPrimitive v_createRequest := m_createContainerBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
+	  
+						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						 v_ae1.start(f_CSE_ANNC_RET_002(int3, v_createRequestAnnc, v_createRequest));//Container
+						 v_ae1.done;
+					}
+					
+					testcase TC_CSE_ANNC_RET_002_CIN() runs on Tester system CseSystem {
+						 //Local variables
+						 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						 var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
+  
+						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						 v_ae1.start(f_CSE_ANNC_RET_002(int4, v_createRequestAnnc, v_createRequest));//ContentInstance
+						 v_ae1.done;
+					}
+					
+					testcase TC_CSE_ANNC_RET_002_GRP() runs on Tester system CseSystem {
+						 //Local variables
+						 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						 var template RequestPrimitive v_createRequest := m_createGroupBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
+  
+						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						 v_ae1.start(f_CSE_ANNC_RET_002(int9, v_createRequestAnnc, v_createRequest));//Group
+						 v_ae1.done;
+					}
+					
+					testcase TC_CSE_ANNC_RET_002_TS() runs on Tester system CseSystem {
+						 //Local variables
+						 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
+	  
+						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						 v_ae1.start(f_CSE_ANNC_RET_002(int29, v_createRequestAnnc, v_createRequest));//TimeSeries
+						 v_ae1.done;
+					}
+					
+					testcase TC_CSE_ANNC_RET_002_TSI() runs on Tester system CseSystem {
+						 //Local variables
+						 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						 var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnnc;
+  
+						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						 v_ae1.start(f_CSE_ANNC_RET_002(int30, v_createRequestAnnc, v_createRequest));//TimeSeriesInstance
+						 v_ae1.done;
+					}
+					
+				} //end group g_CSE_ANNC_RET_002
+				
+			} //end group Retrieve
+			
+			group Update{
+
+				group g_CSE_ANNC_UPD_001{
+
+					/**
+					 * @desc Check that the IUT announces successfully the RESOURCE_TYPE resource when a new CSE-ID is provided in announcedTo optional attribute and its parent resource having been announced to the announcement target CSE
+					 *  
+					 */
+					testcase TC_CSE_ANNC_UPD_001_ACP() runs on Tester system CseSystem {
+						// Local variables
+						var MnCseSimu v_cse1 := MnCseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createAcpBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
+						var template RequestPrimitive v_updateRequest := m_updateAcpBase;	
+			
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};					
+			
+						v_cse1.start(f_CSE_ANNC_UPD_001(int1, v_createRequest, v_createRequestAnnc, v_updateRequest));//AccessControlPolicy
+						v_cse1.done;
+					}
+
+					testcase TC_CSE_ANNC_UPD_001_CNT() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createContainerBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
+						var template RequestPrimitive v_updateRequest := m_updateContainerBase;	
+			
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_updateRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
+  
+						v_cse1.start(f_CSE_ANNC_UPD_001(int3, v_createRequest, v_createRequestAnnc, v_updateRequest));//Container
+						v_cse1.done;
+					}
+
+					testcase TC_CSE_ANNC_UPD_001_GRP() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createGroupBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
+						var template RequestPrimitive v_updateRequest := m_updateGroupBase;	
+			
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_updateRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
+  
+						v_cse1.start(f_CSE_ANNC_UPD_001(int9, v_createRequest, v_createRequestAnnc, v_updateRequest));//Group
+						v_cse1.done;
+					}
+					
+					testcase TC_CSE_ANNC_UPD_001_TS() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;	
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_updateRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
+  
+						v_cse1.start(f_CSE_ANNC_UPD_001(int29, v_createRequest, v_createRequestAnnc, v_updateRequest));//TimeSeries
+						v_cse1.done;
+					}
+
+				}// end group g_CSE_ANNC_UPD_001
+	
+				group g_CSE_ANNC_UPD_002{
+
+					/**
+					 * @desc Check that the IUT initiates de-announcement of the RESOURCE_TYPE resource when a CSE-ID is deleted from the announceTo optional attribute
+					 *  
+					 */
+					testcase TC_CSE_ANNC_UPD_002_ACP() runs on Tester system CseSystem {
+						// Local variables
+						var MnCseSimu v_cse1 := MnCseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createAcpBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
+						var template RequestPrimitive v_updateRequest := m_updateAcpBase;	
+						var AttributeAux_list v_nullFields;
+						var ListOfURIs v_announceTo := {"To be deleted"};
+
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};		
+						
+						v_updateRequest.primitiveContent.accessControlPolicy.announceTo := v_announceTo;
+						v_nullFields := {{"announceTo", omit}};
+
+						v_cse1.start(f_CSE_ANNC_UPD_002(int1, v_createRequest, v_createRequestAnnc, v_updateRequest, v_nullFields));//AccessControlPolicy
+						v_cse1.done;
+					}
+
+					testcase TC_CSE_ANNC_UPD_002_CNT() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createContainerBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
+						var template RequestPrimitive v_updateRequest := m_updateContainerBase;	
+						var AttributeAux_list v_nullFields;
+						var ListOfURIs v_announceTo := {"To be deleted"};
+
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
+						
+						v_updateRequest.primitiveContent.container.announceTo := v_announceTo;
+						v_nullFields := {{"announceTo", omit}};
+  
+						v_cse1.start(f_CSE_ANNC_UPD_002(int3, v_createRequest, v_createRequestAnnc, v_updateRequest, v_nullFields));//Container
+						v_cse1.done;
+					}
+
+					testcase TC_CSE_ANNC_UPD_002_GRP() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createGroupBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
+						var template RequestPrimitive v_updateRequest := m_updateGroupBase;	
+						var AttributeAux_list v_nullFields;
+						var ListOfURIs v_announceTo := {"To be deleted"};
+
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
+						
+						v_updateRequest.primitiveContent.group_.announceTo := v_announceTo;
+						v_nullFields := {{"announceTo", omit}};
+  
+						v_cse1.start(f_CSE_ANNC_UPD_002(int9, v_createRequest, v_createRequestAnnc, v_updateRequest, v_nullFields));//Group
+						v_cse1.done;
+					}
+					
+					testcase TC_CSE_ANNC_UPD_002_TS() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;	
+						var AttributeAux_list v_nullFields;
+						var ListOfURIs v_announceTo := {"To be deleted"};
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
+	
+						v_updateRequest.primitiveContent.timeSeries.announceTo := v_announceTo;
+						v_nullFields := {{"announceTo", omit}};
+  
+						v_cse1.start(f_CSE_ANNC_UPD_002(int29, v_createRequest, v_createRequestAnnc, v_updateRequest, v_nullFields));//TimeSeries
+						v_cse1.done;
+					}
+
+				}// end group g_CSE_ANNC_UPD_002
+	
+				group g_CSE_ANNC_UPD_003{
+
+					/**
+					 * @desc Check that the IUT provides confirmation of resource de-announcement to the originator of the initiating request after a successful resource de-announcement procedure originator (for an UPDATE initiating resource de-announcement)
+					 *  
+					 */
+					testcase TC_CSE_ANNC_UPD_003_ACP() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_createRequest := m_createAcpBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
+						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
+						var ResponsePrimitive v_responsePrimitive;	
+						var AttributeAux_list v_nullFields;
+						var ListOfURIs v_announceTo := {"To be deleted"};
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+  
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
+						
+						v_updateRequest.primitiveContent.accessControlPolicy.announceTo := v_announceTo;
+						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;
+			
+						if(getverdict == pass){
+							v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.accessControlPolicy)) {
+									if(ispresent(v_responsePrimitive.primitiveContent.accessControlPolicy.announceTo)){
+										setverdict(fail, __SCOPE__ & ": Error: announceTo attribute is not set to NULL");
+									}
+								}
+							}
+							
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+
+							//Check that the resource has been udpated correctly
+							if(ischosen(v_primitiveContentRetrieveResource.accessControlPolicy)) {
+								if(ispresent(v_primitiveContentRetrieveResource.accessControlPolicy.announceTo)){
+									setverdict(fail, __SCOPE__ & ": Error: announceTo attribute not updated correctly");
+								}
+							}
+						}		
+				
+					}
+
+					testcase TC_CSE_ANNC_UPD_003_CNT() runs on Tester system CseSystem {
+						// Local variables
+						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 ResponsePrimitive v_responsePrimitive;	
+						var AttributeAux_list v_nullFields;
+						var ListOfURIs v_announceTo := {"To be deleted"};
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+  
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
+						
+						v_updateRequest.primitiveContent.container.announceTo := v_announceTo;
+						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;
+			
+						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.announceTo)){
+										setverdict(fail, __SCOPE__ & ": Error: announceTo attribute is not set to NULL");
+									}
+								}
+							}
+							
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+
+							//Check that the resource has been udpated correctly
+							if(ischosen(v_primitiveContentRetrieveResource.container)) {
+								if(ispresent(v_primitiveContentRetrieveResource.container.announceTo)){
+									setverdict(fail, __SCOPE__ & ": Error: announceTo attribute not updated correctly");
+								}
+							}
+						}	
+									
+					}
+
+					testcase TC_CSE_ANNC_UPD_003_GRP() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_createRequest := m_createGroupBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
+						var template RequestPrimitive v_updateRequest := m_updateGroupBase;	
+						var ResponsePrimitive v_responsePrimitive;	
+						var AttributeAux_list v_nullFields;
+						var ListOfURIs v_announceTo := {"To be deleted"};
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+  
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
+						
+						v_updateRequest.primitiveContent.group_.announceTo := v_announceTo;
+						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;
+			
+						if(getverdict == pass){
+							v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
+									if(ispresent(v_responsePrimitive.primitiveContent.group_.announceTo)){
+										setverdict(fail, __SCOPE__ & ": Error: announceTo attribute is not set to NULL");
+									}
+								}
+							}
+							
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+
+							//Check that the resource has been udpated correctly
+							if(ischosen(v_primitiveContentRetrieveResource.group_)) {
+								if(ispresent(v_primitiveContentRetrieveResource.group_.announceTo)){
+									setverdict(fail, __SCOPE__ & ": Error: announceTo attribute not updated correctly");
+								}
+							}
+						}	
+					}
+					
+					testcase TC_CSE_ANNC_UPD_003_TS() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;	
+						var ResponsePrimitive v_responsePrimitive;	
+						var AttributeAux_list v_nullFields;
+						var ListOfURIs v_announceTo := {"To be deleted"};
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+  
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
+	
+						v_updateRequest.primitiveContent.timeSeries.announceTo := v_announceTo;
+						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;
+
+						if(getverdict == pass){
+							v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
+									if(ispresent(v_responsePrimitive.primitiveContent.timeSeries.announceTo)){
+										setverdict(fail, __SCOPE__ & ": Error: announceTo attribute is not set to NULL");
+									}
+								}
+							}
+		
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+
+							//Check that the resource has been udpated correctly
+							if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
+								if(ispresent(v_primitiveContentRetrieveResource.timeSeries.announceTo)){
+									setverdict(fail, __SCOPE__ & ": Error: announceTo attribute not updated correctly");
+								}
+							}
+						}	
+					}
+
+				}// end group g_CSE_ANNC_UPD_003
+				
+				group g_CSE_ANNC_UPD_004 {
+		
+					/**
+					 * @desc HOST CSE of original resource returns INVALID response if announcedAttributes contains an attribute that is not marked OA
+					 *  
+					 */
+					testcase TC_CSE_ANNC_UPD_004_ACP() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createAcpBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
+						var template RequestPrimitive v_updateRequest := m_updateAcpBase;	
+
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
+						v_updateRequest.primitiveContent.accessControlPolicy.announcedAttribute := {"ToBeDeleted"};
+						v_updateRequest.primitiveContent.accessControlPolicy.parentID := PX_CSE1_ID;			
+
+						v_cse1.start(f_CSE_ANNC_UPD_004(int1, v_createRequest, v_createRequestAnnc, v_updateRequest));//AccessControlPolicy
+						v_cse1.done;
+					}
+
+					testcase TC_CSE_ANNC_UPD_004_CNT() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createContainerBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
+						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
+
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_updateRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
+						v_updateRequest.primitiveContent.container.announcedAttribute := {"ToBeDeleted"};
+						v_updateRequest.primitiveContent.container.parentID := PX_CSE1_ID;
+  
+						v_cse1.start(f_CSE_ANNC_UPD_004(int3, v_createRequest, v_createRequestAnnc, v_updateRequest));//Container
+						v_cse1.done;
+					}
+
+					testcase TC_CSE_ANNC_UPD_004_GRP() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createGroupBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
+						var template RequestPrimitive v_updateRequest := m_updateGroupBase;	
+
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_updateRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
+						v_updateRequest.primitiveContent.group_.announcedAttribute := {"ToBeDeleted"};
+						v_updateRequest.primitiveContent.group_.parentID := PX_CSE1_ID;
+  
+						v_cse1.start(f_CSE_ANNC_UPD_004(int9, v_createRequest, v_createRequestAnnc, v_updateRequest));//Group
+						v_cse1.done;
+					}
+					
+					testcase TC_CSE_ANNC_UPD_004_TS() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;	
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_updateRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
+						v_updateRequest.primitiveContent.timeSeries.announcedAttribute := {"ToBeDeleted"};
+						v_updateRequest.primitiveContent.timeSeries.parentID := PX_CSE1_ID;
+  
+						v_cse1.start(f_CSE_ANNC_UPD_004(int29, v_createRequest, v_createRequestAnnc, v_updateRequest));//TimeSeries
+						v_cse1.done;
+					}
+				} // end group g_CSE_ANNC_UPD_004
+	
+				group g_CSE_ANNC_UPD_005 {
+		
+					/**
+					 * @desc Check that the labels attribute is de-announced when such attribute is deleted from the original resource
+					 *  
+					 */
+					testcase TC_CSE_ANNC_UPD_005() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createContainerBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
+						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
+						var template RequestPrimitive v_updateRequestAnnc := mw_updateContainerAnnc;
+						var RequestPrimitive v_requestPrimitive;	
+						var Labels v_labels_1 := {"VALUE_1"};
+						var AttributeAux_list v_nullFields;
+						var Labels v_labels_2 := {"To be deleted"};	
+
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
+						v_createRequest.primitiveContent.container.labels := v_labels_1;
+						
+						v_updateRequest.primitiveContent.container.labels := v_labels_2;
+						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;
+						
+						if(getverdict == pass){
+							v_requestPrimitive := f_getRequestPrimitive(v_cse1);
+							if(ispresent(v_requestPrimitive.primitiveContent)) {
+								if(ischosen(v_requestPrimitive.primitiveContent.containerAnnc)) {
+									if(ispresent(v_requestPrimitive.primitiveContent.containerAnnc.labels)){
+										setverdict(fail, __SCOPE__ & ": Error: labels attribute is not set to NULL");
+									}
+								}
+							}
+
+						}	
+
+					}
+				} // end group g_CSE_ANNC_UPD_005
+				
+				group g_CSE_ANNC_UPD_006 {
+					
+					/**
+					 * @desc Check that the IUT announces successfully the RESOURCE_TYPE resource when a new CSE-ID is provided in announcedTo optional attribute and IUT having been already announced to announcement target CSE
+					 *  
+					 */
+					testcase TC_CSE_ANNC_UPD_006_ACP() runs on Tester system CseSystem {
+						//Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createAcpBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
+						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
+						
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
+						
+						v_cse1.start(f_CSE_ANNC_UPD_006(int1, v_createRequest, v_createRequestAnnc, v_updateRequest));//AccessControlPolicy
+						v_cse1.done;
+					}
+					
+					testcase TC_CSE_ANNC_UPD_006_CNT() runs on Tester system CseSystem {
+						//Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createContainerBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
+						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
+	
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_updateRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
+	
+						v_cse1.start(f_CSE_ANNC_UPD_006(int3, v_createRequest, v_createRequestAnnc, v_updateRequest));//Container
+						v_cse1.done;
+					}
+					
+					testcase TC_CSE_ANNC_UPD_006_GRP() runs on Tester system CseSystem {
+						//Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createGroupBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
+						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
+
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_updateRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
+
+						v_cse1.start(f_CSE_ANNC_UPD_006(int9, v_createRequest, v_createRequestAnnc, v_updateRequest));//Group
+						v_cse1.done;
+					}
+					
+					testcase TC_CSE_ANNC_UPD_006_TS() runs on Tester system CseSystem {
+						//Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_updateRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
+
+						v_cse1.start(f_CSE_ANNC_UPD_006(int29, v_createRequest, v_createRequestAnnc, v_updateRequest));//TimeSeries
+						v_cse1.done;
+					}
+				}// end group g_CSE_ANNC_UPD_006
+				
+				group g_CSE_ANNC_UPD_007 {
+					
+					/**
+					 * @desc Check that the IUT announces successfully the RESOURCE_TYPE resource when a new CSE-ID is provided in announcedTo optional attribute and IUT has registered and created a <remoteCSE> resource to the announcement target CSE
+					 *  
+					 */
+					testcase TC_CSE_ANNC_UPD_007_ACP() runs on Tester system CseSystem {
+						//Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createAcpBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
+						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
+	
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
+	
+						v_cse1.start(f_CSE_ANNC_UPD_007(int1, v_createRequest, v_createRequestAnnc, v_updateRequest));//AccessControlPolicy
+						v_cse1.done;
+					}
+
+					testcase TC_CSE_ANNC_UPD_007_CNT() runs on Tester system CseSystem {
+						//Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createContainerBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
+						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
+
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_updateRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
+
+						v_cse1.start(f_CSE_ANNC_UPD_007(int3, v_createRequest, v_createRequestAnnc, v_updateRequest));//Container
+						v_cse1.done;
+					}
+
+					testcase TC_CSE_ANNC_UPD_007_GRP() runs on Tester system CseSystem {
+						//Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createGroupBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
+						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
+
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_updateRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
+
+						v_cse1.start(f_CSE_ANNC_UPD_007(int9, v_createRequest, v_createRequestAnnc, v_updateRequest));//Group
+						v_cse1.done;
+					}
+					
+					testcase TC_CSE_ANNC_UPD_007_TS() runs on Tester system CseSystem {
+						//Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_updateRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
+
+						v_cse1.start(f_CSE_ANNC_UPD_007(int29, v_createRequest, v_createRequestAnnc, v_updateRequest));//TimeSeries
+						v_cse1.done;
+					}
+				} //end group g_CSE_ANNC_UPD_007
+				
+				group g_CSE_ANNC_UPD_008 {
+					
+					/**
+					 * @desc Check that the IUT provides confirmation of the announcement of an attribute to the originator of the initiating request after a successful attribute announcement procedure
+					 *  
+					 */
+					testcase TC_CSE_ANNC_UPD_008_CNT_MBS() runs on Tester system CseSystem {
+						// Local variables
+						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 ResponsePrimitive v_responsePrimitive;	
+						var AttributeAux_list v_nullFields;
+						var ListOfNCNames v_announcedAttribute := {"ToBeDeleted"};
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+						var XSD.NonNegativeInteger v_maxByteSize := 512;
+  
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
+						v_createRequest.primitiveContent.container.maxByteSize := v_maxByteSize;
+						v_createRequest.primitiveContent.container.announcedAttribute := v_announcedAttribute;
+
+						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;
+
+						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(pass, __SCOPE__ & ": announcedAttribute attribute is present");
+									} else {
+										setverdict(fail, __SCOPE__ & ": announcedAttribute attribute is not present");
+									}
+								}
+							}
+
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+
+							//Check that the resource has been udpated correctly
+							if(ischosen(v_primitiveContentRetrieveResource.container)) {
+								if(ispresent(v_primitiveContentRetrieveResource.container.announcedAttribute)){
+									setverdict(pass, __SCOPE__ & "announcedAttribute attribute updated correctly");
+								} else {
+									setverdict(fail, __SCOPE__ & "announcedAttribute attribute not updated correctly");
+								}
+							}
+						}	
+					}
+					
+					testcase TC_CSE_ANNC_UPD_008_GRP_MT() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_createRequest := m_createGroupBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
+						var template RequestPrimitive v_updateRequest := m_updateGroupBase;	
+						var ResponsePrimitive v_responsePrimitive;	
+						var AttributeAux_list v_nullFields;
+						var ListOfNCNames v_announcedAttribute := {"ToBeDeleted"};
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+						var MemberType v_memberType := int3;
+  
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
+						v_createRequest.primitiveContent.group_.memberType := v_memberType;
+						v_createRequest.primitiveContent.group_.announcedAttribute := v_announcedAttribute;
+
+						v_updateRequest.primitiveContent.group_.announcedAttribute := {"mt"};
+  
+						v_ae1.start(f_CSE_ANNC_UPD_008(int9, v_createRequestAnnc, v_createRequest, v_updateRequest));//Group
+						v_ae1.done;
+
+						if(getverdict == pass){
+							v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
+									if(ispresent(v_responsePrimitive.primitiveContent.group_.announcedAttribute)){
+										setverdict(pass, __SCOPE__ & ": announcedAttribute attribute is present");
+									} else {
+										setverdict(fail, __SCOPE__ & ": announcedAttribute attribute is not present");
+									}
+								}
+							}
+
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+
+							//Check that the resource has been udpated correctly
+							if(ischosen(v_primitiveContentRetrieveResource.group_)) {
+								if(ispresent(v_primitiveContentRetrieveResource.group_.announcedAttribute)){
+									setverdict(pass, __SCOPE__ & "announcedAttribute attribute updated correctly");
+								} else {
+									setverdict(fail, __SCOPE__ & "announcedAttribute attribute not updated correctly");
+								}
+							}
+						}
+					}
+					
+					testcase TC_CSE_ANNC_UPD_008_TS_MBS() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;	
+						var ResponsePrimitive v_responsePrimitive;	
+						var AttributeAux_list v_nullFields;
+						var ListOfNCNames v_announcedAttribute := {"ToBeDeleted"};
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+						var XSD.NonNegativeInteger v_maxByteSize := 512;
+  
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
+						v_createRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize;
+						v_createRequest.primitiveContent.timeSeries.announcedAttribute := v_announcedAttribute;
+
+						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;
+
+						if(getverdict == pass){
+							v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
+									if(ispresent(v_responsePrimitive.primitiveContent.timeSeries.announcedAttribute)){
+										setverdict(pass, __SCOPE__ & ": announcedAttribute attribute is present");
+									} else {
+										setverdict(fail, __SCOPE__ & ": announcedAttribute attribute is not present");
+									}
+								}
+							}
+
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+
+							//Check that the resource has been udpated correctly
+							if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
+								if(ispresent(v_primitiveContentRetrieveResource.timeSeries.announcedAttribute)){
+									setverdict(pass, __SCOPE__ & "announcedAttribute attribute updated correctly");
+								} else {
+									setverdict(fail, __SCOPE__ & "announcedAttribute attribute not updated correctly");
+								}
+							}
+						}	
+					}
+				} //end group g_CSE_ANNC_UPD_008
+				
+				group g_CSE_ANNC_UPD_009{
+
+					/**
+					 * @desc Check that the IUT updates successfully RESOURCE_TYPE announced variant resource when a new OA attribute is provided to announcedAttribute attribute of the original resource
+					 *  
+					 */
+					testcase TC_CSE_ANNC_UPD_009_CNT_MBS() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createContainerBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
+						var template RequestPrimitive v_updateRequest := m_updateContainerBase;	
+						var template RequestPrimitive v_updateRequestAnnc := mw_updateContainerAnnc;
+						var XSD.NonNegativeInteger v_maxByteSize := 512;
+
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
+						v_createRequest.primitiveContent.container.maxByteSize := v_maxByteSize;	
+						
+						v_createRequestAnnc.primitiveContent.containerAnnc.maxByteSize := v_maxByteSize;
+						
+						v_updateRequest.primitiveContent.container.announcedAttribute := {"mbs"};
+						
+						v_updateRequestAnnc.primitiveContent.containerAnnc.maxByteSize := v_maxByteSize;
+  
+						v_cse1.start(f_CSE_ANNC_UPD_009(int3, v_createRequest, v_createRequestAnnc, v_updateRequest, v_updateRequestAnnc));//Container
+						v_cse1.done;
+					}
+
+					testcase TC_CSE_ANNC_UPD_009_GRP_MT() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createGroupBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
+						var template RequestPrimitive v_updateRequest := m_updateGroupBase;	
+						var template RequestPrimitive v_updateRequestAnnc := mw_updateGroupAnnc;
+						var MemberType v_memberType := int3;
+
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
+						v_createRequest.primitiveContent.group_.memberType := v_memberType;
+						
+						v_createRequestAnnc.primitiveContent.groupAnnc.memberType := v_memberType;
+						
+						v_updateRequest.primitiveContent.group_.announcedAttribute := {"mt"};
+						
+						v_updateRequestAnnc.primitiveContent.groupAnnc.memberType := v_memberType;
+  
+						v_cse1.start(f_CSE_ANNC_UPD_009(int9, v_createRequest, v_createRequestAnnc, v_updateRequest, v_updateRequestAnnc));//Group
+						v_cse1.done;
+					}
+					
+					testcase TC_CSE_ANNC_UPD_009_TS_MBS() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;	
+						var template RequestPrimitive v_updateRequestAnnc := mw_updateTimeSeriesAnnc;
+						var XSD.NonNegativeInteger v_maxByteSize := 512;
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
+						v_createRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize;	
+	
+						v_createRequestAnnc.primitiveContent.timeSeriesAnnc.maxByteSize := v_maxByteSize;
+	
+						v_updateRequest.primitiveContent.timeSeries.announcedAttribute := {"mbs"};
+	
+						v_updateRequestAnnc.primitiveContent.timeSeriesAnnc.maxByteSize := v_maxByteSize;
+  
+						v_cse1.start(f_CSE_ANNC_UPD_009(int29, v_createRequest, v_createRequestAnnc, v_updateRequest, v_updateRequestAnnc));//TimeSeries
+						v_cse1.done;
+					}
+
+				}// end group g_CSE_ANNC_UPD_009
+				
+				group g_CSE_ANNC_UPD_010{
+					
+					/**
+					 * @desc Check that the IUT updates successfully the RESOURCE_TYPE announced variant resource when a MA attribute of its original resource is updated.
+					 *  
+					 */
+					testcase TC_CSE_ANNC_UPD_010_ACP() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createAcpBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
+						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
+						var template RequestPrimitive v_updateRequestAnnc := mw_updateAccessControlPolicyAnnc;
+						var Timestamp v_expirationTime_1 := "21001231T012345";
+						var Timestamp v_expirationTime_2 := "21101231T012345";
+
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
+						v_createRequest.primitiveContent.accessControlPolicy.expirationTime := v_expirationTime_1;	
+
+						v_createRequestAnnc.primitiveContent.accessControlPolicyAnnc.expirationTime := v_expirationTime_1;
+
+						v_updateRequest.primitiveContent.accessControlPolicy.expirationTime := v_expirationTime_2;
+
+						v_updateRequestAnnc.primitiveContent.accessControlPolicyAnnc.expirationTime := v_expirationTime_2;
+  
+						v_cse1.start(f_CSE_ANNC_UPD_010(int3, v_createRequest, v_createRequestAnnc, v_updateRequest, v_updateRequestAnnc));//Container
+						v_cse1.done;
+					}
+
+					testcase TC_CSE_ANNC_UPD_010_CNT() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createContainerBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
+						var template RequestPrimitive v_updateRequest := m_updateContainerBase;	
+						var template RequestPrimitive v_updateRequestAnnc := mw_updateContainerAnnc;
+						var Timestamp v_expirationTime_1 := "21001231T012345";
+						var Timestamp v_expirationTime_2 := "21101231T012345";
+
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
+						v_createRequest.primitiveContent.container.expirationTime := v_expirationTime_1;	
+		
+						v_createRequestAnnc.primitiveContent.containerAnnc.expirationTime := v_expirationTime_1;
+		
+						v_updateRequest.primitiveContent.container.expirationTime := v_expirationTime_2;
+		
+						v_updateRequestAnnc.primitiveContent.containerAnnc.expirationTime := v_expirationTime_2;
+  
+						v_cse1.start(f_CSE_ANNC_UPD_010(int3, v_createRequest, v_createRequestAnnc, v_updateRequest, v_updateRequestAnnc));//Container
+						v_cse1.done;
+					}
+
+					testcase TC_CSE_ANNC_UPD_010_GRP() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createGroupBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
+						var template RequestPrimitive v_updateRequest := m_updateGroupBase;	
+						var template RequestPrimitive v_updateRequestAnnc := mw_updateGroupAnnc;
+						var Timestamp v_expirationTime_1 := "21001231T012345";
+						var Timestamp v_expirationTime_2 := "21101231T012345";
+
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
+						v_createRequest.primitiveContent.group_.expirationTime := v_expirationTime_1;
+		
+						v_createRequestAnnc.primitiveContent.groupAnnc.expirationTime := v_expirationTime_1;
+		
+						v_updateRequest.primitiveContent.group_.expirationTime := v_expirationTime_2;
+		
+						v_updateRequestAnnc.primitiveContent.groupAnnc.expirationTime := v_expirationTime_2;
+  
+						v_cse1.start(f_CSE_ANNC_UPD_010(int9, v_createRequest, v_createRequestAnnc, v_updateRequest, v_updateRequestAnnc));//Group
+						v_cse1.done;
+					}
+					
+					testcase TC_CSE_ANNC_UPD_010_TS() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;	
+						var template RequestPrimitive v_updateRequestAnnc := mw_updateTimeSeriesAnnc;
+						var Timestamp v_expirationTime_1 := "21001231T012345";
+						var Timestamp v_expirationTime_2 := "21101231T012345";
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
+						v_createRequest.primitiveContent.timeSeries.expirationTime := v_expirationTime_1;
+
+						v_createRequestAnnc.primitiveContent.timeSeriesAnnc.expirationTime := v_expirationTime_1;
+
+						v_updateRequest.primitiveContent.timeSeries.expirationTime := v_expirationTime_2;
+
+						v_updateRequestAnnc.primitiveContent.timeSeriesAnnc.expirationTime := v_expirationTime_2;
+  
+						v_cse1.start(f_CSE_ANNC_UPD_010(int29, v_createRequest, v_createRequestAnnc, v_updateRequest, v_updateRequestAnnc));//TimeSeries
+						v_cse1.done;
+					}
+
+				}// end group g_CSE_ANNC_UPD_010
+				
+				group g_CSE_ANNC_UPD_011{
+
+					/**
+					 * @desc Check that the IUT updates successfully the RESOURCE_TYPE announced variant resource when a optional attribute present in the announcedAttribute attribute of its original resource is updated.
+					 *  
+					 */
+					testcase TC_CSE_ANNC_UPD_011_CNT_MBS() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createContainerBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
+						var template RequestPrimitive v_updateRequest := m_updateContainerBase;	
+						var template RequestPrimitive v_updateRequestAnnc := mw_updateContainerAnnc;
+						var XSD.NonNegativeInteger v_maxByteSize_1 := 512;
+						var XSD.NonNegativeInteger v_maxByteSize_2 := 1024;
+
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
+						v_createRequest.primitiveContent.container.maxByteSize := v_maxByteSize_1;
+						v_createRequest.primitiveContent.container.announcedAttribute := {"mbs"};	
+		
+						v_createRequestAnnc.primitiveContent.containerAnnc.maxByteSize := v_maxByteSize_1;
+		
+						v_updateRequest.primitiveContent.container.maxByteSize := v_maxByteSize_2;
+		
+						v_updateRequestAnnc.primitiveContent.containerAnnc.maxByteSize := v_maxByteSize_2;
+  
+						v_cse1.start(f_CSE_ANNC_UPD_011(int3, v_createRequest, v_createRequestAnnc, v_updateRequest, v_updateRequestAnnc));//Container
+						v_cse1.done;
+					}
+
+					testcase TC_CSE_ANNC_UPD_011_GRP_MT() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createGroupBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
+						var template RequestPrimitive v_updateRequest := m_updateGroupBase;	
+						var template RequestPrimitive v_updateRequestAnnc := mw_updateGroupAnnc;
+						var MemberType v_memberType_1 := int3;
+						var MemberType v_memberType_2 := int4;
+
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
+						v_createRequest.primitiveContent.group_.memberType := v_memberType_1;
+						v_createRequest.primitiveContent.group_.announcedAttribute := {"mt"};
+		
+						v_createRequestAnnc.primitiveContent.groupAnnc.memberType := v_memberType_1;
+		
+						v_updateRequest.primitiveContent.group_.memberType := v_memberType_2;
+		
+						v_updateRequestAnnc.primitiveContent.groupAnnc.memberType := v_memberType_2;
+  
+						v_cse1.start(f_CSE_ANNC_UPD_011(int9, v_createRequest, v_createRequestAnnc, v_updateRequest, v_updateRequestAnnc));//Group
+						v_cse1.done;
+					}
+					
+					testcase TC_CSE_ANNC_UPD_011_TS_MBS() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;	
+						var template RequestPrimitive v_updateRequestAnnc := mw_updateTimeSeriesAnnc;
+						var XSD.NonNegativeInteger v_maxByteSize_1 := 512;
+						var XSD.NonNegativeInteger v_maxByteSize_2 := 1024;
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
+						v_createRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize_1;
+						v_createRequest.primitiveContent.timeSeries.announcedAttribute := {"mbs"};	
+
+						v_createRequestAnnc.primitiveContent.timeSeriesAnnc.maxByteSize := v_maxByteSize_1;
+
+						v_updateRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize_2;
+
+						v_updateRequestAnnc.primitiveContent.timeSeriesAnnc.maxByteSize := v_maxByteSize_2;
+  
+						v_cse1.start(f_CSE_ANNC_UPD_011(int29, v_createRequest, v_createRequestAnnc, v_updateRequest, v_updateRequestAnnc));//TimeSeries
+						v_cse1.done;
+					}
+
+				}// end group g_CSE_ANNC_UPD_011
+				
+				group g_CSE_ANNC_UPD_012{
+
+					/**
+					 * @desc Check that the IUT de-announces successfully an announced attribute when such attribute is deleted from announcedAttribute attribute.
+					 *  
+					 */
+					testcase TC_CSE_ANNC_UPD_012_CNT_MBS() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createContainerBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
+						var template RequestPrimitive v_updateRequest := m_updateContainerBase;	
+						var template RequestPrimitive v_updateRequestAnnc := mw_updateContainerAnnc;
+						var RequestPrimitive v_requestPrimitive;	
+						var XSD.NonNegativeInteger v_maxByteSize := 512;
+						var AttributeAux_list v_nullFields;
+						var ListOfNCNames v_announcedAttribute := {"ToBeDeleted"};
+
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
+						v_createRequest.primitiveContent.container.maxByteSize := v_maxByteSize;
+						v_createRequest.primitiveContent.container.announcedAttribute := {"mbs"};	
+
+						v_createRequestAnnc.primitiveContent.containerAnnc.maxByteSize := v_maxByteSize;
+						
+						v_updateRequest.primitiveContent.container.announcedAttribute := v_announcedAttribute;
+						v_nullFields := {{"announcedAttribute", omit}};
+  
+						v_cse1.start(f_CSE_ANNC_UPD_012(int3, v_createRequest, v_createRequestAnnc, v_updateRequest, v_updateRequestAnnc, v_nullFields));//Container
+						v_cse1.done;
+						
+						if(getverdict == pass){
+							v_requestPrimitive := f_getRequestPrimitive(v_cse1);
+							if(ispresent(v_requestPrimitive.primitiveContent)) {
+								if(ischosen(v_requestPrimitive.primitiveContent.containerAnnc)) {
+									if(ispresent(v_requestPrimitive.primitiveContent.containerAnnc.maxByteSize)){
+										setverdict(fail, __SCOPE__ & ": Error: maxByteSize attribute is not set to NULL");
+									}
+								}
+							}
+
+						}	
+						
+					}
+
+					testcase TC_CSE_ANNC_UPD_012_GRP_MT() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createGroupBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
+						var template RequestPrimitive v_updateRequest := m_updateGroupBase;	
+						var template RequestPrimitive v_updateRequestAnnc := mw_updateGroupAnnc;
+						var RequestPrimitive v_requestPrimitive;	
+						var MemberType v_memberType := int3;
+						var AttributeAux_list v_nullFields;
+						var ListOfNCNames v_announcedAttribute := {"ToBeDeleted"};
+
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
+						v_createRequest.primitiveContent.group_.memberType := v_memberType;
+						v_createRequest.primitiveContent.group_.announcedAttribute := {"mt"};
+
+						v_createRequestAnnc.primitiveContent.groupAnnc.memberType := v_memberType;
+
+						v_updateRequest.primitiveContent.group_.announcedAttribute := v_announcedAttribute;
+						v_nullFields := {{"announcedAttribute", omit}};
+  
+						v_cse1.start(f_CSE_ANNC_UPD_012(int9, v_createRequest, v_createRequestAnnc, v_updateRequest, v_updateRequestAnnc, v_nullFields));//Group
+						v_cse1.done;
+						
+						if(getverdict == pass){
+							v_requestPrimitive := f_getRequestPrimitive(v_cse1);
+							if(ispresent(v_requestPrimitive.primitiveContent)) {
+								if(ischosen(v_requestPrimitive.primitiveContent.groupAnnc)) {
+									if(ispresent(v_requestPrimitive.primitiveContent.groupAnnc.memberType)){
+										setverdict(fail, __SCOPE__ & ": Error: memberType attribute is not set to NULL");
+									}
+								}
+							}
+
+						}	
+					}
+					
+					testcase TC_CSE_ANNC_UPD_012_TS_MBS() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;	
+						var template RequestPrimitive v_updateRequestAnnc := mw_updateTimeSeriesAnnc;
+						var RequestPrimitive v_requestPrimitive;	
+						var XSD.NonNegativeInteger v_maxByteSize := 512;
+						var AttributeAux_list v_nullFields;
+						var ListOfNCNames v_announcedAttribute := {"ToBeDeleted"};
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
+						v_createRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize;
+						v_createRequest.primitiveContent.timeSeries.announcedAttribute := {"mbs"};	
+
+						v_createRequestAnnc.primitiveContent.timeSeriesAnnc.maxByteSize := v_maxByteSize;
+	
+						v_updateRequest.primitiveContent.timeSeries.announcedAttribute := v_announcedAttribute;
+						v_nullFields := {{"announcedAttribute", omit}};
+  
+						v_cse1.start(f_CSE_ANNC_UPD_012(int29, v_createRequest, v_createRequestAnnc, v_updateRequest, v_updateRequestAnnc, v_nullFields));//TimeSeries
+						v_cse1.done;
+	
+						if(getverdict == pass){
+							v_requestPrimitive := f_getRequestPrimitive(v_cse1);
+							if(ispresent(v_requestPrimitive.primitiveContent)) {
+								if(ischosen(v_requestPrimitive.primitiveContent.timeSeriesAnnc)) {
+									if(ispresent(v_requestPrimitive.primitiveContent.timeSeriesAnnc.maxByteSize)){
+										setverdict(fail, __SCOPE__ & ": Error: maxByteSize attribute is not set to NULL");
+									}
+								}
+							}
+
+						}	
+	
+					}
+
+				}// end group g_CSE_ANNC_UPD_012
+				
+				group g_CSE_ANNC_UPD_013{
+	
+					/**
+					 * @desc Check that the IUT provides confirmation of the de-announcement of an attribute to the originator of the initiating request after a successful attribute de-announcement procedure
+					 *  
+					 */
+					testcase TC_CSE_ANNC_UPD_013_CNT_MBS() runs on Tester system CseSystem {
+						// Local variables
+						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 ResponsePrimitive v_responsePrimitive;	
+						var AttributeAux_list v_nullFields;
+						var ListOfNCNames v_announcedAttribute := {"ToBeDeleted"};
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+						var XSD.NonNegativeInteger v_maxByteSize := 512;
+	  
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
+						v_createRequest.primitiveContent.container.maxByteSize := v_maxByteSize;
+						v_createRequest.primitiveContent.container.announcedAttribute := {"mbs"};
+		
+						v_updateRequest.primitiveContent.container.announcedAttribute := v_announcedAttribute;
+						v_nullFields := {{"announcedAttribute", omit}};
+	  
+						v_ae1.start(f_CSE_ANNC_UPD_013(int3, v_createRequestAnnc, v_createRequest, v_updateRequest, v_nullFields));//Container
+						v_ae1.done;
+	
+						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: announcedAttribute attribute is not set to NULL");
+									}
+								}
+							}
+			
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+	
+							//Check that the resource has been udpated correctly
+							if(ischosen(v_primitiveContentRetrieveResource.container)) {
+								if(ispresent(v_primitiveContentRetrieveResource.container.announcedAttribute)){
+									setverdict(fail, __SCOPE__ & ": Error: announcedAttribute attribute not updated correctly");
+								}
+							}
+						}	
+					
+					}
+	
+					testcase TC_CSE_ANNC_UPD_013_GRP_MT() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_createRequest := m_createGroupBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
+						var template RequestPrimitive v_updateRequest := m_updateGroupBase;	
+						var ResponsePrimitive v_responsePrimitive;	
+						var AttributeAux_list v_nullFields;
+						var ListOfNCNames v_announcedAttribute := {"ToBeDeleted"};
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+						var MemberType v_memberType := int3;
+	  
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
+						v_createRequest.primitiveContent.group_.memberType := v_memberType;
+						v_createRequest.primitiveContent.group_.announcedAttribute := {"mt"};
+		
+						v_updateRequest.primitiveContent.group_.announcedAttribute := v_announcedAttribute;
+						v_nullFields := {{"announcedAttribute", omit}};
+	  
+						v_ae1.start(f_CSE_ANNC_UPD_013(int9, v_createRequestAnnc, v_createRequest, v_updateRequest, v_nullFields));//Group
+						v_ae1.done;
+	
+						if(getverdict == pass){
+							v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
+									if(ispresent(v_responsePrimitive.primitiveContent.group_.announcedAttribute)){
+										setverdict(fail, __SCOPE__ & ": Error: announcedAttribute attribute is not set to NULL");
+									}
+								}
+							}
+			
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+	
+							//Check that the resource has been udpated correctly
+							if(ischosen(v_primitiveContentRetrieveResource.group_)) {
+								if(ispresent(v_primitiveContentRetrieveResource.group_.announcedAttribute)){
+									setverdict(fail, __SCOPE__ & ": Error: announcedAttribute attribute not updated correctly");
+								}
+							}
+						}	
+					}
+					
+					testcase TC_CSE_ANNC_UPD_013_TS_MBS() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;	
+						var ResponsePrimitive v_responsePrimitive;	
+						var AttributeAux_list v_nullFields;
+						var ListOfNCNames v_announcedAttribute := {"ToBeDeleted"};
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+						var XSD.NonNegativeInteger v_maxByteSize := 512;
+  
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
+						v_createRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize;
+						v_createRequest.primitiveContent.timeSeries.announcedAttribute := {"mbs"};
+
+						v_updateRequest.primitiveContent.container.announcedAttribute := v_announcedAttribute;
+						v_nullFields := {{"announcedAttribute", omit}};
+  
+						v_ae1.start(f_CSE_ANNC_UPD_013(int29, v_createRequestAnnc, v_createRequest, v_updateRequest, v_nullFields));//TimeSeries
+						v_ae1.done;
+
+						if(getverdict == pass){
+							v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
+									if(ispresent(v_responsePrimitive.primitiveContent.timeSeries.announcedAttribute)){
+										setverdict(fail, __SCOPE__ & ": Error: announcedAttribute attribute is not set to NULL");
+									}
+								}
+							}
+
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+
+							//Check that the resource has been udpated correctly
+							if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
+								if(ispresent(v_primitiveContentRetrieveResource.timeSeries.announcedAttribute)){
+									setverdict(fail, __SCOPE__ & ": Error: announcedAttribute attribute not updated correctly");
+								}
+							}
+						}	
+
+					}
+	
+				}// end group g_CSE_ANNC_UPD_013
+				
+				group g_CSE_ANNC_UPD_014{
+					
+					/**
+					 * @desc Host CSE of original resource removes an announcement target CSE from the announceTo attribute if it does not return successful CREATE response for the announced resource (for an UPDATE initiating resource announcement)
+					 *  
+					 */
+					testcase TC_CSE_ANNC_UPD_014_CNT() runs on Tester system CseSystem {
+						// Local variables
+						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 ResponsePrimitive v_responsePrimitive;	
+						 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_updateRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
+  
+						v_ae1.start(f_CSE_ANNC_UPD_014(int3, v_createRequestAnnc, v_createRequest, v_updateRequest));//Container
+						v_ae1.done;
+						
+						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: announcedAttribute attribute is not set to NULL");
+								}
+							}
+						}
+					}
+				  }
+				} //end group g_CSE_ANNC_UPD_014
+			}//end group Update
+			
+			group Delete{
+				
+				group g_CSE_ANNC_DEL_001{
+		
+					/**
+					 * @desc Check that the IUT provides confirmation of resource de-announcement to the originator of the initiating request after a successful resource de-announcement procedure (for a DELETE initiating resource de-announcement)
+					 *  
+					 */
+					testcase TC_CSE_ANNC_DEL_001_ACP() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_createRequest := m_createAcpBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
+  
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
+  
+						v_ae1.start(f_CSE_ANNC_DEL_001(int1, v_createRequestAnnc, v_createRequest));//AccessControlPolicy
+						v_ae1.done;
+					}
+
+					testcase TC_CSE_ANNC_DEL_001_CNT() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_createRequest := m_createContainerBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
+  
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
+  
+						v_ae1.start(f_CSE_ANNC_DEL_001(int3, v_createRequestAnnc, v_createRequest));//Container
+						v_ae1.done;
+					}
+
+					testcase TC_CSE_ANNC_DEL_001_GRP() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_createRequest := m_createGroupBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
+  
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
+  
+						v_ae1.start(f_CSE_ANNC_DEL_001(int9, v_createRequestAnnc, v_createRequest));//Group
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_ANNC_DEL_001_TS() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
+  
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
+  
+						v_ae1.start(f_CSE_ANNC_DEL_001(int29, v_createRequestAnnc, v_createRequest));//TimeSeries
+						v_ae1.done;
+					}
+
+				}// end group g_CSE_ANNC_DEL_001
+	
+				group g_CSE_ANNC_DEL_002{
+		
+					/**
+					 * @desc Check that the IUT deletes all announced resources when the original resource is deleted.
+					 *  
+					 */
+					testcase TC_CSE_ANNC_DEL_002_ACP() runs on Tester system CseSystem {
+						// Local variables
+						var MnCseSimu v_cse1 := MnCseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createAcpBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
+  
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
+  
+						v_cse1.start(f_CSE_ANNC_DEL_002(int1, v_createRequestAnnc, v_createRequest));//AccessControlPolicy
+						v_cse1.done;
+					}
+		
+					testcase TC_CSE_ANNC_DEL_002_CNT() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createContainerBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
+  
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
+  
+						v_cse1.start(f_CSE_ANNC_DEL_002(int3, v_createRequestAnnc, v_createRequest));//Container
+						v_cse1.done;
+					}
+		
+					testcase TC_CSE_ANNC_DEL_002_GRP() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createGroupBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
+  
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
+  
+						v_cse1.start(f_CSE_ANNC_DEL_002(int9, v_createRequestAnnc, v_createRequest));//Group
+						v_cse1.done;
+					}
+					
+					testcase TC_CSE_ANNC_DEL_002_TS() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
+  
+						v_cse1.start(f_CSE_ANNC_DEL_002(int29, v_createRequestAnnc, v_createRequest));//TimeSeries
+						v_cse1.done;
+					}
+
+				}// end group g_CSE_ANNC_DEL_002
+			}//end group Delete
+			
+		}//end group Announcement
+		
+		group PollingChannel {
+					
+			
+		}//end group PollingChannel
+		
+		group Non_Blocking_Requests{
+
+			group Synchronous{
+
+		
+			}// end group Synchronous	
+
+			group Asynchronous{
+
+			}// end group Asynchronous	
+
+		}// end group Non_Blocking_Requests
+
+		group Device_Management {
+			group timeSeries {
+				
+				/**
+				 * @desc Check that the IUT inserts the dataGenerationTime informantion of a missing data point and increases the missingDataCurrentNr attribute when a missing data point is detected
+				 *  
+				 */
+				 testcase TC_CSE_TS_001() runs on Tester system CseSystem {
+					
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+					v_ae1.start(f_CSE_TS_001());
+		  	  	
+					v_ae1.done;
+		  	  		
+				}
+				
+				function f_CSE_TS_001() runs on AeSimu return ResponsePrimitive {
+    				
+					// Local variables
+					var MsgIn v_response;
+					var RequestPrimitive v_request;
+					var integer v_aeIndex := -1;
+					var integer v_resourceIndex := -1;
+											   
+					// Test control
+    				
+					// Test component configuration
+					f_cf01Up();
+						
+					// Test adapter configuration
+    				
+					// Preamble
+    					
+					v_aeIndex := f_cse_preamble_registerAe();
+					
+					v_resourceIndex := f_cse_createResource(int29, m_createTimeSeries(-, -, 5, -, 2000), v_aeIndex);
+									
+					//Create data points and force a missingDataPoint
+					f_cse_generateMissingDataPoint(v_resourceIndex);
+					// Test Body
+    				mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)))));
+					tc_ac.start;
+					alt {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) -> value v_response {
+							tc_ac.stop;
+							setverdict(pass, __SCOPE__ & ": Response OK for retrieving");
+							if(not(ispresent(v_response.primitive.responsePrimitive.primitiveContent.timeSeries.missingDataList))) {
+								setverdict(fail, __SCOPE__ & ": missingDataList attribute not present");
+							}
+							if(not(ispresent(v_response.primitive.responsePrimitive.primitiveContent.timeSeries.missingDataCurrentNr))) {
+								setverdict(fail, __SCOPE__ & ": missingDataCurrentNr attribute not present");
+							} else {
+								if(v_response.primitive.responsePrimitive.primitiveContent.timeSeries.missingDataCurrentNr != 1) {
+									setverdict(fail, __SCOPE__ & ": missingDataCurrentNr attribute wrong value");
+								}
+							}
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK())) -> value v_response {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Wrong response status code");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
+						}
+						[] tc_ac.timeout {
+							setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
+						}
+					}	
+    					
+					// Postamble
+					f_cse_postamble_deleteResources();
+						
+					// Tear down
+					f_cf01Down();
+						
+					return vc_response.primitive.responsePrimitive;
+    					    				
+				}//end f_CSE_DMR_TS_001
+					
+				/**
+				 * @desc Check that the IUT removes the oldest element in MissingDataList when MissingDataCurrentNr reaches MissingDataMaxNr to enable insertion of a new missing data point
+				 *  
+				 */
+				 testcase TC_CSE_TS_002() runs on Tester system CseSystem {
+					
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+					v_ae1.start(f_CSE_TS_002());
+		  	  	
+					v_ae1.done;
+		  	  		
+				}
+				
+				function f_CSE_TS_002() runs on AeSimu return ResponsePrimitive {
+    				
+					// Local variables
+					var MsgIn v_response;
+					var RequestPrimitive v_request := valueof(m_createTimeSeriesBase);
+					var integer v_aeIndex := -1;
+					var integer v_resourceIndex := -1;
+					var Timestamp v_missingDataPointTimestamp;
+					var XSD.Long v_missingDataPointRel;
+											   
+					// Test control
+    				
+					// Test component configuration
+					f_cf01Up();
+						
+					// Test adapter configuration
+    				
+					// Preamble
+    					
+					v_aeIndex := f_cse_preamble_registerAe();
+					
+					v_resourceIndex := f_cse_createResource(int29, m_createTimeSeries(-, -, 5, 1, 2000), v_aeIndex);
+									
+					//Create data points and force a missingDataPoint
+					f_cse_generateMissingDataPoint(v_resourceIndex);
+					
+					//Retrieve first missing data point
+    				mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)))));
+
+					tc_ac.start;
+					alt {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) -> value v_response {
+							tc_ac.stop;
+							setverdict(pass, __SCOPE__ & ": Response OK for retrieving");
+							if(not(ispresent(v_response.primitive.responsePrimitive.primitiveContent.timeSeries.missingDataList))) {
+								setverdict(inconc, __SCOPE__ & ": missingDataList attribute not present");
+							} else {
+								if(ischosen(v_response.primitive.responsePrimitive.primitiveContent.timeSeries.missingDataList.alt_)) {
+									v_missingDataPointTimestamp := v_response.primitive.responsePrimitive.primitiveContent.timeSeries.missingDataList.alt_[0];
+								} else {
+									v_missingDataPointRel := v_response.primitive.responsePrimitive.primitiveContent.timeSeries.missingDataList.alt_1[0];
+								}
+							}
+							if(not(ispresent(v_response.primitive.responsePrimitive.primitiveContent.timeSeries.missingDataCurrentNr))) {
+								setverdict(inconc, __SCOPE__ & ": missingDataCurrentNr attribute not present");
+							} else {
+								if(v_response.primitive.responsePrimitive.primitiveContent.timeSeries.missingDataCurrentNr != 1) {
+									setverdict(inconc, __SCOPE__ & ": missingDataCurrentNr attribute wrong value");
+								}
+							}
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK())) -> value v_response {
+							tc_ac.stop;
+							setverdict(inconc, __SCOPE__ & ": Wrong response status code");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+							tc_ac.stop;
+							setverdict(inconc, __SCOPE__ & ": Error while retrieving resource");
+						}
+						[] tc_ac.timeout {
+							setverdict(inconc, __SCOPE__ & ": No answer while retrieving resource");
+						}
+					}	
+					
+					f_checkAeSimuStatus();
+					
+					//Test body
+					//Create data points and force a second missingDataPoint
+					f_cse_generateMissingDataPoint(v_resourceIndex);
+					
+					//Retrieve second missing data point
+					mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)))));
+	
+					tc_ac.start;
+					alt {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) -> value v_response {
+							tc_ac.stop;
+							setverdict(pass, __SCOPE__ & ": Response OK for retrieving");
+							if(not(ispresent(v_response.primitive.responsePrimitive.primitiveContent.timeSeries.missingDataList))) {
+								setverdict(inconc, __SCOPE__ & ": missingDataList attribute not present");
+							} else {
+								if(ischosen(v_response.primitive.responsePrimitive.primitiveContent.timeSeries.missingDataList.alt_)) {
+									if(f_getTime(v_missingDataPointTimestamp) < f_getTime(v_response.primitive.responsePrimitive.primitiveContent.timeSeries.missingDataList.alt_[0])) {
+										setverdict(pass, __SCOPE__ & ": missingData point inserted in missingDataList");
+									} else {
+										setverdict(fail, __SCOPE__ & ": missingData point not inserted in missingDataList");
+									}
+								} else {
+									if(v_missingDataPointRel < v_response.primitive.responsePrimitive.primitiveContent.timeSeries.missingDataList.alt_1[0]) {
+										setverdict(pass, __SCOPE__ & ": missingData point inserted in missingDataList");
+									} else {
+										setverdict(fail, __SCOPE__ & ": missingData point not inserted in missingDataList");
+									}
+								}
+							}
+							if(not(ispresent(v_response.primitive.responsePrimitive.primitiveContent.timeSeries.missingDataCurrentNr))) {
+								setverdict(fail, __SCOPE__ & ": missingDataCurrentNr attribute not present");
+							} else {
+								if(v_response.primitive.responsePrimitive.primitiveContent.timeSeries.missingDataCurrentNr != 1) {
+									setverdict(fail, __SCOPE__ & ": missingDataCurrentNr attribute wrong value");
+								}
+							}
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK())) -> value v_response {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Wrong response status code");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
+						}
+						[] tc_ac.timeout {
+							setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
+						}
+					}	  
+					// Postamble
+					f_cse_postamble_deleteResources();
+						
+					// Tear down
+					f_cf01Down();
+						
+					return vc_response.primitive.responsePrimitive;
+    					    				
+				}//end f_CSE_DMR_TS_002
+				
+				/**
+				 * @desc Check that the IUT sends a notification with missing data points information when the number of missing data points detected becomes equal to the minimum specified missing number of the Time Series Data specified in missingData condition of the subscription resource
+				 * 
+				 */
+				testcase TC_CSE_TS_003() runs on Tester system CseSystem {
+	
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+											
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+					v_ae1.start(f_CSE_TS_003());
+								  	  	
+					v_ae1.done;
+								  	  		
+				}
+										
+				function f_CSE_TS_003() runs on AeSimu {
+					// Local variables
+					var integer v_aeIndex := -1;
+					var integer v_timeSeriesIndex := -1;
+					var integer v_subscriptionIndex := -1;
+					var EventNotificationCriteria v_eventNotificationCriteria := valueof(m_eventNotificationCriteria({int1}, -));
+					var template RequestPrimitive v_createRequest := omit;
+					var RequestPrimitive v_request;
+					var integer v_ae2Index := -1;
+					var XSD.NonNegativeInteger v_missingDataPointNumber := 1;
+					var template PrimitiveContent v_contentNotification := {timeSeries := mw_contentTimeSeries(?,v_missingDataPointNumber)}; 
+	
+					v_eventNotificationCriteria.missingData := valueof(m_missingData(v_missingDataPointNumber, "PT0H"));
+
+					// Test control
+
+					// Test component configuration
+					f_cf01Up(true);
+
+					// Test adapter configuration
+
+					// Preamble
+					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+					
+					v_timeSeriesIndex := f_cse_createResource(int29, m_createTimeSeries(-, true, 5, -, 2000), v_aeIndex);//TimeSeries
+	
+					f_cse_preamble_subscriptionVerification(v_ae2Index, v_createRequest, int23);//AE2 registered
+	
+					v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_timeSeriesIndex), -, {f_getResourceAddress(v_aeIndex)}, v_eventNotificationCriteria, omit, omit, omit, omit, omit, omit);
+
+					v_subscriptionIndex := f_cse_createResource(int23, v_createRequest, v_timeSeriesIndex);//Subscription under TimeSeries
+	
+					if(vc_ae2.running) {
+						vc_ae2.stop;
+					};
+
+					// Test Body
+					
+					//Create data points and force a missingDataPoint
+					vc_ae2.start(f_cse_generateMissingDataPoint(v_timeSeriesIndex)); 	
+					vc_ae2.done;				
+
+					f_cse_notifyProcedure_representationHandler(v_contentNotification);
+
+					//Postamble
+					f_cse_postamble_deleteResources();
+	
+					//Tear down
+					f_cf01Down();
+
+				} // end f_CSE_TS_003
+				
+				/**
+				 * @desc Check that the IUT does not send notification when the total number of missing data points does not exceed the minimum specified missing number of the Time Series Data specified in missingData condition of the subscription resource during the window duration specified in the same missingData condition
+				 * 
+				 */
+				testcase TC_CSE_TS_004() runs on Tester system CseSystem {
+
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+							
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+					v_ae1.start(f_CSE_TS_004());
+				  	  	
+					v_ae1.done;
+				  	  		
+				}
+						
+				function f_CSE_TS_004() runs on AeSimu {
+					// Local variables
+					var integer v_aeIndex := -1;
+					var integer v_timeSeriesIndex := -1;
+					var integer v_subscriptionIndex := -1;
+					var EventNotificationCriteria v_eventNotificationCriteria := valueof(m_eventNotificationCriteria({int1}, -));
+					var template RequestPrimitive v_createRequest := omit;
+					var ResponsePrimitive v_responsePrimitive;
+					var integer v_ae2Index := -1;
+					var XSD.NonNegativeInteger v_missingDataPointNumber := 100;
+					var template PrimitiveContent v_contentResponse;
+
+					v_eventNotificationCriteria.missingData := valueof(m_missingData(v_missingDataPointNumber, "PT0H"));
+
+					// Test control
+
+					// Test component configuration
+					f_cf01Up(true);
+
+					// Test adapter configuration
+
+					// Preamble
+					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+	
+					v_timeSeriesIndex := f_cse_createResource(int29, m_createTimeSeries(-, true, 5, -, 2000), v_aeIndex);//TimeSeries
+
+					f_cse_preamble_subscriptionVerification(v_ae2Index, v_createRequest, int23);//AE2 registered
+
+					v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_timeSeriesIndex), -, {f_getResourceAddress(v_aeIndex)}, v_eventNotificationCriteria, omit, omit, omit, omit, omit, omit);
+
+					v_subscriptionIndex := f_cse_createResource(int23, v_createRequest, v_timeSeriesIndex);//Subscription under TimeSeries
+
+					if(vc_ae2.running) {
+						vc_ae2.stop;
+					};
+
+					// Test Body
+	
+					//Create data points and force a missingDataPoint
+					vc_ae2.start(f_cse_generateMissingDataPoint(v_timeSeriesIndex)); 	
+					vc_ae2.done;				
+
+					tc_ac.start;
+					alt {
+						[] mcaPortIn.receive(mw_request(mw_notifyNotification(?))){
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ":ERROR: Notification received");
+							//Send response in any case
+							v_responsePrimitive := valueof(m_responseNotification(int2000, omit));
+							v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
+							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+						}
+						[] tc_ac.timeout {
+							setverdict(pass, __SCOPE__ & ": Notification not received");
+						}
+					}	
+					
+					//Check if the IUT restarts missing data point counter and timer
+					mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_timeSeriesIndex), f_getOriginator(v_timeSeriesIndex)))));
+					
+					v_contentResponse.timeSeries := mw_contentTimeSeries_rc1;
+					v_contentResponse.timeSeries.missingDataCurrentNr := 0;
+
+					tc_ac.start;
+					alt {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, v_contentResponse))){
+							tc_ac.stop;
+							setverdict(pass, __SCOPE__ & ": Response OK for retrieving. MissingDataCurrentNr has been restarted");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(v_contentResponse))){
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Wrong response status code");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)){
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Error, resource elements provided not matching expected resource elements");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)){
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
+						}
+						[] tc_ac.timeout {
+							setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
+						}
+					}					
+
+					//Postamble
+					f_cse_postamble_deleteResources();
+
+					//Tear down
+					f_cf01Down();
+
+				} // end f_CSE_TS_004
+				
+			}//end group timeSeries
+			
+		}//end group dataManagement
+	
+	}//end group CSE
+		
+}