diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 243d82c83d7706d7e9d09364a54bde862aaba581..01926009022f3a15716478aadf8c30dd674ac032 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -2581,7 +2581,7 @@ module OneM2M_PermutationFunctions {
 						}
 					}	
 					
-					f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
+					f_checkAeSimuStatus();
 								
 					//Check to see if the resource is present or not
 					if (f_cse_isResourcePresent(v_resourceIndex)){
@@ -2725,7 +2725,7 @@ module OneM2M_PermutationFunctions {
 							}
 						}	
 								
-						f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
+						f_checkAeSimuStatus();
 						
 						//Check to see if the resource is present or not
 						if(f_cse_isResourcePresent(v_resourceIndex)){
@@ -2766,6 +2766,10 @@ module OneM2M_PermutationFunctions {
 						
 						v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex); 	
 						
+						if(vc_ae2.running) {
+							vc_ae2.stop;
+						};
+						
 						if(p_resourceType == int15) {
 							v_request := f_getCreateRequestPrimitive(int3, m_createContainerBase, v_aeIndex);
 							v_request.primitiveContent.container.resourceName := vc_resourcesList[v_resourceIndex].resource.pollingChannel.resourceName;
@@ -3194,7 +3198,7 @@ module OneM2M_PermutationFunctions {
 							}
 						}	
 								
-						f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);	
+						f_checkAeSimuStatus();	
     					
     					//Check to see if the resource is present or not
 						if(f_cse_isResourcePresent(v_resourceIndex)) {
@@ -3737,7 +3741,7 @@ module OneM2M_PermutationFunctions {
 							}
 						}	
     						
-						f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
+						f_checkAeSimuStatus();
 							
 						// Postamble
 						f_cse_postamble_deleteResources();
@@ -5081,7 +5085,11 @@ module OneM2M_PermutationFunctions {
 						f_cse_preamble_subscriptionVerification(v_ae2Index, p_createRequestPrimitive, p_resourceType);
 						
 						v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive, v_aeIndex); 				
-    									
+    							
+    					if (vc_ae2.running) {
+    						vc_ae2.stop;
+    					};		
+    					
 						// Test Body
 						v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive);
 						
@@ -5580,6 +5588,8 @@ module OneM2M_PermutationFunctions {
 							}
 						}	
 						
+						f_checkAeSimuStatus();
+						
 						vc_primitiveContentRetrievedResource := f_cse_retrieveResource(v_resourceIndex);
 						
 						// Postamble
@@ -5634,7 +5644,9 @@ module OneM2M_PermutationFunctions {
 								setverdict(fail, __SCOPE__ & ": No answer while updating resource " & int2str(enum2int(p_resourceTypeChild)));
 							}
 						}	
-						 
+						
+						f_checkAeSimuStatus();
+						
 						vc_primitiveContentRetrievedResource := f_cse_retrieveResource(v_childIndex);
 		
 						// Postamble
@@ -5674,7 +5686,7 @@ module OneM2M_PermutationFunctions {
 							p_createRequestPrimitive := f_setAcpId(p_createRequestPrimitive,{f_getResourceAddress(v_acp1Index)});
 							p_updateRequestPrimitive := f_setAcpId(p_updateRequestPrimitive,{f_getResourceAddress(v_acp2Index)});
 						
-							infoPort.send(f_getResourceAddress(lengthof(vc_resourcesList)-1, e_nonHierarchical)) to mtc;
+							//infoPort.send(f_getResourceAddress(lengthof(vc_resourcesList)-1, e_nonHierarchical)) to mtc;
 						}
 						
 						v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive, vc_aeIndex); 				
@@ -6459,6 +6471,8 @@ module OneM2M_PermutationFunctions {
 							}
 						}					
 				
+						f_checkAeSimuStatus();
+						
 						vc_primitiveContentRetrievedResource := f_cse_retrieveResource(v_resourceIndex);
 					
 						// Postamble
diff --git a/OneM2M_Testcases_CSE_Release_1.ttcn b/OneM2M_Testcases_CSE_Release_1.ttcn
index 3f6be1bafe0cb3899f18ba19b281410ac0319637..10988ad078da19ca06c13b32a3c92295dcd102d1 100644
--- a/OneM2M_Testcases_CSE_Release_1.ttcn
+++ b/OneM2M_Testcases_CSE_Release_1.ttcn
@@ -8528,7 +8528,9 @@ module OneM2M_Testcases_CSE_Release_1 {
 
 					v_resourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex);//Subscription 				
 					
-					f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
+					if(vc_ae2.running) {
+						vc_ae2.stop;
+					};
 					
 					// Test Body
 					v_request:= f_getCreateRequestPrimitive(int3, m_createContainerBase, v_aeIndex);
@@ -8554,6 +8556,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 							setverdict(fail, __SCOPE__ & ": No answer while creating resource type int3 (Container)");
 						}
 					}
+					
+					f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
     				
 					//Postamble
 					f_cse_postamble_deleteResources();
@@ -8606,7 +8610,9 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					v_resourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex);//Subscription
 
-					f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
+					if(vc_ae2.running) {
+						vc_ae2.stop;
+					};
 					
 					// Test Body
 					v_contentResponse.aE := mw_contentAeBase; // all attributes expected
@@ -8636,6 +8642,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						}
 					};
 					
+					f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
+					
 					//Postamble
 					f_cse_postamble_deleteResources();
 
@@ -8691,7 +8699,9 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					v_request := valueof(m_delete(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))); // Subscription resource deletion request
 										
-					f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
+					if(vc_ae2.running) {
+						vc_ae2.stop;
+					};
 					
 					// Test Body
 					v_notificationContent.subscriptionReference := ?;