diff --git a/src/tests/JIT/Methodical/explicit/coverage/expl_byte_1.cs b/src/tests/JIT/Methodical/explicit/coverage/expl_byte_1.cs
index 91abb660d75297..b5d2439989dbfa 100644
--- a/src/tests/JIT/Methodical/explicit/coverage/expl_byte_1.cs
+++ b/src/tests/JIT/Methodical/explicit/coverage/expl_byte_1.cs
@@ -70,15 +70,18 @@ public static void reset()
         BB.f_init = new AA(100);
         BB.f_zero = new AA(0);
     }
+}
+
+internal struct BB
+{
+    public static AA f_init, f_zero;
+}
 
+public static class Test_expl_byte_1
+{
     [Fact]
     public static int TestEntrypoint()
     {
         return TestApp.RunAllTests();
     }
 }
-
-internal struct BB
-{
-    public static AA f_init, f_zero;
-}
diff --git a/src/tests/JIT/Methodical/explicit/coverage/expl_double_1.cs b/src/tests/JIT/Methodical/explicit/coverage/expl_double_1.cs
index a96e0985519075..4d1dcfb2b266df 100644
--- a/src/tests/JIT/Methodical/explicit/coverage/expl_double_1.cs
+++ b/src/tests/JIT/Methodical/explicit/coverage/expl_double_1.cs
@@ -61,15 +61,18 @@ public static void reset()
         BB.f_init = new AA(100);
         BB.f_zero = new AA(0);
     }
+}
+
+internal struct BB
+{
+    public static AA f_init, f_zero;
+}
 
+public static class Test_expl_double_1
+{
     [Fact]
     public static int TestEntrypoint()
     {
         return TestApp.RunAllTests();
     }
 }
-
-internal struct BB
-{
-    public static AA f_init, f_zero;
-}
diff --git a/src/tests/JIT/Methodical/explicit/coverage/expl_float_1.cs b/src/tests/JIT/Methodical/explicit/coverage/expl_float_1.cs
index 3c942595d60c70..fd40bb671dd5ea 100644
--- a/src/tests/JIT/Methodical/explicit/coverage/expl_float_1.cs
+++ b/src/tests/JIT/Methodical/explicit/coverage/expl_float_1.cs
@@ -61,15 +61,18 @@ public static void reset()
         BB.f_init = new AA(100);
         BB.f_zero = new AA(0);
     }
+}
+
+internal struct BB
+{
+    public static AA f_init, f_zero;
+}
 
+public static class Test_expl_float_1
+{
     [Fact]
     public static int TestEntrypoint()
     {
         return TestApp.RunAllTests();
     }
 }
-
-internal struct BB
-{
-    public static AA f_init, f_zero;
-}
diff --git a/src/tests/JIT/Methodical/explicit/coverage/expl_gc_byte_1.cs b/src/tests/JIT/Methodical/explicit/coverage/expl_gc_byte_1.cs
index 8811b34e6b0865..730bd14261a2cc 100644
--- a/src/tests/JIT/Methodical/explicit/coverage/expl_gc_byte_1.cs
+++ b/src/tests/JIT/Methodical/explicit/coverage/expl_gc_byte_1.cs
@@ -64,15 +64,18 @@ public static void reset()
         BB.f_init = new AA(100);
         BB.f_zero = new AA(0);
     }
+}
+
+internal struct BB
+{
+    public static AA f_init, f_zero;
+}
 
+public static class Test_expl_gc_byte_1
+{
     [Fact]
     public static int TestEntrypoint()
     {
         return TestApp.RunAllTests();
     }
 }
-
-internal struct BB
-{
-    public static AA f_init, f_zero;
-}
diff --git a/src/tests/JIT/Methodical/explicit/coverage/expl_gc_double_1.cs b/src/tests/JIT/Methodical/explicit/coverage/expl_gc_double_1.cs
index bf77c5c2ee0e7b..4340a506bc44b5 100644
--- a/src/tests/JIT/Methodical/explicit/coverage/expl_gc_double_1.cs
+++ b/src/tests/JIT/Methodical/explicit/coverage/expl_gc_double_1.cs
@@ -70,15 +70,18 @@ public static void reset()
         BB.f_init = new AA(100);
         BB.f_zero = new AA(0);
     }
+}
+
+internal struct BB
+{
+    public static AA f_init, f_zero;
+}
 
+public static class Test_expl_gc_double_1
+{
     [Fact]
     public static int TestEntrypoint()
     {
         return TestApp.RunAllTests();
     }
 }
-
-internal struct BB
-{
-    public static AA f_init, f_zero;
-}
diff --git a/src/tests/JIT/Methodical/explicit/coverage/expl_gc_float_1.cs b/src/tests/JIT/Methodical/explicit/coverage/expl_gc_float_1.cs
index 1bbc86d2a3031a..5f9070e6c4fd4f 100644
--- a/src/tests/JIT/Methodical/explicit/coverage/expl_gc_float_1.cs
+++ b/src/tests/JIT/Methodical/explicit/coverage/expl_gc_float_1.cs
@@ -73,15 +73,18 @@ public static void reset()
         BB.f_init = new AA(100);
         BB.f_zero = new AA(0);
     }
+}
+
+internal struct BB
+{
+    public static AA f_init, f_zero;
+}
 
+public static class Test_expl_gc_float_1
+{
     [Fact]
     public static int TestEntrypoint()
     {
         return TestApp.RunAllTests();
     }
 }
-
-internal struct BB
-{
-    public static AA f_init, f_zero;
-}
diff --git a/src/tests/JIT/Methodical/explicit/coverage/expl_gc_int_1.cs b/src/tests/JIT/Methodical/explicit/coverage/expl_gc_int_1.cs
index fdb6897002c77e..38cb7135f3bb82 100644
--- a/src/tests/JIT/Methodical/explicit/coverage/expl_gc_int_1.cs
+++ b/src/tests/JIT/Methodical/explicit/coverage/expl_gc_int_1.cs
@@ -64,15 +64,18 @@ public static void reset()
         BB.f_init = new AA(100);
         BB.f_zero = new AA(0);
     }
+}
+
+internal struct BB
+{
+    public static AA f_init, f_zero;
+}
 
+public static class Test_expl_gc_int_1
+{
     [Fact]
     public static int TestEntrypoint()
     {
         return TestApp.RunAllTests();
     }
 }
-
-internal struct BB
-{
-    public static AA f_init, f_zero;
-}
diff --git a/src/tests/JIT/Methodical/explicit/coverage/expl_gc_long_1.cs b/src/tests/JIT/Methodical/explicit/coverage/expl_gc_long_1.cs
index c6b7125917b736..fdd41319000450 100644
--- a/src/tests/JIT/Methodical/explicit/coverage/expl_gc_long_1.cs
+++ b/src/tests/JIT/Methodical/explicit/coverage/expl_gc_long_1.cs
@@ -61,15 +61,18 @@ public static void reset()
         BB.f_init = new AA(100);
         BB.f_zero = new AA(0);
     }
+}
+
+internal struct BB
+{
+    public static AA f_init, f_zero;
+}
 
+public static class Test_expl_gc_long_1
+{
     [Fact]
     public static int TestEntrypoint()
     {
         return TestApp.RunAllTests();
     }
 }
-
-internal struct BB
-{
-    public static AA f_init, f_zero;
-}
diff --git a/src/tests/JIT/Methodical/explicit/coverage/expl_gc_obj_1.cs b/src/tests/JIT/Methodical/explicit/coverage/expl_gc_obj_1.cs
index a17b005371e3a6..8c349930f63765 100644
--- a/src/tests/JIT/Methodical/explicit/coverage/expl_gc_obj_1.cs
+++ b/src/tests/JIT/Methodical/explicit/coverage/expl_gc_obj_1.cs
@@ -68,15 +68,18 @@ public static void reset()
         BB.f_init = new AA(100);
         BB.f_zero = new AA(0);
     }
+}
+
+internal struct BB
+{
+    public static AA f_init, f_zero;
+}
 
+public static class Test_expl_gc_obj_1
+{
     [Fact]
     public static int TestEntrypoint()
     {
         return TestApp.RunAllTests();
     }
 }
-
-internal struct BB
-{
-    public static AA f_init, f_zero;
-}
diff --git a/src/tests/JIT/Methodical/explicit/coverage/expl_gc_short_1.cs b/src/tests/JIT/Methodical/explicit/coverage/expl_gc_short_1.cs
index f8f913867e924e..ac765a840a062c 100644
--- a/src/tests/JIT/Methodical/explicit/coverage/expl_gc_short_1.cs
+++ b/src/tests/JIT/Methodical/explicit/coverage/expl_gc_short_1.cs
@@ -70,15 +70,18 @@ public static void reset()
         BB.f_init = new AA(100);
         BB.f_zero = new AA(0);
     }
+}
+
+internal struct BB
+{
+    public static AA f_init, f_zero;
+}
 
+public static class Test_expl_gc_short_1
+{
     [Fact]
     public static int TestEntrypoint()
     {
         return TestApp.RunAllTests();
     }
 }
-
-internal struct BB
-{
-    public static AA f_init, f_zero;
-}
diff --git a/src/tests/JIT/Methodical/explicit/coverage/expl_gc_val_1.cs b/src/tests/JIT/Methodical/explicit/coverage/expl_gc_val_1.cs
index f517ea411ff8bc..884617e275b468 100644
--- a/src/tests/JIT/Methodical/explicit/coverage/expl_gc_val_1.cs
+++ b/src/tests/JIT/Methodical/explicit/coverage/expl_gc_val_1.cs
@@ -77,15 +77,18 @@ public static void reset()
         BB.f_init = new AA(100);
         BB.f_zero = new AA(0);
     }
+}
+
+internal struct BB
+{
+    public static AA f_init, f_zero;
+}
 
+public static class Test_expl_gc_val_1
+{
     [Fact]
     public static int TestEntrypoint()
     {
         return TestApp.RunAllTests();
     }
 }
-
-internal struct BB
-{
-    public static AA f_init, f_zero;
-}
diff --git a/src/tests/JIT/Methodical/explicit/coverage/expl_int_1.cs b/src/tests/JIT/Methodical/explicit/coverage/expl_int_1.cs
index 0f34a1a3165ef3..9d98877a125d24 100644
--- a/src/tests/JIT/Methodical/explicit/coverage/expl_int_1.cs
+++ b/src/tests/JIT/Methodical/explicit/coverage/expl_int_1.cs
@@ -70,15 +70,18 @@ public static void reset()
         BB.f_init = new AA(100);
         BB.f_zero = new AA(0);
     }
+}
+
+internal struct BB
+{
+    public static AA f_init, f_zero;
+}
 
+public static class Test_expl_int_1
+{
     [Fact]
     public static int TestEntrypoint()
     {
         return TestApp.RunAllTests();
     }
 }
-
-internal struct BB
-{
-    public static AA f_init, f_zero;
-}
diff --git a/src/tests/JIT/Methodical/explicit/coverage/expl_long_1.cs b/src/tests/JIT/Methodical/explicit/coverage/expl_long_1.cs
index f99ba8ac4965bd..068609bbd90fb5 100644
--- a/src/tests/JIT/Methodical/explicit/coverage/expl_long_1.cs
+++ b/src/tests/JIT/Methodical/explicit/coverage/expl_long_1.cs
@@ -73,15 +73,18 @@ public static void reset()
         BB.f_init = new AA(100);
         BB.f_zero = new AA(0);
     }
+}
+
+internal struct BB
+{
+    public static AA f_init, f_zero;
+}
 
+public static class Test_expl_long_1
+{
     [Fact]
     public static int TestEntrypoint()
     {
         return TestApp.RunAllTests();
     }
 }
-
-internal struct BB
-{
-    public static AA f_init, f_zero;
-}
diff --git a/src/tests/JIT/Methodical/explicit/coverage/expl_obj_1.cs b/src/tests/JIT/Methodical/explicit/coverage/expl_obj_1.cs
index 2894112f7c0afd..c1dedb69238ac5 100644
--- a/src/tests/JIT/Methodical/explicit/coverage/expl_obj_1.cs
+++ b/src/tests/JIT/Methodical/explicit/coverage/expl_obj_1.cs
@@ -77,15 +77,18 @@ public static void reset()
         BB.f_init = new AA(100);
         BB.f_zero = new AA(0);
     }
+}
+
+internal struct BB
+{
+    public static AA f_init, f_zero;
+}
 
+public static class Test_expl_obj_1
+{
     [Fact]
     public static int TestEntrypoint()
     {
         return TestApp.RunAllTests();
     }
 }
-
-internal struct BB
-{
-    public static AA f_init, f_zero;
-}
diff --git a/src/tests/JIT/Methodical/explicit/coverage/expl_short_1.cs b/src/tests/JIT/Methodical/explicit/coverage/expl_short_1.cs
index e7cbdb032accf2..7caa6d529e8518 100644
--- a/src/tests/JIT/Methodical/explicit/coverage/expl_short_1.cs
+++ b/src/tests/JIT/Methodical/explicit/coverage/expl_short_1.cs
@@ -64,15 +64,18 @@ public static void reset()
         BB.f_init = new AA(100);
         BB.f_zero = new AA(0);
     }
+}
+
+internal struct BB
+{
+    public static AA f_init, f_zero;
+}
 
+public static class Test_expl_short_1
+{
     [Fact]
     public static int TestEntrypoint()
     {
         return TestApp.RunAllTests();
     }
 }
-
-internal struct BB
-{
-    public static AA f_init, f_zero;
-}
diff --git a/src/tests/JIT/Methodical/explicit/coverage/expl_val_1.cs b/src/tests/JIT/Methodical/explicit/coverage/expl_val_1.cs
index 6f88bd27c8ddb5..e8682218930751 100644
--- a/src/tests/JIT/Methodical/explicit/coverage/expl_val_1.cs
+++ b/src/tests/JIT/Methodical/explicit/coverage/expl_val_1.cs
@@ -77,15 +77,18 @@ public static void reset()
         BB.f_init = new AA(100);
         BB.f_zero = new AA(0);
     }
+}
+
+internal struct BB
+{
+    public static AA f_init, f_zero;
+}
 
+public static class Test_expl_val_1
+{
     [Fact]
     public static int TestEntrypoint()
     {
         return TestApp.RunAllTests();
     }
 }
-
-internal struct BB
-{
-    public static AA f_init, f_zero;
-}
diff --git a/src/tests/JIT/Methodical/explicit/coverage/seq_byte_1.cs b/src/tests/JIT/Methodical/explicit/coverage/seq_byte_1.cs
index e073fa28d2f11e..d404214ae51d95 100644
--- a/src/tests/JIT/Methodical/explicit/coverage/seq_byte_1.cs
+++ b/src/tests/JIT/Methodical/explicit/coverage/seq_byte_1.cs
@@ -61,15 +61,18 @@ public static void reset()
         BB.f_init = new AA(100);
         BB.f_zero = new AA(0);
     }
+}
+
+internal struct BB
+{
+    public static AA f_init, f_zero;
+}
 
+public static class Test_seq_byte_1
+{
     [Fact]
     public static int TestEntrypoint()
     {
         return TestApp.RunAllTests();
     }
 }
-
-internal struct BB
-{
-    public static AA f_init, f_zero;
-}
diff --git a/src/tests/JIT/Methodical/explicit/coverage/seq_double_1.cs b/src/tests/JIT/Methodical/explicit/coverage/seq_double_1.cs
index 1de7b7424880cc..25e5206cb73605 100644
--- a/src/tests/JIT/Methodical/explicit/coverage/seq_double_1.cs
+++ b/src/tests/JIT/Methodical/explicit/coverage/seq_double_1.cs
@@ -60,15 +60,18 @@ public static void reset()
         BB.f_init = new AA(100);
         BB.f_zero = new AA(0);
     }
+}
+
+internal struct BB
+{
+    public static AA f_init, f_zero;
+}
 
+public static class Test_seq_double_1
+{
     [Fact]
     public static int TestEntrypoint()
     {
         return TestApp.RunAllTests();
     }
 }
-
-internal struct BB
-{
-    public static AA f_init, f_zero;
-}
diff --git a/src/tests/JIT/Methodical/explicit/coverage/seq_float_1.cs b/src/tests/JIT/Methodical/explicit/coverage/seq_float_1.cs
index 295747188b4e43..d34d388ddce289 100644
--- a/src/tests/JIT/Methodical/explicit/coverage/seq_float_1.cs
+++ b/src/tests/JIT/Methodical/explicit/coverage/seq_float_1.cs
@@ -60,15 +60,18 @@ public static void reset()
         BB.f_init = new AA(100);
         BB.f_zero = new AA(0);
     }
+}
+
+internal struct BB
+{
+    public static AA f_init, f_zero;
+}
 
+public static class Test_seq_float_1
+{
     [Fact]
     public static int TestEntrypoint()
     {
         return TestApp.RunAllTests();
     }
 }
-
-internal struct BB
-{
-    public static AA f_init, f_zero;
-}
diff --git a/src/tests/JIT/Methodical/explicit/coverage/seq_gc_byte_1.cs b/src/tests/JIT/Methodical/explicit/coverage/seq_gc_byte_1.cs
index bf8045176af18b..92dcfa3e61fb30 100644
--- a/src/tests/JIT/Methodical/explicit/coverage/seq_gc_byte_1.cs
+++ b/src/tests/JIT/Methodical/explicit/coverage/seq_gc_byte_1.cs
@@ -64,15 +64,18 @@ public static void reset()
         BB.f_init = new AA(100);
         BB.f_zero = new AA(0);
     }
+}
+
+internal struct BB
+{
+    public static AA f_init, f_zero;
+}
 
+public static class Test_seq_gc_byte_1
+{
     [Fact]
     public static int TestEntrypoint()
     {
         return TestApp.RunAllTests();
     }
 }
-
-internal struct BB
-{
-    public static AA f_init, f_zero;
-}
diff --git a/src/tests/JIT/Methodical/explicit/coverage/seq_gc_double_1.cs b/src/tests/JIT/Methodical/explicit/coverage/seq_gc_double_1.cs
index f8a4162ee238c4..9d1280b0a5f606 100644
--- a/src/tests/JIT/Methodical/explicit/coverage/seq_gc_double_1.cs
+++ b/src/tests/JIT/Methodical/explicit/coverage/seq_gc_double_1.cs
@@ -69,15 +69,18 @@ public static void reset()
         BB.f_init = new AA(100);
         BB.f_zero = new AA(0);
     }
+}
+
+internal struct BB
+{
+    public static AA f_init, f_zero;
+}
 
+public static class Test_seq_gc_double_1
+{
     [Fact]
     public static int TestEntrypoint()
     {
         return TestApp.RunAllTests();
     }
 }
-
-internal struct BB
-{
-    public static AA f_init, f_zero;
-}
diff --git a/src/tests/JIT/Methodical/explicit/coverage/seq_gc_float_1.cs b/src/tests/JIT/Methodical/explicit/coverage/seq_gc_float_1.cs
index f26d2d0e032dee..39111bb0dfd879 100644
--- a/src/tests/JIT/Methodical/explicit/coverage/seq_gc_float_1.cs
+++ b/src/tests/JIT/Methodical/explicit/coverage/seq_gc_float_1.cs
@@ -72,15 +72,18 @@ public static void reset()
         BB.f_init = new AA(100);
         BB.f_zero = new AA(0);
     }
+}
+
+internal struct BB
+{
+    public static AA f_init, f_zero;
+}
 
+public static class Test_seq_gc_float_1
+{
     [Fact]
     public static int TestEntrypoint()
     {
         return TestApp.RunAllTests();
     }
 }
-
-internal struct BB
-{
-    public static AA f_init, f_zero;
-}
diff --git a/src/tests/JIT/Methodical/explicit/coverage/seq_gc_int_1.cs b/src/tests/JIT/Methodical/explicit/coverage/seq_gc_int_1.cs
index 17a85ec4099b1c..fdd0899ba15da6 100644
--- a/src/tests/JIT/Methodical/explicit/coverage/seq_gc_int_1.cs
+++ b/src/tests/JIT/Methodical/explicit/coverage/seq_gc_int_1.cs
@@ -63,15 +63,18 @@ public static void reset()
         BB.f_init = new AA(100);
         BB.f_zero = new AA(0);
     }
+}
+
+internal struct BB
+{
+    public static AA f_init, f_zero;
+}
 
+public static class Test_seq_gc_int_1
+{
     [Fact]
     public static int TestEntrypoint()
     {
         return TestApp.RunAllTests();
     }
 }
-
-internal struct BB
-{
-    public static AA f_init, f_zero;
-}
diff --git a/src/tests/JIT/Methodical/explicit/coverage/seq_gc_long_1.cs b/src/tests/JIT/Methodical/explicit/coverage/seq_gc_long_1.cs
index 5ed705e40ea9e3..4ea49126a39699 100644
--- a/src/tests/JIT/Methodical/explicit/coverage/seq_gc_long_1.cs
+++ b/src/tests/JIT/Methodical/explicit/coverage/seq_gc_long_1.cs
@@ -60,15 +60,18 @@ public static void reset()
         BB.f_init = new AA(100);
         BB.f_zero = new AA(0);
     }
+}
+
+internal struct BB
+{
+    public static AA f_init, f_zero;
+}
 
+public static class Test_seq_gc_long_1
+{
     [Fact]
     public static int TestEntrypoint()
     {
         return TestApp.RunAllTests();
     }
 }
-
-internal struct BB
-{
-    public static AA f_init, f_zero;
-}
diff --git a/src/tests/JIT/Methodical/explicit/coverage/seq_gc_obj_1.cs b/src/tests/JIT/Methodical/explicit/coverage/seq_gc_obj_1.cs
index b5a9662c83d88f..64d92a0733929e 100644
--- a/src/tests/JIT/Methodical/explicit/coverage/seq_gc_obj_1.cs
+++ b/src/tests/JIT/Methodical/explicit/coverage/seq_gc_obj_1.cs
@@ -68,15 +68,18 @@ public static void reset()
         BB.f_init = new AA(100);
         BB.f_zero = new AA(0);
     }
+}
+
+internal struct BB
+{
+    public static AA f_init, f_zero;
+}
 
+public static class Test_seq_gc_obj_1
+{
     [Fact]
     public static int TestEntrypoint()
     {
         return TestApp.RunAllTests();
     }
 }
-
-internal struct BB
-{
-    public static AA f_init, f_zero;
-}
diff --git a/src/tests/JIT/Methodical/explicit/coverage/seq_gc_short_1.cs b/src/tests/JIT/Methodical/explicit/coverage/seq_gc_short_1.cs
index a5a154ed96cfeb..73783c84a64655 100644
--- a/src/tests/JIT/Methodical/explicit/coverage/seq_gc_short_1.cs
+++ b/src/tests/JIT/Methodical/explicit/coverage/seq_gc_short_1.cs
@@ -70,15 +70,18 @@ public static void reset()
         BB.f_init = new AA(100);
         BB.f_zero = new AA(0);
     }
+}
+
+internal struct BB
+{
+    public static AA f_init, f_zero;
+}
 
+public static class Test_seq_gc_short_1
+{
     [Fact]
     public static int TestEntrypoint()
     {
         return TestApp.RunAllTests();
     }
 }
-
-internal struct BB
-{
-    public static AA f_init, f_zero;
-}
diff --git a/src/tests/JIT/Methodical/explicit/coverage/seq_gc_val_1.cs b/src/tests/JIT/Methodical/explicit/coverage/seq_gc_val_1.cs
index 1477a37cf7c5b5..5b4225eff018a2 100644
--- a/src/tests/JIT/Methodical/explicit/coverage/seq_gc_val_1.cs
+++ b/src/tests/JIT/Methodical/explicit/coverage/seq_gc_val_1.cs
@@ -77,15 +77,18 @@ public static void reset()
         BB.f_init = new AA(100);
         BB.f_zero = new AA(0);
     }
+}
+
+internal struct BB
+{
+    public static AA f_init, f_zero;
+}
 
+public static class Test_seq_gc_val_1
+{
     [Fact]
     public static int TestEntrypoint()
     {
         return TestApp.RunAllTests();
     }
 }
-
-internal struct BB
-{
-    public static AA f_init, f_zero;
-}
diff --git a/src/tests/JIT/Methodical/explicit/coverage/seq_int_1.cs b/src/tests/JIT/Methodical/explicit/coverage/seq_int_1.cs
index 5e8db0c1149e2c..90eb07e50a347f 100644
--- a/src/tests/JIT/Methodical/explicit/coverage/seq_int_1.cs
+++ b/src/tests/JIT/Methodical/explicit/coverage/seq_int_1.cs
@@ -69,15 +69,18 @@ public static void reset()
         BB.f_init = new AA(100);
         BB.f_zero = new AA(0);
     }
+}
+
+internal struct BB
+{
+    public static AA f_init, f_zero;
+}
 
+public static class Test_seq_int_1
+{
     [Fact]
     public static int TestEntrypoint()
     {
         return TestApp.RunAllTests();
     }
 }
-
-internal struct BB
-{
-    public static AA f_init, f_zero;
-}
diff --git a/src/tests/JIT/Methodical/explicit/coverage/seq_long_1.cs b/src/tests/JIT/Methodical/explicit/coverage/seq_long_1.cs
index 569a1667a5e4f0..424364c1a12358 100644
--- a/src/tests/JIT/Methodical/explicit/coverage/seq_long_1.cs
+++ b/src/tests/JIT/Methodical/explicit/coverage/seq_long_1.cs
@@ -72,15 +72,18 @@ public static void reset()
         BB.f_init = new AA(100);
         BB.f_zero = new AA(0);
     }
+}
+
+internal struct BB
+{
+    public static AA f_init, f_zero;
+}
 
+public static class Test_seq_long_1
+{
     [Fact]
     public static int TestEntrypoint()
     {
         return TestApp.RunAllTests();
     }
 }
-
-internal struct BB
-{
-    public static AA f_init, f_zero;
-}
diff --git a/src/tests/JIT/Methodical/explicit/coverage/seq_obj_1.cs b/src/tests/JIT/Methodical/explicit/coverage/seq_obj_1.cs
index 31adbca5d69678..64bde845f93c38 100644
--- a/src/tests/JIT/Methodical/explicit/coverage/seq_obj_1.cs
+++ b/src/tests/JIT/Methodical/explicit/coverage/seq_obj_1.cs
@@ -77,15 +77,18 @@ public static void reset()
         BB.f_init = new AA(100);
         BB.f_zero = new AA(0);
     }
+}
+
+internal struct BB
+{
+    public static AA f_init, f_zero;
+}
 
+public static class Test_seq_obj_1
+{
     [Fact]
     public static int TestEntrypoint()
     {
         return TestApp.RunAllTests();
     }
 }
-
-internal struct BB
-{
-    public static AA f_init, f_zero;
-}
diff --git a/src/tests/JIT/Methodical/explicit/coverage/seq_short_1.cs b/src/tests/JIT/Methodical/explicit/coverage/seq_short_1.cs
index 6afeec7a144f52..103612dca85193 100644
--- a/src/tests/JIT/Methodical/explicit/coverage/seq_short_1.cs
+++ b/src/tests/JIT/Methodical/explicit/coverage/seq_short_1.cs
@@ -64,15 +64,18 @@ public static void reset()
         BB.f_init = new AA(100);
         BB.f_zero = new AA(0);
     }
+}
+
+internal struct BB
+{
+    public static AA f_init, f_zero;
+}
 
+public static class Test_seq_short_1
+{
     [Fact]
     public static int TestEntrypoint()
     {
         return TestApp.RunAllTests();
     }
 }
-
-internal struct BB
-{
-    public static AA f_init, f_zero;
-}
diff --git a/src/tests/JIT/Methodical/explicit/coverage/seq_val_1.cs b/src/tests/JIT/Methodical/explicit/coverage/seq_val_1.cs
index 22fcfb105684a7..3d8154ba863000 100644
--- a/src/tests/JIT/Methodical/explicit/coverage/seq_val_1.cs
+++ b/src/tests/JIT/Methodical/explicit/coverage/seq_val_1.cs
@@ -68,15 +68,18 @@ public static void reset()
         BB.f_init = new AA(100);
         BB.f_zero = new AA(0);
     }
+}
+
+internal struct BB
+{
+    public static AA f_init, f_zero;
+}
 
+public static class Test_seq_val_1
+{
     [Fact]
     public static int TestEntrypoint()
     {
         return TestApp.RunAllTests();
     }
 }
-
-internal struct BB
-{
-    public static AA f_init, f_zero;
-}