diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index bae4f0bd6a7a5d1fd84e6d49a2e8c101107e6ae6..f4e95e3fed0ff3d41fa78e0f91a3e3f686040385 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -3344,7 +3344,7 @@ module OneM2M_PermutationFunctions {
     				
 					}//end f_CSE_DMR_RET_007
     				
-					function f_CSE_DMR_RET_008(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu {
+					function f_CSE_DMR_RET_008(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, AttributeList_1 p_attributeList) runs on AeSimu {
     				
 						// Local variables
 						var MsgIn v_response;
@@ -3368,7 +3368,7 @@ module OneM2M_PermutationFunctions {
     									
 						// Test Body
 						mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex),
-																						{"lbl", "at"}, f_getOriginator(v_resourceIndex)))));
+																						p_attributeList, f_getOriginator(v_resourceIndex)))));
 
 						tc_ac.start;
 						alt {
@@ -9102,7 +9102,7 @@ module OneM2M_PermutationFunctions {
 				f_cf02DownCseSimuMaster();
 			}
 			
-			function f_CSE_PCH_005(inout integer p_aeIndex1, inout integer p_aeIndex2, RequestPrimitive p_requestprimitive) runs on AeSimu {
+			function f_CSE_PCH_005(template RequestPrimitive p_requestPrimitive) runs on AeSimu {
 		
 				//Local variables
 				var integer v_aeIndex1 := -1;
@@ -9123,18 +9123,19 @@ module OneM2M_PermutationFunctions {
 				// Preamble
 				v_acpAuxIndex := f_cse_preamble_createAcpAux(-, int63);//c_CUDNDi)
     
-				f_checkAeSimuStatus();
-				
-				p_aeIndex1 := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);//c_CRDNDi);
+				v_aeIndex1 := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);//c_CRDNDi);
 	
-				f_checkAeSimuStatus();
+				vc_ae2.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, {f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, PX_AE2_ID_STEM, c_defaultAE2Name, -), -1)); // AE2 is registred
+				f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
+					
+				v_aeIndex2 := f_getResource(vc_ae2);
+					
+				v_resourceIndex := f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex1);
 				
-				p_aeIndex2 := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);//c_CRDNDi);
-	
-				f_checkAeSimuStatus();
+				p_requestPrimitive.to_ := f_getResourceAddress(v_resourceIndex);
+				p_requestPrimitive.from_ := f_getOriginator(v_aeIndex2);	
 				
-				//v_resourceIndex := f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex);
-				mcaPort.send(f_getMsgOutPrimitive(m_request(p_requestprimitive)));
+				mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
 				tc_ac.start;
 				alt {
 					[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) {
@@ -9157,60 +9158,6 @@ module OneM2M_PermutationFunctions {
 				f_cf01Down();
 		  	 }
 		  	 
-			function f_CSE_PCH_006() runs on CseSimu {
-				 // Local variables
-				 var integer v_aeIndex := -1;
-				 var integer v_resourceIndex := -1;
-				 var RequestPrimitive v_request;
-				 var MsgIn v_response;
-				 var RequestPrimitive v_requestNotify;
-
-				 // Test control
-
-				 // Test component configuration
-				 f_cf02UpCseSimuMaster();
-
-				 // Test adapter configuration
-
-				 // Preamble
-				 vc_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSEBase);
-
-				 f_checkCseSimuStatus();
-				
-				 vc_ae1.start(f_cse_preamble_registerAe());//AE1 is registred;
-				 f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
-				 
-				 v_aeIndex := f_getResource(vc_ae1);
-
-				 vc_ae1.start(f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex));//PollingChannel is created;
-				 f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
-				 
-				 v_requestNotify := valueof(m_notify(f_getResourceAddress(v_aeIndex)));	
-				 v_request.from_ := PX_CSE1_ID;
-
-				 mccPort.send(f_getMsgOutPrimitive(m_request(v_request)));
-				 tc_ac.start;
-				 alt {
-					 [] mccPort.receive(mw_response(mw_responsePrimitive(int4108))) -> value vc_response {
-						 tc_ac.stop;
-						 setverdict(pass, __SCOPE__ & ":Response status code set to 4108 (REQUEST_TIMEOUT)");
-					 }
-					 [] mccPort.receive(mw_response()) {
-						 tc_ac.stop;
-						 setverdict(fail, __SCOPE__&":INFO: Unexpected message received");
-					 }
-					 [] tc_ac.timeout {
-						 setverdict(fail, __SCOPE__&":INFO: No answer while performing notification");
-					 }
-				 }	
-
-				 // Postamble
-				 f_cse_postamble_deleteResourcesCSE();
-
-				 // Tear down
-				 f_cf02DownCseSimuMaster();
-			 } // end f_CSE_PCH_006
-		  	 
 		  } //end group PollingChannel
 		
 		group Non_Blocking_Requests{
diff --git a/OneM2M_Testcases_CSE_Release_2.ttcn b/OneM2M_Testcases_CSE_Release_2.ttcn
index cf4c5c0b9ef998e6ce0a76ec173497061ad3d21d..0a2ce81b9f3b0ad2202d43ff8595a600e0907048 100644
--- a/OneM2M_Testcases_CSE_Release_2.ttcn
+++ b/OneM2M_Testcases_CSE_Release_2.ttcn
@@ -2654,16 +2654,6 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_ae1.done;
 					}
 					
-					testcase TC_CSE_DMR_RET_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_ae1.start(f_CSE_DMR_RET_003(int15, m_createPollingChannelBase));//PollingChannel
-						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;
@@ -3089,7 +3079,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
                         
-						v_ae1.start(f_CSE_DMR_RET_008(int3, m_createContainerBase));//Container
+						v_ae1.start(f_CSE_DMR_RET_008(int3, m_createContainerBase, {"lbl", "at"}));//Container
 						v_ae1.done;
 					}
 
@@ -3099,7 +3089,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
 						
-						v_ae1.start(f_CSE_DMR_RET_008(int9, m_createGroupBase));//Group
+						v_ae1.start(f_CSE_DMR_RET_008(int9, m_createGroupBase, {"lbl", "at"}));//Group
 						v_ae1.done;
 					}
 					
@@ -3109,7 +3099,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
 	
-						v_ae1.start(f_CSE_DMR_RET_008(int1, m_createAcpBase));//AccessControlPolicy
+						v_ae1.start(f_CSE_DMR_RET_008(int1, m_createAcpBase, {"lbl", "at"}));//AccessControlPolicy
 						v_ae1.done;
 					}
 				
@@ -3119,7 +3109,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
 	
-						v_ae1.start(f_CSE_DMR_RET_008(int18, m_createScheduleBase));//Schedule
+						v_ae1.start(f_CSE_DMR_RET_008(int18, m_createScheduleBase, {"lbl", "at"}));//Schedule
 						v_ae1.done;
 					}
 					
@@ -3129,7 +3119,17 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
 	
-						v_ae1.start(f_CSE_DMR_RET_008(int23, m_createSubscriptionBase));//Subscription
+						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;
 					}
 					
@@ -3139,7 +3139,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-						v_ae1.start(f_CSE_DMR_RET_008(int29, m_createTimeSeriesBase));//TimeSeries
+						v_ae1.start(f_CSE_DMR_RET_008(int29, m_createTimeSeriesBase, {"lbl", "at"}));//TimeSeries
 						v_ae1.done;
 					}
 
@@ -4961,57 +4961,6 @@ module OneM2M_Testcases_CSE_Release_2 {
 						}
 					}
 					
-					testcase TC_CSE_DMR_UPD_004_PCH_LBL_ACP_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 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;//Attribute 3
-						//No Attribute 1
-						//v_updateRequest.primitiveContent.pollingChannel.accessControlPolicyIDs := v_acp;//Attribute 2 TODO Find another alternative for Attribute 2
-						v_updateRequest.primitiveContent.pollingChannel.labels := v_labels_2;//Attribute 3
-						
-						v_nullFields := {{"labels", omit}};
-      						
-						v_ae1.start(f_CSE_DMR_UPD_004(int15, v_createRequest, v_updateRequest, v_nullFields));//PollingChannel
-						v_ae1.done;
-						
-						 
-																		
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							if(ispresent(v_responsePrimitive.primitiveContent)) {
-								if(ischosen(v_responsePrimitive.primitiveContent.pollingChannel)) {
-									//Check attribute 1
-        							
-									//Check attribute 2 TODO once another alternative is found, activate this checking
-									/*if(not match(v_responsePrimitive.primitiveContent.pollingChannel.accessControlPolicyIDs, valueof(v_updateRequest.primitiveContent.pollingChannel.accessControlPolicyIDs))){
-										setverdict(fail, __SCOPE__ & ": Error: ACPI attribute not added correctly")
-									}*/
-									//Check attribute 3
-									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)){
-								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;
@@ -5105,31 +5054,6 @@ module OneM2M_Testcases_CSE_Release_2 {
 						}
 					}
 					
-					testcase TC_CSE_DMR_UPD_006_PCH_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_updatePollingChannelBase;
-						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_006(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)) {
-							   if(v_primitiveContentRetrieveResource.pollingChannel.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;
@@ -7556,16 +7480,6 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_ae1.start(f_CSE_DMR_DEL_002(int18, m_createScheduleBase));//Schedule
 						v_ae1.done;
 					};
-                
-					testcase TC_CSE_DMR_DEL_002_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_002(int15, m_createPollingChannelBase));//PollingChannel
-						v_ae1.done;
-					};
 					
 					testcase TC_CSE_DMR_DEL_002_TS() runs on Tester system CseSystem {
 						// Local variables
@@ -12825,195 +12739,115 @@ module OneM2M_Testcases_CSE_Release_2 {
 			
 			group g_CSE_PCH_005 {
 				
-			  testcase TC_CSE_PCH_005_CRE() runs on Tester system CseSystem {
-					
-				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-				var RequestPrimitive v_request;
-				var integer v_aeIndex1 := -1;
-				var integer v_aeIndex2 := -1;
-				var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
-				
-				v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-				v_request := f_getCreateRequestPrimitive(int15, v_createRequest, v_aeIndex1);
-				v_request.to_ := f_getResourceAddress(v_aeIndex2);
-				
-				v_ae1.start(f_CSE_PCH_005(v_aeIndex1, v_aeIndex2, v_request));
-				v_ae1.done;
-	  	  		
-			 }
-			 
-			 testcase TC_CSE_PCH_005_RET() runs on Tester system CseSystem {
+				testcase TC_CSE_PCH_005_RET() runs on Tester system CseSystem {
 		
-				 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-				 var RequestPrimitive v_request;
-				 var integer v_aeIndex1 := -1;
-				 var integer v_aeIndex2 := -1;
-				 var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
-	
-				 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-				 v_request := f_getCreateRequestPrimitive(int15, v_createRequest, v_aeIndex1);
-				 
-				 v_request := valueof(m_retrievePollingRequest(f_getResourceAddress(v_aeIndex1), f_getOriginator(v_aeIndex1)));
-				 v_request.to_ := f_getResourceAddress(v_aeIndex2);
+					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_PCH_005(v_aeIndex1, v_aeIndex2, v_request));
-				 v_ae1.done;
-			  }
+				 	v_ae1.start(f_CSE_PCH_005(m_retrieve("NotInitialized", "NotInitialized")));
+				 	v_ae1.done;
+			  	}
 			  
-			  testcase TC_CSE_PCH_005_UPD() runs on Tester system CseSystem {
+			  	testcase TC_CSE_PCH_005_UPD() runs on Tester system CseSystem {
 					
-				  var AeSimu v_ae1 := AeSimu.create("AE1") alive;	
-				  var RequestPrimitive v_request;
-				  var integer v_aeIndex1 := -1;
-				  var integer v_aeIndex2 := -1;
-				  var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
-
-				  v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-				  v_request := f_getCreateRequestPrimitive(int15, v_createRequest, v_aeIndex1);
-				  
- 
-				  v_request := valueof(m_updatePollingChannelBase);
-				  v_request.to_ := f_getResourceAddress(v_aeIndex2);
-				  
-				  v_ae1.start(f_CSE_PCH_005(v_aeIndex1, v_aeIndex2, v_request));	
-				  v_ae1.done;
-	
-			   }
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
+					var Labels v_labels_1 := {"VALUE_1"};
+				
+					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_PCH_005(v_updateRequest));
+					v_ae1.done;
+		
+				  }
 			   
 			   testcase TC_CSE_PCH_005_DEL() runs on Tester system CseSystem {
 					
-				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-	
-				var RequestPrimitive v_request;
-				var integer v_aeIndex1 := -1;
-				var integer v_aeIndex2 := -1;
-				var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
-
-				v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-				v_request := f_getCreateRequestPrimitive(int15, v_createRequest, v_aeIndex1);
-				
- 
-				v_request := valueof(m_deletePollingChannelBase(f_getResourceAddress(v_aeIndex1)));
-				v_request.to_ := f_getResourceAddress(v_aeIndex2);
-				
-				v_ae1.start(f_CSE_PCH_005(v_aeIndex1, v_aeIndex2, v_request));
-			    v_ae1.done;
-	
-			}
-			
-			function f_CSE_PCH_005(inout integer p_aeIndex1, inout integer p_aeIndex2, RequestPrimitive p_requestprimitive) runs on AeSimu {
-				
-				//Local variables
-				var integer v_aeIndex1 := -1;
-				var integer v_aeIndex2 := -1;
-				var integer v_resourceIndex := -1;
-				var integer v_acpAuxIndex := -1;
-				var RequestPrimitive v_request;
-				var MsgIn v_response;
-				var RequestPrimitive v_requestNotify;
-	
-				// Test control
-	
-				// Test component configuration
-				f_cf01Up(true);
-	
-				// Test adapter configuration
-	
-				// Preamble
- 			    v_acpAuxIndex := f_cse_preamble_createAcpAux(-, int63);//c_CUDNDi)
- 			    
-				p_aeIndex1 := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);//c_CRDNDi);
-				
-				p_aeIndex2 := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);//c_CRDNDi);
-				
-				//v_resourceIndex := f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex);
-				mcaPort.send(f_getMsgOutPrimitive(m_request(p_requestprimitive)));
-				tc_ac.start;
-				alt {
-					[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) {
-						tc_ac.stop;
-						setverdict(pass, __SCOPE__&":INFO: Polling Resource type not created as originator has no privilege");
-					}
-					[] tc_ac.timeout {
-						setverdict(inconc, __SCOPE__&":INFO: No answer while creating polling resource type");
-					}
-				}	
-				
-				
-			}
-		 } //end group g_CSE_PCH_005
-		 
-		 /**
-		  * @desc Check that the IUT sends the response with a status to the CSE1 when the request expires according to its Request Expiration Timestamp
-		  * 
-		  */
-		 testcase TC_CSE_PCH_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_PCH_005(m_delete("NotInitialized", "NotInitialized")));
+					v_ae1.done;
 	
-			 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-			 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
+				}
 			
-			 v_cse1.start(f_CSE_PCH_006());
-			 v_cse1.done;
-		 }
+		 	} //end group g_CSE_PCH_005
+			 
+			 /**
+			  * @desc Check that the IUT sends the response with a status to the CSE1 when the request expires according to its Request Expiration Timestamp
+			  * 
+			  */
+			 testcase TC_CSE_PCH_006() runs on Tester system CseSystem {
+		
+				 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+				 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+							v_cse1.done;
 				
-		 function f_CSE_PCH_006() runs on CseSimu {
-			 // Local variables
-			 var integer v_aeIndex := -1;
-			 var integer v_resourceIndex := -1;
-			 var RequestPrimitive v_request;
-			 var MsgIn v_response;
-			 var RequestPrimitive v_requestNotify;
+				 v_cse1.start(f_CSE_PCH_006());
+				 v_cse1.done;
+			 }
+					
+			function f_CSE_PCH_006() runs on CseSimu {
+				 // Local variables
+				 var integer v_aeIndex, v_aeIndexForResourceAddress := -1;
+				 var integer v_resourceIndex := -1;
+				 var MsgIn v_response;
+				 var RequestPrimitive v_requestNotify;
 
-			 // Test control
+				 // Test control
 
-			 // Test component configuration
-			 f_cf02UpCseSimuMaster();
+				 // Test component configuration
+				 f_cf02UpCseSimuMaster();
 
-			 // Test adapter configuration
+				 // Test adapter configuration
 
-			 // Preamble
-			 vc_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSEBase);
+				 // Preamble
+				 vc_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSEBase);
 
-			 vc_ae1.start(f_cse_preamble_registerAe());//AE1 is registred;
-			 vc_ae1.done;
-			 f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
-			 v_aeIndex := f_getResource(vc_ae1);
-	
-			 vc_ae1.start(f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex));//PollingChannel is created;
-			 vc_ae1.done;
+				 vc_ae1.start(f_cse_preamble_registerAe());//AE1 is registred;
+				 f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
+				 
+				 v_aeIndex := f_getLatestResourceIndex(vc_ae1);
+				 
+				 v_aeIndexForResourceAddress := f_getResource(vc_ae1);
 
-			 v_requestNotify := valueof(m_notify(f_getResourceAddress(v_aeIndex)));	
-			 v_request.from_ := PX_CSE1_ID;
-		
-			 mccPort.send(f_getMsgOutPrimitive(m_request(v_request)));
-			 tc_ac.start;
-			 alt {
-				 [] mccPort.receive(mw_response(mw_responsePrimitive(int4108))) -> value vc_response {
-					 tc_ac.stop;
-					 setverdict(pass, __SCOPE__ & ":Response status code set to 4108 (REQUEST_TIMEOUT)");
-				 }
-				 [] mccPort.receive(mw_response()) {
-					 tc_ac.stop;
-					 setverdict(inconc, __SCOPE__&":INFO: Unexpected message received");
-				 }
-				 [] tc_ac.timeout {
-					 setverdict(inconc, __SCOPE__&":INFO: No answer while performing notification");
-				 }
-			 }	
-		
-			 // Postamble
-			 f_cse_postamble_deleteResourcesCSE();
+				 vc_ae1.start(f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex));//PollingChannel is created;
+				 f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
+				 
+				 v_requestNotify := valueof(m_notify(f_getResourceAddress(v_aeIndexForResourceAddress)));	
+				 v_requestNotify.from_ := PX_CSE1_ID;
+
+				 mccPort.send(f_getMsgOutPrimitive(m_request(v_requestNotify)));
+				 tc_ac.start;
+				 alt {
+					 [] mccPort.receive(mw_response(mw_responsePrimitive(int4108))) -> value vc_response {
+						 tc_ac.stop;
+						 setverdict(pass, __SCOPE__ & ":Response status code set to 4108 (REQUEST_TIMEOUT)");
+					 }
+					 [] mccPort.receive(mw_response()) {
+						 tc_ac.stop;
+						 setverdict(fail, __SCOPE__&":INFO: Unexpected message received");
+					 }
+					 [] tc_ac.timeout {
+						 setverdict(fail, __SCOPE__&":INFO: No answer while performing notification");
+					 }
+				 }	
 
-			 // Tear down
-			 f_cf02DownCseSimuMaster();
-		 } // end f_CSE_PCH_006
+				 // Postamble
+				 f_cse_postamble_deleteResourcesCSE();
+
+				 // Tear down
+				 f_cf02DownCseSimuMaster();
+			 } // end f_CSE_PCH_006
 			
 		}//end group PollingChannel
+		
 		group Non_Blocking_Requests{
 
 			group Synchronous{