diff --git a/test/CTestTestfile.cmake b/test/CTestTestfile.cmake
index 5ef3706..4bce712 100644
--- a/test/CTestTestfile.cmake
+++ b/test/CTestTestfile.cmake
@@ -41,6 +41,7 @@ ADD_TEST(compile_only_array_power "scripts/compile_only" "good/array_power.ept")
 ADD_TEST(compile_only_auto2 "scripts/compile_only" "good/auto2.ept")
 ADD_TEST(compile_only_auto "scripts/compile_only" "good/auto.ept")
 ADD_TEST(compile_only_autohiera2 "scripts/compile_only" "good/autohiera2.ept")
+ADD_TEST(compile_only_autohiera3 "scripts/compile_only" "good/autohiera3.ept")
 ADD_TEST(compile_only_autohiera "scripts/compile_only" "good/autohiera.ept")
 ADD_TEST(compile_only_bad_updown "scripts/compile_only" "good/bad_updown.ept")
 ADD_TEST(compile_only_ce "scripts/compile_only" "good/ce.ept")
@@ -49,6 +50,7 @@ ADD_TEST(compile_only_clock_causality "scripts/compile_only" "good/clock_causali
 ADD_TEST(compile_only_clocks "scripts/compile_only" "good/clocks.ept")
 ADD_TEST(compile_only_contract_automaton "scripts/compile_only" "good/contract_automaton.ept")
 ADD_TEST(compile_only_contract "scripts/compile_only" "good/contract.ept")
+ADD_TEST(compile_only_contrenum "scripts/compile_only" "good/contrenum.ept")
 ADD_TEST(compile_only_convolutions "scripts/compile_only" "good/convolutions.ept")
 ADD_TEST(compile_only_counter "scripts/compile_only" "good/counter.ept")
 ADD_TEST(compile_only_current "scripts/compile_only" "good/current.ept")
@@ -124,6 +126,7 @@ ADD_TEST(compile_gcc_run_array_power "scripts/compile_gcc_run" "good/array_power
 ADD_TEST(compile_gcc_run_auto2 "scripts/compile_gcc_run" "good/auto2.ept")
 ADD_TEST(compile_gcc_run_auto "scripts/compile_gcc_run" "good/auto.ept")
 ADD_TEST(compile_gcc_run_autohiera2 "scripts/compile_gcc_run" "good/autohiera2.ept")
+ADD_TEST(compile_gcc_run_autohiera3 "scripts/compile_gcc_run" "good/autohiera3.ept")
 ADD_TEST(compile_gcc_run_autohiera "scripts/compile_gcc_run" "good/autohiera.ept")
 ADD_TEST(compile_gcc_run_bad_updown "scripts/compile_gcc_run" "good/bad_updown.ept")
 ADD_TEST(compile_gcc_run_ce "scripts/compile_gcc_run" "good/ce.ept")
@@ -132,6 +135,7 @@ ADD_TEST(compile_gcc_run_clock_causality "scripts/compile_gcc_run" "good/clock_c
 ADD_TEST(compile_gcc_run_clocks "scripts/compile_gcc_run" "good/clocks.ept")
 ADD_TEST(compile_gcc_run_contract_automaton "scripts/compile_gcc_run" "good/contract_automaton.ept")
 ADD_TEST(compile_gcc_run_contract "scripts/compile_gcc_run" "good/contract.ept")
+ADD_TEST(compile_gcc_run_contrenum "scripts/compile_gcc_run" "good/contrenum.ept")
 ADD_TEST(compile_gcc_run_convolutions "scripts/compile_gcc_run" "good/convolutions.ept")
 ADD_TEST(compile_gcc_run_counter "scripts/compile_gcc_run" "good/counter.ept")
 ADD_TEST(compile_gcc_run_current "scripts/compile_gcc_run" "good/current.ept")
@@ -207,6 +211,7 @@ ADD_TEST(test_option_bool_array_power "scripts/test_option" "good/array_power.ep
 ADD_TEST(test_option_bool_auto2 "scripts/test_option" "good/auto2.ept" "-bool")
 ADD_TEST(test_option_bool_auto "scripts/test_option" "good/auto.ept" "-bool")
 ADD_TEST(test_option_bool_autohiera2 "scripts/test_option" "good/autohiera2.ept" "-bool")
+ADD_TEST(test_option_bool_autohiera3 "scripts/test_option" "good/autohiera3.ept" "-bool")
 ADD_TEST(test_option_bool_autohiera "scripts/test_option" "good/autohiera.ept" "-bool")
 ADD_TEST(test_option_bool_bad_updown "scripts/test_option" "good/bad_updown.ept" "-bool")
 ADD_TEST(test_option_bool_ce "scripts/test_option" "good/ce.ept" "-bool")
@@ -215,6 +220,7 @@ ADD_TEST(test_option_bool_clock_causality "scripts/test_option" "good/clock_caus
 ADD_TEST(test_option_bool_clocks "scripts/test_option" "good/clocks.ept" "-bool")
 ADD_TEST(test_option_bool_contract_automaton "scripts/test_option" "good/contract_automaton.ept" "-bool")
 ADD_TEST(test_option_bool_contract "scripts/test_option" "good/contract.ept" "-bool")
+ADD_TEST(test_option_bool_contrenum "scripts/test_option" "good/contrenum.ept" "-bool")
 ADD_TEST(test_option_bool_convolutions "scripts/test_option" "good/convolutions.ept" "-bool")
 ADD_TEST(test_option_bool_counter "scripts/test_option" "good/counter.ept" "-bool")
 ADD_TEST(test_option_bool_current "scripts/test_option" "good/current.ept" "-bool")
@@ -290,6 +296,7 @@ ADD_TEST(test_option_deadcode_array_power "scripts/test_option" "good/array_powe
 ADD_TEST(test_option_deadcode_auto2 "scripts/test_option" "good/auto2.ept" "-deadcode")
 ADD_TEST(test_option_deadcode_auto "scripts/test_option" "good/auto.ept" "-deadcode")
 ADD_TEST(test_option_deadcode_autohiera2 "scripts/test_option" "good/autohiera2.ept" "-deadcode")
+ADD_TEST(test_option_deadcode_autohiera3 "scripts/test_option" "good/autohiera3.ept" "-deadcode")
 ADD_TEST(test_option_deadcode_autohiera "scripts/test_option" "good/autohiera.ept" "-deadcode")
 ADD_TEST(test_option_deadcode_bad_updown "scripts/test_option" "good/bad_updown.ept" "-deadcode")
 ADD_TEST(test_option_deadcode_ce "scripts/test_option" "good/ce.ept" "-deadcode")
@@ -298,6 +305,7 @@ ADD_TEST(test_option_deadcode_clock_causality "scripts/test_option" "good/clock_
 ADD_TEST(test_option_deadcode_clocks "scripts/test_option" "good/clocks.ept" "-deadcode")
 ADD_TEST(test_option_deadcode_contract_automaton "scripts/test_option" "good/contract_automaton.ept" "-deadcode")
 ADD_TEST(test_option_deadcode_contract "scripts/test_option" "good/contract.ept" "-deadcode")
+ADD_TEST(test_option_deadcode_contrenum "scripts/test_option" "good/contrenum.ept" "-deadcode")
 ADD_TEST(test_option_deadcode_convolutions "scripts/test_option" "good/convolutions.ept" "-deadcode")
 ADD_TEST(test_option_deadcode_counter "scripts/test_option" "good/counter.ept" "-deadcode")
 ADD_TEST(test_option_deadcode_current "scripts/test_option" "good/current.ept" "-deadcode")
@@ -373,6 +381,7 @@ ADD_TEST(test_option_tomato_array_power "scripts/test_option" "good/array_power.
 ADD_TEST(test_option_tomato_auto2 "scripts/test_option" "good/auto2.ept" "-tomato")
 ADD_TEST(test_option_tomato_auto "scripts/test_option" "good/auto.ept" "-tomato")
 ADD_TEST(test_option_tomato_autohiera2 "scripts/test_option" "good/autohiera2.ept" "-tomato")
+ADD_TEST(test_option_tomato_autohiera3 "scripts/test_option" "good/autohiera3.ept" "-tomato")
 ADD_TEST(test_option_tomato_autohiera "scripts/test_option" "good/autohiera.ept" "-tomato")
 ADD_TEST(test_option_tomato_bad_updown "scripts/test_option" "good/bad_updown.ept" "-tomato")
 ADD_TEST(test_option_tomato_ce "scripts/test_option" "good/ce.ept" "-tomato")
@@ -381,6 +390,7 @@ ADD_TEST(test_option_tomato_clock_causality "scripts/test_option" "good/clock_ca
 ADD_TEST(test_option_tomato_clocks "scripts/test_option" "good/clocks.ept" "-tomato")
 ADD_TEST(test_option_tomato_contract_automaton "scripts/test_option" "good/contract_automaton.ept" "-tomato")
 ADD_TEST(test_option_tomato_contract "scripts/test_option" "good/contract.ept" "-tomato")
+ADD_TEST(test_option_tomato_contrenum "scripts/test_option" "good/contrenum.ept" "-tomato")
 ADD_TEST(test_option_tomato_convolutions "scripts/test_option" "good/convolutions.ept" "-tomato")
 ADD_TEST(test_option_tomato_counter "scripts/test_option" "good/counter.ept" "-tomato")
 ADD_TEST(test_option_tomato_current "scripts/test_option" "good/current.ept" "-tomato")
@@ -456,6 +466,7 @@ ADD_TEST(test_option_flatten_array_power "scripts/test_option" "good/array_power
 ADD_TEST(test_option_flatten_auto2 "scripts/test_option" "good/auto2.ept" "-flatten")
 ADD_TEST(test_option_flatten_auto "scripts/test_option" "good/auto.ept" "-flatten")
 ADD_TEST(test_option_flatten_autohiera2 "scripts/test_option" "good/autohiera2.ept" "-flatten")
+ADD_TEST(test_option_flatten_autohiera3 "scripts/test_option" "good/autohiera3.ept" "-flatten")
 ADD_TEST(test_option_flatten_autohiera "scripts/test_option" "good/autohiera.ept" "-flatten")
 ADD_TEST(test_option_flatten_bad_updown "scripts/test_option" "good/bad_updown.ept" "-flatten")
 ADD_TEST(test_option_flatten_ce "scripts/test_option" "good/ce.ept" "-flatten")
@@ -464,6 +475,7 @@ ADD_TEST(test_option_flatten_clock_causality "scripts/test_option" "good/clock_c
 ADD_TEST(test_option_flatten_clocks "scripts/test_option" "good/clocks.ept" "-flatten")
 ADD_TEST(test_option_flatten_contract_automaton "scripts/test_option" "good/contract_automaton.ept" "-flatten")
 ADD_TEST(test_option_flatten_contract "scripts/test_option" "good/contract.ept" "-flatten")
+ADD_TEST(test_option_flatten_contrenum "scripts/test_option" "good/contrenum.ept" "-flatten")
 ADD_TEST(test_option_flatten_convolutions "scripts/test_option" "good/convolutions.ept" "-flatten")
 ADD_TEST(test_option_flatten_counter "scripts/test_option" "good/counter.ept" "-flatten")
 ADD_TEST(test_option_flatten_current "scripts/test_option" "good/current.ept" "-flatten")
@@ -539,6 +551,7 @@ ADD_TEST(test_option_itfusion_array_power "scripts/test_option" "good/array_powe
 ADD_TEST(test_option_itfusion_auto2 "scripts/test_option" "good/auto2.ept" "-itfusion")
 ADD_TEST(test_option_itfusion_auto "scripts/test_option" "good/auto.ept" "-itfusion")
 ADD_TEST(test_option_itfusion_autohiera2 "scripts/test_option" "good/autohiera2.ept" "-itfusion")
+ADD_TEST(test_option_itfusion_autohiera3 "scripts/test_option" "good/autohiera3.ept" "-itfusion")
 ADD_TEST(test_option_itfusion_autohiera "scripts/test_option" "good/autohiera.ept" "-itfusion")
 ADD_TEST(test_option_itfusion_bad_updown "scripts/test_option" "good/bad_updown.ept" "-itfusion")
 ADD_TEST(test_option_itfusion_ce "scripts/test_option" "good/ce.ept" "-itfusion")
@@ -547,6 +560,7 @@ ADD_TEST(test_option_itfusion_clock_causality "scripts/test_option" "good/clock_
 ADD_TEST(test_option_itfusion_clocks "scripts/test_option" "good/clocks.ept" "-itfusion")
 ADD_TEST(test_option_itfusion_contract_automaton "scripts/test_option" "good/contract_automaton.ept" "-itfusion")
 ADD_TEST(test_option_itfusion_contract "scripts/test_option" "good/contract.ept" "-itfusion")
+ADD_TEST(test_option_itfusion_contrenum "scripts/test_option" "good/contrenum.ept" "-itfusion")
 ADD_TEST(test_option_itfusion_convolutions "scripts/test_option" "good/convolutions.ept" "-itfusion")
 ADD_TEST(test_option_itfusion_counter "scripts/test_option" "good/counter.ept" "-itfusion")
 ADD_TEST(test_option_itfusion_current "scripts/test_option" "good/current.ept" "-itfusion")
@@ -622,6 +636,7 @@ ADD_TEST(test_option_memalloc_array_power "scripts/test_option" "good/array_powe
 ADD_TEST(test_option_memalloc_auto2 "scripts/test_option" "good/auto2.ept" "-memalloc")
 ADD_TEST(test_option_memalloc_auto "scripts/test_option" "good/auto.ept" "-memalloc")
 ADD_TEST(test_option_memalloc_autohiera2 "scripts/test_option" "good/autohiera2.ept" "-memalloc")
+ADD_TEST(test_option_memalloc_autohiera3 "scripts/test_option" "good/autohiera3.ept" "-memalloc")
 ADD_TEST(test_option_memalloc_autohiera "scripts/test_option" "good/autohiera.ept" "-memalloc")
 ADD_TEST(test_option_memalloc_bad_updown "scripts/test_option" "good/bad_updown.ept" "-memalloc")
 ADD_TEST(test_option_memalloc_ce "scripts/test_option" "good/ce.ept" "-memalloc")
@@ -630,6 +645,7 @@ ADD_TEST(test_option_memalloc_clock_causality "scripts/test_option" "good/clock_
 ADD_TEST(test_option_memalloc_clocks "scripts/test_option" "good/clocks.ept" "-memalloc")
 ADD_TEST(test_option_memalloc_contract_automaton "scripts/test_option" "good/contract_automaton.ept" "-memalloc")
 ADD_TEST(test_option_memalloc_contract "scripts/test_option" "good/contract.ept" "-memalloc")
+ADD_TEST(test_option_memalloc_contrenum "scripts/test_option" "good/contrenum.ept" "-memalloc")
 ADD_TEST(test_option_memalloc_convolutions "scripts/test_option" "good/convolutions.ept" "-memalloc")
 ADD_TEST(test_option_memalloc_counter "scripts/test_option" "good/counter.ept" "-memalloc")
 ADD_TEST(test_option_memalloc_current "scripts/test_option" "good/current.ept" "-memalloc")
@@ -705,6 +721,7 @@ ADD_TEST(test_option_unroll_array_power "scripts/test_option" "good/array_power.
 ADD_TEST(test_option_unroll_auto2 "scripts/test_option" "good/auto2.ept" "-unroll")
 ADD_TEST(test_option_unroll_auto "scripts/test_option" "good/auto.ept" "-unroll")
 ADD_TEST(test_option_unroll_autohiera2 "scripts/test_option" "good/autohiera2.ept" "-unroll")
+ADD_TEST(test_option_unroll_autohiera3 "scripts/test_option" "good/autohiera3.ept" "-unroll")
 ADD_TEST(test_option_unroll_autohiera "scripts/test_option" "good/autohiera.ept" "-unroll")
 ADD_TEST(test_option_unroll_bad_updown "scripts/test_option" "good/bad_updown.ept" "-unroll")
 ADD_TEST(test_option_unroll_ce "scripts/test_option" "good/ce.ept" "-unroll")
@@ -713,6 +730,7 @@ ADD_TEST(test_option_unroll_clock_causality "scripts/test_option" "good/clock_ca
 ADD_TEST(test_option_unroll_clocks "scripts/test_option" "good/clocks.ept" "-unroll")
 ADD_TEST(test_option_unroll_contract_automaton "scripts/test_option" "good/contract_automaton.ept" "-unroll")
 ADD_TEST(test_option_unroll_contract "scripts/test_option" "good/contract.ept" "-unroll")
+ADD_TEST(test_option_unroll_contrenum "scripts/test_option" "good/contrenum.ept" "-unroll")
 ADD_TEST(test_option_unroll_convolutions "scripts/test_option" "good/convolutions.ept" "-unroll")
 ADD_TEST(test_option_unroll_counter "scripts/test_option" "good/counter.ept" "-unroll")
 ADD_TEST(test_option_unroll_current "scripts/test_option" "good/current.ept" "-unroll")
@@ -788,6 +806,7 @@ ADD_TEST(test_option_O_array_power "scripts/test_option" "good/array_power.ept"
 ADD_TEST(test_option_O_auto2 "scripts/test_option" "good/auto2.ept" "-O")
 ADD_TEST(test_option_O_auto "scripts/test_option" "good/auto.ept" "-O")
 ADD_TEST(test_option_O_autohiera2 "scripts/test_option" "good/autohiera2.ept" "-O")
+ADD_TEST(test_option_O_autohiera3 "scripts/test_option" "good/autohiera3.ept" "-O")
 ADD_TEST(test_option_O_autohiera "scripts/test_option" "good/autohiera.ept" "-O")
 ADD_TEST(test_option_O_bad_updown "scripts/test_option" "good/bad_updown.ept" "-O")
 ADD_TEST(test_option_O_ce "scripts/test_option" "good/ce.ept" "-O")
@@ -796,6 +815,7 @@ ADD_TEST(test_option_O_clock_causality "scripts/test_option" "good/clock_causali
 ADD_TEST(test_option_O_clocks "scripts/test_option" "good/clocks.ept" "-O")
 ADD_TEST(test_option_O_contract_automaton "scripts/test_option" "good/contract_automaton.ept" "-O")
 ADD_TEST(test_option_O_contract "scripts/test_option" "good/contract.ept" "-O")
+ADD_TEST(test_option_O_contrenum "scripts/test_option" "good/contrenum.ept" "-O")
 ADD_TEST(test_option_O_convolutions "scripts/test_option" "good/convolutions.ept" "-O")
 ADD_TEST(test_option_O_counter "scripts/test_option" "good/counter.ept" "-O")
 ADD_TEST(test_option_O_current "scripts/test_option" "good/current.ept" "-O")
@@ -871,6 +891,7 @@ ADD_TEST(compile_javac_run_array_power "scripts/compile_javac_run" "good/array_p
 ADD_TEST(compile_javac_run_auto2 "scripts/compile_javac_run" "good/auto2.ept")
 ADD_TEST(compile_javac_run_auto "scripts/compile_javac_run" "good/auto.ept")
 ADD_TEST(compile_javac_run_autohiera2 "scripts/compile_javac_run" "good/autohiera2.ept")
+ADD_TEST(compile_javac_run_autohiera3 "scripts/compile_javac_run" "good/autohiera3.ept")
 ADD_TEST(compile_javac_run_autohiera "scripts/compile_javac_run" "good/autohiera.ept")
 ADD_TEST(compile_javac_run_bad_updown "scripts/compile_javac_run" "good/bad_updown.ept")
 ADD_TEST(compile_javac_run_ce "scripts/compile_javac_run" "good/ce.ept")
@@ -879,6 +900,7 @@ ADD_TEST(compile_javac_run_clock_causality "scripts/compile_javac_run" "good/clo
 ADD_TEST(compile_javac_run_clocks "scripts/compile_javac_run" "good/clocks.ept")
 ADD_TEST(compile_javac_run_contract_automaton "scripts/compile_javac_run" "good/contract_automaton.ept")
 ADD_TEST(compile_javac_run_contract "scripts/compile_javac_run" "good/contract.ept")
+ADD_TEST(compile_javac_run_contrenum "scripts/compile_javac_run" "good/contrenum.ept")
 ADD_TEST(compile_javac_run_convolutions "scripts/compile_javac_run" "good/convolutions.ept")
 ADD_TEST(compile_javac_run_counter "scripts/compile_javac_run" "good/counter.ept")
 ADD_TEST(compile_javac_run_current "scripts/compile_javac_run" "good/current.ept")
@@ -943,3 +965,6 @@ ADD_TEST(compile_javac_run_tuple_args "scripts/compile_javac_run" "good/tuple_ar
 ADD_TEST(compile_javac_run_type_alias "scripts/compile_javac_run" "good/type_alias.ept")
 ADD_TEST(compile_javac_run_updown "scripts/compile_javac_run" "good/updown.ept")
 ADD_TEST(compile_javac_run_when_merge1 "scripts/compile_javac_run" "good/when_merge1.ept")
+ADD_TEST(compile_sdc_run_modular "scripts/compile_sdc_run" "sdc/modular.ept")
+ADD_TEST(compile_sdc_run_office "scripts/compile_sdc_run" "sdc/office.ept")
+ADD_TEST(compile_sdc_run_tracking "scripts/compile_sdc_run" "sdc/tracking.ept")
diff --git a/test/gen_ctests b/test/gen_ctests
index 557962c..584596e 100755
--- a/test/gen_ctests
+++ b/test/gen_ctests
@@ -33,5 +33,11 @@ compile_diff "unroll"
 compile_diff "O"
 
 for i in good/*.ept; do
-    echo 'ADD_TEST(compile_javac_run_'`basename $i .ept` '"scripts/compile_javac_run"' '"'$i'")'
+    name=`basename $i .ept`
+    echo "ADD_TEST(compile_javac_run_${name} \"scripts/compile_javac_run\" \"${i}\")"
+done
+
+for i in sdc/*.ept; do
+    name=`basename $i .ept`
+    echo "ADD_TEST(compile_sdc_run_${name} \"scripts/compile_sdc_run\" \"${i}\")"
 done