diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 7d0286e4b587ae558cc7798779bd2b7771189a3d..c78ac5445c8ceec978e72c90ae97a4809bfa7492 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -191,8 +191,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 +202,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
 
@@ -1568,8 +1575,8 @@ module OneM2M_Functions {
 						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;
@@ -1602,14 +1609,19 @@ 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, register CSE on the Tester";
+				
+				//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);
+						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;
@@ -1670,24 +1682,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;
 						
 						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 +1728,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;
 				    
 					}
@@ -2722,9 +2751,8 @@ module OneM2M_Functions {
 		
 
 		/**
-		 * @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 {
@@ -2835,7 +2863,7 @@ module OneM2M_Functions {
 			
 			}else{
 				
-				action(__SCOPE__ & ":" & p_action);
+				action(p_action);
 			
 			}
 			
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..c331bfbdb3bb7612c34787f94eb572270adacf6b 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -3721,7 +3721,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 2dcb45f075446031e8eef8e1f6fbc246d8101614..00773447475ab312dcca6ace6a9ce389381d7e41 100644
--- a/LibOneM2M/OneM2M_TestSystem.ttcn
+++ b/LibOneM2M/OneM2M_TestSystem.ttcn
@@ -63,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/OneM2M_Testcases_AE.ttcn b/OneM2M_Testcases_AE.ttcn
index f30074e8063df961609696789a1a1138325036b9..c15d8757f6979820fdc996b5f25363c5ca50520b 100644
--- a/OneM2M_Testcases_AE.ttcn
+++ b/OneM2M_Testcases_AE.ttcn
@@ -70,7 +70,7 @@ 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);
@@ -93,8 +93,8 @@ module OneM2M_Testcases_AE {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__, " : Container creation request received successfuly");
 							
-								v_responsePrimtive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
-								mcaPortIn.send(m_response(v_responsePrimtive));
+								v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+								mcaPortIn.send(m_response(v_responsePrimitive));
 							}
 							[] mcaPortIn.receive(mw_request(?)) {
 								tc_ac.stop;
@@ -150,7 +150,7 @@ 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);
@@ -176,8 +176,8 @@ module OneM2M_Testcases_AE {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__, " : Container creation request received successfuly");
 		
-								v_responsePrimtive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
-								mcaPortIn.send(m_response(v_responsePrimtive));
+								v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+								mcaPortIn.send(m_response(v_responsePrimitive));
 							}
 							[] mcaPortIn.receive(mw_request(?)) {
 								tc_ac.stop;
@@ -241,7 +241,7 @@ 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;
@@ -267,8 +267,8 @@ module OneM2M_Testcases_AE {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__, " : Container update request received successfuly");
 							
-								v_responsePrimtive := valueof(m_responsePrimitive(int2004, "To_be_defined", omit));
-								mcaPortIn.send(m_response(v_responsePrimtive));
+								v_responsePrimitive := valueof(m_responsePrimitive(int2004, "To_be_defined", omit));
+								mcaPortIn.send(m_response(v_responsePrimitive));
 							}
 							[] mcaPortIn.receive(mw_request(?)) {
 								tc_ac.stop;
@@ -327,7 +327,7 @@ 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;
@@ -352,8 +352,8 @@ module OneM2M_Testcases_AE {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__, " : Container update request received successfuly");
 							
-								v_responsePrimtive := valueof(m_responsePrimitive(int2004, "To_be_defined", omit));
-								mcaPortIn.send(m_response(v_responsePrimtive));
+								v_responsePrimitive := valueof(m_responsePrimitive(int2004, "To_be_defined", omit));
+								mcaPortIn.send(m_response(v_responsePrimitive));
 							}
 							[] mcaPortIn.receive(mw_request(?)) {
 								tc_ac.stop;
@@ -417,7 +417,7 @@ 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;
@@ -443,8 +443,8 @@ module OneM2M_Testcases_AE {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__, " : Container retrieve request received successfuly");
 				
-								v_responsePrimtive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
-								mcaPortIn.send(m_response(v_responsePrimtive));
+								v_responsePrimitive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
+								mcaPortIn.send(m_response(v_responsePrimitive));
 							}
 							[] mcaPortIn.receive(mw_request(?)) {
 								tc_ac.stop;
@@ -503,7 +503,7 @@ 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;
@@ -529,8 +529,8 @@ module OneM2M_Testcases_AE {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__, " : Container retrieve request received successfuly");
 				
-								v_responsePrimtive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
-								mcaPortIn.send(m_response(v_responsePrimtive));
+								v_responsePrimitive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
+								mcaPortIn.send(m_response(v_responsePrimitive));
 							}
 							[] mcaPortIn.receive(mw_request(?)) {
 								tc_ac.stop;
@@ -594,7 +594,7 @@ 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;
@@ -619,8 +619,8 @@ module OneM2M_Testcases_AE {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__, " : Container update request received successfuly");
 				
-								v_responsePrimtive := valueof(m_responsePrimitive(int2004, "To_be_defined", omit));
-								mcaPortIn.send(m_response(v_responsePrimtive));
+								v_responsePrimitive := valueof(m_responsePrimitive(int2004, "To_be_defined", omit));
+								mcaPortIn.send(m_response(v_responsePrimitive));
 							}
 							[] mcaPortIn.receive(mw_request(?)) {
 								tc_ac.stop;
@@ -679,7 +679,7 @@ 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;
@@ -705,8 +705,8 @@ module OneM2M_Testcases_AE {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__, " : Container update request received successfuly");
 				
-								v_responsePrimtive := valueof(m_responsePrimitive(int2004, "To_be_defined", omit));
-								mcaPortIn.send(m_response(v_responsePrimtive));
+								v_responsePrimitive := valueof(m_responsePrimitive(int2004, "To_be_defined", omit));
+								mcaPortIn.send(m_response(v_responsePrimitive));
 							}
 							[] mcaPortIn.receive(mw_request(?)) {
 								tc_ac.stop;
@@ -744,7 +744,7 @@ module OneM2M_Testcases_AE {
 
 					//primitives for mcaPortIn
 					var MsgIn v_request;
-					var ResponsePrimitive v_responsePrimtive;
+					var ResponsePrimitive v_responsePrimitive;
 					var charstring v_action := "Please, send a valid AE CREATE Registration Request";
 
 					f_cf03Up();
@@ -758,11 +758,11 @@ module OneM2M_Testcases_AE {
 						[] 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
-							mcaPortIn.send(m_response(v_responsePrimtive));
+							mcaPortIn.send(m_response(v_responsePrimitive));
 						}
 						[] mcaPortIn.receive(mw_request(mw_createAe(*,?,m_contentCreateAe_Invalid))) -> value v_request {
 							tc_ac.stop;
@@ -888,7 +888,7 @@ module OneM2M_Testcases_AE {
 	
 						//primitives for mcaPortIn
 						var MsgIn v_request;
-						var ResponsePrimitive v_responsePrimtive;
+						var ResponsePrimitive v_responsePrimitive;
 	
 						f_cf03Up();
 	
@@ -901,11 +901,11 @@ module OneM2M_Testcases_AE {
 							[] 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
-								mcaPortIn.send(m_response(v_responsePrimtive));
+								mcaPortIn.send(m_response(v_responsePrimitive));
 							}
 							[] mcaPortIn.receive(mw_request(mw_createAe(*,?,m_contentCreateAe_Invalid))) -> value v_request {
 								tc_ac.stop;
@@ -936,7 +936,7 @@ module OneM2M_Testcases_AE {
 	
 					//variables
 					var MsgIn v_request;
-					var ResponsePrimitive v_responsePrimtive;
+					var ResponsePrimitive v_responsePrimitive;
 					var charstring v_action := "Please, send a valid AE DELETE Registration Request";
 					
 					//primitives for utPort
@@ -953,11 +953,11 @@ module OneM2M_Testcases_AE {
 							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
-							mcaPortIn.send(m_response(v_responsePrimtive));
+							mcaPortIn.send(m_response(v_responsePrimitive));
 						}
 						[] mcaPortIn.receive {
 							tc_ac.stop;
@@ -989,12 +989,12 @@ module OneM2M_Testcases_AE {
 					//variables
 					var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 					var MsgIn v_request;
-					var ResponsePrimitive v_responsePrimtive;
+					var ResponsePrimitive v_responsePrimitive;
 					var charstring v_action := "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
@@ -1005,10 +1005,10 @@ module OneM2M_Testcases_AE {
 							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
-							mcaPortIn.send(m_response(v_responsePrimtive));
+							mcaPortIn.send(m_response(v_responsePrimitive));
 						}
 						[] mcaPortIn.receive {
 							tc_ac.stop;
@@ -1031,13 +1031,13 @@ module OneM2M_Testcases_AE {
 	
 					var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
 					var MsgIn v_request;
-					var ResponsePrimitive v_responsePrimtive;
+					var ResponsePrimitive v_responsePrimitive;
 					var charstring v_action := "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
@@ -1050,10 +1050,10 @@ module OneM2M_Testcases_AE {
 							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
-							mcaPortIn.send(m_response(v_responsePrimtive));
+							mcaPortIn.send(m_response(v_responsePrimitive));
 						}
 	
 						[] mcaPortIn.receive {
@@ -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
@@ -1141,10 +1141,10 @@ module OneM2M_Testcases_AE {
 								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
-								mcaPortIn.send(m_response(v_responsePrimtive));
+								mcaPortIn.send(m_response(v_responsePrimitive));
 							}
 	
 							[] mcaPortIn.receive {
@@ -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
@@ -1272,10 +1272,10 @@ module OneM2M_Testcases_AE {
 								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
-								mcaPortIn.send(m_response(v_responsePrimtive));
+								mcaPortIn.send(m_response(v_responsePrimitive));
 							}
 	
 							[] mcaPortIn.receive {
@@ -1314,13 +1314,13 @@ module OneM2M_Testcases_AE {
 			
 					function f_AE_DMR_UPD_001(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in charstring p_action) runs on CseSimu {
 			
-						var ResponsePrimitive v_responsePrimtive;
+						var ResponsePrimitive v_responsePrimitive;
 						var MsgIn v_request;
 			
 						//Test component configuration
 						f_cf03Up();
 			
-						//send triggering primtive to SUT
+						//send triggering primitive to SUT
 						f_sendUtPrimitive(p_utRequest,p_action);
 			
 						//Test behavior
@@ -1336,10 +1336,10 @@ module OneM2M_Testcases_AE {
 									setverdict(fail, __SCOPE__, " : Container update request didn't change the value of the attribute");
 								}else{
 									//set responseStatusCode back to SUT
-									v_responsePrimtive := valueof(m_responsePrimitive(int2004, "To_be_defined", omit));
+									v_responsePrimitive := valueof(m_responsePrimitive(int2004, "To_be_defined", omit));
 			
 									//send back responsePrimitive
-									mcaPortIn.send(m_response(v_responsePrimtive));
+									mcaPortIn.send(m_response(v_responsePrimitive));
 								}
 							}
 			
@@ -1437,7 +1437,7 @@ module OneM2M_Testcases_AE {
 	
 						//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();
 						
@@ -1461,10 +1461,10 @@ module OneM2M_Testcases_AE {
 							[] 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
-								mcaPortIn.send(m_response(v_responsePrimtive));
+								mcaPortIn.send(m_response(v_responsePrimitive));
 							}
 							[] mcaPortIn.receive(mw_request(?)) -> value v_request {
 								tc_ac.stop;
@@ -1550,12 +1550,12 @@ module OneM2M_Testcases_AE {
 
 					function f_AE_DMR_UPD_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
@@ -1568,10 +1568,10 @@ module OneM2M_Testcases_AE {
 								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
-								mcaPortIn.send(m_response(v_responsePrimtive));
+								mcaPortIn.send(m_response(v_responsePrimitive));
 							}
 
 							[] mcaPortIn.receive {
@@ -1623,12 +1623,12 @@ module OneM2M_Testcases_AE {
 						//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);
 						
@@ -1640,10 +1640,10 @@ module OneM2M_Testcases_AE {
 								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
-								mcaPortIn.send(m_response(v_responsePrimtive));
+								mcaPortIn.send(m_response(v_responsePrimitive));
 								tc_ac.stop;
 							}
 							[] mcaPortIn.receive {
@@ -1673,13 +1673,13 @@ 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 ResponsePrimitive v_responsePrimitive;
 					var charstring v_action := "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
@@ -1690,10 +1690,10 @@ module OneM2M_Testcases_AE {
 							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
-							mcaPortIn.send(m_response(v_responsePrimtive));
+							mcaPortIn.send(m_response(v_responsePrimitive));
 							tc_ac.stop;
 						}
 						[] mcaPortIn.receive {
@@ -1721,13 +1721,13 @@ 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 ResponsePrimitive v_responsePrimitive;
 					var charstring v_action := "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
@@ -1738,10 +1738,10 @@ module OneM2M_Testcases_AE {
 							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
-							mcaPortIn.send(m_response(v_responsePrimtive));
+							mcaPortIn.send(m_response(v_responsePrimitive));
 							tc_ac.stop;
 						}
 						[] mcaPortIn.receive {
@@ -1769,13 +1769,13 @@ module OneM2M_Testcases_AE {
 					//variables
 					var template UtTriggerPrimitive v_utRequest := m_utRetrieveResource (v_address, "UNINITIALIZED");
 					var MsgIn v_request;
-					var ResponsePrimitive v_responsePrimtive;
+					var ResponsePrimitive v_responsePrimitive;
 					var charstring v_action := "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);
 	
@@ -1787,10 +1787,10 @@ module OneM2M_Testcases_AE {
 							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
-							mcaPortIn.send(m_response(v_responsePrimtive));
+							mcaPortIn.send(m_response(v_responsePrimitive));
 							tc_ac.stop;
 						}
 						[] mcaPortIn.receive {
@@ -1818,13 +1818,13 @@ module OneM2M_Testcases_AE {
 					//variables
 					var template UtTriggerPrimitive v_utRequest := m_utRetrieveResource (v_address, "UNINITIALIZED");
 					var MsgIn v_request;
-					var ResponsePrimitive v_responsePrimtive;
+					var ResponsePrimitive v_responsePrimitive;
 					var charstring v_action := "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);
 
@@ -1836,10 +1836,10 @@ module OneM2M_Testcases_AE {
 							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
-							mcaPortIn.send(m_response(v_responsePrimtive));
+							mcaPortIn.send(m_response(v_responsePrimitive));
 							tc_ac.stop;
 						}
 						[] mcaPortIn.receive {
@@ -1871,13 +1871,13 @@ 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 ResponsePrimitive v_responsePrimitive;
 					var charstring v_action := "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
@@ -1888,10 +1888,10 @@ module OneM2M_Testcases_AE {
 							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
-							mcaPortIn.send(m_response(v_responsePrimtive));
+							mcaPortIn.send(m_response(v_responsePrimitive));
 							tc_ac.stop;
 						}
 						[] mcaPortIn.receive {
@@ -1919,13 +1919,13 @@ 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 ResponsePrimitive v_responsePrimitive;
 					var charstring v_action := "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
@@ -1936,10 +1936,10 @@ module OneM2M_Testcases_AE {
 							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
-							mcaPortIn.send(m_response(v_responsePrimtive));
+							mcaPortIn.send(m_response(v_responsePrimitive));
 							tc_ac.stop;
 						}
 						[] mcaPortIn.receive {
@@ -1967,13 +1967,13 @@ module OneM2M_Testcases_AE {
 					//variables
 					var template UtTriggerPrimitive v_utRequest := m_utDeleteResource (v_address, "UNINITIALIZED");
 					var MsgIn v_request;
-					var ResponsePrimitive v_responsePrimtive;
+					var ResponsePrimitive v_responsePrimitive;
 					var charstring v_action := "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);
 
@@ -1985,10 +1985,10 @@ module OneM2M_Testcases_AE {
 							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
-							mcaPortIn.send(m_response(v_responsePrimtive));
+							mcaPortIn.send(m_response(v_responsePrimitive));
 							tc_ac.stop;
 						}
 						[] mcaPortIn.receive {
@@ -2016,13 +2016,13 @@ module OneM2M_Testcases_AE {
 					//variables
 					var template UtTriggerPrimitive v_utRequest := m_utDeleteResource (v_address, "UNINITIALIZED");
 					var MsgIn v_request;
-					var ResponsePrimitive v_responsePrimtive;
+					var ResponsePrimitive v_responsePrimitive;
 					var charstring v_action := "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);
 
@@ -2034,10 +2034,10 @@ module OneM2M_Testcases_AE {
 							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
-							mcaPortIn.send(m_response(v_responsePrimtive));
+							mcaPortIn.send(m_response(v_responsePrimitive));
 							tc_ac.stop;
 						}
 						[] mcaPortIn.receive {
@@ -2071,7 +2071,7 @@ module OneM2M_Testcases_AE {
 					//variables
 					var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
 					var MsgIn v_request;
-					var ResponsePrimitive v_responsePrimtive;
+					var ResponsePrimitive v_responsePrimitive;
 					var charstring v_action := "Please, send a valid subscription creation request";
 				  	
 					var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
@@ -2079,7 +2079,7 @@ module OneM2M_Testcases_AE {
 
 					f_cf03Up();
 
-					//send triggering primtive to SUT
+					//send triggering primitive to SUT
 					f_sendUtPrimitive(v_utRequest,v_action);
 				  	
 					//Test behavior
@@ -2090,10 +2090,10 @@ module OneM2M_Testcases_AE {
 							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
-							mcaPortIn.send(m_response(v_responsePrimtive));
+							mcaPortIn.send(m_response(v_responsePrimitive));
 						}
 						[] mcaPortIn.receive {
 							tc_ac.stop;
@@ -2236,11 +2236,11 @@ 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
@@ -2251,10 +2251,10 @@ module OneM2M_Testcases_AE {
 								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
-								mcaPortIn.send(m_response(v_responsePrimtive));
+								mcaPortIn.send(m_response(v_responsePrimitive));
 							}
 							[] mcaPortIn.receive {
 								tc_ac.stop;
@@ -2285,7 +2285,7 @@ module OneM2M_Testcases_AE {
 					//variables
 					var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
 					var MsgIn v_request;
-					var ResponsePrimitive v_responsePrimtive;
+					var ResponsePrimitive v_responsePrimitive;
 					var charstring v_action := "Please, send a valid AE Registration CREATE Request";
   	
 					var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
@@ -2300,10 +2300,10 @@ module OneM2M_Testcases_AE {
 						[] 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
-							mcaPortIn.send(m_response(v_responsePrimtive));
+							mcaPortIn.send(m_response(v_responsePrimitive));
 						}
 						[] mcaPortIn.receive(mw_request(mw_createAe(*,?,m_contentCreateAe_Invalid))) -> value v_request {
 							tc_ac.stop;
@@ -2330,10 +2330,10 @@ module OneM2M_Testcases_AE {
 							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
-							mcaPortIn.send(m_response(v_responsePrimtive));
+							mcaPortIn.send(m_response(v_responsePrimitive));
 						}
 						[] mcaPortIn.receive {
 							tc_ac.stop;
@@ -2376,7 +2376,7 @@ module OneM2M_Testcases_AE {
 					//variables
 					var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
 					var MsgIn v_request;
-					var ResponsePrimitive v_responsePrimtive;
+					var ResponsePrimitive v_responsePrimitive;
 					var charstring v_action := "Please, send a valid AE Registration CREATE Request";
   	
 					var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
@@ -2391,10 +2391,10 @@ module OneM2M_Testcases_AE {
 						[] 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
-							mcaPortIn.send(m_response(v_responsePrimtive));
+							mcaPortIn.send(m_response(v_responsePrimitive));
 						}
 						[] mcaPortIn.receive(mw_request(mw_createAe(*,?,m_contentCreateAe_Invalid))) -> value v_request {
 							tc_ac.stop;
@@ -2421,10 +2421,10 @@ module OneM2M_Testcases_AE {
 							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
-							mcaPortIn.send(m_response(v_responsePrimtive));
+							mcaPortIn.send(m_response(v_responsePrimitive));
 						}
 						[] mcaPortIn.receive {
 							tc_ac.stop;
diff --git a/OneM2M_Testcases_CSE.ttcn b/OneM2M_Testcases_CSE.ttcn
index 74bd72a7e666ff1fd55559ae9d958106ebe71b80..95cbc92c915f32dd7cfc8421671b1a92a7c88e80 100644
--- a/OneM2M_Testcases_CSE.ttcn
+++ b/OneM2M_Testcases_CSE.ttcn
@@ -2749,7 +2749,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)) {
@@ -3107,7 +3107,6 @@ module OneM2M_Testcases_CSE {
 						var ResourceType v_resourceType := int16;	//remoteCSE
 						var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
 						var charstring v_action := "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");
@@ -3319,7 +3318,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