diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 03c940463e68d661b72a8f9b8ff716dd814112c1..92b65125c86793b1b8e84a3c334a1f1fa756763f 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -173,7 +173,7 @@ module OneM2M_Functions {
 			vc_testSystemRole := e_cse;		
 			
 			// Map
-			map(self:mcaPort, system:mcaPort);//TODO To be consistent, we should use mcaPortIn for AE testing
+			map(self:mcaPortIn, system:mcaPortIn);//TODO To be consistent, we should use mcaPortIn for AE testing
 			map(self:acPort, system:acPort);
 			map(self:utPort, system:utPort);
 			activate(a_default());
@@ -263,7 +263,7 @@ module OneM2M_Functions {
 		 */
 		function f_cf03Down() runs on CseSimu {
 			
-			unmap(self:mcaPort, system:mcaPort);
+			unmap(self:mcaPortIn, system:mcaPortIn);
 			unmap(self:utPort, system:utPort);
 			unmap(self:acPort, system:acPort);
 		}
diff --git a/LibOneM2M/OneM2M_TestSystem.ttcn b/LibOneM2M/OneM2M_TestSystem.ttcn
index 5f87154c3b7596f5c5a2650926bdf515f9e2490e..00773447475ab312dcca6ace6a9ce389381d7e41 100644
--- a/LibOneM2M/OneM2M_TestSystem.ttcn
+++ b/LibOneM2M/OneM2M_TestSystem.ttcn
@@ -55,6 +55,7 @@ module OneM2M_TestSystem {
 		
 	type component CseSimu extends Tester {
 		port OneM2MPort mcaPort;
+		port OneM2MPort mcaPortIn;
 		port OneM2MPort mccPort;
 		port OneM2MPort mccPortIn;
 
diff --git a/OneM2M_Testcases_AE.ttcn b/OneM2M_Testcases_AE.ttcn
index ef843f447c7347c96b162657c98a8df36a09d6f3..b7d4eb690fea998d150e4025444c8e3cd9afcd00 100644
--- a/OneM2M_Testcases_AE.ttcn
+++ b/OneM2M_Testcases_AE.ttcn
@@ -85,18 +85,17 @@ module OneM2M_Testcases_AE {
 						//Send Trigger Message
 						v_utRequest.to_ := f_getResourceAddress(-1, e_nonHierarchical, p_primitiveScope);
 						v_utRequest.from_ := "UNINITIALIZED";
-						f_sendUtPrimitive(v_utRequest, v_action);						
+						f_sendUtPrimitive(v_utRequest, v_action);
 						
 						tc_ac.start;
 						alt {
-							[] mcaPort.receive(mw_request(mw_createContainer(omit,v_utRequest.to_))) {
+							[] mcaPortIn.receive(mw_request(mw_createContainer(omit,v_utRequest.to_))) {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__, " : Container creation request received successfuly");
 							
 								v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
-								mcaPort.send(m_response(v_responsePrimitive));
-							}
-							[] mcaPort.receive(mw_request(?)) {
+								mcaPortIn.send(m_response(v_responsePrimtive));							}
+							[] mcaPortIn.receive(mw_request(?)) {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__, " : Error while creating container");
 								stop;
@@ -167,19 +166,18 @@ module OneM2M_Testcases_AE {
 						//Send Trigger Message
 						v_utRequest.to_ := f_getResourceAddress(-1, e_hierarchical, p_primitiveScope);
 						v_utRequest.from_ := "UNINITIALIZED";
-						f_sendUtPrimitive(v_utRequest,v_action);	
+						f_sendUtPrimitive(v_utRequest,v_action);
 							
 	
 						tc_ac.start;
 						alt {
-							[] mcaPort.receive(mw_request(mw_createContainer(omit,v_utRequest.to_))) {
+							[] mcaPortIn.receive(mw_request(mw_createContainer(omit,v_utRequest.to_))) {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__, " : Container creation request received successfuly");
 		
 								v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
-								mcaPort.send(m_response(v_responsePrimitive));
-							}
-							[] mcaPort.receive(mw_request(?)) {
+								mcaPortIn.send(m_response(v_responsePrimitive));							}
+							[] mcaPortIn.receive(mw_request(?)) {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__, " : Error while creating container");
 								stop;
@@ -219,11 +217,11 @@ module OneM2M_Testcases_AE {
 					
 					testcase TC_AE_GEN_UPD_001_SPR() runs on CseSimu system AeSystem {
 						
-					//Test control
-					if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
-						setverdict(inconc, __SCOPE__, ": Unstructured-SP-Relative-Resource-ID format support is required to run this test case");
-						stop;
-					}
+						//Test control
+						if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
+							setverdict(inconc, __SCOPE__, ": Unstructured-SP-Relative-Resource-ID format support is required to run this test case");
+							stop;
+						}
 						
 						f_AE_GEN_UPD_001(e_spRelative);
 					}
@@ -259,18 +257,17 @@ module OneM2M_Testcases_AE {
 						v_auxInteger := f_setResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3);
 						v_utRequest.to_ := f_getResourceAddress(v_auxInteger, e_nonHierarchical, p_primitiveScope);
 						v_utRequest.from_ := "UNINITIALIZED";
-						f_sendUtPrimitive(v_utRequest,v_action);													
+						f_sendUtPrimitive(v_utRequest,v_action);
 						
 						tc_ac.start;
 						alt {
-							[] mcaPort.receive(mw_request(mw_updateContainer(omit,v_utRequest.to_))) {
+							[] mcaPortIn.receive(mw_request(mw_updateContainer(omit,v_utRequest.to_))) {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__, " : Container update request received successfuly");
 							
 								v_responsePrimitive := valueof(m_responsePrimitive(int2004, "To_be_defined", omit));
-								mcaPort.send(m_response(v_responsePrimitive));
-							}
-							[] mcaPort.receive(mw_request(?)) {
+								mcaPortIn.send(m_response(v_responsePrimitive));							}
+							[] mcaPortIn.receive(mw_request(?)) {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__, " : Error while updating container");
 								stop;
@@ -344,18 +341,17 @@ module OneM2M_Testcases_AE {
 						v_auxInteger := f_setResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3);
 						v_utRequest.to_ := f_getResourceAddress(v_auxInteger, e_hierarchical, p_primitiveScope);
 						v_utRequest.from_ := "UNINITIALIZED";
-						f_sendUtPrimitive(v_utRequest,v_action);	
+						f_sendUtPrimitive(v_utRequest,v_action);
 								
 						tc_ac.start;
 						alt {
-							[] mcaPort.receive(mw_request(mw_updateContainer(omit,v_utRequest.to_))) {
+							[] mcaPortIn.receive(mw_request(mw_updateContainer(omit,v_utRequest.to_))) {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__, " : Container update request received successfuly");
 							
 								v_responsePrimitive := valueof(m_responsePrimitive(int2004, "To_be_defined", omit));
-								mcaPort.send(m_response(v_responsePrimitive));
-							}
-							[] mcaPort.receive(mw_request(?)) {
+								mcaPortIn.send(m_response(v_responsePrimitive));							}
+							[] mcaPortIn.receive(mw_request(?)) {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__, " : Error while updating container");
 								stop;
@@ -419,7 +415,7 @@ module OneM2M_Testcases_AE {
 			
 						var ResponsePrimitive v_responsePrimitive;
 						var template UtTriggerPrimitive v_utRequestTemplate;
-                        var UtTriggerPrimitive v_utRequest;
+						var UtTriggerPrimitive v_utRequest;
 						var UtTriggerAckPrimitive v_trigger_response;
 						var integer v_auxInteger;
 						var charstring v_action := "Please, send a valid RETRIEVE Request for container containing To set to " & f_getResourceAddress(-1, e_nonHierarchical, p_primitiveScope);
@@ -435,18 +431,17 @@ module OneM2M_Testcases_AE {
 						v_auxInteger := f_setResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3);
 						v_utRequestTemplate := m_utRetrieveResource(f_getResourceAddress(v_auxInteger, e_nonHierarchical, p_primitiveScope),"UNINITIALIZED");
 						f_sendUtPrimitive(v_utRequestTemplate,v_action);
-                        v_utRequest := valueof(v_utRequestTemplate);
+						v_utRequest := valueof(v_utRequestTemplate);
 			
 						tc_ac.start;
 						alt {
-							[] mcaPort.receive(mw_request(mw_retrieveResource(v_utRequest.to_))) {
+							[] mcaPortIn.receive(mw_request(mw_retrieveResource(v_utRequest.to_))) {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__, " : Container retrieve request received successfuly");
 				
 								v_responsePrimitive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
-								mcaPort.send(m_response(v_responsePrimitive));
-							}
-							[] mcaPort.receive(mw_request(?)) {
+								mcaPortIn.send(m_response(v_responsePrimitive));							}
+							[] mcaPortIn.receive(mw_request(?)) {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__, " : Error while retrieving container");
 								stop;
@@ -505,7 +500,7 @@ module OneM2M_Testcases_AE {
 
 						var ResponsePrimitive v_responsePrimitive;
 						var template UtTriggerPrimitive v_utRequestTemplate;
-                        var UtTriggerPrimitive v_utRequest;
+						var UtTriggerPrimitive v_utRequest;
 						var UtTriggerAckPrimitive v_trigger_response;
 						var integer v_auxInteger;
 						var charstring v_action := "Please, send a valid RETRIEVE Request for container containing To set to " & f_getResourceAddress(-1, e_hierarchical, p_primitiveScope);
@@ -520,19 +515,18 @@ module OneM2M_Testcases_AE {
 						//Send Trigger Message
 						v_auxInteger := f_setResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3);
 						v_utRequestTemplate := m_utRetrieveResource(f_getResourceAddress(v_auxInteger, e_hierarchical, p_primitiveScope),"UNINITIALIZED");
-                        v_utRequest := valueof(v_utRequestTemplate);
-						f_sendUtPrimitive(v_utRequest,v_action);				
+						v_utRequest := valueof(v_utRequestTemplate);
+						f_sendUtPrimitive(v_utRequest,v_action);
 
 						tc_ac.start;
 						alt {
-							[] mcaPort.receive(mw_request(mw_retrieveResource(v_utRequest.to_))) {
+							[] mcaPortIn.receive(mw_request(mw_retrieveResource(v_utRequest.to_))) {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__, " : Container retrieve request received successfuly");
 				
 								v_responsePrimitive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
-								mcaPort.send(m_response(v_responsePrimitive));
-							}
-							[] mcaPort.receive(mw_request(?)) {
+								mcaPortIn.send(m_response(v_responsePrimitive));							}
+							[] mcaPortIn.receive(mw_request(?)) {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__, " : Error while retrieving container");
 								stop;
@@ -611,18 +605,17 @@ module OneM2M_Testcases_AE {
 						v_auxInteger := f_setResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3);
 						v_utRequest.to_ := f_getResourceAddress(v_auxInteger, e_nonHierarchical, p_primitiveScope);
 						v_utRequest.from_ := "UNINITIALIZED";
-						f_sendUtPrimitive(v_utRequest,v_action);									
+						f_sendUtPrimitive(v_utRequest,v_action);
 			
 						tc_ac.start;
 						alt {
-							[] mcaPort.receive(mw_request(mw_deleteRequest(v_utRequest.to_))) {
+							[] mcaPortIn.receive(mw_request(mw_deleteRequest(v_utRequest.to_))) {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__, " : Container update request received successfuly");
 				
 								v_responsePrimitive := valueof(m_responsePrimitive(int2004, "To_be_defined", omit));
-								mcaPort.send(m_response(v_responsePrimitive));
-							}
-							[] mcaPort.receive(mw_request(?)) {
+								mcaPortIn.send(m_response(v_responsePrimitive));							}
+							[] mcaPortIn.receive(mw_request(?)) {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__, " : Error while updating container");
 								stop;
@@ -695,20 +688,19 @@ module OneM2M_Testcases_AE {
 						//Send Trigger Message
 						v_auxInteger := f_setResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3);
 						v_utRequest.to_ := f_getResourceAddress(v_auxInteger, e_hierarchical, p_primitiveScope);
-						v_utRequest.from_ := "UNINITIALIZED";			
+						v_utRequest.from_ := "UNINITIALIZED";
 						f_sendUtPrimitive(v_utRequest,v_action);
 				
 
 						tc_ac.start;
 						alt {
-							[] mcaPort.receive(mw_request(mw_deleteRequest(v_utRequest.to_))) {
+							[] mcaPortIn.receive(mw_request(mw_deleteRequest(v_utRequest.to_))) {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__, " : Container update request received successfuly");
 				
 								v_responsePrimitive := valueof(m_responsePrimitive(int2004, "To_be_defined", omit));
-								mcaPort.send(m_response(v_responsePrimitive));
-							}
-							[] mcaPort.receive(mw_request(?)) {
+								mcaPortIn.send(m_response(v_responsePrimitive));							}
+							[] mcaPortIn.receive(mw_request(?)) {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__, " : Error while updating container");
 								stop;
@@ -742,7 +734,7 @@ module OneM2M_Testcases_AE {
 					//primitives for utPort
 					var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
 
-					//primitives for mcaPort
+					//primitives for mcaPortIn
 					var MsgIn v_request;
 					var ResponsePrimitive v_responsePrimitive;
 					var charstring v_action := "Please, send a valid AE CREATE Registration Request";
@@ -755,16 +747,15 @@ module OneM2M_Testcases_AE {
 					//Test behavior
 					tc_ac.start;
 					alt{
-						[] mcaPort.receive(mw_request(mw_createAe)) -> value v_request {
+						[] mcaPortIn.receive(mw_request(mw_createAe)) -> value v_request {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__, " : AE registration request is accepted!!");
 							//v_responsePrimitive := valueof(m_responsePrimitiveTemp(int2000, omit));
 							v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
 							
 							//send back responsePrimitive
-							mcaPort.send(m_response(v_responsePrimitive));
-						}
-						[] mcaPort.receive(mw_request(mw_createAe(*,?,m_contentCreateAe_Invalid))) -> value v_request {
+							mcaPortIn.send(m_response(v_responsePrimitive));						}
+						[] mcaPortIn.receive(mw_request(mw_createAe(*,?,m_contentCreateAe_Invalid))) -> value v_request {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__, " : AE registration request is rejected due to not including mandatory attributes!!");
 						}
@@ -787,8 +778,8 @@ module OneM2M_Testcases_AE {
 					testcase TC_AE_REG_CRE_002_RN() runs on CseSimu system AeSystem {
 						//primitives for utPort
 						var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
-                        var template RequestPrimitive v_createAe := mw_createAe;
-						var charstring v_action := "Please, send a valid AE CREATE Registration Request containing attribute ResourceName"; 
+						var template RequestPrimitive v_createAe := mw_createAe;
+						var charstring v_action := "Please, send a valid AE CREATE Registration Request containing attribute ResourceName";
 						v_utRequest.primitiveContent.aE.resourceName := "UNINITIALIZED";
 						v_createAe.primitiveContent.aE.resourceName := ?;
 						f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
@@ -798,7 +789,7 @@ module OneM2M_Testcases_AE {
 						//primitives for utPort
 						var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
 						var template RequestPrimitive v_createAe := mw_createAe;
-						var charstring v_action := "Please, send a valid AE CREATE Registration Request containing attribute ExpirationTime";  
+						var charstring v_action := "Please, send a valid AE CREATE Registration Request containing attribute ExpirationTime";
 						v_utRequest.primitiveContent.aE.expirationTime := "20301231T012345";
 						v_createAe.primitiveContent.aE.expirationTime := ?;
 						f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
@@ -807,7 +798,7 @@ module OneM2M_Testcases_AE {
 					testcase TC_AE_REG_CRE_002_LBL() runs on CseSimu system AeSystem {
 						//primitives for utPort
 						var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
-						var template RequestPrimitive v_createAe := mw_createAe; 
+						var template RequestPrimitive v_createAe := mw_createAe;
 						var charstring v_action := "Please, send a valid AE CREATE Registration Request containing attribute Labels";
 						v_utRequest.primitiveContent.aE.labels := {"UNINITIALIZED"};
 						v_createAe.primitiveContent.aE.labels := ?;
@@ -818,7 +809,7 @@ module OneM2M_Testcases_AE {
 						//primitives for utPort
 						var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
 						var template RequestPrimitive v_createAe := mw_createAe;
-						var charstring v_action := "Please, send a valid AE CREATE Registration Request containing attribute AppName"; 
+						var charstring v_action := "Please, send a valid AE CREATE Registration Request containing attribute AppName";
 						v_utRequest.primitiveContent.aE.appName := "UNINITIALIZED";
 						v_createAe.primitiveContent.aE.appName := ?;
 						f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
@@ -828,7 +819,7 @@ module OneM2M_Testcases_AE {
 						//primitives for utPort
 						var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
 						var template RequestPrimitive v_createAe := mw_createAe;
-						var charstring v_action := "Please, send a valid AE CREATE Registration Request containing attribute AppID"; 
+						var charstring v_action := "Please, send a valid AE CREATE Registration Request containing attribute AppID";
 						v_utRequest.primitiveContent.aE.app_ID := "UNINITIALIZED";
 						v_createAe.primitiveContent.aE.app_ID := ?;
 						f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
@@ -837,7 +828,7 @@ module OneM2M_Testcases_AE {
 					testcase TC_AE_REG_CRE_002_POA() runs on CseSimu system AeSystem {
 						//primitives for utPort
 						var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
-						var template RequestPrimitive v_createAe := mw_createAe; 
+						var template RequestPrimitive v_createAe := mw_createAe;
 						var charstring v_action := "Please, send a valid AE CREATE Registration Request containing attribute PointOfAccess";
 						v_utRequest.primitiveContent.aE.pointOfAccess := {"UNINITIALIZED"};
 						v_createAe.primitiveContent.aE.pointOfAccess := ?;
@@ -847,7 +838,7 @@ module OneM2M_Testcases_AE {
 					testcase TC_AE_REG_CRE_002_OR() runs on CseSimu system AeSystem {
 						//primitives for utPort
 						var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
-						var template RequestPrimitive v_createAe := mw_createAe; 
+						var template RequestPrimitive v_createAe := mw_createAe;
 						var charstring v_action := "Please, send a valid AE CREATE Registration Request containing attribute OntologyRef";
 						v_utRequest.primitiveContent.aE.ontologyRef := "UNINITIALIZED";
 						v_createAe.primitiveContent.aE.ontologyRef := ?;
@@ -857,7 +848,7 @@ module OneM2M_Testcases_AE {
 					testcase TC_AE_REG_CRE_002_NL() runs on CseSimu system AeSystem {
 						//primitives for utPort
 						var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
-						var template RequestPrimitive v_createAe := mw_createAe; 
+						var template RequestPrimitive v_createAe := mw_createAe;
 						var charstring v_action := "Please, send a valid AE CREATE Registration Request containing attribute NodeLink";
 						v_utRequest.primitiveContent.aE.nodeLink := "UNINITIALIZED";
 						v_createAe.primitiveContent.aE.nodeLink := ?;
@@ -867,7 +858,7 @@ module OneM2M_Testcases_AE {
 					testcase TC_AE_REG_CRE_002_RR() runs on CseSimu system AeSystem {
 						//primitives for utPort
 						var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
-						var template RequestPrimitive v_createAe := mw_createAe; 
+						var template RequestPrimitive v_createAe := mw_createAe;
 						var charstring v_action := "Please, send a valid AE CREATE Registration Request containing attribute RequestReachability";
 						v_utRequest.primitiveContent.aE.requestReachability := true;
 						v_createAe.primitiveContent.aE.requestReachability := ?;
@@ -877,49 +868,46 @@ module OneM2M_Testcases_AE {
 					testcase TC_AE_REG_CRE_002_CSZ() runs on CseSimu system AeSystem {
 						//primitives for utPort
 						var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
-						var template RequestPrimitive v_createAe := mw_createAe; 
+						var template RequestPrimitive v_createAe := mw_createAe;
 						var charstring v_action := "Please, send a valid AE CREATE Registration Request containing attribute ContentSerialization";
 						v_utRequest.primitiveContent.aE.contentSerialization := {applicationxml};
 						v_createAe.primitiveContent.aE.contentSerialization := ?;
 						f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
 					}
 	
-				   function f_AE_REG_CRE_002(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_response, in charstring p_action) runs on CseSimu {
+					function f_AE_REG_CRE_002(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_response, in charstring p_action) runs on CseSimu {
 	
-					   //primitives for mcaPort
-					   var MsgIn v_request;
-					   var ResponsePrimitive v_responsePrimitive;
-	
-					   f_cf03Up();
-	
-					   //Send Trigger Message
-					   f_sendUtPrimitive(p_utRequest,p_action);
-	
-					   //Test behavior
-					   tc_ac.start;
-					   alt{
-						   [] mcaPort.receive(mw_request(p_response)) -> value v_request {
-							   tc_ac.stop;
-							   setverdict(pass, __SCOPE__, " : AE registration request is accepted!!");
-							   //v_responsePrimitive := valueof(m_responsePrimitiveTemp(int2000, omit));
-							   v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+						//primitives for mcaPortIn
+						var MsgIn v_request;
+						var ResponsePrimitive v_responsePrimitive;	
+						f_cf03Up();
 	
-							   //send back responsePrimitive
-							   mcaPort.send(m_response(v_responsePrimitive));
-						   }
-						   [] mcaPort.receive(mw_request(mw_createAe(*,?,m_contentCreateAe_Invalid))) -> value v_request {
-							   tc_ac.stop;
-							   setverdict(fail, __SCOPE__, " : AE registration request is rejected due to not including the optional attribute!");
-						   }
-						   [] tc_ac.timeout{
-							   setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
-						   }
+						//Send Trigger Message
+						f_sendUtPrimitive(p_utRequest,p_action);
 	
-					   }
+								//Test behavior
+								tc_ac.start;
+								alt{
+									[] mcaPortIn.receive(mw_request(p_response)) -> value v_request {
+										tc_ac.stop;
+										setverdict(pass, __SCOPE__, " : AE registration request is accepted!!");
+										//v_responsePrimtive := valueof(m_responsePrimitiveTemp(int2000, omit));
+										v_responsePrimtive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));	
+								//send back responsePrimitive
+								mcaPortIn.send(m_response(v_responsePrimtive));
+							}
+							[] mcaPortIn.receive(mw_request(mw_createAe(*,?,m_contentCreateAe_Invalid))) -> value v_request {
+								tc_ac.stop;
+								setverdict(fail, __SCOPE__, " : AE registration request is rejected due to not including the optional attribute!");
+							}
+							[] tc_ac.timeout{
+								setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+							}	
+						}
 	
-					   // Postamble
-					   f_cf03Down();
-			   		}
+						// Postamble
+						f_cf03Down();
+					}
 				
 				}//End of subgroup AE_REG_CRE_002
 				
@@ -928,7 +916,7 @@ module OneM2M_Testcases_AE {
 			
 			group Delete {
 			
-			/**
+				/**
 				 * @desc Check that the IUT sends AE deregistration request to CSE
 				 */
 	
@@ -949,7 +937,7 @@ module OneM2M_Testcases_AE {
 					//Test behavior
 					tc_ac.start;
 					alt{
-						[] mcaPort.receive(mw_request(mw_deleteRequest)) -> value v_request {
+						[] mcaPortIn.receive(mw_request(mw_deleteRequest)) -> value v_request {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__, " : AE deregistration request is accepted!");
 	
@@ -957,9 +945,8 @@ module OneM2M_Testcases_AE {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
 	
 							//send back responsePrimitive
-							mcaPort.send(m_response(v_responsePrimitive));
-						}
-						[] mcaPort.receive {
+							mcaPortIn.send(m_response(v_responsePrimitive));						}
+						[] mcaPortIn.receive {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__, " : Error while AE deregistration");
 						}
@@ -1000,7 +987,7 @@ module OneM2M_Testcases_AE {
 					//Test behavior
 					tc_ac.start;
 					alt{
-						[] mcaPort.receive(mw_request(mw_createContainer)) -> value v_request {
+						[] mcaPortIn.receive(mw_request(mw_createContainer)) -> value v_request {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__, " : Container creation request is accepted!");
 	
@@ -1008,9 +995,8 @@ module OneM2M_Testcases_AE {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
 							
 							//send back responsePrimitive
-							mcaPort.send(m_response(v_responsePrimitive));
-						}
-						[] mcaPort.receive {
+							mcaPortIn.send(m_response(v_responsePrimitive));						}
+						[] mcaPortIn.receive {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__, " : Container creation request is rejected due to not including mandatory attributes!!");
 						}
@@ -1045,7 +1031,7 @@ module OneM2M_Testcases_AE {
 					alt{
 	
 						//receive MsgIn requestPrimitive
-						[] mcaPort.receive(mw_request(mw_createContentInstance)) -> value v_request {
+						[] mcaPortIn.receive(mw_request(mw_createContentInstance)) -> value v_request {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__, " : ContentInstance creation request is accepted!!");
 							
@@ -1053,10 +1039,9 @@ module OneM2M_Testcases_AE {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
 	
 							//send back responsePrimitive
-							mcaPort.send(m_response(v_responsePrimitive));
-						}
+							mcaPortIn.send(m_response(v_responsePrimtive));						}
 	
-						[] mcaPort.receive {
+						[] mcaPortIn.receive {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__, " : ContentInstance creation request is rejected due to not including mandatory attributes!!");
 						}
@@ -1071,10 +1056,10 @@ module OneM2M_Testcases_AE {
 				}
 				
 				/**
-				 * @desc Check that the IUT sends a ContentInstance creation request with optional attribute ATTRIBUTE_NAME 
+				 * @desc Check that the IUT sends a ContentInstance creation request with optional attribute ATTRIBUTE_NAME
 				 */
 				 
-				 group g_AE_DMR_CRE_003 {
+				group g_AE_DMR_CRE_003 {
 				 
 					testcase TC_AE_DMR_CRE_003_CNF() runs on CseSimu system AeSystem {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
@@ -1136,7 +1121,7 @@ module OneM2M_Testcases_AE {
 						alt{
 	
 							//receive MsgIn requestPrimitive
-							[] mcaPort.receive(mw_request(p_request)) {
+							[] mcaPortIn.receive(mw_request(p_request)) {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__, " : ContentInstance creation request is accepted!!");
 	
@@ -1144,10 +1129,9 @@ module OneM2M_Testcases_AE {
 								v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
 	
 								//send back responsePrimitive
-								mcaPort.send(m_response(v_responsePrimitive));
-							}
+								mcaPortIn.send(m_response(v_responsePrimitive));							}
 	
-							[] mcaPort.receive {
+							[] mcaPortIn.receive {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__, " : ContentInstance creation request is rejected due to not including the attribute!");
 							}
@@ -1161,7 +1145,7 @@ module OneM2M_Testcases_AE {
 						f_cf03Down();
 					}
 				 
-				 }//End of subgroup AE_DMR_CRE_003
+				}//End of subgroup AE_DMR_CRE_003
 				 
 				 
 				 				
@@ -1169,9 +1153,9 @@ module OneM2M_Testcases_AE {
 				 * @desc Check that the IUT sends a Container creation request with optional attribute ATTRIBUTE_NAME when it is triggered
 				 */
 				 
-				 group g_AE_DMR_CRE_004 {
+				group g_AE_DMR_CRE_004 {
 				 
-				 	testcase TC_AE_DMR_CRE_004_ACPI() runs on CseSimu system AeSystem {
+					testcase TC_AE_DMR_CRE_004_ACPI() runs on CseSimu system AeSystem {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 						var template RequestPrimitive v_request := mw_createContainer;
 						var charstring v_action := "Please, send a valid CREATE Request for Container containing attribute AccessControlPolicyIDs";
@@ -1189,7 +1173,7 @@ module OneM2M_Testcases_AE {
 						f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
 					}
 				 	
-				 	testcase TC_AE_DMR_CRE_004_MBS() runs on CseSimu system AeSystem {
+					testcase TC_AE_DMR_CRE_004_MBS() runs on CseSimu system AeSystem {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 						var template RequestPrimitive v_request := mw_createContainer;
 						var charstring v_action := "Please, send a valid CREATE Request for Container containing attribute MaxByteSize";
@@ -1207,7 +1191,7 @@ module OneM2M_Testcases_AE {
 						f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
 					}
 				 	
-				 	testcase TC_AE_DMR_CRE_004_OR() runs on CseSimu system AeSystem {
+					testcase TC_AE_DMR_CRE_004_OR() runs on CseSimu system AeSystem {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 						var template RequestPrimitive v_request := mw_createContainer;
 						var charstring v_action := "Please, send a valid CREATE Request for Container containing attribute OntologyRef";
@@ -1267,7 +1251,7 @@ module OneM2M_Testcases_AE {
 						alt{
 	
 							//receive MsgIn requestPrimitive
-							[] mcaPort.receive(mw_request(p_request)) {
+							[] mcaPortIn.receive(mw_request(p_request)) {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__, " : Container creation request is accepted!!");
 	
@@ -1275,10 +1259,9 @@ module OneM2M_Testcases_AE {
 								v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
 	
 								//send back responsePrimitive
-								mcaPort.send(m_response(v_responsePrimitive));
-							}
+								mcaPortIn.send(m_response(v_responsePrimitive));							}
 	
-							[] mcaPort.receive {
+							[] mcaPortIn.receive {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__, " : Container creation request is rejected due to not including the attribute!");
 							}
@@ -1292,7 +1275,7 @@ module OneM2M_Testcases_AE {
 						f_cf03Down();
 					}
 				 
-				 }//End of subgroup AE_DMR_CRE_004
+				}//End of subgroup AE_DMR_CRE_004
 				 
 			}//End of subgroup Create
 			
@@ -1301,14 +1284,14 @@ module OneM2M_Testcases_AE {
 				group g_AE_DMR_UPD_001 {
 					
 					/**
-					 * @desc Check that the IUT sends an UPDATE Request with the value of the attribute ATTRIBUTE_NAME of the TARGET_RESOURCE_ADDRESS resource 
+					 * @desc Check that the IUT sends an UPDATE Request with the value of the attribute ATTRIBUTE_NAME of the TARGET_RESOURCE_ADDRESS resource
 					 */
 				
 					testcase TC_AE_DMR_UPD_001_LBL() runs on CseSimu system AeSystem {
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
 						var template RequestPrimitive v_request := mw_createContainer;
 						var charstring v_action := "Please, send a valid UPDATE Request for Container updating attribute labels";
-                        v_utRequest.primitiveContent.container.labels := {"UNINITIALIZED"};
+						v_utRequest.primitiveContent.container.labels := {"UNINITIALIZED"};
 						f_AE_DMR_UPD_001(v_utRequest,v_request,v_action);
 					}
 			
@@ -1328,7 +1311,7 @@ module OneM2M_Testcases_AE {
 						alt{
 			
 							//receive MsgIn requestPrimitive
-							[] mcaPort.receive(mw_request(p_request)) -> value v_request {
+							[] mcaPortIn.receive(mw_request(p_request)) -> value v_request {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__, " : Container update request is accepted!!");
 			
@@ -1339,11 +1322,10 @@ module OneM2M_Testcases_AE {
 									v_responsePrimitive := valueof(m_responsePrimitive(int2004, "To_be_defined", omit));
 			
 									//send back responsePrimitive
-									mcaPort.send(m_response(v_responsePrimitive));
-								}
+									mcaPortIn.send(m_response(v_responsePrimtive));								}
 							}
 			
-							[] mcaPort.receive {
+							[] mcaPortIn.receive {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__, " : Container update request is rejected due to not including the attribute!");
 							}
@@ -1362,10 +1344,10 @@ module OneM2M_Testcases_AE {
 				group g_AE_DMR_UPD_002 {
 					
 					/**
-					 * @desc Check that the IUT sends an UPDATE Request with the value of the attribute ATTRIBUTE_NAME of the AE resource 
+					 * @desc Check that the IUT sends an UPDATE Request with the value of the attribute ATTRIBUTE_NAME of the AE resource
 					 */
 	
-					testcase TC_AE_DMR_UPD_002_ET() runs on CseSimu system AeSystem {						
+					testcase TC_AE_DMR_UPD_002_ET() runs on CseSimu system AeSystem {
 						
 						var template UtTriggerPrimitive v_utRequest := m_updateAeBase;
 						var charstring v_action := "Please, send a valid UPDATE Request for AE updating attribute expirationTime";
@@ -1433,51 +1415,48 @@ module OneM2M_Testcases_AE {
 						f_AE_DMR_UPD_002(v_utRequestTestBody,v_action);
 					}
 	
-				   function f_AE_DMR_UPD_002(template UtTriggerPrimitive p_utRequestTestBody, in charstring p_action) runs on CseSimu {
+					function f_AE_DMR_UPD_002(template UtTriggerPrimitive p_utRequestTestBody, in charstring p_action) runs on CseSimu {
 	
-					   	//primitives for mcaPort
-					   	var MsgIn v_request;
-					   	var ResponsePrimitive v_responsePrimitive;
-					   	var integer v_aeIndex := -1;
-						var template RequestPrimitive v_expectedUpdateRequestAe := mw_updateAe();
+						//primitives for mcaPortIn
+						var MsgIn v_request;
+						var ResponsePrimitive v_responsePrimitive;
+						var integer v_aeIndex := -1;						var template RequestPrimitive v_expectedUpdateRequestAe := mw_updateAe();
 						
 	
-					   	f_cf03Up();
+						f_cf03Up();
 					   
-					   	//Preamble
-					   	v_aeIndex := f_ae_preamble_registerAe();
+						//Preamble
+						v_aeIndex := f_ae_preamble_registerAe();
 	
-					   	//Send Trigger Message
+						//Send Trigger Message
 						p_utRequestTestBody.to_ := f_getResourceAddress(v_aeIndex);
-					   	f_sendUtPrimitive(p_utRequestTestBody,p_action);
+						f_sendUtPrimitive(p_utRequestTestBody,p_action);
 	
-					   //Test behavior
+						//Test behavior
 					   
 						v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
 						v_expectedUpdateRequestAe.primitiveContent := f_getTemplateFromPrimitiveContent(p_utRequestTestBody.primitiveContent);
 					   
-					   tc_ac.start;
-					   alt{
-						   [] mcaPort.receive(mw_request(v_expectedUpdateRequestAe)) -> value v_request {
-							   tc_ac.stop;
-							   setverdict(pass, __SCOPE__, " : AE registration update request is accepted!");
-							   v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
-	
-							   //send back responsePrimitive
-							   mcaPort.send(m_response(v_responsePrimitive));
-						   }
-						   [] mcaPort.receive(mw_request(?)) -> value v_request {
-							   tc_ac.stop;
-							   setverdict(fail, __SCOPE__, " : AE registration update request is rejected due to not including the optional attribute!");
-						   }
-						   [] tc_ac.timeout{
-							   setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
-						   }
-	
-					   }
-	
-					   // Postamble
-					   f_cf03Down();
+						tc_ac.start;
+						alt{
+							[] mcaPortIn.receive(mw_request(v_expectedUpdateRequestAe)) -> value v_request {
+								tc_ac.stop;
+								setverdict(pass, __SCOPE__, " : AE registration update request is accepted!");
+								v_responsePrimitive := valueof(m_responsePrimitive(int2001, "T	
+								//send back responsePrimitive
+								mcaPortIn.send(m_response(v_responsePrimitive));
+							}
+							[] mcaPortIn.receive(mw_request(?)) -> value v_request {
+								tc_ac.stop;
+								setverdict(fail, __SCOPE__, " : AE registration update request is rejected due to not including the optional attribute!");
+							}
+							[] tc_ac.timeout{
+								setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+							}	
+						}
+	
+						// Postamble
+						f_cf03Down();
 					}
 	
 				}//End of subgroup AE_DMR_UPD_002
@@ -1485,7 +1464,7 @@ module OneM2M_Testcases_AE {
 				group g_AE_DMR_UPD_003 {
 					
 					/**
-					 * @desc Check that the IUT sends an UPDATE Request with the value of the attribute ATTRIBUTE_NAME of the <container> resource  
+					 * @desc Check that the IUT sends an UPDATE Request with the value of the attribute ATTRIBUTE_NAME of the <container> resource
 					 */
 					
 					testcase TC_AE_DMR_UPD_003_ET() runs on CseSimu system AeSystem {
@@ -1563,7 +1542,7 @@ module OneM2M_Testcases_AE {
 						alt{
 
 							//receive MsgIn requestPrimitive
-							[] mcaPort.receive(mw_request(p_request)) {
+							[] mcaPortIn.receive(mw_request(p_request)) {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__, " : Container update request is accepted!!");
 
@@ -1571,10 +1550,9 @@ module OneM2M_Testcases_AE {
 								v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
 
 								//send back responsePrimitive
-								mcaPort.send(m_response(v_responsePrimitive));
-							}
+								mcaPortIn.send(m_response(v_responsePrimitive));							}
 
-							[] mcaPort.receive {
+							[] mcaPortIn.receive {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__, " : Container update request is rejected due to not including the attribute!");
 							}
@@ -1597,20 +1575,26 @@ module OneM2M_Testcases_AE {
 				group g_AE_DMR_RET_001{
 							
 					/**
-					 * @desc Check that the IUT sends a RETRIEVE Request on the TARGET_RESOURCE_ADDRESS to CSE 
+					 * @desc Check that the IUT sends a RETRIEVE Request on the TARGET_RESOURCE_ADDRESS to CSE
 					 */
 	
-				 	testcase TC_AE_DMR_RET_001_CB() runs on CseSimu system AeSystem {
+					testcase TC_AE_DMR_RET_001_CB() runs on CseSimu system AeSystem {
 						var integer v_auxInteger := f_setResource(valueof(m_primitiveContentCSEBase(m_contentCreateCSEBase)), int5);
 						var charstring v_action := "Please, send a valid RETRIEVE Request for CSEBase";
 						f_AE_DMR_RET_001(int5, f_getResourceAddress(v_auxInteger),v_action);
-				 	}
+					}
 				 	
 					testcase TC_AE_DMR_RET_001_AE() runs on CseSimu system AeSystem {
 						var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
 						var charstring v_action := "Please, send a valid RETRIEVE Request for AE";
 						f_AE_DMR_RET_001(int2, f_getResourceAddress(v_auxInteger),v_action);
 					}
+					
+					testcase TC_AE_DMR_RET_001_CNT() runs on CseSimu system AeSystem {
+						var integer v_auxInteger := f_setResource(valueof(m_primitiveContentContainer(m_contentCreateContainer())), int3);
+						var charstring v_action := "Please, send a valid RETRIEVE Request for Container";
+						f_AE_DMR_RET_001(int3, f_getResourceAddress(v_auxInteger),v_action);
+					}
 	
 					function f_AE_DMR_RET_001(ResourceType p_resourceType, XSD.AnyURI p_address, in charstring p_action) runs on CseSimu {
 		
@@ -1629,7 +1613,7 @@ module OneM2M_Testcases_AE {
 						//Test behavior
 						tc_ac.start;
 						alt{
-							[] mcaPort.receive(mw_request(mw_retrieveResource(p_address))) -> value v_request {
+							[] mcaPortIn.receive(mw_request(mw_retrieveResource(p_address))) -> value v_request {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__, " : retrieve ressource type " & int2str(enum2int(v_request.primitive.requestPrimitive.resourceType)) & " request is accepted!!");
 								
@@ -1637,10 +1621,9 @@ module OneM2M_Testcases_AE {
 								v_responsePrimitive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
 		
 								//send back responsePrimitive
-								mcaPort.send(m_response(v_responsePrimitive));
-								tc_ac.stop;
+								mcaPortIn.send(m_response(v_responsePrimitive));								tc_ac.stop;
 							}
-							[] mcaPort.receive {
+							[] mcaPortIn.receive {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__, " : error while retrieving ressource !");
 							}
@@ -1679,7 +1662,7 @@ module OneM2M_Testcases_AE {
 					//Test behavior
 					tc_ac.start;
 					alt{
-						[] mcaPort.receive(mw_request(mw_retrieveResource(v_address & "/" & c_resourceShortNameOldest))) -> value v_request {
+						[] mcaPortIn.receive(mw_request(mw_retrieveResource(v_address & "/" & c_resourceShortNameOldest))) -> value v_request {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__, " : retrieve attribute oldest request is accepted!");
 	
@@ -1687,10 +1670,9 @@ module OneM2M_Testcases_AE {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
 	
 							//send back responsePrimitive
-							mcaPort.send(m_response(v_responsePrimitive));
-							tc_ac.stop;
+							mcaPortIn.send(m_response(v_responsePrimitive));							tc_ac.stop;
 						}
-						[] mcaPort.receive {
+						[] mcaPortIn.receive {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__, " : error while retrieving attribute !");
 						}
@@ -1727,7 +1709,7 @@ module OneM2M_Testcases_AE {
 					//Test behavior
 					tc_ac.start;
 					alt{
-						[] mcaPort.receive(mw_request(mw_retrieveResource(v_address & "/" & c_resourceShortNameLatest))) -> value v_request {
+						[] mcaPortIn.receive(mw_request(mw_retrieveResource(v_address & "/" & c_resourceShortNameLatest))) -> value v_request {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__, " : retrieve attribute latest request is accepted!!");
 	
@@ -1735,10 +1717,9 @@ module OneM2M_Testcases_AE {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
 	
 							//send back responsePrimitive
-							mcaPort.send(m_response(v_responsePrimitive));
-							tc_ac.stop;
+							mcaPortIn.send(m_response(v_responsePrimitive));							tc_ac.stop;
 						}
-						[] mcaPort.receive {
+						[] mcaPortIn.receive {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__, " : error while retrieving attribute !");
 						}
@@ -1776,7 +1757,7 @@ module OneM2M_Testcases_AE {
 					//Test behavior
 					tc_ac.start;
 					alt{
-						[] mcaPort.receive(mw_request(mw_retrieveResource(v_address))) -> value v_request {
+						[] mcaPortIn.receive(mw_request(mw_retrieveResource(v_address))) -> value v_request {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__, " : retrieve ressource type " & int2str(enum2int(v_request.primitive.requestPrimitive.resourceType)) & " request is accepted!!");
 			
@@ -1784,10 +1765,9 @@ module OneM2M_Testcases_AE {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
 
 							//send back responsePrimitive
-							mcaPort.send(m_response(v_responsePrimitive));
-							tc_ac.stop;
+							mcaPortIn.send(m_response(v_responsePrimitive));							tc_ac.stop;
 						}
-						[] mcaPort.receive {
+						[] mcaPortIn.receive {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__, " : error while retrieving ressource !");
 						}
@@ -1825,7 +1805,7 @@ module OneM2M_Testcases_AE {
 					//Test behavior
 					tc_ac.start;
 					alt{
-						[] mcaPort.receive(mw_request(mw_retrieveResource(v_address))) -> value v_request {
+						[] mcaPortIn.receive(mw_request(mw_retrieveResource(v_address))) -> value v_request {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__, " : retrieve ressource type " & int2str(enum2int(v_request.primitive.requestPrimitive.resourceType)) & " request is accepted!!");
 
@@ -1833,10 +1813,9 @@ module OneM2M_Testcases_AE {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
 
 							//send back responsePrimitive
-							mcaPort.send(m_response(v_responsePrimitive));
-							tc_ac.stop;
+							mcaPortIn.send(m_response(v_responsePrimitive));							tc_ac.stop;
 						}
-						[] mcaPort.receive {
+						[] mcaPortIn.receive {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__, " : error while retrieving ressource !");
 						}
@@ -1877,7 +1856,7 @@ module OneM2M_Testcases_AE {
 					//Test behavior
 					tc_ac.start;
 					alt{
-						[] mcaPort.receive(mw_request(mw_deleteRequest(v_address & "/" & c_resourceShortNameOldest))) -> value v_request {
+						[] mcaPortIn.receive(mw_request(mw_deleteRequest(v_address & "/" & c_resourceShortNameOldest))) -> value v_request {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__, " : delete attribute oldest request is accepted!!");
 
@@ -1885,10 +1864,9 @@ module OneM2M_Testcases_AE {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2002, "To_be_defined", omit));
 
 							//send back responsePrimitive
-							mcaPort.send(m_response(v_responsePrimitive));
-							tc_ac.stop;
+							mcaPortIn.send(m_response(v_responsePrimitive));							tc_ac.stop;
 						}
-						[] mcaPort.receive {
+						[] mcaPortIn.receive {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__, " : error while deleting attribute !");
 						}
@@ -1925,7 +1903,7 @@ module OneM2M_Testcases_AE {
 					//Test behavior
 					tc_ac.start;
 					alt{
-						[] mcaPort.receive(mw_request(mw_deleteRequest(v_address & "/" & c_resourceShortNameLatest))) -> value v_request {
+						[] mcaPortIn.receive(mw_request(mw_deleteRequest(v_address & "/" & c_resourceShortNameLatest))) -> value v_request {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__, " : delete attribute latest request is accepted!!");
 
@@ -1933,10 +1911,9 @@ module OneM2M_Testcases_AE {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2002, "To_be_defined", omit));
 
 							//send back responsePrimitive
-							mcaPort.send(m_response(v_responsePrimitive));
-							tc_ac.stop;
+							mcaPortIn.send(m_response(v_responsePrimitive));							tc_ac.stop;
 						}
-						[] mcaPort.receive {
+						[] mcaPortIn.receive {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__, " : error while deleting attribute !");
 						}
@@ -1974,7 +1951,7 @@ module OneM2M_Testcases_AE {
 					//Test behavior
 					tc_ac.start;
 					alt{
-						[] mcaPort.receive(mw_request(mw_deleteRequest(v_address))) -> value v_request {
+						[] mcaPortIn.receive(mw_request(mw_deleteRequest(v_address))) -> value v_request {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__, " : delete ressource type " & int2str(enum2int(v_request.primitive.requestPrimitive.resourceType)) & " request is accepted!!");
 
@@ -1982,10 +1959,9 @@ module OneM2M_Testcases_AE {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2002, "To_be_defined", omit));
 
 							//send back responsePrimitive
-							mcaPort.send(m_response(v_responsePrimitive));
-							tc_ac.stop;
+							mcaPortIn.send(m_response(v_responsePrimitive));							tc_ac.stop;
 						}
-						[] mcaPort.receive {
+						[] mcaPortIn.receive {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__, " : error while deleting ressource !");
 						}
@@ -2023,7 +1999,7 @@ module OneM2M_Testcases_AE {
 					//Test behavior
 					tc_ac.start;
 					alt{
-						[] mcaPort.receive(mw_request(mw_deleteRequest(v_address))) -> value v_request {
+						[] mcaPortIn.receive(mw_request(mw_deleteRequest(v_address))) -> value v_request {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__, " : delete ressource type " & int2str(enum2int(v_request.primitive.requestPrimitive.resourceType)) & " request is accepted!!");
 
@@ -2031,10 +2007,9 @@ module OneM2M_Testcases_AE {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2002, "To_be_defined", omit));
 
 							//send back responsePrimitive
-							mcaPort.send(m_response(v_responsePrimitive));
-							tc_ac.stop;
+							mcaPortIn.send(m_response(v_responsePrimtive));							tc_ac.stop;
 						}
-						[] mcaPort.receive {
+						[] mcaPortIn.receive {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__, " : error while deleting ressource !");
 						}
@@ -2063,43 +2038,39 @@ module OneM2M_Testcases_AE {
 				testcase TC_AE_SUB_CRE_001() runs on CseSimu system AeSystem {
 				
 					//variables
-				  	var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
-				  	var MsgIn v_request;
-				  	var ResponsePrimitive v_responsePrimitive;
-					var charstring v_action := "Please, send a valid subscription creation request";
+					var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
+					var MsgIn v_request;
+					var ResponsePrimitive v_responsePrimitive;					var charstring v_action := "Please, send a valid subscription creation request";
 				  	
 					var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
 					v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
 
-				  	f_cf03Up();
+					f_cf03Up();
 
-				  	//send triggering primitive to SUT
-				  	f_sendUtPrimitive(v_utRequest,v_action);
-				  	
-				  	//Test behavior
-				  	tc_ac.start;
-				  	alt{
-						[] mcaPort.receive(mw_request(mw_createSubscription)) -> value v_request {
+					//send triggering primtive to SUT
+					f_sendUtPrimitive(v_utRequest,v_action);				  	
+					//Test behavior
+					tc_ac.start;
+					alt{
+						[] mcaPortIn.receive(mw_request(mw_createSubscription)) -> value v_request {
 							tc_ac.stop;
-						  	setverdict(pass, __SCOPE__, " : Subscription creation request is accepted!");
+							setverdict(pass, __SCOPE__, " : Subscription creation request is accepted!");
 
-						  	//set responseStatusCode back to SUT
-						 	v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
-		
-						  	//send back responsePrimitive
-						  	mcaPort.send(m_response(v_responsePrimitive));
-					  	}
-					  	[] mcaPort.receive {
-						  	tc_ac.stop;
-						  	setverdict(fail, __SCOPE__, " : Subscription creation request is rejected due to not including mandatory attributes!!");
-					  	}
-					  	[] tc_ac.timeout{
-						 	setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
-					  	}
-				  	}
-
-				  	// Postamble
-				  	f_cf03Down();
+							//set responseStatusCode back to SUT
+							v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));		
+							//send back responsePrimitive
+							mcaPortIn.send(m_response(v_responsePrimitive));
+						}
+						[] mcaPortIn.receive {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__, " : Subscription creation request is rejected due to not including mandatory attributes!!");
+						}
+						[] tc_ac.timeout{
+							setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+						}
+					}
+					// Postamble
+					f_cf03Down();
 				}
 				
 				group g_AE_SUB_CRE_002 {
@@ -2127,7 +2098,7 @@ module OneM2M_Testcases_AE {
 					
 					testcase TC_AE_SUB_CRE_002_ENC() runs on CseSimu system AeSystem {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
-                        var template RequestPrimitive v_requestT := mw_createSubscription;
+						var template RequestPrimitive v_requestT := mw_createSubscription;
 						var charstring v_action := "Please, send a valid subscription creation request with optional attribute createdBefore";
 						var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
 						v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
@@ -2240,7 +2211,7 @@ module OneM2M_Testcases_AE {
 						//Test behavior
 						tc_ac.start;
 						alt{
-							[] mcaPort.receive(mw_request(p_request)) -> value v_request {
+							[] mcaPortIn.receive(mw_request(p_request)) -> value v_request {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__, " : Subscription creation request is accepted!");
 
@@ -2248,9 +2219,8 @@ module OneM2M_Testcases_AE {
 								v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
 
 								//send back responsePrimitive
-								mcaPort.send(m_response(v_responsePrimitive));
-							}
-							[] mcaPort.receive {
+								mcaPortIn.send(m_response(v_responsePrimitive));							}
+							[] mcaPortIn.receive {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__, " : Subscription creation request is rejected due to not including the optional attribute!");
 							}
@@ -2291,16 +2261,15 @@ module OneM2M_Testcases_AE {
 					f_sendUtPrimitive(v_utRequest,v_action);
 					tc_ac.start;
 					alt{
-						[] mcaPort.receive(mw_request(mw_createAe)) -> value v_request {
+						[] mcaPortIn.receive(mw_request(mw_createAe)) -> value v_request {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__, " : AE registration request is accepted!!");
 							v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
 			
 							//send back responsePrimitive
-							mcaPort.send(m_response(v_responsePrimitive));
-						} 
-						[] mcaPort.receive(mw_request(mw_createAe(*,?,m_contentCreateAe_Invalid))) -> value v_request {
-							tc_ac.stop;
+							mcaPortIn.send(m_response(v_responsePrimitive));
+						}
+						[] mcaPortIn.receive(mw_request(mw_createAe(*,?,m_contentCreateAe_Invalid))) -> value v_request {							tc_ac.stop;
 							setverdict(inconc, __SCOPE__, " : AE registration request is rejected due to not including mandatory attributes!!");
 							stop;
 						}
@@ -2319,7 +2288,7 @@ module OneM2M_Testcases_AE {
 					
 					tc_ac.start;
 					alt{
-						[] mcaPort.receive(mw_request(mw_createSubscription)) -> value v_request {
+						[] mcaPortIn.receive(mw_request(mw_createSubscription)) -> value v_request {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__, " : Subscription creation request is accepted!");
 
@@ -2327,9 +2296,8 @@ module OneM2M_Testcases_AE {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
 
 							//send back responsePrimitive
-							mcaPort.send(m_response(v_responsePrimitive));
-						}
-						[] mcaPort.receive {
+							mcaPortIn.send(m_response(v_responsePrimitive));						}
+						[] mcaPortIn.receive {
 							tc_ac.stop;
 							setverdict(inconc, __SCOPE__, " : Subscription creation request is rejected due to not including mandatory attributes!!");
 						}
@@ -2340,15 +2308,15 @@ module OneM2M_Testcases_AE {
 					
 
 					//Test behavior
-					mcaPort.send(m_request(m_notifyRequest));
+					mcaPortIn.send(m_request(m_notifyRequest));
 					
 					tc_ac.start;
 					alt{
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
+						[] mcaPortIn.receive(mw_response(mw_responsePrimitiveOK)) {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__, " : Notification response is accepted!");
 						}
-						[] mcaPort.receive {
+						[] mcaPortIn.receive {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__, " : Notification response is rejected due to not including mandatory attributes!");
 						}
@@ -2382,16 +2350,15 @@ module OneM2M_Testcases_AE {
 					f_sendUtPrimitive(v_utRequest,v_action);
 					tc_ac.start;
 					alt{
-						[] mcaPort.receive(mw_request(mw_createAe)) -> value v_request {
+						[] mcaPortIn.receive(mw_request(mw_createAe)) -> value v_request {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__, " : AE registration request is accepted!!");
 							v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
 			
 							//send back responsePrimitive
-							mcaPort.send(m_response(v_responsePrimitive));
-						} 
-						[] mcaPort.receive(mw_request(mw_createAe(*,?,m_contentCreateAe_Invalid))) -> value v_request {
-							tc_ac.stop;
+							mcaPortIn.send(m_response(v_responsePrimitive));
+						}
+						[] mcaPortIn.receive(mw_request(mw_createAe(*,?,m_contentCreateAe_Invalid))) -> value v_request {							tc_ac.stop;
 							setverdict(inconc, __SCOPE__, " : AE registration request is rejected due to not including mandatory attributes!!");
 							stop;
 						}
@@ -2410,7 +2377,7 @@ module OneM2M_Testcases_AE {
 					
 					tc_ac.start;
 					alt{
-						[] mcaPort.receive(mw_request(mw_createSubscription)) -> value v_request {
+						[] mcaPortIn.receive(mw_request(mw_createSubscription)) -> value v_request {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__, " : Subscription creation request is accepted!");
 
@@ -2418,9 +2385,8 @@ module OneM2M_Testcases_AE {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
 
 							//send back responsePrimitive
-							mcaPort.send(m_response(v_responsePrimitive));
-						}
-						[] mcaPort.receive {
+							mcaPortIn.send(m_response(v_responsePrimitive));						}
+						[] mcaPortIn.receive {
 							tc_ac.stop;
 							setverdict(inconc, __SCOPE__, " : Subscription creation request is rejected due to not including mandatory attributes!!");
 						}
@@ -2431,15 +2397,15 @@ module OneM2M_Testcases_AE {
 					
 
 					//Test behavior
-					mcaPort.send(m_request(m_notifyAggregatedRequest));
+					mcaPortIn.send(m_request(m_notifyAggregatedRequest));
 					
 					tc_ac.start;
 					alt{
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
+						[] mcaPortIn.receive(mw_response(mw_responsePrimitiveOK)) {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__, " : Notification response is accepted!");
 						}
-						[] mcaPort.receive {
+						[] mcaPortIn.receive {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__, " : Notification response is rejected due to not including mandatory attributes!");
 						}