diff --git a/OneM2M_Testcases_CSE_Release_2.ttcn b/OneM2M_Testcases_CSE_Release_2.ttcn
index 3433672fad24eb945cfd37d640d0bc1a54dda245..bd867eeef398314c55e8e2a58c303fd76e3f119d 100644
--- a/OneM2M_Testcases_CSE_Release_2.ttcn
+++ b/OneM2M_Testcases_CSE_Release_2.ttcn
@@ -32,7 +32,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 				var integer i; 
 				var XSD.ID v_resourceAddress;
 				var RequestPrimitive v_request;
-				map(self:mcaPort, system:mcaPort); 
+				map(self:mcaPort, system:mcaPort) param (PX_TS_AE1.mcaPort); 
 					
 				for (i:=0; i<lengthof(PX_RESOURCES_TO_BE_DELETED); i:= i+1) {  
 					
@@ -3002,10 +3002,6 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 					v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)},omit,omit,m_batchNotify(numberOfAggregatedNotification), true, omit,  -, omit);
             		
-					//TODO We Need to check if the IUT send a notification only for the latest update operation
-					// like we match a Notification we have to verify if it is the first (unvalid behavior) or the last (valid behavior)
-					// maybe we need to synchronise our components
-            		
 					v_resourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex);//Subscription
             					
 					if(vc_ae2.running) {
@@ -3013,6 +3009,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					};
 					
 					// Test Body
+					v_contentResponse.aE.labels := v_labels_3;
 					vc_ae2.start(f_cse_notifyProcedure_representationHandler(v_contentResponse)); // check if the notification is well received and if its content matchs
             					
 					v_updateRequest.primitiveContent.aE.labels := v_labels_1;