diff --git a/.circleci/config.yml b/.circleci/config.yml
index d35651973..920188336 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -35,13 +35,13 @@ commands:
     description: "Restore the cache with pyspec keys"
     steps:
       - restore_cached_venv:
-          venv_name: v25-pyspec
+          venv_name: v24-pyspec
           reqs_checksum: cache-{{ checksum "setup.py" }}-{{ checksum "requirements_preinstallation.txt" }}
   save_pyspec_cached_venv:
     description: Save a venv into a cache with pyspec keys"
     steps:
       - save_cached_venv:
-          venv_name: v25-pyspec
+          venv_name: v24-pyspec
           reqs_checksum: cache-{{ checksum "setup.py" }}-{{ checksum "requirements_preinstallation.txt" }}
           venv_path: ./venv
   restore_deposit_contract_tester_cached_venv:
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index ba5e11304..f32311fa5 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -12,7 +12,7 @@ on:
     branches:
       - dev 
       - master
-  pull_request:
+  pull_request:    
   workflow_dispatch:
     inputs:
       test_preset_type:
@@ -111,4 +111,4 @@ jobs:
             ls -la ./
             rm -rf ./* || true
             rm -rf ./.??* || true
-            ls -la ./
\ No newline at end of file
+            ls -la ./
diff --git a/tests/core/pyspec/eth2spec/test/whisk/block_processing/test_process_shuffled_trackers.py b/tests/core/pyspec/eth2spec/test/whisk/block_processing/test_process_shuffled_trackers.py
index 79c04fd30..e0411870a 100644
--- a/tests/core/pyspec/eth2spec/test/whisk/block_processing/test_process_shuffled_trackers.py
+++ b/tests/core/pyspec/eth2spec/test/whisk/block_processing/test_process_shuffled_trackers.py
@@ -107,19 +107,7 @@ def test_invalid_shuffle_bad_trackers_zero(spec, state):
     body.whisk_post_shuffle_trackers[0] = spec.WhiskTracker()
     yield from run_process_shuffled_trackers(spec, state, body, valid=False)
 
-# TODO: This test does not fail
-# @with_whisk_and_later
-# @spec_state_test
-# def test_invalid_shuffle_bad_trackers_swap(spec, state):
-#     body = empty_block_body(spec)
-#     set_correct_shuffle_proofs(spec, state, body)
-#     assert body.whisk_post_shuffle_trackers[0] != body.whisk_post_shuffle_trackers[1]
-#     tracker_0 = body.whisk_post_shuffle_trackers[0]
-#     body.whisk_post_shuffle_trackers[0] = body.whisk_post_shuffle_trackers[1]
-#     body.whisk_post_shuffle_trackers[1] = tracker_0
-#     yield from run_process_shuffled_trackers(spec, state, body, valid=False)
-
-# Invalid things on gap
+# Invalid cases on gap
 # - not empty shuffle trackers
 # - not empty proof