diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 092a6d77862ba0e011301a04f526817fd8f7013a..36926622b613d3e6d6c77dfeaee51a8afd3541ae 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -1616,7 +1616,7 @@ module OneM2M_Functions {
 						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 request received for creating resource type RemoteCSE");
 					}
 				}	
 
@@ -1676,7 +1676,8 @@ module OneM2M_Functions {
 							v_myResource.remoteCSE.resourceName := "remoteCSE" & int2char(v_resourceIndex);
 						}
 						v_myResource.remoteCSE.resourceType := p_resourceType;
-						v_myResource.remoteCSE.resourceID := "remoteCSE" & int2char(v_resourceIndex);
+						//v_myResource.remoteCSE.resourceID := "remoteCSE" & int2char(v_resourceIndex);
+						v_myResource.remoteCSE.resourceID := "remoteCSE";
 						v_myResource.remoteCSE.parentID := f_getResourceId(vc_localResourcesList[p_parentIndex].resource);
 						v_myResource.remoteCSE.creationTime := fx_generateTimestamp();
 						if(not(ispresent(p_resource.remoteCSE.expirationTime))) {
diff --git a/LibOneM2M/OneM2M_TestSystem.ttcn b/LibOneM2M/OneM2M_TestSystem.ttcn
index 0f8bea0e30a4f86c0effb6568adc638fbec3f0b4..76b0aa1ff006de292893b124c230e4c8463fc8e4 100644
--- a/LibOneM2M/OneM2M_TestSystem.ttcn
+++ b/LibOneM2M/OneM2M_TestSystem.ttcn
@@ -71,6 +71,7 @@ module OneM2M_TestSystem {
 		port OneM2MPort mcaPort;
 		port OneM2MPort mcaPortIn;
 		port OneM2MPort mccPort;
+		port OneM2MPort mccPortIn;
 		port AdapterControlPort acPort;
 	}	
 	
diff --git a/OneM2M_TestControl_IN_profile.ttcn b/OneM2M_TestControl_IN_profile.ttcn
index 20d201e34df2590c7f39418ce75a92d438978e6b..082f108f92e298710ee6d724c133c65fdd759ff6 100644
--- a/OneM2M_TestControl_IN_profile.ttcn
+++ b/OneM2M_TestControl_IN_profile.ttcn
@@ -42,16 +42,28 @@ module OneM2M_TestControl_IN_profile {
 		execute(TC_CSE_REG_CRE_008());
 		execute(TC_CSE_REG_CRE_009());
 		execute(TC_CSE_REG_CRE_010());
-		execute(TC_CSE_REG_CRE_016_LBL());
-		execute(TC_CSE_REG_CRE_016_CST());
-		execute(TC_CSE_REG_CRE_016_POA());
-		execute(TC_CSE_REG_CRE_016_NL());
+		execute(TC_CSE_REG_CRE_012_AE_APN());
+		execute(TC_CSE_REG_CRE_012_AE_LBL());
+		execute(TC_CSE_REG_CRE_012_AE_NL());
+		execute(TC_CSE_REG_CRE_012_AE_OR());
+		execute(TC_CSE_REG_CRE_012_AE_POA());
+		execute(TC_CSE_REG_CRE_013_LBL());
+		execute(TC_CSE_REG_CRE_013_CST());
+		execute(TC_CSE_REG_CRE_013_POA());
+		execute(TC_CSE_REG_CRE_013_NL());
+		execute(TC_CSE_REG_CRE_016());
+		execute(TC_CSE_REG_CRE_017_API());
+		execute(TC_CSE_REG_CRE_017_RR());
+		execute(TC_CSE_REG_CRE_018());
 		execute(TC_CSE_REG_CRE_019());
-		execute(TC_CSE_REG_CRE_022());
+		execute(TC_CSE_REG_CRE_021());
 		execute(TC_CSE_REG_CRE_023());
-		execute(TC_CSE_REG_CRE_025());
-		execute(TC_CSE_REG_CRE_028());
-		execute(TC_CSE_REG_CRE_029());
+		execute(TC_CSE_REG_CRE_027());
+		execute(TC_CSE_REG_CRE_028_ET());
+		execute(TC_CSE_REG_CRE_028_LBL());
+		execute(TC_CSE_REG_CRE_028_NL());
+		execute(TC_CSE_REG_CRE_028_POA());
+		execute(TC_CSE_REG_CRE_028_RN());
 		execute(TC_CSE_REG_RET_001());
 		execute(TC_CSE_REG_RET_005());
 		execute(TC_CSE_REG_RET_008());
diff --git a/OneM2M_Testcases_CSE.ttcn b/OneM2M_Testcases_CSE.ttcn
index 583224e2816c3a03c0e4e590d6bcd7702f8c32d9..d70e98be1f81e07294e1b3fc43ad11fd13bfa807 100644
--- a/OneM2M_Testcases_CSE.ttcn
+++ b/OneM2M_Testcases_CSE.ttcn
@@ -884,8 +884,11 @@ module OneM2M_Testcases_CSE {
 					
 					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 successfully created.");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveInverse(int2001))) -> value v_response{
@@ -929,8 +932,11 @@ 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 successfully created.");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveInverse(int2001))) -> value v_response{
@@ -1086,6 +1092,8 @@ module OneM2M_Testcases_CSE {
 					vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
 					vc_ae1.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, "S")));
 					
+					vc_ae1.done;
+					
 					//TODO:
 					//v_request := valueof(m_delete(f_getResourceAddress(v_aeIndex), f_getOriginator(v_aeIndex)));
 					//mcaPort.send(m_request(v_request));
@@ -1243,34 +1251,54 @@ module OneM2M_Testcases_CSE {
 						
 				}; //end TC_CSE_REG_CRE_010
 				
-				group g_CSE_REG_CRE_013 {
+				group g_CSE_REG_CRE_012 {
 					
-					testcase TC_CSE_REG_CRE_013_AE_LBL() runs on AeSimu system CseSystem {
-						var template RequestPrimitive m_create := m_createAe(PX_APP_ID, omit, omit);
-						m_create.primitiveContent.aE.labels := {"labels"};
+					testcase TC_CSE_REG_CRE_012_AE_LBL() runs on Tester system CseSystem {
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+						
+						v_create.primitiveContent.aE.labels := {"labels"};
+						v_ae1.start(TC_CSE_REG_CRE_012(v_create));
+						v_ae1.done;
 					}
 					
-					testcase TC_CSE_REG_CRE_013_AE_APN() runs on AeSimu system CseSystem {
-						var template RequestPrimitive m_create := m_createAe(PX_APP_ID, omit, omit);
-						m_create.primitiveContent.aE.appName := "AeAppName";
+					testcase TC_CSE_REG_CRE_012_AE_APN() runs on Tester system CseSystem {
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+						
+						v_create.primitiveContent.aE.appName := "AeAppName";
+						v_ae1.start(TC_CSE_REG_CRE_012(v_create));
+						v_ae1.done;
 					}
 					
-					testcase TC_CSE_REG_CRE_013_AE_POA() runs on AeSimu system CseSystem {
-						var template RequestPrimitive m_create := m_createAe(PX_APP_ID, omit, omit);
-						m_create.primitiveContent.aE.pointOfAccess := {PX_AE1_ADDRESS};
+					testcase TC_CSE_REG_CRE_012_AE_POA() runs on Tester system CseSystem {
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+						
+						v_create.primitiveContent.aE.pointOfAccess := {PX_AE1_ADDRESS};
+						v_ae1.start(TC_CSE_REG_CRE_012(v_create));
+						v_ae1.done;
 					}
 					
-					testcase TC_CSE_REG_CRE_013_AE_NL() runs on AeSimu system CseSystem {
-						var template RequestPrimitive m_create := m_createAe(PX_APP_ID, omit, omit);
-						m_create.primitiveContent.aE.nodeLink := "http://127.0.0.1/";
+					testcase TC_CSE_REG_CRE_012_AE_NL() runs on Tester system CseSystem {
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+						
+						v_create.primitiveContent.aE.nodeLink := "http://127.0.0.1/";
+						v_ae1.start(TC_CSE_REG_CRE_012(v_create));
+						v_ae1.done;
 					}
 					
-					testcase TC_CSE_REG_CRE_013_AE_OR() runs on AeSimu system CseSystem {
-						var template RequestPrimitive m_create := m_createAe(PX_APP_ID, omit, omit);
-						m_create.primitiveContent.aE.ontologyRef := "MyOntologyRef";
+					testcase TC_CSE_REG_CRE_012_AE_OR() runs on Tester system CseSystem {
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+						
+						v_create.primitiveContent.aE.ontologyRef := "MyOntologyRef";
+						v_ae1.start(TC_CSE_REG_CRE_012(v_create));
+						v_ae1.done;
 					}
 				
-					function TC_CSE_REG_CRE_013(in template RequestPrimitive p_createAe) runs on AeSimu {
+					function TC_CSE_REG_CRE_012(in template RequestPrimitive p_createAe) runs on AeSimu {
 					
 						//Local variables
 						var MsgIn v_response;
@@ -1313,13 +1341,13 @@ module OneM2M_Testcases_CSE {
 				}
 				
 				
-				group g_CSE_REG_CRE_016 {
+				group g_CSE_REG_CRE_013 {
 					
 					/**
 					 * @desc Check that the IUT accepts a create request of <remoteCSE> resource with OPTIONAL_ATTRIBUTE. 
 					 * 
 					 */
-					testcase TC_CSE_REG_CRE_016_LBL() runs on Tester system CseSystem {
+					testcase TC_CSE_REG_CRE_013_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var template RequestPrimitive v_createRequest := m_createRemoteCSEBase;	
 						const AttributeAux c_optionalAttribute := {"labels", omit};
@@ -1327,12 +1355,12 @@ module OneM2M_Testcases_CSE {
                         						
 						v_createRequest.primitiveContent.remoteCSE.labels := {"MyLabel"};
 						
-						v_cse1.start(f_CSE_REG_CRE_016(v_createRequest, c_optionalAttribute));
+						v_cse1.start(f_CSE_REG_CRE_013(v_createRequest, c_optionalAttribute));
 						v_cse1.done;
 						
 					}
 					
-					testcase TC_CSE_REG_CRE_016_CST() runs on Tester system CseSystem {
+					testcase TC_CSE_REG_CRE_013_CST() runs on Tester system CseSystem {
 						// Local variables
 						var template RequestPrimitive v_createRequest := m_createRemoteCSEBase;	
 						const AttributeAux c_optionalAttribute := {"cseType", omit};
@@ -1340,11 +1368,11 @@ module OneM2M_Testcases_CSE {
 												
 						v_createRequest.primitiveContent.remoteCSE.cseType := int1;
 						
-						v_cse1.start(f_CSE_REG_CRE_016(v_createRequest, c_optionalAttribute));
+						v_cse1.start(f_CSE_REG_CRE_013(v_createRequest, c_optionalAttribute));
 						v_cse1.done;
 					}
 					
-					testcase TC_CSE_REG_CRE_016_POA() runs on Tester system CseSystem {
+					testcase TC_CSE_REG_CRE_013_POA() runs on Tester system CseSystem {
 						// Local variables
 						var template RequestPrimitive v_createRequest := m_createRemoteCSEBase;	
 						const AttributeAux c_optionalAttribute := {"pointOfAccess", omit};
@@ -1352,12 +1380,12 @@ module OneM2M_Testcases_CSE {
 	
 						v_createRequest.primitiveContent.remoteCSE.pointOfAccess := {"http://" & PX_CSE1_ADDRESS & "/"};
 	
-						v_cse1.start(f_CSE_REG_CRE_016(v_createRequest, c_optionalAttribute));
+						v_cse1.start(f_CSE_REG_CRE_013(v_createRequest, c_optionalAttribute));
 						v_cse1.done;
 
 					}
 					
-					testcase TC_CSE_REG_CRE_016_NL() runs on Tester system CseSystem {
+					testcase TC_CSE_REG_CRE_013_NL() runs on Tester system CseSystem {
 						// Local variables
 						var template RequestPrimitive v_createRequest := m_createRemoteCSEBase;	
 						const AttributeAux c_optionalAttribute := {"nodeLink", omit};
@@ -1365,12 +1393,12 @@ module OneM2M_Testcases_CSE {
 
 						v_createRequest.primitiveContent.remoteCSE.nodeLink := c_defaultNodeID;
 
-						v_cse1.start(f_CSE_REG_CRE_016(v_createRequest, c_optionalAttribute));
+						v_cse1.start(f_CSE_REG_CRE_013(v_createRequest, c_optionalAttribute));
 						v_cse1.done;
 
 					}
 					
-					function f_CSE_REG_CRE_016(template RequestPrimitive p_requestPrimitive, in AttributeAux p_optionalAttribute) runs on CseSimu {
+					function f_CSE_REG_CRE_013(template RequestPrimitive p_requestPrimitive, in AttributeAux p_optionalAttribute) runs on CseSimu {
 					
 						// Local variables
 						var MsgIn v_response;
@@ -1409,7 +1437,7 @@ module OneM2M_Testcases_CSE {
 							}
 							[] mccPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Rejected creation of resource type remoteCSE containing attribute" & p_optionalAttribute.name);
+								setverdict(fail, __SCOPE__ & ": Rejected creation of resource type remoteCSE containing attribute " & p_optionalAttribute.name);
 							}
 							[] tc_ac.timeout {
 								setverdict(fail, __SCOPE__ & ": No answer while creating resource type remoteCSE");
@@ -1422,15 +1450,15 @@ module OneM2M_Testcases_CSE {
 						// Tear down
 						f_cf04Down();
 																
-					}//end f_CSE_REG_CRE_BV_016
+					}//end f_CSE_REG_CRE_BV_013
 					
-				}// end group g_CSE_REG_CRE_BV_016	
+				}// end group g_CSE_REG_CRE_BV_013	
 			
 				/**
 				 * @desc Check that the IUT rejects an AE registration (not allowed App-ID) 
 				 * 
 				 */
-				testcase TC_CSE_REG_CRE_019() runs on AeSimu system CseSystem {
+				testcase TC_CSE_REG_CRE_016() runs on AeSimu system CseSystem {
 		  	  	
 					var MsgIn v_response;
 					var RequestPrimitive v_request;
@@ -1476,8 +1504,8 @@ module OneM2M_Testcases_CSE {
 				 * @desc Check that the IUT rejects a create request of <AE> resource that doesn’t include the MANDATORY_ATTRIBUTE
 				 * 
 				 */
-				group g_CSE_REG_CRE_021 {
-					testcase TC_CSE_REG_CRE_021_API() runs on Tester system CseSystem {
+				group g_CSE_REG_CRE_017 {
+					testcase TC_CSE_REG_CRE_017_API() runs on Tester system CseSystem {
 						
 						//Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
@@ -1485,11 +1513,11 @@ module OneM2M_Testcases_CSE {
 						
 						v_createRequest.primitiveContent.aE.app_ID := omit;	//Mandatory app_ID field is being set empty
 	
-						v_ae1.start(f_CSE_REG_CRE_021(v_createRequest));
+						v_ae1.start(f_CSE_REG_CRE_017(v_createRequest));
 						v_ae1.done;
 	
-					}//end TC_CSE_REG_CRE_021_API
-					testcase TC_CSE_REG_CRE_021_RR() runs on Tester system CseSystem {
+					}//end TC_CSE_REG_CRE_017_API
+					testcase TC_CSE_REG_CRE_017_RR() runs on Tester system CseSystem {
 	
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
@@ -1497,12 +1525,12 @@ module OneM2M_Testcases_CSE {
 						
 						v_createRequest.primitiveContent.aE.requestReachability := omit;	//Mandatory requestReachability field is being set empty
 						
-						v_ae1.start(f_CSE_REG_CRE_021(v_createRequest));
+						v_ae1.start(f_CSE_REG_CRE_017(v_createRequest));
 						v_ae1.done;
 
-					}//end TC_CSE_REG_CRE_021_RR
+					}//end TC_CSE_REG_CRE_017_RR
 					
-					function f_CSE_REG_CRE_021(template RequestPrimitive p_createRequestPrimitive) runs on AeSimu {
+					function f_CSE_REG_CRE_017(template RequestPrimitive p_createRequestPrimitive) runs on AeSimu {
 						
 						//Local variables
 						var ResourceType v_resourceType := int2;   
@@ -1545,13 +1573,13 @@ module OneM2M_Testcases_CSE {
 						f_cf01Down();
 						
 					}
-				}//end g_CSE_REG_CRE_021
+				}//end g_CSE_REG_CRE_017
 				
 				/**
 				 * @desc Check that the IUT accepts an create request of <remoteCSE> resource with attributes multiplicity equals to 1. 
 				 *  
 				 */
-				testcase TC_CSE_REG_CRE_022() runs on CseSimu system CseSystem {
+				testcase TC_CSE_REG_CRE_018() runs on CseSimu system CseSystem {
 				
 					// Local variables
 					var MsgIn v_response;
@@ -1599,13 +1627,13 @@ module OneM2M_Testcases_CSE {
 					// Tear down
 					f_cf04Down();
 
-				}//end TC_CSE_REG_CRE_022
+				}//end TC_CSE_REG_CRE_018
 				
 				/**
 				 * @desc Check that the IUT accepts an create request of <remoteCSE> resource with attributes multiplicity equals to 1 without the preconfigured CSE-ID
 				 *
 				 */
-				testcase TC_CSE_REG_CRE_023() runs on CseSimu system CseSystem {
+				testcase TC_CSE_REG_CRE_019() runs on CseSimu system CseSystem {
 				
 					// Local variables
 					var MsgIn v_response;
@@ -1649,13 +1677,13 @@ module OneM2M_Testcases_CSE {
 					// Tear down
 					f_cf04Down();
 
-				}//end TC_CSE_REG_CRE_023
+				}//end TC_CSE_REG_CRE_019
 				
 				/**
 				 * @desc Check that the IUT rejects the create request of <CSEBase> resource.
 				 * 
 				 */
-				testcase TC_CSE_REG_CRE_025() runs on AeSimu system CseSystem {
+				testcase TC_CSE_REG_CRE_021() runs on AeSimu system CseSystem {
     				
 					// Local variables
 					var MsgIn v_response;
@@ -1699,12 +1727,12 @@ module OneM2M_Testcases_CSE {
 					// Tear down
 					f_cf01Down();
 
-				}//end TC_CSE_REG_CRE_025
+				}//end TC_CSE_REG_CRE_021
 				
 				/**
 				 * @desc Check that the IUT rejects the create request of <CSEBase> resource.
 				 * 
-				 */
+				 
 				testcase TC_CSE_REG_CRE_027() runs on AeSimu system CseSystem {
 	
 					// Local variables
@@ -1746,13 +1774,13 @@ module OneM2M_Testcases_CSE {
 					// Tear down
 					f_cf02Down();
 
-				}//end TC_CSE_REG_CRE_027
+				}end TC_CSE_REG_CRE_027*/
 				
 				/**
 				 * @desc Check that the IUT rejects registration of already registered AE (C-AE-ID-STEM provided by AE) 
 				 * 
 				 */
-				testcase TC_CSE_REG_CRE_028() runs on AeSimu system CseSystem {
+				testcase TC_CSE_REG_CRE_023() runs on AeSimu system CseSystem {
 				  
 					var MsgIn v_response;
 					var RequestPrimitive v_request;
@@ -1798,7 +1826,7 @@ module OneM2M_Testcases_CSE {
 				
 				}
 				
-				testcase TC_CSE_REG_CRE_029() runs on CseSimu system CseSystem {
+				/*testcase TC_CSE_REG_CRE_029() runs on CseSimu system CseSystem {
   
 					var MsgIn v_response;
 					
@@ -1837,52 +1865,14 @@ module OneM2M_Testcases_CSE {
 					// Tear down
 					f_cf04Down();
 	
-				}
+				}*/
 				
-				/**
-				 * @desc Check that IUT accepts a CSE registration request with cseType attribute set to ‘MN_CSE’
-				 * 
-				 */
-				testcase TC_CSE_REG_CRE_030() runs on CseSimu system CseSystem {
-					//Local variables
-					var ResourceType v_resourceType := int16;	//remoteCSE	
-					var RequestPrimitive v_request;
-					var template PrimitiveContent v_contentResponse;
-					// Test control
-
-					// Test component configuration
-					f_cf04Up();
-
-					// Test adapter configuration
-
-					// Preamble
-					v_request := valueof(m_createRemoteCSEBase);
-
-					v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
-	
-					//Test Body					
-					vc_remoteCseIndex := f_cse_registerRemoteCse(v_request, v_contentResponse);
-	
-					//Check if the resource has been deleted or not
-					if(f_cse_isResourcePresent(vc_remoteCseIndex)) {
-						setverdict(pass, __SCOPE__ & ":INFO: Resource created");
-					} else {
-						setverdict(fail, __SCOPE__ & ":INFO: Resource not created");
-					}	
-
-					// Postamble
-					f_cse_postamble_deleteResourcesCSE();
-
-					// Tear down
-					f_cf04Down();
-
-				}//end TC_CSE_REG_CRE_030
 				
 				/**
 				 * @desc Check that IUT accepts a CSE registration request with cseType attribute set to ‘MN_CSE’
 				 * 
 				 */
-				testcase TC_CSE_REG_CRE_033() runs on CseSimu system CseSystem {
+				testcase TC_CSE_REG_CRE_027() runs on CseSimu system CseSystem {
 					//Local variables
 					var ResourceType v_resourceType := int16;	//remoteCSE	
 					var RequestPrimitive v_request;
@@ -1917,15 +1907,15 @@ module OneM2M_Testcases_CSE {
 					// Tear down
 					f_cf04Down();
 
-				}//end TC_CSE_REG_CRE_033	
+				}//end TC_CSE_REG_CRE_027	
 				
 				/**
 				 * @desc Check that IUT accepts  a CSE registration request with OPTIONAL_ATTRIBUTE attribute
 				 * 
 				 */
-				group g_CSE_REG_CRE_034 {
+				group g_CSE_REG_CRE_028 {
 				
-					testcase TC_CSE_REG_CRE_034_RN() runs on Tester system CseSystem {
+					testcase TC_CSE_REG_CRE_028_RN() runs on Tester system CseSystem {
 						 //Local variables
 						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						 var RequestPrimitive v_request;
@@ -1939,12 +1929,12 @@ module OneM2M_Testcases_CSE {
 						 v_contentResponse.remoteCSE.cseType := int2;	//MN_CSE
 					     v_contentResponse.remoteCSE.resourceName := c_defaultRemoteCSEResourceName;
 	
-						 v_cse1.start(f_CSE_REG_CRE_034(v_request, v_contentResponse));
+						 v_cse1.start(f_CSE_REG_CRE_028(v_request, v_contentResponse));
 						 v_cse1.done;
 						
 					}
 					
-					testcase TC_CSE_REG_CRE_034_ET() runs on Tester system CseSystem {
+					testcase TC_CSE_REG_CRE_028_ET() runs on Tester system CseSystem {
 						 //Local variables
 						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						 var RequestPrimitive v_request;
@@ -1958,12 +1948,12 @@ module OneM2M_Testcases_CSE {
 						 v_contentResponse.remoteCSE.cseType := int2;	//MN_CSE
 						 v_contentResponse.remoteCSE.expirationTime := "20301231T012345";
 	
-						 v_cse1.start(f_CSE_REG_CRE_034(v_request, v_contentResponse));
+						 v_cse1.start(f_CSE_REG_CRE_028(v_request, v_contentResponse));
 						 v_cse1.done;
 		
 					}
 					
-					testcase TC_CSE_REG_CRE_034_LBL() runs on Tester system CseSystem {
+					testcase TC_CSE_REG_CRE_028_LBL() runs on Tester system CseSystem {
 						 //Local variables
 						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						 var RequestPrimitive v_request;
@@ -1978,12 +1968,12 @@ module OneM2M_Testcases_CSE {
 						 v_contentResponse.remoteCSE.cseType := int2;	//MN_CSE
 						 v_contentResponse.remoteCSE.labels := v_labels_1;
 		
-						 v_cse1.start(f_CSE_REG_CRE_034(v_request, v_contentResponse));
+						 v_cse1.start(f_CSE_REG_CRE_028(v_request, v_contentResponse));
 						 v_cse1.done;
 		
 					}
 					
-					testcase TC_CSE_REG_CRE_034_POA() runs on Tester system CseSystem {
+					testcase TC_CSE_REG_CRE_028_POA() runs on Tester system CseSystem {
 						 //Local variables
 						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						 var RequestPrimitive v_request;
@@ -1997,12 +1987,12 @@ module OneM2M_Testcases_CSE {
 						 v_contentResponse.remoteCSE.cseType := int2;	//MN_CSE
 						 v_contentResponse.remoteCSE.pointOfAccess := {"http://" & PX_CSE1_ADDRESS & "/"};
 		
-						 v_cse1.start(f_CSE_REG_CRE_034(v_request, v_contentResponse));
+						 v_cse1.start(f_CSE_REG_CRE_028(v_request, v_contentResponse));
 						 v_cse1.done;
 		
 					}
 					
-					testcase TC_CSE_REG_CRE_034_NL() runs on Tester system CseSystem {
+					testcase TC_CSE_REG_CRE_028_NL() runs on Tester system CseSystem {
 						 //Local variables
 						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						 var RequestPrimitive v_request;
@@ -2016,12 +2006,12 @@ module OneM2M_Testcases_CSE {
 						 v_contentResponse.remoteCSE.cseType := int2;	//MN_CSE
 						 v_contentResponse.remoteCSE.nodeLink := c_defaultNodeID;
 	
-						 v_cse1.start(f_CSE_REG_CRE_034(v_request, v_contentResponse));
+						 v_cse1.start(f_CSE_REG_CRE_028(v_request, v_contentResponse));
 						 v_cse1.done;
 	
 					}
 					
-					function f_CSE_REG_CRE_034(RequestPrimitive p_request, template PrimitiveContent p_contentResponse) runs on CseSimu{ //system CseSystem {
+					function f_CSE_REG_CRE_028(RequestPrimitive p_request, template PrimitiveContent p_contentResponse) runs on CseSimu{ //system CseSystem {
 						//Local variables
 						var ResourceType v_resourceType := int16;	//remoteCSE	
 						// Test control
@@ -2050,8 +2040,8 @@ module OneM2M_Testcases_CSE {
 						// Tear down
 						f_cf04Down();
 	
-					}//end TC_CSE_REG_CRE_034
-				}//end g_CSE_REG_CRE_034
+					}//end TC_CSE_REG_CRE_028
+				}//end g_CSE_REG_CRE_028
 			
 			}	//end group Create