Index: build/unittest.sh
===================================================================
diff -u -r174ea88f0e57738cd80d68f61152d8e85d91b746 -rbcfca481ae59cad23e9c5711522198526d905441
--- build/unittest.sh	(.../unittest.sh)	(revision 174ea88f0e57738cd80d68f61152d8e85d91b746)
+++ build/unittest.sh	(.../unittest.sh)	(revision bcfca481ae59cad23e9c5711522198526d905441)
@@ -88,8 +88,6 @@
     export PATH=$COCO_DIR/wrapper/bin/:$COCO_DIR/bin/:$PATH
     export LD_LIBRARY_PATH=$QT_DIR/lib
     export DISPLAY=$DISPLAY_NO
-    export SQUISH_GUI_COVERAGE=1
-    export PYTHONPATH=$WORKING_DIR/common/pycommon/squishapi/:$PYTHONPATH
 }
 
 function make_Directories() {
@@ -123,6 +121,12 @@
     else
         cp -r $LOCAL_PROJECT_DIR/testsuites                     testsuites
     fi
+
+    cd testsuites/tools
+    ./setup_env.sh
+
+    # Updated paths.ini
+    sudo python3 update_paths.py --squishqt $SQUISH_DIR
 }
 
 function build_WithCoverage() {
Index: setupCAN/setupVCAN.sh
===================================================================
diff -u -rb3939c69b79df740906cd8c065b3a0a4c6095d77 -rbcfca481ae59cad23e9c5711522198526d905441
--- setupCAN/setupVCAN.sh	(.../setupVCAN.sh)	(revision b3939c69b79df740906cd8c065b3a0a4c6095d77)
+++ setupCAN/setupVCAN.sh	(.../setupVCAN.sh)	(revision bcfca481ae59cad23e9c5711522198526d905441)
@@ -1,4 +1,6 @@
 #!/bin/bash
+sudo ifconfig can0 down > /dev/null 2>&1
+sudo ip link delete can0 > /dev/null 2>&1
 CAN=can0
 if [ "$1" != "" ]; then
     CAN=$1