diff --git a/tests/test_cmds.sh b/tests/test_cmds.sh
index fa09c45611464d85114cb238d447e9f9498ac400..1a869c6a80b97b0dadfc699ffda0a5a3abf0ca9e 100755
--- a/tests/test_cmds.sh
+++ b/tests/test_cmds.sh
@@ -126,6 +126,12 @@ do_tests()
 				zafl_laf)
 					zafl.sh $progpath $protected --enable-split-compare --tempdir $temp_dir > test_${prog}.ps.log 2>&1
 				;;
+				zafl_context_sensitive_laf)
+					zafl.sh $progpath $protected --rida --enable-split-compare --enable-context-sensitivity function --tempdir $temp_dir > test_${prog}.ps.log 2>&1
+				;;
+				zafl_context_sensitive_laf_domgraph)
+					zafl.sh $progpath $protected --rida --enable-split-compare --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 -o laf:--enable-split-compare --tempdir $temp_dir > test_${prog}.ps.log 2>&1
 				;;
diff --git a/zipr b/zipr
index 8c13b28160753c559940d2b841802d0ff4ed6657..109225aa38dd19db5fb0974850068162c267c3f6 160000
--- a/zipr
+++ b/zipr
@@ -1 +1 @@
-Subproject commit 8c13b28160753c559940d2b841802d0ff4ed6657
+Subproject commit 109225aa38dd19db5fb0974850068162c267c3f6