diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index d258f17a2456f424b6c7a9ce93abe9b8c3635bf2..04821bc2a44eab0bcca7a6ae5a16d69ebb8b0184 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -1573,57 +1573,30 @@ module OneM2M_PermutationFunctions {
 						// Test adapter configuration
 
 						// Preamble
-						if(PICS_IN_CSE){
-							vc_remoteCseIndex := f_cse_registerRemoteCse(p_createRequestPrimitive);
-							mccPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex)))));
-						    tc_ac.start;
-							alt {
-								[] mccPort.receive(mw_response(mw_responsePrimitive(int2000, p_contentResponse))) -> value v_response {
-									tc_ac.stop;
-									setverdict(pass, __SCOPE__ & ": Response OK for retrieving for attribute");
-								}
-								[] mccPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response {
-									tc_ac.stop;
-									setverdict(fail, __SCOPE__ & ": Wrong response status code");
-								}
-								[] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
-									tc_ac.stop;
-									setverdict(fail, __SCOPE__ & ": Error, resource elements provided not matching expected resource elements");
-								}
-								[] mccPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
-									tc_ac.stop;
-									setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
-								}
-								[] tc_ac.timeout {
-									setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
-								}
+						vc_remoteCseIndex := f_cse_registerRemoteCse(p_createRequestPrimitive);
+						mccPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex)))));
+					    tc_ac.start;
+						alt {
+							[] mccPort.receive(mw_response(mw_responsePrimitive(int2000, p_contentResponse))) -> value v_response {
+								tc_ac.stop;
+								setverdict(pass, __SCOPE__ & ": Response OK for retrieving for attribute");
+							}
+							[] mccPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response {
+								tc_ac.stop;
+								setverdict(fail, __SCOPE__ & ": Wrong response status code");
+							}
+							[] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+								tc_ac.stop;
+								setverdict(fail, __SCOPE__ & ": Error, resource elements provided not matching expected resource elements");
+							}
+							[] mccPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+								tc_ac.stop;
+								setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
+							}
+							[] tc_ac.timeout {
+								setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
 							}
-						} else if (PICS_MN_CSE){
-							vc_remoteCseIndex := f_cse_registrationRemoteCse(p_createRequestPrimitive);
-							mccPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex)))));
-							tc_ac.start;
-							alt {
-								[] mccPort.receive(mw_response(mw_responsePrimitive(int2000, p_contentResponse))) -> value v_response {
-									tc_ac.stop;
-									setverdict(pass, __SCOPE__ & ": Response OK for retrieving for attribute");
-								}
-								[] mccPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response {
-									tc_ac.stop;
-									setverdict(fail, __SCOPE__ & ": Wrong response status code");
-								}
-								[] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
-									tc_ac.stop;
-									setverdict(fail, __SCOPE__ & ": Error, resource elements provided not matching expected resource elements");
-								}
-								[] mccPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
-									tc_ac.stop;
-									setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
-								}
-								[] tc_ac.timeout {
-									setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
-								}
 							}
-						}
 						
 						//Postamble
   					    f_cse_postamble_deleteResourcesCSE();
@@ -1659,7 +1632,7 @@ module OneM2M_PermutationFunctions {
 						alt {
 							[] mccPort.receive(mw_response(mw_responsePrimitive(int2004, f_getTemplateFromPrimitiveContent(v_request.primitiveContent)))) -> value v_response {
 								tc_ac.stop;
-								setverdict(pass, __SCOPE__ & ": Accepted updation for resource type remoteCSE containing attribute ");
+								setverdict(pass, __SCOPE__ & ": Accepted update for resource type remoteCSE containing attribute ");
 							}
 							[] mccPort.receive(mw_response(mw_responsePrimitiveOK(f_getTemplateFromPrimitiveContent(v_request.primitiveContent)))) -> value v_response {
 								tc_ac.stop;
@@ -1667,11 +1640,11 @@ module OneM2M_PermutationFunctions {
 							}
 							[] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Accepted updation for resource type remoteCSE without containing attribute ");
+								setverdict(fail, __SCOPE__ & ": Accepted update for resource type remoteCSE without containing attribute ");
 							}
 							[] mccPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Rejected updation of resource type remoteCSE containing attribute");
+								setverdict(fail, __SCOPE__ & ": Rejected update of resource type remoteCSE containing attribute");
 							}
 							[] tc_ac.timeout {
 								setverdict(fail, __SCOPE__ & ": No answer while updating resource type remoteCSE");
diff --git a/OneM2M_Testcases_CSE_Release_1.ttcn b/OneM2M_Testcases_CSE_Release_1.ttcn
index 036cd270ee483a0fa16f8bc8698aa28f3396bf95..cd7b3ca03d2fc415ded88522d7240c9720987ca1 100644
--- a/OneM2M_Testcases_CSE_Release_1.ttcn
+++ b/OneM2M_Testcases_CSE_Release_1.ttcn
@@ -2504,62 +2504,31 @@ module OneM2M_Testcases_CSE_Release_1 {
 					 // Test adapter configuration
 	
 					 // Preamble
-					 if(PX_IN_CSE){
-					     vc_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSEBase);
-					    
-						 v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
-	 
-						 mccPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex)))));
-						 tc_ac.start;
-						 alt {
-							 [] mccPort.receive(mw_response(mw_responsePrimitive(int2000, v_contentResponse))) -> value v_response {
-								 tc_ac.stop;
-								 setverdict(pass, __SCOPE__ & ": Response OK for retrieving");
-							 }
-							 [] mccPort.receive(mw_response(mw_responsePrimitiveOK(v_contentResponse))) -> value v_response {
-								 tc_ac.stop;
-								 setverdict(fail, __SCOPE__ & ": Wrong response status code");
-							 }
-							 [] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
-								 tc_ac.stop;
-								 setverdict(fail, __SCOPE__ & ": Error, resource elements provided not matching expected resource elements");
-							 }
-							 [] mccPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
-								 tc_ac.stop;
-								 setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
-							 }
-							 [] tc_ac.timeout {
-								 setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
-							 }
+				     vc_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSEBase);
+				    
+					 v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
+ 
+					 mccPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex)))));
+					 tc_ac.start;
+					 alt {
+						 [] mccPort.receive(mw_response(mw_responsePrimitive(int2000, v_contentResponse))) -> value v_response {
+							 tc_ac.stop;
+							 setverdict(pass, __SCOPE__ & ": Response OK for retrieving");
 						 }
-					    
-					 } else if (PX_MN_CSE) {
-						vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
-						
-						v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
-						
-						mccPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex)))));
-						tc_ac.start;
-						alt {
-							 [] mccPort.receive(mw_response(mw_responsePrimitive(int2000, v_contentResponse))) -> value v_response {
-								 tc_ac.stop;
-								 setverdict(pass, __SCOPE__ & ": Response OK for retrieving");
-							 }
-							 [] mccPort.receive(mw_response(mw_responsePrimitiveOK(v_contentResponse))) -> value v_response {
-								 tc_ac.stop;
-								 setverdict(fail, __SCOPE__ & ": Wrong response status code");
-							 }
-							 [] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
-								 tc_ac.stop;
-								 setverdict(fail, __SCOPE__ & ": Error, resource elements provided not matching expected resource elements");
-							 }
-							 [] mccPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
-								 tc_ac.stop;
-								 setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
-							 }
-							 [] tc_ac.timeout {
-								 setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
-							 }
+						 [] mccPort.receive(mw_response(mw_responsePrimitiveOK(v_contentResponse))) -> value v_response {
+							 tc_ac.stop;
+							 setverdict(fail, __SCOPE__ & ": Wrong response status code");
+						 }
+						 [] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+							 tc_ac.stop;
+							 setverdict(fail, __SCOPE__ & ": Error, resource elements provided not matching expected resource elements");
+						 }
+						 [] mccPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+							 tc_ac.stop;
+							 setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
+						 }
+						 [] tc_ac.timeout {
+							 setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
 						 }
 					 }
 	
@@ -2842,15 +2811,9 @@ module OneM2M_Testcases_CSE_Release_1 {
 					 // Test adapter configuration
 	
 					 // Preamble
-                    if (PX_IN_CSE){
-                        vc_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSEBase);
-                    }
-                    
-                    if (PX_MN_CSE){
-                        vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);   
-                    }
+                     vc_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSEBase);
 					 
-					v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
+ 					 v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
 	 
 					 mccPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex)))));
 					 tc_ac.start;
@@ -2947,7 +2910,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					// Tear down
 					f_cf01Down();
 
-				}; //end TC_CSE_REG_UPD_BI_001
+				}; //end TC_CSE_REG_UPD_001
 
 				/**
 				 * @desc Check that the IUT accepts an update request of <remoteCSE> resource with OPTIONAL_ATTRIBUTE.
@@ -3177,13 +3140,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					// Test adapter configuration
 
 					// Preamble
-                    if (PX_MN_CSE){
-					    vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSE);
-                    }
-                    
-                    if (PX_IN_CSE){
-					    vc_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSEBase);
-                    }
+				    vc_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSEBase);
                     
 					// Test Body
 					v_request := valueof(m_delete(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex)));
@@ -3218,8 +3175,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					}					    
 
 					// Postamble
-					f_cse_postamble_deleteResourcesCSE();
-
+					
 					// Tear down
 					f_cf04Down();