diff --git a/OneM2M_Testcases_AE.ttcn b/OneM2M_Testcases_AE.ttcn
index b7d4eb690fea998d150e4025444c8e3cd9afcd00..c15d8757f6979820fdc996b5f25363c5ca50520b 100644
--- a/OneM2M_Testcases_AE.ttcn
+++ b/OneM2M_Testcases_AE.ttcn
@@ -94,7 +94,8 @@ module OneM2M_Testcases_AE {
 								setverdict(pass, __SCOPE__, " : Container creation request received successfuly");
 							
 								v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
-								mcaPortIn.send(m_response(v_responsePrimtive));							}
+								mcaPortIn.send(m_response(v_responsePrimitive));
+							}
 							[] mcaPortIn.receive(mw_request(?)) {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__, " : Error while creating container");
@@ -176,7 +177,8 @@ module OneM2M_Testcases_AE {
 								setverdict(pass, __SCOPE__, " : Container creation request received successfuly");
 		
 								v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
-								mcaPortIn.send(m_response(v_responsePrimitive));							}
+								mcaPortIn.send(m_response(v_responsePrimitive));
+							}
 							[] mcaPortIn.receive(mw_request(?)) {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__, " : Error while creating container");
@@ -266,7 +268,8 @@ module OneM2M_Testcases_AE {
 								setverdict(pass, __SCOPE__, " : Container update request received successfuly");
 							
 								v_responsePrimitive := valueof(m_responsePrimitive(int2004, "To_be_defined", omit));
-								mcaPortIn.send(m_response(v_responsePrimitive));							}
+								mcaPortIn.send(m_response(v_responsePrimitive));
+							}
 							[] mcaPortIn.receive(mw_request(?)) {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__, " : Error while updating container");
@@ -350,7 +353,8 @@ module OneM2M_Testcases_AE {
 								setverdict(pass, __SCOPE__, " : Container update request received successfuly");
 							
 								v_responsePrimitive := valueof(m_responsePrimitive(int2004, "To_be_defined", omit));
-								mcaPortIn.send(m_response(v_responsePrimitive));							}
+								mcaPortIn.send(m_response(v_responsePrimitive));
+							}
 							[] mcaPortIn.receive(mw_request(?)) {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__, " : Error while updating container");
@@ -440,7 +444,8 @@ module OneM2M_Testcases_AE {
 								setverdict(pass, __SCOPE__, " : Container retrieve request received successfuly");
 				
 								v_responsePrimitive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
-								mcaPortIn.send(m_response(v_responsePrimitive));							}
+								mcaPortIn.send(m_response(v_responsePrimitive));
+							}
 							[] mcaPortIn.receive(mw_request(?)) {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__, " : Error while retrieving container");
@@ -525,7 +530,8 @@ module OneM2M_Testcases_AE {
 								setverdict(pass, __SCOPE__, " : Container retrieve request received successfuly");
 				
 								v_responsePrimitive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
-								mcaPortIn.send(m_response(v_responsePrimitive));							}
+								mcaPortIn.send(m_response(v_responsePrimitive));
+							}
 							[] mcaPortIn.receive(mw_request(?)) {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__, " : Error while retrieving container");
@@ -614,7 +620,8 @@ module OneM2M_Testcases_AE {
 								setverdict(pass, __SCOPE__, " : Container update request received successfuly");
 				
 								v_responsePrimitive := valueof(m_responsePrimitive(int2004, "To_be_defined", omit));
-								mcaPortIn.send(m_response(v_responsePrimitive));							}
+								mcaPortIn.send(m_response(v_responsePrimitive));
+							}
 							[] mcaPortIn.receive(mw_request(?)) {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__, " : Error while updating container");
@@ -699,7 +706,8 @@ module OneM2M_Testcases_AE {
 								setverdict(pass, __SCOPE__, " : Container update request received successfuly");
 				
 								v_responsePrimitive := valueof(m_responsePrimitive(int2004, "To_be_defined", omit));
-								mcaPortIn.send(m_response(v_responsePrimitive));							}
+								mcaPortIn.send(m_response(v_responsePrimitive));
+							}
 							[] mcaPortIn.receive(mw_request(?)) {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__, " : Error while updating container");
@@ -754,7 +762,8 @@ module OneM2M_Testcases_AE {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
 							
 							//send back responsePrimitive
-							mcaPortIn.send(m_response(v_responsePrimitive));						}
+							mcaPortIn.send(m_response(v_responsePrimitive));
+						}
 						[] mcaPortIn.receive(mw_request(mw_createAe(*,?,m_contentCreateAe_Invalid))) -> value v_request {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__, " : AE registration request is rejected due to not including mandatory attributes!!");
@@ -879,22 +888,24 @@ module OneM2M_Testcases_AE {
 	
 						//primitives for mcaPortIn
 						var MsgIn v_request;
-						var ResponsePrimitive v_responsePrimitive;	
+						var ResponsePrimitive v_responsePrimitive;
+	
 						f_cf03Up();
 	
 						//Send Trigger Message
 						f_sendUtPrimitive(p_utRequest,p_action);
 	
-								//Test behavior
-								tc_ac.start;
-								alt{
-									[] mcaPortIn.receive(mw_request(p_response)) -> value v_request {
-										tc_ac.stop;
-										setverdict(pass, __SCOPE__, " : AE registration request is accepted!!");
-										//v_responsePrimtive := valueof(m_responsePrimitiveTemp(int2000, omit));
-										v_responsePrimtive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));	
+						//Test behavior
+						tc_ac.start;
+						alt{
+							[] mcaPortIn.receive(mw_request(p_response)) -> value v_request {
+								tc_ac.stop;
+								setverdict(pass, __SCOPE__, " : AE registration request is accepted!!");
+								//v_responsePrimitive := valueof(m_responsePrimitiveTemp(int2000, omit));
+								v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+	
 								//send back responsePrimitive
-								mcaPortIn.send(m_response(v_responsePrimtive));
+								mcaPortIn.send(m_response(v_responsePrimitive));
 							}
 							[] mcaPortIn.receive(mw_request(mw_createAe(*,?,m_contentCreateAe_Invalid))) -> value v_request {
 								tc_ac.stop;
@@ -902,7 +913,8 @@ module OneM2M_Testcases_AE {
 							}
 							[] tc_ac.timeout{
 								setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
-							}	
+							}
+	
 						}
 	
 						// Postamble
@@ -945,7 +957,8 @@ module OneM2M_Testcases_AE {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
 	
 							//send back responsePrimitive
-							mcaPortIn.send(m_response(v_responsePrimitive));						}
+							mcaPortIn.send(m_response(v_responsePrimitive));
+						}
 						[] mcaPortIn.receive {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__, " : Error while AE deregistration");
@@ -995,7 +1008,8 @@ module OneM2M_Testcases_AE {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
 							
 							//send back responsePrimitive
-							mcaPortIn.send(m_response(v_responsePrimitive));						}
+							mcaPortIn.send(m_response(v_responsePrimitive));
+						}
 						[] mcaPortIn.receive {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__, " : Container creation request is rejected due to not including mandatory attributes!!");
@@ -1039,7 +1053,8 @@ module OneM2M_Testcases_AE {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
 	
 							//send back responsePrimitive
-							mcaPortIn.send(m_response(v_responsePrimtive));						}
+							mcaPortIn.send(m_response(v_responsePrimitive));
+						}
 	
 						[] mcaPortIn.receive {
 							tc_ac.stop;
@@ -1129,7 +1144,8 @@ module OneM2M_Testcases_AE {
 								v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
 	
 								//send back responsePrimitive
-								mcaPortIn.send(m_response(v_responsePrimitive));							}
+								mcaPortIn.send(m_response(v_responsePrimitive));
+							}
 	
 							[] mcaPortIn.receive {
 								tc_ac.stop;
@@ -1259,7 +1275,8 @@ module OneM2M_Testcases_AE {
 								v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
 	
 								//send back responsePrimitive
-								mcaPortIn.send(m_response(v_responsePrimitive));							}
+								mcaPortIn.send(m_response(v_responsePrimitive));
+							}
 	
 							[] mcaPortIn.receive {
 								tc_ac.stop;
@@ -1322,7 +1339,8 @@ module OneM2M_Testcases_AE {
 									v_responsePrimitive := valueof(m_responsePrimitive(int2004, "To_be_defined", omit));
 			
 									//send back responsePrimitive
-									mcaPortIn.send(m_response(v_responsePrimtive));								}
+									mcaPortIn.send(m_response(v_responsePrimitive));
+								}
 							}
 			
 							[] mcaPortIn.receive {
@@ -1420,7 +1438,8 @@ module OneM2M_Testcases_AE {
 						//primitives for mcaPortIn
 						var MsgIn v_request;
 						var ResponsePrimitive v_responsePrimitive;
-						var integer v_aeIndex := -1;						var template RequestPrimitive v_expectedUpdateRequestAe := mw_updateAe();
+						var integer v_aeIndex := -1;
+						var template RequestPrimitive v_expectedUpdateRequestAe := mw_updateAe();
 						
 	
 						f_cf03Up();
@@ -1442,7 +1461,8 @@ module OneM2M_Testcases_AE {
 							[] mcaPortIn.receive(mw_request(v_expectedUpdateRequestAe)) -> value v_request {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__, " : AE registration update request is accepted!");
-								v_responsePrimitive := valueof(m_responsePrimitive(int2001, "T	
+								v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+	
 								//send back responsePrimitive
 								mcaPortIn.send(m_response(v_responsePrimitive));
 							}
@@ -1452,7 +1472,8 @@ module OneM2M_Testcases_AE {
 							}
 							[] tc_ac.timeout{
 								setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
-							}	
+							}
+	
 						}
 	
 						// Postamble
@@ -1550,7 +1571,8 @@ module OneM2M_Testcases_AE {
 								v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
 
 								//send back responsePrimitive
-								mcaPortIn.send(m_response(v_responsePrimitive));							}
+								mcaPortIn.send(m_response(v_responsePrimitive));
+							}
 
 							[] mcaPortIn.receive {
 								tc_ac.stop;
@@ -1621,7 +1643,8 @@ module OneM2M_Testcases_AE {
 								v_responsePrimitive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
 		
 								//send back responsePrimitive
-								mcaPortIn.send(m_response(v_responsePrimitive));								tc_ac.stop;
+								mcaPortIn.send(m_response(v_responsePrimitive));
+								tc_ac.stop;
 							}
 							[] mcaPortIn.receive {
 								tc_ac.stop;
@@ -1670,7 +1693,8 @@ module OneM2M_Testcases_AE {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
 	
 							//send back responsePrimitive
-							mcaPortIn.send(m_response(v_responsePrimitive));							tc_ac.stop;
+							mcaPortIn.send(m_response(v_responsePrimitive));
+							tc_ac.stop;
 						}
 						[] mcaPortIn.receive {
 							tc_ac.stop;
@@ -1717,7 +1741,8 @@ module OneM2M_Testcases_AE {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
 	
 							//send back responsePrimitive
-							mcaPortIn.send(m_response(v_responsePrimitive));							tc_ac.stop;
+							mcaPortIn.send(m_response(v_responsePrimitive));
+							tc_ac.stop;
 						}
 						[] mcaPortIn.receive {
 							tc_ac.stop;
@@ -1765,7 +1790,8 @@ module OneM2M_Testcases_AE {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
 
 							//send back responsePrimitive
-							mcaPortIn.send(m_response(v_responsePrimitive));							tc_ac.stop;
+							mcaPortIn.send(m_response(v_responsePrimitive));
+							tc_ac.stop;
 						}
 						[] mcaPortIn.receive {
 							tc_ac.stop;
@@ -1813,7 +1839,8 @@ module OneM2M_Testcases_AE {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
 
 							//send back responsePrimitive
-							mcaPortIn.send(m_response(v_responsePrimitive));							tc_ac.stop;
+							mcaPortIn.send(m_response(v_responsePrimitive));
+							tc_ac.stop;
 						}
 						[] mcaPortIn.receive {
 							tc_ac.stop;
@@ -1864,7 +1891,8 @@ module OneM2M_Testcases_AE {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2002, "To_be_defined", omit));
 
 							//send back responsePrimitive
-							mcaPortIn.send(m_response(v_responsePrimitive));							tc_ac.stop;
+							mcaPortIn.send(m_response(v_responsePrimitive));
+							tc_ac.stop;
 						}
 						[] mcaPortIn.receive {
 							tc_ac.stop;
@@ -1911,7 +1939,8 @@ module OneM2M_Testcases_AE {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2002, "To_be_defined", omit));
 
 							//send back responsePrimitive
-							mcaPortIn.send(m_response(v_responsePrimitive));							tc_ac.stop;
+							mcaPortIn.send(m_response(v_responsePrimitive));
+							tc_ac.stop;
 						}
 						[] mcaPortIn.receive {
 							tc_ac.stop;
@@ -1959,7 +1988,8 @@ module OneM2M_Testcases_AE {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2002, "To_be_defined", omit));
 
 							//send back responsePrimitive
-							mcaPortIn.send(m_response(v_responsePrimitive));							tc_ac.stop;
+							mcaPortIn.send(m_response(v_responsePrimitive));
+							tc_ac.stop;
 						}
 						[] mcaPortIn.receive {
 							tc_ac.stop;
@@ -2007,7 +2037,8 @@ module OneM2M_Testcases_AE {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2002, "To_be_defined", omit));
 
 							//send back responsePrimitive
-							mcaPortIn.send(m_response(v_responsePrimtive));							tc_ac.stop;
+							mcaPortIn.send(m_response(v_responsePrimitive));
+							tc_ac.stop;
 						}
 						[] mcaPortIn.receive {
 							tc_ac.stop;
@@ -2040,15 +2071,17 @@ module OneM2M_Testcases_AE {
 					//variables
 					var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
 					var MsgIn v_request;
-					var ResponsePrimitive v_responsePrimitive;					var charstring v_action := "Please, send a valid subscription creation request";
+					var ResponsePrimitive v_responsePrimitive;
+					var charstring v_action := "Please, send a valid subscription creation request";
 				  	
 					var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
 					v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
 
 					f_cf03Up();
 
-					//send triggering primtive to SUT
-					f_sendUtPrimitive(v_utRequest,v_action);				  	
+					//send triggering primitive to SUT
+					f_sendUtPrimitive(v_utRequest,v_action);
+				  	
 					//Test behavior
 					tc_ac.start;
 					alt{
@@ -2057,7 +2090,8 @@ module OneM2M_Testcases_AE {
 							setverdict(pass, __SCOPE__, " : Subscription creation request is accepted!");
 
 							//set responseStatusCode back to SUT
-							v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));		
+							v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+		
 							//send back responsePrimitive
 							mcaPortIn.send(m_response(v_responsePrimitive));
 						}
@@ -2069,6 +2103,7 @@ module OneM2M_Testcases_AE {
 							setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
 						}
 					}
+
 					// Postamble
 					f_cf03Down();
 				}
@@ -2219,7 +2254,8 @@ module OneM2M_Testcases_AE {
 								v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
 
 								//send back responsePrimitive
-								mcaPortIn.send(m_response(v_responsePrimitive));							}
+								mcaPortIn.send(m_response(v_responsePrimitive));
+							}
 							[] mcaPortIn.receive {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__, " : Subscription creation request is rejected due to not including the optional attribute!");
@@ -2269,7 +2305,8 @@ module OneM2M_Testcases_AE {
 							//send back responsePrimitive
 							mcaPortIn.send(m_response(v_responsePrimitive));
 						}
-						[] mcaPortIn.receive(mw_request(mw_createAe(*,?,m_contentCreateAe_Invalid))) -> value v_request {							tc_ac.stop;
+						[] mcaPortIn.receive(mw_request(mw_createAe(*,?,m_contentCreateAe_Invalid))) -> value v_request {
+							tc_ac.stop;
 							setverdict(inconc, __SCOPE__, " : AE registration request is rejected due to not including mandatory attributes!!");
 							stop;
 						}
@@ -2296,7 +2333,8 @@ module OneM2M_Testcases_AE {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
 
 							//send back responsePrimitive
-							mcaPortIn.send(m_response(v_responsePrimitive));						}
+							mcaPortIn.send(m_response(v_responsePrimitive));
+						}
 						[] mcaPortIn.receive {
 							tc_ac.stop;
 							setverdict(inconc, __SCOPE__, " : Subscription creation request is rejected due to not including mandatory attributes!!");
@@ -2358,7 +2396,8 @@ module OneM2M_Testcases_AE {
 							//send back responsePrimitive
 							mcaPortIn.send(m_response(v_responsePrimitive));
 						}
-						[] mcaPortIn.receive(mw_request(mw_createAe(*,?,m_contentCreateAe_Invalid))) -> value v_request {							tc_ac.stop;
+						[] mcaPortIn.receive(mw_request(mw_createAe(*,?,m_contentCreateAe_Invalid))) -> value v_request {
+							tc_ac.stop;
 							setverdict(inconc, __SCOPE__, " : AE registration request is rejected due to not including mandatory attributes!!");
 							stop;
 						}
@@ -2385,7 +2424,8 @@ module OneM2M_Testcases_AE {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
 
 							//send back responsePrimitive
-							mcaPortIn.send(m_response(v_responsePrimitive));						}
+							mcaPortIn.send(m_response(v_responsePrimitive));
+						}
 						[] mcaPortIn.receive {
 							tc_ac.stop;
 							setverdict(inconc, __SCOPE__, " : Subscription creation request is rejected due to not including mandatory attributes!!");