diff --git a/src/villas-compare.cpp b/src/villas-compare.cpp
index bdab42ef1..170536666 100644
--- a/src/villas-compare.cpp
+++ b/src/villas-compare.cpp
@@ -101,7 +101,7 @@ public:
 	Compare(int argc, char *argv[]) :
 		Tool(argc, argv, "test-cmp"),
 		pool(),
-		epsilon(1e-9),
+		epsilon(1e-6),
 		format("villas.human"),
 		dtypes("64f"),
 		flags((int) SampleFlags::HAS_SEQUENCE | (int) SampleFlags::HAS_DATA | (int) SampleFlags::HAS_TS_ORIGIN)
diff --git a/tests/benchmarks/run-benchmark.sh b/tests/benchmarks/run-benchmark.sh
index 3cfaf4d52..9cd2b5298 100755
--- a/tests/benchmarks/run-benchmark.sh
+++ b/tests/benchmarks/run-benchmark.sh
@@ -36,6 +36,8 @@ IB_MODES=("RC")
 ######################################
 ######################################
 
+. ${SRCDIR}/tools/villas-helper.sh
+
 # Check if user is superuser. SU is used for namespace
 if [[ "$EUID" -ne 0 ]]; then
     echo "Please run as root"
@@ -91,10 +93,6 @@ fi
 ######################################
 # SET PATHS ##########################
 ######################################
-# Set paths
-SCRIPT=$(realpath $0)
-SCRIPTPATH=$(dirname ${SCRIPT})
-source ${SCRIPTPATH}/../../tools/villas-helper.sh
 
 # Declare location of config files
 CONFIG=$(mktemp /tmp/nodetype-benchmark-config-XXXX.conf)
@@ -252,7 +250,7 @@ cat >> ${CONFIG} <<EOF
 EOF
 
                     # Start receiving node
-                    VILLAS_LOG_PREFIX=$(colorize "[Target Node]  ") \
+                    VILLAS_LOG_PREFIX=$(colorize "[target] ") \
                     cset proc --set=real-time-0 --exec ../../build/src/villas-node -- ${CONFIG_TARGET} &
                     target_node_proc=$!
                     
@@ -261,7 +259,7 @@ EOF
                 
                 if [ ! "${NODETYPE}" == "loopback" ]; then 
                     # Start sending pipe
-                    VILLAS_LOG_PREFIX=$(colorize "[Source Node]  ") \
+                    VILLAS_LOG_PREFIX=$(colorize "[source] ") \
                     ${NAMESPACE_CMD} cset proc --set=real-time-1 --exec ../../build/src/villas-node -- ${CONFIG_SOURCE} &
                     source_node_proc=$!
                 fi
diff --git a/tests/integration/hook-cast.sh b/tests/integration/hook-cast.sh
index 1a504afba..bb5cf0c0d 100755
--- a/tests/integration/hook-cast.sh
+++ b/tests/integration/hook-cast.sh
@@ -22,8 +22,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##################################################################################
 
-# Test is broken
-exit 99
+. ${SRCDIR}/tools/villas-helper.sh
 
 INPUT_FILE=$(mktemp)
 OUTPUT_FILE=$(mktemp)
diff --git a/tools/villas-helper.sh b/tools/villas-helper.sh
index 93d938fc3..c01c7375d 100755
--- a/tools/villas-helper.sh
+++ b/tools/villas-helper.sh
@@ -45,6 +45,11 @@ function villas_format_supports_header() {
 }
 
 function colorize() {
-	RANDOM=$BASHPID
-	echo -e "\x1b[0;$((31 + $RANDOM % 7))m$1\x1b[0m"
+	RANDOM=${BASHPID}
+	echo -e "\x1b[0;$((31 + ${RANDOM} % 7))m$1\x1b[0m"
+}
+
+function villas() {
+	VILLAS_LOG_PREFIX=${VILLAS_LOG_PREFIX:-$(colorize "[$1-$((${RANDOM} % 100))} ")} \
+	command villas $@
 }