diff --git a/tests/ls/test_script.sh b/tests/ls/test_script.sh
index 294a7dc060900e7d317631a3598526ccf9c70e01..a05c53e07210a4ec63a98eb2f6fa4c3c8d37da08 100755
--- a/tests/ls/test_script.sh
+++ b/tests/ls/test_script.sh
@@ -25,30 +25,30 @@ if [ ! $? -eq 0 ]; then
 	report_failure 
 fi
 
-run_basic_test 120 --help
-run_basic_test 120 --version
-run_basic_test 120 --doesnotexist
-run_basic_test 120 $DATA_DIR
-run_basic_test 120 $DATA_DIR/not-exist
-run_basic_test 120 -a $DATA_DIR
-run_basic_test 120 -l $DATA_DIR
-run_basic_test 120 -ltr $DATA_DIR
-run_basic_test 120 -ltrR $DATA_DIR
-run_basic_test 120 -ha $DATA_DIR
-run_basic_test 120 -Z $DATA_DIR
-run_basic_test 120 -Rd $DATA_DIR
-run_basic_test 120 -Rlg $DATA_DIR
-run_basic_test 120 -lC -s $DATA_DIR
-run_basic_test 120 -C --color=always $DATA_DIR
-run_basic_test 120 -F $DATA_DIR
-run_basic_test 120 -Fg $DATA_DIR
-run_basic_test 120 -ha --si $DATA_DIR
-run_basic_test 120 -ha --si -i $DATA_DIR
-run_basic_test 120 -lt --time-style=full-iso $DATA_DIR
-run_basic_test 120 -lt --time-style=long-iso $DATA_DIR
-run_basic_test 120 -lt --time-style=iso $DATA_DIR
-run_basic_test 120 -lt --tabsize=4 --time-style=iso $DATA_DIR
-run_basic_test 120 -ltZ $DATA_DIR
+run_basic_test 20 --help
+run_basic_test 20 --version
+run_basic_test 20 --doesnotexist
+run_basic_test 20 $DATA_DIR
+run_basic_test 20 $DATA_DIR/not-exist
+run_basic_test 20 -a $DATA_DIR
+run_basic_test 20 -l $DATA_DIR
+run_basic_test 20 -ltr $DATA_DIR
+run_basic_test 20 -ltrR $DATA_DIR
+run_basic_test 20 -ha $DATA_DIR
+run_basic_test 20 -Z $DATA_DIR
+run_basic_test 20 -Rd $DATA_DIR
+run_basic_test 20 -Rlg $DATA_DIR
+run_basic_test 20 -lC -s $DATA_DIR
+run_basic_test 20 -C --color=always $DATA_DIR
+run_basic_test 20 -F $DATA_DIR
+run_basic_test 20 -Fg $DATA_DIR
+run_basic_test 20 -ha --si $DATA_DIR
+run_basic_test 20 -ha --si -i $DATA_DIR
+run_basic_test 20 -lt --time-style=full-iso $DATA_DIR
+run_basic_test 20 -lt --time-style=long-iso $DATA_DIR
+run_basic_test 20 -lt --time-style=iso $DATA_DIR
+run_basic_test 20 -lt --tabsize=4 --time-style=iso $DATA_DIR
+run_basic_test 20 -ltZ $DATA_DIR
 
 cleanup
 
diff --git a/tests/test_cmds.sh b/tests/test_cmds.sh
index 9b359430933dd40f5f2c4573be3263ac810df02c..21b9929cc515748bc45696f9783521e9bd0d4fc4 100755
--- a/tests/test_cmds.sh
+++ b/tests/test_cmds.sh
@@ -118,28 +118,28 @@ do_tests()
 					zafl.sh $progpath $protected --rida -m --tempdir $temp_dir > test_${prog}.ps.log 2>&1
 				;;
 				zafl_context_sensitive)
-					zafl.sh $progpath $protected --rida --enable-context-sensitivity function --tempdir $temp_dir > test_${prog}.ps.log 2>&1
+					zafl.sh $progpath $protected -v --rida --enable-context-sensitivity function --tempdir $temp_dir > test_${prog}.ps.log 2>&1
 				;;
 				zafl_context_sensitive_locality)
 					zafl.sh $progpath $protected --rida --enable-context-sensitivity function -l --tempdir $temp_dir > test_${prog}.ps.log 2>&1
 				;;
 				zafl_laf)
-					zafl.sh $progpath $protected --enable-laf --tempdir $temp_dir > test_${prog}.ps.log 2>&1
+					zafl.sh $progpath $protected -v --enable-laf --tempdir $temp_dir > test_${prog}.ps.log 2>&1
 				;;
 				zafl_context_sensitive_laf)
-					zafl.sh $progpath $protected --rida --enable-laf --enable-context-sensitivity function --tempdir $temp_dir > test_${prog}.ps.log 2>&1
+					zafl.sh $progpath $protected -v --rida --enable-laf --enable-context-sensitivity function --tempdir $temp_dir > test_${prog}.ps.log 2>&1
 				;;
 				zafl_context_sensitive_laf_domgraph)
 					zafl.sh $progpath $protected --rida --enable-laf --enable-context-sensitivity function -d --tempdir $temp_dir > test_${prog}.ps.log 2>&1
 				;;
 				laf)
-					$PSZ $progpath $protected -s rida=on -s meds_static=off -s laf=on --tempdir $temp_dir > test_${prog}.ps.log 2>&1
+					$PSZ $progpath $protected -s rida=on -s meds_static=off -s laf=on -o laf:-v --tempdir $temp_dir > test_${prog}.ps.log 2>&1
 				;;
 				laf_cmp)
-					$PSZ $progpath $protected -s rida=on -s meds_static=off -s laf=on -o laf:--disable-trace-div -o laf:--enable-trace-compare --tempdir $temp_dir > test_${prog}.ps.log 2>&1
+					$PSZ $progpath $protected -s rida=on -s meds_static=off -s laf=on -o laf:-v -o laf:--disable-trace-div -o laf:--enable-trace-compare --tempdir $temp_dir > test_${prog}.ps.log 2>&1
 				;;
 				laf_div)
-					$PSZ $progpath $protected -s rida=on -s meds_static=off -s laf=on -o laf:--enable-trace-div -o laf:--disable-trace-compare --tempdir $temp_dir > test_${prog}.ps.log 2>&1
+					$PSZ $progpath $protected -s rida=on -s meds_static=off -s laf=on -o laf:-v -o laf:--enable-trace-div -o laf:--disable-trace-compare --tempdir $temp_dir > test_${prog}.ps.log 2>&1
 				;;
 				zipr)
 					$PSZ $progpath $protected --tempdir $temp_dir > test_${prog}.ps.log 2>&1