diff --git a/LibOneM2M/OneM2M_Pixits.ttcn b/LibOneM2M/OneM2M_Pixits.ttcn
index b7eae500624e8ff5c3f29fe5e0f4d54c12b8daf1..fdea99d4252138a7a5ab1f5656e57b76b896115a 100644
--- a/LibOneM2M/OneM2M_Pixits.ttcn
+++ b/LibOneM2M/OneM2M_Pixits.ttcn
@@ -21,9 +21,11 @@ module OneM2M_Pixits {
 	
 		group IutParameters {
 			
-			modulepar boolean PX_MN_CSE	:= true; 
+			modulepar boolean PX_IN_CSE	:= true; 
 			
-			modulepar boolean PX_IN_CSE	:= false; 
+			modulepar boolean PX_MN_CSE	:= false; 
+						
+			modulepar boolean PX_ASN_CSE:= false; 
 		
 			modulepar charstring PX_SUT_ADDRESS := "127.0.0.1:8080";
 			
@@ -142,13 +144,6 @@ module OneM2M_Pixits {
 	
 			modulepar boolean PX_RUN_POSTAMBLE 				:= true;		
 		}
-
-	
-	//for checking whether the locationPolicy creation request is originated from a ASN-AE
-	//NOTE: Apply to Device-based location request, and this requires Test System (TS) to activate ASN-AE mode to test IUT  	
-	modulepar boolean PX_IUT_IS_ASN_CSE				:= false; //default //set it to true when running Device-based location testcases 	
-	modulepar boolean PX_IUT_IS_MN_CSE				:= false; //default //set it to true when running Share-based location testcases
-	modulepar boolean PX_IUT_IS_IN_CSE				:= false; //default //set it to true when running Share-based location testcases
 	
 	//constant parameters for LOC  
 	modulepar XSD.Token PX_LOCATION_TARGET_ID				:= "{LOCATION-TARGET-ID}"; //SUPPOSE TO BE RECEIVED FROM LOCATION SERVER
diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 4ce39ace69ff46d95162abbc04e877e622a3dde9..715c013a33165817e518af41db333d44b54e980c 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -2674,9 +2674,9 @@ module OneM2M_PermutationFunctions {
 	
 						// Preamble
 						
-						if (PX_IUT_IS_MN_CSE == true) {
+						if (PX_MN_CSE) {
 							vc_cse1.start(f_cse_registrationRemoteCse(m_createRemoteCSEBase));
-						}else if (PX_IUT_IS_IN_CSE == true) {
+						}else if (PX_IN_CSE) {
 							vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSEBase));
 						}	
 						vc_cse1.done;						
diff --git a/OneM2M_Testcases_CSE_Release_2.ttcn b/OneM2M_Testcases_CSE_Release_2.ttcn
index 389eaf3a1aeb67b1d120d248f6b776954af6c24c..caf7d651357d6c347288f3ace276f6273f0c62c9 100644
--- a/OneM2M_Testcases_CSE_Release_2.ttcn
+++ b/OneM2M_Testcases_CSE_Release_2.ttcn
@@ -5351,7 +5351,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 				f_cf01Up();
      	     	
      	     	
-				if(PX_IUT_IS_ASN_CSE){
+				if(PX_ASN_CSE){
      	     	  
 					//Preamble
 					v_aeAuxIndex := f_cse_preamble_registerAe();
@@ -5416,7 +5416,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 				f_cf01Up();
      	     	
      	     	
-				if(PX_IUT_IS_MN_CSE){
+				if(PX_MN_CSE){
      	     	      	     	    
 					//Preamble
 					v_aeAuxIndex := f_cse_preamble_registerAe();