diff --git a/.github/workflows/gradle-nightly-tests.yml b/.github/workflows/gradle-nightly-tests.yml
index ab9bf2777..307fa1407 100644
--- a/.github/workflows/gradle-nightly-tests.yml
+++ b/.github/workflows/gradle-nightly-tests.yml
@@ -41,7 +41,7 @@ jobs:
           go install github.com/consensys/go-corset/cmd/go-corset@latest
 
       - name: Run Nightly tests
-        run: GOMEMLIMIT=196GiB ./gradlew nightlyTests
+        run: GOMEMLIMIT=100GiB ./gradlew nightlyTests
         env:
           JAVA_OPTS: -Dorg.gradle.daemon=false
           CORSET_FLAGS: disable
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index e46048e05..31448819a 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -144,18 +144,18 @@ jobs:
           go install github.com/consensys/go-corset/cmd/go-corset@latest
 
       - name: Run unit tests
-        run: GOMEMLIMIT=32GiB ./gradlew :arithmetization:test
+        run: GOMEMLIMIT=26GiB ./gradlew :arithmetization:test
         env:
           JAVA_OPTS: -Dorg.gradle.daemon=false
           CORSET_FLAGS: disable
-          GOCORSET_FLAGS: -wd --ansi-escapes=false --report --air
+          GOCORSET_FLAGS: -b1024 -wd --ansi-escapes=false --report --air
 
       - name: Run replay tests
-        run: GOMEMLIMIT=32GiB ./gradlew :arithmetization:fastReplayTests
+        run: GOMEMLIMIT=26GiB ./gradlew :arithmetization:fastReplayTests
         env:
           JAVA_OPTS: -Dorg.gradle.daemon=false
           CORSET_FLAGS: disable
-          GOCORSET_FLAGS: -wd --ansi-escapes=false --report --air
+          GOCORSET_FLAGS: -b1024 -wd --ansi-escapes=false --report --air
 
       - name: Upload test report
         if: always()
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 763f347f4..c345a2877 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -9,18 +9,16 @@ repos:
       - id: check-yaml
       - id: check-xml
   - repo: https://github.com/commitizen-tools/commitizen
-    rev: 3.5.3
+    rev: v3.29.1
     hooks:
       - id: commitizen
         stages: [ commit-msg ]
   - repo: https://github.com/jguttman94/pre-commit-gradle
     rev: v0.3.0  # Use the ref you want to point at
     hooks:
-      - id: gradle-check
-        args: [ "--wrapper", "--output" ]
       - id: gradle-spotless
         args: [ "--wrapper", "--output" ]
   - repo: https://github.com/executablebooks/mdformat
-    rev: 0.7.14
+    rev: 0.7.17
     hooks:
       - id: mdformat
diff --git a/arithmetization/src/test/java/net/consensys/linea/replaytests/Issue1216Tests.java b/arithmetization/src/test/java/net/consensys/linea/replaytests/Issue1216Tests.java
index e022b5117..38514d60a 100644
--- a/arithmetization/src/test/java/net/consensys/linea/replaytests/Issue1216Tests.java
+++ b/arithmetization/src/test/java/net/consensys/linea/replaytests/Issue1216Tests.java
@@ -20,6 +20,7 @@
 import net.consensys.linea.zktracer.module.hub.AccountSnapshot;
 import net.consensys.linea.zktracer.module.hub.Hub;
 import org.hyperledger.besu.datatypes.Address;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
@@ -41,6 +42,7 @@ public class Issue1216Tests {
    * blowing up with a NPE since the "after" version of the self destructor didn't exist yet in the
    * code. This was solved in issue #1216.
    */
+  @Disabled
   @Tag("nightly")
   @Tag("replay")
   @Test
diff --git a/arithmetization/src/test/java/net/consensys/linea/replaytests/NightlyTests.java b/arithmetization/src/test/java/net/consensys/linea/replaytests/NightlyTests.java
index 7c00cdd7c..c85dd893a 100644
--- a/arithmetization/src/test/java/net/consensys/linea/replaytests/NightlyTests.java
+++ b/arithmetization/src/test/java/net/consensys/linea/replaytests/NightlyTests.java
@@ -22,6 +22,11 @@
 
 @Tag("nightly")
 public class NightlyTests {
+  @Test
+  void leoFailingRange() {
+    replay(LINEA_MAINNET, "5389571-5389577.json.gz");
+  }
+
   // Leo's range split up 5104800-5104883
   ///////////////////////////////////////
   @Test
diff --git a/arithmetization/src/test/java/net/consensys/linea/replaytests/ReplayTests.java b/arithmetization/src/test/java/net/consensys/linea/replaytests/ReplayTests.java
index 6a4bdfaa9..ba0b84e06 100644
--- a/arithmetization/src/test/java/net/consensys/linea/replaytests/ReplayTests.java
+++ b/arithmetization/src/test/java/net/consensys/linea/replaytests/ReplayTests.java
@@ -51,12 +51,6 @@ void bulkReplay() {
     // bulkReplay(LINEA_MAINNET, "");
   }
 
-  @Disabled
-  @Test
-  void leoFailingRange() {
-    replay(LINEA_MAINNET, "5389571-5389577.json.gz");
-  }
-
   // @Disabled
   @Test
   void failingMmuModexp() {
diff --git a/gradle/tests.gradle b/gradle/tests.gradle
index 072af11b8..0a43b0dda 100644
--- a/gradle/tests.gradle
+++ b/gradle/tests.gradle
@@ -190,4 +190,3 @@ tasks.register("weeklyTests", Test) {
     includeTags("weekly")
   }
 }
-
diff --git a/reference-tests/src/test/java/net/consensys/linea/BlockchainReferenceTestTools.java b/reference-tests/src/test/java/net/consensys/linea/BlockchainReferenceTestTools.java
index 635543384..17d4111be 100644
--- a/reference-tests/src/test/java/net/consensys/linea/BlockchainReferenceTestTools.java
+++ b/reference-tests/src/test/java/net/consensys/linea/BlockchainReferenceTestTools.java
@@ -185,7 +185,8 @@ public static void executeTest(final BlockchainReferenceTestCaseSpec spec) {
     zkTracer.traceStartConflation(spec.getCandidateBlocks().length);
 
     for (var candidateBlock : spec.getCandidateBlocks()) {
-      if (!candidateBlock.isExecutable()) {
+      if (!candidateBlock.isExecutable()
+          || candidateBlock.getBlock().getBody().getTransactions().isEmpty()) {
         return;
       }