diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 4f2285a4220449936daa7af54e3ecac93551b59a..1569f13c02b27dee45c0e8ba94ef0b0815cc3c3b 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -403,6 +403,7 @@ module OneM2M_Functions {
 				if(p_resourceType == int23){
 					p_ae2 := AeSimu.create("AE2") alive;
 					p_ae2.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, "MyAe2", {f_getAnnouncementTargetPoA("HTTP", PX_AE2_ADDRESS, "")}), -1)); // AE2 is registred
+					p_ae2.done;
 					p_ae2Index := f_getResource(p_ae2);
 					if(ischosen(p_createRequestPrimitive.primitiveContent.subscription)){		//this condition is necessary for Subscription TCs where notification URI is set in m_createSubscriptionAdvanced
 						p_createRequestPrimitive.primitiveContent.subscription.notificationURI := {f_getResourceAddress(p_ae2Index)}; 
@@ -563,7 +564,7 @@ module OneM2M_Functions {
 				p_cse.start(f_sendRemoteCseResource());
 				alt {
 					[]infoPort.receive(mw_resource) -> value v_resource {
-						v_resourceIndex := f_setResource(v_resource.resource, v_resource.resourceType, v_resource.parentIndex);
+						v_resourceIndex := f_setResource(v_resource.resource, v_resource.resourceType, v_resource.parentIndex, false);
 					}
 				}
 		
@@ -585,7 +586,7 @@ module OneM2M_Functions {
 				p_ae.start(f_sendResource(p_resourceIndex));
 				alt {
 					[]infoPort.receive(mw_resource) -> value v_resource {
-						v_resourceIndex := f_setResource(v_resource.resource, v_resource.resourceType, v_resource.parentIndex);
+						v_resourceIndex := f_setResource(v_resource.resource, v_resource.resourceType, v_resource.parentIndex, false);
 					}
 				}
 	
@@ -1148,7 +1149,7 @@ module OneM2M_Functions {
 						[] mcaPortIn.receive(mw_request(mw_notify(v_notificationRequest))) -> value v_request {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__ & ":INFO: Notification received");
-							v_responsePrimitive.requestIdentifier := v_request.primitive.requestPrimitive.requestIdentifier;
+							
 //							if(f_isHierarchical(v_request.primitive.requestPrimitive.primitiveContent.notification.creator)) {
 //								setverdict(fail, __SCOPE__ & ": Creator cannot contain a hierarchical address");
 //								v_responsePrimitive.responseStatusCode := int4000;
@@ -1159,7 +1160,6 @@ module OneM2M_Functions {
 //								setverdict(fail, __SCOPE__ & ": Creator not set to originator of the subscription creation primitive");
 //								v_responsePrimitive.responseStatusCode := int4000;
 //							}
-							mcaPortIn.send(m_httpResponse(v_responsePrimitive)); 						
 						}
 						[] mcaPortIn.receive(mw_request(mw_notify(mw_contentNotification(?)))) -> value v_request {
 							tc_ac.stop;
@@ -1171,9 +1171,18 @@ module OneM2M_Functions {
 						}
 						[] tc_ac.timeout {
 							setverdict(fail, __SCOPE__ & ":ERROR:  No notification received");
+							stop;
 						}
 					}
-    	
+						
+					v_responsePrimitive.requestIdentifier := v_request.primitive.requestPrimitive.requestIdentifier;
+					if(getverdict() == pass) {
+						mcaPortIn.send(m_httpResponse(v_responsePrimitive));
+					} else {
+						v_responsePrimitive.responseStatusCode := int4000; 
+						mcaPortIn.send(m_httpResponse(v_responsePrimitive));
+					}
+					
 					//mcaPort.send(m_response(v_responsePrimitive));	// TODO have to be deleted
         
 				} //end f_subscriptionVerificationHandler
@@ -1518,7 +1527,7 @@ module OneM2M_Functions {
 						}
 						p_myResource.remoteCSE.nodeLink := omit;
       					
-						return f_setResource(p_myResource, p_resourceType, p_parentIndex);			   
+						return f_setResource(p_myResource, p_resourceType, p_parentIndex, false);			   
 				    
 					}
 				}
@@ -1680,7 +1689,7 @@ module OneM2M_Functions {
       					
 						p_resource.aE := v_ae;
 						p_modifiedResource.aE := v_aeModified;
-						return f_setResource(p_resource, p_resourceType, p_parentIndex);			   
+						return f_setResource(p_resource, p_resourceType, p_parentIndex, false);			   
 				    
 					}
 										
@@ -2170,7 +2179,7 @@ module OneM2M_Functions {
 		 * @return Internal resource index of the saved resource
 		 * @verdict 
 		 */
-		function f_setResource(PrimitiveContent p_resource, ResourceType p_resourceType, integer  p_parentIndex := -1) runs on Tester return integer {
+		function f_setResource(PrimitiveContent p_resource, ResourceType p_resourceType, integer  p_parentIndex := -1, in boolean p_resourceToBeDeleted := true) runs on Tester return integer {
 			var integer v_newIndex := -1;	
 			if(isbound(vc_resourcesList)) {
 				vc_resourcesList[lengthof(vc_resourcesList)] := {p_parentIndex, p_resourceType, p_resource};
@@ -2179,8 +2188,10 @@ module OneM2M_Functions {
 			}
 			
 			v_newIndex := lengthof(vc_resourcesList)-1;
-			if(match(int2, p_resourceType) or match(-1, p_parentIndex)) {//If created resource is an AE or created under CSEBase, it needs to be added to the resourceToBeDeleted list
-				vc_resourcesIndexToBeDeleted := vc_resourcesIndexToBeDeleted & {v_newIndex};
+			if(p_resourceToBeDeleted) {
+				if(match(int2, p_resourceType) or match(-1, p_parentIndex)) {//If created resource is an AE or created under CSEBase, it needs to be added to the resourceToBeDeleted list
+					vc_resourcesIndexToBeDeleted := vc_resourcesIndexToBeDeleted & {v_newIndex};
+				}
 			}
 			
 			return v_newIndex;
diff --git a/OneM2M_Testcases.ttcn b/OneM2M_Testcases.ttcn
index ac0224c82c178dc927fa617818b954043ae98ce7..f86ce322b79ade3714e7ae671da61fc1ef2be67f 100644
--- a/OneM2M_Testcases.ttcn
+++ b/OneM2M_Testcases.ttcn
@@ -1156,7 +1156,7 @@ module OneM2M_Testcases {
 				testcase TC_CSE_REG_CRE_010() runs on AeSimu system CseSystem {
 		  	  	
 					var MsgIn v_response;
-					var ResponsePrimitive v_request;
+					var RequestPrimitive v_request;
 					var integer v_aeIndex := -1;
 	                
 					// Test component configuration
@@ -1209,9 +1209,9 @@ module OneM2M_Testcases {
 					// Tear down
 					f_cf02Down();
 						
-				} //end TC_CSE_REG_CRE_010
+				}; //end TC_CSE_REG_CRE_010
 				
-				group g_CSE_REG_CRE_016{
+				group g_CSE_REG_CRE_016 {
 					
 					/**
 					 * @desc Check that the IUT accepts a create request of <remoteCSE> resource with OPTIONAL_ATTRIBUTE. 
@@ -2469,16 +2469,17 @@ module OneM2M_Testcases {
 						mcaPort.send(m_request(v_request));
 						tc_ac.start;
 						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value vc_response {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__ & ": Resource type " & int2str(enum2int(p_resourceType)) & " created successfully");
-								v_resourceIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, p_resourceType, v_parentIndex);
+								f_checkAttributesToBeSaved(p_resourceType, v_request, vc_response.primitive.responsePrimitive);
+								v_resourceIndex := f_setResource(vc_response.primitive.responsePrimitive.primitiveContent, p_resourceType, v_parentIndex);
 							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__ & ": Wrong response status code");
 								}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__ & ": Error while creating resource type " & int2str(enum2int(p_resourceType)));
 							}
@@ -2498,14 +2499,14 @@ module OneM2M_Testcases {
     								
 						// Postamble
 						f_cse_postamble_deleteResources();
-						vc_resourcesIndexToBeDeleted := {};
-    					
+						v_ae2.start(f_cse_postamble_deleteResources());
+						
 						// Tear down
 						//ae2.stop;
 						f_cf01Down();
 						unmap(v_ae2:mcaPort, system:mcaPort);
     					
-						return v_response.primitive.responsePrimitive;
+						return vc_response.primitive.responsePrimitive;
     					    				
 					}//end f_CSE_DMR_CRE_001
     				
@@ -2672,16 +2673,17 @@ module OneM2M_Testcases {
 						mcaPort.send(m_request(v_request));
 						tc_ac.start;
 						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value vc_response {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__ & ": Resource type " & int2str(enum2int(p_resourceType)) & " created successfully");
-								v_resourceIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, p_resourceType, v_aeIndex);
+								f_checkAttributesToBeSaved(p_resourceType, v_request, vc_response.primitive.responsePrimitive);
+								v_resourceIndex := f_setResource(vc_response.primitive.responsePrimitive.primitiveContent, p_resourceType, v_aeIndex);
 							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__ & ": Wrong response status code");
 							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__ & ": Error while creating resource type " & int2str(enum2int(p_resourceType)));
 							}
@@ -2704,7 +2706,7 @@ module OneM2M_Testcases {
 						// Tear down
 						f_cf01Down();
 						
-						return v_response.primitive.responsePrimitive;
+						return vc_response.primitive.responsePrimitive;
 				
 					}//end f_CSE_DMR_CRE_002
 					
@@ -3150,16 +3152,17 @@ module OneM2M_Testcases {
 							mcaPort.send(m_request(v_request));
 							tc_ac.start;
 							alt {
-								[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
+								[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value vc_response {
 									tc_ac.stop;
 									setverdict(pass, __SCOPE__ & ": Accepted creation rejected for resource type " & int2str(enum2int(p_resourceType)));
-									v_resourceIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, p_resourceType, v_aeIndex);
+									f_checkAttributesToBeSaved(p_resourceType, v_request, vc_response.primitive.responsePrimitive);
+									v_resourceIndex := f_setResource(vc_response.primitive.responsePrimitive.primitiveContent, p_resourceType, v_aeIndex);
 								}
-								[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+								[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
 									tc_ac.stop;
 									setverdict(fail, __SCOPE__ & ": Wrong response status code");
 								}
-								[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+								[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
 									tc_ac.stop;
 									setverdict(fail, __SCOPE__ & ": Creation rejected of resource type " & int2str(enum2int(p_resourceType)));
 								}
@@ -3183,7 +3186,7 @@ module OneM2M_Testcases {
 							// Tear down
 							f_cf01Down();
 						
-							return v_response.primitive.responsePrimitive;
+							return vc_response.primitive.responsePrimitive;
     					    				
 						}//end f_CSE_DMR_CRE_006
 						
@@ -4390,6 +4393,7 @@ module OneM2M_Testcases {
 								[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001, f_getTemplateFromPrimitiveContent(v_request.primitiveContent)))) -> value v_response {
 									tc_ac.stop;
 									setverdict(pass, __SCOPE__ & ": Accepted creation for resource type " & int2str(enum2int(p_resourceType)) & " containing attribute " & p_optionalAttribute.name);
+									f_checkAttributesToBeSaved(p_resourceType, v_request, v_response.primitive.responsePrimitive);
 									v_resourceIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, p_resourceType, v_parentIndex);
 								}
 								[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(f_getTemplateFromPrimitiveContent(v_request.primitiveContent)))) -> value v_response {
@@ -8423,15 +8427,15 @@ module OneM2M_Testcases {
 						mcaPort.send(m_request(v_request));
 						tc_ac.start;
 						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value vc_response {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__ & ": Attribute of resource type " & int2str(enum2int(p_resourceType)) & " updated successfully");
 							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__ & ": Wrong response status code");
 							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__ & ": Error while updating resource type " & int2str(enum2int(p_resourceType)));
 							}
@@ -8451,7 +8455,7 @@ module OneM2M_Testcases {
 						// Tear down
 						f_cf01Down();
 						
-						return v_response.primitive.responsePrimitive;
+						return vc_response.primitive.responsePrimitive;
     					    				
 					}//end f_CSE_DMR_UPD_001
     				
@@ -8703,15 +8707,15 @@ module OneM2M_Testcases {
 						mcaPort.send(m_request(v_request));
 						tc_ac.start;
 						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value vc_response {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__ & ": Attribute of resource type " & int2str(enum2int(p_resourceType)) & " updated successfully");
 							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__ & ": Wrong response status code");
 							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__ & ": Error while updating resource type " & int2str(enum2int(p_resourceType)));
 							}
@@ -8729,7 +8733,7 @@ module OneM2M_Testcases {
 						// Tear down
 						f_cf01Down();
 						
-						return v_response.primitive.responsePrimitive;
+						return vc_response.primitive.responsePrimitive;
     					    				
 					}//end f_CSE_DMR_UPD_002
     				
@@ -9027,15 +9031,15 @@ module OneM2M_Testcases {
 						mcaPort.send(m_request(v_request, p_nullFields));
 						tc_ac.start;
 						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value vc_response {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__ & ": Attribute of resource type " & int2str(enum2int(p_resourceType)) & " updated successfully");
 							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__ & ": Wrong response status code");
 							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO))  -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO))  -> value vc_response {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__ & ": Error while updating resource type " & int2str(enum2int(p_resourceType)));
 							}
@@ -9052,7 +9056,7 @@ module OneM2M_Testcases {
 						// Tear down
 						f_cf01Down();
 						
-						return v_response.primitive.responsePrimitive;
+						return vc_response.primitive.responsePrimitive;
     					    				
 					}//end f_CSE_DMR_UPD_003
     				
@@ -9438,15 +9442,15 @@ module OneM2M_Testcases {
 						mcaPort.send(m_request(v_request, p_nullFields));
 						tc_ac.start;
 						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value vc_response {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__ & ": Attribute of resource type " & int2str(enum2int(p_resourceType)) & " updated successfully");
 							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__ & ": Wrong response status code");
 							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO))  -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO))  -> value vc_response {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__ & ": Error while updating resource type " & int2str(enum2int(p_resourceType)));
 							}
@@ -9463,7 +9467,7 @@ module OneM2M_Testcases {
 						// Tear down
 						f_cf01Down();
 						
-						return v_response.primitive.responsePrimitive;
+						return vc_response.primitive.responsePrimitive;
     					    				
 					}//end f_CSE_DMR_UPD_004
     				
@@ -11359,11 +11363,11 @@ module OneM2M_Testcases {
 						mcaPort.send(m_request(v_request));
 						tc_ac.start;
 						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value vc_response {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__ & ": Attribute of resource type " & int2str(enum2int(p_resourceType)) & " updated successfully");
 							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__ & ": Error while updating resource type " & int2str(enum2int(p_resourceType)));
 							}
@@ -12614,15 +12618,15 @@ module OneM2M_Testcases {
 						mcaPort.send(m_request(v_request)); //CSEBase
 						tc_ac.start;
 						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value vc_response {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__, ": Attribute of resource type " & int2str(enum2int(p_resourceType)) & " updated successfully");
 							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__, ": Wrong response status code");
 							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__, ": Error while updating optional attribute");
 							}
@@ -13233,15 +13237,15 @@ module OneM2M_Testcases {
 						mcaPort.send(m_request(v_request)); //CSEBase
 						tc_ac.start;
 						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value vc_response {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__, ": Attribute of resource type " & int2str(enum2int(p_resourceType)) & " updated successfully");
 							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__, ": Wrong response status code");
 							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__, ": Error while updating mandatory attribute");
 							}
@@ -14251,6 +14255,7 @@ module OneM2M_Testcases {
 					[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
 						tc_ac.stop;
 						setverdict(pass, __SCOPE__ & ": Resource locationPolicy is created successfully with response status code: " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode))&"!");
+						f_checkAttributesToBeSaved(int10, v_request, v_response.primitive.responsePrimitive);
 						v_resourceIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int10, v_aeAuxIndex);
 					}
 					[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
@@ -14574,6 +14579,7 @@ module OneM2M_Testcases {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__ & ": Resource locationPolicy is created successfully with response status code: " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode))&"!");
+							f_checkAttributesToBeSaved(int10, v_request, v_response.primitive.responsePrimitive);
 							v_resourceIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int10, v_aeAuxIndex);
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
@@ -14638,6 +14644,7 @@ module OneM2M_Testcases {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__ & ": Resource locationPolicy is created successfully with response status code: " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode))&"!");
+							f_checkAttributesToBeSaved(int10, v_request, v_response.primitive.responsePrimitive);
 							v_resourceIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int10, v_aeAuxIndex);
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
@@ -18957,6 +18964,7 @@ module OneM2M_Testcases {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__ & ": Resource type " & int2str(enum2int(c_accessControlPolicyType)) & " created successfully");
+								f_checkAttributesToBeSaved(c_accessControlPolicyType, v_createRequest, v_response.primitive.responsePrimitive);
 								v_acpIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int1, v_aeIndex);
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {