diff --git a/test/tools/end.sh b/test/tools/end.sh
index b6af5d5..9373623 100755
--- a/test/tools/end.sh
+++ b/test/tools/end.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+
+rm -rf $testDir
 ./test/tools/delete-container.sh 
 ./test/tools/delete-image.sh > /dev/null 2>&1
 
diff --git a/test/tools/prepare.sh b/test/tools/prepare.sh
index ea88ee1..6840d94 100755
--- a/test/tools/prepare.sh
+++ b/test/tools/prepare.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+mkdir -p $testDir
+
 dir=$(dirname $0)
 $dir/delete-container.sh
 $dir/delete-image.sh
diff --git a/test/tools/run-container.sh b/test/tools/run-container.sh
index 3319e09..2c0e1d7 100755
--- a/test/tools/run-container.sh
+++ b/test/tools/run-container.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-echo "docker.io run --name $testContainer $runOptions -d $testImage"
-ID=`docker.io run --name $testContainer $runOptions -d $testImage`
+echo "docker.io run --name $testContainer $runOptions -d $testImage $runCommand"
+ID=`docker.io run --name $testContainer $runOptions -d $testImage $runCommand`
 sleep 10
 
 echo " --> Obtaining IP"