diff --git a/OneM2M_Testcases_CSE_Release_1.ttcn b/OneM2M_Testcases_CSE_Release_1.ttcn
index 5e4488d12dcb5c93fa18a0db9b4303271a079d3d..79f16317ceb30ef6b6c400b0ba6c3b02fde25d93 100644
--- a/OneM2M_Testcases_CSE_Release_1.ttcn
+++ b/OneM2M_Testcases_CSE_Release_1.ttcn
@@ -680,9 +680,6 @@ module OneM2M_Testcases_CSE_Release_1 {
 		  	  	
 		  	  		var MsgIn v_request;
 					var template RequestPrimitive v_requestPrimitive;
-					var integer v_cseBaseIndex := -1;
-					var ResourceType v_resourceType := int2;
-					var boolean v_handleResponses := false;
 					
 					//Test control
 	                
@@ -693,7 +690,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSE);
 		
 					//Test Body
-					vc_ae1.start(f_cse_sendCreateRequestPrimitive(int2, m_createAe(PX_APP_ID, -, "S", omit)));
+					vc_ae1.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, -, "S")));
 					vc_ae1.done;
 					
 					v_requestPrimitive := mw_createAEAnnc(PX_CSE_ID & "/S", -, -, -);
@@ -704,29 +701,26 @@ module OneM2M_Testcases_CSE_Release_1 {
 						[] mccPortIn.receive(mw_request(v_requestPrimitive)) -> value v_request {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__ & ": AE creation redirected.");
-							v_handleResponses := true;
+							f_cse_sendResponse(v_request);
 						}
 						[] mccPortIn.receive(mw_request(mw_createAEAnnc())) -> value v_request {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__ & ": AE creation redirected but wrong parameters");
-							v_handleResponses := true;
+							f_cse_sendResponse(v_request);
 						}
 						[] mccPortIn.receive(mw_request(?))-> value v_request {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__ & ": Unexpected message received");
-							v_handleResponses := true;
+							f_cse_sendResponse(v_request);
 						}
 						[] tc_ac.timeout {
 							setverdict(fail, __SCOPE__ & ": No answer while creating AE");
 						}
 					}
+					
+					vc_ae1.done;
 									
 					// Postamble
-					if (v_handleResponses) {
-						vc_ae1.start(f_cse_receiveResponse());
-						f_cse_sendResponse(v_request);
-						vc_ae1.done;
-					}
 					f_cse_postamble_deleteResourcesCSE();
 					
 					// Tear down