Index: local/run.coco.sh
===================================================================
diff -u -rb56991abe47642969fbebe4f5df3b2f6ef53512c -r977e1d63d67abcdd732ed425110aacb17b6f496b
--- local/run.coco.sh	(.../run.coco.sh)	(revision b56991abe47642969fbebe4f5df3b2f6ef53512c)
+++ local/run.coco.sh	(.../run.coco.sh)	(revision 977e1d63d67abcdd732ed425110aacb17b6f496b)
@@ -250,8 +250,9 @@
 
 
 ##### ---------- MAIN -------------------------------------------------------------------------------------------------
+server_coco_check
+
 if [ "$1" == "--build" ]; then
-    server_coco_check
     if [[ "$2" == "" ]]; then
         cleanup_directories
     fi
@@ -270,7 +271,6 @@
     fi
 fi
 
-
 if [ "$1" == "--run" ]; then
     cd $WORKING_PATH
     # tst_service screen needs the folders to be empty.
@@ -282,7 +282,6 @@
 
 
 if [ "$1" == "--merge" ]; then
-    server_coco_check
     cd $WORKING_PATH
     tests_read_list
     coverage_merge
@@ -291,16 +290,17 @@
 
 
 if [ "$1" == "--report" ]; then
-    server_coco_check
     cd $WORKING_PATH
     coverage_report "$2"
 fi
 
 
 if [ "$1" == "" ]; then
     echo "Usage:"
-    echo "run.coco.sh <options>"
+    echo "run.coco.sh <options> [test name]"
     echo "--build                build and instrment the application and tests from $APPLICATION_PATH"
+    echo "  [test name]          Test name can be used to build only the selected test from the list."
+    echo "                       If used the folder won't be cleaned/wiped."
     echo "--run                  run the tests"
     echo "--merge                merge the test results"
     echo "--report <report type> create the execution report of the ran applicaiton"