diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 1527dab972ea5955f2663e07a36304af23b4d481..4572a6aa637375e27619b8fa22fd5d4a1d926ed5 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -7060,7 +7060,6 @@ module OneM2M_PermutationFunctions {
 	       
 						p_requestPrimitive.to_ := f_getResourceAddress(v_groupIndex) & "/fopt";
 						p_requestPrimitive.from_ := f_getOriginator(v_groupIndex);
-						p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
 						
 						// Test Body
 	
@@ -7136,8 +7135,7 @@ module OneM2M_PermutationFunctions {
 	   
 						p_requestPrimitive.to_ := f_getResourceAddress(v_groupIndex) & "/fopt";
 						p_requestPrimitive.from_ := f_getOriginator(v_groupIndex);
-						p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
-	
+						
 						// Test Body
 	
 						f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
@@ -7202,8 +7200,7 @@ module OneM2M_PermutationFunctions {
 						
 						p_requestPrimitive.to_ := f_getResourceAddress(v_groupIndex) & "/fopt";
 						p_requestPrimitive.from_ := f_getOriginator(v_groupIndex);
-						p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
-	
+						
 						// Test Body
 	
 						f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
@@ -7278,8 +7275,7 @@ module OneM2M_PermutationFunctions {
 	   
 						p_requestPrimitive.to_ := f_getResourceAddress(v_groupIndex) & "/fopt";
 						p_requestPrimitive.from_ := f_getOriginator(v_groupIndex);
-						p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
-	
+						
 						// Test Body
 	
 						f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
@@ -7353,8 +7349,7 @@ module OneM2M_PermutationFunctions {
 						   
 						p_requestPrimitive.to_ := f_getResourceAddress(v_groupIndex) & "/fopt";
 						p_requestPrimitive.from_ := f_getOriginator(v_groupIndex); 
-						p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
-	
+						
 						// Test Body
 	
 						f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
@@ -7456,8 +7451,7 @@ module OneM2M_PermutationFunctions {
 	   
 						p_requestPrimitive.to_ := f_getResourceAddress(v_groupIndex) & "/" & c_resourceShortNameFanOutPoint & "/" & c_defaultContainerResourceName;
 						p_requestPrimitive.from_ := f_getOriginator(v_groupIndex); //TODO see if it is correct or if we have to use PX_SUPER_ADMIN
-						p_requestPrimitive.requestIdentifier := p_requestPrimitive.requestIdentifier & f_rnd(1, 1000000);
-	
+						
 						// Test Body
 	
 						f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
@@ -7708,8 +7702,7 @@ module OneM2M_PermutationFunctions {
 							// Test Body
 							p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
 							p_requestPrimitive.from_ := f_getResourceId(vc_resourcesList[v_aeIndex2].resource);
-							p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
-	
+							
 							f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
 							tc_ac.start;
 							alt {
@@ -7778,8 +7771,7 @@ module OneM2M_PermutationFunctions {
 							// Test Body
 							p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
 							p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
-							p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
-	
+							
 							f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
 							tc_ac.start;
 							alt {
@@ -7834,7 +7826,6 @@ module OneM2M_PermutationFunctions {
 							// Test Body
 							p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
 							p_requestPrimitive.from_ := "testDomain";
-							p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
 							
 							f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
 							tc_ac.start;
@@ -7914,8 +7905,7 @@ module OneM2M_PermutationFunctions {
 							// Test Body
 							p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
 							p_requestPrimitive.from_ := f_getResourceId(vc_resourcesList[v_aeIndex2].resource);
-							p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
-			
+							
 							f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
 							tc_ac.start;
 							alt {
@@ -7972,8 +7962,7 @@ module OneM2M_PermutationFunctions {
 							// Test Body
 							p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
 							p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
-							p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
-			
+							
 							f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
 							tc_ac.start;
 							alt {
@@ -8042,8 +8031,7 @@ module OneM2M_PermutationFunctions {
 							// Test Body
 							p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
 							p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
-							p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
-			
+							
 							f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
 							tc_ac.start;
 							alt {
@@ -8105,8 +8093,7 @@ module OneM2M_PermutationFunctions {
 							// Test Body
 							p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
 							p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
-							p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
-			
+							
 							f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
 							tc_ac.start;
 							alt {
@@ -8163,8 +8150,7 @@ module OneM2M_PermutationFunctions {
 							// Test Body
 							p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
 							p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
-							p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
-			
+							
 							f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
 							tc_ac.start;
 							alt {
@@ -8219,8 +8205,7 @@ module OneM2M_PermutationFunctions {
 							// Test Body
 							p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
 							p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
-							p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
-			
+							
 							f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
 							tc_ac.start;
 							alt {
@@ -8280,8 +8265,7 @@ module OneM2M_PermutationFunctions {
 							// Test Body
 							p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
 							p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
-							p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
-			
+							
 							f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
 							tc_ac.start;
 							alt {
@@ -8336,8 +8320,7 @@ module OneM2M_PermutationFunctions {
 							// Test Body
 							p_requestPrimitive.to_ := f_getResourceAddress(v_containerIndex);
 							p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
-							p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
-	
+							
 							f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
 							tc_ac.start;
 							alt {
@@ -8399,7 +8382,6 @@ module OneM2M_PermutationFunctions {
 							// Test Body
 							p_requestPrimitive.to_ := f_getResourceAddress(v_containerIndex);
 							p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
-							p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
 								
 							f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
 							tc_ac.start;