diff --git a/SMPStaticAnalyzer b/SMPStaticAnalyzer
index 8acd3ee30168df1c41e7f0eb565badb5bc17b86d..63c3799ff7ffe1684970ddfd9d355bcbc73d7161 160000
--- a/SMPStaticAnalyzer
+++ b/SMPStaticAnalyzer
@@ -1 +1 @@
-Subproject commit 8acd3ee30168df1c41e7f0eb565badb5bc17b86d
+Subproject commit 63c3799ff7ffe1684970ddfd9d355bcbc73d7161
diff --git a/tests/test_cmds.sh b/tests/test_cmds.sh
index 37bdd8ee02082eca3e09d49fc496a685b76d054a..24741aa290e5b2345d64adaa8a88b28cef37e701 100755
--- a/tests/test_cmds.sh
+++ b/tests/test_cmds.sh
@@ -73,7 +73,7 @@ do_tests()
 					zafl.sh $progpath $protected -d -g --tempdir $temp_dir > test_${prog}.ps.log 2>&1
 				;;
 				zafl_domgraph_opt_context_sensitive)
-					zafl.sh $progpath $protected -d -g --enable-context-sensitivity function --tempdir $temp_dir > test_${prog}.ps.log 2>&1
+					zafl.sh $progpath $protected -d -g --enable-context-sensitivity --tempdir $temp_dir > test_${prog}.ps.log 2>&1
 				;;
 				zafl_domgraph_locality)
 					zafl.sh $progpath $protected -d --enable-locality --tempdir $temp_dir > test_${prog}.ps.log 2>&1
@@ -118,10 +118,10 @@ do_tests()
 					zafl.sh $progpath $protected --rida -m --tempdir $temp_dir > test_${prog}.ps.log 2>&1
 				;;
 				zafl_context_sensitive)
-					zafl.sh $progpath $protected -v --rida --enable-context-sensitivity function --tempdir $temp_dir > test_${prog}.ps.log 2>&1
+					zafl.sh $progpath $protected -v --rida --enable-context-sensitivity --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.sh $progpath $protected --rida --enable-context-sensitivity -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
@@ -130,13 +130,13 @@ do_tests()
 					zafl.sh $progpath $protected --enable-laf -d --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 --rida --enable-laf --enable-context-sensitivity --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
+					zafl.sh $progpath $protected --rida --enable-laf --enable-context-sensitivity -d --tempdir $temp_dir > test_${prog}.ps.log 2>&1
 				;;
 				zafl_context_sensitive_laf_domgraph_optgraph)
-					zafl.sh $progpath $protected --rida --enable-laf --enable-context-sensitivity function -d -g --tempdir $temp_dir > test_${prog}.ps.log 2>&1
+					zafl.sh $progpath $protected --rida --enable-laf --enable-context-sensitivity -d -g --tempdir $temp_dir > test_${prog}.ps.log 2>&1
 				;;
 				laf)
 					$PSZ $progpath $protected -s rida -c laf --tempdir $temp_dir > test_${prog}.ps.log 2>&1