diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 6df761aaaf0066ddbc42e2425858910096d33115..80e5c8ec0a3fe6837c2f5e42f91c215cff9c1600 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -7,7 +7,7 @@
  *  
  *  @author     oneM2M
  *  @version    $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Functions.ttcn $
- *              $Id: OneM2M_Functions.ttcn 238 2017-03-23 17:39:11Z reinaortega $
+ *              $Id: OneM2M_Functions.ttcn 240 2017-03-23 17:46:28Z reinaortega $
  *  @desc       Module containing functions for oneM2M
  *
  */
@@ -114,7 +114,6 @@ module OneM2M_Functions {
 		
 			unmap(self:mcaPort, system:mcaPort);
 			unmap(self:acPort, system:acPort);
-			stop;
 		}	
 		/**
 		 * @desc Ports unmapping
@@ -125,7 +124,6 @@ module OneM2M_Functions {
 			unmap(self:mcaPort, system:mcaPort);
 			unmap(self:mccPort, system:mccPort);
 			unmap(self:acPort, system:acPort);
-			stop;
 		}		
 		/**
 		 * @desc Ports unmapping for Config 03
@@ -134,7 +132,6 @@ module OneM2M_Functions {
 			
 			unmap(self:mcaPort, system:mcaPort);
 			unmap(self:acPort, system:acPort);
-			stop;
 		}
 		
 	}//end group configFunctions
@@ -1427,6 +1424,7 @@ module OneM2M_Functions {
 				 f_cse_postamble_deleteResources();
 				 // Tear down
 				 f_cfCseTesterDown();
+				 stop;
 			}
 		}
 		
@@ -1442,6 +1440,7 @@ module OneM2M_Functions {
 				 //f_ae_postamble_deleteResources();
 				 // Tear down
 				 f_cfAeTesterDown();
+				 stop;
 			}
 		}