diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 7e6c8725ab6e2079e1ee693df189e0d94ecbd8ae..2172c7da18d330167b06c53d75c08fec3854d56e 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -958,7 +958,9 @@ module OneM2M_Functions {
 						setverdict(pass, __SCOPE__ & ":INFO: Announcement received");
 						//TODO Save resource and generate required attributes
 						v_responsePrimitive := f_getCreateResponsePrimitive(v_request.primitive.requestPrimitive.resourceType, v_request.primitive.requestPrimitive);
-						mccPort.send(m_response(v_responsePrimitive)); 						
+						mccPort.send(m_response(v_responsePrimitive));
+						f_checkAttributesToBeSaved(v_request.primitive.requestPrimitive.resourceType, v_request, vc_response.primitive.responsePrimitive);
+						f_setResource(vc_response.primitive.responsePrimitive.primitiveContent, v_request.primitive.requestPrimitive.resourceType, vc_remoteCseIndex);					
 					}
 					[] mccPort.receive{
 						tc_ac.stop;
diff --git a/OneM2M_Testcases.ttcn b/OneM2M_Testcases.ttcn
index baf4de0d95bbfd22c7497556ebb2c101ef5db212..2542aedf331fddd4d831ff6243a43e4bb2cdf734 100644
--- a/OneM2M_Testcases.ttcn
+++ b/OneM2M_Testcases.ttcn
@@ -1168,7 +1168,9 @@ module OneM2M_Testcases {
 					vc_cseSimu.start(f_cse_resourceAnnouncementHandler());
 					
 					//TODO Deregister
-					
+					//f_cse_deleteResource(v_aeIndex);
+					v_request := valueof(m_delete(f_getResourceAddress(v_aeIndex), f_getOriginator(v_aeIndex)));
+					mcaPort.send(m_request(v_request));
 					
 					//Test Body
 					f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, f_getResourceId(vc_resourcesList[v_aeIndex].resource)));