diff --git a/kevm-pyk/pyproject.toml b/kevm-pyk/pyproject.toml
index 83eb304044..bff9e5f028 100644
--- a/kevm-pyk/pyproject.toml
+++ b/kevm-pyk/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "kevm-pyk"
-version = "1.0.620"
+version = "1.0.621"
 description = ""
 authors = [
     "Runtime Verification, Inc. <contact@runtimeverification.com>",
diff --git a/kevm-pyk/src/kevm_pyk/__init__.py b/kevm-pyk/src/kevm_pyk/__init__.py
index 1a8fd9effa..4e34bc811b 100644
--- a/kevm-pyk/src/kevm_pyk/__init__.py
+++ b/kevm-pyk/src/kevm_pyk/__init__.py
@@ -5,4 +5,4 @@
 if TYPE_CHECKING:
     from typing import Final
 
-VERSION: Final = '1.0.620'
+VERSION: Final = '1.0.621'
diff --git a/kevm-pyk/src/tests/integration/test_conformance.py b/kevm-pyk/src/tests/integration/test_conformance.py
index c7d119a69e..b3da8ac9d1 100644
--- a/kevm-pyk/src/tests/integration/test_conformance.py
+++ b/kevm-pyk/src/tests/integration/test_conformance.py
@@ -34,12 +34,16 @@
 
 
 def _test(gst_file: Path, schedule: str, mode: str, chainid: int, usegas: bool) -> None:
+    skipped_gst_tests = SKIPPED_TESTS.get(gst_file, [])
+    if '*' in skipped_gst_tests:
+        pytest.skip()
+
     with gst_file.open() as f:
         gst_data = json.load(f)
 
     for test_name, test in gst_data.items():
         _LOGGER.info(f'Running test: {gst_file} - {test_name}')
-        if test_name in SKIPPED_TESTS.get(gst_file, []):
+        if test_name in skipped_gst_tests:
             continue
         res = interpret({test_name: test}, schedule, mode, chainid, usegas, check=False)
         _assert_exit_code_zero(res)
@@ -79,9 +83,8 @@ def read_csv_file(csv_file: Path) -> tuple[tuple[Path, str], ...]:
 SKIPPED_TESTS: Final = _skipped_tests()
 
 VM_TEST_DIR: Final = TEST_DIR / 'BlockchainTests/GeneralStateTests/VMTests'
-ALL_VM_TESTS: Final = tuple(VM_TEST_DIR.glob('*/*.json'))
-VM_TESTS: Final = tuple(test_file for test_file in ALL_VM_TESTS if test_file not in SKIPPED_TESTS)
-REST_VM_TESTS: Final = tuple(test_file for test_file in ALL_VM_TESTS if test_file in SKIPPED_TESTS)
+VM_TESTS: Final = tuple(VM_TEST_DIR.glob('*/*.json'))
+SKIPPED_VM_TESTS: Final = tuple(test_file for test_file in VM_TESTS if test_file in SKIPPED_TESTS)
 
 
 @pytest.mark.parametrize(
@@ -96,27 +99,23 @@ def test_vm(test_file: Path) -> None:
 @pytest.mark.skip(reason='failing / slow VM tests')
 @pytest.mark.parametrize(
     'test_file',
-    REST_VM_TESTS,
-    ids=[str(test_file.relative_to(VM_TEST_DIR)) for test_file in REST_VM_TESTS],
+    SKIPPED_VM_TESTS,
+    ids=[str(test_file.relative_to(VM_TEST_DIR)) for test_file in SKIPPED_VM_TESTS],
 )
 def test_rest_vm(test_file: Path) -> None:
     _test(test_file, 'DEFAULT', 'VMTESTS', 1, True)
 
 
-BCHAIN_TEST_DIR: Final = TEST_DIR / 'BlockchainTests/GeneralStateTests'
-ALL_BCHAIN_TESTS: Final = tuple(BCHAIN_TEST_DIR.glob('**/*.json'))
-BCHAIN_TESTS: Final = tuple(
-    test_file for test_file in ALL_BCHAIN_TESTS if test_file not in (list(SKIPPED_TESTS) + list(ALL_VM_TESTS))
-)
-REST_BCHAIN_TESTS: Final = tuple(
-    test_file for test_file in ALL_BCHAIN_TESTS if test_file in SKIPPED_TESTS and test_file not in ALL_VM_TESTS
-)
+ALL_TEST_DIR: Final = TEST_DIR / 'BlockchainTests/GeneralStateTests'
+ALL_TESTS: Final = tuple(ALL_TEST_DIR.glob('**/*.json'))
+BCHAIN_TESTS: Final = tuple(test_file for test_file in ALL_TESTS if test_file not in set(VM_TESTS))
+SKIPPED_BCHAIN_TESTS: Final = tuple(test_file for test_file in BCHAIN_TESTS if test_file in SKIPPED_TESTS)
 
 
 @pytest.mark.parametrize(
     'test_file',
     BCHAIN_TESTS,
-    ids=[str(test_file.relative_to(TEST_DIR)) for test_file in BCHAIN_TESTS],
+    ids=[str(test_file.relative_to(ALL_TEST_DIR)) for test_file in BCHAIN_TESTS],
 )
 def test_bchain(test_file: Path) -> None:
     _test(test_file, 'SHANGHAI', 'NORMAL', 1, True)
@@ -125,8 +124,8 @@ def test_bchain(test_file: Path) -> None:
 @pytest.mark.skip(reason='failing / slow blockchain tests')
 @pytest.mark.parametrize(
     'test_file',
-    REST_BCHAIN_TESTS,
-    ids=[str(test_file.relative_to(TEST_DIR)) for test_file in REST_BCHAIN_TESTS],
+    SKIPPED_BCHAIN_TESTS,
+    ids=[str(test_file.relative_to(ALL_TEST_DIR)) for test_file in SKIPPED_BCHAIN_TESTS],
 )
 def test_rest_bchain(test_file: Path) -> None:
     _test(test_file, 'SHANGHAI', 'NORMAL', 1, True)
diff --git a/package/version b/package/version
index f669c74ee6..5825a8dee0 100644
--- a/package/version
+++ b/package/version
@@ -1 +1 @@
-1.0.620
+1.0.621
diff --git a/tests/slow.llvm b/tests/slow.llvm
index 7816608b34..1dbe6b41f3 100644
--- a/tests/slow.llvm
+++ b/tests/slow.llvm
@@ -1,90 +1,2 @@
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopMul.json,loopMul_d0g0v0_Berlin
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopMul.json,loopMul_d0g0v0_Istanbul
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopMul.json,loopMul_d0g0v0_London
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopMul.json,loopMul_d0g0v0_Merge
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopMul.json,loopMul_d0g0v0_Shanghai
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopMul.json,loopMul_d1g0v0_Berlin
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopMul.json,loopMul_d1g0v0_Istanbul
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopMul.json,loopMul_d1g0v0_London
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopMul.json,loopMul_d1g0v0_Merge
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopMul.json,loopMul_d1g0v0_Shanghai
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopMul.json,loopMul_d2g0v0_Berlin
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopMul.json,loopMul_d2g0v0_Istanbul
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopMul.json,loopMul_d2g0v0_London
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopMul.json,loopMul_d2g0v0_Merge
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopMul.json,loopMul_d2g0v0_Shanghai
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d0g0v0_Berlin
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d0g0v0_Istanbul
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d0g0v0_London
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d0g0v0_Merge
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d0g0v0_Shanghai
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d10g0v0_Berlin
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d10g0v0_Istanbul
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d10g0v0_London
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d10g0v0_Merge
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d10g0v0_Shanghai
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d11g0v0_Berlin
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d11g0v0_Istanbul
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d11g0v0_London
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d11g0v0_Merge
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d11g0v0_Shanghai
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d12g0v0_Berlin
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d12g0v0_Istanbul
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d12g0v0_London
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d12g0v0_Merge
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d12g0v0_Shanghai
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d13g0v0_Berlin
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d13g0v0_Istanbul
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d13g0v0_London
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d13g0v0_Merge
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d13g0v0_Shanghai
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d14g0v0_Berlin
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d14g0v0_Istanbul
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d14g0v0_London
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d14g0v0_Merge
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d14g0v0_Shanghai
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d1g0v0_Berlin
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d1g0v0_Istanbul
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d1g0v0_London
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d1g0v0_Merge
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d1g0v0_Shanghai
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d2g0v0_Berlin
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d2g0v0_Istanbul
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d2g0v0_London
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d2g0v0_Merge
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d2g0v0_Shanghai
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d3g0v0_Berlin
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d3g0v0_Istanbul
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d3g0v0_London
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d3g0v0_Merge
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d3g0v0_Shanghai
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d4g0v0_Berlin
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d4g0v0_Istanbul
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d4g0v0_London
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d4g0v0_Merge
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d4g0v0_Shanghai
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d5g0v0_Berlin
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d5g0v0_Istanbul
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d5g0v0_London
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d5g0v0_Merge
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d5g0v0_Shanghai
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d6g0v0_Berlin
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d6g0v0_Istanbul
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d6g0v0_London
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d6g0v0_Merge
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d6g0v0_Shanghai
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d7g0v0_Berlin
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d7g0v0_Istanbul
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d7g0v0_London
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d7g0v0_Merge
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d7g0v0_Shanghai
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d8g0v0_Berlin
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d8g0v0_Istanbul
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d8g0v0_London
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d8g0v0_Merge
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d8g0v0_Shanghai
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d9g0v0_Berlin
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d9g0v0_Istanbul
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d9g0v0_London
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d9g0v0_Merge
-BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,loopExp_d9g0v0_Shanghai
+BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopMul.json,*
+BlockchainTests/GeneralStateTests/VMTests/vmPerformance/loopExp.json,*