diff --git a/test/runsanitychecks.sh b/test/runsanitychecks.sh
old mode 100644
new mode 100755
index 2e33ec19..b7090436
--- a/test/runsanitychecks.sh
+++ b/test/runsanitychecks.sh
@@ -1,144 +1,132 @@
-
-cd sanity-check
+#!/bin/sh
+cd sanity-check || exit 1
 echo "" > ../log.txt
 
 ###############################################################################
-cd c++03
-echo "" >> ../log.txt
-echo "-----------------------------------------------" >> ../log.txt
-echo " C++03" >> ../log.txt
-echo "-----------------------------------------------" >> ../log.txt
+cd c++03 || exit 1
+{ echo ""
+echo "-----------------------------------------------"
+echo " C++03"
+echo "-----------------------------------------------"
 
-echo "GCC - STL" >> ../log.txt
+echo "GCC - STL"; } >> ../log.txt
 gcc --version | grep gcc >> ../log.txt
 cmake --cmake-clean-cache -DNO_STL=OFF .
-make || echo **** Failed **** >> ../log.txt
+make || echo "**** Failed ****" >> ../log.txt
 
-echo "" >> ../log.txt
-echo "GCC - No STL" >> ../log.txt
+{ echo ""; echo "GCC - No STL"; } >> ../log.txt
 gcc --version | grep gcc >> ../log.txt
 cmake --cmake-clean-cache -DNO_STL=ON .
-make || echo **** Failed **** >> ../log.txt
+make || echo "**** Failed ****" >> ../log.txt
 
-echo "" >> ../log.txt
-echo "Clang - STL" >> ../log.txt
+{ echo ""; echo "Clang - STL"; } >> ../log.txt
 clang --version | grep clang >> ../log.txt
 export CC=clang
 export CXX=clang++
 cmake --cmake-clean-cache -DNO_STL=OFF .
-make || echo **** Failed **** >> ../log.txt
+make || echo "**** Failed ****" >> ../log.txt
 
-echo "" >> ../log.txt
-echo "Clang - No STL" >> ../log.txt
+{ echo ""; echo "Clang - No STL"; } >> ../log.txt
 clang --version | grep clang >> ../log.txt
 export CC=clang
 export CXX=clang++
 cmake --cmake-clean-cache -DNO_STL=ON .
-make || echo **** Failed **** >> ../log.txt
+make || echo "**** Failed ****" >> ../log.txt
 
 ###############################################################################
-cd ../c++11
-echo "" >> ../log.txt
-echo "-----------------------------------------------" >> ../log.txt
-echo " C++11" >> ../log.txt
-echo "-----------------------------------------------" >> ../log.txt
+cd ../c++11 || exit 1
+{ echo ""
+echo "-----------------------------------------------"
+echo " C++11"
+echo "-----------------------------------------------"
 
-echo "GCC - STL" >> ../log.txt
+echo "GCC - STL"; } >> ../log.txt
 gcc --version | grep gcc >> ../log.txt
 cmake --cmake-clean-cache -DNO_STL=OFF .
-make || echo **** Failed **** >> ../log.txt
+make || echo "**** Failed ****" >> ../log.txt
 
-echo "" >> ../log.txt
-echo "GCC - No STL" >> ../log.txt
+{ echo ""; echo "GCC - No STL"; } >> ../log.txt
 gcc --version | grep gcc >> ../log.txt
 cmake --cmake-clean-cache -DNO_STL=ON .
-make || echo **** Failed **** >> ../log.txt
+make || echo "**** Failed ****" >> ../log.txt
 
-echo "" >> ../log.txt
-echo "Clang - STL" >> ../log.txt
+{ echo ""; echo "Clang - STL"; } >> ../log.txt
 clang --version | grep clang >> ../log.txt
 export CC=clang
 export CXX=clang++
 cmake --cmake-clean-cache -DNO_STL=OFF .
-make || echo **** Failed **** >> ../log.txt
+make || echo "**** Failed ****" >> ../log.txt
 
-echo "" >> ../log.txt
-echo "Clang - No STL" >> ../log.txt
+{ echo ""; echo "Clang - No STL"; } >> ../log.txt
 clang --version | grep clang >> ../log.txt
 export CC=clang
 export CXX=clang++
 cmake --cmake-clean-cache -DNO_STL=ON .
-make || echo **** Failed **** >> ../log.txt
+make || echo "**** Failed ****" >> ../log.txt
 
 ###############################################################################
-cd ../c++14
-echo "" >> ../log.txt
-echo "-----------------------------------------------" >> ../log.txt
-echo " C++14" >> ../log.txt
-echo "-----------------------------------------------" >> ../log.txt
+cd ../c++14 || exit 1
+{ echo ""
+echo "-----------------------------------------------"
+echo " C++14"
+echo "-----------------------------------------------"
 
-echo " GCC - STL" >> ../log.txt
+echo " GCC - STL"; } >> ../log.txt
 gcc --version | grep gcc >> ../log.txt
 cmake --cmake-clean-cache -DNO_STL=OFF .
-make || echo **** Failed **** >> ../log.txt
+make || echo "**** Failed ****" >> ../log.txt
 
-echo "" >> ../log.txt
-echo "GCC - No STL" >> ../log.txt
+{ echo ""; echo "GCC - No STL"; } >> ../log.txt
 gcc --version | grep gcc >> ../log.txt
 cmake --cmake-clean-cache -DNO_STL=ON .
-make || echo **** Failed **** >> ../log.txt
+make || echo "**** Failed ****" >> ../log.txt
 
-echo "" >> ../log.txt
-echo "Clang - STL" >> ../log.txt
+{ echo ""; echo "Clang - STL"; } >> ../log.txt
 clang --version | grep clang >> ../log.txt
 export CC=clang
 export CXX=clang++
 cmake --cmake-clean-cache -DNO_STL=OFF .
-make || echo **** Failed **** >> ../log.txt
+make || echo "**** Failed ****" >> ../log.txt
 
-echo "" >> ../log.txt
-echo "Clang - No STL" >> ../log.txt
+{ echo ""; echo "Clang - No STL"; } >> ../log.txt
 clang --version | grep clang >> ../log.txt
 export CC=clang
 export CXX=clang++
 cmake --cmake-clean-cache -DNO_STL=ON .
-make || echo **** Failed **** >> ../log.txt
+make || echo "**** Failed ****" >> ../log.txt
 
 ###############################################################################
-cd ../c++17
-echo "" >> ../log.txt
-echo "-----------------------------------------------" >> ../log.txt
-echo " C++17 " >> ../log.txt
-echo "-----------------------------------------------" >> ../log.txt
+cd ../c++17 || exit 1
+{ echo ""
+echo "-----------------------------------------------"
+echo " C++17 "
+echo "-----------------------------------------------"
 
-echo "GCC - STL" >> ../log.txt
+echo "GCC - STL"; } >> ../log.txt
 gcc --version | grep gcc >> ../log.txt
 cmake --cmake-clean-cache -DNO_STL=OFF .
-make || echo **** Failed **** >> ../log.txt
+make || echo "**** Failed ****" >> ../log.txt
 
-echo "" >> ../log.txt
-echo "GCC - No STL" >> ../log.txt
+{ echo ""; echo "GCC - No STL"; } >> ../log.txt
 gcc --version | grep gcc >> ../log.txt
 cmake --cmake-clean-cache -DNO_STL=ON .
-make || echo **** Failed **** >> ../log.txt
+make || echo "**** Failed ****" >> ../log.txt
 
-echo "" >> ../log.txt
-echo "Clang - STL" >> ../log.txt
+{ echo ""; echo "Clang - STL"; } >> ../log.txt
 clang --version | grep clang >> ../log.txt
 export CC=clang
 export CXX=clang++
 cmake --cmake-clean-cache -DNO_STL=OFF .
-make || echo **** Failed **** >> ../log.txt
+make || echo "**** Failed ****" >> ../log.txt
 
-echo "" >> ../log.txt
-echo "Clang - No STL" >> ../log.txt
+{ echo ""; echo "Clang - No STL"; } >> ../log.txt
 clang --version | grep clang >> ../log.txt
 export CC=clang
 export CXX=clang++
 cmake --cmake-clean-cache -DNO_STL=ON .
-make || echo **** Failed **** >> ../log.txt
+make || echo "**** Failed ****" >> ../log.txt
 
-echo "" >> ../log.txt
-echo "-----------------------------------------------" >> ../log.txt
-echo " Completed" >> ../log.txt
-echo "-----------------------------------------------" >> ../log.txt
+{ echo ""
+echo "-----------------------------------------------"
+echo " Completed"
+echo "-----------------------------------------------"; } >> ../log.txt
diff --git a/test/runtests.sh b/test/runtests.sh
old mode 100644
new mode 100755
index 59896bef..80091cf5
--- a/test/runtests.sh
+++ b/test/runtests.sh
@@ -1,5 +1,6 @@
+#!/bin/sh
 sudo ntpdate ntp.ubuntu.com
-cd build
+cd build || exit 1
 echo "ETL Tests" > etl_test_log.txt
 echo "********** GCC **********" >> etl_test_log.txt
 gcc --version | grep gcc >> etl_test_log.txt