diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 05386ab5ff773740cdba9b3d6897c6149491709a..0427a811d5c6e815bbb705cc40dd6e3b8136240b 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -103,6 +103,7 @@ module OneM2M_Functions {
 		function f_cf02UpCse1() runs on CseSimu {
 			
 			// Variables
+			var PrimitiveContent v_cSEBaseResource;
 			vc_config := e_cf02;
 			vc_testSystemRole := e_cse;		
 			
@@ -114,6 +115,9 @@ module OneM2M_Functions {
 			activate(a_default());
 			activate(a_cse_cf02_cse1());
 			
+			v_cSEBaseResource := f_cse_generateLocalResource(-, -1, int5);
+			vc_cSEBaseIndex := f_setLocalResource(v_cSEBaseResource, int5, -1);
+			
 			//Initialze the IUT
 							
 		} // end f_cf02UpCse1
@@ -124,7 +128,8 @@ module OneM2M_Functions {
 		function f_cf02UpCseSimuMaster() runs on CseSimu {
 				
 			// Variables
-			vc_config := e_cf02;
+			var PrimitiveContent v_cSEBaseResource;
+			vc_config := e_cf02CseSimuMaster;
 			vc_testSystemRole := e_cse;		
 			vc_ae1 := AeSimu.create("AE1") alive;
 				
@@ -136,6 +141,9 @@ module OneM2M_Functions {
 			activate(a_cse_cf02_cse1());
 			vc_ae1.start(f_cf02UpAe1());
 			vc_ae1.done;
+			
+			v_cSEBaseResource := f_cse_generateLocalResource(-, -1, int5);
+			vc_cSEBaseIndex := f_setLocalResource(v_cSEBaseResource, int5, -1);
 				
 			// Connect
 			
@@ -149,7 +157,7 @@ module OneM2M_Functions {
 		function f_cf02UpAe1() runs on AeSimu {
 			
 			// Variables
-			vc_config := e_cf02;	
+			vc_config := e_cf02CseSimuMaster;	
 			vc_testSystemRole := e_ae;		
 			
 			// Map
@@ -173,7 +181,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());
@@ -191,8 +199,10 @@ module OneM2M_Functions {
 		function f_cf04Up() runs on CseSimu {
 
 			// Variables
+			var PrimitiveContent v_cSEBaseResource;
 			vc_config := e_cf04;
-			vc_testSystemRole := e_cse;		
+			vc_testSystemRole := e_cse;	
+			
 	
 			// Map
 			map(self:mccPort, system:mccPort);
@@ -200,10 +210,15 @@ module OneM2M_Functions {
 			map(self:acPort, system:acPort);
 			activate(a_default());
 			activate(a_cse_cf04());
+			
+			//Creation of CSEBase
+			
+			v_cSEBaseResource := f_cse_generateLocalResource(-, -1, int5);
+			vc_cSEBaseIndex := f_setLocalResource(v_cSEBaseResource, int5, -1);
 
 			// Connect
 			
-			//Initialze the IUT
+			//Initialize the IUT
 			
 		} // end f_cf03Up
 
@@ -256,7 +271,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);
 		}
@@ -1262,10 +1277,10 @@ module OneM2M_Functions {
 
 			group NotificationFunctions { 
 				
-				/**
-				 * @desc Handling message exchange for the subscription verification
-				 * @param p_responseStatusCode Response Status Code to be used for the response to the verification request
-				 * @verdict 
+				/**
+				 * @desc Handling message exchange for the subscription verification
+				 * @param p_responseStatusCode Response Status Code to be used for the response to the verification request
+				 * @verdict 
 				 */
 				function f_cse_notifyProcedure_subscriptionVerificationHandler(in ResponseStatusCode p_responseStatusCode := int2001) runs on AeSimu {
 					// Local variables
@@ -1511,7 +1526,49 @@ module OneM2M_Functions {
     	
 					return v_matchResult;
     
-				} //end f_check_notificationContent	
+				} //end f_check_notificationContent
+				
+				/**
+				 * @desc Handling message exchange for the AE Annc update
+				 * @param p_responseStatusCode Response Status Code to be used for the response to the AE Annc request
+				 * @verdict 
+				 */
+				//TODO TO BE FINALIZED
+				function f_cse_notifyProcedure_updateHandler() runs on CseSimu {
+					// Local variables
+					var ResponsePrimitive v_responsePrimitive;
+					var template Notification v_notificationRequest := mw_contentNotification_any;
+	 
+
+					//Preparation of Notification response to be sent
+					v_responsePrimitive := valueof(m_responseNotification(int2004, omit));
+
+					tc_ac.start;
+					alt {
+						[] mccPortIn.receive(mw_request(mw_notify(v_notificationRequest))) -> value vc_request {
+							tc_ac.stop;
+							setverdict(pass, __SCOPE__ & ":INFO: Notification received");
+						}
+						[] mccPortIn.receive{
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ":ERROR: unexpected message received");
+							stop;
+						}
+						[] tc_ac.timeout {
+							setverdict(fail, __SCOPE__ & ":ERROR:  No notification received");
+							stop;
+						}
+					}
+		
+					v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
+					if(getverdict == pass) {
+						mccPortIn.send(m_httpResponse(v_responsePrimitive));
+					} else {
+						v_responsePrimitive.responseStatusCode := int4000; 
+						mccPortIn.send(m_httpResponse(v_responsePrimitive));
+					}
+
+				} //end f_cse_notifyProcedure_updateHandler	
 				
 			}// end of group NotificationFunctions 	
 			
@@ -1565,22 +1622,22 @@ module OneM2M_Functions {
 				alt {
 					[] mccPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response {
 						tc_ac.stop;
-						setverdict(pass, __SCOPE__&":INFO: Resource type RemoteCSE created successfuly");
+						setverdict(pass, __SCOPE__&":INFO: Resource type remoteCSE created successfuly");
 						f_checkAttributesToBeSaved(int16, v_request, v_response.primitive.responsePrimitive);
 						v_resourceIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int16, -1);
-						v_remoteCSEResource := f_cse_generateLocalResource(v_response.primitive.responsePrimitive.primitiveContent, 1, int16);
-						v_localResourceIndex := f_setLocalResource(v_remoteCSEResource, int16, -1);
+						v_remoteCSEResource := f_cse_generateLocalResource(v_response.primitive.responsePrimitive.primitiveContent, vc_cSEBaseIndex, int16);
+						v_localResourceIndex := f_setLocalResource(v_remoteCSEResource, int16, vc_cSEBaseIndex);
 					}
 					[] mccPort.receive(mw_response(mw_responsePrimitiveKO)) {
 						tc_ac.stop;
-						setverdict(inconc, __SCOPE__&":INFO: Error while creating resource type RemoteCSE");
+						setverdict(inconc, __SCOPE__&":INFO: Error while creating resource type remoteCSE");
 					}
 					[] mccPort.receive {
 						tc_ac.stop;
 						setverdict(inconc, __SCOPE__&":INFO: Unexpected message received");
 					}
 					[] tc_ac.timeout {
-						setverdict(inconc, __SCOPE__&":INFO: No answer while creating resource type RemoteCSE");
+						setverdict(inconc, __SCOPE__&":INFO: No answer while creating resource type remoteCSE");
 					}
 				}	
 
@@ -1602,29 +1659,34 @@ module OneM2M_Functions {
 				var PrimitiveContent v_remoteCSEResource;
 				var integer v_localResourceIndex := -1;
 				var integer v_resourceIndex := -1;
+				var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
+				var charstring v_action := "Please, send a CSE registration request";
+				
+				//send triggering primitive to SUT
+			  	f_sendUtPrimitive(v_utRequest,v_action);
 
 				tc_ac.start;
 				alt {
 					[] mccPortIn.receive(mw_request(p_requestPrimitive)) -> value v_request {
 						tc_ac.stop;
-						setverdict(pass, __SCOPE__&":INFO: Resource type RemoteCSE created successfuly");
-						v_remoteCSEResource := f_cse_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, 1, int16);//TODO Get index from v_request.primitive.requestPrimitive.to_
-						v_localResourceIndex := f_setLocalResource(v_remoteCSEResource, int16, -1);
+						setverdict(pass, __SCOPE__&":INFO: Resource type remoteCSE created successfuly");
+						v_remoteCSEResource := f_cse_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, vc_cSEBaseIndex, int16);//TODO Get index from v_request.primitive.requestPrimitive.to_
+						v_localResourceIndex := f_setLocalResource(v_remoteCSEResource, int16, vc_cSEBaseIndex);
 						
 						v_response := valueof(m_responsePrimitive(int2001,v_request.primitive.requestPrimitive.requestIdentifier));
 						v_response.from_ := PX_CSE1_ID;
 						v_response.to_ := v_request.primitive.requestPrimitive.from_;
 						v_response.primitiveContent.remoteCSE := vc_localResourcesList[v_localResourceIndex].resource.remoteCSE;
-						mccPort.send(m_response(v_response));
+						mccPortIn.send(m_response(v_response));
 						
-						v_resourceIndex := f_setResource(v_request.primitive.responsePrimitive.primitiveContent, int16, -1);
+						v_resourceIndex := f_setResource(v_request.primitive.requestPrimitive.primitiveContent, int16, -1);
 					}
 					[] mccPortIn.receive {
 						tc_ac.stop;
 						setverdict(inconc, __SCOPE__&":INFO: Unexpected message received");
 					}
 					[] tc_ac.timeout {
-						setverdict(inconc, __SCOPE__&":INFO: No request received for creating resource type RemoteCSE");
+						setverdict(inconc, __SCOPE__&":INFO: No request received for creating resource type remoteCSE");
 					}
 				}	
 
@@ -1670,24 +1732,41 @@ module OneM2M_Functions {
 			 * @param  p_resourceType      Type of the resource to be created
 			 * @return Internal created resource
 			 */
-			function f_cse_generateLocalResource(in PrimitiveContent p_resource, in integer p_parentIndex, in ResourceType p_resourceType) runs on CseSimu return PrimitiveContent {
+			function f_cse_generateLocalResource(in template(omit) PrimitiveContent p_resource := omit, in integer p_parentIndex, in ResourceType p_resourceType) runs on CseSimu return PrimitiveContent {
 
 				var integer v_resourceIndex := lengthof(vc_localResourcesList);
 				var PrimitiveContent v_myResource;
 				
 				// TODO To review the code (use of indexes, generation of value for certain attributes, etc..)
-				if(p_resourceType == int16 and ispresent(p_resource)) {
+				if(p_resourceType == int5) {	//CSEBase
+					v_myResource.cSEBase.resourceName := "CSEBase" & int2str(v_resourceIndex);
+					v_myResource.cSEBase.resourceType := p_resourceType;
+					v_myResource.cSEBase.resourceID := "CSEBase" & int2str(v_resourceIndex);
+					v_myResource.cSEBase.parentID := omit;		//Following TS-0001, it must be NULL
+					//v_myResource.cSEBase.creationTime := fx_generateTimestamp();
+					v_myResource.cSEBase.creationTime := "20171231T012345";
+					v_myResource.cSEBase.lastModifiedTime := v_myResource.cSEBase.creationTime;		
+					v_myResource.cSEBase.cSE_ID := PX_CSE1_ID;
+					v_myResource.cSEBase.supportedResourceType := PX_CSE1_SRT;
+					v_myResource.cSEBase.pointOfAccess := {f_getAnnouncementTargetPoA(PX_PROTOCOL_BINDING, PX_CSE1_ADDRESS, "")};
+					if (PX_MN_CSE){
+						v_myResource.cSEBase.cseType := int1;	//Tester is an IN-CSE
+					}else if (PX_IN_CSE){
+						v_myResource.cSEBase.cseType := int2;	//Tester is a MN-CSE
+					}
+					    
+				}else if(p_resourceType == int16 and ispresent(p_resource)) {			//RemoteCSE
 					if(ischosen(p_resource.remoteCSE)){
-						v_myResource.remoteCSE := p_resource.remoteCSE;
+						v_myResource.remoteCSE := valueof(p_resource.remoteCSE);
 						
 						if(not(ispresent(p_resource.remoteCSE.resourceName))) {
-							v_myResource.remoteCSE.resourceName := "remoteCSE" & int2char(v_resourceIndex);
+							v_myResource.remoteCSE.resourceName := "remoteCSE" & int2str(v_resourceIndex);
 						}
 						v_myResource.remoteCSE.resourceType := p_resourceType;
-						//v_myResource.remoteCSE.resourceID := "remoteCSE" & int2char(v_resourceIndex);
-						v_myResource.remoteCSE.resourceID := "remoteCSE";
+						v_myResource.remoteCSE.resourceID := "remoteCSE" & int2str(v_resourceIndex);
 						v_myResource.remoteCSE.parentID := f_getResourceId(vc_localResourcesList[p_parentIndex].resource);
-						v_myResource.remoteCSE.creationTime := fx_generateTimestamp();
+						//v_myResource.remoteCSE.creationTime := fx_generateTimestamp();
+						v_myResource.remoteCSE.creationTime := "20171231T012345";
 						if(not(ispresent(p_resource.remoteCSE.expirationTime))) {
 							v_myResource.remoteCSE.expirationTime := "20301231T012345";
 						}
@@ -1699,10 +1778,10 @@ module OneM2M_Functions {
 							//TODO Create a pollingChannel resource
 							v_myResource.remoteCSE.pointOfAccess := omit;
 						}	
-						if(vc_localResourcesList[v_resourceIndex].resourceType == int5) {
+						/*if(vc_localResourcesList[v_resourceIndex].resourceType == int5) {
 							v_myResource.remoteCSE.m2M_Ext_ID := omit;	
 							v_myResource.remoteCSE.trigger_Recipient_ID:= omit;
-						}
+						}*/
 						v_myResource.remoteCSE.nodeLink := omit;
 				    
 					}
@@ -2208,6 +2287,10 @@ module OneM2M_Functions {
 			if(ischosen(p_contentResource.serviceSubscribedAppRule)) {
 				return f_resourceIdCleaner(p_contentResource.serviceSubscribedAppRule.resourceID);
 			}
+			if(ischosen(p_contentResource.remoteCSE)) {
+				return f_resourceIdCleaner(p_contentResource.remoteCSE.resourceID);
+			}
+
 			log(__SCOPE__&":WARNING: Primitive Content Kind not implemented");
 			
 			return "resourceIDNotFound";
@@ -2720,27 +2803,10 @@ module OneM2M_Functions {
 	
 	group CommonFunctions {
 		
+
 		/**
-		 * @desc Sending of an Adapter Control primitive
-		 * @param event Action to be performed by TA
-		 * @param data Corresponding information for the correct execution of the given action
-		 * @verdict 
-		 */
-		function f_bool2str(in boolean p_bool) runs on Tester return charstring {
-	
-			var charstring v_bool;
-			if (p_bool){
-				v_bool := "true";
-			}else{
-				v_bool := "false";
-			}
-			return v_bool;
-		}
-		
-		/**
-		 * @desc Sending of an Adapter Control primitive
-		 * @param event Action to be performed by TA
-		 * @param data Corresponding information for the correct execution of the given action
+		 * @desc Boolean to charstring
+		 * @param p_bool
 		 * @verdict 
 		 */
 		function f_checkAeSimuStatus() runs on AeSimu {
@@ -2851,7 +2917,7 @@ module OneM2M_Functions {
 			
 			}else{
 				
-				action(__SCOPE__ & ":" & p_action);
+				action(p_action);
 			
 			}
 			
@@ -2941,11 +3007,11 @@ module OneM2M_Functions {
 			}
 		}
 		
-		/**
-		 * @desc Removal of an element from a given integer list
-		 * @param p_list Given integer list
-		 * @param p_valueToBeDeleted Element value to be removed
-		 * @verdict 
+		/**
+		 * @desc Removal of an element from a given integer list
+		 * @param p_list Given integer list
+		 * @param p_valueToBeDeleted Element value to be removed
+		 * @verdict 
 		 */
 		function f_removeElementFromList (inout IntegerList p_list, in integer p_valueToBeDeleted) {
 			var IntegerList result := {};
@@ -2958,11 +3024,11 @@ module OneM2M_Functions {
 			p_list := result;
 		}
 		
-		/**
-		 * @desc Build a reception template from the primitiveContent sent in previous request primitive
-		 * @param p_primitiveContent PrimitiveContent from previous request primitive
-		 * @return Built reception template
-		 * @verdict 
+		/**
+		 * @desc Build a reception template from the primitiveContent sent in previous request primitive
+		 * @param p_primitiveContent PrimitiveContent from previous request primitive
+		 * @return Built reception template
+		 * @verdict 
 		 */
 		function f_getTemplateFromPrimitiveContent (in template PrimitiveContent p_primitiveContent) return template PrimitiveContent{
 			var template PrimitiveContent v_primitiveContent := omit;
@@ -3216,11 +3282,11 @@ module OneM2M_Functions {
 			return v_primitiveContent;
 		}
 		
-		/**
-		 * @desc Comparison of two primitiveContent parameters
-		 * @param p_responsePrimitiveContent Received primitiveContent
-		 * @param p_requestPrimitiveContent Sent primitiveContent
-		 * @verdict 
+		/**
+		 * @desc Comparison of two primitiveContent parameters
+		 * @param p_responsePrimitiveContent Received primitiveContent
+		 * @param p_requestPrimitiveContent Sent primitiveContent
+		 * @verdict 
 		 */
 		function f_match2PrimitiveContent (in PrimitiveContent p_responsePrimitiveContent, in template PrimitiveContent p_requestPrimitiveContent) runs on Tester {
 			var template PrimitiveContent v_primitiveContent;
diff --git a/LibOneM2M/OneM2M_Pixits.ttcn b/LibOneM2M/OneM2M_Pixits.ttcn
index bc046b783d70ee46c07d37fffd73f7d5e91c5644..92e13bda6d0fd4aa8b3ca7aff8ed5a4653575c37 100644
--- a/LibOneM2M/OneM2M_Pixits.ttcn
+++ b/LibOneM2M/OneM2M_Pixits.ttcn
@@ -104,6 +104,11 @@ module OneM2M_Pixits {
 			 * @desc Test System CSE1 resource ID with Unstructured-CSE-relative-Resource-ID (relative) format according to TS-0001-7.2-1
 			 */			
 			modulepar XSD.ID PX_CSE1_RESOURCE_ID	:= "CSE1_RESOURCE_ID";
+			
+			/**
+			 * @desc CSE1 Supported resource type
+			 */	
+			modulepar ResourceTypeList_1 PX_CSE1_SRT := {int1, int2, int3, int16};
 			 
 			/**
 			 * @desc Test System M2M-SP1-ID with M2M-SP-ID format (absolute) according to TS-0001-7.2-1 Unstructured-CSE-relative -Resource-ID
diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index 200d7ec7709b5d0488bbaf75beaf51bd6593b5ef..f4f65c884f15ad94a28a206b72c209a2921102ce 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -547,7 +547,6 @@ module OneM2M_Templates {
 			 * @param p_stemId
 			 */
 			template (value) RequestPrimitive m_createAEAnnc(template (omit) AcpType p_accessControlPolicyIds := omit, template (omit) XSD.ID p_to := omit, template (omit) XSD.ID p_from := omit, XSD.ID p_appId, XSD.ID p_stemId := "") modifies m_create:= {
-				to_ := p_to,
 				from_ := p_from,//PX_AE_ID_STEM,//TODO We should use omit, "s", or "c"
 				requestIdentifier := testcasename() & "-m_createAEAnnc",
 				resourceType := int10002,
@@ -656,11 +655,19 @@ module OneM2M_Templates {
 			};
 			
 			/**
-			 * @desc CREATE request primitive for remoteCSE resource
+			 * @desc Reception template for CREATE RemoteCSE
+			 */
+			template RequestPrimitive mw_createRemoteCSE(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int16,
+				primitiveContent := {remoteCSE := ?}	//{remoteCSE := m_contentCreateRemoteCSE(p_resourceName, p_accessControlPolicyIds,p_cSEBase, p_cSE_ID)}
+			};
+			
+			/**
+			 * @desc Base reception template for CREATE RemoteCSE
 			 */
 			template RequestPrimitive mw_createRemoteCSEBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
 				resourceType := int16,
-				primitiveContent := ?//{remoteCSE := m_contentCreateRemoteCSE(p_resourceName, p_accessControlPolicyIds,p_cSEBase, p_cSE_ID)}
+				primitiveContent := {remoteCSE := mw_contentCreateRemoteCSEBase}
 			};
 			
 			/**
@@ -1821,7 +1828,7 @@ module OneM2M_Templates {
 		};
     	
 		/**
-		 * @desc Base primitiveContent for CREATE operation for Container resource
+		 * @desc Base primitiveContent for CREATE operation for RemoteCSE resource
 		 * @param p_name Resource name
 		 */
 		template (value) RemoteCSE_optional m_contentCreateRemoteCSE (in template (omit) XSD.String p_name := c_defaultRemoteCSEResourceName, in template (omit) AcpType p_accessControlPolicyIds, in template (omit) XSD.AnyURI p_cSEBase := PX_CSE1_ID, in template (omit) XSD.ID p_cSE_ID := PX_CSE1_ID):= {
@@ -1846,6 +1853,32 @@ module OneM2M_Templates {
 			nodeLink := omit,//O
 			choice := omit//O
 		};
+		
+		/**
+	  	* @desc Base reception template of primitiveContent for CREATE operation for remoteCSE resource
+	  	*/
+		template RemoteCSE_optional mw_contentCreateRemoteCSEBase := {
+			resourceName := *,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := *,//O
+			accessControlPolicyIDs := *,//O
+			expirationTime := *,//O
+			announceTo := *,//O
+			announcedAttribute := *,//O
+			cseType := *,//O
+			pointOfAccess := *,//O
+			cSEBase := ?,//M
+			cSE_ID := ?,//M
+			m2M_Ext_ID := *,//O
+			trigger_Recipient_ID := *,//O
+			requestReachability := ?,//M
+			nodeLink := *,//O
+			choice := *//O
+		};
     	
 		/**
 		* @desc Base reception template of primitiveContent for CREATE operation for ContainerAnnc resource
@@ -3721,7 +3754,8 @@ module OneM2M_Templates {
 		
 		template (value) UtTriggerPrimitive m_utCreateRemoteCSE modifies m_utCreate := {
 			requestIdentifier := testcasename() & "-m_utCreateRemoteCSE" & f_rnd(1, 1000000),
-			resourceType := int16
+			resourceType := int16,
+			primitiveContent := {remoteCSE := m_contentRemoteCSE_allOmit}
 		}
  		
 		template (value) UtTriggerPrimitive m_utRetrieveResource(XSD.ID p_targetResourceAddress, in XSD.ID p_originator) := {
diff --git a/LibOneM2M/OneM2M_TestSystem.ttcn b/LibOneM2M/OneM2M_TestSystem.ttcn
index c3fc66f1548c2cab2d69d25892c6de28fa3add3a..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;
 
@@ -62,6 +63,7 @@ module OneM2M_TestSystem {
 		var MyResourcesList vc_localResourcesList;
 		var AeSimu vc_ae1;//For CF02 when CseSimu is master
 		var integer vc_remoteCseIndex;
+		var integer vc_cSEBaseIndex;	//Index of the CSEBase resource of the Tester inside vc_localResourcesList
 	};
 	
 	type component InCseSimu extends CseSimu {}
diff --git a/LibOneM2M/OneM2M_Types.ttcn b/LibOneM2M/OneM2M_Types.ttcn
index 000bc30c660fbb4fc0038c53d32218b31eaa35ef..2958e489c470d8bae50559f3b320ad28c77866a7 100644
--- a/LibOneM2M/OneM2M_Types.ttcn
+++ b/LibOneM2M/OneM2M_Types.ttcn
@@ -5594,6 +5594,7 @@ group OtherTypes {
 	type enumerated Configurations {
 		e_cf01,
 		e_cf02,
+		e_cf02CseSimuMaster,
 		e_cf03,
 		e_cf04
 	};
diff --git a/OneM2M_TestControl_IN_profile.ttcn b/OneM2M_TestControl_IN_profile.ttcn
index 082f108f92e298710ee6d724c133c65fdd759ff6..c1758bcaa01c30a77f88d68564266e124cc69d7e 100644
--- a/OneM2M_TestControl_IN_profile.ttcn
+++ b/OneM2M_TestControl_IN_profile.ttcn
@@ -58,6 +58,13 @@ module OneM2M_TestControl_IN_profile {
 		execute(TC_CSE_REG_CRE_019());
 		execute(TC_CSE_REG_CRE_021());
 		execute(TC_CSE_REG_CRE_023());
+		execute(TC_CSE_REG_CRE_024());
+		execute(TC_CSE_REG_CRE_025());
+		execute(TC_CSE_REG_CRE_026_RN());
+		execute(TC_CSE_REG_CRE_026_ET());
+		execute(TC_CSE_REG_CRE_026_LBL());
+		execute(TC_CSE_REG_CRE_026_POA());
+		execute(TC_CSE_REG_CRE_026_NL());
 		execute(TC_CSE_REG_CRE_027());
 		execute(TC_CSE_REG_CRE_028_ET());
 		execute(TC_CSE_REG_CRE_028_LBL());
diff --git a/OneM2M_Testcases_AE.ttcn b/OneM2M_Testcases_AE.ttcn
index 0c92a548c2bb00e05770cab66d82ca4a7e1fb9e4..2db653ed26e597ae4908ca137dd0235ea1a38d4b 100644
--- a/OneM2M_Testcases_AE.ttcn
+++ b/OneM2M_Testcases_AE.ttcn
@@ -70,10 +70,10 @@ module OneM2M_Testcases_AE {
 					
 					function f_AE_GEN_CRE_001(PrimitiveScope p_primitiveScope) runs on CseSimu {
 						
-						var ResponsePrimitive v_responsePrimtive;
+						var ResponsePrimitive v_responsePrimitive;
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 						var UtTriggerAckPrimitive v_trigger_response;
-						var charstring v_action := "Please, send a valid CREATE Request for container containing To set to " & f_getResourceAddress(-1, e_nonHierarchical, p_primitiveScope);
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for container containing To set to " & f_getResourceAddress(-1, e_nonHierarchical, p_primitiveScope);
 						
 						if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
 							setverdict(inconc, __SCOPE__, ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
@@ -85,18 +85,18 @@ 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_responsePrimtive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
-								mcaPort.send(m_response(v_responsePrimtive));
+								v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+								mcaPortIn.send(m_response(v_responsePrimitive));
 							}
-							[] mcaPort.receive(mw_request(?)) {
+							[] mcaPortIn.receive(mw_request(?)) {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__, " : Error while creating container");
 								stop;
@@ -150,10 +150,10 @@ module OneM2M_Testcases_AE {
 
 					function f_AE_GEN_CRE_002(PrimitiveScope p_primitiveScope) runs on CseSimu {
 	
-						var ResponsePrimitive v_responsePrimtive;
+						var ResponsePrimitive v_responsePrimitive;
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 						var UtTriggerAckPrimitive v_trigger_response;
-						var charstring v_action := "Please, send a valid CREATE Request for container containing To set to " & f_getResourceAddress(-1, e_hierarchical, p_primitiveScope);
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for container containing To set to " & f_getResourceAddress(-1, e_hierarchical, p_primitiveScope);
 						
 						
 						//Test Control
@@ -167,19 +167,19 @@ 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_responsePrimtive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
-								mcaPort.send(m_response(v_responsePrimtive));
+								v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+								mcaPortIn.send(m_response(v_responsePrimitive));
 							}
-							[] mcaPort.receive(mw_request(?)) {
+							[] mcaPortIn.receive(mw_request(?)) {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__, " : Error while creating container");
 								stop;
@@ -241,11 +241,11 @@ module OneM2M_Testcases_AE {
 					
 					function f_AE_GEN_UPD_001(PrimitiveScope p_primitiveScope) runs on CseSimu {
 						
-						var ResponsePrimitive v_responsePrimtive;
+						var ResponsePrimitive v_responsePrimitive;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
 						var UtTriggerAckPrimitive v_trigger_response;
 						var integer v_auxInteger;
-						var charstring v_action := "Please, send a valid UPDATE Request for container containing To set to " & f_getResourceAddress(-1, e_nonHierarchical, p_primitiveScope);
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for container containing To set to " & f_getResourceAddress(-1, e_nonHierarchical, p_primitiveScope);
 						
 						
 						if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
@@ -259,18 +259,18 @@ 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_responsePrimtive := valueof(m_responsePrimitive(int2004, "To_be_defined", omit));
-								mcaPort.send(m_response(v_responsePrimtive));
+								v_responsePrimitive := valueof(m_responsePrimitive(int2004, "To_be_defined", omit));
+								mcaPortIn.send(m_response(v_responsePrimitive));
 							}
-							[] mcaPort.receive(mw_request(?)) {
+							[] mcaPortIn.receive(mw_request(?)) {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__, " : Error while updating container");
 								stop;
@@ -327,11 +327,11 @@ module OneM2M_Testcases_AE {
 
 					function f_AE_GEN_UPD_002(PrimitiveScope p_primitiveScope) runs on CseSimu {
 	
-						var ResponsePrimitive v_responsePrimtive;
+						var ResponsePrimitive v_responsePrimitive;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
 						var UtTriggerAckPrimitive v_trigger_response;
 						var integer v_auxInteger;
-						var charstring v_action := "Please, send a valid UPDATE Request for container containing To set to " & f_getResourceAddress(-1, e_hierarchical, p_primitiveScope);
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for container containing To set to " & f_getResourceAddress(-1, e_hierarchical, p_primitiveScope);
 						
 						if(not(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
 							setverdict(inconc, __SCOPE__, ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
@@ -344,18 +344,18 @@ 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_responsePrimtive := valueof(m_responsePrimitive(int2004, "To_be_defined", omit));
-								mcaPort.send(m_response(v_responsePrimtive));
+								v_responsePrimitive := valueof(m_responsePrimitive(int2004, "To_be_defined", omit));
+								mcaPortIn.send(m_response(v_responsePrimitive));
 							}
-							[] mcaPort.receive(mw_request(?)) {
+							[] mcaPortIn.receive(mw_request(?)) {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__, " : Error while updating container");
 								stop;
@@ -417,12 +417,12 @@ module OneM2M_Testcases_AE {
 		
 					function f_AE_GEN_RET_001(PrimitiveScope p_primitiveScope) runs on CseSimu {
 			
-						var ResponsePrimitive v_responsePrimtive;
+						var ResponsePrimitive v_responsePrimitive;
 						var template UtTriggerPrimitive v_utRequestTemplate;
                         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);
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for container containing To set to " & f_getResourceAddress(-1, e_nonHierarchical, p_primitiveScope);
 						
 						if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
 							setverdict(inconc, __SCOPE__, ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
@@ -439,14 +439,14 @@ module OneM2M_Testcases_AE {
 			
 						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_responsePrimtive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
-								mcaPort.send(m_response(v_responsePrimtive));
+								v_responsePrimitive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
+								mcaPortIn.send(m_response(v_responsePrimitive));
 							}
-							[] mcaPort.receive(mw_request(?)) {
+							[] mcaPortIn.receive(mw_request(?)) {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__, " : Error while retrieving container");
 								stop;
@@ -503,12 +503,12 @@ module OneM2M_Testcases_AE {
 
 					function f_AE_GEN_RET_002(PrimitiveScope p_primitiveScope) runs on CseSimu {
 
-						var ResponsePrimitive v_responsePrimtive;
+						var ResponsePrimitive v_responsePrimitive;
 						var template UtTriggerPrimitive v_utRequestTemplate;
                         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);
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for container containing To set to " & f_getResourceAddress(-1, e_hierarchical, p_primitiveScope);
 						
 						if(not(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
 							setverdict(inconc, __SCOPE__, ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
@@ -521,18 +521,18 @@ module OneM2M_Testcases_AE {
 						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);				
+						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_responsePrimtive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
-								mcaPort.send(m_response(v_responsePrimtive));
+								v_responsePrimitive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
+								mcaPortIn.send(m_response(v_responsePrimitive));
 							}
-							[] mcaPort.receive(mw_request(?)) {
+							[] mcaPortIn.receive(mw_request(?)) {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__, " : Error while retrieving container");
 								stop;
@@ -594,11 +594,11 @@ module OneM2M_Testcases_AE {
 		
 					function f_AE_GEN_DEL_001(PrimitiveScope p_primitiveScope) runs on CseSimu {
 			
-						var ResponsePrimitive v_responsePrimtive;
+						var ResponsePrimitive v_responsePrimitive;
 						var template UtTriggerPrimitive v_utRequest := m_utDeleteRequest;
 						var UtTriggerAckPrimitive v_trigger_response;
 						var integer v_auxInteger;
-						var charstring v_action := "Please, send a valid DELETE Request for container containing To set to " & f_getResourceAddress(-1, e_nonHierarchical, p_primitiveScope);
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid DELETE Request for container containing To set to " & f_getResourceAddress(-1, e_nonHierarchical, p_primitiveScope);
 
 						if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
 							setverdict(inconc, __SCOPE__, ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
@@ -611,18 +611,18 @@ 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_responsePrimtive := valueof(m_responsePrimitive(int2004, "To_be_defined", omit));
-								mcaPort.send(m_response(v_responsePrimtive));
+								v_responsePrimitive := valueof(m_responsePrimitive(int2004, "To_be_defined", omit));
+								mcaPortIn.send(m_response(v_responsePrimitive));
 							}
-							[] mcaPort.receive(mw_request(?)) {
+							[] mcaPortIn.receive(mw_request(?)) {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__, " : Error while updating container");
 								stop;
@@ -679,11 +679,11 @@ module OneM2M_Testcases_AE {
 
 					function f_AE_GEN_DEL_002(PrimitiveScope p_primitiveScope) runs on CseSimu {
 
-						var ResponsePrimitive v_responsePrimtive;
+						var ResponsePrimitive v_responsePrimitive;
 						var template UtTriggerPrimitive v_utRequest := m_utDeleteRequest;
 						var UtTriggerAckPrimitive v_trigger_response;
 						var integer v_auxInteger;
-						var charstring v_action := "Please, send a valid DELETE Request for container containing To set to " & f_getResourceAddress(-1, e_hierarchical, p_primitiveScope);
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid DELETE Request for container containing To set to " & f_getResourceAddress(-1, e_hierarchical, p_primitiveScope);
 						
 						if(not(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
 							setverdict(inconc, __SCOPE__, ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
@@ -695,20 +695,20 @@ 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_responsePrimtive := valueof(m_responsePrimitive(int2004, "To_be_defined", omit));
-								mcaPort.send(m_response(v_responsePrimtive));
+								v_responsePrimitive := valueof(m_responsePrimitive(int2004, "To_be_defined", omit));
+								mcaPortIn.send(m_response(v_responsePrimitive));
 							}
-							[] mcaPort.receive(mw_request(?)) {
+							[] mcaPortIn.receive(mw_request(?)) {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__, " : Error while updating container");
 								stop;
@@ -742,10 +742,10 @@ 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_responsePrimtive;
-					var charstring v_action := "Please, send a valid AE CREATE Registration Request";
+					var ResponsePrimitive v_responsePrimitive;
+					var charstring v_action :=  __SCOPE__ & ": Please, send a valid AE CREATE Registration Request";
 
 					f_cf03Up();
 				
@@ -755,16 +755,16 @@ 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_responsePrimtive := valueof(m_responsePrimitiveTemp(int2000, omit));
-							v_responsePrimtive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+							//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_responsePrimtive));
+							mcaPortIn.send(m_response(v_responsePrimitive));
 						}
-						[] mcaPort.receive(mw_request(mw_createAe(*,?,m_contentCreateAe_Invalid))) -> value v_request {
+						[] 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!!");
 						}
@@ -788,7 +788,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 ResourceName"; 
+						var charstring v_action :=  __SCOPE__ & ": 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 +798,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 :=  __SCOPE__ & ": 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,8 +807,8 @@ 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 charstring v_action := "Please, send a valid AE CREATE Registration Request containing attribute Labels";
+						var template RequestPrimitive v_createAe := mw_createAe;
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute Labels";
 						v_utRequest.primitiveContent.aE.labels := {"UNINITIALIZED"};
 						v_createAe.primitiveContent.aE.labels := ?;
 						f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
@@ -818,7 +818,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 :=  __SCOPE__ & ": 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 +828,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 :=  __SCOPE__ & ": 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,8 +837,8 @@ 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 charstring v_action := "Please, send a valid AE CREATE Registration Request containing attribute PointOfAccess";
+						var template RequestPrimitive v_createAe := mw_createAe;
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute PointOfAccess";
 						v_utRequest.primitiveContent.aE.pointOfAccess := {"UNINITIALIZED"};
 						v_createAe.primitiveContent.aE.pointOfAccess := ?;
 						f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
@@ -847,8 +847,8 @@ 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 charstring v_action := "Please, send a valid AE CREATE Registration Request containing attribute OntologyRef";
+						var template RequestPrimitive v_createAe := mw_createAe;
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute OntologyRef";
 						v_utRequest.primitiveContent.aE.ontologyRef := "UNINITIALIZED";
 						v_createAe.primitiveContent.aE.ontologyRef := ?;
 						f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
@@ -857,8 +857,8 @@ 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 charstring v_action := "Please, send a valid AE CREATE Registration Request containing attribute NodeLink";
+						var template RequestPrimitive v_createAe := mw_createAe;
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute NodeLink";
 						v_utRequest.primitiveContent.aE.nodeLink := "UNINITIALIZED";
 						v_createAe.primitiveContent.aE.nodeLink := ?;
 						f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
@@ -867,8 +867,8 @@ 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 charstring v_action := "Please, send a valid AE CREATE Registration Request containing attribute RequestReachability";
+						var template RequestPrimitive v_createAe := mw_createAe;
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute RequestReachability";
 						v_utRequest.primitiveContent.aE.requestReachability := true;
 						v_createAe.primitiveContent.aE.requestReachability := ?;
 						f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
@@ -877,8 +877,8 @@ 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 charstring v_action := "Please, send a valid AE CREATE Registration Request containing attribute ContentSerialization";
+						var template RequestPrimitive v_createAe := mw_createAe;
+						var charstring v_action :=  __SCOPE__ & ": 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);
@@ -886,9 +886,9 @@ module OneM2M_Testcases_AE {
 	
 				   function f_AE_REG_CRE_002(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_response, in charstring p_action) runs on CseSimu {
 	
-					   //primitives for mcaPort
+						//primitives for mcaPortIn
 					   var MsgIn v_request;
-					   var ResponsePrimitive v_responsePrimtive;
+						var ResponsePrimitive v_responsePrimitive;
 	
 					   f_cf03Up();
 	
@@ -898,16 +898,16 @@ module OneM2M_Testcases_AE {
 					   //Test behavior
 					   tc_ac.start;
 					   alt{
-						   [] mcaPort.receive(mw_request(p_response)) -> value v_request {
+							[] 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));
+								//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_responsePrimtive));
+								mcaPortIn.send(m_response(v_responsePrimitive));
 						   }
-						   [] mcaPort.receive(mw_request(mw_createAe(*,?,m_contentCreateAe_Invalid))) -> value v_request {
+							[] 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!");
 						   }
@@ -936,8 +936,8 @@ module OneM2M_Testcases_AE {
 	
 					//variables
 					var MsgIn v_request;
-					var ResponsePrimitive v_responsePrimtive;
-					var charstring v_action := "Please, send a valid AE DELETE Registration Request";
+					var ResponsePrimitive v_responsePrimitive;
+					var charstring v_action :=  __SCOPE__ & ": Please, send a valid AE DELETE Registration Request";
 					
 					//primitives for utPort
 					var template UtTriggerPrimitive v_utRequest := mw_deleteRequest;
@@ -949,17 +949,17 @@ 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!");
 	
-							//v_responsePrimtive := valueof(m_responsePrimitiveTemp(int2000, omit));
-							v_responsePrimtive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+							//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_responsePrimtive));
+							mcaPortIn.send(m_response(v_responsePrimitive));
 						}
-						[] mcaPort.receive {
+						[] mcaPortIn.receive {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__, " : Error while AE deregistration");
 						}
@@ -989,28 +989,28 @@ module OneM2M_Testcases_AE {
 					//variables
 					var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 					var MsgIn v_request;
-					var ResponsePrimitive v_responsePrimtive;
-					var charstring v_action := "Please, send a valid CREATE Request for container";
+					var ResponsePrimitive v_responsePrimitive;
+					var charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for container";
 					
 					f_cf03Up();
 	
-					//send triggering primtive to SUT
+					//send triggering primitive to SUT
 					f_sendUtPrimitive(v_utRequest,v_action);
 					
 					//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!");
 	
 							//set responseStatusCode back to SUT
-							v_responsePrimtive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+							v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
 							
 							//send back responsePrimitive
-							mcaPort.send(m_response(v_responsePrimtive));
+							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 mandatory attributes!!");
 						}
@@ -1031,13 +1031,13 @@ module OneM2M_Testcases_AE {
 	
 					var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
 					var MsgIn v_request;
-					var ResponsePrimitive v_responsePrimtive;
-					var charstring v_action := "Please, send a valid CREATE Request for ContentInstance";
+					var ResponsePrimitive v_responsePrimitive;
+					var charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance";
 	
 					//Test component configuration
 					f_cf03Up();
 	
-					//send triggering primtive to SUT
+					//send triggering primitive to SUT
 					f_sendUtPrimitive(v_utRequest,v_action);
 	
 					//Test behavior
@@ -1045,18 +1045,18 @@ 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!!");
 							
 							//set responseStatusCode back to SUT
-							v_responsePrimtive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+							v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
 	
 							//send back responsePrimitive
-							mcaPort.send(m_response(v_responsePrimtive));
+							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 mandatory attributes!!");
 						}
@@ -1071,7 +1071,7 @@ 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 {
@@ -1079,7 +1079,7 @@ module OneM2M_Testcases_AE {
 					testcase TC_AE_DMR_CRE_003_CNF() runs on CseSimu system AeSystem {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
 						var template RequestPrimitive v_request := mw_createContentInstance;
-						var charstring v_action := "Please, send a valid CREATE Request for ContentInstance containing attribute ContentInfo";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute ContentInfo";
 						v_utRequest.primitiveContent.contentInstance.contentInfo := "UNINITIALIZED";
 						v_request.primitiveContent.contentInstance.contentInfo := ?;
 						f_AE_DMR_CRE_003(v_utRequest,v_request,v_action);
@@ -1088,7 +1088,7 @@ module OneM2M_Testcases_AE {
 					testcase TC_AE_DMR_CRE_003_RN() runs on CseSimu system AeSystem {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
 						var template RequestPrimitive v_request := mw_createContentInstance;
-						var charstring v_action := "Please, send a valid CREATE Request for ContentInstance containing attribute ResourceName";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute ResourceName";
 						v_utRequest.primitiveContent.contentInstance.resourceName := "UNINITIALIZED";
 						v_request.primitiveContent.contentInstance.resourceName := ?;
 						f_AE_DMR_CRE_003(v_utRequest,v_request,v_action);
@@ -1097,7 +1097,7 @@ module OneM2M_Testcases_AE {
 					testcase TC_AE_DMR_CRE_003_ET() runs on CseSimu system AeSystem {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
 						var template RequestPrimitive v_request := mw_createContentInstance;
-						var charstring v_action := "Please, send a valid CREATE Request for ContentInstance containing attribute ExpirationTime";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute ExpirationTime";
 						v_utRequest.primitiveContent.contentInstance.expirationTime := "20301231T012345";
 						v_request.primitiveContent.contentInstance.expirationTime := ?;
 						f_AE_DMR_CRE_003(v_utRequest,v_request,v_action);
@@ -1106,7 +1106,7 @@ module OneM2M_Testcases_AE {
 					testcase TC_AE_DMR_CRE_003_LBL() runs on CseSimu system AeSystem {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
 						var template RequestPrimitive v_request := mw_createContentInstance;
-						var charstring v_action := "Please, send a valid CREATE Request for ContentInstance containing attribute Labels";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute Labels";
 						v_utRequest.primitiveContent.contentInstance.labels := {"UNINITIALIZED"};
 						v_request.primitiveContent.contentInstance.labels := ?;
 						f_AE_DMR_CRE_003(v_utRequest,v_request,v_action);
@@ -1115,7 +1115,7 @@ module OneM2M_Testcases_AE {
 					testcase TC_AE_DMR_CRE_003_CR() runs on CseSimu system AeSystem {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
 						var template RequestPrimitive v_request := mw_createContentInstance;
-						var charstring v_action := "Please, send a valid CREATE Request for ContentInstance containing attribute Creator";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute Creator";
 						v_utRequest.primitiveContent.contentInstance.creator := "UNINITIALIZED";
 						v_request.primitiveContent.contentInstance.creator := ?;
 						f_AE_DMR_CRE_003(v_utRequest,v_request,v_action);
@@ -1123,12 +1123,12 @@ module OneM2M_Testcases_AE {
 	
 					function f_AE_DMR_CRE_003(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in charstring p_action) runs on CseSimu {
 	
-						var ResponsePrimitive v_responsePrimtive;
+						var ResponsePrimitive v_responsePrimitive;
 	
 						//Test component configuration
 						f_cf03Up();
 	
-						//send triggering primtive to SUT
+						//send triggering primitive to SUT
 						f_sendUtPrimitive(p_utRequest,p_action);
 	
 						//Test behavior
@@ -1136,18 +1136,18 @@ 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!!");
 	
 								//set responseStatusCode back to SUT
-								v_responsePrimtive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+								v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
 	
 								//send back responsePrimitive
-								mcaPort.send(m_response(v_responsePrimtive));
+								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!");
 							}
@@ -1174,7 +1174,7 @@ module OneM2M_Testcases_AE {
 				 	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";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute AccessControlPolicyIDs";
 						v_utRequest.primitiveContent.container.accessControlPolicyIDs := {"UNINITIALIZED"};
 						v_request.primitiveContent.container.accessControlPolicyIDs := ?;
 						f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
@@ -1183,7 +1183,7 @@ module OneM2M_Testcases_AE {
 					testcase TC_AE_DMR_CRE_004_MNI() 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 MaxNrOfInstances";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute MaxNrOfInstances";
 						v_utRequest.primitiveContent.container.maxNrOfInstances := 1;
 						v_request.primitiveContent.container.maxNrOfInstances := ?;
 						f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
@@ -1192,7 +1192,7 @@ module OneM2M_Testcases_AE {
 				 	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";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute MaxByteSize";
 						v_utRequest.primitiveContent.container.maxByteSize := 1;
 						v_request.primitiveContent.container.maxByteSize := ?;
 						f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
@@ -1201,7 +1201,7 @@ module OneM2M_Testcases_AE {
 					testcase TC_AE_DMR_CRE_004_MIA() 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 MaxInstanceAge";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute MaxInstanceAge";
 						v_utRequest.primitiveContent.container.maxInstanceAge := 1;
 						v_request.primitiveContent.container.maxInstanceAge := ?;
 						f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
@@ -1210,7 +1210,7 @@ module OneM2M_Testcases_AE {
 				 	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";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute OntologyRef";
 						v_utRequest.primitiveContent.container.ontologyRef := "UNINITIALIZED";
 						v_request.primitiveContent.container.ontologyRef := ?;
 						f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
@@ -1219,7 +1219,7 @@ module OneM2M_Testcases_AE {
 					testcase TC_AE_DMR_CRE_004_RN() 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 ResourceName";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute ResourceName";
 						v_utRequest.primitiveContent.container.resourceName := "UNINITIALIZED";
 						v_request.primitiveContent.container.resourceName := ?;
 						f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
@@ -1228,7 +1228,7 @@ module OneM2M_Testcases_AE {
 					testcase TC_AE_DMR_CRE_004_ET() 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 ExpirationTime";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute ExpirationTime";
 						v_utRequest.primitiveContent.container.expirationTime := "20301231T012345";
 						v_request.primitiveContent.container.expirationTime := ?;
 						f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
@@ -1237,7 +1237,7 @@ module OneM2M_Testcases_AE {
 					testcase TC_AE_DMR_CRE_004_LBL() 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 Labels";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute Labels";
 						v_utRequest.primitiveContent.container.labels := {"UNINITIALIZED"};
 						v_request.primitiveContent.container.labels := ?;
 						f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
@@ -1246,7 +1246,7 @@ module OneM2M_Testcases_AE {
 					testcase TC_AE_DMR_CRE_004_CR() 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 Creator";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute Creator";
 						v_utRequest.primitiveContent.container.creator := "UNINITIALIZED";
 						v_request.primitiveContent.container.creator := ?;
 						f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
@@ -1254,12 +1254,12 @@ module OneM2M_Testcases_AE {
 	
 					function f_AE_DMR_CRE_004(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in charstring p_action) runs on CseSimu {
 	
-						var ResponsePrimitive v_responsePrimtive;
+						var ResponsePrimitive v_responsePrimitive;
 	
 						//Test component configuration
 						f_cf03Up();
 	
-						//send triggering primtive to SUT
+						//send triggering primitive to SUT
 						f_sendUtPrimitive(p_utRequest,p_action);
 	
 						//Test behavior
@@ -1267,18 +1267,18 @@ 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!!");
 	
 								//set responseStatusCode back to SUT
-								v_responsePrimtive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+								v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
 	
 								//send back responsePrimitive
-								mcaPort.send(m_response(v_responsePrimtive));
+								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!");
 							}
@@ -1327,7 +1327,7 @@ module OneM2M_Testcases_AE {
 					testcase TC_AE_DMR_UPD_001_APN() 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 appName";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute appName";
 						
 						v_utRequest.primitiveContent.aE.appName := "UNINITIALIZED";
 						
@@ -1337,7 +1337,7 @@ module OneM2M_Testcases_AE {
 					testcase TC_AE_DMR_UPD_001_POA() 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 pointOfAccess";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute pointOfAccess";
 						
 						v_utRequest.primitiveContent.aE.pointOfAccess := {"http://127.0.0.1:1400/monitor"};
 						
@@ -1347,7 +1347,7 @@ module OneM2M_Testcases_AE {
 					testcase TC_AE_DMR_UPD_001_OR() 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 ontologyRef";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute ontologyRef";
 						
 						v_utRequest.primitiveContent.aE.ontologyRef := "MyOntologyRef";
 						
@@ -1357,7 +1357,7 @@ module OneM2M_Testcases_AE {
 					testcase TC_AE_DMR_UPD_001_NL() 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 nodeLink";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute nodeLink";
 						
 						v_utRequest.primitiveContent.aE.nodeLink := "/CSE_ID/S-AE-ID-STEM";
 						
@@ -1366,7 +1366,7 @@ module OneM2M_Testcases_AE {
 	
 					testcase TC_AE_DMR_UPD_001_RR() 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 requestReachability";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute requestReachability";
 						
 						v_utRequest.primitiveContent.aE.requestReachability := true;
 						
@@ -1375,7 +1375,7 @@ module OneM2M_Testcases_AE {
 	
 					testcase TC_AE_DMR_UPD_001_CSZ() runs on CseSimu system AeSystem {
 						var template UtTriggerPrimitive v_utRequestTestBody := m_updateAeBase;
-						var charstring v_action := "Please, send a valid UPDATE Request for AE updating attribute contentSerialization";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute contentSerialization";
 						
 						v_utRequestTestBody.primitiveContent.aE.contentSerialization := {applicationxml};
 						
@@ -1384,9 +1384,9 @@ module OneM2M_Testcases_AE {
 	
 				   function f_AE_DMR_UPD_001(template UtTriggerPrimitive p_utRequestTestBody, in charstring p_action) runs on CseSimu {
 	
-					   	//primitives for mcaPort
+						//primitives for mcaPortIn
 					   	var MsgIn v_request;
-					   	var ResponsePrimitive v_responsePrimtive;
+						var ResponsePrimitive v_responsePrimitive;
 					   	var integer v_aeIndex := -1;
 						var template RequestPrimitive v_expectedUpdateRequestAe := mw_updateAe();
 						
@@ -1407,15 +1407,15 @@ module OneM2M_Testcases_AE {
 					   
 					   tc_ac.start;
 					   alt{
-						   [] mcaPort.receive(mw_request(v_expectedUpdateRequestAe)) -> value v_request {
+							[] mcaPortIn.receive(mw_request(v_expectedUpdateRequestAe)) -> value v_request {
 							   tc_ac.stop;
 							   setverdict(pass, __SCOPE__, " : AE registration update request is accepted!");
-							   v_responsePrimtive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+								v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
 	
 							   //send back responsePrimitive
-							   mcaPort.send(m_response(v_responsePrimtive));
+								mcaPortIn.send(m_response(v_responsePrimitive));
 						   }
-						   [] mcaPort.receive(mw_request(?)) -> value v_request {
+							[] 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!");
 						   }
@@ -1434,7 +1434,7 @@ 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 <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_002_ET() runs on CseSimu system AeSystem {
@@ -1442,7 +1442,7 @@ module OneM2M_Testcases_AE {
 						
 						var template RequestPrimitive v_request := mw_updateContainer;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
-						var charstring v_action := "Please, send a valid UPDATE Request for Container updating attribute expirationTime";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute expirationTime";
 						v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
 						v_utRequest.primitiveContent.container.expirationTime := "20301231T012345";
 						v_request.primitiveContent.container.expirationTime := ?;
@@ -1454,7 +1454,7 @@ module OneM2M_Testcases_AE {
 						
 						var template RequestPrimitive v_request := mw_updateContainer;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
-						var charstring v_action := "Please, send a valid UPDATE Request for Container updating attribute labels";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute labels";
 						v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
 						v_utRequest.primitiveContent.container.labels := {"UNINITIALIZED"};
 						v_request.primitiveContent.container.labels := ?;
@@ -1466,7 +1466,7 @@ module OneM2M_Testcases_AE {
 						
 						var template RequestPrimitive v_request := mw_updateContainer;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
-						var charstring v_action := "Please, send a valid UPDATE Request for Container updating attribute maxNrOfInstances";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute maxNrOfInstances";
 						v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
 						v_utRequest.primitiveContent.container.maxNrOfInstances := 1;
 						v_request.primitiveContent.container.maxNrOfInstances := ?;
@@ -1478,7 +1478,7 @@ module OneM2M_Testcases_AE {
 						
 						var template RequestPrimitive v_request := mw_updateContainer;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
-						var charstring v_action := "Please, send a valid UPDATE Request for Container updating attribute maxByteSize";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute maxByteSize";
 						v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
 						v_utRequest.primitiveContent.container.maxByteSize := 1;
 						v_request.primitiveContent.container.maxByteSize := ?;
@@ -1489,7 +1489,7 @@ module OneM2M_Testcases_AE {
 						var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
 						var template RequestPrimitive v_request := mw_updateContainer;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
-						var charstring v_action := "Please, send a valid UPDATE Request for Container updating attribute maxInstanceAge";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute maxInstanceAge";
                         
 						v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
 						v_utRequest.primitiveContent.container.maxInstanceAge := 1;
@@ -1499,12 +1499,12 @@ module OneM2M_Testcases_AE {
 
 					function f_AE_DMR_UPD_002(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in charstring p_action) runs on CseSimu {
 
-						var ResponsePrimitive v_responsePrimtive;
+						var ResponsePrimitive v_responsePrimitive;
 
 						//Test component configuration
 						f_cf03Up();
 
-						//send triggering primtive to SUT
+						//send triggering primitive to SUT
 						f_sendUtPrimitive(p_utRequest,p_action);
 
 						//Test behavior
@@ -1512,18 +1512,18 @@ 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!!");
 
 								//set responseStatusCode back to SUT
-								v_responsePrimtive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+								v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
 
 								//send back responsePrimitive
-								mcaPort.send(m_response(v_responsePrimtive));
+								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!");
 							}
@@ -1546,50 +1546,56 @@ 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 {
 						var integer v_auxInteger := f_setResource(valueof(m_primitiveContentCSEBase(m_contentCreateCSEBase)), int5);
-						var charstring v_action := "Please, send a valid RETRIEVE Request for CSEBase";
+						var charstring v_action :=  __SCOPE__ & ": 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";
+						var charstring v_action :=  __SCOPE__ & ": 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 :=  __SCOPE__ & ": 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 {
 		
 						//variables
 						var template UtTriggerPrimitive v_utRequest := m_utRetrieveResource (p_address, "UNINITIALIZED");
 						var MsgIn v_request;
-						var ResponsePrimitive v_responsePrimtive;
+						var ResponsePrimitive v_responsePrimitive;
 		
 						//Test component configuration
 						f_cf03Up();
 		
-						//send triggering primtive to SUT
+						//send triggering primitive to SUT
 						v_utRequest.resourceType := p_resourceType;
 						f_sendUtPrimitive(v_utRequest,p_action);
 						
 						//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!!");
 								
 								//set responseStatusCode back to SUT
-								v_responsePrimtive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
+								v_responsePrimitive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
 		
 								//send back responsePrimitive
-								mcaPort.send(m_response(v_responsePrimtive));
+								mcaPortIn.send(m_response(v_responsePrimitive));
 								tc_ac.stop;
 							}
-							[] mcaPort.receive {
+							[] mcaPortIn.receive {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__, " : error while retrieving ressource !");
 							}
@@ -1616,30 +1622,30 @@ module OneM2M_Testcases_AE {
 					//variables
 					var template UtTriggerPrimitive v_utRequest := m_utRetrieveResource (v_address & "/" & c_resourceShortNameOldest, "UNINITIALIZED");
 					var MsgIn v_request;
-					var ResponsePrimitive v_responsePrimtive;
-					var charstring v_action := "Please, send a valid RETRIEVE Request for retrieving the 'oldest' attribute from Container";
+					var ResponsePrimitive v_responsePrimitive;
+					var charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for retrieving the 'oldest' attribute from Container";
 	
 					//Test component configuration
 					f_cf03Up();
 	
-					//send triggering primtive to SUT
+					//send triggering primitive to SUT
 					f_sendUtPrimitive(v_utRequest,v_action);
 	
 					//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!");
 	
 							//set responseStatusCode back to SUT
-							v_responsePrimtive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
+							v_responsePrimitive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
 	
 							//send back responsePrimitive
-							mcaPort.send(m_response(v_responsePrimtive));
+							mcaPortIn.send(m_response(v_responsePrimitive));
 							tc_ac.stop;
 						}
-						[] mcaPort.receive {
+						[] mcaPortIn.receive {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__, " : error while retrieving attribute !");
 						}
@@ -1664,30 +1670,30 @@ module OneM2M_Testcases_AE {
 					//variables
 					var template UtTriggerPrimitive v_utRequest := m_utRetrieveResource (v_address & "/" & c_resourceShortNameLatest, "UNINITIALIZED");
 					var MsgIn v_request;
-					var ResponsePrimitive v_responsePrimtive;
-					var charstring v_action := "Please, send a valid RETRIEVE Request for retrieving the 'latest' attribute from Container";
+					var ResponsePrimitive v_responsePrimitive;
+					var charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for retrieving the 'latest' attribute from Container";
 	
 					//Test component configuration
 					f_cf03Up();
 	
-					//send triggering primtive to SUT
+					//send triggering primitive to SUT
 					f_sendUtPrimitive(v_utRequest,v_action);
 	
 					//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!!");
 	
 							//set responseStatusCode back to SUT
-							v_responsePrimtive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
+							v_responsePrimitive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
 	
 							//send back responsePrimitive
-							mcaPort.send(m_response(v_responsePrimtive));
+							mcaPortIn.send(m_response(v_responsePrimitive));
 							tc_ac.stop;
 						}
-						[] mcaPort.receive {
+						[] mcaPortIn.receive {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__, " : error while retrieving attribute !");
 						}
@@ -1712,31 +1718,31 @@ module OneM2M_Testcases_AE {
 					//variables
 					var template UtTriggerPrimitive v_utRequest := m_utRetrieveResource (v_address, "UNINITIALIZED");
 					var MsgIn v_request;
-					var ResponsePrimitive v_responsePrimtive;
-					var charstring v_action := "Please, send a valid RETRIEVE Request for retrieving the Container";
+					var ResponsePrimitive v_responsePrimitive;
+					var charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for retrieving the Container";
 
 					//Test component configuration
 					f_cf03Up();
 
-					//send triggering primtive to SUT
+					//send triggering primitive to SUT
 					v_utRequest.resourceType := int3;
 					f_sendUtPrimitive(v_utRequest,v_action);
 	
 					//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!!");
 			
 							//set responseStatusCode back to SUT
-							v_responsePrimtive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
+							v_responsePrimitive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
 
 							//send back responsePrimitive
-							mcaPort.send(m_response(v_responsePrimtive));
+							mcaPortIn.send(m_response(v_responsePrimitive));
 							tc_ac.stop;
 						}
-						[] mcaPort.receive {
+						[] mcaPortIn.receive {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__, " : error while retrieving ressource !");
 						}
@@ -1761,31 +1767,31 @@ module OneM2M_Testcases_AE {
 					//variables
 					var template UtTriggerPrimitive v_utRequest := m_utRetrieveResource (v_address, "UNINITIALIZED");
 					var MsgIn v_request;
-					var ResponsePrimitive v_responsePrimtive;
-					var charstring v_action := "Please, send a valid RETRIEVE Request for retrieving the contentInstance";
+					var ResponsePrimitive v_responsePrimitive;
+					var charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for retrieving the contentInstance";
 
 					//Test component configuration
 					f_cf03Up();
 
-					//send triggering primtive to SUT
+					//send triggering primitive to SUT
 					v_utRequest.resourceType := int4;
 					f_sendUtPrimitive(v_utRequest,v_action);
 
 					//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!!");
 
 							//set responseStatusCode back to SUT
-							v_responsePrimtive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
+							v_responsePrimitive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
 
 							//send back responsePrimitive
-							mcaPort.send(m_response(v_responsePrimtive));
+							mcaPortIn.send(m_response(v_responsePrimitive));
 							tc_ac.stop;
 						}
-						[] mcaPort.receive {
+						[] mcaPortIn.receive {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__, " : error while retrieving ressource !");
 						}
@@ -1814,30 +1820,30 @@ module OneM2M_Testcases_AE {
 					//variables
 					var template UtTriggerPrimitive v_utRequest := m_utDeleteResource (v_address & "/" & c_resourceShortNameOldest, "UNINITIALIZED");
 					var MsgIn v_request;
-					var ResponsePrimitive v_responsePrimtive;
-					var charstring v_action := "Please, send a valid DELETE Request for deleting the 'oldest' attribute from contentInstance";
+					var ResponsePrimitive v_responsePrimitive;
+					var charstring v_action :=  __SCOPE__ & ": Please, send a valid DELETE Request for deleting the 'oldest' attribute from contentInstance";
 
 					//Test component configuration
 					f_cf03Up();
 
-					//send triggering primtive to SUT
+					//send triggering primitive to SUT
 					f_sendUtPrimitive(v_utRequest,v_action);
 
 					//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!!");
 
 							//set responseStatusCode back to SUT
-							v_responsePrimtive := valueof(m_responsePrimitive(int2002, "To_be_defined", omit));
+							v_responsePrimitive := valueof(m_responsePrimitive(int2002, "To_be_defined", omit));
 
 							//send back responsePrimitive
-							mcaPort.send(m_response(v_responsePrimtive));
+							mcaPortIn.send(m_response(v_responsePrimitive));
 							tc_ac.stop;
 						}
-						[] mcaPort.receive {
+						[] mcaPortIn.receive {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__, " : error while deleting attribute !");
 						}
@@ -1862,30 +1868,30 @@ module OneM2M_Testcases_AE {
 					//variables
 					var template UtTriggerPrimitive v_utRequest := m_utDeleteResource (v_address & "/" & c_resourceShortNameLatest, "UNINITIALIZED");
 					var MsgIn v_request;
-					var ResponsePrimitive v_responsePrimtive;
-					var charstring v_action := "Please, send a valid DELETE Request for deleting the 'latest' attribute from contentInstance";
+					var ResponsePrimitive v_responsePrimitive;
+					var charstring v_action :=  __SCOPE__ & ": Please, send a valid DELETE Request for deleting the 'latest' attribute from contentInstance";
 
 					//Test component configuration
 					f_cf03Up();
 
-					//send triggering primtive to SUT
+					//send triggering primitive to SUT
 					f_sendUtPrimitive(v_utRequest,v_action);
 
 					//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!!");
 
 							//set responseStatusCode back to SUT
-							v_responsePrimtive := valueof(m_responsePrimitive(int2002, "To_be_defined", omit));
+							v_responsePrimitive := valueof(m_responsePrimitive(int2002, "To_be_defined", omit));
 
 							//send back responsePrimitive
-							mcaPort.send(m_response(v_responsePrimtive));
+							mcaPortIn.send(m_response(v_responsePrimitive));
 							tc_ac.stop;
 						}
-						[] mcaPort.receive {
+						[] mcaPortIn.receive {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__, " : error while deleting attribute !");
 						}
@@ -1910,31 +1916,31 @@ module OneM2M_Testcases_AE {
 					//variables
 					var template UtTriggerPrimitive v_utRequest := m_utDeleteResource (v_address, "UNINITIALIZED");
 					var MsgIn v_request;
-					var ResponsePrimitive v_responsePrimtive;
-					var charstring v_action := "Please, send a valid DELETE Request for deleting the container resource";
+					var ResponsePrimitive v_responsePrimitive;
+					var charstring v_action :=  __SCOPE__ & ": Please, send a valid DELETE Request for deleting the container resource";
 
 					//Test component configuration
 					f_cf03Up();
 
-					//send triggering primtive to SUT
+					//send triggering primitive to SUT
 					v_utRequest.resourceType := int3;
 					f_sendUtPrimitive(v_utRequest,v_action);
 
 					//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!!");
 
 							//set responseStatusCode back to SUT
-							v_responsePrimtive := valueof(m_responsePrimitive(int2002, "To_be_defined", omit));
+							v_responsePrimitive := valueof(m_responsePrimitive(int2002, "To_be_defined", omit));
 
 							//send back responsePrimitive
-							mcaPort.send(m_response(v_responsePrimtive));
+							mcaPortIn.send(m_response(v_responsePrimitive));
 							tc_ac.stop;
 						}
-						[] mcaPort.receive {
+						[] mcaPortIn.receive {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__, " : error while deleting ressource !");
 						}
@@ -1959,31 +1965,31 @@ module OneM2M_Testcases_AE {
 					//variables
 					var template UtTriggerPrimitive v_utRequest := m_utDeleteResource (v_address, "UNINITIALIZED");
 					var MsgIn v_request;
-					var ResponsePrimitive v_responsePrimtive;
-					var charstring v_action := "Please, send a valid DELETE Request for deleting the contentInstance resource";
+					var ResponsePrimitive v_responsePrimitive;
+					var charstring v_action :=  __SCOPE__ & ": Please, send a valid DELETE Request for deleting the contentInstance resource";
 
 					//Test component configuration
 					f_cf03Up();
 
-					//send triggering primtive to SUT
+					//send triggering primitive to SUT
 					v_utRequest.resourceType := int4;
 					f_sendUtPrimitive(v_utRequest,v_action);
 
 					//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!!");
 
 							//set responseStatusCode back to SUT
-							v_responsePrimtive := valueof(m_responsePrimitive(int2002, "To_be_defined", omit));
+							v_responsePrimitive := valueof(m_responsePrimitive(int2002, "To_be_defined", omit));
 
 							//send back responsePrimitive
-							mcaPort.send(m_response(v_responsePrimtive));
+							mcaPortIn.send(m_response(v_responsePrimitive));
 							tc_ac.stop;
 						}
-						[] mcaPort.receive {
+						[] mcaPortIn.receive {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__, " : error while deleting ressource !");
 						}
@@ -2014,31 +2020,31 @@ module OneM2M_Testcases_AE {
 					//variables
 				  	var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
 				  	var MsgIn v_request;
-				  	var ResponsePrimitive v_responsePrimtive;
-					var charstring v_action := "Please, send a valid subscription creation request";
+					var ResponsePrimitive v_responsePrimitive;
+					var charstring v_action :=  __SCOPE__ & ": 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();
 
-				  	//send triggering primtive to SUT
+					//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 {
+						[] mcaPortIn.receive(mw_request(mw_createSubscription)) -> value v_request {
 							tc_ac.stop;
 						  	setverdict(pass, __SCOPE__, " : Subscription creation request is accepted!");
 
 						  	//set responseStatusCode back to SUT
-						 	v_responsePrimtive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+							v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
 		
 						  	//send back responsePrimitive
-						  	mcaPort.send(m_response(v_responsePrimtive));
+							mcaPortIn.send(m_response(v_responsePrimitive));
 					  	}
-					  	[] mcaPort.receive {
+						[] mcaPortIn.receive {
 						  	tc_ac.stop;
 						  	setverdict(fail, __SCOPE__, " : Subscription creation request is rejected due to not including mandatory attributes!!");
 					  	}
@@ -2060,7 +2066,7 @@ module OneM2M_Testcases_AE {
 					testcase TC_AE_SUB_CRE_002_ACPI() runs on CseSimu system AeSystem {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
 						var template RequestPrimitive v_requestT := mw_createSubscription;
-						var charstring v_action := "Please, send a valid subscription creation request with optional attribute accessControlPolicyIDs";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute accessControlPolicyIDs";
 
 						var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
 						v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
@@ -2077,7 +2083,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 charstring v_action := "Please, send a valid subscription creation request with optional attribute createdBefore";
+						var charstring v_action :=  __SCOPE__ & ": 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);
 						v_utRequest.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
@@ -2094,7 +2100,7 @@ module OneM2M_Testcases_AE {
 					testcase TC_AE_SUB_CRE_002_EXC() runs on CseSimu system AeSystem {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
 						var template RequestPrimitive v_requestT := mw_createSubscription;
-						var charstring v_action := "Please, send a valid subscription creation request with optional attribute expirationCounter";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute expirationCounter";
 
 						var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
 						v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
@@ -2111,7 +2117,7 @@ module OneM2M_Testcases_AE {
 					testcase TC_AE_SUB_CRE_002_NFU() runs on CseSimu system AeSystem {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
 						var template RequestPrimitive v_requestT := mw_createSubscription;
-						var charstring v_action := "Please, send a valid subscription creation request with optional attribute notificationForwardingURI";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute notificationForwardingURI";
 
 						var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
 						v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
@@ -2128,7 +2134,7 @@ module OneM2M_Testcases_AE {
 					testcase TC_AE_SUB_CRE_002_NCT() runs on CseSimu system AeSystem {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
 						var template RequestPrimitive v_requestT := mw_createSubscription;
-						var charstring v_action := "Please, send a valid subscription creation request with optional attribute notificationContentType";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute notificationContentType";
 
 						var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
 						v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
@@ -2145,7 +2151,7 @@ module OneM2M_Testcases_AE {
 					testcase TC_AE_SUB_CRE_002_NEC() runs on CseSimu system AeSystem {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
 						var template RequestPrimitive v_requestT := mw_createSubscription;
-						var charstring v_action := "Please, send a valid subscription creation request with optional attribute notificationEventCat";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute notificationEventCat";
 
 						var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
 						v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
@@ -2162,7 +2168,7 @@ module OneM2M_Testcases_AE {
 					testcase TC_AE_SUB_CRE_002_SU() runs on CseSimu system AeSystem {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
 						var template RequestPrimitive v_requestT := mw_createSubscription;
-						var charstring v_action := "Please, send a valid subscription creation request with optional attribute subscriberURI";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute subscriberURI";
 
 						var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
 						v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
@@ -2179,27 +2185,27 @@ module OneM2M_Testcases_AE {
 					function f_AE_SUB_CRE_002(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in charstring p_action) runs on CseSimu {
 	
 						var MsgIn v_request;
-						var ResponsePrimitive v_responsePrimtive;
+						var ResponsePrimitive v_responsePrimitive;
 
 						f_cf03Up();
 
-						//send triggering primtive to SUT
+						//send triggering primitive to SUT
 						f_sendUtPrimitive(p_utRequest,p_action);
 
 						//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!");
 
 								//set responseStatusCode back to SUT
-								v_responsePrimtive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+								v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
 
 								//send back responsePrimitive
-								mcaPort.send(m_response(v_responsePrimtive));
+								mcaPortIn.send(m_response(v_responsePrimitive));
 							}
-							[] mcaPort.receive {
+							[] mcaPortIn.receive {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__, " : Subscription creation request is rejected due to not including the optional attribute!");
 							}
@@ -2228,8 +2234,8 @@ module OneM2M_Testcases_AE {
 					//variables
 					var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
 					var MsgIn v_request;
-					var ResponsePrimitive v_responsePrimtive;
-					var charstring v_action := "Please, send a valid AE Registration CREATE Request";
+					var ResponsePrimitive v_responsePrimitive;
+					var charstring v_action :=  __SCOPE__ & ": Please, send a valid AE Registration CREATE Request";
   	
 					var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
 					v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
@@ -2240,15 +2246,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_responsePrimtive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+							v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
 			
 							//send back responsePrimitive
-							mcaPort.send(m_response(v_responsePrimtive));
-						} 
-						[] 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(inconc, __SCOPE__, " : AE registration request is rejected due to not including mandatory attributes!!");
 							stop;
@@ -2268,17 +2274,17 @@ 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!");
 
 							//set responseStatusCode back to SUT
-							v_responsePrimtive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+							v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
 
 							//send back responsePrimitive
-							mcaPort.send(m_response(v_responsePrimtive));
+							mcaPortIn.send(m_response(v_responsePrimitive));
 						}
-						[] mcaPort.receive {
+						[] mcaPortIn.receive {
 							tc_ac.stop;
 							setverdict(inconc, __SCOPE__, " : Subscription creation request is rejected due to not including mandatory attributes!!");
 						}
@@ -2289,15 +2295,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!");
 						}
@@ -2319,8 +2325,8 @@ module OneM2M_Testcases_AE {
 					//variables
 					var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
 					var MsgIn v_request;
-					var ResponsePrimitive v_responsePrimtive;
-					var charstring v_action := "Please, send a valid AE Registration CREATE Request";
+					var ResponsePrimitive v_responsePrimitive;
+					var charstring v_action :=  __SCOPE__ & ": Please, send a valid AE Registration CREATE Request";
   	
 					var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
 					v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
@@ -2331,15 +2337,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_responsePrimtive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+							v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
 			
 							//send back responsePrimitive
-							mcaPort.send(m_response(v_responsePrimtive));
-						} 
-						[] 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(inconc, __SCOPE__, " : AE registration request is rejected due to not including mandatory attributes!!");
 							stop;
@@ -2359,17 +2365,17 @@ 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!");
 
 							//set responseStatusCode back to SUT
-							v_responsePrimtive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+							v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
 
 							//send back responsePrimitive
-							mcaPort.send(m_response(v_responsePrimtive));
+							mcaPortIn.send(m_response(v_responsePrimitive));
 						}
-						[] mcaPort.receive {
+						[] mcaPortIn.receive {
 							tc_ac.stop;
 							setverdict(inconc, __SCOPE__, " : Subscription creation request is rejected due to not including mandatory attributes!!");
 						}
@@ -2380,15 +2386,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!");
 						}
diff --git a/OneM2M_Testcases_CSE.ttcn b/OneM2M_Testcases_CSE.ttcn
index b93bf2ffd9e048519dbd764995920298a41c627b..f69ceb0c8af857fd6c30909fe9e304ecf7ca8362 100644
--- a/OneM2M_Testcases_CSE.ttcn
+++ b/OneM2M_Testcases_CSE.ttcn
@@ -996,7 +996,7 @@ module OneM2M_Testcases_CSE {
 					f_cf01Up();
 		  	  	
 					//Preambule
-					//vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
+					//vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSE);
 					//TODO: create serviceSubscribedProfile, Node, and serviceSubscribedAppRule
 					//v_cseBaseIndex := f_cse_preamble_createServiceSubscribedProfile({"C*"}); //c_CRUDNDi);
 					
@@ -1044,7 +1044,7 @@ module OneM2M_Testcases_CSE {
 		  	  	
 					//Preambule
 					//v_cseBaseIndex := f_cse_preamble_createServiceSubscribedAppRule({"S"});//c_CRUDNDi);
-					vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
+					vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSE);
 		
 					//Test Body
 					vc_ae1.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, omit)));				
@@ -1054,15 +1054,15 @@ module OneM2M_Testcases_CSE {
 					//mcaPort.send(m_request(v_request));
 					tc_ac.start;
 					alt{
-						[]mccPort.receive(mw_request(mw_createAEAnnc(f_getResourceAddress(-1,e_hierarchical, e_spRelative) & "/S", "CSE_ID", -))){
+						[]mccPortIn.receive(mw_request(mw_createAEAnnc(f_getResourceAddress(-1,e_hierarchical, e_spRelative) & "/S", "CSE_ID", -))){
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__ & ": AE creation redirected.");
 						}
-						[]mccPort.receive(mw_request(mw_createAEAnnc(f_getResourceAddress(-1,e_hierarchical, e_absolute) & "/S", "CSE_ID", -))){
+						[]mccPortIn.receive(mw_request(mw_createAEAnnc(f_getResourceAddress(-1,e_hierarchical, e_absolute) & "/S", "CSE_ID", -))){
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__ & ": AE creation redirected.");
 						}
-						[] mccPort.receive {
+						[] mccPortIn.receive {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__ & ": Error while creating AE");
 						}
@@ -1096,7 +1096,7 @@ module OneM2M_Testcases_CSE {
 					f_cf02UpCseSimuMaster();
 		  	  	
 					//Preambule
-					vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
+					vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSE);
 					vc_ae1.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, "S")));
 					
 					vc_ae1.done;
@@ -1206,7 +1206,7 @@ module OneM2M_Testcases_CSE {
 					f_cf02Up();
 		  	  	
 					//Preambule
-					vc_cse1.start(f_cse_registrationRemoteCse(mw_createRemoteCSEBase));
+					vc_cse1.start(f_cse_registrationRemoteCse(mw_createRemoteCSE));
 					vc_cse1.done;
 					
 					v_aeIndex := f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, "S-AE-ID-STEM"));
@@ -1258,6 +1258,71 @@ module OneM2M_Testcases_CSE {
 						
 				}; //end TC_CSE_REG_CRE_010
 				
+				/**
+				 * @desc Check that the IUT accepts a create request of <AE> resource with attributes multiplicity equals to 1 and asking an CSE relative AE_ID by indicating AE_ID_Stem with character ‘C’.  
+				 * 
+				 */
+				testcase TC_CSE_REG_CRE_011() runs on AeSimu system CseSystem {
+
+					var MsgIn v_response;
+					var RequestPrimitive v_request;
+					var integer v_cseBaseIndex := -1;
+					var ResourceType v_resourceType := int2;
+    
+    
+					// Test component configuration
+					f_cf01Up();
+    
+					//Preamble
+
+					//Test Body
+					v_request := valueof(m_createAe(PX_APP_ID, omit, "C"));	
+	
+					v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, -1);
+	
+					mcaPort.send(m_request(v_request));
+	
+					tc_ac.start;
+					alt {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
+							tc_ac.stop;
+							f_checkAttributesToBeSaved(int2, v_request, v_response.primitive.responsePrimitive);
+							vc_aeAuxIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int2);
+							setverdict(pass, __SCOPE__ & ": AE successfully created.");
+							
+							if(v_response.primitive.responsePrimitive.primitiveContent.aE.resourceID[0] == "C"){
+								setverdict(pass, __SCOPE__ & "Resource ID set correctly.");
+							} else {
+								setverdict(fail, __SCOPE__ & "Resource ID not set correctly.");
+							}
+							
+							if(f_isScopeSpRelative(v_response.primitive.responsePrimitive.primitiveContent.aE.aE_ID)){
+								setverdict(pass, __SCOPE__ & "AE ID set correctly.");
+							} else {
+								setverdict(fail, __SCOPE__ & "AE ID not set correctly.");
+							}
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveInverse(int2001))) -> value v_response{
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Error while creating AE with status code " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)));
+						}
+						[] tc_ac.timeout {
+							setverdict(fail, __SCOPE__ & ": No answer while creating AE");
+						}
+					}	
+					
+					// Postamble
+					f_cse_postamble_deleteResources();
+	
+					// Tear down
+					f_cf01Down();
+		
+				}
+				
+				/**
+				  * @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_LBL() runs on Tester system CseSystem {
@@ -1325,8 +1390,12 @@ module OneM2M_Testcases_CSE {
 						mcaPort.send(m_request(v_request));
 						tc_ac.start;
 						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) {
+							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response{
 								tc_ac.stop;
+								
+								f_checkAttributesToBeSaved(int2, v_request, v_response.primitive.responsePrimitive);
+								vc_aeAuxIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int2);
+								
 								setverdict(pass, __SCOPE__ & ": AE creation successfull.");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveInverse(int2001))) -> value v_response{
@@ -1686,6 +1755,91 @@ module OneM2M_Testcases_CSE {
 
 				}//end TC_CSE_REG_CRE_019
 				
+				/**
+	 			 * @desc Check that the IUT accepts a response from IN_CSE on the success update of AEAnnc during AE registration with preprovisioned SP_relative_AE_ID
+				 * 
+				 */
+				 //TODO TO BE FINALIZED
+				testcase TC_CSE_REG_CRE_020() runs on AeSimu system CseSystem {
+
+					var MsgIn v_response;
+					var RequestPrimitive v_request;
+					var integer v_aeIndex := -1;
+					var ResourceType v_resourceType := int2;
+					
+					//Test control
+					if(not(PICS_MN_CSE)) {
+					   setverdict(inconc, __SCOPE__ & ": IUT shall be MN-CSE to run this test case");
+					   stop;
+					}
+    
+					// Test component configuration
+					f_cf02Up();
+
+					//Preambule
+					vc_cse1.start(f_cse_registrationRemoteCse(mw_createRemoteCSE));
+					vc_cse1.done;
+	
+					v_request := valueof(m_createAe(PX_APP_ID, omit, omit));				
+						
+					v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, -1);
+
+					mcaPort.send(m_request(v_request));
+					tc_ac.start;
+					alt {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response{
+							tc_ac.stop;
+		
+							f_checkAttributesToBeSaved(int2, v_request, v_response.primitive.responsePrimitive);
+							vc_aeAuxIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int2);
+							setverdict(pass, __SCOPE__ & ": AE successfully created.");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveInverse(int2001))) -> value v_response{
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Error while creating AE with status code " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)));
+						}
+						[] tc_ac.timeout {
+							setverdict(fail, __SCOPE__ & ": No answer while creating AE");
+						}
+					}	
+	
+					vc_cse1.start(f_cse_notifyProcedure_updateHandler());
+					vc_cse1.done;
+	
+	                //Test body
+					tc_ac.start;
+
+					alt {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
+							tc_ac.stop;
+							//continue to test the content
+							if (ischosen(v_response.primitive.responsePrimitive.primitiveContent.aE)){
+								if (v_response.primitive.responsePrimitive.primitiveContent.aE.app_ID == PX_APP_ID){
+									setverdict(pass, __SCOPE__ & ": AE creation success.");
+								}else{
+									setverdict(fail, __SCOPE__ & ": Error in AE content.");
+								}
+							}else{
+								setverdict(fail, __SCOPE__ & ": primitiveContent doesn't exist");
+							}
+						}
+						[] 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_020
+				
 				/**
 				 * @desc Check that the IUT rejects the create request of <CSEBase> resource.
 				 * 
@@ -1736,6 +1890,62 @@ module OneM2M_Testcases_CSE {
 
 				}//end TC_CSE_REG_CRE_021
 				
+				/**
+				 * @desc Check that the IUT accepts an AE registration (allowed App-ID, C-AE-ID-STEM not provided by AE)  
+				 * 
+				 */
+				testcase TC_CSE_REG_CRE_022() runs on AeSimu system CseSystem {				
+					
+					var MsgIn v_response;
+					var RequestPrimitive v_request;
+					var ResourceType v_resourceType := int2;
+
+					//Test control
+
+					// Test component configuration
+					f_cf01Up();
+
+					//Preamble
+
+					//Test Body
+					v_request := valueof(m_createAe(PX_APP_ID, omit, "C"));	
+
+					v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, -1);
+
+					mcaPort.send(m_request(v_request));
+
+					tc_ac.start;
+					alt {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
+							tc_ac.stop;
+							f_checkAttributesToBeSaved(int2, v_request, v_response.primitive.responsePrimitive);
+							vc_aeAuxIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int2);		
+							setverdict(pass, __SCOPE__ & ": AE successfully registered.");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveInverse(int2001))) -> value v_response{
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Error while registering AE with status code " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)));
+						}
+						[] tc_ac.timeout {
+							setverdict(fail, __SCOPE__ & ": No answer while registering AE");
+						}
+					}	
+					
+					//Check to see if the resource is present or not
+				  	if (f_isResourcePresent(vc_aeAuxIndex)){
+					  	setverdict(pass, __SCOPE__ & ":INFO: Resource created");
+				  	} else {
+					  	setverdict(fail, __SCOPE__ & ":ERROR: Resource not created");
+				  	}
+				
+					// Postamble
+					f_cse_postamble_deleteResources();
+
+					// Tear down
+					f_cf01Down();
+		
+				}
+				
 				/**
 				 * @desc Check that the IUT rejects the create request of <CSEBase> resource.
 				 * 
@@ -1755,7 +1965,7 @@ module OneM2M_Testcases_CSE {
 					// Test adapter configuration
 
 					// Preamble
-					vc_cse1.start(f_cse_registrationRemoteCse(mw_createRemoteCSEBase));
+					vc_cse1.start(f_cse_registrationRemoteCse(mw_createRemoteCSE));
 
 					// Test Body
 					f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, omit));
@@ -1833,6 +2043,205 @@ module OneM2M_Testcases_CSE {
 				
 				}
 				
+				/**
+				 * @desc Check that IUT sends a CSE registration request with attributes multiplicity equals to 1 
+				 * 
+				 */
+				testcase TC_CSE_REG_CRE_024() runs on CseSimu system CseSystem {
+  
+					// Local variables
+					var ResponsePrimitive v_responsePrimitive;
+					var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
+					var charstring v_action :=  __SCOPE__ & ": Please, send a CSE registration request with attributes multiplicity equals to 1";
+	   
+					// Test control
+
+					// Test component configuration
+					f_cf04Up();
+
+					// Test adapter configuration
+
+					// Preamble
+					//send triggering primitive to SUT
+					f_sendUtPrimitive(v_utRequest,v_action);
+
+					// Test Body
+					tc_ac.start;
+					alt {
+						[] mccPortIn.receive(mw_request(mw_createRemoteCSEBase)) {
+							tc_ac.stop;
+							setverdict(pass, __SCOPE__&":INFO: Resource type remoteCSE created successfuly");
+							
+							//set responseStatusCode back to SUT
+							v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+
+							//send back responsePrimitive
+							mccPortIn.send(m_response(v_responsePrimitive));
+						}
+						[] mccPortIn.receive {
+							tc_ac.stop;
+							setverdict(inconc, __SCOPE__&":INFO: Unexpected message received");
+						}
+						[] tc_ac.timeout {
+							setverdict(inconc, __SCOPE__&":INFO: No request received for creating resource type remoteCSE");
+						}
+					}	
+					// Postamble
+					f_cse_postamble_deleteResourcesCSE();
+
+					// Tear down
+					f_cf04Down();
+
+				}
+				
+				/**
+				 * @desc Check that IUT accepts a CSE registration request with attributes multiplicity equals to 1 
+				 * 
+				 */
+				testcase TC_CSE_REG_CRE_025() runs on CseSimu system CseSystem {
+	  
+					// Local variables
+					var MsgIn v_response;
+					var RequestPrimitive v_request;
+					var integer v_resourceIndex := -1;
+					var integer v_localResourceIndex := -1;
+					var PrimitiveContent v_remoteCSEResource;
+	   
+					// Test control
+
+					// Test component configuration
+					f_cf04Up();
+
+					// Test adapter configuration
+
+					// Preamble
+					v_request := f_getCreateRequestPrimitive(int16, m_createRemoteCSEBase, -1);
+					mccPort.send(m_request(v_request));
+
+					// Test Body
+					tc_ac.start;
+					alt {
+						[] mccPort.receive(mw_response(mw_responsePrimitiveOK(?))) -> value v_response {
+							tc_ac.stop;
+							setverdict(pass, __SCOPE__&":INFO: Resource type remoteCSE created successfuly");
+							f_checkAttributesToBeSaved(int16, v_request, v_response.primitive.responsePrimitive);
+							v_resourceIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int16, -1);
+						}
+						[] mccPort.receive(mw_response(mw_responsePrimitiveKO)) {
+							tc_ac.stop;
+							setverdict(inconc, __SCOPE__&":INFO: Error while creating resource type remoteCSE");
+						}
+						[] mccPort.receive {
+							tc_ac.stop;
+							setverdict(inconc, __SCOPE__&":INFO: Unexpected message received");
+						}
+						[] tc_ac.timeout {
+							setverdict(inconc, __SCOPE__&":INFO: No answer while creating resource type remoteCSE");
+						}
+					}	
+					// Postamble
+					f_cse_postamble_deleteResourcesCSE();
+
+					// Tear down
+					f_cf04Down();
+	
+				}
+				
+				/**
+				 * @desc Check that IUT sends a CSE registration request with OPTIONAL_ATTRIBUTE attribute 
+				 * 
+				 */
+				
+				group g_CSE_REG_CRE_026 {
+					
+					testcase TC_CSE_REG_CRE_026_RN() runs on CseSimu system CseSystem {
+						var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
+						var template RequestPrimitive v_request := mw_createRemoteCSE;
+						var charstring v_action :=  __SCOPE__ & ": Please, send a CSE registration request with optional attribute resourceName";
+						v_utRequest.primitiveContent.remoteCSE.resourceName := "UNINITIALIZED";
+						v_request.primitiveContent.remoteCSE.resourceName := ?;
+						f_CSE_REG_CRE_026(v_utRequest,v_request,v_action);
+					}
+					
+					testcase TC_CSE_REG_CRE_026_ET() runs on CseSimu system CseSystem {
+						var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
+						var template RequestPrimitive v_request := mw_createRemoteCSE;
+						var charstring v_action :=  __SCOPE__ & ": Please, send a CSE registration request with optional attribute expirationTime";
+						v_utRequest.primitiveContent.remoteCSE.expirationTime := "20301231T012345";
+						v_request.primitiveContent.remoteCSE.expirationTime := ?;
+						f_CSE_REG_CRE_026(v_utRequest,v_request,v_action);
+					}
+					
+					testcase TC_CSE_REG_CRE_026_LBL() runs on CseSimu system CseSystem {
+						var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
+						var template RequestPrimitive v_request := mw_createRemoteCSE;
+						var charstring v_action :=  __SCOPE__ & ": Please, send a CSE registration request with optional attribute labels";
+						v_utRequest.primitiveContent.remoteCSE.labels := {"UNINITIALIZED"};
+						v_request.primitiveContent.remoteCSE.labels := ?;
+						f_CSE_REG_CRE_026(v_utRequest,v_request,v_action);
+					}
+					
+					testcase TC_CSE_REG_CRE_026_POA() runs on CseSimu system CseSystem {
+						var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
+						var template RequestPrimitive v_request := mw_createRemoteCSE;
+						var charstring v_action :=  __SCOPE__ & ": Please, send a CSE registration request with optional attribute pointOfAccess";
+						v_utRequest.primitiveContent.remoteCSE.pointOfAccess := {"UNINITIALIZED"};
+						v_request.primitiveContent.remoteCSE.pointOfAccess := ?;
+						f_CSE_REG_CRE_026(v_utRequest,v_request,v_action);
+					}
+					
+					testcase TC_CSE_REG_CRE_026_NL() runs on CseSimu system CseSystem {
+						var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
+						var template RequestPrimitive v_request := mw_createRemoteCSE;
+						var charstring v_action :=  __SCOPE__ & ": Please, send a CSE registration request with optional attribute nodeLink";
+						v_utRequest.primitiveContent.remoteCSE.nodeLink := "UNINITIALIZED";
+						v_request.primitiveContent.remoteCSE.nodeLink := ?;
+						f_CSE_REG_CRE_026(v_utRequest,v_request,v_action);
+					}
+					
+					function f_CSE_REG_CRE_026(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in charstring p_action) runs on CseSimu {
+	  
+						var ResponsePrimitive v_responsePrimitive;
+
+						//Test component configuration
+						f_cf04Up();
+
+						//send triggering primitive to SUT
+						f_sendUtPrimitive(p_utRequest,p_action);
+
+						//Test behavior
+						tc_ac.start;
+						alt{
+
+							//receive MsgIn requestPrimitive
+							[] mccPortIn.receive(mw_request(p_request)) {
+								tc_ac.stop;
+								setverdict(pass, __SCOPE__&":INFO: Resource type remoteCSE created successfuly");
+
+								//set responseStatusCode back to SUT
+								v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+
+								//send back responsePrimitive
+								mccPortIn.send(m_response(v_responsePrimitive));
+							}
+							[] mccPortIn.receive {
+								tc_ac.stop;
+								setverdict(inconc, __SCOPE__&":INFO: Unexpected message received");
+							}
+							[] tc_ac.timeout {
+								setverdict(inconc, __SCOPE__&":INFO: No request received for creating resource type remoteCSE");
+							}
+						}
+
+						// Postamble
+						f_cse_postamble_deleteResourcesCSE();
+	
+						// Tear down
+						f_cf04Down();
+	
+					}
+				}
+				
 				/*testcase TC_CSE_REG_CRE_029() runs on CseSimu system CseSystem {
   
 					var MsgIn v_response;
@@ -1853,7 +2262,7 @@ module OneM2M_Testcases_CSE {
 	
 					tc_ac.start;
 					alt {
-						[] mccPort.receive(mw_request(mw_createRemoteCSEBase(PX_CSE_ID,f_getResourceAddress(-1)))) -> value v_response {
+						[] 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");
 						}
@@ -2749,7 +3158,7 @@ module OneM2M_Testcases_CSE {
 					 var ResourceType v_resourceType := int16;	//remoteCSE
 					 var template PrimitiveContent v_contentResponse;
 					 var template UtTriggerPrimitive v_utRequest;
-					 var charstring v_action := "Please, send a valid RETRIEVE Request containing To set to " & PX_CSE1_ADDRESS;
+					 var charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request containing To set to " & PX_CSE1_ADDRESS;
 	 		
 					 // Test control
 					 if(not(PICS_MN_CSE)) {
@@ -3023,16 +3432,20 @@ module OneM2M_Testcases_CSE {
 					}//end f_CSE_REG_UPD_002
 				} //end g_CSE_REG_UPD_002
 			    
+				/**
+				  * @desc Check that IUT sends a <remoteCSE> update request with OPTIONAL_ATTRIBUTE attribute.
+			   	  * 
+				 */
 			    group g_CSE_REG_UPD_003 {
 	
 					testcase TC_CSE_REG_UPD_003_ET() runs on Tester system CseSystem {
 						// Local variables
 						var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;	
-						var AttributeAux c_optionalAttribute;
+						var AttributeList c_optionalAttribute;
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 			
 						v_updateRequest.primitiveContent.remoteCSE.expirationTime := "20301231T012345";
-						c_optionalAttribute := {"expirationTime", valueof(v_updateRequest).primitiveContent.remoteCSE.expirationTime};
+						c_optionalAttribute := {"expirationTime"};
 
 						v_cse1.start(f_CSE_REG_UPD_003(v_updateRequest, c_optionalAttribute));
 						v_cse1.done;
@@ -3042,11 +3455,11 @@ module OneM2M_Testcases_CSE {
 					testcase TC_CSE_REG_UPD_003_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;	
-						var AttributeAux c_optionalAttribute;
+						var AttributeList c_optionalAttribute;
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 			
 						v_updateRequest.primitiveContent.remoteCSE.labels := {"MyLabel"};
-						c_optionalAttribute := {"labels", valueof(v_updateRequest).primitiveContent.remoteCSE.labels[0]};
+						c_optionalAttribute := {"labels"};
 
 						v_cse1.start(f_CSE_REG_UPD_003(v_updateRequest, c_optionalAttribute));
 						v_cse1.done;
@@ -3056,11 +3469,11 @@ module OneM2M_Testcases_CSE {
 					testcase TC_CSE_REG_UPD_003_POA() runs on Tester system CseSystem {
 						// Local variables
 						var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;	
-						var AttributeAux c_optionalAttribute;
+						var AttributeList c_optionalAttribute;
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 		
 						v_updateRequest.primitiveContent.remoteCSE.pointOfAccess := {"http://" & PX_CSE1_ADDRESS & "/"};
-						c_optionalAttribute := {"pointofAccess", valueof(v_updateRequest).primitiveContent.remoteCSE.pointOfAccess[0]};
+						c_optionalAttribute := {"pointofAccess"};
 
 						v_cse1.start(f_CSE_REG_UPD_003(v_updateRequest, c_optionalAttribute));
 						v_cse1.done;
@@ -3070,11 +3483,11 @@ module OneM2M_Testcases_CSE {
 					testcase TC_CSE_REG_UPD_003_NL() runs on Tester system CseSystem {
 						// Local variables
 						var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;	
-						var AttributeAux c_optionalAttribute;
+						var AttributeList c_optionalAttribute;
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 			
 						v_updateRequest.primitiveContent.remoteCSE.nodeLink := c_defaultNodeID;
-						c_optionalAttribute := {"nodeLink", valueof(v_updateRequest).primitiveContent.remoteCSE.nodeLink};
+						c_optionalAttribute := {"nodeLink"};
 
 						v_cse1.start(f_CSE_REG_UPD_003(v_updateRequest, c_optionalAttribute));
 						v_cse1.done;
@@ -3084,27 +3497,25 @@ module OneM2M_Testcases_CSE {
 					testcase TC_CSE_REG_UPD_003_RR() runs on Tester system CseSystem {
 						// Local variables
 						var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;	
-						var AttributeAux c_optionalAttribute;
+						var AttributeList c_optionalAttribute;
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 
 						v_updateRequest.primitiveContent.remoteCSE.requestReachability := true;
-						c_optionalAttribute := {"requestReachability", f_bool2str(valueof(v_updateRequest).primitiveContent.remoteCSE.requestReachability)};
+						c_optionalAttribute := {"requestReachability"};
 
 						v_cse1.start(f_CSE_REG_UPD_003(v_updateRequest, c_optionalAttribute));
 						v_cse1.done;
 
 					}
 	
-					function f_CSE_REG_UPD_003(template RequestPrimitive p_requestPrimitive, in AttributeAux p_Attribute) runs on CseSimu {
+					function f_CSE_REG_UPD_003(template RequestPrimitive p_requestPrimitive, in AttributeList p_attribute) runs on CseSimu {
 						// Local variables
 						//Local variables
 						var MsgIn v_response;
 						var RequestPrimitive v_request;
 						var ResourceType v_resourceType := int16;	//remoteCSE
 						var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
-						var charstring v_action := "Please, send a valid RETRIEVE Request containing To set to " & PX_CSE1_ADDRESS & " and Content containing remoteCSE resource containing attribute " & p_Attribute.name & " set to " & p_Attribute.value_;
-								
-						// Test control
+						var charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request containing To set to " & PX_CSE1_ADDRESS & " and Content containing remoteCSE resource containing a valid attribute " & p_attribute[0];														// Test control
 						if(not(PICS_MN_CSE)) {
 							setverdict(inconc, __SCOPE__ & ": IUT shall be MN-CSE to run this test case");
 							stop;
@@ -3126,27 +3537,16 @@ module OneM2M_Testcases_CSE {
 						// Test Body
 						v_request := f_getUpdateRequestPrimitive(int16, vc_remoteCseIndex, p_requestPrimitive);
 
-						mccPort.send(m_request(v_request));
 						tc_ac.start;
 						alt {
-							[] mccPort.receive(mw_response(mw_responsePrimitive(int2004, f_getTemplateFromPrimitiveContent(v_request.primitiveContent)))) -> value v_response {
+							[] mccPortIn.receive(mw_request(v_request)) {
 								tc_ac.stop;
-								setverdict(pass, __SCOPE__ & ": Accepted updation for resource type remoteCSE containing attribute " & p_Attribute.name);
+								setverdict(pass, __SCOPE__ & ": Received request for updation for resource type remoteCSE containing attribute " & p_attribute[0]);
 								f_setResource(v_request.primitiveContent,int16);
 							}
-							[] mccPort.receive(mw_response(mw_responsePrimitiveOK(f_getTemplateFromPrimitiveContent(v_request.primitiveContent)))) -> value v_response {
-								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Wrong response status code in the response");
-								f_setResource(v_request.primitiveContent,int16);
-							}
-							[] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
-								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Accepted updation for resource type remoteCSE without containing attribute " & p_Attribute.name);
-								f_setResource(v_request.primitiveContent,int16);
-							}
-							[] mccPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+							[] mccPortIn.receive {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Rejected updation of resource type remoteCSE containing attribute" & p_Attribute.name);
+								setverdict(fail, __SCOPE__ & ": Error: Did not receive update request for resource type remoteCSE");
 							}
 							[] tc_ac.timeout {
 								setverdict(fail, __SCOPE__ & ": No answer while updating resource type remoteCSE");
@@ -3227,7 +3627,7 @@ module OneM2M_Testcases_CSE {
 					// Test adapter configuration
 
 					// Preamble
-					vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
+					vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSE);
 
 					// Test Body
 					v_request := valueof(m_delete(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex)));
@@ -3326,7 +3726,7 @@ module OneM2M_Testcases_CSE {
 					var template UtTriggerPrimitive v_utRequest := m_utDeleteRequest;
 					var UtTriggerAckPrimitive v_trigger_response;
 					var integer v_auxInteger;
-					var charstring v_action := "Please, send a valid DELETE Request containing To set to " & PX_CSE1_ADDRESS;
+					var charstring v_action := __SCOPE__ & ": Please, send a valid DELETE Request containing To set to " & PX_CSE1_ADDRESS;
 					// Test control
 
 					// Test component configuration
@@ -3335,7 +3735,7 @@ module OneM2M_Testcases_CSE {
 					// Test adapter configuration
 
 					// Preamble
-					vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
+					vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSE);
 					
 					//Send Trigger Message
 					v_auxInteger := f_setResource(valueof(m_primitiveContentRemoteCSE(m_contentCreateRemoteCSE(omit,omit,omit,omit))), int16);