diff --git a/Cargo.lock b/Cargo.lock
index 00cc81ef..cc6c0539 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4644,7 +4644,7 @@ version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "03c3c6b7927ffe7ecaa769ee0e3994da3b8cafc8f444578982c83ecb161af917"
 dependencies = [
- "heck 0.5.0",
+ "heck 0.4.1",
  "proc-macro2",
  "quote",
  "syn",
@@ -4719,9 +4719,9 @@ dependencies = [
 
 [[package]]
 name = "sqlplannertest"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3510ad2ca50c652ccef035ae6fe3596c306f365a1319d8ca116f01381127a335"
+checksum = "d5fa1bbd1b93ed508085086dfdfec2cd5641ae520b42bbd973af0a8a0451aabf"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -4734,6 +4734,7 @@ dependencies = [
  "serde_yaml",
  "similar",
  "tokio",
+ "tracing",
 ]
 
 [[package]]
diff --git a/datafusion-optd-cli/tests/cli_integration.rs b/datafusion-optd-cli/tests/cli_integration.rs
index 27145df7..cd2a5fbd 100644
--- a/datafusion-optd-cli/tests/cli_integration.rs
+++ b/datafusion-optd-cli/tests/cli_integration.rs
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use std::process::Command;
+use std::process::{Command, Stdio};
 
 use assert_cmd::prelude::CommandCargoExt;
 
@@ -55,11 +55,8 @@ fn init() {
 fn cli_test_tpch() {
     let mut cmd = Command::cargo_bin("datafusion-optd-cli").unwrap();
     cmd.current_dir(".."); // all paths in `test.sql` assume we're in the base dir of the repo
-    cmd.args([
-        "--enable-df-logical",
-        "--file",
-        "datafusion-optd-cli/tpch-sf0_01/test.sql",
-    ]);
+    cmd.args(["--file", "datafusion-optd-cli/tpch-sf0_01/test.sql"]);
+    cmd.stdout(Stdio::piped()).stderr(Stdio::piped());
     let status = cmd.status().unwrap();
     assert!(
         status.success(),
diff --git a/optd-core/src/cascades/optimizer.rs b/optd-core/src/cascades/optimizer.rs
index 7d2abfdc..ff0b8e8a 100644
--- a/optd-core/src/cascades/optimizer.rs
+++ b/optd-core/src/cascades/optimizer.rs
@@ -297,7 +297,7 @@ impl<T: NodeType, M: Memo<T>> CascadesOptimizer<T, M> {
         trace!(event = "fire_optimize_tasks", root_group_id = %group_id);
         let mut task = TaskContext::new(self);
         // 32MB stack for the optimization process, TODO: reduce memory footprint
-        stacker::maybe_grow(32 * 1024 * 1024, 32 * 1024 * 1024, || {
+        stacker::grow(32 * 1024 * 1024, || {
             let fut: Pin<Box<dyn Future<Output = ()>>> = Box::pin(task.fire_optimize(group_id));
             fut.block_on();
         });
diff --git a/optd-core/src/cascades/tasks2.rs b/optd-core/src/cascades/tasks2.rs
index 5644ab7f..a1961804 100644
--- a/optd-core/src/cascades/tasks2.rs
+++ b/optd-core/src/cascades/tasks2.rs
@@ -160,10 +160,14 @@ impl<'a, T: NodeType, M: Memo<T>> TaskContext<'a, T, M> {
                 continue;
             }
             // Skip transformation rules when budget is used
-            if self.optimizer.ctx.logical_budget_used && !rule.is_impl_rule() {
+            if (self.optimizer.ctx.logical_budget_used || self.optimizer.ctx.all_budget_used)
+                && !rule.is_impl_rule()
+            {
                 continue;
             }
-            if self.optimizer.ctx.all_budget_used {
+            if self.optimizer.ctx.all_budget_used
+                && self.optimizer.get_group_winner(group_id).has_full_winner()
+            {
                 break;
             }
             if top_matches(rule.matcher(), expr.typ.clone()) {
@@ -246,7 +250,8 @@ impl<'a, T: NodeType, M: Memo<T>> TaskContext<'a, T, M> {
         let rule = self.optimizer.rules()[rule_id].clone();
 
         let binding_exprs = match_and_pick_expr(rule.matcher(), expr_id, self.optimizer);
-        if binding_exprs.len() >= 100 {
+        const BINDING_EXPR_WARNING_THRESHOLD: usize = 200;
+        if binding_exprs.len() >= BINDING_EXPR_WARNING_THRESHOLD {
             tracing::warn!(
                 event = "rule_application",
                 task = "apply_rule",
@@ -302,12 +307,16 @@ impl<'a, T: NodeType, M: Memo<T>> TaskContext<'a, T, M> {
                 }
             }
 
-            if self.optimizer.ctx.all_budget_used {
-                break;
-            }
-            if self.optimizer.ctx.logical_budget_used && !rule.is_impl_rule() {
+            if (self.optimizer.ctx.logical_budget_used || self.optimizer.ctx.all_budget_used)
+                && !rule.is_impl_rule()
+            {
                 continue;
             }
+            if self.optimizer.ctx.all_budget_used
+                && self.optimizer.get_group_winner(group_id).has_full_winner()
+            {
+                break;
+            }
 
             trace!(event = "before_apply_rule", task = "apply_rule", input_binding=%binding);
             let applied = rule.apply(self.optimizer, binding);
@@ -540,7 +549,7 @@ impl<'a, T: NodeType, M: Memo<T>> TaskContext<'a, T, M> {
 
     fn on_task_start(&self) {
         if (self.optimizer.ctx.all_budget_used || self.optimizer.ctx.logical_budget_used)
-            && self.steps % 100 == 0
+            && self.steps % 100000 == 0
         {
             println!("out of budget, dumping info");
             println!("step={}", self.steps);
diff --git a/optd-sqlplannertest/Cargo.toml b/optd-sqlplannertest/Cargo.toml
index 66f7d130..e25a1193 100644
--- a/optd-sqlplannertest/Cargo.toml
+++ b/optd-sqlplannertest/Cargo.toml
@@ -13,7 +13,7 @@ repository = { workspace = true }
 [dependencies]
 clap = { version = "4.5.4", features = ["derive"] }
 anyhow = { version = "1", features = ["backtrace"] }
-sqlplannertest = "0.4"
+sqlplannertest = "0.4.1"
 async-trait = "0.1"
 datafusion-optd-cli = { path = "../datafusion-optd-cli", version = "43.0.0" }
 optd-datafusion-repr-adv-cost = { path = "../optd-datafusion-repr-adv-cost", version = "0.1" }