Index: tools/create_dialin_link.sh
===================================================================
diff -u -r3b227c80563721d348a1bc80701c5cfab938d469 -r1b2880abb6dd871b225dfafd45848b45215e6e81
--- tools/create_dialin_link.sh	(.../create_dialin_link.sh)	(revision 3b227c80563721d348a1bc80701c5cfab938d469)
+++ tools/create_dialin_link.sh	(.../create_dialin_link.sh)	(revision 1b2880abb6dd871b225dfafd45848b45215e6e81)
@@ -20,16 +20,13 @@
 LOCAL_DIALIN=~/Projects/dialin/dialin
 read -p "Do you want to restore the remote dialin package? (y/n) " resp
 if [ "$resp" == "y" ]; then
-    if [ -d "venv/lib/python3.6/site-packages/dialin.bak" ]; then
-        rm -rf venv/lib/python3.6/site-packages/dialin
-        mv venv/lib/python3.6/site-packages/dialin.bak venv/lib/python3.6/site-packages/dialin
-    else
-        echo "venv/lib/python3.6/site-packages/dialin.bak not found."
-    fi 
+    rm -rf venv
+    cd tools; ./setup_env.sh
 else
-    echo "Ok, let's link to a local dialin repository then."
+    echo "Ok, let's link to a local dialin repository."
     read -p "Enter the path to your local dialin: " -e -i "$LOCAL_DIALIN" LOCAL_DIALIN
-    mv venv/lib/python3.6/site-packages/dialin venv/lib/python3.6/site-packages/dialin.bak
+    rm -rf venv/lib/python3.6/site-packages/dialin
+    echo "LOCAL_DIALIN: $LOCAL_DIALIN"
     ln -s $LOCAL_DIALIN venv/lib/python3.6/site-packages/dialin
 fi
 echo "Done."
Index: tools/run_tests.sh
===================================================================
diff -u -r922df89f8af23f7fbbc9320a7fd9ae45391a4c96 -r1b2880abb6dd871b225dfafd45848b45215e6e81
--- tools/run_tests.sh	(.../run_tests.sh)	(revision 922df89f8af23f7fbbc9320a7fd9ae45391a4c96)
+++ tools/run_tests.sh	(.../run_tests.sh)	(revision 1b2880abb6dd871b225dfafd45848b45215e6e81)
@@ -15,12 +15,17 @@
 #         and can run tests with the specified tags
 #
 ############################################################################
-TAGS=AlarmStatusData,DGOperationMode,DGROPumpData,HDOperationModeData,TreatmentUltrafiltration,TreatmentSalineData
+TAGS=AlarmStatusData,DGOperationMode,DGROPumpData,HDOperationModeData,TreatmentUltrafiltration,TreatmentSalineData,CreateTreatment
 TIMEOUT=60
 
 rm -rf /tmp/UnitTest
 cd ..
-echo "[i] This script assumes squishserver has already been started with run_server.sh."
+read -p "Did you already start run_server.sh? (y/n) " serverStarted
+if [ "$serverStarted" != "y" ]; then
+    echo "Please start run_server.sh prior to running this script."
+    exit
+fi
+
 read -p "Do you want to run all tests? (y/n) " resp
 
 /opt/squishqt/bin/squishrunner --config setAUTTimeout $TIMEOUT