diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index e5882eb9ace443c73ac083537836f6cf53d0c19f..50af31bcde6221b7414b2ba0c4356251e8a1a223 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -130,6 +130,10 @@ module OneM2M_Functions {
 			vc_config := e_cf02CseSimuMaster;
 			vc_testSystemRole := e_cse;		
 			vc_ae1 := AeSimu.create("AE1") alive;
+			
+			//Initialization of local CSEBase
+			v_cSEBaseResource := f_cse_generateLocalResource(-, -1, int5);
+			vc_cSEBaseIndex := f_setLocalResource(v_cSEBaseResource, int5, -1);
 				
 			// Map
 			map(self:mccPort, system:mccPort);
@@ -139,9 +143,6 @@ 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
 			
@@ -177,6 +178,10 @@ module OneM2M_Functions {
 			vc_config := e_cf03;
 			vc_testSystemRole := e_cse;		
 			
+			//Creation of CSEBase
+			v_cSEBaseResource := f_cse_generateLocalResource(-, -1, int5);
+			vc_cSEBaseIndex := f_setLocalResource(v_cSEBaseResource, int5, -1);
+			
 			// Map
 			map(self:mcaPortIn, system:mcaPortIn);//TODO To be consistent, we should use mcaPortIn for AE testing
 			map(self:acPort, system:acPort);
@@ -185,11 +190,6 @@ module OneM2M_Functions {
 			}
 			activate(a_default());
 			activate(a_ae_cf03());
-			
-			//Creation of CSEBase
-			
-			v_cSEBaseResource := f_cse_generateLocalResource(-, -1, int5);
-			vc_cSEBaseIndex := f_setLocalResource(v_cSEBaseResource, int5, -1);
 		
 			// Connect
 					
@@ -207,18 +207,16 @@ module OneM2M_Functions {
 			vc_config := e_cf04;
 			vc_testSystemRole := e_cse;	
 			
-	
+			//Creation of CSEBase
+			v_cSEBaseResource := f_cse_generateLocalResource(-, -1, int5);
+			vc_cSEBaseIndex := f_setLocalResource(v_cSEBaseResource, int5, -1);
+			
 			// Map
 			map(self:mccPort, system:mccPort);
 			map(self:mccPortIn, system:mccPortIn);
 			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
 			
@@ -1045,10 +1043,6 @@ module OneM2M_Functions {
 						tc_ac.stop;
 						setverdict(inconc, __SCOPE__&":INFO: Error while retrieving resource");
 					}
-					[] mcaPort.receive{
-						tc_ac.stop;
-						setverdict(inconc, __SCOPE__&":INFO: Unexpected message received");
-					}
 					[] tc_ac.timeout {
 						setverdict(inconc, __SCOPE__&":INFO: No answer while retrieving resource");
 					}