diff --git a/LibOneM2M/OneM2M_Pixits.ttcn b/LibOneM2M/OneM2M_Pixits.ttcn
index d7fe88e6b359468a6ac5a2238e3c3dfaa2f07615..3da3dfd5edf559d5917d61f85deb2bbb71d1e26b 100644
--- a/LibOneM2M/OneM2M_Pixits.ttcn
+++ b/LibOneM2M/OneM2M_Pixits.ttcn
@@ -53,10 +53,8 @@ module OneM2M_Pixits {
 	modulepar boolean PX_FROM_IS_AE_ID 				:= false;
 	//@Martin
 	//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_TS_IS_ASN_AE				:= false; //default
-	modulepar boolean PX_IUT_IS_ASN_CSE				:= false; //default //set it to true when running Device-based location testcases 
-	modulepar boolean PX_TS_IS_ADN_AE				:= true; //default 
+	//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
 	
 	//@Martin
diff --git a/OneM2M_Testcases.ttcn b/OneM2M_Testcases.ttcn
index 48391153b62a34026afe80386557be08397fbf19..6d40e4e00f0055c2c716d6070967c72bf9ec5f5d 100644
--- a/OneM2M_Testcases.ttcn
+++ b/OneM2M_Testcases.ttcn
@@ -4161,7 +4161,7 @@ module OneM2M_Testcases {
      	     	
      	     	
      	     	if(PX_IUT_IS_ASN_CSE){
-     	     	  if(PX_TS_IS_ASN_AE){
+     	     	  
      	     	    //Preamble
      	     		v_aeAuxIndex := f_cse_preamble_registerAe();
      	     		//Set requestPrimitive
@@ -4186,7 +4186,7 @@ module OneM2M_Testcases {
       		      
       		      // Postamble
           			f_cse_postamble_deleteResources();	 
-    				}
+    				
      	     	} 
 				// Tear down
 				f_cf01Down(); 		      
@@ -4210,8 +4210,7 @@ module OneM2M_Testcases {
      	     	
      	     	
      	     	if(PX_IUT_IS_MN_CSE){
-     	     	  if(PX_TS_IS_ADN_AE){
-     	     	    
+     	     	      	     	    
      	     	    //Preamble
      	     		v_aeAuxIndex := f_cse_preamble_registerAe();
      	     		//Set requestPrimitive
@@ -4236,7 +4235,7 @@ module OneM2M_Testcases {
     		      
     		      // Postamble
         			f_cse_postamble_deleteResources();	 
-    				}
+    				
      	     	}  
 				// Tear down
 				f_cf01Down();