From f9f72dccfba7d1aaa6f2c4c446fdc5d865f16b36 Mon Sep 17 00:00:00 2001
From: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
Date: Wed, 26 Jul 2017 12:03:01 +0200
Subject: [PATCH] Using __SCOPE__ everywhere in log and setverdict calls

Signed-off-by: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
---
 LibOneM2M/OneM2M_Functions.ttcn |   90 +-
 OneM2M_Testcases.ttcn           | 1632 +++++++++++++++----------------
 2 files changed, 861 insertions(+), 861 deletions(-)

diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index c76b0c3..4d90261 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -7,7 +7,7 @@
  *  
  *  @author     oneM2M
  *  @version    $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Functions.ttcn $
- *              $Id: OneM2M_Functions.ttcn 327 2017-07-26 06:25:46Z reinaortega $
+ *              $Id: OneM2M_Functions.ttcn 330 2017-07-26 10:02:53Z reinaortega $
  *  @desc       Module containing functions for oneM2M
  *
  */
@@ -401,7 +401,7 @@ module OneM2M_Functions {
 					tc_ac.stop;
 					}
 					[] tc_ac.timeout {
-						setverdict(inconc, testcasename() & ": Notify verification not received");
+						setverdict(inconc, __SCOPE__ & "INFO: Notify verification not received");
 					}
 				}
 			} //end f_is_component_done
@@ -542,11 +542,11 @@ module OneM2M_Functions {
 					}
 					[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 						tc_ac.stop;
-						setverdict(fail, __SCOPE__&":ERROR: Error while updating resource");
+						setverdict(inconc, __SCOPE__&":INFO: Error while updating resource");
 					}
 					[] mcaPort.receive{
 						tc_ac.stop;
-						setverdict(fail, __SCOPE__&":ERROR: Unexpected message received");
+						setverdict(inconc, __SCOPE__&":INFO: Unexpected message received");
 					}
 					[] tc_ac.timeout {
 						setverdict(inconc, __SCOPE__&":INFO: No answer while updating resource");
@@ -574,11 +574,11 @@ module OneM2M_Functions {
 					}
 					[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 						tc_ac.stop;
-						setverdict(fail, __SCOPE__&":ERROR: Error while retrieving resource");
+						setverdict(inconc, __SCOPE__&":INFO: Error while retrieving resource");
 					}
 					[] mcaPort.receive{
 						tc_ac.stop;
-						setverdict(fail, __SCOPE__&":ERROR: Unexpected message received");
+						setverdict(inconc, __SCOPE__&":INFO: Unexpected message received");
 					}
 					[] tc_ac.timeout {
 						setverdict(inconc, __SCOPE__&":INFO: No answer while retrieving resource");
@@ -605,14 +605,14 @@ module OneM2M_Functions {
 				alt {
 					[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
 						tc_ac.stop;
-						setverdict(pass, __SCOPE__&" INFO: Resource" & p_requestPrimitive.to_ & " deleted");
+						setverdict(pass, __SCOPE__&"INFO: Resource" & p_requestPrimitive.to_ & " deleted");
 					}
 					[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 						tc_ac.stop;
-						setverdict(inconc, __SCOPE__&" INFO: Error while deleting resource " & p_requestPrimitive.to_);
+						setverdict(inconc, __SCOPE__&"INFO: Error while deleting resource " & p_requestPrimitive.to_);
 					}
 					[] tc_ac.timeout {
-						setverdict(inconc, __SCOPE__&" INFO: No answer while deleting resource " & p_requestPrimitive.to_);
+						setverdict(inconc, __SCOPE__&"INFO: No answer while deleting resource " & p_requestPrimitive.to_);
 					}	
 				}	
 				
@@ -651,7 +651,7 @@ module OneM2M_Functions {
 					}
 					[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 						tc_ac.stop;
-						setverdict(fail, __SCOPE__&":ERROR: Error while updating " & v_request.to_ & " resource");
+						setverdict(inconc, __SCOPE__&":INFO: Error while updating " & v_request.to_ & " resource");
 					}
 					[] tc_ac.timeout {
 						setverdict(inconc, __SCOPE__&":INFO: No answer while updating " & v_request.to_ & " resource" );
@@ -680,16 +680,16 @@ module OneM2M_Functions {
 				alt {
 					[] mcaPort.receive(mw_request(mw_create(p_from, p_to))) -> value v_request {
 						tc_ac.stop;
-						setverdict(pass, testcasename() & ": Announcement received");
+						setverdict(pass, __SCOPE__ & ":INFO: Announcement received");
 						v_responsePrimitive := f_getCreateResponsePrimitive(v_request.primitive.requestPrimitive.resourceType, v_request.primitive.requestPrimitive);
 						mcaPort.send(m_response(v_responsePrimitive)); 						
 					}
 					[] mcaPort.receive{
 						tc_ac.stop;
-						setverdict(fail, testcasename() & ": Error, unexpected message received");
+						setverdict(fail, __SCOPE__ & ":ERROR: Unexpected message received");
 					}
 					[] tc_ac.timeout {
-						setverdict(inconc, testcasename() & ":  No announcement received");
+						setverdict(fail, __SCOPE__ & ":ERROR:  No announcement received");
 					}
 				}
 	
@@ -720,30 +720,30 @@ module OneM2M_Functions {
     			alt {
     				[] mcaPort.receive(mw_request(mw_notify(v_notificationRequest))) -> value v_request {
     					tc_ac.stop;
-    					setverdict(pass, testcasename() & ": Notification received");
+    					setverdict(pass, __SCOPE__ & ":INFO: Notification received");
 						v_responsePrimitive.requestIdentifier := v_request.primitive.requestPrimitive.requestIdentifier;
 //    					if(f_isHierarchical(v_request.primitive.requestPrimitive.primitiveContent.notification.creator)) {
-//							setverdict(fail, testcasename() & ": Creator cannot contain a hierarchical address");
+//							setverdict(fail, __SCOPE__ & ": Creator cannot contain a hierarchical address");
 //							v_responsePrimitive.responseStatusCode := int4000;
 //						}
 //    					if(f_compareURIs(p_creatorIndex, v_request.primitive.requestPrimitive.primitiveContent.notification.creator)) {
-//							setverdict(pass, testcasename() & ": Creator set to originator of the subscription creation primitive");
+//							setverdict(pass, __SCOPE__ & ": Creator set to originator of the subscription creation primitive");
 //    					} else {
-//							setverdict(fail, testcasename() & ": Creator not set to originator of the subscription creation primitive");
+//							setverdict(fail, __SCOPE__ & ": Creator not set to originator of the subscription creation primitive");
 //							v_responsePrimitive.responseStatusCode := int4000;
 //    					}
     					mcaPort.send(m_httpResponse(v_responsePrimitive)); 						
     				}
     				[] mcaPort.receive(mw_request(mw_notify(mw_contentNotification(?)))) -> value v_request {
     					tc_ac.stop;
-    					setverdict(fail, testcasename() & ": Notification received but verificationRequest isn't set to TRUE");							
+    					setverdict(fail, __SCOPE__ & ":ERROR: Notification received but verificationRequest isn't set to TRUE");							
     				}
     				[] mcaPort.receive{
     					tc_ac.stop;
-    					setverdict(fail, testcasename() & ": Error, unexpected message received");
+    					setverdict(fail, __SCOPE__ & ":ERROR: unexpected message received");
     				}
     				[] tc_ac.timeout {
-    					setverdict(inconc, testcasename() & ":  No notification received");
+    					setverdict(fail, __SCOPE__ & ":ERROR:  No notification received");
     				}
     			}
     	
@@ -760,63 +760,63 @@ module OneM2M_Functions {
     					if(isvalue(p_response.primitiveContent.accessControlPolicy) and
     							not(ispresent(p_response.primitiveContent.accessControlPolicy.resourceName))) {
     						p_response.primitiveContent.accessControlPolicy.resourceName :=  p_request.primitiveContent.accessControlPolicy.resourceName;
-    						log(__SCOPE__ & ": Info: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.accessControlPolicy.resourceName)
+    						log(__SCOPE__ & ":INFO: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.accessControlPolicy.resourceName)
     					}
     				}
     				case (int2) {
     					if(isvalue(p_response.primitiveContent.aE) and
     							not(ispresent(p_response.primitiveContent.aE.resourceName))) {
     						p_response.primitiveContent.aE.resourceName :=  p_request.primitiveContent.aE.resourceName;
-							log(__SCOPE__ & ": Info: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.aE.resourceName)
+							log(__SCOPE__ & ":INFO: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.aE.resourceName)
     					}
     				}
     				case (int3) {
     					if(isvalue(p_response.primitiveContent.container) and
     							not(ispresent(p_response.primitiveContent.container.resourceName))) {
     						p_response.primitiveContent.container.resourceName :=  p_request.primitiveContent.container.resourceName;
-							log(__SCOPE__ & ": Info: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.container.resourceName)
+							log(__SCOPE__ & ":INFO: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.container.resourceName)
     					}
     				}
 					case (int4) {
 						if(isvalue(p_response.primitiveContent.contentInstance) and
 								not(ispresent(p_response.primitiveContent.contentInstance.resourceName))) {
 							p_response.primitiveContent.contentInstance.resourceName :=  p_request.primitiveContent.contentInstance.resourceName;
-							log(__SCOPE__ & ": Info: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.contentInstance.resourceName)
+							log(__SCOPE__ & ":INFO: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.contentInstance.resourceName)
 						}
 					}
     				case (int15) {
     					if (isvalue(p_response.primitiveContent.pollingChannel) and
     							not(ispresent(p_response.primitiveContent.pollingChannel.resourceName))) {
     						p_response.primitiveContent.pollingChannel.resourceName :=  p_request.primitiveContent.pollingChannel.resourceName;
-							log(__SCOPE__ & ": Info: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.pollingChannel.resourceName)
+							log(__SCOPE__ & ":INFO: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.pollingChannel.resourceName)
     					}
     				}
 					case (int16) {
 						if (isvalue(p_response.primitiveContent.remoteCSE) and
 								not(ispresent(p_response.primitiveContent.remoteCSE.resourceName))) {
 							p_response.primitiveContent.remoteCSE.resourceName :=  p_request.primitiveContent.remoteCSE.resourceName;
-							log(__SCOPE__ & ": Info: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.remoteCSE.resourceName)
+							log(__SCOPE__ & ":INFO: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.remoteCSE.resourceName)
 						}
 					}
     				case (int18) {
     					if (isvalue(p_response.primitiveContent.schedule) and
     							not(ispresent(p_response.primitiveContent.schedule.resourceName))) {
     						p_response.primitiveContent.schedule.resourceName :=  p_request.primitiveContent.schedule.resourceName;
-							log(__SCOPE__ & ": Info: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.schedule.resourceName)
+							log(__SCOPE__ & ":INFO: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.schedule.resourceName)
     					}
     				}
     				case (int23) {
     					if (isvalue(p_response.primitiveContent.subscription) and
     							not(ispresent(p_response.primitiveContent.subscription.resourceName))) {
     						p_response.primitiveContent.subscription.resourceName :=  p_request.primitiveContent.subscription.resourceName;
-							log(__SCOPE__ & ": Info: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.subscription.resourceName)
+							log(__SCOPE__ & ":INFO: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.subscription.resourceName)
     					}
     				}
     				case (int9) {
     					if (isvalue(p_response.primitiveContent.group_) and
     							not(ispresent(p_response.primitiveContent.group_.resourceName))) {
     						p_response.primitiveContent.group_.resourceName :=  p_request.primitiveContent.group_.resourceName;
-							log(__SCOPE__ & ": Info: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.group_.resourceName)
+							log(__SCOPE__ & ":INFO: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.group_.resourceName)
     					}
     				}
     				case else {
@@ -919,19 +919,19 @@ module OneM2M_Functions {
     				[] mcaPort.receive(mw_request(mw_notify(mw_contentNotification(?)))) -> value v_request {
     					tc_ac.stop;
     					if(f_check_notificationContent(v_request.primitive.requestPrimitive, p_primitiveContent)){
-    						setverdict(pass, testcasename() & ": Notification received");
+    						setverdict(pass, __SCOPE__ & ":INFO: Notification received");
     						mcaPort.send(m_response(valueof(m_responseNotification(int2001))));
     					}
     					else{
-    						setverdict(fail, testcasename() & ": Notification received but the content doesn't match");
+    						setverdict(fail, __SCOPE__ & ":ERROR: Notification received but the content doesn't match");
     					}
     				}
     				[] mcaPort.receive{
     					tc_ac.stop;
-    					setverdict(fail, testcasename() & ": Error, unexpected message received");
+    					setverdict(fail, __SCOPE__ & ":ERROR: unexpected message received");
     				}
     				[] tc_ac.timeout {
-    					setverdict(inconc, testcasename() & ": No notification received");
+    					setverdict(fail, __SCOPE__ & ":ERROR: No notification received");
     				}
     			}
     	
@@ -953,21 +953,21 @@ module OneM2M_Functions {
 							tc_ac.stop;
 							mcaPort.send(m_response(valueof(m_responseNotification(int2001))));
 							if(not(match(v_response.primitive.requestPrimitive.primitiveContent.notification.subscriptionDeletion, true))) {
-								setverdict(fail, testcasename() & ": subscriptionDeletion attribute have to be set to TRUE");
+								setverdict(fail, __SCOPE__ & ":ERROR: subscriptionDeletion attribute have to be set to TRUE");
 							}
 							if(f_check_notificationContent(v_response.primitive.requestPrimitive, p_primitiveContent)){
-								setverdict(pass, testcasename() & ": Notification received");
+								setverdict(pass, __SCOPE__ & ":INFO: Notification received");
 							}
 							else{
-								setverdict(fail, testcasename() & ": Notification received but the content doesn't match");
+								setverdict(fail, __SCOPE__ & ":ERROR: Notification received but the content doesn't match");
 							}
 						}
 						[] mcaPort.receive{
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error, unexpected message received");
+							setverdict(fail, __SCOPE__ & ":ERROR: unexpected message received");
 						}
 						[] tc_ac.timeout {
-							setverdict(inconc, testcasename() & ": No notification received");
+							setverdict(fail, __SCOPE__ & ":ERROR: No notification received");
 						}
 					}
 					
@@ -1265,13 +1265,13 @@ module OneM2M_Functions {
 				var MsgIn v_request; 
 				
 				[] mcaPort.receive(mw_request(?)) -> value v_request {
-					log("a_default: WARNING: Unexpected request received");
+					log(__SCOPE__ & ":WARNING: Unexpected request received");
 					mcaPort.send(m_response(m_responsePrimitive(int5000, v_request.primitive.requestPrimitive.requestIdentifier)));
 					repeat;
 				}
 				    		
 				[] mcaPort.receive {
-					log("a_ae_default: WARNING: Unexpected message received");
+					log(__SCOPE__ & ":WARNING: Unexpected message received");
 					repeat;
 				}
 			 }		
@@ -1503,7 +1503,7 @@ module OneM2M_Functions {
 			if(ischosen(p_contentResource.serviceSubscribedAppRule)) {
 				return f_resourceIdCleaner(p_contentResource.serviceSubscribedAppRule.resourceID);
 			}
-			log(""&__SCOPE__&":WARNING: Primitive Content Kind not implemented");
+			log(__SCOPE__&":WARNING: Primitive Content Kind not implemented");
 			
 			return "resourceIDNotFound";
 			
@@ -1776,7 +1776,7 @@ module OneM2M_Functions {
 				return vc_resourcesList[p_targetResourceIndex].resource.aE.aE_ID;
 			}
 			
-			log("f_getAeId: WARNING: p_targetResourceIndex does not refer to AE resource");
+			log(__SCOPE__ & ":WARNING: p_targetResourceIndex does not refer to AE resource");
 			return "";
 			
 		} // end f_getAeId
@@ -1841,10 +1841,10 @@ module OneM2M_Functions {
 			 altstep a_default() runs on Tester {
 			
 				[] tc_wait.timeout {
-					 setverdict(inconc,"a_default: ERROR: Timeout while awaiting reaction of the IUT prior to Upper Tester action");
+					 setverdict(inconc, __SCOPE__&":INFO: Timeout while awaiting reaction of the IUT prior to Upper Tester action");
 				}
 				[] tc_ac.timeout {
-					setverdict(inconc,"a_default: ERROR: Timeout while awaiting the reception of a message");
+					setverdict(inconc, __SCOPE__&":INFO: Timeout while awaiting the reception of a message");
 				}
 			 }				 
 
@@ -2158,7 +2158,7 @@ module OneM2M_Functions {
 			v_response := p_responsePrimitiveContent;
 			v_primitiveContent := f_getTemplateFromPrimitiveContent(p_requestPrimitiveContent);
 			if(not(match(v_response, v_primitiveContent))){
-				setverdict(inconc, "Preamble: Error resource incomplete, some attribute missing ");
+				setverdict(inconc, __SCOPE__&":INFO: Resource incomplete, some attribute missing ");
 			}
 
 		}
diff --git a/OneM2M_Testcases.ttcn b/OneM2M_Testcases.ttcn
index dc5a5c0..8071478 100644
--- a/OneM2M_Testcases.ttcn
+++ b/OneM2M_Testcases.ttcn
@@ -7,7 +7,7 @@
  *  
  *  @author     oneM2M
  *  @version    $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_Testcases.ttcn $
- *              $Id: OneM2M_Testcases.ttcn 329 2017-07-26 07:03:27Z reinaortega $
+ *              $Id: OneM2M_Testcases.ttcn 330 2017-07-26 10:02:53Z reinaortega $
  *  @desc       Module containing test cases for oneM2M
  *
  */
@@ -51,21 +51,21 @@ module OneM2M_Testcases {
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
 							t_ac.stop;
-							log("Postamble: Resource deleted");
+							log(__SCOPE__ & ":Resource deleted");
 							setverdict(pass);
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 							t_ac.stop;
-							log("Postamble: Error while deleting resource");
+							log(__SCOPE__ & ":Error while deleting resource");
 							setverdict(fail);
 						}
 						[] mcaPort.receive {
 							t_ac.stop;
-							log("Postamble: Unexpected message received");
+							log(__SCOPE__ & ":Unexpected message received");
 							setverdict(inconc);
 						}
 						[] t_ac.timeout {
-							log("Postamble: No answer while deleting resource");
+							log(__SCOPE__ & ":No answer while deleting resource");
 							setverdict(inconc);
 						}	
 					}	
@@ -117,7 +117,7 @@ module OneM2M_Testcases {
 											   
 						// Test control
 						if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
-							setverdict(inconc, testcasename() & ": 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;
 						}
     				
@@ -142,18 +142,18 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": Container resource created using non-hierarchical addressing method");
+								setverdict(pass, __SCOPE__ & ": Container resource created using non-hierarchical addressing method");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Wrong response status code in the response");
+								setverdict(fail, __SCOPE__ & ": Wrong response status code in the response");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while creating container resource using non-hierarchical addressing method");
+								setverdict(fail, __SCOPE__ & ": Error while creating container resource using non-hierarchical addressing method");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while creating resource");
+								setverdict(fail, __SCOPE__ & ": No answer while creating resource");
 							}
 						}	
     								
@@ -203,7 +203,7 @@ module OneM2M_Testcases {
 											   
 						// Test control
 						if(not(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
-							setverdict(inconc, testcasename() & ": 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,18 +228,18 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": Container resource created using hierarchical addressing method");
+								setverdict(pass, __SCOPE__ & ": Container resource created using hierarchical addressing method");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Wrong response status code in the response");
+								setverdict(fail, __SCOPE__ & ": Wrong response status code in the response");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while creating container resource using hierarchical addressing method");
+								setverdict(fail, __SCOPE__ & ": Error while creating container resource using hierarchical addressing method");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while creating resource");
+								setverdict(fail, __SCOPE__ & ": No answer while creating resource");
 							}
 						}	
     								
@@ -291,7 +291,7 @@ module OneM2M_Testcases {
 											   
 						// Test control
 						if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
-							setverdict(inconc, testcasename() & ": 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;
 						}
     				
@@ -315,18 +315,18 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": Container resource retrieved using non-hierarchical addressing method");
+								setverdict(pass, __SCOPE__ & ": Container resource retrieved using non-hierarchical addressing method");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Wrong response status code in the response");
+								setverdict(fail, __SCOPE__ & ": Wrong response status code in the response");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while retrieving container resource using non-hierarchical addressing method");
+								setverdict(fail, __SCOPE__ & ": Error while retrieving container resource using non-hierarchical addressing method");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while retrieving resource");
+								setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
 							}
 						}	
     								
@@ -375,7 +375,7 @@ module OneM2M_Testcases {
 											   
 						// Test control
 						if(not(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
-							setverdict(inconc, testcasename() & ": 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;
 						}
     				
@@ -398,18 +398,18 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": Container resource retrieved using hierarchical addressing method");
+								setverdict(pass, __SCOPE__ & ": Container resource retrieved using hierarchical addressing method");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Wrong response status code in the response");
+								setverdict(fail, __SCOPE__ & ": Wrong response status code in the response");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while retrieving container resource using hierarchical addressing method");
+								setverdict(fail, __SCOPE__ & ": Error while retrieving container resource using hierarchical addressing method");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while retrieving resource");
+								setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
 							}
 						}	
     								
@@ -461,7 +461,7 @@ module OneM2M_Testcases {
 											   
 						// Test control
 						if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
-							setverdict(inconc, testcasename() & ": 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;
 						}
     				
@@ -489,18 +489,18 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": Container resource updated using non-hierarchical addressing method");
+								setverdict(pass, __SCOPE__ & ": Container resource updated using non-hierarchical addressing method");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Wrong response status code in the response");
+								setverdict(fail, __SCOPE__ & ": Wrong response status code in the response");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while updating container resource using non-hierarchical addressing method");
+								setverdict(fail, __SCOPE__ & ": Error while updating container resource using non-hierarchical addressing method");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while updating resource");
+								setverdict(fail, __SCOPE__ & ": No answer while updating resource");
 							}
 						}	
     								
@@ -549,7 +549,7 @@ module OneM2M_Testcases {
 											   
 						// Test control
 						if(not(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
-							setverdict(inconc, testcasename() & ": 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;
 						}
     				
@@ -577,18 +577,18 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": Container resource updated using hierarchical addressing method");
+								setverdict(pass, __SCOPE__ & ": Container resource updated using hierarchical addressing method");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Wrong response status code in the response");
+								setverdict(fail, __SCOPE__ & ": Wrong response status code in the response");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while updating container resource using hierarchical addressing method");
+								setverdict(fail, __SCOPE__ & ": Error while updating container resource using hierarchical addressing method");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while updating resource");
+								setverdict(fail, __SCOPE__ & ": No answer while updating resource");
 							}
 						}	
     								
@@ -641,7 +641,7 @@ module OneM2M_Testcases {
 											   
 						// Test control
 						if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
-							setverdict(inconc, testcasename() & ": 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;
 						}
     				
@@ -667,18 +667,18 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": Container resource deleted using non-hierarchical addressing method");
+								setverdict(pass, __SCOPE__ & ": Container resource deleted using non-hierarchical addressing method");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Wrong response status code in the response");
+								setverdict(fail, __SCOPE__ & ": Wrong response status code in the response");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while deleting container resource using non-hierarchical addressing method");
+								setverdict(fail, __SCOPE__ & ": Error while deleting container resource using non-hierarchical addressing method");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while deleting resource");
+								setverdict(fail, __SCOPE__ & ": No answer while deleting resource");
 							}
 						}	
     								
@@ -728,7 +728,7 @@ module OneM2M_Testcases {
 											   
 						// Test control
 						if(not(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
-							setverdict(inconc, testcasename() & ": 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;
 						}
     				
@@ -754,18 +754,18 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": Container resource deleted using hierarchical addressing method");
+								setverdict(pass, __SCOPE__ & ": Container resource deleted using hierarchical addressing method");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Wrong response status code in the response");
+								setverdict(fail, __SCOPE__ & ": Wrong response status code in the response");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while deleting container resource using hierarchical addressing method");
+								setverdict(fail, __SCOPE__ & ": Error while deleting container resource using hierarchical addressing method");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while deleting resource");
+								setverdict(fail, __SCOPE__ & ": No answer while deleting resource");
 							}
 						}	
     								
@@ -819,14 +819,14 @@ module OneM2M_Testcases {
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) {
 							tc_ac.stop;
-							setverdict(pass, testcasename() & ": AE successfully created.");
+							setverdict(pass, __SCOPE__ & ": AE successfully created.");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveInverse(int2001))) -> value v_response{
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error while creating AE with status code " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)));
+							setverdict(fail, __SCOPE__ & ": Error while creating AE with status code " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)));
 						}
 						[] tc_ac.timeout {
-							setverdict(fail, testcasename() & ": No answer while creating AE");
+							setverdict(fail, __SCOPE__ & ": No answer while creating AE");
 						}
 					}	
 									
@@ -865,14 +865,14 @@ module OneM2M_Testcases {
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) {
 							tc_ac.stop;
-							setverdict(pass, testcasename() & ": AE successfully created.");
+							setverdict(pass, __SCOPE__ & ": AE successfully created.");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveInverse(int2001))) -> value v_response{
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error while creating AE with status code " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)));
+							setverdict(fail, __SCOPE__ & ": Error while creating AE with status code " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)));
 						}
 						[] tc_ac.timeout {
-							setverdict(fail, testcasename() & ": No answer while creating AE");
+							setverdict(fail, __SCOPE__ & ": No answer while creating AE");
 						}
 					}	
 									
@@ -911,14 +911,14 @@ module OneM2M_Testcases {
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) {
 							tc_ac.stop;
-							setverdict(pass, testcasename() & ": AE creation rejected.");
+							setverdict(pass, __SCOPE__ & ": AE creation rejected.");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveInverse(int4005))) -> value v_response{
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error while creating AE with status code " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)));
+							setverdict(fail, __SCOPE__ & ": Error while creating AE with status code " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)));
 						}
 						[] tc_ac.timeout {
-							setverdict(fail, testcasename() & ": No answer while creating AE");
+							setverdict(fail, __SCOPE__ & ": No answer while creating AE");
 						}
 					}	
 									
@@ -957,14 +957,14 @@ module OneM2M_Testcases {
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) {
 							tc_ac.stop;
-							setverdict(pass, testcasename() & ": AE creation rejected.");
+							setverdict(pass, __SCOPE__ & ": AE creation rejected.");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveInverse(int4005))) -> value v_response{
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error while creating AE with status code " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)));
+							setverdict(fail, __SCOPE__ & ": Error while creating AE with status code " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)));
 						}
 						[] tc_ac.timeout {
-							setverdict(fail, testcasename() & ": No answer while creating AE");
+							setverdict(fail, __SCOPE__ & ": No answer while creating AE");
 						}
 					}	
 									
@@ -1004,14 +1004,14 @@ module OneM2M_Testcases {
 					alt {
 						[] mccPort.receive(mw_request(mw_createAEAnnc(-, -, -))) {
 							tc_ac.stop;
-							setverdict(pass, testcasename() & ": AE creation redirected.");
+							setverdict(pass, __SCOPE__ & ": AE creation redirected.");
 						}
 						[] mccPort.receive {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error while creating AE");
+							setverdict(fail, __SCOPE__ & ": Error while creating AE");
 						}
 						[] tc_ac.timeout {
-							setverdict(fail, testcasename() & ": No answer while creating AE");
+							setverdict(fail, __SCOPE__ & ": No answer while creating AE");
 						}
 					}	
 									
@@ -1054,14 +1054,14 @@ module OneM2M_Testcases {
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int4105))) {
 							tc_ac.stop;
-							setverdict(pass, testcasename() & ": AE creation rejected.");
+							setverdict(pass, __SCOPE__ & ": AE creation rejected.");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveInverse(int4105))) -> value v_response{
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error while creating AE with status code " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)));
+							setverdict(fail, __SCOPE__ & ": Error while creating AE with status code " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)));
 						}
 						[] tc_ac.timeout {
-							setverdict(fail, testcasename() & ": No answer while creating AE");
+							setverdict(fail, __SCOPE__ & ": No answer while creating AE");
 						}
 					}	
 									
@@ -1101,14 +1101,14 @@ module OneM2M_Testcases {
 					alt {
 						[] mccPort.receive(mw_request(mw_createAEAnnc("/S", "CSE_ID", -))) {
 							tc_ac.stop;
-							setverdict(pass, testcasename() & ": AE creation redirected.");
+							setverdict(pass, __SCOPE__ & ": AE creation redirected.");
 						}
 						[] mccPort.receive {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error while creating AE");
+							setverdict(fail, __SCOPE__ & ": Error while creating AE");
 						}
 						[] tc_ac.timeout {
-							setverdict(fail, testcasename() & ": No answer while creating AE");
+							setverdict(fail, __SCOPE__ & ": No answer while creating AE");
 						}
 					}	
 									
@@ -1149,15 +1149,15 @@ module OneM2M_Testcases {
 					alt {
 						[] mccPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
 							tc_ac.stop;
-							setverdict(pass, testcasename() & ": AE creation redirected.");
+							setverdict(pass, __SCOPE__ & ": AE creation redirected.");
 							//continue to test the content
 						}
 						[] mccPort.receive {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error while creating AE");
+							setverdict(fail, __SCOPE__ & ": Error while creating AE");
 						}
 						[] tc_ac.timeout {
-							setverdict(fail, testcasename() & ": No answer while creating AE");
+							setverdict(fail, __SCOPE__ & ": No answer while creating AE");
 						}
 					}	
 									
@@ -1195,15 +1195,15 @@ module OneM2M_Testcases {
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
 							tc_ac.stop;
-							setverdict(pass, testcasename() & ": AE creation success.");
+							setverdict(pass, __SCOPE__ & ": AE creation success.");
 							//continue to test the content
 						}
 						[] mcaPort.receive {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error while creating AE");
+							setverdict(fail, __SCOPE__ & ": Error while creating AE");
 						}
 						[] tc_ac.timeout {
-							setverdict(fail, testcasename() & ": No answer while creating AE");
+							setverdict(fail, __SCOPE__ & ": No answer while creating AE");
 						}
 					}	
 									
@@ -1246,14 +1246,14 @@ module OneM2M_Testcases {
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) {
 							tc_ac.stop;
-							setverdict(pass, testcasename() & ": CSEBase creation rejected.");
+							setverdict(pass, __SCOPE__ & ": CSEBase creation rejected.");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveInverse(int4005))) -> value v_response{
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error while creating CSEBase with status code " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)));
+							setverdict(fail, __SCOPE__ & ": Error while creating CSEBase with status code " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)));
 						}
 						[] tc_ac.timeout {
-							setverdict(fail, testcasename() & ": No answer while creating CSEBase");
+							setverdict(fail, __SCOPE__ & ": No answer while creating CSEBase");
 						}
 					}	
 				
@@ -1294,14 +1294,14 @@ module OneM2M_Testcases {
 					alt {
 						[] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 							tc_ac.stop;
-							setverdict(pass, testcasename() & ": Resource type remoteCSE created successfully");
+							setverdict(pass, __SCOPE__ & ": Resource type remoteCSE created successfully");
 						}
 						[] mccPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error while creating resource type remoteCSE");
+							setverdict(fail, __SCOPE__ & ": Error while creating resource type remoteCSE");
 						}
 						[] tc_ac.timeout {
-							setverdict(fail, testcasename() & ": No answer while creating resource type remoteCSE");
+							setverdict(fail, __SCOPE__ & ": No answer while creating resource type remoteCSE");
 						}
 					}	
 			
@@ -1342,14 +1342,14 @@ module OneM2M_Testcases {
 					alt {
 						[] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 							tc_ac.stop;
-							setverdict(pass, testcasename() & ": Resource type remoteCSE created successfully");
+							setverdict(pass, __SCOPE__ & ": Resource type remoteCSE created successfully");
 						}
 						[] mccPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error while creating resource type remoteCSE");
+							setverdict(fail, __SCOPE__ & ": Error while creating resource type remoteCSE");
 						}
 						[] tc_ac.timeout {
-							setverdict(fail, testcasename() & ": No answer while creating resource type remoteCSE");
+							setverdict(fail, __SCOPE__ & ": No answer while creating resource type remoteCSE");
 						}
 					}	
 
@@ -1435,18 +1435,18 @@ module OneM2M_Testcases {
 						alt {
 							[] mccPort.receive(mw_response(mw_responsePrimitiveOK(f_getTemplateFromPrimitiveContent(v_request.primitiveContent)))) -> value v_response {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": Accepted creation for resource type remoteCSE containing attribute " & p_optionalAttribute.name);
+								setverdict(pass, __SCOPE__ & ": Accepted creation for resource type remoteCSE containing attribute " & p_optionalAttribute.name);
 							}
 							[] mccPort.receive(mw_response(mw_responsePrimitiveOK())) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Accepted creation for resource type remoteCSE without containing attribute " & p_optionalAttribute.name);
+								setverdict(fail, __SCOPE__ & ": Accepted creation for resource type remoteCSE without containing attribute " & p_optionalAttribute.name);
 							}
 							[] mccPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Rejected creation of resource type remoteCSE containing attribute" & p_optionalAttribute.name);
+								setverdict(fail, __SCOPE__ & ": Rejected creation of resource type remoteCSE containing attribute" & p_optionalAttribute.name);
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while creating resource type remoteCSE");
+								setverdict(fail, __SCOPE__ & ": No answer while creating resource type remoteCSE");
 							}
 						}	
 								
@@ -1493,18 +1493,18 @@ module OneM2M_Testcases {
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(v_contentResponse))) -> value v_response {
 							tc_ac.stop;
-							setverdict(pass, testcasename() & ": Response OK for retrieving");
+							setverdict(pass, __SCOPE__ & ": Response OK for retrieving");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error, resource elements provided not matching expected resource elements");
+							setverdict(fail, __SCOPE__ & ": Error, resource elements provided not matching expected resource elements");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error while retrieving resource");
+							setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
 						}
 						[] tc_ac.timeout {
-							setverdict(fail, testcasename() & ": No answer while retrieving resource");
+							setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
 						}
 					}	
 				
@@ -1530,7 +1530,7 @@ module OneM2M_Testcases {
 								   
 					// Test control
 					if(not(PICS_IN_CSE)) {
-						setverdict(inconc, testcasename() & ": IUT shall be IN-CSE to run this test case");
+						setverdict(inconc, __SCOPE__ & ": IUT shall be IN-CSE to run this test case");
 						stop;
 					}
 
@@ -1553,25 +1553,25 @@ module OneM2M_Testcases {
 							tc_ac.stop;
 							if (ispresent(v_response.primitive.responsePrimitive.primitiveContent.cSEBase.cseType)){
 								if (v_response.primitive.responsePrimitive.primitiveContent.cSEBase.cseType==int1){
-									setverdict(pass, testcasename() & ": cseType attribute is set to 1 (IN_CSE)");
+									setverdict(pass, __SCOPE__ & ": cseType attribute is set to 1 (IN_CSE)");
 								}else{
-									setverdict(fail, testcasename() & ": Error, cseType attribute is set to " & int2str(enum2int(v_response.primitive.responsePrimitive.primitiveContent.cSEBase.cseType)));
+									setverdict(fail, __SCOPE__ & ": Error, cseType attribute is set to " & int2str(enum2int(v_response.primitive.responsePrimitive.primitiveContent.cSEBase.cseType)));
 								}
 							}else{
-								setverdict(fail, testcasename() & ": Error, cseType attribute is not present");
+								setverdict(fail, __SCOPE__ & ": Error, cseType attribute is not present");
 							}
 							
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error, resource elements provided not matching expected resource elements");
+							setverdict(fail, __SCOPE__ & ": Error, resource elements provided not matching expected resource elements");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error while retrieving resource");
+							setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
 						}
 						[] tc_ac.timeout {
-							setverdict(fail, testcasename() & ": No answer while retrieving resource");
+							setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
 						}
 					}	
 
@@ -1616,28 +1616,28 @@ module OneM2M_Testcases {
 							tc_ac.stop;
 							
 							if (v_response.primitive.responsePrimitive.primitiveContent.cSEBase.supportedResourceType == PX_SRT) {
-								setverdict(pass, testcasename() & ": supportedResourceTypes attribute is set according to PX_SRT");
+								setverdict(pass, __SCOPE__ & ": supportedResourceTypes attribute is set according to PX_SRT");
 							}else{
-								setverdict(fail, testcasename() & ": supportedResourceTypes attribute is not set according to PX_SRT");
+								setverdict(fail, __SCOPE__ & ": supportedResourceTypes attribute is not set according to PX_SRT");
 							}
 							
 							if (v_response.primitive.responsePrimitive.primitiveContent.cSEBase.pointOfAccess==PX_POA){
-								setverdict(pass, testcasename() & ": supportedResourceTypes attribute is set according to PX_POA");
+								setverdict(pass, __SCOPE__ & ": supportedResourceTypes attribute is set according to PX_POA");
 							}else{
-								setverdict(fail, testcasename() & ": supportedResourceTypes attribute is not set according to PX_POA");
+								setverdict(fail, __SCOPE__ & ": supportedResourceTypes attribute is not set according to PX_POA");
 							}
 			
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error, resource elements provided not matching expected resource elements");
+							setverdict(fail, __SCOPE__ & ": Error, resource elements provided not matching expected resource elements");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error while retrieving resource");
+							setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
 						}
 						[] tc_ac.timeout {
-							setverdict(fail, testcasename() & ": No answer while retrieving resource");
+							setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
 						}
 					}	
 
@@ -1684,14 +1684,14 @@ module OneM2M_Testcases {
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) {
 							tc_ac.stop;
-							setverdict(pass, testcasename() & ": CSEBase update rejected.");
+							setverdict(pass, __SCOPE__ & ": CSEBase update rejected.");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveInverse(int4005))) -> value v_response{
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error while updating CSEBase with status code " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)));
+							setverdict(fail, __SCOPE__ & ": Error while updating CSEBase with status code " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)));
 						}
 						[] tc_ac.timeout {
-							setverdict(fail, testcasename() & ": No answer while updating CSEBase");
+							setverdict(fail, __SCOPE__ & ": No answer while updating CSEBase");
 						}
 					}					    
 
@@ -1734,14 +1734,14 @@ module OneM2M_Testcases {
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) {
 							tc_ac.stop;
-							setverdict(pass, testcasename() & ": CSEBase deletion rejected.");
+							setverdict(pass, __SCOPE__ & ": CSEBase deletion rejected.");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveInverse(int4005))) -> value v_response{
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error while deleting CSEBase with status code " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)));
+							setverdict(fail, __SCOPE__ & ": Error while deleting CSEBase with status code " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)));
 						}
 						[] tc_ac.timeout {
-							setverdict(fail, testcasename() & ": No answer while deleting CSEBase");
+							setverdict(fail, __SCOPE__ & ": No answer while deleting CSEBase");
 						}
 					}					    
 	
@@ -1775,11 +1775,11 @@ module OneM2M_Testcases {
 						
 						v_createRequest.primitiveContent.container.resourceName := omit;
 						v_responsePrimitive := f_CSE_DMR_CRE_001(int3, v_createRequest, -, v_notifyHandler); //Container
-						log(v_responsePrimitive);
+						
 						if(getverdict == pass){
 							if(not ispresent(v_responsePrimitive.primitiveContent.container.resourceName)){
-								setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
-						}
+								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+							}
 						}
 						
 					}
@@ -1792,10 +1792,10 @@ module OneM2M_Testcases {
 						
 						v_createRequest.primitiveContent.group_.resourceName := omit;
 						v_responsePrimitive := f_CSE_DMR_CRE_001(int3, v_createRequest, m_createAeAux(omit,omit),v_notifyHandler);//Container
-							log(v_responsePrimitive);
-							if(getverdict == pass){
-							if(not ispresent(v_responsePrimitive.primitiveContent.group_.resourceName)){
-									setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
+							
+							if(getverdict == pass) {
+								if(not ispresent(v_responsePrimitive.primitiveContent.group_.resourceName)){
+									setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
 								}
 							}
 						
@@ -1812,7 +1812,7 @@ module OneM2M_Testcases {
 						v_responsePrimitive := f_CSE_DMR_CRE_001(int3, v_createRequest, m_createContainerBase, v_notifyHandler);//Container
 						if(getverdict == pass){
 							if(not ispresent(v_responsePrimitive.primitiveContent.accessControlPolicy.resourceName)){
-								setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
 					}
 						}
 
@@ -1829,7 +1829,7 @@ module OneM2M_Testcases {
 						v_responsePrimitive := f_CSE_DMR_CRE_001(int9, v_createRequest, -, v_notifyHandler);//Group
 						if(getverdict == pass){
 							if(not ispresent(v_responsePrimitive.primitiveContent.accessControlPolicy.resourceName)){
-								setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
 						}
 						}
 						
@@ -1846,7 +1846,7 @@ module OneM2M_Testcases {
 						v_responsePrimitive := f_CSE_DMR_CRE_001(int9, v_createRequest, m_createAeAux(omit,omit), v_notifyHandler);//Group
 							if(getverdict == pass){
 							if(not ispresent(v_responsePrimitive.primitiveContent.accessControlPolicy.resourceName)){
-									setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
+									setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
 								}
 							}
 						
@@ -1863,7 +1863,7 @@ module OneM2M_Testcases {
 						v_responsePrimitive := f_CSE_DMR_CRE_001(int1, v_createRequest, -, v_notifyHandler);//AccessControlPolicy
 						if(getverdict == pass){
 							if(not ispresent(v_responsePrimitive.primitiveContent.accessControlPolicy.resourceName)){
-								setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
 						}
 						}
 						
@@ -1880,7 +1880,7 @@ module OneM2M_Testcases {
 						v_responsePrimitive := f_CSE_DMR_CRE_001(int1, v_createRequest, m_createAeAux(omit,omit), v_notifyHandler);//AccessControlPolicy
 							if(getverdict == pass){
 								if(not ispresent(v_responsePrimitive.primitiveContent.accessControlPolicy.resourceName)){
-									setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
+									setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
 								}
 							}
 						
@@ -1897,7 +1897,7 @@ module OneM2M_Testcases {
 						
 						if(getverdict == pass){
 							if(not ispresent(v_responsePrimitive.primitiveContent.schedule.resourceName)){
-								setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
     					}
 						}
 						
@@ -1914,7 +1914,7 @@ module OneM2M_Testcases {
 
 							if(getverdict == pass){
 								if(not ispresent(v_responsePrimitive.primitiveContent.schedule.resourceName)){
-									setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
+									setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
 								}
 							}
 						
@@ -1931,7 +1931,7 @@ module OneM2M_Testcases {
 						
 						if(getverdict == pass){
 							if(not ispresent(v_responsePrimitive.primitiveContent.schedule.resourceName)){
-								setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
 					}
 						}
 					
@@ -1949,7 +1949,7 @@ module OneM2M_Testcases {
 						v_responsePrimitive := f_CSE_DMR_CRE_001(int15, v_createRequest, m_createAeAux(omit,omit), v_notifyHandler);//PollingChannel
 							if(getverdict == pass){
 								if(not ispresent(v_responsePrimitive.primitiveContent.pollingChannel.resourceName)){
-									setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
+									setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
 								}
 							}
 						
@@ -1965,7 +1965,7 @@ module OneM2M_Testcases {
 						v_responsePrimitive := f_CSE_DMR_CRE_001(int23, v_createRequest, -, v_notifyHandler);//Subscription
 						if(getverdict == pass){
 							if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
-								setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
 					}
 						}
 					
@@ -1981,7 +1981,7 @@ module OneM2M_Testcases {
 						v_responsePrimitive := f_CSE_DMR_CRE_001(int23, v_createRequest, m_createAeAux(omit,omit), v_notifyHandler);//Subscription
 						if(getverdict == pass){
 							if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
-								setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
 							}
 						}
 	
@@ -1997,7 +1997,7 @@ module OneM2M_Testcases {
 						v_responsePrimitive := f_CSE_DMR_CRE_001(int23, v_createRequest, m_createContainerBase, v_notifyHandler);//Subscription
 						if(getverdict == pass){
 							if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
-								setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
 							}
 						}
 
@@ -2013,7 +2013,7 @@ module OneM2M_Testcases {
 						v_responsePrimitive := f_CSE_DMR_CRE_001(int23, v_createRequest, m_createAcpBase, v_notifyHandler);//Subscription
     						if(getverdict == pass){
     							if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
-    								setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
+    								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
     							}
     						}
 						}
@@ -2028,7 +2028,7 @@ module OneM2M_Testcases {
 						v_responsePrimitive := f_CSE_DMR_CRE_001(int23, v_createRequest, m_createScheduleBase, v_notifyHandler);//Subscription
 						if(getverdict == pass){
 							if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
-								setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
 					}
 						}		
 					}
@@ -2043,7 +2043,7 @@ module OneM2M_Testcases {
 						v_responsePrimitive := f_CSE_DMR_CRE_001(int23, v_createRequest, m_createGroupBase, v_notifyHandler);//Subscription
 						if(getverdict == pass){
 							if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
-								setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
 							}
 						}		
 					}
@@ -2059,7 +2059,7 @@ module OneM2M_Testcases {
 						v_responsePrimitive := f_CSE_DMR_CRE_001(int14, v_createRequest, -, v_notifyHandler);//Node
 						if(getverdict == pass){
 							if(not ispresent(v_responsePrimitive.primitiveContent.node.resourceName)){
-								setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
 							}
 						}
 						
@@ -2075,7 +2075,7 @@ module OneM2M_Testcases {
 						v_responsePrimitive := f_CSE_DMR_CRE_001(int12, v_createRequest, -, v_notifyHandler);//Management Command
 						if(getverdict == pass){
 							if(not ispresent(v_responsePrimitive.primitiveContent.mgmtResource.resourceName)){
-								setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
 							}
 						}
 						
@@ -2091,7 +2091,7 @@ module OneM2M_Testcases {
 						v_responsePrimitive := f_CSE_DMR_CRE_001(int10, v_createRequest, -, v_notifyHandler);//Location Policy
 						if(getverdict == pass){
 							if(not ispresent(v_responsePrimitive.primitiveContent.locationPolicy.resourceName)){
-								setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
 							}
 						}
 						
@@ -2107,7 +2107,7 @@ module OneM2M_Testcases {
 						v_responsePrimitive := f_CSE_DMR_CRE_001(int22, v_createRequest, -, v_notifyHandler);//Stats Config
 						if(getverdict == pass){
 							if(not ispresent(v_responsePrimitive.primitiveContent.statsConfig.resourceName)){
-								setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
 							}
 						}
 					}
@@ -2123,7 +2123,7 @@ module OneM2M_Testcases {
 						v_responsePrimitive := f_CSE_DMR_CRE_001(int21, v_createRequest, -, v_notifyHandler);//Stats Collect
 						if(getverdict == pass){
 							if(not ispresent(v_responsePrimitive.primitiveContent.statsCollect.resourceName)){
-								setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
 							}
 						}
 						
@@ -2139,7 +2139,7 @@ module OneM2M_Testcases {
 						v_responsePrimitive := f_CSE_DMR_CRE_001(int11, v_createRequest, -, v_notifyHandler);//Subscription Profile
 						if(getverdict == pass){
 							if(not ispresent(v_responsePrimitive.primitiveContent.m2mServiceSubscriptionProfile.resourceName)){
-								setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
 							}
 						}
 						
@@ -2155,7 +2155,7 @@ module OneM2M_Testcases {
 						v_responsePrimitive := f_CSE_DMR_CRE_001(int19, v_createRequest, -, v_notifyHandler);//Service Subscribed App
 						if(getverdict == pass){
 							if(not ispresent(v_responsePrimitive.primitiveContent.serviceSubscribedAppRule.resourceName)){
-								setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
 							}
 						}
 						
@@ -2205,15 +2205,15 @@ module OneM2M_Testcases {
     					alt {
     						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
     							tc_ac.stop;
-    							setverdict(pass, testcasename() & ": Resource type " & int2str(enum2int(p_resourceType)) & " created successfully");
+    							setverdict(pass, __SCOPE__ & ": Resource type " & int2str(enum2int(p_resourceType)) & " created successfully");
 								v_resourceIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, p_resourceType, v_parentIndex);
 							}
     						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
     							tc_ac.stop;
-    							setverdict(fail, testcasename() & ": Error while creating resource type " & int2str(enum2int(p_resourceType)));
+    							setverdict(fail, __SCOPE__ & ": Error while creating resource type " & int2str(enum2int(p_resourceType)));
     						}
     						[] tc_ac.timeout {
-    							setverdict(fail, testcasename() & ": No answer while creating resource type " & int2str(enum2int(p_resourceType)));
+    							setverdict(fail, __SCOPE__ & ": No answer while creating resource type " & int2str(enum2int(p_resourceType)));
     						}
     					}	
     					
@@ -2249,10 +2249,10 @@ module OneM2M_Testcases {
 						
 						if(getverdict == pass){
 							if(not ispresent(v_responsePrimitive.primitiveContent.container.resourceName)){
-								setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
 							} else {
 								if(v_responsePrimitive.primitiveContent.container.resourceName != c_defaultContainerResourceName){
-									setverdict(fail, testcasename(), ": Error, resourceName attribute not correct");
+									setverdict(fail, __SCOPE__, ": Error, resourceName attribute not correct");
 								}
 							}
 						}
@@ -2266,10 +2266,10 @@ module OneM2M_Testcases {
 						
 						if(getverdict == pass){
 							if(not ispresent(v_responsePrimitive.primitiveContent.group_.resourceName)){
-								setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
 							} else {
 								if(v_responsePrimitive.primitiveContent.group_.resourceName != c_defaultGroupResourceName){
-									setverdict(fail, testcasename(), ": Error, resourceName attribute not correct");
+									setverdict(fail, __SCOPE__, ": Error, resourceName attribute not correct");
 								}
 							}
 						}
@@ -2283,10 +2283,10 @@ module OneM2M_Testcases {
 						
 						if(getverdict == pass){
 							if(not ispresent(v_responsePrimitive.primitiveContent.accessControlPolicy.resourceName)){
-								setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
 							} else {
 								if(v_responsePrimitive.primitiveContent.accessControlPolicy.resourceName != c_defaultAccessControlPolicyResourceName){
-									setverdict(fail, testcasename(), ": Error, resourceName attribute not correct");
+									setverdict(fail, __SCOPE__, ": Error, resourceName attribute not correct");
 								}
 							}
 						}
@@ -2300,10 +2300,10 @@ module OneM2M_Testcases {
 						
 						if(getverdict == pass){
 							if(not ispresent(v_responsePrimitive.primitiveContent.schedule.resourceName)){
-								setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
 							} else {
 								if(v_responsePrimitive.primitiveContent.schedule.resourceName != c_defaultScheduleResourceName){
-									setverdict(fail, testcasename(), ": Error, resourceName attribute not correct");
+									setverdict(fail, __SCOPE__, ": Error, resourceName attribute not correct");
 								}
 							}
 						}
@@ -2316,10 +2316,10 @@ module OneM2M_Testcases {
 
 						if(getverdict == pass){
 							if(not ispresent(v_responsePrimitive.primitiveContent.pollingChannel.resourceName)){
-								setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
 							} else {
 								if(v_responsePrimitive.primitiveContent.pollingChannel.resourceName != c_defaultPollingChannelResourceName){
-									setverdict(fail, testcasename(), ": Error, resourceName attribute not correct");
+									setverdict(fail, __SCOPE__, ": Error, resourceName attribute not correct");
 								}
 							}
 						}
@@ -2333,10 +2333,10 @@ module OneM2M_Testcases {
 						
 						if(getverdict == pass){
 							if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
-								setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
 							} else {
 								if(v_responsePrimitive.primitiveContent.subscription.resourceName != c_defaultSubscriptionResourceName){
-									setverdict(fail, testcasename(), ": Error, resourceName attribute not correct");
+									setverdict(fail, __SCOPE__, ": Error, resourceName attribute not correct");
 								}
 							}
 						}
@@ -2371,14 +2371,14 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": Resource type " & int2str(enum2int(p_resourceType)) & " created successfully");
+								setverdict(pass, __SCOPE__ & ": Resource type " & int2str(enum2int(p_resourceType)) & " created successfully");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while creating resource type " & int2str(enum2int(p_resourceType)));
+								setverdict(fail, __SCOPE__ & ": Error while creating resource type " & int2str(enum2int(p_resourceType)));
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while creating resource type " & int2str(enum2int(p_resourceType)));
+								setverdict(fail, __SCOPE__ & ": No answer while creating resource type " & int2str(enum2int(p_resourceType)));
 							}
 						}	
 								
@@ -2471,18 +2471,18 @@ module OneM2M_Testcases {
     					alt {
     						[] mcaPort.receive(mw_response(mw_responsePrimitive(int4105))) -> value v_response {
     							tc_ac.stop;
-    							setverdict(pass, testcasename() & ": Resource already exists");
+    							setverdict(pass, __SCOPE__ & ": Resource already exists");
     						}
     						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
     							tc_ac.stop;
-    							setverdict(fail, testcasename() & ": Error while creating an already existing resource");
+    							setverdict(fail, __SCOPE__ & ": Error while creating an already existing resource");
     						}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Creating a resource that already exists");
+								setverdict(fail, __SCOPE__ & ": Creating a resource that already exists");
 							}
     						[] tc_ac.timeout {
-    							setverdict(fail, testcasename() & ": No answer while creating resource");
+    							setverdict(fail, __SCOPE__ & ": No answer while creating resource");
     						}
     					}	
     								
@@ -2548,7 +2548,7 @@ module OneM2M_Testcases {
 											   
 						// Test control
 						if(not(PICS_ACP_SUPPORT)) {
-							setverdict(inconc, testcasename() & ": AccessControlPolicy support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": AccessControlPolicy support is required to run this test case");
 							stop;
 						}
     				
@@ -2574,18 +2574,18 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": Access denied to create a resource");
+								setverdict(pass, __SCOPE__ & ": Access denied to create a resource");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while creating a resource without privileges");
+								setverdict(fail, __SCOPE__ & ": Error while creating a resource without privileges");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Resource created without creation privileges");
+								setverdict(fail, __SCOPE__ & ": Resource created without creation privileges");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while creating resource");
+								setverdict(fail, __SCOPE__ & ": No answer while creating resource");
 							}
 						}	
     								
@@ -2665,18 +2665,18 @@ module OneM2M_Testcases {
 							alt {
 								[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 									tc_ac.stop;
-									setverdict(pass, testcasename() & ": Creation rejected for resource type " & int2str(enum2int(p_resourceType)) & " containing an invalid value for attribute " & p_invalidAttribute.name);
+									setverdict(pass, __SCOPE__ & ": Creation rejected for resource type " & int2str(enum2int(p_resourceType)) & " containing an invalid value for attribute " & p_invalidAttribute.name);
 								}								
 								[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 									tc_ac.stop;
-									setverdict(fail, testcasename() & ": Accepted creation of resource type " & int2str(enum2int(p_resourceType)) & " containing an invalid value for attribute" & p_invalidAttribute.name);
+									setverdict(fail, __SCOPE__ & ": Accepted creation of resource type " & int2str(enum2int(p_resourceType)) & " containing an invalid value for attribute" & p_invalidAttribute.name);
 								}
 								[] mcaPort.receive {
 									tc_ac.stop;
-									setverdict(fail, testcasename() & ": Incorrect value received");
+									setverdict(fail, __SCOPE__ & ": Incorrect value received");
 								}
 								[] tc_ac.timeout {
-									setverdict(fail, testcasename() & ": No answer while creating resource type " & int2str(enum2int(p_resourceType)));  
+									setverdict(fail, __SCOPE__ & ": No answer while creating resource type " & int2str(enum2int(p_resourceType)));  
 								}
 							}	
     								
@@ -2705,7 +2705,7 @@ module OneM2M_Testcases {
 						
 						if(getverdict == pass){
 							if(not ispresent(v_responsePrimitive.primitiveContent.container.maxNrOfInstances)){
-								setverdict(fail, testcasename(), ": Error, maxNrOfInstances attribute not provided");
+								setverdict(fail, __SCOPE__, ": Error, maxNrOfInstances attribute not provided");
 							} 
 						}	
 					}
@@ -2719,7 +2719,7 @@ module OneM2M_Testcases {
 						
 						if(getverdict == pass){
 							if(not ispresent(v_responsePrimitive.primitiveContent.container.maxByteSize)){
-								setverdict(fail, testcasename(), ": Error, maxByteSize attribute not provided");
+								setverdict(fail, __SCOPE__, ": Error, maxByteSize attribute not provided");
 							} 
 						}	
 						  
@@ -2734,7 +2734,7 @@ module OneM2M_Testcases {
 						
 						if(getverdict == pass){
 							if(not ispresent(v_responsePrimitive.primitiveContent.container.maxInstanceAge)){
-								setverdict(fail, testcasename(), ": Error, maxInstanceAge attribute not provided");
+								setverdict(fail, __SCOPE__, ": Error, maxInstanceAge attribute not provided");
 							} 
 						}	
 					}
@@ -2764,14 +2764,14 @@ module OneM2M_Testcases {
 							alt {
 								[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 									tc_ac.stop;
-									setverdict(pass, testcasename() & ": Accepted creation rejected for resource type " & int2str(enum2int(p_resourceType)));
+									setverdict(pass, __SCOPE__ & ": Accepted creation rejected for resource type " & int2str(enum2int(p_resourceType)));
 								}
 								[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 									tc_ac.stop;
-									setverdict(fail, testcasename() & ": Creation rejected of resource type " & int2str(enum2int(p_resourceType)));
+									setverdict(fail, __SCOPE__ & ": Creation rejected of resource type " & int2str(enum2int(p_resourceType)));
 								}
 								[] tc_ac.timeout {
-									setverdict(fail, testcasename() & ": No answer while creating resource type " & int2str(enum2int(p_resourceType)));
+									setverdict(fail, __SCOPE__ & ": No answer while creating resource type " & int2str(enum2int(p_resourceType)));
 								}
 							}	
     								
@@ -2823,18 +2823,18 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int5207))) -> value v_response {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": Maximun number of instances exceeded");
+								setverdict(pass, __SCOPE__ & ": Maximun number of instances exceeded");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Bad responseStatusCode in response");
+								setverdict(fail, __SCOPE__ & ": Bad responseStatusCode in response");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Accepted creation of contentInstance exceding maximum number of instances");
+								setverdict(fail, __SCOPE__ & ": Accepted creation of contentInstance exceding maximum number of instances");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while creating resource type 4");
+								setverdict(fail, __SCOPE__ & ": No answer while creating resource type 4");
 							}
 						}	
 								
@@ -2884,19 +2884,19 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int5207))) -> value v_response {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": Maximun byte size exceeded");
+								setverdict(pass, __SCOPE__ & ": Maximun byte size exceeded");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Bad responseStatusCode in response");
+								setverdict(fail, __SCOPE__ & ": Bad responseStatusCode in response");
 							}
 							
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Accepted creation of contentInstance exceding maximum byte size");
+								setverdict(fail, __SCOPE__ & ": Accepted creation of contentInstance exceding maximum byte size");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while creating resource type 4");
+								setverdict(fail, __SCOPE__ & ": No answer while creating resource type 4");
 							}
 						}	
 								
@@ -2949,23 +2949,23 @@ module OneM2M_Testcases {
                         alt {
                         	[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(v_contentResponse))) -> value v_response {
                         		tc_ac.stop;
-                        		setverdict(pass, testcasename() & ": Response OK for retrieving");
+                        		setverdict(pass, __SCOPE__ & ": Response OK for retrieving");
                         		if(v_response.primitive.responsePrimitive.primitiveContent.container.stateTag == vc_resourcesList[v_containerIndex].resource.container.stateTag + 1) {
-									setverdict(pass, testcasename() & ": stateTag attribute increased after creation of contentInstance resource");
+									setverdict(pass, __SCOPE__ & ": stateTag attribute increased after creation of contentInstance resource");
                         		} else {
-									setverdict(fail, testcasename() & ": stateTag attribute not incremented correctly after creation of contentInstance resource");
+									setverdict(fail, __SCOPE__ & ": stateTag attribute not incremented correctly after creation of contentInstance resource");
                         		}
                         	}
                         	[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
                         		tc_ac.stop;
-                        		setverdict(fail, testcasename() & ": Error, resource elements provided not matching expected resource elements");
+                        		setverdict(fail, __SCOPE__ & ": Error, resource elements provided not matching expected resource elements");
                         	}
                         	[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
                         		tc_ac.stop;
-                        		setverdict(fail, testcasename() & ": Error while retrieving resource");
+                        		setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
                         	}
                         	[] tc_ac.timeout {
-                        		setverdict(fail, testcasename() & ": No answer while retrieving resource");
+                        		setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
                         	}
                         }	
 								
@@ -3015,18 +3015,18 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) -> value v_response {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": Not allowed to create a contentInstance resource named 'la'");
+								setverdict(pass, __SCOPE__ & ": Not allowed to create a contentInstance resource named 'la'");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Rejected creation of contentInstance named 'la' with wrong ResponseStatusCode");
+								setverdict(fail, __SCOPE__ & ": Rejected creation of contentInstance named 'la' with wrong ResponseStatusCode");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Accepted creation of contentInstance named 'la'");
+								setverdict(fail, __SCOPE__ & ": Accepted creation of contentInstance named 'la'");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while creating resource type 4");
+								setverdict(fail, __SCOPE__ & ": No answer while creating resource type 4");
 							}
 						}	
 								
@@ -3076,18 +3076,18 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) -> value v_response {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": Not allowed to create a contentInstance resource named 'ol'");
+								setverdict(pass, __SCOPE__ & ": Not allowed to create a contentInstance resource named 'ol'");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Rejected creation of contentInstance named 'ol' with wrong ResponseStatusCode");
+								setverdict(fail, __SCOPE__ & ": Rejected creation of contentInstance named 'ol' with wrong ResponseStatusCode");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Accepted creation of contentInstance named 'ol'");
+								setverdict(fail, __SCOPE__ & ": Accepted creation of contentInstance named 'ol'");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while creating resource type 4");
+								setverdict(fail, __SCOPE__ & ": No answer while creating resource type 4");
 							}
 						}	
 								
@@ -3169,18 +3169,18 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(omit))) -> value v_response {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": No content provided with RC set to 0");
+								setverdict(pass, __SCOPE__ & ": No content provided with RC set to 0");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Content provided with RC set to 0");
+								setverdict(fail, __SCOPE__ & ": Content provided with RC set to 0");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while creating resource");
+								setverdict(fail, __SCOPE__ & ": Error while creating resource");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while creating resource");
+								setverdict(fail, __SCOPE__ & ": No answer while creating resource");
 							}
 						}	
     								
@@ -3280,18 +3280,18 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": No content provided with RC set to 0");
+								setverdict(pass, __SCOPE__ & ": No content provided with RC set to 0");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Content provided with RC set to 0");
+								setverdict(fail, __SCOPE__ & ": Content provided with RC set to 0");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while creating resource");
+								setverdict(fail, __SCOPE__ & ": Error while creating resource");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while creating resource");
+								setverdict(fail, __SCOPE__ & ": No answer while creating resource");
 							}
 						}	
     								
@@ -3391,18 +3391,18 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": No content provided with RC set to 0");
+								setverdict(pass, __SCOPE__ & ": No content provided with RC set to 0");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Content provided with RC set to 0");
+								setverdict(fail, __SCOPE__ & ": Content provided with RC set to 0");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while creating resource");
+								setverdict(fail, __SCOPE__ & ": Error while creating resource");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while creating resource");
+								setverdict(fail, __SCOPE__ & ": No answer while creating resource");
 							}
 						}	
     								
@@ -3774,7 +3774,7 @@ module OneM2M_Testcases {
 							// Test control
 							if(match(c_accessControlPolicyIDs,p_optionalAttribute.name)) {
 								if(not(PICS_ACP_SUPPORT)) {
-									setverdict(inconc, testcasename() & ": AccessControlPolicy support is required to run this test case");
+									setverdict(inconc, __SCOPE__ & ": AccessControlPolicy support is required to run this test case");
 									stop;
 								}
 							}
@@ -3807,18 +3807,18 @@ module OneM2M_Testcases {
 							alt {
 								[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(f_getTemplateFromPrimitiveContent(v_request.primitiveContent)))) -> value v_response {
 									tc_ac.stop;
-									setverdict(pass, testcasename() & ": Accepted creation for resource type " & int2str(enum2int(p_resourceType)) & " containing attribute " & p_optionalAttribute.name);
+									setverdict(pass, __SCOPE__ & ": Accepted creation for resource type " & int2str(enum2int(p_resourceType)) & " containing attribute " & p_optionalAttribute.name);
 								}
 								[] mcaPort.receive(mw_response(mw_responsePrimitiveOK())) -> value v_response {
 									tc_ac.stop;
-									setverdict(fail, testcasename() & ": Accepted creation for resource type " & int2str(enum2int(p_resourceType)) & " without containing attribute " & p_optionalAttribute.name);
+									setverdict(fail, __SCOPE__ & ": Accepted creation for resource type " & int2str(enum2int(p_resourceType)) & " without containing attribute " & p_optionalAttribute.name);
 								}
 								[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 									tc_ac.stop;
-									setverdict(fail, testcasename() & ": Rejected creation of resource type " & int2str(enum2int(p_resourceType)) & " containing attribute" & p_optionalAttribute.name);
+									setverdict(fail, __SCOPE__ & ": Rejected creation of resource type " & int2str(enum2int(p_resourceType)) & " containing attribute" & p_optionalAttribute.name);
 								}
 								[] tc_ac.timeout {
-									setverdict(fail, testcasename() & ": No answer while creating resource type " & int2str(enum2int(p_resourceType)));
+									setverdict(fail, __SCOPE__ & ": No answer while creating resource type " & int2str(enum2int(p_resourceType)));
 								}
 							}	
     								
@@ -3949,18 +3949,18 @@ module OneM2M_Testcases {
 						alt {
 							[] mccPort.receive(mw_request(p_requestAnnc)) -> value v_response {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": No content provided with RC set to 0");
+								setverdict(pass, __SCOPE__ & ": No content provided with RC set to 0");
 							}
 							[] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Content provided with RC set to 0");
+								setverdict(fail, __SCOPE__ & ": Content provided with RC set to 0");
 							}
 							[] mccPort.receive(mw_response(mw_responsePrimitiveKO)) {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while creating resource");
+								setverdict(fail, __SCOPE__ & ": Error while creating resource");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while creating resource");
+								setverdict(fail, __SCOPE__ & ": No answer while creating resource");
 							}
 						}	
     								
@@ -3996,12 +3996,12 @@ module OneM2M_Testcases {
 							//Check if maxByteSize attribute has been announced
 							if (ispresent(v_requestPrimitive.primitiveContent.containerAnnc.maxByteSize)){
 								if(v_requestPrimitive.primitiveContent.containerAnnc.maxByteSize != maxByteSize){
-									setverdict(fail, testcasename() & ": Error: Value of maxByteSize has not been announced successfully");
+									setverdict(fail, __SCOPE__ & ": Error: Value of maxByteSize has not been announced successfully");
 								}else{
-									setverdict(pass, testcasename() & ": Value of maxByteSize has been announced successfully");
+									setverdict(pass, __SCOPE__ & ": Value of maxByteSize has been announced successfully");
 								}
 							}else{
-								setverdict(fail, testcasename() & ": Error: maxByteSize has not been announced");
+								setverdict(fail, __SCOPE__ & ": Error: maxByteSize has not been announced");
 							}
 						}
 					}
@@ -4022,12 +4022,12 @@ module OneM2M_Testcases {
 							//Check if contentSize attribute has been announced
 							if (ispresent(v_requestPrimitive.primitiveContent.contentInstanceAnnc.contentSize)){
 								if(v_requestPrimitive.primitiveContent.contentInstanceAnnc.contentSize != contentSize){
-									setverdict(fail, testcasename() & ": Error: Value of contentSize has not been announced successfully");
+									setverdict(fail, __SCOPE__ & ": Error: Value of contentSize has not been announced successfully");
 								}else{
-									setverdict(pass, testcasename() & ": Value of contentSize has been announced successfully");
+									setverdict(pass, __SCOPE__ & ": Value of contentSize has been announced successfully");
 								}
 							}else{
-								setverdict(fail, testcasename() & ": Error: contentSize has not been announced");
+								setverdict(fail, __SCOPE__ & ": Error: contentSize has not been announced");
 							}
 						}
 					}
@@ -4048,12 +4048,12 @@ module OneM2M_Testcases {
 							//Check if maxNrOfMembers attribute has been announced
 							if (ispresent(v_requestPrimitive.primitiveContent.groupAnnc.maxNrOfMembers)){
 								if(v_requestPrimitive.primitiveContent.groupAnnc.maxNrOfMembers != maxNrOfMembers){
-									setverdict(fail, testcasename() & ": Error: Value of maxNrOfMembers has not been announced successfully");
+									setverdict(fail, __SCOPE__ & ": Error: Value of maxNrOfMembers has not been announced successfully");
 								}else{
-									setverdict(pass, testcasename() & ": Value of maxNrOfMembers has been announced successfully");
+									setverdict(pass, __SCOPE__ & ": Value of maxNrOfMembers has been announced successfully");
 								}
 							}else{
-								setverdict(fail, testcasename() & ": Error: maxNrOfMembers has not been announced");
+								setverdict(fail, __SCOPE__ & ": Error: maxNrOfMembers has not been announced");
 							}
 						}
 					}
@@ -4074,12 +4074,12 @@ module OneM2M_Testcases {
 							//Check if locationSource attribute has been announced
 							if (ispresent(v_requestPrimitive.primitiveContent.locationPolicyAnnc.locationSource)){
 								if(v_requestPrimitive.primitiveContent.locationPolicyAnnc.locationSource != locationSource){
-									setverdict(fail, testcasename() & ": Error: Value of locationSource has not been announced successfully");
+									setverdict(fail, __SCOPE__ & ": Error: Value of locationSource has not been announced successfully");
 								}else{
-									setverdict(pass, testcasename() & ": Value of locationSource has been announced successfully");
+									setverdict(pass, __SCOPE__ & ": Value of locationSource has been announced successfully");
 								}
 							}else{
-								setverdict(fail, testcasename() & ": Error: locationSource has not been announced");
+								setverdict(fail, __SCOPE__ & ": Error: locationSource has not been announced");
 							}
 						}
 					}
@@ -4100,12 +4100,12 @@ module OneM2M_Testcases {
 							//Check if description attribute has been announced
 							if (ispresent(v_requestPrimitive.primitiveContent.announcedMgmtResource.description)){
 								if(v_requestPrimitive.primitiveContent.announcedMgmtResource.description != description){
-									setverdict(fail, testcasename() & ": Error: Value of description has not been announced successfully");
+									setverdict(fail, __SCOPE__ & ": Error: Value of description has not been announced successfully");
 								}else{
-									setverdict(pass, testcasename() & ": Value of description has been announced successfully");
+									setverdict(pass, __SCOPE__ & ": Value of description has been announced successfully");
 								}
 							}else{
-								setverdict(fail, testcasename() & ": Error: description has not been announced");
+								setverdict(fail, __SCOPE__ & ": Error: description has not been announced");
 							}
 						}
 					}
@@ -4138,12 +4138,12 @@ module OneM2M_Testcases {
 							//Check if scheduleElement attribute has been announced
 							if (ispresent(v_requestPrimitive.primitiveContent.scheduleAnnc.scheduleElement)){
 								if(v_requestPrimitive.primitiveContent.scheduleAnnc.scheduleElement != scheduleElement){
-									setverdict(fail, testcasename() & ": Error: Value of scheduleElement has not been announced successfully");
+									setverdict(fail, __SCOPE__ & ": Error: Value of scheduleElement has not been announced successfully");
 								}else{
-									setverdict(pass, testcasename() & ": Value of scheduleElement has been announced successfully");
+									setverdict(pass, __SCOPE__ & ": Value of scheduleElement has been announced successfully");
 								}
 							}else{
-								setverdict(fail, testcasename() & ": Error: scheduleElement has not been announced");
+								setverdict(fail, __SCOPE__ & ": Error: scheduleElement has not been announced");
 							}
 						}
 					}
@@ -4179,18 +4179,18 @@ module OneM2M_Testcases {
 						alt {
 							[] mccPort.receive(mw_request(p_requestAnnc)) -> value v_anncRequest {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": No content provided with RC set to 0");
+								setverdict(pass, __SCOPE__ & ": No content provided with RC set to 0");
 							}
 							[] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_anncRequest {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Content provided with RC set to 0");
+								setverdict(fail, __SCOPE__ & ": Content provided with RC set to 0");
 							}
 							[] mccPort.receive(mw_response(mw_responsePrimitiveKO)) {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while creating resource");
+								setverdict(fail, __SCOPE__ & ": Error while creating resource");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while creating resource");
+								setverdict(fail, __SCOPE__ & ": No answer while creating resource");
 							}
 						}	
 					
@@ -4313,18 +4313,18 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": Response OK for retrieving");
+								setverdict(pass, __SCOPE__ & ": Response OK for retrieving");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error, resource elements provided not matching expected resource elements");
+								setverdict(fail, __SCOPE__ & ": Error, resource elements provided not matching expected resource elements");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while retrieving resource");
+								setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while retrieving resource");
+								setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
 							}
 						}	
     								
@@ -4382,18 +4382,18 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) -> value v_response {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": Resource not found");
+								setverdict(pass, __SCOPE__ & ": Resource not found");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while retrieving resource");
+								setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while retrieving resource");
+								setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while retrieving resource");
+								setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
 							}
 						}	
     								
@@ -4466,7 +4466,7 @@ module OneM2M_Testcases {
     										   
 						// Test control
 						if(not(PICS_ACP_SUPPORT)) {
-							log(testcasename() & ":AccessControlPolicy support is required for executing this test case");
+							log(__SCOPE__ & ":INFO: AccessControlPolicy support is required for executing this test case");
 							stop;
 						}
     				
@@ -4493,18 +4493,18 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": Access denied to retrieve attributes from resource type " & int2str(enum2int(p_resourceType)));
+								setverdict(pass, __SCOPE__ & ": Access denied to retrieve attributes from resource type " & int2str(enum2int(p_resourceType)));
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while retrieving attributes from resource without having privileges");
+								setverdict(fail, __SCOPE__ & ": Error while retrieving attributes from resource without having privileges");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Retrieving attributes from resource without having privileges");
+								setverdict(fail, __SCOPE__ & ": Retrieving attributes from resource without having privileges");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while retrieving resource");
+								setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
 							}
 						}	
     								
@@ -4616,18 +4616,18 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": Requested attribute retrieved successfully");
+								setverdict(pass, __SCOPE__ & ": Requested attribute retrieved successfully");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error, not only requested attribute retrieved");
+								setverdict(fail, __SCOPE__ & ": Error, not only requested attribute retrieved");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while retrieving resource attribute");
+								setverdict(fail, __SCOPE__ & ": Error while retrieving resource attribute");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while retrieving resource attribute");
+								setverdict(fail, __SCOPE__ & ": No answer while retrieving resource attribute");
 							}
 						}	
     								
@@ -4739,18 +4739,18 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": Requested attribute retrieved successfully");
+								setverdict(pass, __SCOPE__ & ": Requested attribute retrieved successfully");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error, not only requested attribute retrieved");
+								setverdict(fail, __SCOPE__ & ": Error, not only requested attribute retrieved");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while retrieving resource attribute");
+								setverdict(fail, __SCOPE__ & ": Error while retrieving resource attribute");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while retrieving resource attribute");
+								setverdict(fail, __SCOPE__ & ": No answer while retrieving resource attribute");
 							}
 						}	
     								
@@ -4869,18 +4869,18 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": Requested attributes retrieved successfully");
+								setverdict(pass, __SCOPE__ & ": Requested attributes retrieved successfully");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error, not only requested attributes retrieved");
+								setverdict(fail, __SCOPE__ & ": Error, not only requested attributes retrieved");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while retrieving resource attributes");
+								setverdict(fail, __SCOPE__ & ": Error while retrieving resource attributes");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while retrieving resource attributes");
+								setverdict(fail, __SCOPE__ & ": No answer while retrieving resource attributes");
 							}
 						}	
     								
@@ -4972,14 +4972,14 @@ module OneM2M_Testcases {
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while retrieving non existing resource attribute");
+								setverdict(fail, __SCOPE__ & ": Error while retrieving non existing resource attribute");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error : attribute was retrieved while it doesn't exist");
+								setverdict(fail, __SCOPE__ & ": Error : attribute was retrieved while it doesn't exist");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while retrieving resource attribute");
+								setverdict(fail, __SCOPE__ & ": No answer while retrieving resource attribute");
 							}
 						}	
     								
@@ -5071,14 +5071,14 @@ module OneM2M_Testcases {
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while retrieving non existing resource attributes");
+								setverdict(fail, __SCOPE__ & ": Error while retrieving non existing resource attributes");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error : attribute was retrieved while it doesn't exist");
+								setverdict(fail, __SCOPE__ & ": Error : attribute was retrieved while it doesn't exist");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while retrieving resource attributes");
+								setverdict(fail, __SCOPE__ & ": No answer while retrieving resource attributes");
 							}
 						}	
     								
@@ -5124,18 +5124,18 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))){
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": Resource not found");
+								setverdict(pass, __SCOPE__ & ": Resource not found");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while retrieving resource");
+								setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while retrieving resource");
+								setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while retrieving resource");
+								setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
 							}
 						}	
 					
@@ -5190,18 +5190,18 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(v_contentResponse))){
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": resourceName attribute of <oldest> resource retrieved successfully");
+								setverdict(pass, __SCOPE__ & ": resourceName attribute of <oldest> resource retrieved successfully");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)){
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error, resourceName attribute of <oldest> resource value not expected");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute of <oldest> resource value not expected");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)){
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while retrieving <oldest> resource");
+								setverdict(fail, __SCOPE__ & ": Error while retrieving <oldest> resource");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while retrieving <oldest> resource");
+								setverdict(fail, __SCOPE__ & ": No answer while retrieving <oldest> resource");
 							}
 						}	
     								
@@ -5247,18 +5247,18 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))){
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": Resource not found");
+								setverdict(pass, __SCOPE__ & ": Resource not found");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while retrieving resource");
+								setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while retrieving resource");
+								setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while retrieving resource");
+								setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
 							}
 						}	
 					
@@ -5314,18 +5314,18 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(v_contentResponse))){
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": resourceName attribute of <latest> resource retrieved successfully");
+								setverdict(pass, __SCOPE__ & ": resourceName attribute of <latest> resource retrieved successfully");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)){
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error, resourceName attribute of <latest> resource value not expected");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute of <latest> resource value not expected");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)){
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while retrieving <latest> resource");
+								setverdict(fail, __SCOPE__ & ": Error while retrieving <latest> resource");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while retrieving <latest> resource");
+								setverdict(fail, __SCOPE__ & ": No answer while retrieving <latest> resource");
 							}
 						}	
     								
@@ -5454,18 +5454,18 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": Response OK for retrieving");
+								setverdict(pass, __SCOPE__ & ": Response OK for retrieving");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error, resource elements provided not matching expected resource elements");
+								setverdict(fail, __SCOPE__ & ": Error, resource elements provided not matching expected resource elements");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while retrieving resource");
+								setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while retrieving resource");
+								setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
 							}
 						}	
     								
@@ -5538,7 +5538,7 @@ module OneM2M_Testcases {
     										   
 						// Test control
 						if(not(PICS_ACP_SUPPORT)) {
-							log(testcasename() & ":AccessControlPolicy support is required for executing this test case");
+							log(__SCOPE__ & ":INFO: AccessControlPolicy support is required for executing this test case");
 							stop;
 						}
     				
@@ -5565,18 +5565,18 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": Access denied to retrieve attributes from resource type " & int2str(enum2int(p_resourceType)));
+								setverdict(pass, __SCOPE__ & ": Access denied to retrieve attributes from resource type " & int2str(enum2int(p_resourceType)));
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while retrieving attributes from resource without having privileges");
+								setverdict(fail, __SCOPE__ & ": Error while retrieving attributes from resource without having privileges");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Retrieving attributes from resource without having privileges");
+								setverdict(fail, __SCOPE__ & ": Retrieving attributes from resource without having privileges");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while retrieving resource");
+								setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
 							}
 						}	
     								
@@ -5704,18 +5704,18 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": Requested attribute retrieved successfully");
+								setverdict(pass, __SCOPE__ & ": Requested attribute retrieved successfully");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error, not only requested attribute retrieved");
+								setverdict(fail, __SCOPE__ & ": Error, not only requested attribute retrieved");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while retrieving resource attribute");
+								setverdict(fail, __SCOPE__ & ": Error while retrieving resource attribute");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while retrieving resource attribute");
+								setverdict(fail, __SCOPE__ & ": No answer while retrieving resource attribute");
 							}
 						}	
     								
@@ -5842,18 +5842,18 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": Requested attribute retrieved successfully");
+								setverdict(pass, __SCOPE__ & ": Requested attribute retrieved successfully");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error, not only requested attribute retrieved");
+								setverdict(fail, __SCOPE__ & ": Error, not only requested attribute retrieved");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while retrieving resource attribute");
+								setverdict(fail, __SCOPE__ & ": Error while retrieving resource attribute");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while retrieving resource attribute");
+								setverdict(fail, __SCOPE__ & ": No answer while retrieving resource attribute");
 							}
 						}	
     								
@@ -5988,18 +5988,18 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": Requested attributes retrieved successfully");
+								setverdict(pass, __SCOPE__ & ": Requested attributes retrieved successfully");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error, not only requested attributes retrieved");
+								setverdict(fail, __SCOPE__ & ": Error, not only requested attributes retrieved");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while retrieving resource attributes");
+								setverdict(fail, __SCOPE__ & ": Error while retrieving resource attributes");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while retrieving resource attributes");
+								setverdict(fail, __SCOPE__ & ": No answer while retrieving resource attributes");
 							}
 						}	
     								
@@ -6099,18 +6099,18 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) -> value v_response {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": Retrieved attribute does not exist");
+								setverdict(pass, __SCOPE__ & ": Retrieved attribute does not exist");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while retrieving non existing resource attribute");
+								setverdict(fail, __SCOPE__ & ": Error while retrieving non existing resource attribute");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error : attribute was retrieved while it doesn't exist");
+								setverdict(fail, __SCOPE__ & ": Error : attribute was retrieved while it doesn't exist");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while retrieving resource attribute");
+								setverdict(fail, __SCOPE__ & ": No answer while retrieving resource attribute");
 							}
 						}	
     								
@@ -6210,18 +6210,18 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) -> value v_response {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": Retrieved attribute does not exist");
+								setverdict(pass, __SCOPE__ & ": Retrieved attribute does not exist");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while retrieving non existing resource attributes");
+								setverdict(fail, __SCOPE__ & ": Error while retrieving non existing resource attributes");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error : attribute was retrieved while it doesn't exist");
+								setverdict(fail, __SCOPE__ & ": Error : attribute was retrieved while it doesn't exist");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while retrieving resource attributes");
+								setverdict(fail, __SCOPE__ & ": No answer while retrieving resource attributes");
 							}
 						}	
     								
@@ -6284,18 +6284,18 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) { //BAD REQUEST
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": Request successfully rejected");
+								setverdict(pass, __SCOPE__ & ": Request successfully rejected");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) { 
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while retrieving resource");
+								setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error, Result content set to " & int2str(enum2int(p_resultContent)) & " is impossible for a retrieve request ");
+								setverdict(fail, __SCOPE__ & ": Error, Result content set to " & int2str(enum2int(p_resultContent)) & " is impossible for a retrieve request ");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while retrieving resource");
+								setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
 							}
 						}	
 						
@@ -6412,18 +6412,18 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": No child resources provided with RC set to " & int2str(enum2int(v_request.resultContent)));
+								setverdict(pass, __SCOPE__ & ": No child resources provided with RC set to " & int2str(enum2int(v_request.resultContent)));
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Child resources provided with RC set to " & int2str(enum2int(v_request.resultContent)));
+								setverdict(fail, __SCOPE__ & ": Child resources provided with RC set to " & int2str(enum2int(v_request.resultContent)));
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while retrieving resource");
+								setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while retrieving resource");
+								setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
 							}
 						}	
 						
@@ -6541,18 +6541,18 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": No child resources provided with RC set to " & int2str(enum2int(v_request.resultContent)));
+								setverdict(pass, __SCOPE__ & ": No child resources provided with RC set to " & int2str(enum2int(v_request.resultContent)));
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Child resources provided with RC set to " & int2str(enum2int(v_request.resultContent)));
+								setverdict(fail, __SCOPE__ & ": Child resources provided with RC set to " & int2str(enum2int(v_request.resultContent)));
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while retrieving resource");
+								setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while retrieving resource");
+								setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
 							}
 						}	
 						
@@ -6670,18 +6670,18 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": No child resources provided with RC set to " & int2str(enum2int(v_request.resultContent)));
+								setverdict(pass, __SCOPE__ & ": No child resources provided with RC set to " & int2str(enum2int(v_request.resultContent)));
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Child resources provided with RC set to " & int2str(enum2int(v_request.resultContent)));
+								setverdict(fail, __SCOPE__ & ": Child resources provided with RC set to " & int2str(enum2int(v_request.resultContent)));
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while retrieving resource");
+								setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while retrieving resource");
+								setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
 							}
 						}	
 						
@@ -6798,18 +6798,18 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": No child resources provided with RC set to " & int2str(enum2int(v_request.resultContent)));
+								setverdict(pass, __SCOPE__ & ": No child resources provided with RC set to " & int2str(enum2int(v_request.resultContent)));
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Child resources provided with RC set to " & int2str(enum2int(v_request.resultContent)));
+								setverdict(fail, __SCOPE__ & ": Child resources provided with RC set to " & int2str(enum2int(v_request.resultContent)));
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while retrieving resource");
+								setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while retrieving resource");
+								setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
 							}
 						}	
 						
@@ -6926,18 +6926,18 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": No child resources provided with RC set to " & int2str(enum2int(v_request.resultContent)));
+								setverdict(pass, __SCOPE__ & ": No child resources provided with RC set to " & int2str(enum2int(v_request.resultContent)));
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Child resources provided with RC set to " & int2str(enum2int(v_request.resultContent)));
+								setverdict(fail, __SCOPE__ & ": Child resources provided with RC set to " & int2str(enum2int(v_request.resultContent)));
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while retrieving resource");
+								setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while retrieving resource");
+								setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
 							}
 						}	
 						
@@ -6980,7 +6980,7 @@ module OneM2M_Testcases {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.container)) {
         							if(v_responsePrimitive.primitiveContent.container.labels != v_labels_2){
-        								setverdict(fail, testcasename() & ": Error: Labels attribute not updated correctly")
+        								setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
         							}
 								}
 							}
@@ -7005,7 +7005,7 @@ module OneM2M_Testcases {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
 									if(v_responsePrimitive.primitiveContent.group_.labels != v_labels_2){
-										setverdict(fail, testcasename() & ": Error: Labels attribute not updated correctly")
+										setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
 									}
 								}
 							}
@@ -7030,7 +7030,7 @@ module OneM2M_Testcases {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.accessControlPolicy)) {
 									if(v_responsePrimitive.primitiveContent.accessControlPolicy.labels != v_labels_2){
-        								setverdict(fail, testcasename() & ": Error: Labels attribute not updated correctly")
+        								setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
         							}
 								}
 							}
@@ -7056,7 +7056,7 @@ module OneM2M_Testcases {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.schedule)) {
 									if(v_responsePrimitive.primitiveContent.schedule.labels != v_labels_2){
-        								setverdict(fail, testcasename() & ": Error: Labels attribute not updated correctly")
+        								setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
         							}
 								}
 							}
@@ -7082,7 +7082,7 @@ module OneM2M_Testcases {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.pollingChannel)) {
         							if(v_responsePrimitive.primitiveContent.pollingChannel.labels != v_labels_2){
-        								setverdict(fail, testcasename() & ": Error: Labels attribute not updated correctly")
+        								setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
         							}
 								}
 							}
@@ -7107,7 +7107,7 @@ module OneM2M_Testcases {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
 									if(v_responsePrimitive.primitiveContent.subscription.labels != v_labels_2){
-        								setverdict(fail, testcasename() & ": Error: Labels attribute not updated correctly")
+        								setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
         							}
 								}
 							}
@@ -7147,14 +7147,14 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": 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_responsePrimitiveKO)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while updating resource type " & int2str(enum2int(p_resourceType)));
+								setverdict(fail, __SCOPE__ & ": Error while updating resource type " & int2str(enum2int(p_resourceType)));
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while updating resource type " & int2str(enum2int(p_resourceType)));
+								setverdict(fail, __SCOPE__ & ": No answer while updating resource type " & int2str(enum2int(p_resourceType)));
 							}
 						}	
     								
@@ -7191,7 +7191,7 @@ module OneM2M_Testcases {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.container)) {
         							if(v_responsePrimitive.primitiveContent.container.labels != v_labels_1){
-        								setverdict(fail, testcasename() & ": Error: Labels attribute not updated correctly")
+        								setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
         							}
 								}
 							}
@@ -7213,7 +7213,7 @@ module OneM2M_Testcases {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
         							if(v_responsePrimitive.primitiveContent.group_.labels != v_labels_1){
-        								setverdict(fail, testcasename() & ": Error: Labels attribute not updated correctly")
+        								setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
         							}
 								}
 							}
@@ -7235,7 +7235,7 @@ module OneM2M_Testcases {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.accessControlPolicy)) {
         							if(v_responsePrimitive.primitiveContent.accessControlPolicy.labels != v_labels_1){
-        								setverdict(fail, testcasename() & ": Error: Labels attribute not updated correctly")
+        								setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
         							}
 								}
 							}
@@ -7257,7 +7257,7 @@ module OneM2M_Testcases {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.schedule)) {
         							if(v_responsePrimitive.primitiveContent.schedule.labels != v_labels_1){
-        								setverdict(fail, testcasename() & ": Error: Labels attribute not updated correctly")
+        								setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
         							}
 								}
 							}
@@ -7279,7 +7279,7 @@ module OneM2M_Testcases {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.pollingChannel)) {
         							if(v_responsePrimitive.primitiveContent.pollingChannel.labels != v_labels_1){
-        								setverdict(fail, testcasename() & ": Error: Labels attribute not updated correctly")
+        								setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
         							}
 								}
 							}
@@ -7301,7 +7301,7 @@ module OneM2M_Testcases {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
         							if(v_responsePrimitive.primitiveContent.subscription.labels != v_labels_1){
-        								setverdict(fail, testcasename() & ": Error: Labels attribute not updated correctly")
+        								setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
         							}
 								}
 							}
@@ -7340,14 +7340,14 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": 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_responsePrimitiveKO)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while updating resource type " & int2str(enum2int(p_resourceType)));
+								setverdict(fail, __SCOPE__ & ": Error while updating resource type " & int2str(enum2int(p_resourceType)));
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while updating resource type " & int2str(enum2int(p_resourceType)));
+								setverdict(fail, __SCOPE__ & ": No answer while updating resource type " & int2str(enum2int(p_resourceType)));
 							}
 						}	
     								
@@ -7391,7 +7391,7 @@ module OneM2M_Testcases {
 								if(ischosen(v_responsePrimitive.primitiveContent.container)) {
         							if(ispresent(v_responsePrimitive.primitiveContent.container.labels)){ 
         								if(not(match(v_responsePrimitive.primitiveContent.container.labels,{""}))) {
-        									setverdict(fail, testcasename() & ": Error: Labels attribute not deleted correctly");
+        									setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly");
         								}
         							}
 								}
@@ -7420,7 +7420,7 @@ module OneM2M_Testcases {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
         							if(ispresent(v_responsePrimitive.primitiveContent.group_.labels)){
-        								setverdict(fail, testcasename() & ": Error: Labels attribute not deleted correctly")
+        								setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly")
         							}
 								}
 							}
@@ -7448,7 +7448,7 @@ module OneM2M_Testcases {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.accessControlPolicy)) {
         							if(ispresent(v_responsePrimitive.primitiveContent.accessControlPolicy.labels)){
-        								setverdict(fail, testcasename() & ": Error: Labels attribute not deleted correctly")
+        								setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly")
         							}
 								}
 							}
@@ -7476,7 +7476,7 @@ module OneM2M_Testcases {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.schedule)) {
         							if(ispresent(v_responsePrimitive.primitiveContent.schedule.labels)){
-        								setverdict(fail, testcasename() & ": Error: Labels attribute not deleted correctly")
+        								setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly")
         							}
 								}
 							}
@@ -7504,7 +7504,7 @@ module OneM2M_Testcases {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.pollingChannel)) {
         							if(ispresent(v_responsePrimitive.primitiveContent.pollingChannel.labels)){
-        								setverdict(fail, testcasename() & ": Error: Labels attribute not deleted correctly")
+        								setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly")
         							}
 								}
 							}
@@ -7532,7 +7532,7 @@ module OneM2M_Testcases {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
         							if(ispresent(v_responsePrimitive.primitiveContent.subscription.labels)){
-        								setverdict(fail, testcasename() & ": Error: Labels attribute not deleted correctly")
+        								setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly")
         							}
 								}
 							}
@@ -7573,14 +7573,14 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": 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_responsePrimitiveKO))  -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while updating resource type " & int2str(enum2int(p_resourceType)));
+								setverdict(fail, __SCOPE__ & ": Error while updating resource type " & int2str(enum2int(p_resourceType)));
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while updating resource type " & int2str(enum2int(p_resourceType)));
+								setverdict(fail, __SCOPE__ & ": No answer while updating resource type " & int2str(enum2int(p_resourceType)));
 							}
 						}	
     								
@@ -7625,15 +7625,15 @@ module OneM2M_Testcases {
 								if(ischosen(v_responsePrimitive.primitiveContent.container)) {
         							//Check attribute 1
         							if(v_responsePrimitive.primitiveContent.container.expirationTime != valueof(v_updateRequest.primitiveContent.container.expirationTime)){
-        								setverdict(fail, testcasename() & ": Error: Expiration Time attribute not updated correctly")
+        								setverdict(fail, __SCOPE__ & ": Error: Expiration Time attribute not updated correctly")
         							}
         							//Check attribute 2
         							if(v_responsePrimitive.primitiveContent.container.maxNrOfInstances != valueof(v_updateRequest.primitiveContent.container.maxNrOfInstances)){
-        								setverdict(fail, testcasename() & ": Error: MaxNrOfInstances attribute not updated correctly")
+        								setverdict(fail, __SCOPE__ & ": Error: MaxNrOfInstances attribute not updated correctly")
         							}
         							//Check attribute 3
         							if(ispresent(v_responsePrimitive.primitiveContent.container.labels)){
-        								setverdict(fail, testcasename() & ": Error: Labels attribute not deleted correctly")
+        								setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly")
         							}
 								}
 							}
@@ -7665,15 +7665,15 @@ module OneM2M_Testcases {
 								if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
         							//Check attribute 1
         							if(not match(v_responsePrimitive.primitiveContent.group_.groupName, valueof(v_updateRequest.primitiveContent.group_.groupName))){
-        								setverdict(fail, testcasename() & ": Error: groupName attribute not updated correctly")
+        								setverdict(fail, __SCOPE__ & ": Error: groupName attribute not updated correctly")
         							}
         							//Check attribute 2
         							if(not match(v_responsePrimitive.primitiveContent.group_.expirationTime, valueof(v_updateRequest.primitiveContent.group_.expirationTime))){
-        								setverdict(fail, testcasename() & ": Error: expirationTime attribute not updated correctly")
+        								setverdict(fail, __SCOPE__ & ": Error: expirationTime attribute not updated correctly")
         							}
         							//Check attribute 3
         							if(ispresent(v_responsePrimitive.primitiveContent.group_.labels)){
-        								setverdict(fail, testcasename() & ": Error: Labels attribute not deleted correctly")
+        								setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly")
         							}
 								}
 							}
@@ -7714,15 +7714,15 @@ module OneM2M_Testcases {
 								if(ischosen(v_responsePrimitive.primitiveContent.accessControlPolicy)) {
         							//Check attribute 1
         							if(not match(v_responsePrimitive.primitiveContent.accessControlPolicy.privileges.accessControlRule_list[0].accessControlOperations, v_privileges_2.accessControlRule_list[0].accessControlOperations)){
-        								setverdict(fail, testcasename() & ": Error: Privileges attribute not updated correctly")
+        								setverdict(fail, __SCOPE__ & ": Error: Privileges attribute not updated correctly")
         							}
         							//Check attribute 2
         							if(not match(v_responsePrimitive.primitiveContent.accessControlPolicy.announceTo, valueof(v_updateRequest.primitiveContent.accessControlPolicy.announceTo))){
-        								setverdict(fail, testcasename() & ": Error: Announce_to attribute not updated correctly")
+        								setverdict(fail, __SCOPE__ & ": Error: Announce_to attribute not updated correctly")
         							}
         							//Check attribute 3
         							if(ispresent(v_responsePrimitive.primitiveContent.accessControlPolicy.labels)){
-        								setverdict(fail, testcasename() & ": Error: Labels attribute not deleted correctly")
+        								setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly")
         							}
 								}
 							}
@@ -7752,15 +7752,15 @@ module OneM2M_Testcases {
 								if(ischosen(v_responsePrimitive.primitiveContent.schedule)) {
         							//Check attribute 1
         							if(v_responsePrimitive.primitiveContent.schedule.scheduleElement != valueof(v_updateRequest.primitiveContent.schedule.scheduleElement)){
-        								setverdict(fail, testcasename() & ": Error: Expiration Time attribute not updated correctly")
+        								setverdict(fail, __SCOPE__ & ": Error: Expiration Time attribute not updated correctly")
         							}
         							//Check attribute 2
         							if(v_responsePrimitive.primitiveContent.schedule.announceTo != valueof(v_updateRequest.primitiveContent.schedule.announceTo)){
-        								setverdict(fail, testcasename() & ": Error: MaxNrOfInstances attribute not updated correctly")
+        								setverdict(fail, __SCOPE__ & ": Error: MaxNrOfInstances attribute not updated correctly")
         							}
         							//Check attribute 3
         							if(ispresent(v_responsePrimitive.primitiveContent.schedule.labels)){
-        								setverdict(fail, testcasename() & ": Error: Labels attribute not deleted correctly")
+        								setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly")
         							}
 								}
 							}
@@ -7793,11 +7793,11 @@ module OneM2M_Testcases {
         							
         							//Check attribute 2 TODO once another alternative is found, activate this checking
         							/*if(not match(v_responsePrimitive.primitiveContent.pollingChannel.accessControlPolicyIDs, valueof(v_updateRequest.primitiveContent.pollingChannel.accessControlPolicyIDs))){
-        								setverdict(fail, testcasename() & ": Error: ACPI attribute not added correctly")
+        								setverdict(fail, __SCOPE__ & ": Error: ACPI attribute not added correctly")
         							}*/
         							//Check attribute 3
         							if(ispresent(v_responsePrimitive.primitiveContent.pollingChannel.labels)){
-        								setverdict(fail, testcasename() & ": Error: Labels attribute not deleted correctly")
+        								setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly")
         							}
 								}
 							}
@@ -7826,15 +7826,15 @@ module OneM2M_Testcases {
 								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
             						//Check attribute 1
             						if(not match(v_responsePrimitive.primitiveContent.subscription.labels, valueof(v_updateRequest.primitiveContent.subscription.labels))){
-            							setverdict(fail, testcasename() & ": Error: Labels attribute not updated correctly")
+            							setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
             						}
             						//Check attribute 2
             						if(not match(v_responsePrimitive.primitiveContent.subscription.expirationTime, valueof(v_updateRequest.primitiveContent.subscription.expirationTime))){
-            							setverdict(fail, testcasename() & ": Error: expirationTime attribute not updated correctly")
+            							setverdict(fail, __SCOPE__ & ": Error: expirationTime attribute not updated correctly")
             						}
             						//Check attribute 3
             						if(ispresent(v_responsePrimitive.primitiveContent.subscription.expirationCounter)){
-            							setverdict(fail, testcasename() & ": Error: expirationCounter attribute not deleted correctly")
+            							setverdict(fail, __SCOPE__ & ": Error: expirationCounter attribute not deleted correctly")
             						}
 								}
 							}
@@ -7873,14 +7873,14 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK())) -> value v_response {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": 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_responsePrimitiveKO))  -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while updating resource type " & int2str(enum2int(p_resourceType)));
+								setverdict(fail, __SCOPE__ & ": Error while updating resource type " & int2str(enum2int(p_resourceType)));
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while updating resource type " & int2str(enum2int(p_resourceType)));
+								setverdict(fail, __SCOPE__ & ": No answer while updating resource type " & int2str(enum2int(p_resourceType)));
 							}
 						}	
     								
@@ -8001,18 +8001,18 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) -> value v_response {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": Resource " & c_defaultResourceName & " of type " & int2str(enum2int(p_resourceType)) & " not found");
+								setverdict(pass, __SCOPE__ & ": Resource " & c_defaultResourceName & " of type " & int2str(enum2int(p_resourceType)) & " not found");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while updating an unexisting resource type " & int2str(enum2int(p_resourceType)));
+								setverdict(fail, __SCOPE__ & ": Error while updating an unexisting resource type " & int2str(enum2int(p_resourceType)));
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while updating an unexisting resource type " & int2str(enum2int(p_resourceType)));
+								setverdict(fail, __SCOPE__ & ": Error while updating an unexisting resource type " & int2str(enum2int(p_resourceType)));
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while updating resource type " & int2str(enum2int(p_resourceType)));
+								setverdict(fail, __SCOPE__ & ": No answer while updating resource type " & int2str(enum2int(p_resourceType)));
 							}
 						}	
     								
@@ -8108,7 +8108,7 @@ module OneM2M_Testcases {
     										   
 						// Test control
 						if(not(PICS_ACP_SUPPORT)) {
-    						setverdict(inconc, testcasename() & ": AccessControlPolicy support is required to run this test case");
+    						setverdict(inconc, __SCOPE__ & ": AccessControlPolicy support is required to run this test case");
     						stop;
 						}
     				
@@ -8134,18 +8134,18 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": Access denied to update attributes from resource type " & int2str(enum2int(p_resourceType)));
+								setverdict(pass, __SCOPE__ & ": Access denied to update attributes from resource type " & int2str(enum2int(p_resourceType)));
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while updating attributes from resource without having privileges");
+								setverdict(fail, __SCOPE__ & ": Error while updating attributes from resource without having privileges");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Updating attributes from resource without having privileges");
+								setverdict(fail, __SCOPE__ & ": Updating attributes from resource without having privileges");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while updating resource type " & int2str(enum2int(p_resourceType)));
+								setverdict(fail, __SCOPE__ & ": No answer while updating resource type " & int2str(enum2int(p_resourceType)));
 							}
 						}	
     								
@@ -8264,18 +8264,18 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) -> value v_response {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": Operation not allowed. RO attribute from resource type " & int2str(enum2int(p_resourceType)) );
+								setverdict(pass, __SCOPE__ & ": Operation not allowed. RO attribute from resource type " & int2str(enum2int(p_resourceType)) );
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while updating RO attribute");
+								setverdict(fail, __SCOPE__ & ": Error while updating RO attribute");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Updating RO attribute from resource");
+								setverdict(fail, __SCOPE__ & ": Updating RO attribute from resource");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while updating resource type " & int2str(enum2int(p_resourceType)));
+								setverdict(fail, __SCOPE__ & ": No answer while updating resource type " & int2str(enum2int(p_resourceType)));
 							}
 						}	
     								
@@ -8405,18 +8405,18 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) -> value v_response {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": Operation not allowed. Mandatory RW attribute from resource type " & int2str(enum2int(p_resourceType)) );
+								setverdict(pass, __SCOPE__ & ": Operation not allowed. Mandatory RW attribute from resource type " & int2str(enum2int(p_resourceType)) );
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while deleting mandatory RW attribute");
+								setverdict(fail, __SCOPE__ & ": Error while deleting mandatory RW attribute");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Deleting a mandatory RW attribute from resource");
+								setverdict(fail, __SCOPE__ & ": Deleting a mandatory RW attribute from resource");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while updating resource type " & int2str(enum2int(p_resourceType)));
+								setverdict(fail, __SCOPE__ & ": No answer while updating resource type " & int2str(enum2int(p_resourceType)));
 							}
 						}	
     								
@@ -8469,24 +8469,24 @@ module OneM2M_Testcases {
 								[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 									tc_ac.stop;
 									if(v_response.primitive.responsePrimitive.primitiveContent.container.stateTag == 1) { //(Create and Delete)
-										setverdict(pass, testcasename() & ": The stateTag attribute is incremented");	
+										setverdict(pass, __SCOPE__ & ": The stateTag attribute is incremented");	
 									}
 									else{
-										setverdict(fail, testcasename() & ": Error the stateTag attribute is not incremented");
+										setverdict(fail, __SCOPE__ & ": Error the stateTag attribute is not incremented");
 									}
 								}
 								[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 									tc_ac.stop;
-									setverdict(fail, testcasename() & ": Error while retrieving resource attributes");
+									setverdict(fail, __SCOPE__ & ": Error while retrieving resource attributes");
 								}
 								[] tc_ac.timeout {
-									setverdict(fail, testcasename() & ": No answer while retrieving resource attributes");
+									setverdict(fail, __SCOPE__ & ": No answer while retrieving resource attributes");
 								}
 							}	
 				
 						}//end if
 						else{
-							setverdict(fail, testcasename() & ": Error the stateTag attribute is empty");
+							setverdict(fail, __SCOPE__ & ": Error the stateTag attribute is empty");
 						}
 		
 						// Postamble
@@ -8539,18 +8539,18 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) -> value v_response {
 							   tc_ac.stop;
-							   setverdict(pass, testcasename() & ": Not allowed to update a contentInstance with error OPERATION_NOT_ALLOWED");
+							   setverdict(pass, __SCOPE__ & ": Not allowed to update a contentInstance with error OPERATION_NOT_ALLOWED");
 						   }
 						   [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 							   tc_ac.stop;
-							   setverdict(fail, testcasename() & ": Not allowed to update a contentInstance with a wrong error code");
+							   setverdict(fail, __SCOPE__ & ": Not allowed to update a contentInstance with a wrong error code");
 						   }
 						   [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 							   tc_ac.stop;
-							   setverdict(fail, testcasename() & ": Accepted update of contentInstance");
+							   setverdict(fail, __SCOPE__ & ": Accepted update of contentInstance");
 						   }
 						   [] tc_ac.timeout {
-							   setverdict(fail, testcasename() & ": No answer while updating contentInstance");
+							   setverdict(fail, __SCOPE__ & ": No answer while updating contentInstance");
 						   }
 						}	
 				
@@ -8606,18 +8606,18 @@ module OneM2M_Testcases {
 					  	alt {
 						  	[] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) -> value v_response {
 							 	tc_ac.stop;
-							 	setverdict(pass, testcasename() & ": Not allowed to update a latest resource with error OPERATION_NOT_ALLOWED");
+							 	setverdict(pass, __SCOPE__ & ": Not allowed to update a latest resource with error OPERATION_NOT_ALLOWED");
 						 	}
 						 	[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 							 	tc_ac.stop;
-							 	setverdict(fail, testcasename() & ": Not allowed to update a latest resource with a wrong error code");
+							 	setverdict(fail, __SCOPE__ & ": Not allowed to update a latest resource with a wrong error code");
 						 	}
 						 	[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 							 	tc_ac.stop;
-							 	setverdict(fail, testcasename() & ": Accepted update of a latest resource");
+							 	setverdict(fail, __SCOPE__ & ": Accepted update of a latest resource");
 						 	}
 						 	[] tc_ac.timeout {
-							 	setverdict(fail, testcasename() & ": No answer while updating a latest resource");
+							 	setverdict(fail, __SCOPE__ & ": No answer while updating a latest resource");
 						 	}
 					  	}	
 
@@ -8673,18 +8673,18 @@ module OneM2M_Testcases {
 					  	alt {
 						  	[] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) -> value v_response {
 							  	tc_ac.stop;
-							  	setverdict(pass, testcasename() & ": Not allowed to update an oldest resource with error OPERATION_NOT_ALLOWED");
+							  	setverdict(pass, __SCOPE__ & ": Not allowed to update an oldest resource with error OPERATION_NOT_ALLOWED");
 						  	}
 						  	[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 							  	tc_ac.stop;
-							  	setverdict(fail, testcasename() & ": Not allowed to update an oldest resource with a wrong error code");
+							  	setverdict(fail, __SCOPE__ & ": Not allowed to update an oldest resource with a wrong error code");
 						  	}
 						  	[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 							  	tc_ac.stop;
-							  	setverdict(fail, testcasename() & ": Accepted update of an oldest resource");
+							  	setverdict(fail, __SCOPE__ & ": Accepted update of an oldest resource");
 						  	}
 						  	[] tc_ac.timeout {
-							  	setverdict(fail, testcasename() & ": No answer while updating an oldest resource");
+							  	setverdict(fail, __SCOPE__ & ": No answer while updating an oldest resource");
 						  	}
 					  	}	
 
@@ -8781,14 +8781,14 @@ module OneM2M_Testcases {
                 		alt {
                 			[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
                 				tc_ac.stop;
-                				setverdict(pass, testcasename() & ": Resource" & int2str(enum2int(p_resourceType)) & " deleted successfully");
+                				setverdict(pass, __SCOPE__ & ": Resource" & int2str(enum2int(p_resourceType)) & " deleted successfully");
                 			}
                 			[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
                 				tc_ac.stop;
-                				setverdict(fail, testcasename() & ": Error while deleting resource type " & int2str(enum2int(p_resourceType)));
+                				setverdict(fail, __SCOPE__ & ": Error while deleting resource type " & int2str(enum2int(p_resourceType)));
                 			}
                 			[] tc_ac.timeout {
-                				setverdict(fail, testcasename() & ": No answer while deleting resource type " & int2str(enum2int(p_resourceType)));
+                				setverdict(fail, __SCOPE__ & ": No answer while deleting resource type " & int2str(enum2int(p_resourceType)));
                 			}
                 		}	
                 					
@@ -8861,7 +8861,7 @@ module OneM2M_Testcases {
                 							   
                 		// Test control
 						if(not(PICS_ACP_SUPPORT)) {
-							setverdict(inconc, testcasename() & ": AccessControlPolicy support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": AccessControlPolicy support is required to run this test case");
 							stop;
 						}
                 
@@ -8888,14 +8888,14 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": Attribute of resource type int1 (Acp) updated successfully");
+								setverdict(pass, __SCOPE__ & ": Attribute of resource type int1 (Acp) updated successfully");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while updating resource type int1 (Acp)");
+								setverdict(fail, __SCOPE__ & ": Error while updating resource type int1 (Acp)");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while updating resource type int1 (Acp)");
+								setverdict(fail, __SCOPE__ & ": No answer while updating resource type int1 (Acp)");
 							}
 						}
                 		
@@ -8922,18 +8922,18 @@ module OneM2M_Testcases {
                 		alt {
                 			[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response {
                 				tc_ac.stop;
-                				setverdict(pass, testcasename() & ": Access denied to delete the resource " & int2str(enum2int(p_resourceType)));
+                				setverdict(pass, __SCOPE__ & ": Access denied to delete the resource " & int2str(enum2int(p_resourceType)));
                 			}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error resource deleted without having privileges");
+								setverdict(fail, __SCOPE__ & ": Error resource deleted without having privileges");
 							}                			
                 			[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
                 				tc_ac.stop;
-                				setverdict(fail, testcasename() & ": Error while deleting a resource ");
+                				setverdict(fail, __SCOPE__ & ": Error while deleting a resource ");
                 			}
                 			[] tc_ac.timeout {
-                				setverdict(fail, testcasename() & ": No answer while deleting resource type " & int2str(enum2int(p_resourceType)));
+                				setverdict(fail, __SCOPE__ & ": No answer while deleting resource type " & int2str(enum2int(p_resourceType)));
                 			}
                 		}	
                 					
@@ -8984,18 +8984,18 @@ module OneM2M_Testcases {
                 		alt {
                 			[] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) -> value v_response {
                 				tc_ac.stop;
-								setverdict(pass, testcasename() & ": Unexisting resource cannot be deleted");
+								setverdict(pass, __SCOPE__ & ": Unexisting resource cannot be deleted");
                 			}
                 			[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
                 				tc_ac.stop;
-                				setverdict(fail, testcasename() & ": Error while deleting non existing resource");
+                				setverdict(fail, __SCOPE__ & ": Error while deleting non existing resource");
                 			}
                 			[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
                 				tc_ac.stop;
-                				setverdict(fail, testcasename() & ": Error while deleting non existing resource");
+                				setverdict(fail, __SCOPE__ & ": Error while deleting non existing resource");
                 			}
                 			[] tc_ac.timeout {
-                				setverdict(fail, testcasename() & ": No answer while deleting resource");
+                				setverdict(fail, __SCOPE__ & ": No answer while deleting resource");
                 			}
                 		}		
                 					
@@ -9085,14 +9085,14 @@ module OneM2M_Testcases {
                 		alt {
                 			[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
                 				tc_ac.stop;
-                				setverdict(pass, testcasename() & ":Resource type " & int2str(enum2int(p_resourceType)) & " delete successfully");
+                				setverdict(pass, __SCOPE__ & ":Resource type " & int2str(enum2int(p_resourceType)) & " delete successfully");
                 			}
                 			[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
                 				tc_ac.stop;
-                				setverdict(fail, testcasename() & ": Error while deleting resource type " & int2str(enum2int(p_resourceType)));
+                				setverdict(fail, __SCOPE__ & ": Error while deleting resource type " & int2str(enum2int(p_resourceType)));
                 			}
                 			[] tc_ac.timeout {
-                				setverdict(fail, testcasename() & ": No answer while deleting resource type " & int2str(enum2int(p_resourceType)));
+                				setverdict(fail, __SCOPE__ & ": No answer while deleting resource type " & int2str(enum2int(p_resourceType)));
                 			}
                 		}
                 		
@@ -9102,18 +9102,18 @@ module OneM2M_Testcases {
                 		alt {
                 			[] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) -> value v_response {
                 				tc_ac.stop;
-                				setverdict(pass, testcasename() & ": Error while deleting non existing resource");
+                				setverdict(pass, __SCOPE__ & ": Error while deleting non existing resource");
                 			}
                 			[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
                 				tc_ac.stop;
-                				setverdict(fail, testcasename() & ": Error while deleting non existing resource");
+                				setverdict(fail, __SCOPE__ & ": Error while deleting non existing resource");
                 			}
                 			[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
                 				tc_ac.stop;
-                				setverdict(fail, testcasename() & ": Error while deleting non existing resource");
+                				setverdict(fail, __SCOPE__ & ": Error while deleting non existing resource");
                 			}
                 			[] tc_ac.timeout {
-                				setverdict(fail, testcasename() & ": No answer while deleting resource");
+                				setverdict(fail, __SCOPE__ & ": No answer while deleting resource");
                 			}
                 		}		
                 					
@@ -9165,14 +9165,14 @@ module OneM2M_Testcases {
             				alt {
             					[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
             						tc_ac.stop;
-            						setverdict(pass, testcasename() & ": Resource type " & int2str(enum2int(c_containerResourceType)) & " delete successfully");
+            						setverdict(pass, __SCOPE__ & ": Resource type " & int2str(enum2int(c_containerResourceType)) & " delete successfully");
             					}
             					[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
             						tc_ac.stop;
-            						setverdict(fail, testcasename() & ": Error while deleting resource type " & int2str(enum2int(c_containerResourceType)));
+            						setverdict(fail, __SCOPE__ & ": Error while deleting resource type " & int2str(enum2int(c_containerResourceType)));
             					}
             					[] tc_ac.timeout {
-            						setverdict(fail, testcasename() & ": No answer while deleting resource type " & int2str(enum2int(c_containerResourceType)));
+            						setverdict(fail, __SCOPE__ & ": No answer while deleting resource type " & int2str(enum2int(c_containerResourceType)));
             					}
             				}
             	
@@ -9185,24 +9185,24 @@ module OneM2M_Testcases {
             					[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
             						tc_ac.stop;
             						if(v_response.primitive.responsePrimitive.primitiveContent.container.stateTag == 2) { //(Create and Delete)
-            							setverdict(pass, testcasename() & ": The stateTag attribute is incremented");	
+            							setverdict(pass, __SCOPE__ & ": The stateTag attribute is incremented");	
             						}
             						else{
-            							setverdict(fail, testcasename() & ": Error the stateTag attribute is not incremented");
+            							setverdict(fail, __SCOPE__ & ": Error the stateTag attribute is not incremented");
             						}
             					}
             					[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
             						tc_ac.stop;
-            						setverdict(fail, testcasename() & ": Error while retrieving resource attributes");
+            						setverdict(fail, __SCOPE__ & ": Error while retrieving resource attributes");
             					}
             					[] tc_ac.timeout {
-            						setverdict(fail, testcasename() & ": No answer while retrieving resource attributes");
+            						setverdict(fail, __SCOPE__ & ": No answer while retrieving resource attributes");
             					}
             				}	
             					
             			}//end if
             			else{
-            				setverdict(fail, testcasename() & ": Error the stateTag attribute is empty");
+            				setverdict(fail, __SCOPE__ & ": Error the stateTag attribute is empty");
             			}
             			
             			// Postamble
@@ -9246,7 +9246,7 @@ module OneM2M_Testcases {
 						v_attributesContainer := f_cse_retrieveResource(v_containerIndex);
             			
 						if(not(ispresent(v_attributesContainer.container.currentNrOfInstances))) {
-							setverdict(fail, testcasename() & ": Error the currentNrOfInstances attribute is empty");
+							setverdict(fail, __SCOPE__ & ": Error the currentNrOfInstances attribute is empty");
 							f_checkCseTesterStatus();
 						}
 							
@@ -9256,15 +9256,15 @@ module OneM2M_Testcases {
 						v_attributesContainer_afterDeletion := f_cse_retrieveResource(v_containerIndex);
 						
 						if(not(ispresent(v_attributesContainer.container.currentNrOfInstances))) {
-							setverdict(fail, testcasename() & ": Error the currentNrOfInstances attribute is empty");
+							setverdict(fail, __SCOPE__ & ": Error the currentNrOfInstances attribute is empty");
 							f_checkCseTesterStatus();
 						}
 						
 						if((v_attributesContainer.container.currentNrOfInstances > v_attributesContainer_afterDeletion.container.currentNrOfInstances) and
 							(v_attributesContainer.container.currentByteSize > v_attributesContainer_afterDeletion.container.currentByteSize)) {
-							setverdict(pass, testcasename() & ": The currentNrOfInstances and currentByteSize attributes are decreased");
+							setverdict(pass, __SCOPE__ & ": The currentNrOfInstances and currentByteSize attributes are decreased");
 						} else {
-							setverdict(fail, testcasename() & ": currentNrOfInstances and/or currentByteSize attributes are not decreased");
+							setverdict(fail, __SCOPE__ & ": currentNrOfInstances and/or currentByteSize attributes are not decreased");
 						}
 							
 						// Postamble
@@ -9315,14 +9315,14 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": Resource type " & int2str(enum2int(c_containerResourceType)) & " deleted successfuly");
+								setverdict(pass, __SCOPE__ & ": Resource type " & int2str(enum2int(c_containerResourceType)) & " deleted successfuly");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while deleting resource type " & int2str(enum2int(c_containerResourceType)));
+								setverdict(fail, __SCOPE__ & ": Error while deleting resource type " & int2str(enum2int(c_containerResourceType)));
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while deleting resource type " & int2str(enum2int(c_containerResourceType)));
+								setverdict(fail, __SCOPE__ & ": No answer while deleting resource type " & int2str(enum2int(c_containerResourceType)));
 							}
 						}
 						
@@ -9334,14 +9334,14 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Resource type" & int2str(enum2int(c_containerResourceType)) & " has already been deleted");	
+								setverdict(fail, __SCOPE__ & ": Resource type" & int2str(enum2int(c_containerResourceType)) & " has already been deleted");	
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": Error while retrieving resource attributes as" & int2str(enum2int(c_containerResourceType)) & " has been deleted");
+								setverdict(pass, __SCOPE__ & ": Error while retrieving resource attributes as" & int2str(enum2int(c_containerResourceType)) & " has been deleted");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while retrieving resource attributes");
+								setverdict(fail, __SCOPE__ & ": No answer while retrieving resource attributes");
 							}
 						}
 					    
@@ -9389,14 +9389,14 @@ module OneM2M_Testcases {
 						alt {
 						    	[] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) -> value v_response {
 									tc_ac.stop;
-									setverdict(pass, testcasename() & ": Resource type  " & int2str(enum2int(c_containerResourceType)) & " NOT FOUND");
+									setverdict(pass, __SCOPE__ & ": Resource type  " & int2str(enum2int(c_containerResourceType)) & " NOT FOUND");
 								}
 								[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 									tc_ac.stop;
-									setverdict(fail, testcasename() & ": Resource type  " & int2str(enum2int(c_containerResourceType)) & " has not been created");
+									setverdict(fail, __SCOPE__ & ": Resource type  " & int2str(enum2int(c_containerResourceType)) & " has not been created");
 								}
 								[] tc_ac.timeout {
-									setverdict(fail, testcasename() & ": No answer while deleting resource type " & int2str(enum2int(c_containerResourceType)));
+									setverdict(fail, __SCOPE__ & ": No answer while deleting resource type " & int2str(enum2int(c_containerResourceType)));
 								}
 							}					    
 						
@@ -9448,14 +9448,14 @@ module OneM2M_Testcases {
 						alt {
 								[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 									tc_ac.stop;
-									setverdict(pass, testcasename() & ": Resource type " & int2str(enum2int(c_containerResourceType)) & " deleted successfuly");
+									setverdict(pass, __SCOPE__ & ": Resource type " & int2str(enum2int(c_containerResourceType)) & " deleted successfuly");
 								}
 						  	    [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 								    tc_ac.stop;
-									setverdict(fail, testcasename() & ": Error while deleting resource type " & int2str(enum2int(c_containerResourceType)));
+									setverdict(fail, __SCOPE__ & ": Error while deleting resource type " & int2str(enum2int(c_containerResourceType)));
 								}
 								[] tc_ac.timeout {
-									setverdict(fail, testcasename() & ": No answer while deleting resource type " & int2str(enum2int(c_containerResourceType)));
+									setverdict(fail, __SCOPE__ & ": No answer while deleting resource type " & int2str(enum2int(c_containerResourceType)));
 								}
 						   }
 						   
@@ -9467,14 +9467,14 @@ module OneM2M_Testcases {
 						alt {
 								[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 						 		   tc_ac.stop;
-								   setverdict(fail, testcasename() & ": Resource type" & int2str(enum2int(c_containerResourceType)) & "has already been deleted");	
+								   setverdict(fail, __SCOPE__ & ": Resource type" & int2str(enum2int(c_containerResourceType)) & "has already been deleted");	
 								}
 								[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 								   tc_ac.stop;
-							 	   setverdict(pass, testcasename() & ": Error while retrieving resource attributes as" & int2str(enum2int(c_containerResourceType)) & " has been deleted");
+							 	   setverdict(pass, __SCOPE__ & ": Error while retrieving resource attributes as" & int2str(enum2int(c_containerResourceType)) & " has been deleted");
 								}
 								[] tc_ac.timeout {
-								   setverdict(fail, testcasename() & ": No answer while retrieving resource attributes");
+								   setverdict(fail, __SCOPE__ & ": No answer while retrieving resource attributes");
 								}
 							}
 							
@@ -9522,14 +9522,14 @@ module OneM2M_Testcases {
 						alt {
 								[] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) -> value v_response {
 									tc_ac.stop;
-									setverdict(pass, testcasename() & ": Resource type" & int2str(enum2int(c_containerResourceType)) & " NOT FOUND");
+									setverdict(pass, __SCOPE__ & ": Resource type" & int2str(enum2int(c_containerResourceType)) & " NOT FOUND");
 								}
 							    [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 									tc_ac.stop;
-									setverdict(fail, testcasename() & ": Resource type" & int2str(enum2int(c_containerResourceType)) & " has not been created");
+									setverdict(fail, __SCOPE__ & ": Resource type" & int2str(enum2int(c_containerResourceType)) & " has not been created");
 								}
 								[] tc_ac.timeout {
-									setverdict(fail, testcasename() & ": No answer while deleting resource type " & int2str(enum2int(c_containerResourceType)));
+									setverdict(fail, __SCOPE__ & ": No answer while deleting resource type " & int2str(enum2int(c_containerResourceType)));
 								}
 							}					    
 						
@@ -9571,18 +9571,18 @@ module OneM2M_Testcases {
      	    	alt{
      	    	  [] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) -> value v_response { //BAD REQUEST
      	    	    tc_ac.stop;
-     	    	    setverdict(pass, testcasename() & "Resource <locationPolicy> create request is rejected due to invalid request body message!!");     	    	    
+     	    	    setverdict(pass, __SCOPE__ & "Resource <locationPolicy> create request is rejected due to invalid request body message!!");     	    	    
      	    	  }
      	    	  [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
      	    	    tc_ac.stop;
-    				setverdict(fail, testcasename() & ": Error while handling an invalid locationPolicy resource create request with response status code:" & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)));     	    	    
+    				setverdict(fail, __SCOPE__ & ": Error while handling an invalid locationPolicy resource create request with response status code:" & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)));     	    	    
      	    	  }
      	    	   [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
      	    	    tc_ac.stop;
-    				setverdict(fail, testcasename() & ": Created a locationPolicy resource for an invalid create request with response status code:" & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)));     	    	    
+    				setverdict(fail, __SCOPE__ & ": Created a locationPolicy resource for an invalid create request with response status code:" & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)));     	    	    
      	    	  } 
      	    	  [] tc_ac.timeout {
-    					setverdict(fail, testcasename() & ": Timeout due to no response received from requested server!");
+    					setverdict(fail, __SCOPE__ & ": Timeout due to no response received from requested server!");
     			  }   	    	  
      	    	      	    	  
      	    	}
@@ -9622,14 +9622,14 @@ module OneM2M_Testcases {
     			alt {
     				[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
     					tc_ac.stop;
-    					setverdict(pass, testcasename() & ": Resource locationPolicy is created successfully with response status code: " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode))&"!");
+    					setverdict(pass, __SCOPE__ & ": Resource locationPolicy is created successfully with response status code: " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode))&"!");
     				}
     				[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
     					tc_ac.stop;
-    					setverdict(fail, testcasename() & ": Error occurrs with response status code: " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)) & "while handling a valid locationPolicy resource create request!");
+    					setverdict(fail, __SCOPE__ & ": Error occurrs with response status code: " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)) & "while handling a valid locationPolicy resource create request!");
     				}
     				[] tc_ac.timeout {
-    					setverdict(fail, testcasename() & ": Timeout due to no response from requested server!");
+    					setverdict(fail, __SCOPE__ & ": Timeout due to no response from requested server!");
     				}
     			}	
     								
@@ -9659,7 +9659,7 @@ module OneM2M_Testcases {
 				
 				// Test control
                 if(not(PICS_ACP_SUPPORT)) {
-                	setverdict(inconc, testcasename() & ": AccessControlPolicy support is required to run this test case");
+                	setverdict(inconc, __SCOPE__ & ": AccessControlPolicy support is required to run this test case");
                 	stop;
                 }
 				     	     	
@@ -9680,14 +9680,14 @@ module OneM2M_Testcases {
     			alt {
     				[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response {
     					tc_ac.stop;
-    					setverdict(pass, testcasename() & ": Access denied to create a resource including locationPolicy!");
+    					setverdict(pass, __SCOPE__ & ": Access denied to create a resource including locationPolicy!");
     				}
     				[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
     					tc_ac.stop;
-    					setverdict(fail, testcasename() & ": Error occurrs with response status code: " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)) & "due to IUT failed to check the access privilege of originator!");
+    					setverdict(fail, __SCOPE__ & ": Error occurrs with response status code: " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)) & "due to IUT failed to check the access privilege of originator!");
     				}
     				[] tc_ac.timeout {
-    					setverdict(fail, testcasename() & ": Timeout due to no response from requested server!");
+    					setverdict(fail, __SCOPE__ & ": Timeout due to no response from requested server!");
     				}
     			}
     								
@@ -9728,14 +9728,14 @@ module OneM2M_Testcases {
     			alt {
     				[] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) -> value v_response {
     					tc_ac.stop;
-    					setverdict(pass, testcasename() & ": The targeted resource is not found!!");
+    					setverdict(pass, __SCOPE__ & ": The targeted resource is not found!!");
     				}
     				[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
     					tc_ac.stop;
-    					setverdict(fail, testcasename() & ": Error occurrs with response status code: "& int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)) & "due to IUT created a locationPolicy resource under a non-existed parent resource!");
+    					setverdict(fail, __SCOPE__ & ": Error occurrs with response status code: "& int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)) & "due to IUT created a locationPolicy resource under a non-existed parent resource!");
     				}
     				[] tc_ac.timeout {
-    					setverdict(fail, testcasename() & ": Timeout due to no response from requested server!");
+    					setverdict(fail, __SCOPE__ & ": Timeout due to no response from requested server!");
     				}
     			}	
     								
@@ -9783,14 +9783,14 @@ module OneM2M_Testcases {
     			alt {
     				[] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) -> value v_response {
     					tc_ac.stop;
-    					setverdict(pass, testcasename() & ": Update locationPolicy resource is rejected!!");
+    					setverdict(pass, __SCOPE__ & ": Update locationPolicy resource is rejected!!");
     				}
     				[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
     					tc_ac.stop;
-    					setverdict(fail, testcasename() & ": Error occurrs with response status code: "& int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)) & "due to IUT failed to handle an invalid locationPolicy update request");
+    					setverdict(fail, __SCOPE__ & ": Error occurrs with response status code: "& int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)) & "due to IUT failed to handle an invalid locationPolicy update request");
     				}
     				[] tc_ac.timeout {
-    					setverdict(fail, testcasename() & ": Timeout due to no response from requested server!");
+    					setverdict(fail, __SCOPE__ & ": Timeout due to no response from requested server!");
     				}
     			}	
     								
@@ -9838,22 +9838,22 @@ module OneM2M_Testcases {
 		        [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response{
 		          tc_ac.stop;
 		          if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.container.locationID)){		            
-		            	setverdict(fail, testcasename() & "No locationID is included in the response!");
+		            	setverdict(fail, __SCOPE__ & "No locationID is included in the response!");
 		          }else{
-		            	setverdict(pass, testcasename() & "Container resource associated with locationPolicy resource is successfully retrieved with locationID included in the response!");		            
+		            	setverdict(pass, __SCOPE__ & "Container resource associated with locationPolicy resource is successfully retrieved with locationID included in the response!");		            
 		          }		          
 		          
 		        }
 		        [] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) -> value v_response{
 		          		tc_ac.stop;
-		          		setverdict(fail, testcasename() & "Requested container resource is not found!");
+		          		setverdict(fail, __SCOPE__ & "Requested container resource is not found!");
 		        }
 		        [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 						tc_ac.stop;
-						setverdict(fail, testcasename() & ": Error while retrieving resource!");
+						setverdict(fail, __SCOPE__ & ": Error while retrieving resource!");
 				}
 				[] tc_ac.timeout {
-						setverdict(fail, testcasename() & ": No answer while retrieving resource!");
+						setverdict(fail, __SCOPE__ & ": No answer while retrieving resource!");
 				}
 		        
 		      }
@@ -9894,14 +9894,14 @@ module OneM2M_Testcases {
           			alt {
           				[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
           					tc_ac.stop;
-          					setverdict(pass, testcasename() & ": Resource locationPolicy is created successfully with response status code: " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode))&"!");
+          					setverdict(pass, __SCOPE__ & ": Resource locationPolicy is created successfully with response status code: " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode))&"!");
           				}
           				[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
           					tc_ac.stop;
-          					setverdict(fail, testcasename() & ": Error occurrs with response status code: " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)) & "while handling a valid locationPolicy resource create request!");
+          					setverdict(fail, __SCOPE__ & ": Error occurrs with response status code: " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)) & "while handling a valid locationPolicy resource create request!");
           				}
           				[] tc_ac.timeout {
-          					setverdict(fail, testcasename() & ": Timeout due to no response from requested server!");
+          					setverdict(fail, __SCOPE__ & ": Timeout due to no response from requested server!");
           				}
           			}	
       		      
@@ -9943,14 +9943,14 @@ module OneM2M_Testcases {
         			alt {
         				[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
         					tc_ac.stop;
-        					setverdict(pass, testcasename() & ": Resource locationPolicy is created successfully with response status code: " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode))&"!");
+        					setverdict(pass, __SCOPE__ & ": Resource locationPolicy is created successfully with response status code: " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode))&"!");
         				}
         				[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
         					tc_ac.stop;
-        					setverdict(fail, testcasename() & ": Error occurrs with response status code: " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)) & "while handling a valid locationPolicy resource create request!");
+        					setverdict(fail, __SCOPE__ & ": Error occurrs with response status code: " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)) & "while handling a valid locationPolicy resource create request!");
         				}
         				[] tc_ac.timeout {
-        					setverdict(fail, testcasename() & ": Timeout due to no response from requested server!");
+        					setverdict(fail, __SCOPE__ & ": Timeout due to no response from requested server!");
         				}
         			}	
     		      
@@ -10004,22 +10004,22 @@ module OneM2M_Testcases {
 		        [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response{
 		          tc_ac.stop;
 		          if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.notification.notificationEvent)){		            
-		            	setverdict(fail, testcasename() & "No NotificationEvent is included in the response!");
+		            	setverdict(fail, __SCOPE__ & "No NotificationEvent is included in the response!");
 		          }else{
-		            	setverdict(pass, testcasename() & "Location information is successfully sent!");		            
+		            	setverdict(pass, __SCOPE__ & "Location information is successfully sent!");		            
 		          }		          
 		          
 		        }
 		        [] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) -> value v_response{
 		          		tc_ac.stop;
-		          		setverdict(fail, testcasename() & "Requested container resource is not found!");
+		          		setverdict(fail, __SCOPE__ & "Requested container resource is not found!");
 		        }
 		        [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 						tc_ac.stop;
-						setverdict(fail, testcasename() & ": Error while retrieving resource!");
+						setverdict(fail, __SCOPE__ & ": Error while retrieving resource!");
 				}
 				[] tc_ac.timeout {
-						setverdict(fail, testcasename() & ": No answer while retrieving resource!");
+						setverdict(fail, __SCOPE__ & ": No answer while retrieving resource!");
 				}		        
 		      }
 		      
@@ -10067,22 +10067,22 @@ module OneM2M_Testcases {
 		        [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response{
 		          tc_ac.stop;
 		          if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.notification.notificationEvent)){		            
-		            	setverdict(fail, testcasename() & "No NotificationEvent is included in the response!");
+		            	setverdict(fail, __SCOPE__ & "No NotificationEvent is included in the response!");
 		          }else{
-		            	setverdict(pass, testcasename() & "Location information is successfully sent!");		            
+		            	setverdict(pass, __SCOPE__ & "Location information is successfully sent!");		            
 		          }		          
 		          
 		        }
 		        [] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) -> value v_response{
 		          		tc_ac.stop;
-		          		setverdict(fail, testcasename() & "Requested container resource is not found!");
+		          		setverdict(fail, __SCOPE__ & "Requested container resource is not found!");
 		        }
 		        [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 						tc_ac.stop;
-						setverdict(fail, testcasename() & ": Error while retrieving resource!");
+						setverdict(fail, __SCOPE__ & ": Error while retrieving resource!");
 				}
 				[] tc_ac.timeout {
-						setverdict(fail, testcasename() & ": No answer while retrieving resource!");
+						setverdict(fail, __SCOPE__ & ": No answer while retrieving resource!");
 				}		        
 		      }
 		      
@@ -10129,22 +10129,22 @@ module OneM2M_Testcases {
 		        [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response{
 		          tc_ac.stop;
 		          if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.notification.notificationEvent)){		            
-		            	setverdict(fail, testcasename() & "No NotificationEvent is included in the response!");
+		            	setverdict(fail, __SCOPE__ & "No NotificationEvent is included in the response!");
 		          }else{
-		            	setverdict(pass, testcasename() & "Location information is successfully sent!");		            
+		            	setverdict(pass, __SCOPE__ & "Location information is successfully sent!");		            
 		          }		          
 		          
 		        }
 		        [] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) -> value v_response{
 		          		tc_ac.stop;
-		          		setverdict(fail, testcasename() & "Requested container resource is not found!");
+		          		setverdict(fail, __SCOPE__ & "Requested container resource is not found!");
 		        }
 		        [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 						tc_ac.stop;
-						setverdict(fail, testcasename() & ": Error while retrieving resource!");
+						setverdict(fail, __SCOPE__ & ": Error while retrieving resource!");
 				}
 				[] tc_ac.timeout {
-						setverdict(fail, testcasename() & ": No answer while retrieving resource!");
+						setverdict(fail, __SCOPE__ & ": No answer while retrieving resource!");
 				}		        
 		      }
 		      
@@ -10205,14 +10205,14 @@ module OneM2M_Testcases {
     		      alt{
     		        [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response{
     		          tc_ac.stop;    		         
-    		          setverdict(pass, testcasename() & "Subscription resource is successfully!");
+    		          setverdict(pass, __SCOPE__ & "Subscription resource is successfully!");
     		        }
     		        [] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) -> value v_response{
     		          		tc_ac.stop;
-    		          		setverdict(fail, testcasename() & "Requested container resource is not found!");
+    		          		setverdict(fail, __SCOPE__ & "Requested container resource is not found!");
     		        }    		        
     				[] tc_ac.timeout {
-    						setverdict(fail, testcasename() & ": No answer while creating subscription resource!");
+    						setverdict(fail, __SCOPE__ & ": No answer while creating subscription resource!");
     				}		        
     		      }
     		      
@@ -10256,22 +10256,22 @@ module OneM2M_Testcases {
 		        [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response{
 		          tc_ac.stop;
 		          if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.locationPolicy.locationContainerID)){		            
-		            	setverdict(fail, testcasename() & "No locationContainerID is included in the response!");
+		            	setverdict(fail, __SCOPE__ & "No locationContainerID is included in the response!");
 		          }else{
-		            	setverdict(pass, testcasename() & "LocationPolicy resource is successfully retrieved with locationContainerID included in the response!");		            
+		            	setverdict(pass, __SCOPE__ & "LocationPolicy resource is successfully retrieved with locationContainerID included in the response!");		            
 		          }		          
 		          
 		        }
 		        [] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) -> value v_response{
 		          		tc_ac.stop;
-		          		setverdict(fail, testcasename() & "Requested locationPolicy is not found!");
+		          		setverdict(fail, __SCOPE__ & "Requested locationPolicy is not found!");
 		        }
 		        [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 						tc_ac.stop;
-						setverdict(fail, testcasename() & ": Error while retrieving resource!");
+						setverdict(fail, __SCOPE__ & ": Error while retrieving resource!");
 				}
 				[] tc_ac.timeout {
-						setverdict(fail, testcasename() & ": No answer while retrieving resource!");
+						setverdict(fail, __SCOPE__ & ": No answer while retrieving resource!");
 				}
 		        
 		      }
@@ -10336,18 +10336,18 @@ module OneM2M_Testcases {
                     alt {
                         [] mcaPort.receive(mw_response(mw_responsePrimitive(int6010))) -> value v_response {
                             tc_ac.stop;
-                            setverdict(pass, testcasename() & ": Creation failed because member ID exceed max number of member");
+                            setverdict(pass, __SCOPE__ & ": Creation failed because member ID exceed max number of member");
                         }
                         [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
                             tc_ac.stop;
-                            setverdict(fail, testcasename() & ": Error while creating resource");
+                            setverdict(fail, __SCOPE__ & ": Error while creating resource");
                         }
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error resource created while member ID exceed max number of member");
+							setverdict(fail, __SCOPE__ & ": Error resource created while member ID exceed max number of member");
 						}
                         [] tc_ac.timeout {
-                            setverdict(fail, testcasename() & ": No answer while creating resource");
+                            setverdict(fail, __SCOPE__ & ": No answer while creating resource");
                         }
                     }
                                     
@@ -10380,7 +10380,7 @@ module OneM2M_Testcases {
                 	
                 	// Test control
 					if(not(PICS_ACP_SUPPORT)) {
-						setverdict(inconc, testcasename() & ": AccessControlPolicy support is required to run this test case");
+						setverdict(inconc, __SCOPE__ & ": AccessControlPolicy support is required to run this test case");
 						stop;
 					}
                 	
@@ -10406,18 +10406,18 @@ module OneM2M_Testcases {
                 	alt {
                 		[] mcaPort.receive(mw_response(mw_responsePrimitive(int5105))) -> value v_response {
                 			tc_ac.stop;
-                			setverdict(pass, testcasename() & ": creation failed due to lack of privilege");                            
+                			setverdict(pass, __SCOPE__ & ": creation failed due to lack of privilege");                            
                 		}
                 		[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
                 			tc_ac.stop;
-                			setverdict(fail, testcasename() & ": Error while creating resource");
+                			setverdict(fail, __SCOPE__ & ": Error while creating resource");
                 		}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error creation successful while doesn't have privileges for retrieving resource");
+							setverdict(fail, __SCOPE__ & ": Error creation successful while doesn't have privileges for retrieving resource");
 						}
                 		[] tc_ac.timeout {
-                			setverdict(fail, testcasename() & ": No answer while retrieving resource");
+                			setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
                 		}
                 	}
                 					
@@ -10451,7 +10451,7 @@ module OneM2M_Testcases {
                 
 					// Test control
 					if(not(PICS_ACP_SUPPORT)) {
-						setverdict(inconc, testcasename() & ": AccessControlPolicy support is required to run this test case");
+						setverdict(inconc, __SCOPE__ & ": AccessControlPolicy support is required to run this test case");
 						stop;
 					}
                 	
@@ -10478,18 +10478,18 @@ module OneM2M_Testcases {
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int5105))) -> value v_response {
 							tc_ac.stop;
-							setverdict(pass, testcasename() & ": Update failed due to lack of privilege");                            
+							setverdict(pass, __SCOPE__ & ": Update failed due to lack of privilege");                            
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error while updating resource");
+							setverdict(fail, __SCOPE__ & ": Error while updating resource");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error update successful while doesn't have privileges for retrieving resource");
+							setverdict(fail, __SCOPE__ & ": Error update successful while doesn't have privileges for retrieving resource");
 						}
 						[] tc_ac.timeout {
-							setverdict(fail, testcasename() & ": No answer while updating resource");
+							setverdict(fail, __SCOPE__ & ": No answer while updating resource");
 						}
 					}
                 					
@@ -10536,21 +10536,21 @@ module OneM2M_Testcases {
                     alt {
                         [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
                             tc_ac.stop;
-                            setverdict(pass, testcasename() & ": Resource created successfully");
+                            setverdict(pass, __SCOPE__ & ": Resource created successfully");
 						
                             if(not match({v_memberID}, v_response.primitive.responsePrimitive.primitiveContent.group_.memberIDs)){
-								setverdict(fail, testcasename(), ": 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, testcasename() & ": Error, wrong number of memberIDs attribute");      
+							   setverdict(fail, __SCOPE__ & ": Error, wrong number of memberIDs attribute");      
 							} 
                         }
                         [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
                             tc_ac.stop;
-                            setverdict(fail, testcasename() & ": Error while creating resource");
+                            setverdict(fail, __SCOPE__ & ": Error while creating resource");
                         }
                         [] tc_ac.timeout {
-                            setverdict(fail, testcasename() & ": No answer while creating resource");
+                            setverdict(fail, __SCOPE__ & ": No answer while creating resource");
                         }
                     }
                                     
@@ -10595,22 +10595,22 @@ module OneM2M_Testcases {
                     alt {
                         [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
                             tc_ac.stop;
-                            setverdict(pass, testcasename() & ": Resource created successfully");
+                            setverdict(pass, __SCOPE__ & ": Resource created successfully");
 							if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.group_.memberTypeValidated)){
-                                setverdict(fail, testcasename(), ": 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, testcasename(), ": Error, memberTypeValidated attribute not correct");
+                                    setverdict(fail, __SCOPE__, ": Error, memberTypeValidated attribute not correct");
                                 }
                             }     
                         }
                         [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
                             tc_ac.stop;
-                            setverdict(fail, testcasename() & ": Error while creating resource");
+                            setverdict(fail, __SCOPE__ & ": Error while creating resource");
                         }
                         [] tc_ac.timeout {
-                            setverdict(fail, testcasename() & ": No answer while creating resource" );
+                            setverdict(fail, __SCOPE__ & ": No answer while creating resource" );
                         }
                     }
                                     
@@ -10656,33 +10656,33 @@ module OneM2M_Testcases {
                     alt {
                         [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
                             tc_ac.stop;
-                            setverdict(pass, testcasename() & ": Resource created successfully");
+                            setverdict(pass, __SCOPE__ & ": Resource created successfully");
 							
                             // check for memberTypeValidated
                             if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.group_.memberTypeValidated)){
-                                setverdict(fail, testcasename(), ": 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, testcasename(), ": 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, testcasename(), ": 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, testcasename(), ": Error, memberType attribute not correct");
+                                    setverdict(fail, __SCOPE__, ": Error, memberType attribute not correct");
                                 }
                             }
                         }
                         [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
                             tc_ac.stop;
-                            setverdict(fail, testcasename() & ": Error while creating resource");
+                            setverdict(fail, __SCOPE__ & ": Error while creating resource");
                         }
                         [] tc_ac.timeout {
-                            setverdict(fail, testcasename() & ": No answer while creating resource");
+                            setverdict(fail, __SCOPE__ & ": No answer while creating resource");
                         }
                     }
                                     
@@ -10731,18 +10731,18 @@ module OneM2M_Testcases {
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int6011))) -> value v_response {
 							tc_ac.stop;
-							setverdict(pass, testcasename() & ": unsuccessful validation of the resource type during the creation of the group");
+							setverdict(pass, __SCOPE__ & ": unsuccessful validation of the resource type during the creation of the group");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error create succesfull while the operation should be aborted");
+							setverdict(fail, __SCOPE__ & ": Error create succesfull while the operation should be aborted");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error while creating resource");
+							setverdict(fail, __SCOPE__ & ": Error while creating resource");
 						}
 						[] tc_ac.timeout {
-							setverdict(fail, testcasename() & ": No answer while creating resource");
+							setverdict(fail, __SCOPE__ & ": No answer while creating resource");
 						}
 					}
                     
@@ -10792,32 +10792,32 @@ module OneM2M_Testcases {
                     alt {
                         [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
                             tc_ac.stop;
-                            setverdict(pass, testcasename() & ": Resource created successfully");
+                            setverdict(pass, __SCOPE__ & ": Resource created successfully");
 							
 							// check for memberTypeValidated
                             if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.group_.memberTypeValidated)){
-                                setverdict(fail, testcasename(), ": 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, testcasename(), ": 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, testcasename(), ": 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, testcasename(), ": Error, memberIDs attribute not correct");
+                                    setverdict(fail, __SCOPE__, ": Error, memberIDs attribute not correct");
                                 }
                             }
                         }
                         [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
                             tc_ac.stop;
-                            setverdict(fail, testcasename() & ": Error while creating resource");
+                            setverdict(fail, __SCOPE__ & ": Error while creating resource");
                         }
                         [] tc_ac.timeout {
-                            setverdict(fail, testcasename() & ": No answer while creating resource");
+                            setverdict(fail, __SCOPE__ & ": No answer while creating resource");
                         }
                     }
                                     
@@ -10872,31 +10872,31 @@ module OneM2M_Testcases {
 					alt {
 						 [] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
 							 tc_ac.stop;
-							 setverdict(pass, testcasename() & ": update successful"); 
+							 setverdict(pass, __SCOPE__ & ": update successful"); 
      
 							// check for membersId
 							if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.group_.memberIDs)){
-								setverdict(fail, testcasename(), ": 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, testcasename() & ": Error, wrong number of memberIDs attribute");      
+								   setverdict(fail, __SCOPE__ & ": Error, wrong number of memberIDs attribute");      
 								}                               
 								if(v_response.primitive.responsePrimitive.primitiveContent.group_.memberIDs[0] != v_memberId_2){
-									setverdict(fail, testcasename(), ": Error, memberIDs attribute not correct");
+									setverdict(fail, __SCOPE__, ": Error, memberIDs attribute not correct");
 								}
 							}
 						 }
 						 [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error update successful with wrong ResponseStatusCode");
+							setverdict(fail, __SCOPE__ & ": Error update successful with wrong ResponseStatusCode");
 						 }
 						 [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 							 tc_ac.stop;
-							 setverdict(fail, testcasename() & ": Error while updating resource");
+							 setverdict(fail, __SCOPE__ & ": Error while updating resource");
 						 }
 						 [] tc_ac.timeout {
-							 setverdict(fail, testcasename() & ": No answer while updating resource");
+							 setverdict(fail, __SCOPE__ & ": No answer while updating resource");
 						 }
 					 }
                     
@@ -10945,27 +10945,27 @@ module OneM2M_Testcases {
                     alt {
                         [] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
                             tc_ac.stop;
-                            setverdict(pass, testcasename() & ": update successful"); 
+                            setverdict(pass, __SCOPE__ & ": update successful"); 
                              
                              if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.group_.memberTypeValidated)) {
-                                setverdict(fail, testcasename(), ": 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, testcasename(), ": Error, memberTypeValidated wrong value");  
+                                    setverdict(fail, __SCOPE__, ": Error, memberTypeValidated wrong value");  
                                 }
                              }
                         }
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
 						   tc_ac.stop;
-						   setverdict(fail, testcasename() & ": Error update successful with wrong ResponseStatusCode");
+						   setverdict(fail, __SCOPE__ & ": Error update successful with wrong ResponseStatusCode");
 						}
                         [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
                             tc_ac.stop;
-                            setverdict(fail, testcasename() & ": Error while updating resource");
+                            setverdict(fail, __SCOPE__ & ": Error while updating resource");
                         }
                         [] tc_ac.timeout {
-                            setverdict(fail, testcasename() & ": No answer while updating resource");
+                            setverdict(fail, __SCOPE__ & ": No answer while updating resource");
                         }
                      }
         
@@ -11018,39 +11018,39 @@ module OneM2M_Testcases {
                     alt {
                         [] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
                   			tc_ac.stop;
-							setverdict(pass, testcasename() & ": update successful");                              
+							setverdict(pass, __SCOPE__ & ": update successful");                              
                              
 							//memberTypeValidated attribute set to FALSE
 							if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.group_.memberTypeValidated)) {
-                            	setverdict(fail, testcasename(), ": 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, testcasename(), ": Error, memberTypeValidated must be FALSE");
+									setverdict(fail, __SCOPE__, ": Error, memberTypeValidated must be FALSE");
 								}
 							}
                                 
 							//memberType attribute set to MIXED
 							if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.group_.memberType)) {
-								setverdict(fail, testcasename(), ": 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, testcasename(), ": Error, memberType was not set to MIXED");
+									setverdict(fail, __SCOPE__, ": Error, memberType was not set to MIXED");
 								}
 							}
                                 
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
 						   tc_ac.stop;
-						   setverdict(fail, testcasename() & ": Error update successful with wrong ResponseStatusCode");
+						   setverdict(fail, __SCOPE__ & ": Error update successful with wrong ResponseStatusCode");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error while retrieving resource");
+							setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
 						}
 						[] tc_ac.timeout {
-							setverdict(fail, testcasename() & ": No answer while retrieving resource");
+							setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
 						}
 					}
         
@@ -11104,41 +11104,41 @@ module OneM2M_Testcases {
                     alt {
                     	[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
                       		tc_ac.stop;
-                            setverdict(pass, testcasename() & ": update successful"); 
+                            setverdict(pass, __SCOPE__ & ": update successful"); 
                                                           
 							//memberTypeValidated attribute set to TRUE
 							if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.group_.memberTypeValidated)) {
-								setverdict(fail, testcasename(), ": 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, testcasename(), ": 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, testcasename(), ": 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, testcasename() & ": Error, wrong number of memberIDs attribute");      
+								   setverdict(fail, __SCOPE__ & ": Error, wrong number of memberIDs attribute");      
 								}                               
 								if(v_response.primitive.responsePrimitive.primitiveContent.group_.memberIDs[0] != v_memberId_1){
-									setverdict(fail, testcasename(), ": Error, memberIDs attribute not correct");
+									setverdict(fail, __SCOPE__, ": Error, memberIDs attribute not correct");
 								}
 							}                                   
                         }
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
 						   tc_ac.stop;
-						   setverdict(fail, testcasename() & ": Error update successful with wrong ResponseStatusCode");
+						   setverdict(fail, __SCOPE__ & ": Error update successful with wrong ResponseStatusCode");
 						}
                         [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
                             tc_ac.stop;
-                            setverdict(fail, testcasename() & ": Error while updating resource");
+                            setverdict(fail, __SCOPE__ & ": Error while updating resource");
                         }
                         [] tc_ac.timeout {
-                            setverdict(fail, testcasename() & ": No answer while updating resource");
+                            setverdict(fail, __SCOPE__ & ": No answer while updating resource");
                         }
                      }
         
@@ -11191,18 +11191,18 @@ module OneM2M_Testcases {
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int6011))) -> value v_response {
 							tc_ac.stop;
-							setverdict(pass, testcasename() & ": unsuccessful validation of the resource type during the creation of the group");
+							setverdict(pass, __SCOPE__ & ": unsuccessful validation of the resource type during the creation of the group");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error create succesfull while the operation should be aborted");
+							setverdict(fail, __SCOPE__ & ": Error create succesfull while the operation should be aborted");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error while creating resource");
+							setverdict(fail, __SCOPE__ & ": Error while creating resource");
 						}
 						[] tc_ac.timeout {
-							setverdict(fail, testcasename() & ": No answer while creating resource");
+							setverdict(fail, __SCOPE__ & ": No answer while creating resource");
 						}
 					}
         
@@ -11266,18 +11266,18 @@ module OneM2M_Testcases {
                     alt {
                         [] mcaPort.receive(mw_response(mw_responsePrimitive(int6010))) -> value v_response {
                             tc_ac.stop;
-                            setverdict(pass, testcasename() & ": operation is not allowed");                             
+                            setverdict(pass, __SCOPE__ & ": operation is not allowed");                             
                         }
                         [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
                         	tc_ac.stop;
-                            setverdict(fail, testcasename() & ": Error while retrieving resource");
+                            setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
                         }
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error update successful while maxNrOfMembers has exceeded");
+							setverdict(fail, __SCOPE__ & ": Error update successful while maxNrOfMembers has exceeded");
 						}
                         [] tc_ac.timeout {
-                            setverdict(fail, testcasename() & ": No answer while retrieving resource");
+                            setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
                         }
                      }
         
@@ -11330,18 +11330,18 @@ module OneM2M_Testcases {
                     alt {
                         [] mcaPort.receive(mw_response(mw_responsePrimitive(int6010))) -> value v_response {
                             tc_ac.stop;
-                            setverdict(pass, testcasename() & ": max number of member exceeded");                             
+                            setverdict(pass, __SCOPE__ & ": max number of member exceeded");                             
                         }
                          [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
                              tc_ac.stop;
-                             setverdict(fail, testcasename() & ": Error while updating resource");
+                             setverdict(fail, __SCOPE__ & ": Error while updating resource");
                          }
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
 							 tc_ac.stop;
-							 setverdict(fail, testcasename() & ": Error update successful while operation is not allowed");
+							 setverdict(fail, __SCOPE__ & ": Error update successful while operation is not allowed");
 						 }
                          [] tc_ac.timeout {
-                             setverdict(fail, testcasename() & ": No answer while updating resource");
+                             setverdict(fail, __SCOPE__ & ": No answer while updating resource");
                          }
                      }
         
@@ -11420,29 +11420,29 @@ module OneM2M_Testcases {
                             tc_ac.stop;
                             
                             if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.group_.memberTypeValidated)) {
-                                setverdict(fail, testcasename(), ": 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) {
-                                        setverdict(fail, testcasename() & ": Error, wrong number of memberIDs attribute"); 
+                                        setverdict(fail, __SCOPE__ & ": Error, wrong number of memberIDs attribute"); 
                                     } else {
                                         if(v_response.primitive.responsePrimitive.primitiveContent.group_.memberIDs[0] == c_memberResourceAddress1 and v_response.primitive.responsePrimitive.primitiveContent.group_.memberIDs[1] == c_memberResourceAddress2) {
-                                            setverdict(pass, testcasename() & ": update successful");       
+                                            setverdict(pass, __SCOPE__ & ": update successful");       
                                         } else {
-                                            setverdict(fail, testcasename(), ": Error, wrong memberIDs");   
+                                            setverdict(fail, __SCOPE__, ": Error, wrong memberIDs");   
                                         }
                                     }
                                 } else {
-                                    setverdict(fail, testcasename(), ": Error, memberTypeValidated must be set to FALSE");  
+                                    setverdict(fail, __SCOPE__, ": Error, memberTypeValidated must be set to FALSE");  
                                 }   
                             }                            
                         }
                          [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
                              tc_ac.stop;
-                             setverdict(fail, testcasename() & ": Error while retrieving resource");
+                             setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
                          }
                          [] tc_ac.timeout {
-                             setverdict(fail, testcasename() & ": No answer while retrieving resource");
+                             setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
                          }
                      }
         
@@ -11529,10 +11529,10 @@ module OneM2M_Testcases {
                         }
                          [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
                              tc_ac.stop;
-                             setverdict(fail, testcasename() & ": Error while retrieving resource");
+                             setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
                          }
                          [] tc_ac.timeout {
-                             setverdict(fail, testcasename() & ": No answer while retrieving resource");
+                             setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
                          }
                      }
         
@@ -11585,7 +11585,7 @@ module OneM2M_Testcases {
 					
 					// Test control
 					if(not(PICS_ACP_SUPPORT)) {
-						setverdict(inconc, testcasename() & ": AccessControlPolicy support is required to run this test case");
+						setverdict(inconc, __SCOPE__ & ": AccessControlPolicy support is required to run this test case");
 						stop;
 					}
 
@@ -11613,25 +11613,25 @@ module OneM2M_Testcases {
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 							tc_ac.stop;
-							setverdict(pass, testcasename() & ": creation successfull by using fanOutPoint in group resource");
+							setverdict(pass, __SCOPE__ & ": creation successfull by using fanOutPoint in group resource");
     
 							if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list)){
-								setverdict(fail, testcasename(), ": 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, testcasename(), ": Error, one responsePrimitve of aggregatedResponse_list is not successful");
+										setverdict(fail, __SCOPE__, ": Error, one responsePrimitve of aggregatedResponse_list is not successful");
 									}
 								}
 							}                       
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error while creating resource");
+							setverdict(fail, __SCOPE__ & ": Error while creating resource");
 						}
 						[] tc_ac.timeout {
-							setverdict(fail, testcasename() & ": No answer while creating resource");
+							setverdict(fail, __SCOPE__ & ": No answer while creating resource");
 						}
 					}
 
@@ -11684,7 +11684,7 @@ module OneM2M_Testcases {
 
 					// Test control
 					if(not(PICS_ACP_SUPPORT)) {
-						setverdict(inconc, testcasename() & ": AccessControlPolicy support is required to run this test case");
+						setverdict(inconc, __SCOPE__ & ": AccessControlPolicy support is required to run this test case");
 						stop;
 					}
 
@@ -11712,22 +11712,22 @@ module OneM2M_Testcases {
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response {
 							tc_ac.stop;
-							setverdict(pass, testcasename() & ": Update failed due to lack of privilege");
+							setverdict(pass, __SCOPE__ & ": Update failed due to lack of privilege");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error while operation");
+							setverdict(fail, __SCOPE__ & ": Error while operation");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error operation successful while doesn't have privileges");
+							setverdict(fail, __SCOPE__ & ": Error operation successful while doesn't have privileges");
 						}
 						[] mcaPort.receive{
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error, unexpected message received");
+							setverdict(fail, __SCOPE__ & ": Error, unexpected message received");
 						}
 						[] tc_ac.timeout {
-							setverdict(fail, testcasename() & ": No answer while executing operation");
+							setverdict(fail, __SCOPE__ & ": No answer while executing operation");
 						}
 					}
         
@@ -11781,7 +11781,7 @@ module OneM2M_Testcases {
 		
 					// Test control
 					if(not(PICS_ACP_SUPPORT)) {
-						setverdict(inconc, testcasename() & ": AccessControlPolicy support is required to run this test case");
+						setverdict(inconc, __SCOPE__ & ": AccessControlPolicy support is required to run this test case");
 						stop;
 					}
 
@@ -11809,25 +11809,25 @@ module OneM2M_Testcases {
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 							tc_ac.stop;
-							setverdict(pass, testcasename() & ": creation successfull by using fanOutPoint in group resource");
+							setverdict(pass, __SCOPE__ & ": creation successfull by using fanOutPoint in group resource");
                 
 							if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list)){
-								setverdict(fail, testcasename(), ": 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, testcasename(), ": Error, one responsePrimitve of aggregatedResponse_list is not successful");
+										setverdict(fail, __SCOPE__, ": Error, one responsePrimitve of aggregatedResponse_list is not successful");
 									}
 								}
 							}                       
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error while creating resource");
+							setverdict(fail, __SCOPE__ & ": Error while creating resource");
 						}
 						[] tc_ac.timeout {
-							setverdict(fail, testcasename() & ": No answer while creating resource");
+							setverdict(fail, __SCOPE__ & ": No answer while creating resource");
 						}
 					}
 		
@@ -11880,7 +11880,7 @@ module OneM2M_Testcases {
 
 					// Test control
 					if(not(PICS_ACP_SUPPORT)) {
-						setverdict(inconc, testcasename() & ": AccessControlPolicy support is required to run this test case");
+						setverdict(inconc, __SCOPE__ & ": AccessControlPolicy support is required to run this test case");
 						stop;
 					}
 
@@ -11908,22 +11908,22 @@ module OneM2M_Testcases {
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response {
 							tc_ac.stop;
-							setverdict(pass, testcasename() & ": Update failed due to lack of privilege");
+							setverdict(pass, __SCOPE__ & ": Update failed due to lack of privilege");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error while operation");
+							setverdict(fail, __SCOPE__ & ": Error while operation");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error operation successful while doesn't have privileges");
+							setverdict(fail, __SCOPE__ & ": Error operation successful while doesn't have privileges");
 						}
 						[] mcaPort.receive{
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error, unexpected message received");
+							setverdict(fail, __SCOPE__ & ": Error, unexpected message received");
 						}
 						[] tc_ac.timeout {
-							setverdict(fail, testcasename() & ": No answer while executing operation");
+							setverdict(fail, __SCOPE__ & ": No answer while executing operation");
 						}
 					}
 
@@ -12013,19 +12013,19 @@ module OneM2M_Testcases {
 				  	alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 							tc_ac.stop;
-							setverdict(pass, testcasename() & ": creation successfull by using fanOutPoint in group resource");
+							setverdict(pass, __SCOPE__ & ": creation successfull by using fanOutPoint in group resource");
                             
 							if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list)){
-								setverdict(fail, testcasename(), ": 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, testcasename(), ": 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, testcasename(), ": Error, aggregatedResponse doesn't match with template expected");
+        									setverdict(fail, __SCOPE__, ": Error, aggregatedResponse doesn't match with template expected");
         								}
         							}
 								}
@@ -12033,10 +12033,10 @@ module OneM2M_Testcases {
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error while creating resource");
+							setverdict(fail, __SCOPE__ & ": Error while creating resource");
 						}
 						[] tc_ac.timeout {
-							setverdict(fail, testcasename() & ": No answer while creating resource");
+							setverdict(fail, __SCOPE__ & ": No answer while creating resource");
 						}
 					}
 					
@@ -12053,15 +12053,15 @@ module OneM2M_Testcases {
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 							tc_ac.stop;
-							setverdict(pass, testcasename() & ": creation successfull by using fanOutPoint in group resource");
+							setverdict(pass, __SCOPE__ & ": creation successfull by using fanOutPoint in group resource");
               
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error while creating resource");
+							setverdict(fail, __SCOPE__ & ": Error while creating resource");
 						}
 						[] tc_ac.timeout {
-							setverdict(fail, testcasename() & ": No answer while creating resource");
+							setverdict(fail, __SCOPE__ & ": No answer while creating resource");
 						}
 					}
 
@@ -12099,7 +12099,7 @@ module OneM2M_Testcases {
 					
 					// Test control
 					if(not(PICS_ACP_SUPPORT)) {
-						setverdict(inconc, testcasename() & ": AccessControlPolicy support is required to run this test case");
+						setverdict(inconc, __SCOPE__ & ": AccessControlPolicy support is required to run this test case");
 						stop;
 					}
 
@@ -12128,19 +12128,19 @@ module OneM2M_Testcases {
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 							tc_ac.stop;
-							setverdict(pass, testcasename() & ": creation successfull by using fanOutPoint in group resource");
+							setverdict(pass, __SCOPE__ & ": creation successfull by using fanOutPoint in group resource");
                 
 							if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list)){
-								setverdict(fail, testcasename(), ": 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, testcasename(), ": 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, testcasename(), ": Error, aggregatedResponse doesn't match with template expected");
+											setverdict(fail, __SCOPE__, ": Error, aggregatedResponse doesn't match with template expected");
 										}
 									}
 								}
@@ -12148,10 +12148,10 @@ module OneM2M_Testcases {
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error while creating resource");
+							setverdict(fail, __SCOPE__ & ": Error while creating resource");
 						}
 						[] tc_ac.timeout {
-							setverdict(fail, testcasename() & ": No answer while creating resource");
+							setverdict(fail, __SCOPE__ & ": No answer while creating resource");
 						}
 					}
 		
@@ -12189,7 +12189,7 @@ module OneM2M_Testcases {
 		
 					// Test control
 					if(not(PICS_ACP_SUPPORT)) {
-						setverdict(inconc, testcasename() & ": AccessControlPolicy support is required to run this test case");
+						setverdict(inconc, __SCOPE__ & ": AccessControlPolicy support is required to run this test case");
 						stop;
 					}
 
@@ -12218,19 +12218,19 @@ module OneM2M_Testcases {
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 							tc_ac.stop;
-							setverdict(pass, testcasename() & ": creation successfull by using fanOutPoint in group resource");
+							setverdict(pass, __SCOPE__ & ": creation successfull by using fanOutPoint in group resource");
     
 							if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list)){
-								setverdict(fail, testcasename(), ": 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, testcasename(), ": 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, testcasename(), ": Error, aggregatedResponse doesn't match with template expected");
+											setverdict(fail, __SCOPE__, ": Error, aggregatedResponse doesn't match with template expected");
 										}
 									}
 								}
@@ -12238,10 +12238,10 @@ module OneM2M_Testcases {
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error while creating resource");
+							setverdict(fail, __SCOPE__ & ": Error while creating resource");
 						}
 						[] tc_ac.timeout {
-							setverdict(fail, testcasename() & ": No answer while creating resource");
+							setverdict(fail, __SCOPE__ & ": No answer while creating resource");
 						}
 					}
 
@@ -12291,18 +12291,18 @@ module OneM2M_Testcases {
 					alt {
 						[] mcaPort.receive(mw_response(mw_responseDiscovery)){
 							tc_ac.stop;
-							setverdict(pass, testcasename() & ": URI List Representation available");
+							setverdict(pass, __SCOPE__ & ": URI List Representation available");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) { 
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Wrong responseStatusCode while retrieving resource");
+							setverdict(fail, __SCOPE__ & ": Wrong responseStatusCode while retrieving resource");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) { 
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error while retrieving resource");
+							setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
 						}
 						[] tc_ac.timeout {
-							setverdict(fail, testcasename() & ": No answer while retrieving resource");
+							setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
 						}
 					 }	
     								
@@ -12350,23 +12350,23 @@ module OneM2M_Testcases {
 						[] mcaPort.receive(mw_response(mw_responseDiscovery)) -> value v_response {
 							tc_ac.stop;
 							if(sizeof(v_response.primitive.responsePrimitive.primitiveContent.uRIList) == 0){
-							  setverdict(pass, testcasename() & ": No Content is present");	
+							  setverdict(pass, __SCOPE__ & ": No Content is present");	
 							}
 							else
 							{
-							  setverdict(fail, testcasename() & ": Wrong content available in URIList element");
+							  setverdict(fail, __SCOPE__ & ": Wrong content available in URIList element");
 							}
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) { 
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Wrong responseStatusCode while retrieving resource");
+							setverdict(fail, __SCOPE__ & ": Wrong responseStatusCode while retrieving resource");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) { 
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error while retrieving resource");
+							setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
 						}
 						[] tc_ac.timeout {
-							setverdict(fail, testcasename() & ": No answer while retrieving resource");
+							setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
 						}
 					 }	
 								
@@ -12412,21 +12412,21 @@ module OneM2M_Testcases {
 						[] mcaPort.receive(mw_response(mw_responseDiscovery)) -> value v_response {
 							tc_ac.stop;
 							if (f_isNonHierarchical(v_response.primitive.responsePrimitive.primitiveContent.uRIList[0])) {
-							  setverdict(pass, testcasename() & ": Non-hierarchical address form present in URIList element");
+							  setverdict(pass, __SCOPE__ & ": Non-hierarchical address form present in URIList element");
 							} else {
-							  setverdict(fail, testcasename() & ": Non-hierarchical address form absent in URIList representation"); 
+							  setverdict(fail, __SCOPE__ & ": Non-hierarchical address form absent in URIList representation"); 
 							}
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) { 
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Wrong responseStatusCode while retrieving resource");
+							setverdict(fail, __SCOPE__ & ": Wrong responseStatusCode while retrieving resource");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) { 
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error while retrieving resource");
+							setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
 						}
 						[] tc_ac.timeout {
-							setverdict(fail, testcasename() & ": No answer while retrieving resource");
+							setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
 						}
 					 }	
     								
@@ -12456,7 +12456,7 @@ module OneM2M_Testcases {
 					
 					// Test control
 					if(not(PICS_ACP_SUPPORT)) {
-						log(testcasename() & ":AccessControlPolicy support is required for executing this test case");
+						log(__SCOPE__ & ":INFO: AccessControlPolicy support is required for executing this test case");
 						stop;
 					}
 
@@ -12478,18 +12478,18 @@ module OneM2M_Testcases {
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) {
 							tc_ac.stop;
-							setverdict(pass, testcasename() & ": Access denied to discovery operation for resource " & f_getResourceAddress(v_resourceIndex));
+							setverdict(pass, __SCOPE__ & ": Access denied to discovery operation for resource " & f_getResourceAddress(v_resourceIndex));
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Wrong response status code while discovering " & f_getResourceAddress(v_resourceIndex) & " without having privileges");
+							setverdict(fail, __SCOPE__ & ": Wrong response status code while discovering " & f_getResourceAddress(v_resourceIndex) & " without having privileges");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Discovering " & f_getResourceAddress(v_resourceIndex) & " without having privileges");
+							setverdict(fail, __SCOPE__ & ": Discovering " & f_getResourceAddress(v_resourceIndex) & " without having privileges");
 						}
 						[] tc_ac.timeout {
-							setverdict(fail, testcasename() & ": No answer while discovering resource");
+							setverdict(fail, __SCOPE__ & ": No answer while discovering resource");
 						}
 					 }	
     								
@@ -12540,18 +12540,18 @@ module OneM2M_Testcases {
 						
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) -> value v_response {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": Resource not found");
+								setverdict(pass, __SCOPE__ & ": Resource not found");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) { 
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Wrong response status code while retrieving resource");
+								setverdict(fail, __SCOPE__ & ": Wrong response status code while retrieving resource");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) { 
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Wrong response while retrieving resource");
+								setverdict(fail, __SCOPE__ & ": Wrong response while retrieving resource");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while retrieving resource");
+								setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
 							}
 						 }	
     								
@@ -12600,18 +12600,18 @@ module OneM2M_Testcases {
 						
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4102))) -> value v_response {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": Contents Unacceptable");
+								setverdict(pass, __SCOPE__ & ": Contents Unacceptable");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) { 
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Wrong response status code while retrieving resource");
+								setverdict(fail, __SCOPE__ & ": Wrong response status code while retrieving resource");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) { 
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Wrong response while retrieving resource");
+								setverdict(fail, __SCOPE__ & ": Wrong response while retrieving resource");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while retrieving resource");
+								setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
 							}
 						 }	
     								
@@ -12665,18 +12665,18 @@ module OneM2M_Testcases {
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int5203))) -> value v_response {
 							tc_ac.stop;
-							setverdict(pass, testcasename() & ": <Subscription> Resource not subscribable");
+							setverdict(pass, __SCOPE__ & ": <Subscription> Resource not subscribable");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error while subscribing a ressource");
+							setverdict(fail, __SCOPE__ & ": Error while subscribing a ressource");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Subsciption successful whereas <Subscription> resource is not subscribable");
+							setverdict(fail, __SCOPE__ & ": Subsciption successful whereas <Subscription> resource is not subscribable");
 						}
 						[] tc_ac.timeout {
-							setverdict(fail, testcasename() & ": No answer while creating resource");
+							setverdict(fail, __SCOPE__ & ": No answer while creating resource");
 						}
 					}	
 
@@ -12720,18 +12720,18 @@ module OneM2M_Testcases {
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int5203))) -> value v_response {
 							tc_ac.stop;
-							setverdict(pass, testcasename() & ": <Subscription> Resource not subscribable");
+							setverdict(pass, __SCOPE__ & ": <Subscription> Resource not subscribable");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error while subscribing a ressource");
+							setverdict(fail, __SCOPE__ & ": Error while subscribing a ressource");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Subsciption successful whereas <Subscription> resource is not subscribable");
+							setverdict(fail, __SCOPE__ & ": Subsciption successful whereas <Subscription> resource is not subscribable");
 						}
 						[] tc_ac.timeout {
-							setverdict(fail, testcasename() & ": No answer while creating resource");
+							setverdict(fail, __SCOPE__ & ": No answer while creating resource");
 						}
 					}
 
@@ -12761,7 +12761,7 @@ module OneM2M_Testcases {
 						
 					// Test control
 					if(not(PICS_ACP_SUPPORT)) {
-						setverdict(inconc, testcasename() & ": AccessControlPolicy support is required to run this test case");
+						setverdict(inconc, __SCOPE__ & ": AccessControlPolicy support is required to run this test case");
 						stop;
 					}
 
@@ -12783,18 +12783,18 @@ module OneM2M_Testcases {
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response {
 							tc_ac.stop;
-							setverdict(pass, testcasename() & ": No privilege for subscribing to the resource");
+							setverdict(pass, __SCOPE__ & ": No privilege for subscribing to the resource");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error while subscribing a ressource");
+							setverdict(fail, __SCOPE__ & ": Error while subscribing a ressource");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Subsciption successful whereas it doesn't have privilege");
+							setverdict(fail, __SCOPE__ & ": Subsciption successful whereas it doesn't have privilege");
 						}
 						[] tc_ac.timeout {
-							setverdict(fail, testcasename() & ": No answer while creating resource");
+							setverdict(fail, __SCOPE__ & ": No answer while creating resource");
 						}
 					}
 			
@@ -12840,18 +12840,18 @@ module OneM2M_Testcases {
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int5204))) -> value v_response { //SUBSCRIPTION_VERIFICATION_INITIATION_FAILED
 							tc_ac.stop;
-							setverdict(pass, testcasename() & ": OK : Subscription verification initiation failed");
+							setverdict(pass, __SCOPE__ & ": OK : Subscription verification initiation failed");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error while subscribing a ressource");
+							setverdict(fail, __SCOPE__ & ": Error while subscribing a ressource");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Subsciption successful whereas subsciption verification failed");
+							setverdict(fail, __SCOPE__ & ": Subsciption successful whereas subsciption verification failed");
 						}
 						[] tc_ac.timeout {
-							setverdict(fail, testcasename() & ": No answer while creating resource");
+							setverdict(fail, __SCOPE__ & ": No answer while creating resource");
 						}
 					}
 
@@ -12901,18 +12901,18 @@ module OneM2M_Testcases {
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int4101))) -> value v_response { //SUBSCRIPTION_CREATOR_HAS_NO_PRIVILEGE 
 							tc_ac.stop;
-							setverdict(pass, testcasename() & ": OK : Subscription creator has no privilege");
+							setverdict(pass, __SCOPE__ & ": OK : Subscription creator has no privilege");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error while subscribing a ressource");
+							setverdict(fail, __SCOPE__ & ": Error while subscribing a ressource");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Subsciption successful whereas subsciption creator has no privilege");
+							setverdict(fail, __SCOPE__ & ": Subsciption successful whereas subsciption creator has no privilege");
 						}
 						[] tc_ac.timeout {
-							setverdict(fail, testcasename() & ": No answer while creating resource");
+							setverdict(fail, __SCOPE__ & ": No answer while creating resource");
 						}
 					}
 
@@ -12962,18 +12962,18 @@ module OneM2M_Testcases {
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int5205))) -> value v_response { //SUBSCRIPTION_CREATOR_HAS_NO_PRIVILEGE 
 							tc_ac.stop;
-							setverdict(pass, testcasename() & ": OK : Subscription creator has no privilege");
+							setverdict(pass, __SCOPE__ & ": OK : Subscription creator has no privilege");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error while subscribing a ressource");
+							setverdict(fail, __SCOPE__ & ": Error while subscribing a ressource");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Subsciption successful whereas subsciption creator has no privilege");
+							setverdict(fail, __SCOPE__ & ": Subsciption successful whereas subsciption creator has no privilege");
 						}
 						[] tc_ac.timeout {
-							setverdict(fail, testcasename() & ": No answer while creating resource");
+							setverdict(fail, __SCOPE__ & ": No answer while creating resource");
 						}
 					}
 
@@ -13037,18 +13037,18 @@ module OneM2M_Testcases {
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 							tc_ac.stop;
-							setverdict(pass, testcasename() & ": Attribute of resource type int2 (Ae) updated successfully");
+							setverdict(pass, __SCOPE__ & ": Attribute of resource type int2 (Ae) updated successfully");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error while updating resource type int2 (Ae)");
+							setverdict(fail, __SCOPE__ & ": Error while updating resource type int2 (Ae)");
 						}
 						[] mcaPort.receive{
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error, unexpected message received");
+							setverdict(fail, __SCOPE__ & ": Error, unexpected message received");
 						}
 						[] tc_ac.timeout {
-							setverdict(fail, testcasename() & ": No answer while updating resource type int2 (Ae)");
+							setverdict(fail, __SCOPE__ & ": No answer while updating resource type int2 (Ae)");
 						}
 					};
 					
@@ -13112,18 +13112,18 @@ module OneM2M_Testcases {
     				alt {
     					[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
     						tc_ac.stop;
-    						setverdict(pass, testcasename() & ": Resource type int3 (Container) created successfully");
+    						setverdict(pass, __SCOPE__ & ": Resource type int3 (Container) created successfully");
     					}
     					[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
     						tc_ac.stop;
-    						setverdict(fail, testcasename() & ": Error while creating resource type int3 (Container)");
+    						setverdict(fail, __SCOPE__ & ": Error while creating resource type int3 (Container)");
     					}
     					[] mcaPort.receive{
     						tc_ac.stop;
-    						setverdict(fail, testcasename() & ": Error, unexpected message received");
+    						setverdict(fail, __SCOPE__ & ": Error, unexpected message received");
     					}
     					[] tc_ac.timeout {
-    						setverdict(fail, testcasename() & ": No answer while creating resource type int3 (Container)");
+    						setverdict(fail, __SCOPE__ & ": No answer while creating resource type int3 (Container)");
     					}
     				}
     				
@@ -13187,18 +13187,18 @@ module OneM2M_Testcases {
 							tc_ac.stop;
 							//Update vc_resourcesIndexToBeDeleted 
 							f_removeElementFromList (vc_resourcesIndexToBeDeleted, v_aeIndex);
-							setverdict(pass, testcasename() & ": resource type int2 (AE) deleted successfully");
+							setverdict(pass, __SCOPE__ & ": resource type int2 (AE) deleted successfully");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error while deleting resource type int2 (AE)");
+							setverdict(fail, __SCOPE__ & ": Error while deleting resource type int2 (AE)");
 						}
 						[] mcaPort.receive{
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error, unexpected message received");
+							setverdict(fail, __SCOPE__ & ": Error, unexpected message received");
 						}
 						[] tc_ac.timeout {
-							setverdict(fail, testcasename() & ": No answer while deleting resource type int2 (AE)");
+							setverdict(fail, __SCOPE__ & ": No answer while deleting resource type int2 (AE)");
 						}
 					}
 					
@@ -13262,18 +13262,18 @@ module OneM2M_Testcases {
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 							tc_ac.stop;
-							setverdict(pass, testcasename() & ": Container resource deleted successfully");
+							setverdict(pass, __SCOPE__ & ": Container resource deleted successfully");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error while deleting resource type int3 (Container)");
+							setverdict(fail, __SCOPE__ & ": Error while deleting resource type int3 (Container)");
 						}
 						[] mcaPort.receive{
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error, unexpected message received");
+							setverdict(fail, __SCOPE__ & ": Error, unexpected message received");
 						}
 						[] tc_ac.timeout {
-							setverdict(fail, testcasename() & ": No answer while deleting resource type int3 (Container)");
+							setverdict(fail, __SCOPE__ & ": No answer while deleting resource type int3 (Container)");
 						}
 					}	
 
@@ -13386,19 +13386,19 @@ module OneM2M_Testcases {
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 							tc_ac.stop;
-							setverdict(pass, testcasename() & ": Attribute of resource type int2 (Ae) updated successfully");
+							setverdict(pass, __SCOPE__ & ": Attribute of resource type int2 (Ae) updated successfully");
 						}
 						
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error while updating resource type int2 (Ae)");
+							setverdict(fail, __SCOPE__ & ": Error while updating resource type int2 (Ae)");
 						}
 						[] mcaPort.receive{
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error, unexpected message received");
+							setverdict(fail, __SCOPE__ & ": Error, unexpected message received");
 						}
 						[] tc_ac.timeout {
-							setverdict(fail, testcasename() & ": No answer while updating resource type int2 (Ae)");
+							setverdict(fail, __SCOPE__ & ": No answer while updating resource type int2 (Ae)");
 						}
 					}	
 
@@ -13464,18 +13464,18 @@ module OneM2M_Testcases {
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 							tc_ac.stop;
-							setverdict(pass, testcasename() & ": Attribute of resource type int2 (Ae) updated successfully");
+							setverdict(pass, __SCOPE__ & ": Attribute of resource type int2 (Ae) updated successfully");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error while updating resource type int2 (Ae)");
+							setverdict(fail, __SCOPE__ & ": Error while updating resource type int2 (Ae)");
 						}
 						[] mcaPort.receive{
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error, unexpected message received");
+							setverdict(fail, __SCOPE__ & ": Error, unexpected message received");
 						}
 						[] tc_ac.timeout {
-							setverdict(fail, testcasename() & ": No answer while updating resource type int2 (Ae) or None notification received");
+							setverdict(fail, __SCOPE__ & ": No answer while updating resource type int2 (Ae) or None notification received");
 						}
 					}	
 
@@ -13548,22 +13548,22 @@ module OneM2M_Testcases {
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(v_retrieveContentResponse))) -> value v_response {
 							tc_ac.stop;
 							if(v_response.primitive.responsePrimitive.primitiveContent.subscription.expirationCounter == 2 ){
-								setverdict(pass, testcasename() & ": expirationCounter has been successfully decreased by one");
+								setverdict(pass, __SCOPE__ & ": expirationCounter has been successfully decreased by one");
 							}
 							else{
-								setverdict(fail, testcasename() & ": Error expirationCounter hasn't been decreased by one");
+								setverdict(fail, __SCOPE__ & ": Error expirationCounter hasn't been decreased by one");
 							}
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error, resource elements provided not matching expected resource elements");
+							setverdict(fail, __SCOPE__ & ": Error, resource elements provided not matching expected resource elements");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error while retrieving resource");
+							setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
 						}
 						[] tc_ac.timeout {
-							setverdict(fail, testcasename() & ": No answer while retrieving resource");
+							setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
 						}
 					}
 					
@@ -13635,18 +13635,18 @@ module OneM2M_Testcases {
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) -> value v_response {
 							tc_ac.stop;
-							setverdict(pass, testcasename() & ": Subscription Resource have been successfully deleted");
+							setverdict(pass, __SCOPE__ & ": Subscription Resource have been successfully deleted");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error while retrieving Subscription Resource");
+							setverdict(fail, __SCOPE__ & ": Error while retrieving Subscription Resource");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error Subscription Resource has not been deleted");
+							setverdict(fail, __SCOPE__ & ": Error Subscription Resource has not been deleted");
 						}
 						[] tc_ac.timeout {
-							setverdict(fail, testcasename() & ": No answer while retrieving Subscription Resource");
+							setverdict(fail, __SCOPE__ & ": No answer while retrieving Subscription Resource");
 						}
 					}
 					
@@ -13715,18 +13715,18 @@ module OneM2M_Testcases {
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 							tc_ac.stop;
-							setverdict(pass, testcasename() & ": Attribute of resource type int2 (Ae) updated successfully");
+							setverdict(pass, __SCOPE__ & ": Attribute of resource type int2 (Ae) updated successfully");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error while updating resource type int2 (Ae)");
+							setverdict(fail, __SCOPE__ & ": Error while updating resource type int2 (Ae)");
 						}
 						[] mcaPort.receive{
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error, unexpected message received");
+							setverdict(fail, __SCOPE__ & ": Error, unexpected message received");
 						}
 						[] tc_ac.timeout {
-							setverdict(fail, testcasename() & ": No answer while updating resource type int2 (Ae) or None notification received");
+							setverdict(fail, __SCOPE__ & ": No answer while updating resource type int2 (Ae) or None notification received");
 						}
 					}	
 					
@@ -13793,14 +13793,14 @@ module OneM2M_Testcases {
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 							tc_ac.stop;
-							setverdict(pass, testcasename() & ": Attribute of resource type int2 (Ae) updated successfully");
+							setverdict(pass, __SCOPE__ & ": Attribute of resource type int2 (Ae) updated successfully");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error while updating resource type int2 (Ae)");
+							setverdict(fail, __SCOPE__ & ": Error while updating resource type int2 (Ae)");
 						}
 						[] tc_ac.timeout {
-							setverdict(fail, testcasename() & ": No answer while updating resource type int2 (Ae) or None notification received");
+							setverdict(fail, __SCOPE__ & ": No answer while updating resource type int2 (Ae) or None notification received");
 						}
 					}	
 
@@ -13825,10 +13825,10 @@ module OneM2M_Testcases {
 					alt {
 						[] mcaPort.receive{
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error, Notification isn't expected ");
+							setverdict(fail, __SCOPE__ & ": Error, Notification isn't expected ");
 						}
 						[] tc_ac.timeout {
-							setverdict(pass, testcasename() & ": No notification received");
+							setverdict(pass, __SCOPE__ & ": No notification received");
 						}
 					}
 
@@ -13884,18 +13884,18 @@ module OneM2M_Testcases {
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 							tc_ac.stop;
-							setverdict(pass, testcasename() & ": Subscription resource deleted successfully");
+							setverdict(pass, __SCOPE__ & ": Subscription resource deleted successfully");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error while deleting resource type int23 (Subscription)");
+							setverdict(fail, __SCOPE__ & ": Error while deleting resource type int23 (Subscription)");
 						}
 						[] mcaPort.receive{
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error, unexpected message received");
+							setverdict(fail, __SCOPE__ & ": Error, unexpected message received");
 						}
 						[] tc_ac.timeout {
-							setverdict(fail, testcasename() & ": No answer while deleting resource type int23 (Subscription)");
+							setverdict(fail, __SCOPE__ & ": No answer while deleting resource type int23 (Subscription)");
 						}
 					}	
 					
@@ -13925,14 +13925,14 @@ module OneM2M_Testcases {
         			alt {
         				[] mcaPort.receive(mw_request(mw_notify(v_notificationRequest))) -> value v_response {
         					tc_ac.stop;
-        					setverdict(pass, testcasename() & ": Notification received");
+        					setverdict(pass, __SCOPE__ & ": Notification received");
         				}
         				[] mcaPort.receive{
         					tc_ac.stop;
-        					setverdict(fail, testcasename() & ": Error, unexpected message received");
+        					setverdict(fail, __SCOPE__ & ": Error, unexpected message received");
         				}
         				[] tc_ac.timeout {
-        					setverdict(fail, testcasename() & ": No notification received");
+        					setverdict(fail, __SCOPE__ & ": No notification received");
         				}
         			}
         
@@ -14026,22 +14026,22 @@ module OneM2M_Testcases {
     						tc_ac.stop;
     						if(p_numberOfAggregatedNotification == lengthof(v_response.primitive.requestPrimitive.primitiveContent.aggregatedNotification.notification_list)){
         						if(f_check_notificationContent(v_response.primitive.requestPrimitive, p_primitiveContent)){
-        							setverdict(pass, testcasename() & ": Notification received");
+        							setverdict(pass, __SCOPE__ & ": Notification received");
         						}
         						else{
-        							setverdict(fail, testcasename() & ": Notification received but the content doesn't match");
+        							setverdict(fail, __SCOPE__ & ": Notification received but the content doesn't match");
         						}
     						}
     						else {
-								setverdict(fail, testcasename() & ": Number of Notification in Aggregatednotification isn't right");
+								setverdict(fail, __SCOPE__ & ": Number of Notification in Aggregatednotification isn't right");
     						}
     					}
     					[] mcaPort.receive{
     						tc_ac.stop;
-    						setverdict(fail, testcasename() & ": Error, unexpected message received");
+    						setverdict(fail, __SCOPE__ & ": Error, unexpected message received");
     					}
     					[] tc_ac.timeout {
-    						setverdict(fail, testcasename() & ": No notification received");
+    						setverdict(fail, __SCOPE__ & ": No notification received");
     					}
     				}
     	
@@ -14240,18 +14240,18 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(v_contentResponse))) -> value v_response {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": Response OK for retrieving");
+								setverdict(pass, __SCOPE__ & ": Response OK for retrieving");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error, resource elements provided not matching expected resource elements");
+								setverdict(fail, __SCOPE__ & ": Error, resource elements provided not matching expected resource elements");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while retrieving resource");
+								setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while retrieving resource");
+								setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
 							}
 						}
 
@@ -14305,18 +14305,18 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(v_contentResponse))) -> value v_response {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": Response OK for retrieving");
+								setverdict(pass, __SCOPE__ & ": Response OK for retrieving");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error, resource elements provided not matching expected resource elements");
+								setverdict(fail, __SCOPE__ & ": Error, resource elements provided not matching expected resource elements");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while retrieving resource");
+								setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while retrieving resource");
+								setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
 							}
 						}
 
@@ -14387,18 +14387,18 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": Successful operation on resource type int2 (Ae)");
+								setverdict(pass, __SCOPE__ & ": Successful operation on resource type int2 (Ae)");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while operation on resource type int2 (Ae)");
+								setverdict(fail, __SCOPE__ & ": Error while operation on resource type int2 (Ae)");
 							}
 							[] mcaPort.receive{
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error, unexpected message received");
+								setverdict(fail, __SCOPE__ & ": Error, unexpected message received");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while executing operation on resource type int2 (Ae)");
+								setverdict(fail, __SCOPE__ & ": No answer while executing operation on resource type int2 (Ae)");
 							}
 						}
 
@@ -14413,14 +14413,14 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								log(testcasename() & ": Attribute of resource type ACP updated successfully");
+								log(__SCOPE__ & ":INFO:  Attribute of resource type ACP updated successfully");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 								tc_ac.stop;
-								log(testcasename() & ": Error while updating resource type ACP");
+								log(__SCOPE__ & ":INFO:  Error while updating resource type ACP");
 							}
 							[] tc_ac.timeout {
-								log(testcasename() & ": No answer while updating resource type ACP");
+								log(__SCOPE__ & ":INFO:  No answer while updating resource type ACP");
 							}
 						}
 						
@@ -14487,18 +14487,18 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": Successful operation on resource type int2 (Ae)");
+								setverdict(pass, __SCOPE__ & ": Successful operation on resource type int2 (Ae)");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while operation on resource type int2 (Ae)");
+								setverdict(fail, __SCOPE__ & ": Error while operation on resource type int2 (Ae)");
 							}
 							[] mcaPort.receive{
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error, unexpected message received");
+								setverdict(fail, __SCOPE__ & ": Error, unexpected message received");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while executing operation on resource type int2 (Ae)");
+								setverdict(fail, __SCOPE__ & ": No answer while executing operation on resource type int2 (Ae)");
 							}
 						}
 
@@ -14563,18 +14563,18 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": Successful operation on resource type int3 (Container)");
+								setverdict(pass, __SCOPE__ & ": Successful operation on resource type int3 (Container)");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while operation on resource type int3 (Container)");
+								setverdict(fail, __SCOPE__ & ": Error while operation on resource type int3 (Container)");
 							}
 							[] mcaPort.receive{
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error, unexpected message received");
+								setverdict(fail, __SCOPE__ & ": Error, unexpected message received");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while executing operation on resource type int3 (Container)");
+								setverdict(fail, __SCOPE__ & ": No answer while executing operation on resource type int3 (Container)");
 							}
 						}
 
@@ -14653,22 +14653,22 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": Operation denied because of lack of right on Container");
+								setverdict(pass, __SCOPE__ & ": Operation denied because of lack of right on Container");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error operation have been accpeted without having privileges");
+								setverdict(fail, __SCOPE__ & ": Error operation have been accpeted without having privileges");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while operation on resource type int3 (Container)");
+								setverdict(fail, __SCOPE__ & ": Error while operation on resource type int3 (Container)");
 							}
 							[] mcaPort.receive{
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error, unexpected message received");
+								setverdict(fail, __SCOPE__ & ": Error, unexpected message received");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while executing operation on resource type int3 (Container)");
+								setverdict(fail, __SCOPE__ & ": No answer while executing operation on resource type int3 (Container)");
 							}
 						}
 
@@ -14743,22 +14743,22 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": Operation denied because of lack of right on Container");
+								setverdict(pass, __SCOPE__ & ": Operation denied because of lack of right on Container");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error operation have been accpeted without having privileges");
+								setverdict(fail, __SCOPE__ & ": Error operation have been accpeted without having privileges");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while operation on resource type int3 (Container)");
+								setverdict(fail, __SCOPE__ & ": Error while operation on resource type int3 (Container)");
 							}
 							[] mcaPort.receive{
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error, unexpected message received");
+								setverdict(fail, __SCOPE__ & ": Error, unexpected message received");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while executing operation on resource type int3 (Container)");
+								setverdict(fail, __SCOPE__ & ": No answer while executing operation on resource type int3 (Container)");
 							}
 						}
 
@@ -14842,18 +14842,18 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": Successful operation on resource type int2 (Ae)");
+								setverdict(pass, __SCOPE__ & ": Successful operation on resource type int2 (Ae)");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while operation on resource type int2 (Ae)");
+								setverdict(fail, __SCOPE__ & ": Error while operation on resource type int2 (Ae)");
 							}
 							[] mcaPort.receive{
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error, unexpected message received");
+								setverdict(fail, __SCOPE__ & ": Error, unexpected message received");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while executing operation on resource type int2 (Ae)");
+								setverdict(fail, __SCOPE__ & ": No answer while executing operation on resource type int2 (Ae)");
 							}
 						}
 
@@ -14917,18 +14917,18 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": Successful Update operation on resource type int2 (Ae)");
+								setverdict(pass, __SCOPE__ & ": Successful Update operation on resource type int2 (Ae)");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while Update operation on resource type int2 (Ae)");
+								setverdict(fail, __SCOPE__ & ": Error while Update operation on resource type int2 (Ae)");
 							}
 							[] mcaPort.receive{
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error, unexpected message received");
+								setverdict(fail, __SCOPE__ & ": Error, unexpected message received");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while executing update operation on resource type int2 (Ae)");
+								setverdict(fail, __SCOPE__ & ": No answer while executing update operation on resource type int2 (Ae)");
 							}
 						}
 
@@ -14992,22 +14992,22 @@ module OneM2M_Testcases {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response {
 								tc_ac.stop;
-								setverdict(pass, testcasename() & ": Operation denied because of lack of right on Container");
+								setverdict(pass, __SCOPE__ & ": Operation denied because of lack of right on Container");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error operation have been accpeted without having privileges");
+								setverdict(fail, __SCOPE__ & ": Error operation have been accpeted without having privileges");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error while operation on resource type int3 (Container)");
+								setverdict(fail, __SCOPE__ & ": Error while operation on resource type int3 (Container)");
 							}
 							[] mcaPort.receive{
 								tc_ac.stop;
-								setverdict(fail, testcasename() & ": Error, unexpected message received");
+								setverdict(fail, __SCOPE__ & ": Error, unexpected message received");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, testcasename() & ": No answer while executing operation on resource type int3 (Container)");
+								setverdict(fail, __SCOPE__ & ": No answer while executing operation on resource type int3 (Container)");
 							}
 						}
 
-- 
GitLab