diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 95d4aebd406def5097829fdfd5ea39e309cac593..665afbf92d69021ab5aac02c30b83a94f7af4260 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -3311,7 +3311,7 @@ module OneM2M_Functions {
 			else if (ischosen(p_requestPrimitive.primitiveContent.statsConfig)){
 				p_requestPrimitive.primitiveContent.statsConfig.accessControlPolicyIDs := p_accessControlPolicyIDs;
 			} else {
-				log( __SCOPE__, ":INFO: Resource not having acpi attribute. Not possible to set acpi")
+				log( __SCOPE__ & ":INFO: Resource not having acpi attribute. Not possible to set acpi")
 			}
 			return valueof(p_requestPrimitive);					
 		}
@@ -3636,14 +3636,14 @@ module OneM2M_Functions {
 				alt{
 					[] utPort.receive(mw_utResponseOK) {
 						tc_wait.stop;
-						setverdict(pass, __SCOPE__, " : Triggering message is successfully received!");
+						setverdict(pass, __SCOPE__ & " : Triggering message is successfully received!");
 					}
 					[] utPort.receive(mw_utResponseKO) {
 						tc_wait.stop;
-						setverdict(inconc, __SCOPE__, " : Error while receiving Triggering message!");
+						setverdict(inconc, __SCOPE__ & " : Error while receiving Triggering message!");
 					}
 					[] tc_wait.timeout{
-						setverdict(inconc, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+						setverdict(inconc, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 					}
 				}
 				
diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index ee30177e956b2d6102f127de0ad7eb2cf8bf2809..a07db23650d2aff66bb729dd6a491595b1a39417 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -41,7 +41,7 @@ module OneM2M_PermutationFunctions {
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for container to ";
 						
 						if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
-							setverdict(inconc, __SCOPE__, ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 
@@ -55,7 +55,7 @@ module OneM2M_PermutationFunctions {
 						alt {
 							[] mcaPortIn.receive(mw_request(mw_createContainer(-,v_utRequest.requestPrimitive.to_))) -> value v_request {
 								tc_ac.stop;
-								setverdict(pass, __SCOPE__, " : Container creation request received successfuly");
+								setverdict(pass, __SCOPE__ & " : Container creation request received successfuly");
 								v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
 								v_resource := f_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentIndex, v_request.primitive.requestPrimitive.resourceType);
 								v_resourceIndex := f_setLocalResource(v_resource, v_request.primitive.requestPrimitive.resourceType, v_parentIndex);	
@@ -64,12 +64,12 @@ module OneM2M_PermutationFunctions {
 							}
 							[] mcaPortIn.receive(mw_request(?)) {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__, " : Error while creating container");
+								setverdict(fail, __SCOPE__ & " : Error while creating container");
 								mcaPortIn.send(f_getMsgOutPrimitive(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))));
 								stop;
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__, " : No answer while creating resource");
+								setverdict(fail, __SCOPE__ & " : No answer while creating resource");
 								stop;
 							}
 						}
@@ -89,7 +89,7 @@ module OneM2M_PermutationFunctions {
 						
 						//Test Control
 						if(not(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
-							setverdict(inconc, __SCOPE__, ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 	
@@ -104,7 +104,7 @@ module OneM2M_PermutationFunctions {
 						alt {
 							[] mcaPortIn.receive(mw_request(mw_createContainer(-,v_utRequest.requestPrimitive.to_))) -> value (v_request) {
 								tc_ac.stop;
-								setverdict(pass, __SCOPE__, " : Container creation request received successfuly");
+								setverdict(pass, __SCOPE__ & " : Container creation request received successfuly");
 								v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
 								v_resource := f_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentIndex, v_request.primitive.requestPrimitive.resourceType);
 								v_resourceIndex := f_setLocalResource(v_resource, v_request.primitive.requestPrimitive.resourceType, v_parentIndex);	
@@ -113,12 +113,12 @@ module OneM2M_PermutationFunctions {
 							}
 							[] mcaPortIn.receive(mw_request(?)) {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__, " : Error while creating container");
+								setverdict(fail, __SCOPE__ & " : Error while creating container");
 								mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 								stop;
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__, " : No answer while creating resource");
+								setverdict(fail, __SCOPE__ & " : No answer while creating resource");
 								stop;
 							}
 						}
@@ -142,7 +142,7 @@ module OneM2M_PermutationFunctions {
 						
 						
 						if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
-							setverdict(inconc, __SCOPE__, ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -158,7 +158,7 @@ module OneM2M_PermutationFunctions {
 						alt {
 							[] mcaPortIn.receive(mw_request(mw_updateContainer(-,v_utRequest.requestPrimitive.to_))) -> value v_request {
 								tc_ac.stop;
-								setverdict(pass, __SCOPE__, " : Container update request received successfuly");
+								setverdict(pass, __SCOPE__ & " : Container update request received successfuly");
 								v_resourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
 								f_updateLocalResource(v_resourceIndex, v_request.primitive.requestPrimitive.primitiveContent);
 								v_responsePrimitive := valueof(m_responsePrimitive(int2004, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
@@ -166,12 +166,12 @@ module OneM2M_PermutationFunctions {
 							}
 							[] mcaPortIn.receive(mw_request(?)) {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__, " : Error while updating container");
+								setverdict(fail, __SCOPE__ & " : Error while updating container");
 								mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 								stop;
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__, " : No answer while updating resource");
+								setverdict(fail, __SCOPE__ & " : No answer while updating resource");
 								stop;
 							}
 						}
@@ -189,7 +189,7 @@ module OneM2M_PermutationFunctions {
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for container to ";
 						
 						if(not(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
-							setverdict(inconc, __SCOPE__, ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 	
@@ -205,7 +205,7 @@ module OneM2M_PermutationFunctions {
 						alt {
 							[] mcaPortIn.receive(mw_request(mw_updateContainer(-,v_utRequest.requestPrimitive.to_))) -> value (v_request) {
 								tc_ac.stop;
-								setverdict(pass, __SCOPE__, " : Container update request received successfuly");
+								setverdict(pass, __SCOPE__ & " : Container update request received successfuly");
 								v_resourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
 								f_updateLocalResource(v_resourceIndex, v_request.primitive.requestPrimitive.primitiveContent);
 								v_responsePrimitive := valueof(m_responsePrimitive(int2004, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
@@ -213,12 +213,12 @@ module OneM2M_PermutationFunctions {
 							}
 							[] mcaPortIn.receive(mw_request(?)) {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__, " : Error while updating container");
+								setverdict(fail, __SCOPE__ & " : Error while updating container");
 								mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 								stop;
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__, " : No answer while updating resource");
+								setverdict(fail, __SCOPE__ & " : No answer while updating resource");
 								stop;
 							}
 						}
@@ -242,7 +242,7 @@ module OneM2M_PermutationFunctions {
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for container to ";
 						
 						if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
-							setverdict(inconc, __SCOPE__, ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 			
@@ -259,19 +259,19 @@ module OneM2M_PermutationFunctions {
 						alt {
 							[] mcaPortIn.receive(mw_request(mw_retrieve(v_utRequest.requestPrimitive.to_))) -> value (v_request) {
 								tc_ac.stop;
-								setverdict(pass, __SCOPE__, " : Container retrieve request received successfuly");
+								setverdict(pass, __SCOPE__ & " : Container retrieve request received successfuly");
 								v_resourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
 								v_responsePrimitive := valueof(m_responsePrimitive(int2000, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
 								mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 							}
 							[] mcaPortIn.receive(mw_request(?)) {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__, " : Error while retrieving container");
+								setverdict(fail, __SCOPE__ & " : Error while retrieving container");
 								mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 								stop;
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__, " : No answer while retrieving resource");
+								setverdict(fail, __SCOPE__ & " : No answer while retrieving resource");
 								stop;
 							}
 						}
@@ -290,7 +290,7 @@ module OneM2M_PermutationFunctions {
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for container to ";
 						
 						if(not(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
-							setverdict(inconc, __SCOPE__, ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 
@@ -307,19 +307,19 @@ module OneM2M_PermutationFunctions {
 						alt {
 							[] mcaPortIn.receive(mw_request(mw_retrieve(v_utRequest.requestPrimitive.to_))) -> value (v_request) {
 								tc_ac.stop;
-								setverdict(pass, __SCOPE__, " : Container retrieve request received successfuly");
+								setverdict(pass, __SCOPE__ & " : Container retrieve request received successfuly");
 								v_resourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
 								v_responsePrimitive := valueof(m_responsePrimitive(int2000, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
 								mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 							}
 							[] mcaPortIn.receive(mw_request(?)) {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__, " : Error while retrieving container");
+								setverdict(fail, __SCOPE__ & " : Error while retrieving container");
 								mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 								stop;
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__, " : No answer while retrieving resource");
+								setverdict(fail, __SCOPE__ & " : No answer while retrieving resource");
 								stop;
 							}
 						}
@@ -342,7 +342,7 @@ module OneM2M_PermutationFunctions {
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid DELETE Request for container to ";
 
 						if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
-							setverdict(inconc, __SCOPE__, ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 			
@@ -358,18 +358,18 @@ module OneM2M_PermutationFunctions {
 						alt {
 							[] mcaPortIn.receive(mw_request(mw_delete(v_utRequest.requestPrimitive.to_))) -> value (v_request) {
 								tc_ac.stop;
-								setverdict(pass, __SCOPE__, " : Container update request received successfuly");
+								setverdict(pass, __SCOPE__ & " : Container update request received successfuly");
 								v_responsePrimitive := valueof(m_responsePrimitive(int2004, v_request.primitive.requestPrimitive.requestIdentifier, omit));
 								mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 							}
 							[] mcaPortIn.receive(mw_request(?)) {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__, " : Error while updating container");
+								setverdict(fail, __SCOPE__ & " : Error while updating container");
 								mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 								stop;
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__, " : No answer while updating resource");
+								setverdict(fail, __SCOPE__ & " : No answer while updating resource");
 								stop;
 							}
 						}
@@ -387,7 +387,7 @@ module OneM2M_PermutationFunctions {
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid DELETE Request for container to ";
 						
 						if(not(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
-							setverdict(inconc, __SCOPE__, ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 
@@ -404,18 +404,18 @@ module OneM2M_PermutationFunctions {
 						alt {
 							[] mcaPortIn.receive(mw_request(mw_delete(v_utRequest.requestPrimitive.to_))) -> value (v_request) {
 								tc_ac.stop;
-								setverdict(pass, __SCOPE__, " : Container update request received successfuly");
+								setverdict(pass, __SCOPE__ & " : Container update request received successfuly");
 								v_responsePrimitive := valueof(m_responsePrimitive(int2004, v_request.primitive.requestPrimitive.requestIdentifier, omit));
 								mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 							}
 							[] mcaPortIn.receive(mw_request(?)) {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__, " : Error while updating container");
+								setverdict(fail, __SCOPE__ & " : Error while updating container");
 								mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 								stop;
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__, " : No answer while updating resource");
+								setverdict(fail, __SCOPE__ & " : No answer while updating resource");
 								stop;
 							}
 						}
@@ -453,7 +453,7 @@ module OneM2M_PermutationFunctions {
 					   alt{
 							[] mcaPortIn.receive(mw_request(p_request)) -> value v_request {
 							   tc_ac.stop;
-							   setverdict(pass, __SCOPE__, " : AE registration request is accepted!!");
+							   setverdict(pass, __SCOPE__ & " : AE registration request is accepted!!");
 							   v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
 							   v_resource := f_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentIndex, v_request.primitive.requestPrimitive.resourceType);
 							   v_resourceIndex := f_setLocalResource(v_resource, v_request.primitive.requestPrimitive.resourceType, v_parentIndex);	
@@ -464,11 +464,11 @@ module OneM2M_PermutationFunctions {
 						   }
 							[] 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 the optional attribute!");
+							   setverdict(fail, __SCOPE__ & " : AE registration request is rejected due to not including the optional attribute!");
 								mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 						   }
 						   [] tc_ac.timeout{
-							   setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+							   setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						   }
 	
 					   }
@@ -515,7 +515,7 @@ module OneM2M_PermutationFunctions {
 							//receive MsgIn requestPrimitive
 							[] mcaPortIn.receive(mw_request(p_request)) -> value (v_request) {
 								tc_ac.stop;
-								setverdict(pass, __SCOPE__, " : ContentInstance creation request is accepted!!");
+								setverdict(pass, __SCOPE__ & " : ContentInstance creation request is accepted!!");
 								v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
 								v_resource := f_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentIndex, v_request.primitive.requestPrimitive.resourceType);
 								v_resourceIndex := f_setLocalResource(v_resource, v_request.primitive.requestPrimitive.resourceType, v_parentIndex);	
@@ -527,12 +527,12 @@ module OneM2M_PermutationFunctions {
 	
 							[] mcaPortIn.receive {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__, " : ContentInstance creation request is rejected due to not including the attribute!");
+								setverdict(fail, __SCOPE__ & " : ContentInstance creation request is rejected due to not including the attribute!");
 								mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 							}
 	
 							[] tc_ac.timeout{
-								setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+								setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 							}
 						}
 	
@@ -561,7 +561,7 @@ module OneM2M_PermutationFunctions {
 							//receive MsgIn requestPrimitive
 							[] mcaPortIn.receive(mw_request(p_request)) -> value (v_request) {
 								tc_ac.stop;
-								setverdict(pass, __SCOPE__, " : Container creation request is accepted!!");
+								setverdict(pass, __SCOPE__ & " : Container creation request is accepted!!");
 								v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
 								v_resource := f_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentIndex, v_request.primitive.requestPrimitive.resourceType);
 								v_resourceIndex := f_setLocalResource(v_resource, v_request.primitive.requestPrimitive.resourceType, v_parentIndex);	
@@ -572,11 +572,11 @@ module OneM2M_PermutationFunctions {
 							}
 							[] mcaPortIn.receive {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__, " : Container creation request is rejected due to not including the attribute!");
+								setverdict(fail, __SCOPE__ & " : Container creation request is rejected due to not including the attribute!");
 								mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 							}
 							[] tc_ac.timeout{
-								setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+								setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 							}
 						}
 	
@@ -612,7 +612,7 @@ module OneM2M_PermutationFunctions {
 					   alt{
 							[] mcaPortIn.receive(mw_request(p_expectedUpdateRequest)) -> value v_request {
 							   tc_ac.stop;
-							   setverdict(pass, __SCOPE__, " : AE update request is accepted!");
+							   setverdict(pass, __SCOPE__ & " : AE update request is accepted!");
 							   v_resourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
 							   f_updateLocalResource(v_resourceIndex, v_request.primitive.requestPrimitive.primitiveContent);
 							   v_responsePrimitive := valueof(m_responsePrimitive(int2004, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
@@ -620,11 +620,11 @@ module OneM2M_PermutationFunctions {
 						   }
 							[] mcaPortIn.receive(mw_request(?)) -> value v_request {
 							   tc_ac.stop;
-							   setverdict(fail, __SCOPE__, " : AE update request is rejected due to not including the optional attribute!");
+							   setverdict(fail, __SCOPE__ & " : AE update request is rejected due to not including the optional attribute!");
 								mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 						   }
 						   [] tc_ac.timeout{
-							   setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+							   setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						   }
 	
 					   }
@@ -655,7 +655,7 @@ module OneM2M_PermutationFunctions {
 							//receive MsgIn requestPrimitive
 							[] mcaPortIn.receive(mw_request(p_request)) -> value (v_request) {
 								tc_ac.stop;
-								setverdict(pass, __SCOPE__, " : Container update request is accepted!!");
+								setverdict(pass, __SCOPE__ & " : Container update request is accepted!!");
 								v_resourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
 								f_updateLocalResource(v_resourceIndex, v_request.primitive.requestPrimitive.primitiveContent);
 								v_responsePrimitive := valueof(m_responsePrimitive(int2004, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
@@ -664,12 +664,12 @@ module OneM2M_PermutationFunctions {
 
 							[] mcaPortIn.receive(mw_request(?)) {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__, " : Container update request is rejected due to not including the attribute!");
+								setverdict(fail, __SCOPE__ & " : Container update request is rejected due to not including the attribute!");
 								mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 							}
 
 							[] tc_ac.timeout{
-								setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+								setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 							}
 						}
 
@@ -708,17 +708,17 @@ module OneM2M_PermutationFunctions {
 						alt{
 							[] mcaPortIn.receive(mw_request(mw_retrieve(f_getLocalResourceAddress(v_resourceIndex)))) -> value v_request {
 								tc_ac.stop;
-								setverdict(pass, __SCOPE__, " : retrieve resource type request is accepted!!");
+								setverdict(pass, __SCOPE__ & " : retrieve resource type request is accepted!!");
 								v_responsePrimitive := valueof(m_responsePrimitive(int2000, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
 								mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 							}
 							[] mcaPortIn.receive (mw_request(mw_retrieve(?))){
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__, " : Retrieve request for unexpected target");
+								setverdict(fail, __SCOPE__ & " : Retrieve request for unexpected target");
 								mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 							}
 							[] tc_ac.timeout{
-								setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+								setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 							}
 						}
 		
@@ -758,7 +758,7 @@ module OneM2M_PermutationFunctions {
 						alt{
 							[] mcaPortIn.receive(mw_request(p_request)) -> value v_request {
 								tc_ac.stop;
-								setverdict(pass, __SCOPE__, " : Subscription creation request is accepted!");
+								setverdict(pass, __SCOPE__ & " : Subscription creation request is accepted!");
 								v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
 								v_resource := f_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentIndex, v_request.primitive.requestPrimitive.resourceType);
 								v_resourceIndex := f_setLocalResource(v_resource, v_request.primitive.requestPrimitive.resourceType, v_parentIndex);	
@@ -768,11 +768,11 @@ module OneM2M_PermutationFunctions {
 							}
 							[] mcaPortIn.receive {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__, " : Subscription creation request is rejected due to not including the optional attribute!");
+								setverdict(fail, __SCOPE__ & " : Subscription creation request is rejected due to not including the optional attribute!");
 								mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 							}
 							[] tc_ac.timeout{
-								setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+								setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 							}
 						}
 
@@ -4715,18 +4715,18 @@ module OneM2M_PermutationFunctions {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value vc_response {
 								tc_ac.stop;
-								setverdict(pass, __SCOPE__, ": Attribute of resource type " & int2str(enum2int(p_resourceType)) & " updated successfully");
+								setverdict(pass, __SCOPE__ & ": Attribute of resource type " & int2str(enum2int(p_resourceType)) & " updated successfully");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__, ": Wrong response status code");
+								setverdict(fail, __SCOPE__ & ": Wrong response status code");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__, ": Error while updating optional attribute");
+								setverdict(fail, __SCOPE__ & ": Error while updating optional attribute");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__, ": No answer while updating resource type " & int2str(enum2int(p_resourceType)));
+								setverdict(fail, __SCOPE__ & ": No answer while updating resource type " & int2str(enum2int(p_resourceType)));
 							}
 						}
 					  
@@ -4805,15 +4805,15 @@ module OneM2M_PermutationFunctions {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value vc_response {
 								tc_ac.stop;
-								setverdict(pass, __SCOPE__, ": Attribute of resource type " & int2str(enum2int(p_resourceType)) & " updated successfully");
+								setverdict(pass, __SCOPE__ & ": Attribute of resource type " & int2str(enum2int(p_resourceType)) & " updated successfully");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__, ": Wrong response status code");
+								setverdict(fail, __SCOPE__ & ": Wrong response status code");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__, ": Error while updating mandatory attribute");
+								setverdict(fail, __SCOPE__ & ": Error while updating mandatory attribute");
 							}
 							[] mcaPortIn.receive(mw_request(mw_notifyNotification(mw_contentNotificationVerification))) -> value vc_request {
 								tc_ac.stop;
@@ -4825,7 +4825,7 @@ module OneM2M_PermutationFunctions {
 								repeat;
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__, ": No answer while updating resource type " & int2str(enum2int(p_resourceType)));
+								setverdict(fail, __SCOPE__ & ": No answer while updating resource type " & int2str(enum2int(p_resourceType)));
 							}
 						}
 						
@@ -5147,12 +5147,12 @@ module OneM2M_PermutationFunctions {
 								setverdict(pass, __SCOPE__ & ": creation successfull by using fanOutPoint in group resource");
 	                
 								if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list)){
-									setverdict(fail, __SCOPE__, ": Error, aggregatedResponse attribute not provided");
+									setverdict(fail, __SCOPE__ & ": Error, aggregatedResponse attribute not provided");
 								}
 								else {
 									for(i:=0; i<lengthof(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list); i := i+1){
 										if(not match(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list[i], mw_responsePrimitiveOK)){
-											setverdict(fail, __SCOPE__, ": Error, one responsePrimitve of aggregatedResponse_list is not successful");
+											setverdict(fail, __SCOPE__ & ": Error, one responsePrimitve of aggregatedResponse_list is not successful");
 										}
 									}
 								}                       
@@ -5291,12 +5291,12 @@ module OneM2M_PermutationFunctions {
 								setverdict(pass, __SCOPE__ & ": creation successfull by using fanOutPoint in group resource");
 	    
 								if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list)){
-									setverdict(fail, __SCOPE__, ": Error, aggregatedResponse attribute not provided");
+									setverdict(fail, __SCOPE__ & ": Error, aggregatedResponse attribute not provided");
 								}
 								else {
 									for(i:=0; i<lengthof(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list); i := i+1){
 										if(not match(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list[i], mw_responsePrimitiveOK)){
-											setverdict(fail, __SCOPE__, ": Error, one responsePrimitve of aggregatedResponse_list is not successful");
+											setverdict(fail, __SCOPE__ & ": Error, one responsePrimitve of aggregatedResponse_list is not successful");
 										}
 									}
 								}                       
@@ -5431,16 +5431,16 @@ module OneM2M_PermutationFunctions {
 								setverdict(pass, __SCOPE__ & ": creation successfull by using fanOutPoint in group resource");
 	                            
 								if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list)){
-									setverdict(fail, __SCOPE__, ": Error, aggregatedResponse attribute not provided");
+									setverdict(fail, __SCOPE__ & ": Error, aggregatedResponse attribute not provided");
 								}
 								else{
 									if(lengthof(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list) != c_numberOfResponsePrimitive){
-										setverdict(fail, __SCOPE__, ": Error, length of aggregatedResponse is not valid");
+										setverdict(fail, __SCOPE__ & ": Error, length of aggregatedResponse is not valid");
 									}
 									else{
 										for(i:=0; i<c_numberOfResponsePrimitive; i:=i+1){
 											if(not match(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list[i].primitiveContent, p_contentResponse)){
-												setverdict(fail, __SCOPE__, ": Error, aggregatedResponse doesn't match with template expected");
+												setverdict(fail, __SCOPE__ & ": Error, aggregatedResponse doesn't match with template expected");
 											}
 										}
 									}
@@ -5518,16 +5518,16 @@ module OneM2M_PermutationFunctions {
 								setverdict(pass, __SCOPE__ & ": creation successfull by using fanOutPoint in group resource");
 	                
 								if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list)){
-									setverdict(fail, __SCOPE__, ": Error, aggregatedResponse attribute not provided");
+									setverdict(fail, __SCOPE__ & ": Error, aggregatedResponse attribute not provided");
 								}
 								else{
 									if(lengthof(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list) != c_numberOfResponsePrimitive){
-										setverdict(fail, __SCOPE__, ": Error, length of aggregatedResponse is not valid");
+										setverdict(fail, __SCOPE__ & ": Error, length of aggregatedResponse is not valid");
 									}
 									else{
 										for(i:=0; i<c_numberOfResponsePrimitive; i:=i+1){
 											if(not match(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list[i].primitiveContent, v_contentResponse)){
-												setverdict(fail, __SCOPE__, ": Error, aggregatedResponse doesn't match with template expected");
+												setverdict(fail, __SCOPE__ & ": Error, aggregatedResponse doesn't match with template expected");
 											}
 										}
 									}
@@ -6460,14 +6460,14 @@ module OneM2M_PermutationFunctions {
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(v_responsePrimitive.responseStatusCode))) -> value v_response {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, ": Operation for resource " & int2str(enum2int(p_resourceType)) & " performed successfully");	
+							setverdict(pass, __SCOPE__ & ": Operation for resource " & int2str(enum2int(p_resourceType)) & " performed successfully");	
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__, ": Wrong response status code");
+							setverdict(fail, __SCOPE__ & ": Wrong response status code");
 						}
 						[] tc_ac.timeout {
-							setverdict(fail, __SCOPE__, ": No answer while updating resource type " & int2str(enum2int(p_resourceType)));
+							setverdict(fail, __SCOPE__ & ": No answer while updating resource type " & int2str(enum2int(p_resourceType)));
 						}
 					}
 										
diff --git a/OneM2M_Testcases_AE_Release_1.ttcn b/OneM2M_Testcases_AE_Release_1.ttcn
index 17479212a5318a488961f34505cf28022edb30da..8ec85f895750e29978de4549e96d1892448b5d0e 100644
--- a/OneM2M_Testcases_AE_Release_1.ttcn
+++ b/OneM2M_Testcases_AE_Release_1.ttcn
@@ -44,7 +44,7 @@ module OneM2M_Testcases_AE_Release_1 {
 												
 						// Test control
 						if(not(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE)) {
-							setverdict(inconc, __SCOPE__, ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -60,7 +60,7 @@ module OneM2M_Testcases_AE_Release_1 {
 												
 						// Test control
 						if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
-							setverdict(inconc, __SCOPE__, ": Unstructured-SP-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Unstructured-SP-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -76,7 +76,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						
 						// Test control
 						if(not(PICS_PRIMITIVE_SCOPE_ABSOLUTE)) {
-							setverdict(inconc, __SCOPE__, ": Unstructured-Absolute-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Unstructured-Absolute-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						v_cse1.start(f_AE_GEN_CRE_001(e_absolute));
@@ -98,7 +98,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						v_cse1.done;
 						
 						if(not(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE)) {
-							setverdict(inconc, __SCOPE__, ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -113,7 +113,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						v_cse1.done;
 						
 						if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
-							setverdict(inconc, __SCOPE__, ": Structured-SP-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Structured-SP-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -128,7 +128,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						v_cse1.done;
 						
 						if(not(PICS_PRIMITIVE_SCOPE_ABSOLUTE)) {
-							setverdict(inconc, __SCOPE__, ": Structured-Absolute-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Structured-Absolute-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -156,7 +156,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						
 						// Test control
 						if(not(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE)) {
-							setverdict(inconc, __SCOPE__, ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -172,7 +172,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						
 					//Test control
 					if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
-						setverdict(inconc, __SCOPE__, ": Unstructured-SP-Relative-Resource-ID format support is required to run this test case");
+						setverdict(inconc, __SCOPE__ & ": Unstructured-SP-Relative-Resource-ID format support is required to run this test case");
 						stop;
 					}
 						
@@ -188,7 +188,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_ABSOLUTE)) {
-							setverdict(inconc, __SCOPE__, ": Unstructured-Absolute-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Unstructured-Absolute-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -212,7 +212,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE)) {
-							setverdict(inconc, __SCOPE__, ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -228,7 +228,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
-							setverdict(inconc, __SCOPE__, ": Structured-SP-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Structured-SP-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -244,7 +244,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_ABSOLUTE)) {
-							setverdict(inconc, __SCOPE__, ": Structured-Absolute-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Structured-Absolute-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -272,7 +272,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						
 						// Test control
 						if(not(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE)) {
-							setverdict(inconc, __SCOPE__, ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -288,7 +288,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
-							setverdict(inconc, __SCOPE__, ": Unstructured-SP-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Unstructured-SP-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -304,7 +304,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_ABSOLUTE)) {
-							setverdict(inconc, __SCOPE__, ": Unstructured-Absolute-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Unstructured-Absolute-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -328,7 +328,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE)) {
-							setverdict(inconc, __SCOPE__, ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -344,7 +344,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
-							setverdict(inconc, __SCOPE__, ": Structured-SP-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Structured-SP-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -360,7 +360,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_ABSOLUTE)) {
-							setverdict(inconc, __SCOPE__, ": Structured-Absolute-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Structured-Absolute-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -388,7 +388,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE)) {
-							setverdict(inconc, __SCOPE__, ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -404,7 +404,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
-							setverdict(inconc, __SCOPE__, ": Unstructured-SP-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Unstructured-SP-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -420,7 +420,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_ABSOLUTE)) {
-							setverdict(inconc, __SCOPE__, ": Unstructured-Absolute-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Unstructured-Absolute-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -444,7 +444,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE)) {
-							setverdict(inconc, __SCOPE__, ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -460,7 +460,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
-							setverdict(inconc, __SCOPE__, ": Structured-SP-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Structured-SP-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -476,7 +476,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_ABSOLUTE)) {
-							setverdict(inconc, __SCOPE__, ": Structured-Absolute-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Structured-Absolute-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -535,7 +535,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					alt{
 						[] mcaPortIn.receive(mw_request(v_requestPrimitive)) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, " : AE registration request is accepted!!");
+							setverdict(pass, __SCOPE__ & " : AE registration request is accepted!!");
 							v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
 							v_resource := f_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentIndex, v_request.primitive.requestPrimitive.resourceType);
 							v_resourceIndex := f_setLocalResource(v_resource, v_request.primitive.requestPrimitive.resourceType, v_parentIndex);	
@@ -546,11 +546,11 @@ module OneM2M_Testcases_AE_Release_1 {
 						}
 						[] 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!!");
+							setverdict(fail, __SCOPE__ & " : AE registration request is rejected due to not including mandatory attributes!!");
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 						}
 						[] tc_ac.timeout{
-							setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}
 	
 					}
@@ -764,7 +764,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					alt{
 						[] mcaPortIn.receive(mw_request(mw_delete(v_utRequest.requestPrimitive.to_))) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, " : AE deregistration request is accepted!");
+							setverdict(pass, __SCOPE__ & " : AE deregistration request is accepted!");
 							v_responsePrimitive := valueof(m_responsePrimitive(int2002, v_request.primitive.requestPrimitive.requestIdentifier, omit));
 	
 							//send back responsePrimitive
@@ -772,11 +772,11 @@ module OneM2M_Testcases_AE_Release_1 {
 						}
 						[] mcaPortIn.receive {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__, " : Error while AE deregistration");
+							setverdict(fail, __SCOPE__ & " : Error while AE deregistration");
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 						}
 						[] tc_ac.timeout{
-							setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}
 	
 					}
@@ -831,7 +831,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					alt{
 						[] mcaPortIn.receive(mw_request(v_requestPrimitive)) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, " : Container creation request is accepted!");
+							setverdict(pass, __SCOPE__ & " : Container creation request is accepted!");
 							v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
 							v_resource := f_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentIndex, v_request.primitive.requestPrimitive.resourceType);
 							v_resourceIndex := f_setLocalResource(v_resource, v_request.primitive.requestPrimitive.resourceType, v_parentIndex);	
@@ -842,11 +842,11 @@ module OneM2M_Testcases_AE_Release_1 {
 						}
 						[] mcaPortIn.receive {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__, " : Container creation request is rejected due to not including mandatory attributes!!");
+							setverdict(fail, __SCOPE__ & " : Container creation request is rejected due to not including mandatory attributes!!");
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 						}
 						[] tc_ac.timeout{
-							setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}
 					}
 	
@@ -898,7 +898,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						//receive MsgIn requestPrimitive
 						[] mcaPortIn.receive(mw_request(v_requestPrimitive)) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, " : ContentInstance creation request is accepted!!");
+							setverdict(pass, __SCOPE__ & " : ContentInstance creation request is accepted!!");
 							v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
 							v_resource := f_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentIndex, v_request.primitive.requestPrimitive.resourceType);
 							v_resourceIndex := f_setLocalResource(v_resource, v_request.primitive.requestPrimitive.resourceType, v_parentIndex);	
@@ -909,12 +909,12 @@ module OneM2M_Testcases_AE_Release_1 {
 						}
 						[] mcaPortIn.receive {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__, " : ContentInstance creation request is rejected due to not including mandatory attributes!!");
+							setverdict(fail, __SCOPE__ & " : ContentInstance creation request is rejected due to not including mandatory attributes!!");
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 						}
 	
 						[] tc_ac.timeout{
-							setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}
 					}
 					
@@ -1467,17 +1467,17 @@ module OneM2M_Testcases_AE_Release_1 {
 					alt{
 						[] mcaPortIn.receive(mw_request(mw_retrieve(v_utRequest.requestPrimitive.to_ ))) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, " : retrieve attribute oldest request is accepted!");
+							setverdict(pass, __SCOPE__ & " : retrieve attribute oldest request is accepted!");
 							v_responsePrimitive := valueof(m_responsePrimitive(int2000, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 						}
 						[] mcaPortIn.receive(mw_request(mw_retrieve(?))) {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__, " : Retrieve Request for unexpected target");
+							setverdict(fail, __SCOPE__ & " : Retrieve Request for unexpected target");
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 						}
 						[] tc_ac.timeout{
-							setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}
 					}
 	
@@ -1529,17 +1529,17 @@ module OneM2M_Testcases_AE_Release_1 {
 					alt{
 						[] mcaPortIn.receive(mw_request(mw_retrieve(v_utRequest.requestPrimitive.to_))) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, " : retrieve attribute latest request is accepted!!");
+							setverdict(pass, __SCOPE__ & " : retrieve attribute latest request is accepted!!");
 							v_responsePrimitive := valueof(m_responsePrimitive(int2000, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 						}
 						[] mcaPortIn.receive(mw_request(mw_retrieve(?))) {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__, " : Retrieve Request for unexpected target");
+							setverdict(fail, __SCOPE__ & " : Retrieve Request for unexpected target");
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 						}
 						[] tc_ac.timeout{
-							setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}
 					}
 	
@@ -1587,17 +1587,17 @@ module OneM2M_Testcases_AE_Release_1 {
 					alt{
 						[] mcaPortIn.receive(mw_request(mw_retrieve(v_utRequest.requestPrimitive.to_))) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, " : retrieve resource type request is accepted!!");
+							setverdict(pass, __SCOPE__ & " : retrieve resource type request is accepted!!");
 							v_responsePrimitive := valueof(m_responsePrimitive(int2000, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 						}
 						[] mcaPortIn.receive(mw_request(mw_retrieve(?))) {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__, " : Retrieve Request for unexpected target");
+							setverdict(fail, __SCOPE__ & " : Retrieve Request for unexpected target");
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 						}
 						[] tc_ac.timeout{
-							setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}
 					}
 
@@ -1647,17 +1647,17 @@ module OneM2M_Testcases_AE_Release_1 {
 					alt{
 						[] mcaPortIn.receive(mw_request(mw_retrieve(v_utRequest.requestPrimitive.to_))) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, " : retrieve resource type request is accepted!!");
+							setverdict(pass, __SCOPE__ & " : retrieve resource type request is accepted!!");
 							v_responsePrimitive := valueof(m_responsePrimitive(int2000, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 						}
 						[] mcaPortIn.receive(mw_request(mw_retrieve(?))) {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__, " : Retrieve Request for unexpected target");
+							setverdict(fail, __SCOPE__ & " : Retrieve Request for unexpected target");
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 						}
 						[] tc_ac.timeout{
-							setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}
 					}
 
@@ -1709,7 +1709,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					alt{
 						[] mcaPortIn.receive(mw_request(mw_delete(v_utRequest.requestPrimitive.to_))) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, " : Delete oldest ContentInstance resource is accepted");
+							setverdict(pass, __SCOPE__ & " : Delete oldest ContentInstance resource is accepted");
 
 							//set responseStatusCode back to SUT
 							v_responsePrimitive := valueof(m_responsePrimitive(int2002, v_request.primitive.requestPrimitive.requestIdentifier, omit));
@@ -1720,10 +1720,10 @@ module OneM2M_Testcases_AE_Release_1 {
 						}
 						[] mcaPortIn.receive (mw_request(mw_delete(?))) {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__, " : Delete request for unexpected target");
+							setverdict(fail, __SCOPE__ & " : Delete request for unexpected target");
 						}
 						[] tc_ac.timeout{
-							setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}
 					}
 
@@ -1771,7 +1771,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					alt{
 						[] mcaPortIn.receive(mw_request(mw_delete(v_utRequest.requestPrimitive.to_))) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, " : delete attribute latest resource ContentInstance is accepted");
+							setverdict(pass, __SCOPE__ & " : delete attribute latest resource ContentInstance is accepted");
 
 							//set responseStatusCode back to SUT
 							v_responsePrimitive := valueof(m_responsePrimitive(int2002, v_request.primitive.requestPrimitive.requestIdentifier, omit));
@@ -1782,10 +1782,10 @@ module OneM2M_Testcases_AE_Release_1 {
 						}
 						[] mcaPortIn.receive (mw_request(mw_delete(?))) {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__, " : Delete request for unexpected target");
+							setverdict(fail, __SCOPE__ & " : Delete request for unexpected target");
 						}
 						[] tc_ac.timeout{
-							setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}
 					}
 
@@ -1833,7 +1833,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					alt{
 						[] mcaPortIn.receive(mw_request(mw_delete(v_utRequest.requestPrimitive.to_))) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, " : delete resource type request is accepted!!");
+							setverdict(pass, __SCOPE__ & " : delete resource type request is accepted!!");
 
 							//set responseStatusCode back to SUT
 							v_responsePrimitive := valueof(m_responsePrimitive(int2002, v_request.primitive.requestPrimitive.requestIdentifier, omit));
@@ -1844,10 +1844,10 @@ module OneM2M_Testcases_AE_Release_1 {
 						}
 						[] mcaPortIn.receive (mw_request(mw_delete(?))) {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__, " : Delete request for unexpected target");
+							setverdict(fail, __SCOPE__ & " : Delete request for unexpected target");
 						}
 						[] tc_ac.timeout{
-							setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}
 					}
 
@@ -1897,7 +1897,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					alt{
 						[] mcaPortIn.receive(mw_request(mw_delete(v_utRequest.requestPrimitive.to_ ))) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, " : delete resource type request is accepted!!");
+							setverdict(pass, __SCOPE__ & " : delete resource type request is accepted!!");
 
 							//set responseStatusCode back to SUT
 							v_responsePrimitive := valueof(m_responsePrimitive(int2002, v_request.primitive.requestPrimitive.requestIdentifier, omit));
@@ -1908,10 +1908,10 @@ module OneM2M_Testcases_AE_Release_1 {
 						}
 						[] mcaPortIn.receive (mw_request(mw_delete(?))) {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__, " : Delete request for unexpected target");
+							setverdict(fail, __SCOPE__ & " : Delete request for unexpected target");
 						}
 						[] tc_ac.timeout{
-							setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}
 					}
 
@@ -1965,7 +1965,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					alt{
 						[] mcaPortIn.receive(mw_request(mw_createSubscription)) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, " : Subscription creation request is accepted!");
+							setverdict(pass, __SCOPE__ & " : Subscription creation request is accepted!");
 							v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
 							v_resource := f_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentIndex, v_request.primitive.requestPrimitive.resourceType);
 							v_resourceIndex := f_setLocalResource(v_resource, v_request.primitive.requestPrimitive.resourceType, v_parentIndex);	
@@ -1976,11 +1976,11 @@ module OneM2M_Testcases_AE_Release_1 {
 						}
 						[] mcaPortIn.receive {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__, " : Subscription creation request is rejected due to not including mandatory attributes!!");
+							setverdict(fail, __SCOPE__ & " : Subscription creation request is rejected due to not including mandatory attributes!!");
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 						}
 						[] tc_ac.timeout{
-							setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}
 					}
 
@@ -2169,7 +2169,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					alt{
 						[] mcaPortIn.receive(mw_request(mw_createAe)) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, " : AE registration request is accepted!!");
+							setverdict(pass, __SCOPE__ & " : AE registration request is accepted!!");
 							v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
 							v_resource := f_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentIndex, v_request.primitive.requestPrimitive.resourceType);
 							v_resourceIndex := f_setLocalResource(v_resource, v_request.primitive.requestPrimitive.resourceType, v_parentIndex);	
@@ -2180,11 +2180,11 @@ module OneM2M_Testcases_AE_Release_1 {
 						}
 						[] 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!!");
+							setverdict(inconc, __SCOPE__ & " : AE registration request is rejected due to not including mandatory attributes!!");
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 						}
 						[] tc_ac.timeout{
-							setverdict(inconc, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+							setverdict(inconc, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}
 
 					}
@@ -2201,7 +2201,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					alt{
 						[] mcaPortIn.receive(mw_request(mw_createSubscription)) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, " : Subscription creation request is accepted!");
+							setverdict(pass, __SCOPE__ & " : Subscription creation request is accepted!");
 							v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
 							v_resource := f_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentIndex, v_request.primitive.requestPrimitive.resourceType);
 							v_resourceIndex := f_setLocalResource(v_resource, v_request.primitive.requestPrimitive.resourceType, v_parentIndex);	
@@ -2212,11 +2212,11 @@ module OneM2M_Testcases_AE_Release_1 {
 						}
 						[] mcaPortIn.receive {
 							tc_ac.stop;
-							setverdict(inconc, __SCOPE__, " : Subscription creation request is rejected due to not including mandatory attributes!!");
+							setverdict(inconc, __SCOPE__ & " : Subscription creation request is rejected due to not including mandatory attributes!!");
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 						}
 						[] tc_ac.timeout{
-							setverdict(inconc, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+							setverdict(inconc, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}
 					}
 					
@@ -2229,14 +2229,14 @@ module OneM2M_Testcases_AE_Release_1 {
 					alt{
 						[] mcaPortIn.receive(mw_response(mw_responsePrimitiveOK)) {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, " : Notification response is accepted!");
+							setverdict(pass, __SCOPE__ & " : Notification response is accepted!");
 						}
 						[] mcaPortIn.receive {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__, " : Notification response is rejected due to not including mandatory attributes!");
+							setverdict(fail, __SCOPE__ & " : Notification response is rejected due to not including mandatory attributes!");
 						}
 						[] tc_ac.timeout{
-							setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}
 					}
  
@@ -2280,7 +2280,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					alt{
 						[] mcaPortIn.receive(mw_request(mw_createAe)) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, " : AE registration request is accepted!!");
+							setverdict(pass, __SCOPE__ & " : AE registration request is accepted!!");
 							v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
 							v_resource := f_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentIndex, v_request.primitive.requestPrimitive.resourceType);
 							v_resourceIndex := f_setLocalResource(v_resource, v_request.primitive.requestPrimitive.resourceType, v_parentIndex);	
@@ -2291,11 +2291,11 @@ module OneM2M_Testcases_AE_Release_1 {
 						}
 						[] 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!!");
+							setverdict(inconc, __SCOPE__ & " : AE registration request is rejected due to not including mandatory attributes!!");
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 						}
 						[] tc_ac.timeout{
-							setverdict(inconc, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+							setverdict(inconc, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}
 
 					}
@@ -2312,7 +2312,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					alt{
 						[] mcaPortIn.receive(mw_request(mw_createSubscription)) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, " : Subscription creation request is accepted!");
+							setverdict(pass, __SCOPE__ & " : Subscription creation request is accepted!");
 							v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
 							v_resource := f_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentIndex, v_request.primitive.requestPrimitive.resourceType);
 							v_resourceIndex := f_setLocalResource(v_resource, v_request.primitive.requestPrimitive.resourceType, v_parentIndex);	
@@ -2323,11 +2323,11 @@ module OneM2M_Testcases_AE_Release_1 {
 						}
 						[] mcaPortIn.receive {
 							tc_ac.stop;
-							setverdict(inconc, __SCOPE__, " : Subscription creation request is rejected due to not including mandatory attributes!!");
+							setverdict(inconc, __SCOPE__ & " : Subscription creation request is rejected due to not including mandatory attributes!!");
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 						}
 						[] tc_ac.timeout{
-							setverdict(inconc, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+							setverdict(inconc, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}
 					}
 					
@@ -2340,14 +2340,14 @@ module OneM2M_Testcases_AE_Release_1 {
 					alt{
 						[] mcaPortIn.receive(mw_response(mw_responsePrimitiveOK)) {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, " : Notification response is accepted!");
+							setverdict(pass, __SCOPE__ & " : Notification response is accepted!");
 						}
 						[] mcaPortIn.receive {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__, " : Notification response is rejected due to not including mandatory attributes!");
+							setverdict(fail, __SCOPE__ & " : Notification response is rejected due to not including mandatory attributes!");
 						}
 						[] tc_ac.timeout{
-							setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}
 					}
  
diff --git a/OneM2M_Testcases_CSE_Release_1.ttcn b/OneM2M_Testcases_CSE_Release_1.ttcn
index 8a3d075e6006df0ce68240d81c606ecfed8ba74c..5bee6ebcee03b8f12546177d768a48342e6fc6cd 100644
--- a/OneM2M_Testcases_CSE_Release_1.ttcn
+++ b/OneM2M_Testcases_CSE_Release_1.ttcn
@@ -3396,7 +3396,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.container.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}
 						
@@ -3419,7 +3419,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							if(getverdict == pass){ 
 								v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 								if(not ispresent(v_responsePrimitive.primitiveContent.container.resourceName)){
-									setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+									setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 								}
 							}
 						
@@ -3442,7 +3442,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.container.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 					}
 						}
 
@@ -3465,7 +3465,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.group_.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 						}
 						}
 						
@@ -3488,7 +3488,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.group_.resourceName)){
-									setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+									setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 								}
 							}
 						
@@ -3511,7 +3511,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.accessControlPolicy.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 						}
 						}
 						
@@ -3534,7 +3534,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.accessControlPolicy.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}
 						
@@ -3556,7 +3556,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}
 					
@@ -3578,7 +3578,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}
 	
@@ -3600,7 +3600,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}
 
@@ -3622,7 +3622,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}
 					}
@@ -3643,7 +3643,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_cse1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}		
 					}
@@ -3664,7 +3664,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.contentInstance.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}
 
@@ -3693,10 +3693,10 @@ module OneM2M_Testcases_CSE_Release_1 {
 						
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.container.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							} else {
 								if(v_responsePrimitive.primitiveContent.container.resourceName != c_defaultContainerResourceName){
-									setverdict(fail, __SCOPE__, ": Error, resourceName attribute not correct");
+									setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not correct");
 								}
 							}
 						}
@@ -3717,10 +3717,10 @@ module OneM2M_Testcases_CSE_Release_1 {
 																		
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.group_.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							} else {
 								if(v_responsePrimitive.primitiveContent.group_.resourceName != c_defaultGroupResourceName){
-									setverdict(fail, __SCOPE__, ": Error, resourceName attribute not correct");
+									setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not correct");
 								}
 							}
 						}
@@ -3740,10 +3740,10 @@ module OneM2M_Testcases_CSE_Release_1 {
 																		
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.accessControlPolicy.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							} else {
 								if(v_responsePrimitive.primitiveContent.accessControlPolicy.resourceName != c_defaultAccessControlPolicyResourceName){
-									setverdict(fail, __SCOPE__, ": Error, resourceName attribute not correct");
+									setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not correct");
 								}
 							}
 						}
@@ -3763,10 +3763,10 @@ module OneM2M_Testcases_CSE_Release_1 {
 																		
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							} else {
 								if(v_responsePrimitive.primitiveContent.subscription.resourceName != c_defaultSubscriptionResourceName){
-									setverdict(fail, __SCOPE__, ": Error, resourceName attribute not correct");
+									setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not correct");
 								}
 							}
 						}
@@ -3953,7 +3953,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 																		
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.container.maxNrOfInstances)){
-								setverdict(fail, __SCOPE__, ": Error, maxNrOfInstances attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, maxNrOfInstances attribute not provided");
 							} 
 						}	
 					}
@@ -3973,7 +3973,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 																		
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.container.maxByteSize)){
-								setverdict(fail, __SCOPE__, ": Error, maxByteSize attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, maxByteSize attribute not provided");
 							} 
 						}	
 						  
@@ -3994,7 +3994,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 																		
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.container.maxInstanceAge)){
-								setverdict(fail, __SCOPE__, ": Error, maxInstanceAge attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, maxInstanceAge attribute not provided");
 							} 
 						}	
 					}
@@ -6966,7 +6966,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						   if(ispresent(v_responsePrimitive.primitiveContent)) {
 							   if(ischosen(v_responsePrimitive.primitiveContent.remoteCSE)) {
 								   if(v_responsePrimitive.primitiveContent.remoteCSE.labels != v_labels){
-									   setverdict(fail, __SCOPE__, ": Error: Labels attribute not updated correctly")
+									   setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
 								   }
 							   }
 						   }
@@ -7001,7 +7001,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						  if(ispresent(v_responsePrimitive.primitiveContent)) {
 							  if(ischosen(v_responsePrimitive.primitiveContent.remoteCSE)) {
 								  if(v_responsePrimitive.primitiveContent.remoteCSE.pointOfAccess != v_poaList){
-									  setverdict(fail, __SCOPE__, ": Error: Point of access attribute not updated correctly")
+									  setverdict(fail, __SCOPE__ & ": Error: Point of access attribute not updated correctly")
 								  }
 							  }
 						  }
@@ -7036,7 +7036,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						 if(ispresent(v_responsePrimitive.primitiveContent)) {
 							 if(ischosen(v_responsePrimitive.primitiveContent.remoteCSE)) {
 								 if(v_responsePrimitive.primitiveContent.remoteCSE.nodeLink != v_nodeLink){
-									 setverdict(fail, __SCOPE__, ": Error: Node link attribute not updated correctly")
+									 setverdict(fail, __SCOPE__ & ": Error: Node link attribute not updated correctly")
 								 }
 							 }
 						 }
@@ -7071,7 +7071,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.aE)) {
 									 if(v_responsePrimitive.primitiveContent.aE.labels != v_labels){
-										 setverdict(fail, __SCOPE__, ": Error: Labels attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -7106,7 +7106,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.aE)) {
 									 if(v_responsePrimitive.primitiveContent.aE.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.aE.accessControlPolicyIDs)){
-										 setverdict(fail, __SCOPE__, ": Error: Access control policy IDs attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Access control policy IDs attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -7140,7 +7140,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.aE)) {
 									 if(v_responsePrimitive.primitiveContent.aE.appName != v_appName){
-										 setverdict(fail, __SCOPE__, ": Error: AppName attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: AppName attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -7174,7 +7174,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.aE)) {
 									 if(v_responsePrimitive.primitiveContent.aE.pointOfAccess != v_poaList){
-										 setverdict(fail, __SCOPE__, ": Error: Point of Access attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Point of Access attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -7209,7 +7209,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.container)) {
 									 if(v_responsePrimitive.primitiveContent.container.labels != v_labels){
-										 setverdict(fail, __SCOPE__, ": Error: Labels attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -7244,7 +7244,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.container)) {
 									 if(v_responsePrimitive.primitiveContent.container.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.container.accessControlPolicyIDs)){
-										 setverdict(fail, __SCOPE__, ": Error: Access Control Policy IDs attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Access Control Policy IDs attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -7279,7 +7279,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.container)) {
 									 if(v_responsePrimitive.primitiveContent.container.maxNrOfInstances != v_maxNrOfInstances){
-										 setverdict(fail, __SCOPE__, ": Error: Maximum number of instances attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Maximum number of instances attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -7314,7 +7314,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.container)) {
 									 if(v_responsePrimitive.primitiveContent.container.maxByteSize != v_maxByteSize){
-										 setverdict(fail, __SCOPE__, ": Error: Maximum Byte size attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Maximum Byte size attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -7349,7 +7349,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.container)) {
 									 if(v_responsePrimitive.primitiveContent.container.maxInstanceAge != v_maxInstanceAge){
-										 setverdict(fail, __SCOPE__, ": Error: Maximum Instance age attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Maximum Instance age attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -7384,7 +7384,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.accessControlPolicy)) {
 									 if(v_responsePrimitive.primitiveContent.accessControlPolicy.labels != v_labels){
-										 setverdict(fail, __SCOPE__, ": Error: Labels attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -7419,7 +7419,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
 									 if(v_responsePrimitive.primitiveContent.subscription.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.subscription.accessControlPolicyIDs)){
-										 setverdict(fail, __SCOPE__, ": Error: Access Control Policy IDs attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Access Control Policy IDs attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -7453,7 +7453,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
 									 if(v_responsePrimitive.primitiveContent.subscription.labels != v_labels){
-										 setverdict(fail, __SCOPE__, ": Error: Labels attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -7487,7 +7487,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
 									 if(v_responsePrimitive.primitiveContent.group_.labels != v_labels){
-										 setverdict(fail, __SCOPE__, ": Error: Labels attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -7522,7 +7522,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
 									 if(v_responsePrimitive.primitiveContent.group_.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.group_.accessControlPolicyIDs)){
-										 setverdict(fail, __SCOPE__, ": Error: Access Control Policy IDs attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Access Control Policy IDs attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -7556,7 +7556,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
 									 if(v_responsePrimitive.primitiveContent.group_.membersAccessControlPolicyIDs != v_membersAccessControlPolicyIDs){
-										 setverdict(fail, __SCOPE__, ": Error: Members Access Control Policy IDs attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Members Access Control Policy IDs attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -7590,7 +7590,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
 									 if(v_responsePrimitive.primitiveContent.group_.groupName != v_groupName){
-										 setverdict(fail, __SCOPE__, ": Error: Group name attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Group name attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -7632,7 +7632,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.remoteCSE)) {
 									if(v_responsePrimitive.primitiveContent.remoteCSE.expirationTime != v_expirationTime){
-										setverdict(fail, __SCOPE__, ": Error: Expiration time attribute not updated correctly")
+										setverdict(fail, __SCOPE__ & ": Error: Expiration time attribute not updated correctly")
 									}
 								}
 							}
@@ -7665,7 +7665,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.remoteCSE)) {
 									if(v_responsePrimitive.primitiveContent.remoteCSE.requestReachability != v_requestReachability){
-										setverdict(fail, __SCOPE__, ": Error: Request Reachability attribute not updated correctly")
+										setverdict(fail, __SCOPE__ & ": Error: Request Reachability attribute not updated correctly")
 									}
 								}
 							}
@@ -7700,7 +7700,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.aE)) {
 									if(v_responsePrimitive.primitiveContent.aE.expirationTime != v_expirationTime){
-										setverdict(fail, __SCOPE__, ": Error: Expiration time attribute not updated correctly")
+										setverdict(fail, __SCOPE__ & ": Error: Expiration time attribute not updated correctly")
 									}
 								}
 							}
@@ -7735,7 +7735,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.aE)) {
 									if(v_responsePrimitive.primitiveContent.aE.requestReachability != v_requestReachability){
-										setverdict(fail, __SCOPE__, ": Error: Request Reachability attribute not updated correctly")
+										setverdict(fail, __SCOPE__ & ": Error: Request Reachability attribute not updated correctly")
 									}
 								}
 							}
@@ -7770,7 +7770,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.container)) {
 									if(v_responsePrimitive.primitiveContent.container.expirationTime != v_expirationTime){
-										setverdict(fail, __SCOPE__, ": Error: Expiration time attribute not updated correctly")
+										setverdict(fail, __SCOPE__ & ": Error: Expiration time attribute not updated correctly")
 									}
 								}
 							}
@@ -7805,7 +7805,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.accessControlPolicy)) {
 									if(v_responsePrimitive.primitiveContent.accessControlPolicy.expirationTime != v_expirationTime){
-										setverdict(fail, __SCOPE__, ": Error: Expiration time attribute not updated correctly")
+										setverdict(fail, __SCOPE__ & ": Error: Expiration time attribute not updated correctly")
 									}
 								}
 							}
@@ -7839,7 +7839,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.accessControlPolicy)) {
 									if(v_responsePrimitive.primitiveContent.accessControlPolicy.privileges != v_privileges_1){
-										setverdict(fail, __SCOPE__, ": Error: Privileges attribute not updated correctly")
+										setverdict(fail, __SCOPE__ & ": Error: Privileges attribute not updated correctly")
 									}
 								}
 							}
@@ -7873,7 +7873,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.accessControlPolicy)) {
 									if(v_responsePrimitive.primitiveContent.accessControlPolicy.selfPrivileges != v_privileges_1){
-										setverdict(fail, __SCOPE__, ": Error: Self Privileges attribute not updated correctly")
+										setverdict(fail, __SCOPE__ & ": Error: Self Privileges attribute not updated correctly")
 									}
 								}
 							}
@@ -7908,7 +7908,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
 									if(v_responsePrimitive.primitiveContent.subscription.expirationTime != v_expirationTime){
-										setverdict(fail, __SCOPE__, ": Error: Expiration time attribute not updated correctly")
+										setverdict(fail, __SCOPE__ & ": Error: Expiration time attribute not updated correctly")
 									}
 								}
 							}
@@ -7944,7 +7944,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
 									if(v_responsePrimitive.primitiveContent.subscription.notificationURI != v_notificationURI){
-										setverdict(fail, __SCOPE__, ": Error: Notification URI attribute not updated correctly")
+										setverdict(fail, __SCOPE__ & ": Error: Notification URI attribute not updated correctly")
 									}
 								}
 							}
@@ -7979,7 +7979,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
 									if(v_responsePrimitive.primitiveContent.subscription.notificationContentType != v_notificationContentType){
-										setverdict(fail, __SCOPE__, ": Error: Notification Content Type attribute not updated correctly")
+										setverdict(fail, __SCOPE__ & ": Error: Notification Content Type attribute not updated correctly")
 									}
 								}
 							}
@@ -8014,7 +8014,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
 									if(v_responsePrimitive.primitiveContent.group_.expirationTime != v_expirationTime){
-										setverdict(fail, __SCOPE__, ": Error: Expiration Time attribute not updated correctly")
+										setverdict(fail, __SCOPE__ & ": Error: Expiration Time attribute not updated correctly")
 									}
 								}
 							}
@@ -8049,7 +8049,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
 									if(v_responsePrimitive.primitiveContent.group_.maxNrOfMembers != v_maxNrOfMembers){
-										setverdict(fail, __SCOPE__, ": Error: Maximum Number of Members attribute not updated correctly")
+										setverdict(fail, __SCOPE__ & ": Error: Maximum Number of Members attribute not updated correctly")
 									}
 								}
 							}
@@ -8084,7 +8084,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
 									if(v_responsePrimitive.primitiveContent.group_.memberIDs != v_memberIDs){
-										setverdict(fail, __SCOPE__, ": Error: Member IDs attribute not updated correctly")
+										setverdict(fail, __SCOPE__ & ": Error: Member IDs attribute not updated correctly")
 									}
 								}
 							}
@@ -11170,7 +11170,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							setverdict(pass, __SCOPE__ & ": Resource created successfully");
 						
 							if(not match({v_memberID}, v_response.primitive.responsePrimitive.primitiveContent.group_.memberIDs)){
-								setverdict(fail, __SCOPE__, ": Error, presence of duplicate member IDs ");
+								setverdict(fail, __SCOPE__ & ": Error, presence of duplicate member IDs ");
 							}
 							if(lengthof(v_response.primitive.responsePrimitive.primitiveContent.group_.memberIDs) != 1) {
 							   setverdict(fail, __SCOPE__ & ": Error, wrong number of memberIDs attribute");      
@@ -11236,11 +11236,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__ & ": Resource created successfully");
 							if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.group_.memberTypeValidated)){
-								setverdict(fail, __SCOPE__, ": Error, memberTypeValidated attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, memberTypeValidated attribute not provided");
 							}
 							else {
 								if(v_response.primitive.responsePrimitive.primitiveContent.group_.memberTypeValidated == false){
-									setverdict(fail, __SCOPE__, ": Error, memberTypeValidated attribute not correct");
+									setverdict(fail, __SCOPE__ & ": Error, memberTypeValidated attribute not correct");
 								}
 							}     
 						}
@@ -11307,20 +11307,20 @@ module OneM2M_Testcases_CSE_Release_1 {
 							
 							// check for memberTypeValidated
 							if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.group_.memberTypeValidated)){
-								setverdict(fail, __SCOPE__, ": Error, memberTypeValidated attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, memberTypeValidated attribute not provided");
 							}
 							else {
 								if(v_response.primitive.responsePrimitive.primitiveContent.group_.memberTypeValidated == false){
-									setverdict(fail, __SCOPE__, ": Error, memberTypeValidated attribute not correct");
+									setverdict(fail, __SCOPE__ & ": Error, memberTypeValidated attribute not correct");
 								}
 							}
 							// check for memberType (MIXED)
 							if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.group_.memberType)){
-								setverdict(fail, __SCOPE__, ": Error, memberType attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, memberType attribute not provided");
 							} 
 							else {
 								if(v_response.primitive.responsePrimitive.primitiveContent.group_.memberType != int0){ 
-									setverdict(fail, __SCOPE__, ": Error, memberType attribute not correct");
+									setverdict(fail, __SCOPE__ & ": Error, memberType attribute not correct");
 								}
 							}
 						}
@@ -11391,19 +11391,19 @@ module OneM2M_Testcases_CSE_Release_1 {
 							
 							// check for memberTypeValidated
 							if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.group_.memberTypeValidated)){
-								setverdict(fail, __SCOPE__, ": Error, memberTypeValidated attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, memberTypeValidated attribute not provided");
 							} else {
 								if(v_response.primitive.responsePrimitive.primitiveContent.group_.memberTypeValidated == false){
-									setverdict(fail, __SCOPE__, ": Error, memberTypeValidated attribute not correct");
+									setverdict(fail, __SCOPE__ & ": Error, memberTypeValidated attribute not correct");
 								}
 							}
 							// check for membersId
 							if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.group_.memberIDs)){
-								setverdict(fail, __SCOPE__, ": Error, memberIDs attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, memberIDs attribute not provided");
 							} 
 							else {
 								if(not match({f_getResourceId(vc_resourcesList[v_containerIndex].resource)}, v_response.primitive.responsePrimitive.primitiveContent.group_.memberIDs)){
-									setverdict(fail, __SCOPE__, ": Error, memberIDs attribute not correct");
+									setverdict(fail, __SCOPE__ & ": Error, memberIDs attribute not correct");
 								}
 							}
 						}
@@ -11565,16 +11565,16 @@ module OneM2M_Testcases_CSE_Release_1 {
 							setverdict(pass, __SCOPE__ & ": creation successfull by using fanOutPoint in group resource");
     
 							if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list)){
-								setverdict(fail, __SCOPE__, ": Error, aggregatedResponse attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, aggregatedResponse attribute not provided");
 							}
 							else{
 								if(lengthof(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list) != c_numberOfResponsePrimitive){
-									setverdict(fail, __SCOPE__, ": Error, length of aggregatedResponse is not valid");
+									setverdict(fail, __SCOPE__ & ": Error, length of aggregatedResponse is not valid");
 								}
 								else{
 									for(i:=0; i<c_numberOfResponsePrimitive; i:=i+1){
 										if(not match(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list[i].primitiveContent, v_contentResponse)){
-											setverdict(fail, __SCOPE__, ": Error, aggregatedResponse doesn't match with template expected");
+											setverdict(fail, __SCOPE__ & ": Error, aggregatedResponse doesn't match with template expected");
 										}
 									}
 								}
@@ -11743,14 +11743,14 @@ module OneM2M_Testcases_CSE_Release_1 {
      
 							// check for membersId
 							if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.group_.memberIDs)){
-								setverdict(fail, __SCOPE__, ": Error, memberIDs attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, memberIDs attribute not provided");
 							} 
 							else {
 								if(lengthof(v_response.primitive.responsePrimitive.primitiveContent.group_.memberIDs) != 1) {
 								   setverdict(fail, __SCOPE__ & ": Error, wrong number of memberIDs attribute");      
 								}                               
 								if(v_response.primitive.responsePrimitive.primitiveContent.group_.memberIDs[0] != v_memberId_2){
-									setverdict(fail, __SCOPE__, ": Error, memberIDs attribute not correct");
+									setverdict(fail, __SCOPE__ & ": Error, memberIDs attribute not correct");
 								}
 							}
 						 }
@@ -11771,7 +11771,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					 if(getverdict == pass){ 
 						 if(ischosen(v_primitiveContentRetrievedResource.group_)){
 							if(v_primitiveContentRetrievedResource.group_.memberIDs[0] != v_memberId_2){
-								setverdict(fail, __SCOPE__, ": Error, memberIDs attribute not updated");
+								setverdict(fail, __SCOPE__ & ": Error, memberIDs attribute not updated");
 							}
 						  }
 					 }
@@ -11834,11 +11834,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 							setverdict(pass, __SCOPE__ & ": update successful"); 
                              
 							 if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.group_.memberTypeValidated)) {
-								setverdict(fail, __SCOPE__, ": Error, memberTypeValidated attribute not provided");    
+								setverdict(fail, __SCOPE__ & ": Error, memberTypeValidated attribute not provided");    
 							 } 
 							 else {
 								if(v_response.primitive.responsePrimitive.primitiveContent.group_.memberTypeValidated == false) {
-									setverdict(fail, __SCOPE__, ": Error, memberTypeValidated wrong value");  
+									setverdict(fail, __SCOPE__ & ": Error, memberTypeValidated wrong value");  
 								}
 							 }
 						}
@@ -11859,7 +11859,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					if(getverdict == pass){ 
 						 if(ischosen(v_primitiveContentRetrievedResource.group_)){
 							if(v_primitiveContentRetrievedResource.group_.memberTypeValidated == false){
-								setverdict(fail, __SCOPE__, ": Error,  memberTypeValidated attribute not updated");
+								setverdict(fail, __SCOPE__ & ": Error,  memberTypeValidated attribute not updated");
 							}
 						  }
 					 } 
@@ -11927,21 +11927,21 @@ module OneM2M_Testcases_CSE_Release_1 {
                              
 							//memberTypeValidated attribute set to FALSE
 							if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.group_.memberTypeValidated)) {
-								setverdict(fail, __SCOPE__, ": Error, memberTypeValidated attribute not provided");    
+								setverdict(fail, __SCOPE__ & ": Error, memberTypeValidated attribute not provided");    
 							}
 							else {
 								if(v_response.primitive.responsePrimitive.primitiveContent.group_.memberTypeValidated != true) {
-									setverdict(fail, __SCOPE__, ": Error, memberTypeValidated must be TRUE");
+									setverdict(fail, __SCOPE__ & ": Error, memberTypeValidated must be TRUE");
 								}
 							}
                                 
 							//memberType attribute set to MIXED
 							if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.group_.memberType)) {
-								setverdict(fail, __SCOPE__, ": Error, memberType attribute not provided");    
+								setverdict(fail, __SCOPE__ & ": Error, memberType attribute not provided");    
 							}
 							else {
 								if(v_response.primitive.responsePrimitive.primitiveContent.group_.memberType != int0) { //Mixed is int0 in release 2 and int24 in release 1
-									setverdict(fail, __SCOPE__, ": Error, memberType was not set to MIXED");
+									setverdict(fail, __SCOPE__ & ": Error, memberType was not set to MIXED");
 								}
 							}
                                 
@@ -11963,11 +11963,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 					if(getverdict == pass){ 
 						 if(ischosen(v_primitiveContentRetrievedResource.group_)){
 							if(v_primitiveContentRetrievedResource.group_.memberTypeValidated == false){
-								setverdict(fail, __SCOPE__, ": Error,  memberTypeValidated attribute not updated");
+								setverdict(fail, __SCOPE__ & ": Error,  memberTypeValidated attribute not updated");
 							}
 							
 							if(v_primitiveContentRetrievedResource.group_.memberType != int0){
-								setverdict(fail, __SCOPE__, ": Error,  memberType attribute not set to MIXED");
+								setverdict(fail, __SCOPE__ & ": Error,  memberType attribute not set to MIXED");
 							}
 						  }
 					 }
@@ -12036,24 +12036,24 @@ module OneM2M_Testcases_CSE_Release_1 {
                                                           
 							//memberTypeValidated attribute set to TRUE
 							if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.group_.memberTypeValidated)) {
-								setverdict(fail, __SCOPE__, ": Error, memberTypeValidated attribute not provided");    
+								setverdict(fail, __SCOPE__ & ": Error, memberTypeValidated attribute not provided");    
 							} 
 							else {
 								if(v_response.primitive.responsePrimitive.primitiveContent.group_.memberTypeValidated != true) {
-									setverdict(fail, __SCOPE__, ": Error, memberTypeValidated must be TRUE");
+									setverdict(fail, __SCOPE__ & ": Error, memberTypeValidated must be TRUE");
 								}
 							}
 
 							//memberIDs attribute set to v_memberID1
 							if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.group_.memberIDs)){
-								setverdict(fail, __SCOPE__, ": Error, memberIDs attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, memberIDs attribute not provided");
 							}
 							else {                               
 								if(lengthof(v_response.primitive.responsePrimitive.primitiveContent.group_.memberIDs) != 1) {
 								   setverdict(fail, __SCOPE__ & ": Error, wrong number of memberIDs attribute");      
 								}                               
 								if(v_response.primitive.responsePrimitive.primitiveContent.group_.memberIDs[0] != v_memberId_1){
-									setverdict(fail, __SCOPE__, ": Error, memberIDs attribute not correct");
+									setverdict(fail, __SCOPE__ & ": Error, memberIDs attribute not correct");
 								}
 							}                                   
 						}
@@ -12074,11 +12074,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 					if(getverdict == pass){ 
 						 if(ischosen(v_primitiveContentRetrievedResource.group_)){
 							if(v_primitiveContentRetrievedResource.group_.memberTypeValidated == false){
-								setverdict(fail, __SCOPE__, ": Error,  memberTypeValidated attribute not updated");
+								setverdict(fail, __SCOPE__ & ": Error,  memberTypeValidated attribute not updated");
 							}
 		
 							if(v_primitiveContentRetrievedResource.group_.memberIDs[0] != v_memberId_1){
-								setverdict(fail, __SCOPE__, ": Error,  memberIDs attribute not correct");
+								setverdict(fail, __SCOPE__ & ": Error,  memberIDs attribute not correct");
 							}
 						  }
 					 }
@@ -12409,7 +12409,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							tc_ac.stop;
                             
 							if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.group_.memberTypeValidated)) {
-								setverdict(fail, __SCOPE__, ": Error, memberTypeValidated attribute not provided");    
+								setverdict(fail, __SCOPE__ & ": Error, memberTypeValidated attribute not provided");    
 							 } else {
 								if(v_response.primitive.responsePrimitive.primitiveContent.group_.memberTypeValidated == false) {
 									if(lengthof(v_response.primitive.responsePrimitive.primitiveContent.group_.memberIDs) != 2) {
@@ -12418,11 +12418,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 										if(v_response.primitive.responsePrimitive.primitiveContent.group_.memberIDs[0] == v_memberId_1 and v_response.primitive.responsePrimitive.primitiveContent.group_.memberIDs[1] == v_memberId_2) {
 											setverdict(pass, __SCOPE__ & ": update successful");       
 										} else {
-											setverdict(fail, __SCOPE__, ": Error, wrong memberIDs");   
+											setverdict(fail, __SCOPE__ & ": Error, wrong memberIDs");   
 										}
 									}
 								} else {
-									setverdict(fail, __SCOPE__, ": Error, memberTypeValidated must be set to FALSE");  
+									setverdict(fail, __SCOPE__ & ": Error, memberTypeValidated must be set to FALSE");  
 								}   
 							}                            
 						}
@@ -12439,11 +12439,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 					if(getverdict == pass){ 
 						 if(ischosen(v_primitiveContentRetrievedResource.group_)){
 							if(v_primitiveContentRetrievedResource.group_.memberTypeValidated != false){
-								setverdict(fail, __SCOPE__, ": Error,  memberTypeValidated attribute not updated");
+								setverdict(fail, __SCOPE__ & ": Error,  memberTypeValidated attribute not updated");
 							}
 
 							if((v_primitiveContentRetrievedResource.group_.memberIDs[0] != v_memberId_1) and (v_primitiveContentRetrievedResource.group_.memberIDs[1] != v_memberId_2)){
-								setverdict(fail, __SCOPE__, ": Error,  memberIDs attribute not correct");
+								setverdict(fail, __SCOPE__ & ": Error,  memberIDs attribute not correct");
 							}
 						  }
 					 }
diff --git a/OneM2M_Testcases_CSE_Release_2.ttcn b/OneM2M_Testcases_CSE_Release_2.ttcn
index 516e6f13a57238580cbf850da749d5649942e63c..81e5e8ab7b121a955b09cb8fd518a517da6b1b24 100644
--- a/OneM2M_Testcases_CSE_Release_2.ttcn
+++ b/OneM2M_Testcases_CSE_Release_2.ttcn
@@ -400,7 +400,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 																	
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.schedule.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}
 						
@@ -422,7 +422,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 											
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.schedule.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}
 						
@@ -444,7 +444,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 																		
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.schedule.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}
 					
@@ -468,7 +468,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.pollingChannel.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}
 						
@@ -490,7 +490,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}		
 					}
@@ -511,7 +511,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}		
 					}
@@ -533,7 +533,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.node.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}
 						
@@ -555,7 +555,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.mgmtCmd.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}
 						
@@ -577,7 +577,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.locationPolicy.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}
 						
@@ -599,7 +599,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.statsConfig.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}
 					}
@@ -621,7 +621,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.statsCollect.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}
 						
@@ -643,7 +643,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.m2mServiceSubscriptionProfile.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}
 						
@@ -665,7 +665,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.serviceSubscribedAppRule.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}
 						
@@ -693,10 +693,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 																		
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.schedule.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							} else {
 								if(v_responsePrimitive.primitiveContent.schedule.resourceName != c_defaultScheduleResourceName){
-									setverdict(fail, __SCOPE__, ": Error, resourceName attribute not correct");
+									setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not correct");
 								}
 							}
 						}
@@ -715,10 +715,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.pollingChannel.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							} else {
 								if(v_responsePrimitive.primitiveContent.pollingChannel.resourceName != c_defaultPollingChannelResourceName){
-									setverdict(fail, __SCOPE__, ": Error, resourceName attribute not correct");
+									setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not correct");
 								}
 							}
 						}
@@ -4542,7 +4542,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.node)) {
 									 if(v_responsePrimitive.primitiveContent.node.labels != v_labels){
-										 setverdict(fail, __SCOPE__, ": Error: Labels attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -4580,7 +4580,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.node)) {
 									 if(v_responsePrimitive.primitiveContent.node.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.node.accessControlPolicyIDs)){
-										 setverdict(fail, __SCOPE__, ": Error: Access Control Policy attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Access Control Policy attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -4619,7 +4619,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.aE)) {
 									 if(v_responsePrimitive.primitiveContent.aE.ontologyRef != v_ontoLogyRef){
-										 setverdict(fail, __SCOPE__, ": Error: Ontology Ref attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Ontology Ref attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -4655,7 +4655,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.container)) {
 									 if(v_responsePrimitive.primitiveContent.container.ontologyRef != v_ontoLogyRef){
-										 setverdict(fail, __SCOPE__, ": Error: Ontology Ref attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Ontology Ref attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -4691,7 +4691,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.container)) {
 									 if(v_responsePrimitive.primitiveContent.container.locationID != v_locationID){
-										 setverdict(fail, __SCOPE__, ": Error: Location ID attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Location ID attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -4726,7 +4726,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
 									 if(v_responsePrimitive.primitiveContent.subscription.eventNotificationCriteria != v_eventNotificationCriteria){
-										 setverdict(fail, __SCOPE__, ": Error: Event Notification Criteria attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Event Notification Criteria attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -4761,7 +4761,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
 									 if(v_responsePrimitive.primitiveContent.subscription.expirationCounter != v_expirationCounter){
-										 setverdict(fail, __SCOPE__, ": Error: Expiration Counter attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Expiration Counter attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -4796,7 +4796,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
 									 if(v_responsePrimitive.primitiveContent.subscription.groupID != v_groupID){
-										 setverdict(fail, __SCOPE__, ": Error: Group ID attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Group ID attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -4831,7 +4831,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
 									 if(v_responsePrimitive.primitiveContent.subscription.notificationForwardingURI != v_notificationForwardingURI){
-										 setverdict(fail, __SCOPE__, ": Error: Notification Forwarding URI attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Notification Forwarding URI attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -4866,7 +4866,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
 									 if(v_responsePrimitive.primitiveContent.subscription.batchNotify != v_batchNotify){
-										 setverdict(fail, __SCOPE__, ": Error: Batch Notify attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Batch Notify attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -4901,7 +4901,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
 									 if(v_responsePrimitive.primitiveContent.subscription.rateLimit != v_rateLimit){
-										 setverdict(fail, __SCOPE__, ": Error: Rate Limit attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Rate Limit attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -4936,7 +4936,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
 									 if(v_responsePrimitive.primitiveContent.subscription.pendingNotification != v_pendingNotification){
-										 setverdict(fail, __SCOPE__, ": Error: Pending Notification attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Pending Notification attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -4971,7 +4971,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
 									 if(v_responsePrimitive.primitiveContent.subscription.notificationStoragePriority != v_notificationStoragePriority){
-										 setverdict(fail, __SCOPE__, ": Error: Notification Storage priority attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Notification Storage priority attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -5006,7 +5006,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
 									 if(v_responsePrimitive.primitiveContent.subscription.latestNotify != v_latestNotify){
-										 setverdict(fail, __SCOPE__, ": Error: Latest Notify priority attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Latest Notify priority attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -5040,7 +5040,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
 									 if(v_responsePrimitive.primitiveContent.subscription.notificationEventCat != v_eventCat){
-										 setverdict(fail, __SCOPE__, ": Error: Notification Event Cat attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Notification Event Cat attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -5083,7 +5083,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.node)) {
 									if(v_responsePrimitive.primitiveContent.node.expirationTime != v_expirationTime){
-										setverdict(fail, __SCOPE__, ": Error: Expiration time attribute not updated correctly")
+										setverdict(fail, __SCOPE__ & ": Error: Expiration time attribute not updated correctly")
 									}
 								}
 							}
@@ -5119,7 +5119,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.node)) {
 									if(v_responsePrimitive.primitiveContent.node.nodeID != v_targetId){
-										setverdict(fail, __SCOPE__, ": Error: NodeID attribute not updated correctly")
+										setverdict(fail, __SCOPE__ & ": Error: NodeID attribute not updated correctly")
 									}
 								}
 							}