diff --git a/tests/arith_tree/arith_tree_add_chains.ys b/tests/arith_tree/arith_tree_add_chains.ys
index 7fd59e2ee..f293ed9da 100644
--- a/tests/arith_tree/arith_tree_add_chains.ys
+++ b/tests/arith_tree/arith_tree_add_chains.ys
@@ -8,7 +8,7 @@ endmodule
 EOT
 hierarchy -auto-top
 proc
-arith_tree -final ripple
+arith_tree
 select -assert-count 1 t:$fa
 select -assert-count 1 t:$add
 design -reset
@@ -23,7 +23,7 @@ endmodule
 EOT
 hierarchy -auto-top
 proc
-arith_tree -final ripple
+arith_tree
 select -assert-count 3 t:$fa
 select -assert-count 1 t:$add
 design -reset
@@ -38,7 +38,7 @@ endmodule
 EOT
 hierarchy -auto-top
 proc
-arith_tree -final ripple
+arith_tree
 select -assert-count 6 t:$fa
 select -assert-count 1 t:$add
 design -reset
@@ -55,7 +55,7 @@ endmodule
 EOT
 hierarchy -auto-top
 proc
-arith_tree -final ripple
+arith_tree
 select -assert-count 14 t:$fa
 select -assert-count 1 t:$add
 design -reset
@@ -76,7 +76,7 @@ endmodule
 EOT
 hierarchy -auto-top
 select -assert-count 2 t:$alu
-arith_tree -final ripple
+arith_tree
 opt_clean
 select -assert-count 1 t:$fa
 select -assert-count 1 t:$add
@@ -102,7 +102,7 @@ endmodule
 EOT
 hierarchy -auto-top
 select -assert-count 3 t:$alu
-arith_tree -final ripple
+arith_tree
 opt_clean
 select -assert-count 2 t:$fa
 select -assert-count 1 t:$add
@@ -131,7 +131,7 @@ endmodule
 EOT
 hierarchy -auto-top
 select -assert-count 4 t:$alu
-arith_tree -final ripple
+arith_tree
 opt_clean
 select -assert-count 3 t:$fa
 select -assert-count 1 t:$add
@@ -151,7 +151,7 @@ hierarchy -auto-top
 proc
 alumacc
 opt
-arith_tree -final ripple
+arith_tree
 opt_clean
 select -assert-count 1 t:$fa
 select -assert-count 1 t:$add
@@ -170,7 +170,7 @@ hierarchy -auto-top
 proc
 alumacc
 opt
-arith_tree -final ripple
+arith_tree
 opt_clean
 select -assert-count 3 t:$fa
 select -assert-count 1 t:$add
@@ -189,7 +189,7 @@ hierarchy -auto-top
 proc
 alumacc
 opt
-arith_tree -final ripple
+arith_tree
 opt_clean
 select -assert-count 6 t:$fa
 select -assert-count 1 t:$add
diff --git a/tests/arith_tree/arith_tree_edge_cases.ys b/tests/arith_tree/arith_tree_edge_cases.ys
index a6dc4b3ac..c7b6ebb53 100644
--- a/tests/arith_tree/arith_tree_edge_cases.ys
+++ b/tests/arith_tree/arith_tree_edge_cases.ys
@@ -8,7 +8,7 @@ endmodule
 EOT
 hierarchy -auto-top
 proc
-arith_tree -final ripple
+arith_tree
 select -assert-count 1 t:$fa
 select -assert-count 1 t:$add
 design -reset
@@ -23,7 +23,7 @@ endmodule
 EOT
 hierarchy -auto-top
 proc
-arith_tree -final ripple
+arith_tree
 select -assert-count 2 t:$fa
 select -assert-count 1 t:$add
 design -reset
@@ -38,7 +38,7 @@ endmodule
 EOT
 hierarchy -auto-top
 proc
-arith_tree -final ripple
+arith_tree
 select -assert-count 2 t:$fa
 select -assert-count 1 t:$add
 design -reset
@@ -56,7 +56,7 @@ endmodule
 EOT
 hierarchy -auto-top
 proc
-arith_tree -final ripple
+arith_tree
 select -assert-count 2 t:$fa
 select -assert-count 1 t:$add
 design -reset
@@ -71,7 +71,7 @@ endmodule
 EOT
 hierarchy -auto-top
 proc
-arith_tree -final ripple
+arith_tree
 select -assert-count 2 t:$fa
 select -assert-count 1 t:$add
 design -reset
@@ -86,7 +86,7 @@ endmodule
 EOT
 hierarchy -auto-top
 proc
-arith_tree -final ripple
+arith_tree
 select -assert-count 2 t:$fa
 select -assert-count 1 t:$add
 design -reset
@@ -101,7 +101,7 @@ endmodule
 EOT
 hierarchy -auto-top
 proc
-arith_tree -final ripple
+arith_tree
 select -assert-count 2 t:$fa
 select -assert-count 1 t:$add
 design -reset
@@ -117,7 +117,7 @@ endmodule
 EOT
 hierarchy -auto-top
 proc
-arith_tree -final ripple
+arith_tree
 select -assert-count 4 t:$fa
 select -assert-count 2 t:$add
 design -reset
@@ -141,7 +141,7 @@ endmodule
 EOT
 hierarchy -auto-top
 proc
-arith_tree -final ripple
+arith_tree
 select -assert-count 2 t:$fa
 select -assert-count 1 t:$add
 design -reset
@@ -158,7 +158,7 @@ hierarchy -auto-top
 proc
 alumacc
 opt_clean
-arith_tree -final ripple
+arith_tree
 select -assert-none t:$fa
 select -assert-none t:$add
 select -assert-none t:$sub
@@ -177,7 +177,7 @@ hierarchy -auto-top
 proc
 alumacc
 opt_clean
-arith_tree -final ripple
+arith_tree
 select -assert-none t:$fa
 select -assert-none t:$add
 select -assert-none t:$sub
@@ -196,7 +196,7 @@ hierarchy -auto-top
 proc
 alumacc
 opt_clean
-arith_tree -final ripple
+arith_tree
 select -assert-none t:$fa
 select -assert-none t:$add
 select -assert-none t:$sub
@@ -215,7 +215,7 @@ hierarchy -auto-top
 proc
 alumacc
 opt
-arith_tree -final ripple
+arith_tree
 opt_clean
 select -assert-none t:$macc t:$macc_v2 %u
 select -assert-none t:$mul
@@ -254,7 +254,7 @@ hierarchy -auto-top
 proc
 alumacc
 opt_clean
-arith_tree -final ripple
+arith_tree
 opt_clean
 select -assert-none t:$fa
 select -assert-count 2 t:$alu
@@ -272,7 +272,7 @@ hierarchy -auto-top
 proc
 alumacc
 opt
-arith_tree -final ripple
+arith_tree
 opt_clean
 select -assert-none t:$fa
 design -reset
@@ -292,7 +292,7 @@ hierarchy -auto-top
 proc
 alumacc
 opt_clean
-arith_tree -final ripple
+arith_tree
 opt_clean
 select -assert-count 2 t:$fa
 select -assert-count 1 t:$add
@@ -312,7 +312,7 @@ hierarchy -auto-top
 proc
 alumacc
 opt_clean
-arith_tree -final ripple
+arith_tree
 opt_clean
 select -assert-count 2 t:$fa
 select -assert-count 1 t:$add
@@ -341,7 +341,7 @@ hierarchy -auto-top
 proc
 alumacc
 opt_clean
-arith_tree -final ripple
+arith_tree
 opt_clean
 select -assert-min 1 t:$dff
 design -reset
@@ -360,7 +360,7 @@ hierarchy -auto-top
 proc
 alumacc
 opt_clean
-arith_tree -final ripple
+arith_tree
 opt_clean
 select -assert-count 1 t:$fa
 select -assert-count 1 t:$add
@@ -380,7 +380,7 @@ hierarchy -auto-top
 proc
 alumacc
 opt_clean
-arith_tree -final ripple
+arith_tree
 opt_clean
 select -assert-count 2 t:$fa
 select -assert-count 1 t:$add
@@ -400,7 +400,7 @@ hierarchy -auto-top
 proc
 alumacc
 opt_clean
-arith_tree -final ripple
+arith_tree
 select -assert-none t:$fa
 select -assert-none t:$add
 select -assert-none t:$sub
@@ -419,7 +419,7 @@ hierarchy -auto-top
 proc
 alumacc
 opt
-arith_tree -final ripple
+arith_tree
 opt_clean
 select -assert-none t:$macc t:$macc_v2 %u
 select -assert-none t:$mul
diff --git a/tests/arith_tree/arith_tree_final_adder.ys b/tests/arith_tree/arith_tree_final_adder.ys
index b8184128a..6c6da792a 100644
--- a/tests/arith_tree/arith_tree_final_adder.ys
+++ b/tests/arith_tree/arith_tree_final_adder.ys
@@ -44,7 +44,7 @@ endmodule
 EOT
 hierarchy -auto-top
 proc
-equiv_opt arith_tree -final ripple
+equiv_opt arith_tree
 design -load postopt
 select -assert-count 1 t:$add
 select -assert-count 0 t:$add a:adder_arch %i
diff --git a/tests/arith_tree/arith_tree_idempotent.ys b/tests/arith_tree/arith_tree_idempotent.ys
index e071b89b7..3ca0fcc90 100644
--- a/tests/arith_tree/arith_tree_idempotent.ys
+++ b/tests/arith_tree/arith_tree_idempotent.ys
@@ -9,11 +9,11 @@ EOT
 hierarchy -auto-top
 proc
 
-arith_tree -final ripple
+arith_tree
 select -assert-count 6 t:$fa
 select -assert-count 1 t:$add
 
-arith_tree -final ripple
+arith_tree
 select -assert-count 6 t:$fa
 select -assert-count 1 t:$add
 select -assert-none t:$sub
@@ -32,13 +32,13 @@ proc
 alumacc
 opt_clean
 
-arith_tree -final ripple
+arith_tree
 select -assert-count 6 t:$fa
 select -assert-count 1 t:$add
 select -assert-none t:$sub
 select -assert-none t:$alu
 
-arith_tree -final ripple
+arith_tree
 select -assert-count 6 t:$fa
 select -assert-count 1 t:$add
 select -assert-none t:$sub
diff --git a/tests/arith_tree/arith_tree_sub_chains.ys b/tests/arith_tree/arith_tree_sub_chains.ys
index 6fd42ca8c..a34cb3868 100644
--- a/tests/arith_tree/arith_tree_sub_chains.ys
+++ b/tests/arith_tree/arith_tree_sub_chains.ys
@@ -8,7 +8,7 @@ endmodule
 EOT
 hierarchy -auto-top
 proc
-arith_tree -final ripple
+arith_tree
 select -assert-count 2 t:$fa
 select -assert-count 1 t:$add
 select -assert-count 1 t:$not
@@ -25,7 +25,7 @@ endmodule
 EOT
 hierarchy -auto-top
 proc
-arith_tree -final ripple
+arith_tree
 select -assert-count 3 t:$fa
 select -assert-count 1 t:$add
 select -assert-count 1 t:$not
@@ -42,7 +42,7 @@ endmodule
 EOT
 hierarchy -auto-top
 proc
-arith_tree -final ripple
+arith_tree
 select -assert-count 3 t:$fa
 select -assert-count 1 t:$add
 select -assert-count 3 t:$not
@@ -59,7 +59,7 @@ endmodule
 EOT
 hierarchy -auto-top
 proc
-arith_tree -final ripple
+arith_tree
 select -assert-count 4 t:$fa
 select -assert-count 1 t:$add
 select -assert-count 2 t:$not
@@ -76,7 +76,7 @@ endmodule
 EOT
 hierarchy -auto-top
 proc
-arith_tree -final ripple
+arith_tree
 select -assert-count 3 t:$fa
 select -assert-count 1 t:$add
 select -assert-count 2 t:$not
@@ -94,7 +94,7 @@ endmodule
 EOT
 hierarchy -auto-top
 proc
-arith_tree -final ripple
+arith_tree
 select -assert-count 2 t:$fa
 select -assert-count 1 t:$add
 select -assert-count 1 t:$not
@@ -113,7 +113,7 @@ hierarchy -auto-top
 proc
 alumacc
 opt_clean
-arith_tree -final ripple
+arith_tree
 opt_clean
 select -assert-count 2 t:$fa
 select -assert-count 1 t:$add
@@ -133,7 +133,7 @@ hierarchy -auto-top
 proc
 alumacc
 opt_clean
-arith_tree -final ripple
+arith_tree
 opt_clean
 select -assert-count 3 t:$fa
 select -assert-count 1 t:$add
@@ -153,7 +153,7 @@ hierarchy -auto-top
 proc
 alumacc
 opt_clean
-arith_tree -final ripple
+arith_tree
 opt_clean
 select -assert-count 3 t:$fa
 select -assert-count 1 t:$add
@@ -173,7 +173,7 @@ hierarchy -auto-top
 proc
 alumacc
 opt_clean
-arith_tree -final ripple
+arith_tree
 opt_clean
 select -assert-count 3 t:$fa
 select -assert-count 1 t:$add
@@ -193,7 +193,7 @@ hierarchy -auto-top
 proc
 alumacc
 opt
-arith_tree -final ripple
+arith_tree
 opt_clean
 select -assert-none t:$macc t:$macc_v2 %u
 select -assert-min 1 t:$fa
@@ -212,7 +212,7 @@ hierarchy -auto-top
 proc
 alumacc
 opt
-arith_tree -final ripple
+arith_tree
 opt_clean
 select -assert-none t:$macc t:$macc_v2 %u
 select -assert-min 1 t:$fa
@@ -232,7 +232,7 @@ hierarchy -auto-top
 proc
 alumacc
 opt
-arith_tree -final ripple
+arith_tree
 opt_clean
 select -assert-none t:$macc t:$macc_v2 %u
 select -assert-count 4 t:$fa