diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index 2fb5624ec86f25371e972df769f5a42dbe1fc21e..e0cf7cc3eb5058213a431787c9177693aabdf0bd 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -1815,7 +1815,7 @@ module OneM2M_Templates {
 		
 		/**
 			 * @desc Base primitiveContent for CREATE operation for StatConfig resource
-			 * @param p_primitiveContent Content for the StatConfig
+			 * @param p_primitiveConten t Content for the StatConfig
 			 */
 		template StatsConfig_optional m_contentCreateStatConfigBase := {
 			resourceName 				:= c_defaultStatsConfigResourceName, //O
diff --git a/OneM2M_Testcases.ttcn b/OneM2M_Testcases.ttcn
index bf469c2fd971778d3b44b7c1cbccc9b2eefc0b8a..ab0bb047148fb25d8bc63bf2445b3f08e9750004 100644
--- a/OneM2M_Testcases.ttcn
+++ b/OneM2M_Testcases.ttcn
@@ -470,7 +470,7 @@ module OneM2M_Testcases {
 				// Tear down
 				f_cf02Down();
 					
-			}
+			} //end TC_CSE_REG_BV_009
 			
 			group Create{
 				
@@ -507,7 +507,7 @@ module OneM2M_Testcases {
 							setverdict(fail, testcasename() & ": Error while creating CSEBase with status code " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)));
 						}
 						[] tc_ac.timeout {
-							setverdict(inconc, testcasename() & ": No answer while creating CSEBase");
+							setverdict(fail, testcasename() & ": No answer while creating CSEBase");
 						}
 					}	
 				
@@ -517,6 +517,7 @@ module OneM2M_Testcases {
 					// Tear down
 					f_cf01Down();
 
+				}//end TC_CSE_REG_CRE_BI_001
 				
 				testcase TC_CSE_REG_CRE_BV_011() runs on CseTester system CseSystem {
 				
@@ -700,8 +701,6 @@ module OneM2M_Testcases {
 					}//end f_CSE_REG_CRE_BV_015
 				}// end group g_CSE_REG_CRE_BV_015	
 			
-			}
-			
 			}	//end group Create
 			
 			group Retrieve{
@@ -744,7 +743,7 @@ module OneM2M_Testcases {
 							setverdict(fail, testcasename() & ": Error while retrieving resource");
 						}
 						[] tc_ac.timeout {
-							setverdict(inconc, testcasename() & ": No answer while retrieving resource");
+							setverdict(fail, testcasename() & ": No answer while retrieving resource");
 						}
 					}	
 				
@@ -807,7 +806,7 @@ module OneM2M_Testcases {
 							setverdict(fail, testcasename() & ": Error while retrieving resource");
 						}
 						[] tc_ac.timeout {
-							setverdict(inconc, testcasename() & ": No answer while retrieving resource");
+							setverdict(fail, testcasename() & ": No answer while retrieving resource");
 						}
 					}	
 
@@ -869,7 +868,7 @@ module OneM2M_Testcases {
 							setverdict(fail, testcasename() & ": Error while retrieving resource");
 						}
 						[] tc_ac.timeout {
-							setverdict(inconc, testcasename() & ": No answer while retrieving resource");
+							setverdict(fail, testcasename() & ": No answer while retrieving resource");
 						}
 					}	
 
@@ -892,7 +891,7 @@ module OneM2M_Testcases {
 					var integer v_aeIndex := -1;
 					var Labels v_labels_1 := {"VALUE_1"};
 					var template RequestPrimitive v_updateRequest := m_updateCSEBaseBase;
-   
+   					const integer c_cseBaseIndex := -1;
 					// Test control
 
 					// Test component configuration
@@ -905,8 +904,7 @@ module OneM2M_Testcases {
 
 					// Test Body
 					v_updateRequest.primitiveContent.cSEBase_optional.labels := v_labels_1;
-					v_request := f_getUpdateRequestPrimitive(int5, v_aeIndex, v_updateRequest);
-					v_request.to_ := f_getResourceAddress();
+					v_request := f_getUpdateRequestPrimitive(int5, c_cseBaseIndex, v_updateRequest);
 					
 					mcaPort.send(m_request(v_request));
 					tc_ac.start;
@@ -920,7 +918,7 @@ module OneM2M_Testcases {
 							setverdict(fail, testcasename() & ": Error while updating CSEBase with status code " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)));
 						}
 						[] tc_ac.timeout {
-							setverdict(inconc, testcasename() & ": No answer while updating CSEBase");
+							setverdict(fail, testcasename() & ": No answer while updating CSEBase");
 						}
 					}					    
 
@@ -966,7 +964,7 @@ module OneM2M_Testcases {
 							setverdict(fail, testcasename() & ": Error while deleting CSEBase with status code " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)));
 						}
 						[] tc_ac.timeout {
-							setverdict(inconc, testcasename() & ": No answer while deleting CSEBase");
+							setverdict(fail, testcasename() & ": No answer while deleting CSEBase");
 						}
 					}