From 466a380ec06fba88ed31237714858b2f72fcabe5 Mon Sep 17 00:00:00 2001
From: Tomas Rylek <trylek@microsoft.com>
Date: Wed, 12 Jan 2022 22:58:39 +0100
Subject: [PATCH 01/22] Add merged wrappers for JIT/Methodical tests

---
 .../Methodical/Arrays/range/Directory.Build.props    | 11 -----------
 src/tests/JIT/Methodical/Directory.Build.props       | 11 +++++++++++
 .../{Arrays/range_d.csproj => Methodical_d.csproj}   |  5 ++---
 .../{Arrays/range_r.csproj => Methodical_do.csproj}  |  5 ++---
 src/tests/JIT/Methodical/Methodical_others.csproj    | 12 ++++++++++++
 src/tests/JIT/Methodical/Methodical_r.csproj         |  8 ++++++++
 src/tests/JIT/Methodical/Methodical_ro.csproj        |  8 ++++++++
 7 files changed, 43 insertions(+), 17 deletions(-)
 delete mode 100644 src/tests/JIT/Methodical/Arrays/range/Directory.Build.props
 create mode 100644 src/tests/JIT/Methodical/Directory.Build.props
 rename src/tests/JIT/Methodical/{Arrays/range_d.csproj => Methodical_d.csproj} (50%)
 rename src/tests/JIT/Methodical/{Arrays/range_r.csproj => Methodical_do.csproj} (50%)
 create mode 100644 src/tests/JIT/Methodical/Methodical_others.csproj
 create mode 100644 src/tests/JIT/Methodical/Methodical_r.csproj
 create mode 100644 src/tests/JIT/Methodical/Methodical_ro.csproj

diff --git a/src/tests/JIT/Methodical/Arrays/range/Directory.Build.props b/src/tests/JIT/Methodical/Arrays/range/Directory.Build.props
deleted file mode 100644
index 5f8c702b2d6a4f..00000000000000
--- a/src/tests/JIT/Methodical/Arrays/range/Directory.Build.props
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <BuildAsStandalone>false</BuildAsStandalone>
-  </PropertyGroup>
-
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, '$(MSBuildThisFileDirectory)..'))" />
-
-  <PropertyGroup>
-    <AssemblyName>$(MSBuildProjectName.Replace("_il_d", "").Replace("_il_r", ""))</AssemblyName>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/tests/JIT/Methodical/Directory.Build.props b/src/tests/JIT/Methodical/Directory.Build.props
new file mode 100644
index 00000000000000..6ecfb88c38a8dc
--- /dev/null
+++ b/src/tests/JIT/Methodical/Directory.Build.props
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <PropertyGroup>
+    <BuildAsStandalone Condition="'$(BuildAsStandalone)' == ''">false</BuildAsStandalone>
+
+    <AssemblyName Condition="'$(BuildAsStandalone)' != 'true'">$(MSBuildProjectName.Replace('_il_d', '').Replace('_il_r', ''))</AssemblyName>
+  </PropertyGroup>
+
+  <Import Project="..\..\Directory.Build.props" />
+</Project>
diff --git a/src/tests/JIT/Methodical/Arrays/range_d.csproj b/src/tests/JIT/Methodical/Methodical_d.csproj
similarity index 50%
rename from src/tests/JIT/Methodical/Arrays/range_d.csproj
rename to src/tests/JIT/Methodical/Methodical_d.csproj
index 9cb4a2b78eef6f..4b018e10b4ab27 100644
--- a/src/tests/JIT/Methodical/Arrays/range_d.csproj
+++ b/src/tests/JIT/Methodical/Methodical_d.csproj
@@ -1,9 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <BuildAsStandalone>false</BuildAsStandalone>
     <IsMergedTestRunnerAssembly>true</IsMergedTestRunnerAssembly>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="range/*_d.ilproj" />
+    <ProjectReference Include="*/**/*_d.??proj" />
   </ItemGroup>
 </Project>
diff --git a/src/tests/JIT/Methodical/Arrays/range_r.csproj b/src/tests/JIT/Methodical/Methodical_do.csproj
similarity index 50%
rename from src/tests/JIT/Methodical/Arrays/range_r.csproj
rename to src/tests/JIT/Methodical/Methodical_do.csproj
index cfb48142a6c3a2..002f38b1e12da5 100644
--- a/src/tests/JIT/Methodical/Arrays/range_r.csproj
+++ b/src/tests/JIT/Methodical/Methodical_do.csproj
@@ -1,9 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <BuildAsStandalone>false</BuildAsStandalone>
     <IsMergedTestRunnerAssembly>true</IsMergedTestRunnerAssembly>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="range/*_r.ilproj" />
+    <ProjectReference Include="*/**/*_do.??proj" />
   </ItemGroup>
 </Project>
diff --git a/src/tests/JIT/Methodical/Methodical_others.csproj b/src/tests/JIT/Methodical/Methodical_others.csproj
new file mode 100644
index 00000000000000..356c3d7587a73b
--- /dev/null
+++ b/src/tests/JIT/Methodical/Methodical_others.csproj
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <IsMergedTestRunnerAssembly>true</IsMergedTestRunnerAssembly>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="*/**/*.??proj" />
+    <ProjectReference Remove="*/**/*_d.??proj" />
+    <ProjectReference Remove="*/**/*_do.??proj" />
+    <ProjectReference Remove="*/**/*_r.??proj" />
+    <ProjectReference Remove="*/**/*_ro.??proj" />
+  </ItemGroup>
+</Project>
diff --git a/src/tests/JIT/Methodical/Methodical_r.csproj b/src/tests/JIT/Methodical/Methodical_r.csproj
new file mode 100644
index 00000000000000..7aa1f50a658e6c
--- /dev/null
+++ b/src/tests/JIT/Methodical/Methodical_r.csproj
@@ -0,0 +1,8 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <IsMergedTestRunnerAssembly>true</IsMergedTestRunnerAssembly>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="*/**/*_r.??proj" />
+  </ItemGroup>
+</Project>
diff --git a/src/tests/JIT/Methodical/Methodical_ro.csproj b/src/tests/JIT/Methodical/Methodical_ro.csproj
new file mode 100644
index 00000000000000..a75e209c30a3d5
--- /dev/null
+++ b/src/tests/JIT/Methodical/Methodical_ro.csproj
@@ -0,0 +1,8 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <IsMergedTestRunnerAssembly>true</IsMergedTestRunnerAssembly>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="*/**/*_ro.??proj" />
+  </ItemGroup>
+</Project>

From e4ddb3adc149d3dccb11330345f6c676ced2bb54 Mon Sep 17 00:00:00 2001
From: Tomas <trylek@microsoft.com>
Date: Sun, 3 Apr 2022 20:42:08 +0200
Subject: [PATCH 02/22] Always run CopyAllNativeProjectReferenceBinaries

Previously this target was only called from the recursive traversal
used when globally copying native artifacts for all projects (this
is used in the lab where the native artifacts are produced on
a different machine than the managed test artifacts). In case of
combined (local) test build we weren't running the target, only
its dependencies (ResolveCMakeNativeProjectReference and
ConsolidateNativeProjectReference); this used to be sufficient as
these two targets handle all logic related to copying native
components of a normal project, however I have recently added
special logic for copying merged test wrapper native artifacts
the CopyAllNativeProjectReferenceBinaries target and so we now must
make sure it also always runs.

Thanks

Tomas
---
 src/tests/Directory.Build.targets | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/tests/Directory.Build.targets b/src/tests/Directory.Build.targets
index 96d65ab0eabf50..0fdd805882e039 100644
--- a/src/tests/Directory.Build.targets
+++ b/src/tests/Directory.Build.targets
@@ -217,7 +217,8 @@
   </Target>
 
   <Target Name="CopyAllNativeProjectReferenceBinaries"
-          DependsOnTargets="ResolveCMakeNativeProjectReference;ConsolidateNativeProjectReference">
+          DependsOnTargets="ResolveCMakeNativeProjectReference;ConsolidateNativeProjectReference"
+          BeforeTargets="Build">
 
     <ItemGroup Condition="'$(IsMergedTestRunnerAssembly)' == 'true'">
       <MergedWrapperReferenceFolders Include="@(ProjectReference->'$([System.IO.Path]::GetFullPath('%(ProjectReference.Identity)/..', '$(OutDir)/..'))/%(ProjectReference.FileName)')" />

From da5898028ce20ade10207993883663cace95f1e1 Mon Sep 17 00:00:00 2001
From: Tomas <trylek@microsoft.com>
Date: Mon, 4 Apr 2022 00:48:18 +0200
Subject: [PATCH 03/22] Mark JIT optimization-sensitive tests as out-of-process

---
 src/tests/JIT/Methodical/Arrays/misc/arrres_il_r.ilproj | 1 +
 src/tests/JIT/Methodical/tailcall_v4/hijacking.ilproj   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/tests/JIT/Methodical/Arrays/misc/arrres_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/misc/arrres_il_r.ilproj
index 1020cf984f3b37..f40732f5ba2e9e 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/arrres_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/arrres_il_r.ilproj
@@ -7,6 +7,7 @@
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
     <JitOptimizationSensitive>true</JitOptimizationSensitive>
+    <RequiresProjectIsolation>true</RequiresProjectIsolation>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="arrres.il" />
diff --git a/src/tests/JIT/Methodical/tailcall_v4/hijacking.ilproj b/src/tests/JIT/Methodical/tailcall_v4/hijacking.ilproj
index 2856022120ab82..64efa456331e19 100644
--- a/src/tests/JIT/Methodical/tailcall_v4/hijacking.ilproj
+++ b/src/tests/JIT/Methodical/tailcall_v4/hijacking.ilproj
@@ -13,6 +13,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <JitOptimizationSensitive>true</JitOptimizationSensitive>
+    <RequiresProjectIsolation>true</RequiresProjectIsolation>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hijacking.il" />

From 31edb5f6fada2841ca728dfa1de8a9e339a04539 Mon Sep 17 00:00:00 2001
From: Tomas <trylek@microsoft.com>
Date: Mon, 4 Apr 2022 16:11:15 +0200
Subject: [PATCH 04/22] Skip platform-specific out-of-process tests on the
 excluded platforms

---
 src/tests/Common/CoreCLRTestLibrary/OutOfProcessTest.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/tests/Common/CoreCLRTestLibrary/OutOfProcessTest.cs b/src/tests/Common/CoreCLRTestLibrary/OutOfProcessTest.cs
index 89fafa77da4331..83a07c41f806d9 100644
--- a/src/tests/Common/CoreCLRTestLibrary/OutOfProcessTest.cs
+++ b/src/tests/Common/CoreCLRTestLibrary/OutOfProcessTest.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
@@ -65,6 +65,12 @@ public static void RunOutOfProcessTest(string basePath, string assemblyPath)
                     testExecutable = Path.Combine(baseDir, Path.ChangeExtension(assemblyPath.Replace("\\", "/"), ".sh"));
                 }
 
+                if (!File.Exists(testExecutable))
+                {
+                    // Skip platform-specific test when running on the excluded platform
+                    return;
+                }
+
                 System.IO.Directory.CreateDirectory(outputDir);
 
                 ret = wrapper.RunTest(testExecutable, outputFile, errorFile, Assembly.GetEntryAssembly()!.FullName!, testBinaryBase, outputDir);

From 61eac57067fbbbd9e1b3ee1ddac77989d2db08e8 Mon Sep 17 00:00:00 2001
From: Tomas <trylek@microsoft.com>
Date: Tue, 5 Apr 2022 15:05:02 +0200
Subject: [PATCH 05/22] Don't copy out of process test artifacts to merged
 wrapper outputs

---
 src/tests/Directory.Build.targets | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/tests/Directory.Build.targets b/src/tests/Directory.Build.targets
index 0fdd805882e039..dda1e395b3621c 100644
--- a/src/tests/Directory.Build.targets
+++ b/src/tests/Directory.Build.targets
@@ -221,7 +221,10 @@
           BeforeTargets="Build">
 
     <ItemGroup Condition="'$(IsMergedTestRunnerAssembly)' == 'true'">
+      <OutOfProcessMarkers Include="$(OutDir)/../**/*.OutOfProcessTest" />
       <MergedWrapperReferenceFolders Include="@(ProjectReference->'$([System.IO.Path]::GetFullPath('%(ProjectReference.Identity)/..', '$(OutDir)/..'))/%(ProjectReference.FileName)')" />
+      <!-- Don't copy out-of-process test components to the merged wrapper output folder -->
+      <MergedWrapperReferenceFolders Remove="%(OutOfProcessMarkers.RootDir)%(OutOfProcessMarkers.Directory)" />
       <!-- For merged project wrappers, include native libraries in all project references -->
       <MergedWrapperReferenceFiles Include="%(MergedWrapperReferenceFolders.Identity)/*$(LibSuffix)" />
     </ItemGroup>

From 01ddd124e41b1297ed2910181b8b875f2e6a8244 Mon Sep 17 00:00:00 2001
From: Tomas <trylek@microsoft.com>
Date: Tue, 5 Apr 2022 21:33:47 +0200
Subject: [PATCH 06/22] Fix logic for skipping out of process test artifacts

---
 src/tests/Directory.Build.targets | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/tests/Directory.Build.targets b/src/tests/Directory.Build.targets
index dda1e395b3621c..09b4d206af3804 100644
--- a/src/tests/Directory.Build.targets
+++ b/src/tests/Directory.Build.targets
@@ -221,10 +221,11 @@
           BeforeTargets="Build">
 
     <ItemGroup Condition="'$(IsMergedTestRunnerAssembly)' == 'true'">
-      <OutOfProcessMarkers Include="$(OutDir)/../**/*.OutOfProcessTest" />
+      <OutOfProcessTestMarkers Include="$(OutDir)/../**/*.OutOfProcessTest" />
+      <OutOfProcessTestFolders Include="$([MSBuild]::NormalizePath('%(OutOfProcessTestMarkers.RootDir)%(OutOfProcessTestMarkers.Directory)'))" />
       <MergedWrapperReferenceFolders Include="@(ProjectReference->'$([System.IO.Path]::GetFullPath('%(ProjectReference.Identity)/..', '$(OutDir)/..'))/%(ProjectReference.FileName)')" />
       <!-- Don't copy out-of-process test components to the merged wrapper output folder -->
-      <MergedWrapperReferenceFolders Remove="%(OutOfProcessMarkers.RootDir)%(OutOfProcessMarkers.Directory)" />
+      <MergedWrapperReferenceFolders Remove="@(OutOfProcessTestFolders)" />
       <!-- For merged project wrappers, include native libraries in all project references -->
       <MergedWrapperReferenceFiles Include="%(MergedWrapperReferenceFolders.Identity)/*$(LibSuffix)" />
     </ItemGroup>

From a8deec674b6a6ecbacf63acb1bf1c712a31c610d Mon Sep 17 00:00:00 2001
From: Tomas <trylek@microsoft.com>
Date: Tue, 5 Apr 2022 22:58:55 +0200
Subject: [PATCH 07/22] Add conditional check for the presence of
 out-of-process markers

---
 src/tests/Directory.Build.targets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/tests/Directory.Build.targets b/src/tests/Directory.Build.targets
index 09b4d206af3804..95e08c3cd3f438 100644
--- a/src/tests/Directory.Build.targets
+++ b/src/tests/Directory.Build.targets
@@ -222,12 +222,12 @@
 
     <ItemGroup Condition="'$(IsMergedTestRunnerAssembly)' == 'true'">
       <OutOfProcessTestMarkers Include="$(OutDir)/../**/*.OutOfProcessTest" />
-      <OutOfProcessTestFolders Include="$([MSBuild]::NormalizePath('%(OutOfProcessTestMarkers.RootDir)%(OutOfProcessTestMarkers.Directory)'))" />
+      <OutOfProcessTestFolders Include="$([MSBuild]::NormalizePath('%(OutOfProcessTestMarkers.RootDir)%(OutOfProcessTestMarkers.Directory)'))" Condition="'@(OutOfProcessTestMarkers)' != ''" />
       <MergedWrapperReferenceFolders Include="@(ProjectReference->'$([System.IO.Path]::GetFullPath('%(ProjectReference.Identity)/..', '$(OutDir)/..'))/%(ProjectReference.FileName)')" />
       <!-- Don't copy out-of-process test components to the merged wrapper output folder -->
       <MergedWrapperReferenceFolders Remove="@(OutOfProcessTestFolders)" />
       <!-- For merged project wrappers, include native libraries in all project references -->
-      <MergedWrapperReferenceFiles Include="%(MergedWrapperReferenceFolders.Identity)/*$(LibSuffix)" />
+      <MergedWrapperReferenceFiles Include="%(MergedWrapperReferenceFolders.Identity)/*$(LibSuffix)" Condition="'@(MergedWrapperReferenceFolders)' != ''" />
     </ItemGroup>
     <Copy SourceFiles="@(MergedWrapperReferenceFiles)"
         DestinationFiles="@(MergedWrapperReferenceFiles->'$(OutDir)/%(FileName)%(Extension)')"

From 6185e74f48294660a30d03694e12c12e95f355bb Mon Sep 17 00:00:00 2001
From: Tomas <trylek@microsoft.com>
Date: Tue, 5 Apr 2022 23:00:42 +0200
Subject: [PATCH 08/22] Switch over JIT/Methodical tests to use merged wrappers

---
 .../JIT/Methodical/Arrays/huge/huge_b.il      |   8 +-
 .../Methodical/Arrays/huge/huge_b_il_d.ilproj |   1 -
 .../Methodical/Arrays/huge/huge_b_il_r.ilproj |   1 -
 .../JIT/Methodical/Arrays/huge/huge_i4.il     |   8 +-
 .../Arrays/huge/huge_i4_il_d.ilproj           |   1 -
 .../Arrays/huge/huge_i4_il_r.ilproj           |   1 -
 .../JIT/Methodical/Arrays/huge/huge_objref.il |  48 +-
 .../Arrays/huge/huge_objref_il_d.ilproj       |   1 -
 .../Arrays/huge/huge_objref_il_r.ilproj       |   1 -
 .../JIT/Methodical/Arrays/huge/huge_r4.il     |   8 +-
 .../Arrays/huge/huge_r4_il_d.ilproj           |   1 -
 .../Arrays/huge/huge_r4_il_r.ilproj           |   1 -
 .../JIT/Methodical/Arrays/huge/huge_r8.il     |   8 +-
 .../Arrays/huge/huge_r8_il_d.ilproj           |   1 -
 .../Arrays/huge/huge_r8_il_r.ilproj           |   1 -
 .../JIT/Methodical/Arrays/huge/huge_struct.il |  48 +-
 .../Arrays/huge/huge_struct_il_d.ilproj       |   1 -
 .../Arrays/huge/huge_struct_il_r.ilproj       |   1 -
 .../JIT/Methodical/Arrays/huge/huge_u8.il     |   8 +-
 .../Arrays/huge/huge_u8_il_d.ilproj           |   1 -
 .../Arrays/huge/huge_u8_il_r.ilproj           |   1 -
 .../JIT/Methodical/Arrays/huge_struct.il      |  48 +-
 .../JIT/Methodical/Arrays/huge_struct.ilproj  |   1 -
 src/tests/JIT/Methodical/Arrays/lcs/lcs.cs    |   8 +-
 src/tests/JIT/Methodical/Arrays/lcs/lcs2.cs   |   8 +-
 .../JIT/Methodical/Arrays/lcs/lcs2_d.csproj   |   1 -
 .../JIT/Methodical/Arrays/lcs/lcs2_do.csproj  |   1 -
 .../JIT/Methodical/Arrays/lcs/lcs2_r.csproj   |   1 -
 .../JIT/Methodical/Arrays/lcs/lcs2_ro.csproj  |   1 -
 .../Methodical/Arrays/lcs/lcs_lcs_d.csproj    |   1 -
 .../Methodical/Arrays/lcs/lcs_lcs_do.csproj   |   1 -
 .../Methodical/Arrays/lcs/lcs_lcs_r.csproj    |   1 -
 .../Methodical/Arrays/lcs/lcs_lcs_ro.csproj   |   1 -
 .../JIT/Methodical/Arrays/lcs/lcs_ldlen.il    |  16 +-
 .../Arrays/lcs/lcs_ldlen_il_d.ilproj          |   1 -
 .../Arrays/lcs/lcs_ldlen_il_r.ilproj          |   1 -
 src/tests/JIT/Methodical/Arrays/lcs/lcsbas.cs |   8 +-
 .../JIT/Methodical/Arrays/lcs/lcsbas_d.csproj |   1 -
 .../Methodical/Arrays/lcs/lcsbas_do.csproj    |   1 -
 .../JIT/Methodical/Arrays/lcs/lcsbas_r.csproj |   1 -
 .../Methodical/Arrays/lcs/lcsbas_ro.csproj    |   1 -
 src/tests/JIT/Methodical/Arrays/lcs/lcsbox.cs |   8 +-
 .../JIT/Methodical/Arrays/lcs/lcsbox_d.csproj |   1 -
 .../Methodical/Arrays/lcs/lcsbox_do.csproj    |   1 -
 .../JIT/Methodical/Arrays/lcs/lcsbox_r.csproj |   1 -
 .../Methodical/Arrays/lcs/lcsbox_ro.csproj    |   1 -
 src/tests/JIT/Methodical/Arrays/lcs/lcsmax.cs |   8 +-
 .../JIT/Methodical/Arrays/lcs/lcsmax_d.csproj |   1 -
 .../Methodical/Arrays/lcs/lcsmax_do.csproj    |   1 -
 .../JIT/Methodical/Arrays/lcs/lcsmax_r.csproj |   1 -
 .../Methodical/Arrays/lcs/lcsmax_ro.csproj    |   1 -
 .../JIT/Methodical/Arrays/lcs/lcsmixed.cs     |   8 +-
 .../Methodical/Arrays/lcs/lcsmixed_d.csproj   |   1 -
 .../Methodical/Arrays/lcs/lcsmixed_do.csproj  |   1 -
 .../Methodical/Arrays/lcs/lcsmixed_r.csproj   |   1 -
 .../Methodical/Arrays/lcs/lcsmixed_ro.csproj  |   1 -
 src/tests/JIT/Methodical/Arrays/lcs/lcsval.cs |   8 +-
 .../JIT/Methodical/Arrays/lcs/lcsval_d.csproj |   1 -
 .../Methodical/Arrays/lcs/lcsval_do.csproj    |   1 -
 .../JIT/Methodical/Arrays/lcs/lcsval_r.csproj |   1 -
 .../Methodical/Arrays/lcs/lcsval_ro.csproj    |   1 -
 .../JIT/Methodical/Arrays/lcs/lcsvalbox.cs    |   8 +-
 .../Methodical/Arrays/lcs/lcsvalbox_d.csproj  |   1 -
 .../Methodical/Arrays/lcs/lcsvalbox_do.csproj |   1 -
 .../Methodical/Arrays/lcs/lcsvalbox_r.csproj  |   1 -
 .../Methodical/Arrays/lcs/lcsvalbox_ro.csproj |   1 -
 .../JIT/Methodical/Arrays/misc/address.il     |  24 +-
 .../Arrays/misc/address_il_d.ilproj           |   1 -
 .../Arrays/misc/address_il_r.ilproj           |   1 -
 .../JIT/Methodical/Arrays/misc/arrres.cs      |   8 +-
 .../JIT/Methodical/Arrays/misc/arrres.il      | 124 +--
 .../Methodical/Arrays/misc/arrres_d.csproj    |   1 -
 .../Methodical/Arrays/misc/arrres_do.csproj   |   1 -
 .../Methodical/Arrays/misc/arrres_il_r.ilproj |   1 -
 .../Methodical/Arrays/misc/arrres_r.csproj    |   1 -
 .../Methodical/Arrays/misc/arrres_ro.csproj   |   1 -
 src/tests/JIT/Methodical/Arrays/misc/gcarr.cs |   8 +-
 src/tests/JIT/Methodical/Arrays/misc/gcarr.il |  24 +-
 .../JIT/Methodical/Arrays/misc/gcarr_d.csproj |   1 -
 .../Methodical/Arrays/misc/gcarr_do.csproj    |   1 -
 .../Methodical/Arrays/misc/gcarr_il_d.ilproj  |   1 -
 .../Methodical/Arrays/misc/gcarr_il_r.ilproj  |   1 -
 .../JIT/Methodical/Arrays/misc/gcarr_r.csproj |   1 -
 .../Methodical/Arrays/misc/gcarr_ro.csproj    |   1 -
 .../Methodical/Arrays/misc/initializearray.il |   4 +-
 .../Arrays/misc/initializearray_enum.il       |   4 +-
 .../misc/initializearray_enum_il_d.ilproj     |   1 -
 .../misc/initializearray_enum_il_r.ilproj     |   1 -
 .../Arrays/misc/initializearray_il_d.ilproj   |   1 -
 .../Arrays/misc/initializearray_il_r.ilproj   |   1 -
 .../JIT/Methodical/Arrays/misc/ldelem_get.il  |  24 +-
 .../Arrays/misc/ldelem_get_il_d.ilproj        |   1 -
 .../Arrays/misc/ldelem_get_il_r.ilproj        |   1 -
 .../JIT/Methodical/Arrays/misc/length0.il     |  28 +-
 .../Arrays/misc/length0_il_d.ilproj           |   1 -
 .../Arrays/misc/length0_il_r.ilproj           |   1 -
 .../JIT/Methodical/Arrays/misc/lengthm2.il    |   8 +-
 .../Arrays/misc/lengthm2_il_d.ilproj          |   1 -
 .../Arrays/misc/lengthm2_il_r.ilproj          |   1 -
 .../JIT/Methodical/Arrays/misc/selfref.cs     |   8 +-
 .../JIT/Methodical/Arrays/misc/selfref.il     |   8 +-
 .../Methodical/Arrays/misc/selfref_d.csproj   |   1 -
 .../Methodical/Arrays/misc/selfref_do.csproj  |   1 -
 .../Arrays/misc/selfref_il_d.ilproj           |   1 -
 .../Arrays/misc/selfref_il_r.ilproj           |   1 -
 .../Methodical/Arrays/misc/selfref_r.csproj   |   1 -
 .../Methodical/Arrays/misc/selfref_ro.csproj  |   1 -
 .../Arrays/range/negIndexRngChkElim.il        |   4 +-
 src/tests/JIT/Methodical/AsgOp/i4/i4.cs       |   9 +-
 .../JIT/Methodical/AsgOp/i4/i4_cs_d.csproj    |   1 -
 .../JIT/Methodical/AsgOp/i4/i4_cs_do.csproj   |   1 -
 .../JIT/Methodical/AsgOp/i4/i4_cs_r.csproj    |   1 -
 .../JIT/Methodical/AsgOp/i4/i4_cs_ro.csproj   |   1 -
 src/tests/JIT/Methodical/AsgOp/i4/i4flat.cs   |   9 +-
 .../Methodical/AsgOp/i4/i4flat_cs_d.csproj    |   1 -
 .../Methodical/AsgOp/i4/i4flat_cs_do.csproj   |   1 -
 .../Methodical/AsgOp/i4/i4flat_cs_r.csproj    |   1 -
 .../Methodical/AsgOp/i4/i4flat_cs_ro.csproj   |   1 -
 src/tests/JIT/Methodical/AsgOp/i8/i8.cs       |   9 +-
 .../JIT/Methodical/AsgOp/i8/i8_cs_d.csproj    |   1 -
 .../JIT/Methodical/AsgOp/i8/i8_cs_do.csproj   |   1 -
 .../JIT/Methodical/AsgOp/i8/i8_cs_r.csproj    |   1 -
 .../JIT/Methodical/AsgOp/i8/i8_cs_ro.csproj   |   1 -
 src/tests/JIT/Methodical/AsgOp/i8/i8flat.cs   |   9 +-
 .../Methodical/AsgOp/i8/i8flat_cs_d.csproj    |   1 -
 .../Methodical/AsgOp/i8/i8flat_cs_do.csproj   |   1 -
 .../Methodical/AsgOp/i8/i8flat_cs_r.csproj    |   1 -
 .../Methodical/AsgOp/i8/i8flat_cs_ro.csproj   |   1 -
 src/tests/JIT/Methodical/AsgOp/r4/r4.cs       |   9 +-
 .../JIT/Methodical/AsgOp/r4/r4_cs_d.csproj    |   1 -
 .../JIT/Methodical/AsgOp/r4/r4_cs_do.csproj   |   1 -
 .../JIT/Methodical/AsgOp/r4/r4_cs_r.csproj    |   1 -
 .../JIT/Methodical/AsgOp/r4/r4_cs_ro.csproj   |   1 -
 src/tests/JIT/Methodical/AsgOp/r4/r4flat.cs   |   9 +-
 .../Methodical/AsgOp/r4/r4flat_cs_d.csproj    |   1 -
 .../Methodical/AsgOp/r4/r4flat_cs_do.csproj   |   1 -
 .../Methodical/AsgOp/r4/r4flat_cs_r.csproj    |   1 -
 .../Methodical/AsgOp/r4/r4flat_cs_ro.csproj   |   1 -
 src/tests/JIT/Methodical/AsgOp/r8/r8.cs       |   9 +-
 .../JIT/Methodical/AsgOp/r8/r8_cs_d.csproj    |   1 -
 .../JIT/Methodical/AsgOp/r8/r8_cs_do.csproj   |   1 -
 .../JIT/Methodical/AsgOp/r8/r8_cs_r.csproj    |   1 -
 .../JIT/Methodical/AsgOp/r8/r8_cs_ro.csproj   |   1 -
 src/tests/JIT/Methodical/AsgOp/r8/r8flat.cs   |   9 +-
 .../Methodical/AsgOp/r8/r8flat_cs_d.csproj    |   1 -
 .../Methodical/AsgOp/r8/r8flat_cs_do.csproj   |   1 -
 .../Methodical/AsgOp/r8/r8flat_cs_r.csproj    |   1 -
 .../Methodical/AsgOp/r8/r8flat_cs_ro.csproj   |   1 -
 .../Boxing/boxunbox/KeepAliveBoxOpt.cs        |   4 +-
 .../Boxing/boxunbox/KeepAliveBoxOpt.csproj    |   1 -
 .../JIT/Methodical/Boxing/boxunbox/array.il   |   6 +-
 .../Boxing/boxunbox/array_il_d.ilproj         |   1 -
 .../Boxing/boxunbox/array_il_r.ilproj         |   1 -
 .../JIT/Methodical/Boxing/boxunbox/chain.il   |   6 +-
 .../Boxing/boxunbox/chain_il_d.ilproj         |   1 -
 .../Boxing/boxunbox/chain_il_r.ilproj         |   1 -
 .../JIT/Methodical/Boxing/boxunbox/finally.il |  12 +-
 .../Boxing/boxunbox/finally_il_d.ilproj       |   1 -
 .../Boxing/boxunbox/finally_il_r.ilproj       |   1 -
 .../Methodical/Boxing/boxunbox/huge_filter.il |  12 +-
 .../Boxing/boxunbox/huge_filter_il_d.ilproj   |   1 -
 .../Boxing/boxunbox/huge_filter_il_r.ilproj   |   1 -
 .../JIT/Methodical/Boxing/boxunbox/jump.il    |  14 +-
 .../Boxing/boxunbox/jump_il_d.ilproj          |   1 -
 .../Boxing/boxunbox/jump_il_r.ilproj          |   1 -
 .../JIT/Methodical/Boxing/boxunbox/local.il   |   6 +-
 .../Boxing/boxunbox/local_il_d.ilproj         |   1 -
 .../Boxing/boxunbox/local_il_r.ilproj         |   1 -
 .../Methodical/Boxing/boxunbox/localloc.il    |  12 +-
 .../boxunbox/localloc_boxunbox_il_d.ilproj    |   1 -
 .../boxunbox/localloc_boxunbox_il_r.ilproj    |   1 -
 .../JIT/Methodical/Boxing/boxunbox/simple.il  |  12 +-
 .../Boxing/boxunbox/simple_il_d.ilproj        |   1 -
 .../Boxing/boxunbox/simple_il_r.ilproj        |   1 -
 .../Methodical/Boxing/boxunbox/tailcall.il    |  14 +-
 .../boxunbox/tailcall_boxunbox_il_d.ilproj    |   1 -
 .../boxunbox/tailcall_boxunbox_il_r.ilproj    |   1 -
 .../JIT/Methodical/Boxing/boxunbox/try.il     |  12 +-
 .../Boxing/boxunbox/try_boxunbox_il_d.ilproj  |   1 -
 .../Boxing/boxunbox/try_boxunbox_il_r.ilproj  |   1 -
 .../Methodical/Boxing/callconv/instance.cs    |  10 +-
 .../Methodical/Boxing/callconv/instance.il    |  30 +-
 .../Boxing/callconv/instance_cs_d.csproj      |   1 -
 .../Boxing/callconv/instance_cs_do.csproj     |   1 -
 .../Boxing/callconv/instance_cs_r.csproj      |   1 -
 .../Boxing/callconv/instance_cs_ro.csproj     |   1 -
 .../Boxing/callconv/instance_il_d.ilproj      |   1 -
 .../Boxing/callconv/instance_il_r.ilproj      |   1 -
 .../JIT/Methodical/Boxing/functional/fibo.cs  |   8 +-
 .../JIT/Methodical/Boxing/functional/fibo.il  |  18 +-
 .../Boxing/functional/fibo_cs_d.csproj        |   1 -
 .../Boxing/functional/fibo_cs_do.csproj       |   1 -
 .../Boxing/functional/fibo_cs_r.csproj        |   1 -
 .../Boxing/functional/fibo_cs_ro.csproj       |   1 -
 .../Boxing/functional/fibo_il_d.ilproj        |   1 -
 .../Boxing/functional/fibo_il_r.ilproj        |   1 -
 .../JIT/Methodical/Boxing/functional/sin.cs   |   8 +-
 .../JIT/Methodical/Boxing/functional/sin.il   |  98 +-
 .../functional/sin_functional_cs_d.csproj     |   1 -
 .../functional/sin_functional_cs_do.csproj    |   1 -
 .../functional/sin_functional_cs_r.csproj     |   1 -
 .../functional/sin_functional_cs_ro.csproj    |   1 -
 .../Boxing/functional/sin_il_d.ilproj         |   1 -
 .../Boxing/functional/sin_il_r.ilproj         |   1 -
 .../JIT/Methodical/Boxing/misc/concurgc.il    |  20 +-
 .../Boxing/misc/concurgc_il_d.ilproj          |   1 -
 .../Boxing/misc/concurgc_il_r.ilproj          |   1 -
 src/tests/JIT/Methodical/Boxing/misc/enum.cs  |   8 +-
 src/tests/JIT/Methodical/Boxing/misc/enum.il  |  38 +-
 .../Methodical/Boxing/misc/enum_cs_d.csproj   |   1 -
 .../Methodical/Boxing/misc/enum_cs_do.csproj  |   1 -
 .../Methodical/Boxing/misc/enum_cs_r.csproj   |   1 -
 .../Methodical/Boxing/misc/enum_cs_ro.csproj  |   1 -
 .../Methodical/Boxing/misc/enum_il_d.ilproj   |   1 -
 .../Methodical/Boxing/misc/enum_il_r.ilproj   |   1 -
 .../JIT/Methodical/Boxing/misc/nestval.cs     |   8 +-
 .../JIT/Methodical/Boxing/misc/nestval.il     | 128 +--
 .../Boxing/misc/nestval_cs_d.csproj           |   1 -
 .../Boxing/misc/nestval_cs_do.csproj          |   1 -
 .../Boxing/misc/nestval_cs_r.csproj           |   1 -
 .../Boxing/misc/nestval_cs_ro.csproj          |   1 -
 .../Boxing/misc/nestval_il_d.ilproj           |   1 -
 .../Boxing/misc/nestval_il_r.ilproj           |   1 -
 .../JIT/Methodical/Boxing/misc/tailjump.cs    |   8 +-
 .../JIT/Methodical/Boxing/misc/tailjump.il    |  22 +-
 .../Boxing/misc/tailjump_cs_d.csproj          |   1 -
 .../Boxing/misc/tailjump_cs_do.csproj         |   1 -
 .../Boxing/misc/tailjump_cs_r.csproj          |   1 -
 .../Boxing/misc/tailjump_cs_ro.csproj         |   1 -
 .../Boxing/misc/tailjump_il_d.ilproj          |   1 -
 .../Boxing/misc/tailjump_il_r.ilproj          |   1 -
 .../JIT/Methodical/Boxing/misc/typedref.il    |  18 +-
 .../Boxing/misc/typedref_il_d.ilproj          |   1 -
 .../Boxing/misc/typedref_il_r.ilproj          |   1 -
 .../JIT/Methodical/Boxing/misc/unusedindir.cs |   9 +-
 .../Methodical/Boxing/misc/unusedindir.csproj |   1 -
 src/tests/JIT/Methodical/Boxing/morph/sin.cs  |   8 +-
 .../JIT/Methodical/Boxing/morph/sin3double.il |   2 +-
 .../Methodical/Boxing/morph/sin3double.ilproj |   1 -
 .../Boxing/morph/sin_morph_cs_d.csproj        |   1 -
 .../Boxing/morph/sin_morph_cs_do.csproj       |   1 -
 .../Boxing/morph/sin_morph_cs_r.csproj        |   1 -
 .../Boxing/morph/sin_morph_cs_ro.csproj       |   1 -
 src/tests/JIT/Methodical/Boxing/seh/fault.il  |  46 +-
 .../Methodical/Boxing/seh/fault_il_d.ilproj   |   1 -
 .../Methodical/Boxing/seh/fault_il_r.ilproj   |   1 -
 src/tests/JIT/Methodical/Boxing/seh/filter.il |  46 +-
 .../Boxing/seh/filter_seh_Boxing_il_d.ilproj  |   1 -
 .../Boxing/seh/filter_seh_Boxing_il_r.ilproj  |   1 -
 src/tests/JIT/Methodical/Boxing/seh/try.cs    |   8 +-
 src/tests/JIT/Methodical/Boxing/seh/try.il    |  46 +-
 .../JIT/Methodical/Boxing/seh/try_cs_d.csproj |   1 -
 .../Methodical/Boxing/seh/try_cs_do.csproj    |   1 -
 .../JIT/Methodical/Boxing/seh/try_cs_r.csproj |   1 -
 .../Methodical/Boxing/seh/try_cs_ro.csproj    |   1 -
 .../Methodical/Boxing/seh/try_seh_il_d.ilproj |   1 -
 .../Methodical/Boxing/seh/try_seh_il_r.ilproj |   1 -
 .../JIT/Methodical/Boxing/xlang/sin_cs.cs     |   6 +-
 .../JIT/Methodical/Boxing/xlang/sin_cs.il     |   6 +-
 .../Boxing/xlang/sin_cs_cs_sinlib_d.csproj    |   1 -
 .../Boxing/xlang/sin_cs_cs_sinlib_do.csproj   |   1 -
 .../Boxing/xlang/sin_cs_cs_sinlib_r.csproj    |   1 -
 .../Boxing/xlang/sin_cs_cs_sinlib_ro.csproj   |   1 -
 .../Boxing/xlang/sin_cs_il_sinlib_d.csproj    |   1 -
 .../Boxing/xlang/sin_cs_il_sinlib_do.csproj   |   1 -
 .../Boxing/xlang/sin_cs_il_sinlib_r.csproj    |   1 -
 .../Boxing/xlang/sin_cs_il_sinlib_ro.csproj   |   1 -
 .../JIT/Methodical/Boxing/xlang/sin_il.cs     |   8 +-
 .../JIT/Methodical/Boxing/xlang/sin_il.il     |   6 +-
 .../Boxing/xlang/sin_il_cs_il_d.ilproj        |   1 -
 .../Boxing/xlang/sin_il_cs_il_r.ilproj        |   1 -
 .../Boxing/xlang/sin_il_il_d.ilproj           |   1 -
 .../Boxing/xlang/sin_il_il_r.ilproj           |   1 -
 .../Methodical/Coverage/arglist_pos.ilproj    |   1 -
 src/tests/JIT/Methodical/Coverage/b39946.il   |   4 +-
 .../JIT/Methodical/Coverage/b39946.ilproj     |   1 -
 src/tests/JIT/Methodical/Coverage/b433189.cs  |   4 +-
 .../JIT/Methodical/Coverage/b433189.csproj    |   1 -
 src/tests/JIT/Methodical/Coverage/b518440.il  |   4 +
 .../JIT/Methodical/Coverage/b518440.ilproj    |   1 -
 .../Coverage/copy_prop_byref_to_native_int.il |  29 +-
 .../copy_prop_byref_to_native_int.ilproj      |   1 -
 src/tests/JIT/Methodical/Coverage/hole.ilproj |   1 -
 .../Methodical/ELEMENT_TYPE_IU/conv_i8_i.il   |   4 +-
 .../ELEMENT_TYPE_IU/conv_i8_i_il_d.ilproj     |   1 -
 .../ELEMENT_TYPE_IU/conv_i8_i_il_r.ilproj     |   1 -
 .../Methodical/ELEMENT_TYPE_IU/conv_i8_u.il   |   4 +-
 .../ELEMENT_TYPE_IU/conv_i8_u_il_d.ilproj     |   1 -
 .../ELEMENT_TYPE_IU/conv_i8_u_il_r.ilproj     |   1 -
 .../ELEMENT_TYPE_IU/convovf_i8_i.il           |   4 +-
 .../ELEMENT_TYPE_IU/convovf_i8_i_il_d.ilproj  |   1 -
 .../ELEMENT_TYPE_IU/convovf_i8_i_il_r.ilproj  |   1 -
 .../ELEMENT_TYPE_IU/convovf_i8_u_il_d.ilproj  |   1 -
 .../ELEMENT_TYPE_IU/convovf_i8_u_il_r.ilproj  |   1 -
 .../i_array_merge_Target_32BIT.il             |   2 +-
 .../i_array_merge_Target_32BIT_il_d.ilproj    |   1 -
 .../i_array_merge_Target_32BIT_il_r.ilproj    |   1 -
 .../i_array_merge_Target_64BIT.il             |   2 +-
 .../i_array_merge_Target_64BIT_il_d.ilproj    |   1 -
 .../i_array_merge_Target_64BIT_il_r.ilproj    |   1 -
 .../JIT/Methodical/ELEMENT_TYPE_IU/i_box.il   |  10 +-
 .../ELEMENT_TYPE_IU/i_box_il_d.ilproj         |   1 -
 .../ELEMENT_TYPE_IU/i_box_il_r.ilproj         |   1 -
 .../JIT/Methodical/ELEMENT_TYPE_IU/i_conv.il  |   4 +-
 .../ELEMENT_TYPE_IU/i_conv_il_d.ilproj        |   1 -
 .../ELEMENT_TYPE_IU/i_conv_il_r.ilproj        |   1 -
 .../JIT/Methodical/ELEMENT_TYPE_IU/i_fld.il   |  28 +-
 .../ELEMENT_TYPE_IU/i_fld_il_d.ilproj         |   1 -
 .../ELEMENT_TYPE_IU/i_fld_il_r.ilproj         |   1 -
 .../JIT/Methodical/ELEMENT_TYPE_IU/i_flood.il |   8 +-
 .../ELEMENT_TYPE_IU/i_flood_il_d.ilproj       |   1 -
 .../ELEMENT_TYPE_IU/i_flood_il_r.ilproj       |   1 -
 .../JIT/Methodical/ELEMENT_TYPE_IU/i_flow.il  |  36 +-
 .../ELEMENT_TYPE_IU/i_flow_il_d.ilproj        |   1 -
 .../ELEMENT_TYPE_IU/i_flow_il_r.ilproj        |   1 -
 .../JIT/Methodical/ELEMENT_TYPE_IU/i_prop.il  |  22 +-
 .../ELEMENT_TYPE_IU/i_prop_il_d.ilproj        |   1 -
 .../ELEMENT_TYPE_IU/i_prop_il_r.ilproj        |   1 -
 .../Methodical/ELEMENT_TYPE_IU/i_qsort1.il    |  10 +-
 .../ELEMENT_TYPE_IU/i_qsort1_il_d.ilproj      |   1 -
 .../ELEMENT_TYPE_IU/i_qsort1_il_r.ilproj      |   1 -
 .../Methodical/ELEMENT_TYPE_IU/i_qsort2.il    |  10 +-
 .../ELEMENT_TYPE_IU/i_qsort2_il_d.ilproj      |   1 -
 .../ELEMENT_TYPE_IU/i_qsort2_il_r.ilproj      |   1 -
 .../JIT/Methodical/ELEMENT_TYPE_IU/i_ref.il   |   8 +-
 .../ELEMENT_TYPE_IU/i_ref_il_d.ilproj         |   1 -
 .../ELEMENT_TYPE_IU/i_ref_il_r.ilproj         |   1 -
 .../JIT/Methodical/ELEMENT_TYPE_IU/i_seq.il   |   4 +-
 .../ELEMENT_TYPE_IU/i_seq_il_d.ilproj         |   1 -
 .../ELEMENT_TYPE_IU/i_seq_il_r.ilproj         |   1 -
 .../JIT/Methodical/ELEMENT_TYPE_IU/i_vfld.il  |  28 +-
 .../ELEMENT_TYPE_IU/i_vfld_il_d.ilproj        |   1 -
 .../ELEMENT_TYPE_IU/i_vfld_il_r.ilproj        |   1 -
 .../JIT/Methodical/ELEMENT_TYPE_IU/ptr.il     |  37 +-
 .../ELEMENT_TYPE_IU/ptr_il_d.ilproj           |   1 -
 .../ELEMENT_TYPE_IU/ptr_il_r.ilproj           |   1 -
 .../JIT/Methodical/ELEMENT_TYPE_IU/qperm.il   |  10 +-
 .../ELEMENT_TYPE_IU/qperm_il_d.ilproj         |   1 -
 .../ELEMENT_TYPE_IU/qperm_il_r.ilproj         |   1 -
 .../ELEMENT_TYPE_IU/sizeof_Target_32BIT.il    |   8 +-
 .../sizeof_Target_32BIT_il_d.ilproj           |   1 -
 .../sizeof_Target_32BIT_il_r.ilproj           |   1 -
 .../ELEMENT_TYPE_IU/sizeof_Target_64BIT.il    |   4 +-
 .../sizeof_Target_64BIT_il_d.ilproj           |   1 -
 .../sizeof_Target_64BIT_il_r.ilproj           |   1 -
 .../u_array_merge_Target_32BIT.il             |   2 +-
 .../u_array_merge_Target_32BIT_il_d.ilproj    |   1 -
 .../u_array_merge_Target_32BIT_il_r.ilproj    |   1 -
 .../u_array_merge_Target_64BIT.il             |   2 +-
 .../u_array_merge_Target_64BIT_il_d.ilproj    |   1 -
 .../u_array_merge_Target_64BIT_il_r.ilproj    |   1 -
 .../JIT/Methodical/ELEMENT_TYPE_IU/u_box.il   |  10 +-
 .../ELEMENT_TYPE_IU/u_box_il_d.ilproj         |   1 -
 .../ELEMENT_TYPE_IU/u_box_il_r.ilproj         |   1 -
 .../JIT/Methodical/ELEMENT_TYPE_IU/u_conv.il  |   4 +-
 .../ELEMENT_TYPE_IU/u_conv_il_d.ilproj        |   1 -
 .../JIT/Methodical/ELEMENT_TYPE_IU/u_fld.il   |  30 +-
 .../ELEMENT_TYPE_IU/u_fld_il_d.ilproj         |   1 -
 .../ELEMENT_TYPE_IU/u_fld_il_r.ilproj         |   1 -
 .../JIT/Methodical/ELEMENT_TYPE_IU/u_flood.il |   8 +-
 .../ELEMENT_TYPE_IU/u_flood_il_d.ilproj       |   1 -
 .../ELEMENT_TYPE_IU/u_flood_il_r.ilproj       |   1 -
 .../JIT/Methodical/ELEMENT_TYPE_IU/u_flow.il  |  36 +-
 .../ELEMENT_TYPE_IU/u_flow_il_d.ilproj        |   1 -
 .../ELEMENT_TYPE_IU/u_flow_il_r.ilproj        |   1 -
 .../JIT/Methodical/ELEMENT_TYPE_IU/u_prop.il  |  22 +-
 .../ELEMENT_TYPE_IU/u_prop_il_d.ilproj        |   1 -
 .../ELEMENT_TYPE_IU/u_prop_il_r.ilproj        |   1 -
 .../Methodical/ELEMENT_TYPE_IU/u_qsort1.il    |  10 +-
 .../ELEMENT_TYPE_IU/u_qsort1_il_d.ilproj      |   1 -
 .../ELEMENT_TYPE_IU/u_qsort1_il_r.ilproj      |   1 -
 .../Methodical/ELEMENT_TYPE_IU/u_qsort2.il    |  10 +-
 .../ELEMENT_TYPE_IU/u_qsort2_il_d.ilproj      |   1 -
 .../ELEMENT_TYPE_IU/u_qsort2_il_r.ilproj      |   1 -
 .../JIT/Methodical/ELEMENT_TYPE_IU/u_ref.il   |   8 +-
 .../ELEMENT_TYPE_IU/u_ref_il_d.ilproj         |   1 -
 .../ELEMENT_TYPE_IU/u_ref_il_r.ilproj         |   1 -
 .../JIT/Methodical/ELEMENT_TYPE_IU/u_seq.il   |   4 +-
 .../ELEMENT_TYPE_IU/u_seq_il_d.ilproj         |   1 -
 .../ELEMENT_TYPE_IU/u_seq_il_r.ilproj         |   1 -
 .../JIT/Methodical/ELEMENT_TYPE_IU/u_vfld.il  |  28 +-
 .../ELEMENT_TYPE_IU/u_vfld_il_d.ilproj        |   1 -
 .../ELEMENT_TYPE_IU/u_vfld_il_r.ilproj        |   1 -
 src/tests/JIT/Methodical/FPtrunc/convX.il     |   2 +-
 .../JIT/Methodical/FPtrunc/convX_il_d.ilproj  |   1 -
 .../JIT/Methodical/FPtrunc/convX_il_r.ilproj  |   1 -
 src/tests/JIT/Methodical/FPtrunc/convr4a.cs   |   4 +-
 .../Methodical/FPtrunc/convr4a_cs_d.csproj    |   1 -
 .../Methodical/FPtrunc/convr4a_cs_do.csproj   |   1 -
 .../Methodical/FPtrunc/convr4a_cs_r.csproj    |   1 -
 .../Methodical/FPtrunc/convr4a_cs_ro.csproj   |   1 -
 .../Methodical/FPtrunc/convr4d_il_d.ilproj    |   1 -
 .../Methodical/FPtrunc/convr4d_il_r.ilproj    |   1 -
 src/tests/JIT/Methodical/FPtrunc/convr8a.cs   |   4 +-
 .../Methodical/FPtrunc/convr8a_cs_d.csproj    |   1 -
 .../Methodical/FPtrunc/convr8a_cs_do.csproj   |   1 -
 .../Methodical/FPtrunc/convr8a_cs_r.csproj    |   1 -
 .../Methodical/FPtrunc/convr8a_cs_ro.csproj   |   1 -
 .../Methodical/FPtrunc/convr8d_il_d.ilproj    |   1 -
 .../Methodical/FPtrunc/convr8d_il_r.ilproj    |   1 -
 .../Methodical/Invoke/25params/25param1a.cs   |   9 +-
 .../Invoke/25params/25param1a_cs_d.csproj     |   1 -
 .../Invoke/25params/25param1a_cs_do.csproj    |   1 -
 .../Invoke/25params/25param1a_cs_r.csproj     |   1 -
 .../Invoke/25params/25param1a_cs_ro.csproj    |   1 -
 .../Methodical/Invoke/25params/25param1b.il   |  19 +-
 .../Invoke/25params/25param1b_il_d.ilproj     |   1 -
 .../Invoke/25params/25param1b_il_r.ilproj     |   1 -
 .../Methodical/Invoke/25params/25param1c.il   |  19 +-
 .../Invoke/25params/25param1c_il_d.ilproj     |   1 -
 .../Invoke/25params/25param1c_il_r.ilproj     |   1 -
 .../Methodical/Invoke/25params/25param2a.cs   |   9 +-
 .../Invoke/25params/25param2a_cs_d.csproj     |   1 -
 .../Invoke/25params/25param2a_cs_do.csproj    |   1 -
 .../Invoke/25params/25param2a_cs_r.csproj     |   1 -
 .../Invoke/25params/25param2a_cs_ro.csproj    |   1 -
 .../Methodical/Invoke/25params/25param2b.il   |  47 +-
 .../Invoke/25params/25param2b_il_d.ilproj     |   1 -
 .../Invoke/25params/25param2b_il_r.ilproj     |   1 -
 .../Methodical/Invoke/25params/25param2c.il   |  47 +-
 .../Invoke/25params/25param2c_il_d.ilproj     |   1 -
 .../Invoke/25params/25param2c_il_r.ilproj     |   1 -
 .../Methodical/Invoke/25params/25param3a.cs   |   9 +-
 .../Invoke/25params/25param3a_cs_d.csproj     |   1 -
 .../Invoke/25params/25param3a_cs_do.csproj    |   1 -
 .../Invoke/25params/25param3a_cs_r.csproj     |   1 -
 .../Invoke/25params/25param3a_cs_ro.csproj    |   1 -
 .../Methodical/Invoke/25params/25param3b.il   | 115 +--
 .../Invoke/25params/25param3b_il_d.ilproj     |   1 -
 .../Invoke/25params/25param3b_il_r.ilproj     |   1 -
 .../Methodical/Invoke/25params/25param3c.il   | 115 +--
 .../Invoke/25params/25param3c_il_d.ilproj     |   1 -
 .../Invoke/25params/25param3c_il_r.ilproj     |   1 -
 .../Invoke/25params/25paramMixed.il           | 115 +--
 .../Invoke/25params/25paramMixed_il_d.ilproj  |   1 -
 .../Invoke/25params/25paramMixed_il_r.ilproj  |   1 -
 .../JIT/Methodical/Invoke/SEH/catchfault.il   |  34 +-
 .../Invoke/SEH/catchfault_il_d.ilproj         |   1 -
 .../Invoke/SEH/catchfault_il_r.ilproj         |   1 -
 .../Methodical/Invoke/SEH/catchfault_jmp.il   |  44 +-
 .../Invoke/SEH/catchfault_jmp_il_d.ilproj     |   1 -
 .../Invoke/SEH/catchfault_jmp_il_r.ilproj     |   1 -
 .../Methodical/Invoke/SEH/catchfault_tail.il  |  44 +-
 .../Invoke/SEH/catchfault_tail_il_d.ilproj    |   1 -
 .../Invoke/SEH/catchfault_tail_il_r.ilproj    |   1 -
 .../JIT/Methodical/Invoke/SEH/catchfinally.cs |   8 +-
 .../Invoke/SEH/catchfinally_d.csproj          |   1 -
 .../Invoke/SEH/catchfinally_do.csproj         |   1 -
 .../Methodical/Invoke/SEH/catchfinally_ind.il |  34 +-
 .../Invoke/SEH/catchfinally_ind_il_d.ilproj   |   1 -
 .../Invoke/SEH/catchfinally_ind_il_r.ilproj   |   1 -
 .../Methodical/Invoke/SEH/catchfinally_jmp.il |  44 +-
 .../Invoke/SEH/catchfinally_jmp_il_d.ilproj   |   1 -
 .../Invoke/SEH/catchfinally_jmp_il_r.ilproj   |   1 -
 .../Invoke/SEH/catchfinally_jmpind.il         |  44 +-
 .../SEH/catchfinally_jmpind_il_d.ilproj       |   1 -
 .../SEH/catchfinally_jmpind_il_r.ilproj       |   1 -
 .../Invoke/SEH/catchfinally_r.csproj          |   1 -
 .../Invoke/SEH/catchfinally_ro.csproj         |   1 -
 .../Invoke/SEH/catchfinally_tail.cs           |   8 +-
 .../Invoke/SEH/catchfinally_tail.il           |  44 +-
 .../Invoke/SEH/catchfinally_tail_d.csproj     |   1 -
 .../Invoke/SEH/catchfinally_tail_do.csproj    |   1 -
 .../Invoke/SEH/catchfinally_tail_il_d.ilproj  |   1 -
 .../Invoke/SEH/catchfinally_tail_il_r.ilproj  |   1 -
 .../Invoke/SEH/catchfinally_tail_r.csproj     |   1 -
 .../Invoke/SEH/catchfinally_tail_ro.csproj    |   1 -
 .../JIT/Methodical/Invoke/callvirt/test1.cs   |  10 +-
 .../JIT/Methodical/Invoke/callvirt/test1.il   |  50 +-
 .../Methodical/Invoke/callvirt/test1_d.csproj |   1 -
 .../Invoke/callvirt/test1_do.csproj           |   1 -
 .../Invoke/callvirt/test1_il_d.ilproj         |   1 -
 .../Invoke/callvirt/test1_il_r.ilproj         |   1 -
 .../Methodical/Invoke/callvirt/test1_r.csproj |   1 -
 .../Invoke/callvirt/test1_ro.csproj           |   1 -
 .../JIT/Methodical/Invoke/callvirt/test2.il   |  50 +-
 .../Invoke/callvirt/test2_il_d.ilproj         |   1 -
 .../Invoke/callvirt/test2_il_r.ilproj         |   1 -
 .../JIT/Methodical/Invoke/callvirt/test3.il   |   4 +-
 .../Invoke/callvirt/test3_il_d.ilproj         |   1 -
 .../Invoke/callvirt/test3_il_r.ilproj         |   1 -
 .../JIT/Methodical/Invoke/ctor/val_cctor.il   |  32 +-
 .../Invoke/ctor/val_cctor_il_d.ilproj         |   1 -
 .../Invoke/ctor/val_cctor_il_r.ilproj         |   1 -
 .../JIT/Methodical/Invoke/ctor/val_ctor.cs    |   8 +-
 .../Methodical/Invoke/ctor/val_ctor_d.csproj  |   1 -
 .../Methodical/Invoke/ctor/val_ctor_do.csproj |   1 -
 .../Methodical/Invoke/ctor/val_ctor_newobj.il |  26 +-
 .../Invoke/ctor/val_ctor_newobj_il_d.ilproj   |   1 -
 .../Invoke/ctor/val_ctor_newobj_il_r.ilproj   |   1 -
 .../Methodical/Invoke/ctor/val_ctor_r.csproj  |   1 -
 .../Methodical/Invoke/ctor/val_ctor_ro.csproj |   1 -
 src/tests/JIT/Methodical/Invoke/deep/deep.cs  |   8 +-
 src/tests/JIT/Methodical/Invoke/deep/deep1.il |  36 +-
 .../Methodical/Invoke/deep/deep1_il_d.ilproj  |   1 -
 .../Methodical/Invoke/deep/deep1_il_r.ilproj  |   1 -
 src/tests/JIT/Methodical/Invoke/deep/deep2.il | 114 +--
 .../Methodical/Invoke/deep/deep2_il_d.ilproj  |   1 -
 .../Methodical/Invoke/deep/deep2_il_r.ilproj  |   1 -
 .../JIT/Methodical/Invoke/deep/deep_d.csproj  |   1 -
 .../JIT/Methodical/Invoke/deep/deep_do.csproj |   1 -
 .../JIT/Methodical/Invoke/deep/deep_r.csproj  |   1 -
 .../JIT/Methodical/Invoke/deep/deep_ro.csproj |   1 -
 src/tests/JIT/Methodical/Invoke/fptr/ftn_t.il |  18 +-
 .../Methodical/Invoke/fptr/ftn_t_il_d.ilproj  |   1 -
 .../Methodical/Invoke/fptr/ftn_t_il_r.ilproj  |   1 -
 .../JIT/Methodical/Invoke/fptr/instftn.il     |  18 +-
 .../Invoke/fptr/instftn_il_d.ilproj           |   1 -
 .../Invoke/fptr/instftn_il_r.ilproj           |   1 -
 .../JIT/Methodical/Invoke/fptr/instftn_t.il   |  20 +-
 .../Invoke/fptr/instftn_t_il_d.ilproj         |   1 -
 .../Invoke/fptr/instftn_t_il_r.ilproj         |   1 -
 .../JIT/Methodical/Invoke/fptr/recurse.cs     |   8 +-
 .../Methodical/Invoke/fptr/recurse_calli.il   |  12 +-
 .../Invoke/fptr/recurse_calli_il_d.ilproj     |   1 -
 .../Invoke/fptr/recurse_calli_il_r.ilproj     |   1 -
 .../Methodical/Invoke/fptr/recurse_d.csproj   |   1 -
 .../Methodical/Invoke/fptr/recurse_do.csproj  |   1 -
 .../JIT/Methodical/Invoke/fptr/recurse_jmp.il |  12 +-
 .../Invoke/fptr/recurse_jmp_il_d.ilproj       |   1 -
 .../Invoke/fptr/recurse_jmp_il_r.ilproj       |   1 -
 .../Methodical/Invoke/fptr/recurse_jmpi.il    |  12 +-
 .../Invoke/fptr/recurse_jmpi_il_d.ilproj      |   1 -
 .../Invoke/fptr/recurse_jmpi_il_r.ilproj      |   1 -
 .../Methodical/Invoke/fptr/recurse_r.csproj   |   1 -
 .../Methodical/Invoke/fptr/recurse_ro.csproj  |   1 -
 .../Invoke/fptr/recurse_tail_call.il          |  12 +-
 .../Invoke/fptr/recurse_tail_call_il_d.ilproj |   1 -
 .../Invoke/fptr/recurse_tail_call_il_r.ilproj |   1 -
 .../Invoke/fptr/recurse_tail_calli.il         |  12 +-
 .../fptr/recurse_tail_calli_il_d.ilproj       |   1 -
 .../fptr/recurse_tail_calli_il_r.ilproj       |   1 -
 .../JIT/Methodical/Invoke/fptr/valftn.il      |  24 +-
 .../Methodical/Invoke/fptr/valftn_il_d.ilproj |   1 -
 .../Methodical/Invoke/fptr/valftn_il_r.ilproj |   1 -
 .../JIT/Methodical/Invoke/fptr/valftn_t.il    |  26 +-
 .../Invoke/fptr/valftn_t_il_d.ilproj          |   1 -
 .../Invoke/fptr/valftn_t_il_r.ilproj          |   1 -
 .../JIT/Methodical/Invoke/fptr/virtftn.il     |  20 +-
 .../Invoke/fptr/virtftn_il_d.ilproj           |   1 -
 .../Invoke/fptr/virtftn_il_r.ilproj           |   1 -
 .../JIT/Methodical/Invoke/fptr/virtftn_t.il   |  22 +-
 .../Invoke/fptr/virtftn_t_il_d.ilproj         |   1 -
 .../Invoke/fptr/virtftn_t_il_r.ilproj         |   1 -
 .../Invoke/hfa_params/hfa_params.cs           |   4 +-
 .../Invoke/hfa_params/hfa_params_cs_d.csproj  |   1 -
 .../Invoke/hfa_params/hfa_params_cs_do.csproj |   1 -
 .../Invoke/hfa_params/hfa_params_cs_r.csproj  |   1 -
 .../Invoke/hfa_params/hfa_params_cs_ro.csproj |   1 -
 .../JIT/Methodical/Invoke/implicit/fr4.il     |  12 +-
 .../Invoke/implicit/fr4_il_d.ilproj           |   1 -
 .../Invoke/implicit/fr4_il_r.ilproj           |   1 -
 .../JIT/Methodical/Invoke/implicit/fr8.il     |  12 +-
 .../Invoke/implicit/fr8_il_d.ilproj           |   1 -
 .../Invoke/implicit/fr8_il_r.ilproj           |   1 -
 .../JIT/Methodical/Invoke/implicit/i4i1.il    |  10 +-
 .../Invoke/implicit/i4i1_il_d.ilproj          |   1 -
 .../Invoke/implicit/i4i1_il_r.ilproj          |   1 -
 .../JIT/Methodical/Invoke/implicit/i4i2.il    |  10 +-
 .../Invoke/implicit/i4i2_il_d.ilproj          |   1 -
 .../Invoke/implicit/i4i2_il_r.ilproj          |   1 -
 .../JIT/Methodical/Invoke/implicit/i4u1.il    |  10 +-
 .../Invoke/implicit/i4u1_il_d.ilproj          |   1 -
 .../Invoke/implicit/i4u1_il_r.ilproj          |   1 -
 .../JIT/Methodical/Invoke/implicit/i4u2.il    |  10 +-
 .../Invoke/implicit/i4u2_il_d.ilproj          |   1 -
 .../Invoke/implicit/i4u2_il_r.ilproj          |   1 -
 .../JIT/Methodical/Invoke/implicit/i4u4.il    |  10 +-
 .../Invoke/implicit/i4u4_il_d.ilproj          |   1 -
 .../Invoke/implicit/i4u4_il_r.ilproj          |   1 -
 .../JIT/Methodical/Invoke/implicit/i8u8.il    |  10 +-
 .../Invoke/implicit/i8u8_il_d.ilproj          |   1 -
 .../Invoke/implicit/i8u8_il_r.ilproj          |   1 -
 .../JIT/Methodical/Invoke/implicit/ii1.il     |  10 +-
 .../Invoke/implicit/ii1_il_d.ilproj           |   1 -
 .../Invoke/implicit/ii1_il_r.ilproj           |   1 -
 .../JIT/Methodical/Invoke/implicit/ii2.il     |  10 +-
 .../Invoke/implicit/ii2_il_d.ilproj           |   1 -
 .../Invoke/implicit/ii2_il_r.ilproj           |   1 -
 .../JIT/Methodical/Invoke/implicit/ii4.il     |  10 +-
 .../Invoke/implicit/ii4_il_d.ilproj           |   1 -
 .../Invoke/implicit/ii4_il_r.ilproj           |   1 -
 .../JIT/Methodical/Invoke/implicit/iu1.il     |  12 +-
 .../Invoke/implicit/iu1_il_d.ilproj           |   1 -
 .../Invoke/implicit/iu1_il_r.ilproj           |   1 -
 .../JIT/Methodical/Invoke/implicit/iu2.il     |  12 +-
 .../Invoke/implicit/iu2_il_d.ilproj           |   1 -
 .../Invoke/implicit/iu2_il_r.ilproj           |   1 -
 .../JIT/Methodical/Invoke/implicit/iu4.il     |  10 +-
 .../Invoke/implicit/iu4_il_d.ilproj           |   1 -
 .../Invoke/implicit/iu4_il_r.ilproj           |   1 -
 .../JIT/Methodical/Invoke/implicit/obj.cs     |  10 +-
 .../Methodical/Invoke/implicit/obj_d.csproj   |   1 -
 .../Methodical/Invoke/implicit/obj_do.csproj  |   1 -
 .../Methodical/Invoke/implicit/obj_r.csproj   |   1 -
 .../Methodical/Invoke/implicit/obj_ro.csproj  |   1 -
 .../JIT/Methodical/Invoke/implicit/objref.il  |  32 +-
 .../Invoke/implicit/objref_il_d.ilproj        |   1 -
 .../Invoke/implicit/objref_il_r.ilproj        |   1 -
 .../Methodical/Invoke/thiscall/thisnull.il    |  24 +-
 .../Invoke/thiscall/thisnull_il_d.ilproj      |   1 -
 .../Invoke/thiscall/thisnull_il_r.ilproj      |   1 -
 .../JIT/Methodical/MDArray/DataTypes/bool.cs  |   4 +-
 .../MDArray/DataTypes/bool_cs_d.csproj        |   1 -
 .../MDArray/DataTypes/bool_cs_do.csproj       |   1 -
 .../MDArray/DataTypes/bool_cs_r.csproj        |   1 -
 .../MDArray/DataTypes/bool_cs_ro.csproj       |   1 -
 .../JIT/Methodical/MDArray/DataTypes/byte.cs  |   4 +-
 .../MDArray/DataTypes/byte_cs_d.csproj        |   1 -
 .../MDArray/DataTypes/byte_cs_do.csproj       |   1 -
 .../MDArray/DataTypes/byte_cs_r.csproj        |   1 -
 .../MDArray/DataTypes/byte_cs_ro.csproj       |   1 -
 .../JIT/Methodical/MDArray/DataTypes/char.cs  |   4 +-
 .../MDArray/DataTypes/char_cs_d.csproj        |   1 -
 .../MDArray/DataTypes/char_cs_do.csproj       |   1 -
 .../MDArray/DataTypes/char_cs_r.csproj        |   1 -
 .../MDArray/DataTypes/char_cs_ro.csproj       |   1 -
 .../Methodical/MDArray/DataTypes/decimal.cs   |   4 +-
 .../MDArray/DataTypes/decimal_cs_d.csproj     |   1 -
 .../MDArray/DataTypes/decimal_cs_do.csproj    |   1 -
 .../MDArray/DataTypes/decimal_cs_r.csproj     |   1 -
 .../MDArray/DataTypes/decimal_cs_ro.csproj    |   1 -
 .../Methodical/MDArray/DataTypes/double.cs    |   4 +-
 .../MDArray/DataTypes/double_cs_d.csproj      |   1 -
 .../MDArray/DataTypes/double_cs_do.csproj     |   1 -
 .../MDArray/DataTypes/double_cs_r.csproj      |   1 -
 .../MDArray/DataTypes/double_cs_ro.csproj     |   1 -
 .../JIT/Methodical/MDArray/DataTypes/float.cs |   4 +-
 .../MDArray/DataTypes/float_cs_d.csproj       |   1 -
 .../MDArray/DataTypes/float_cs_do.csproj      |   1 -
 .../MDArray/DataTypes/float_cs_r.csproj       |   1 -
 .../MDArray/DataTypes/float_cs_ro.csproj      |   1 -
 .../JIT/Methodical/MDArray/DataTypes/int.cs   |   4 +-
 .../MDArray/DataTypes/int_cs_d.csproj         |   1 -
 .../MDArray/DataTypes/int_cs_do.csproj        |   1 -
 .../MDArray/DataTypes/int_cs_r.csproj         |   1 -
 .../MDArray/DataTypes/int_cs_ro.csproj        |   1 -
 .../JIT/Methodical/MDArray/DataTypes/long.cs  |   4 +-
 .../MDArray/DataTypes/long_cs_d.csproj        |   1 -
 .../MDArray/DataTypes/long_cs_do.csproj       |   1 -
 .../MDArray/DataTypes/long_cs_r.csproj        |   1 -
 .../MDArray/DataTypes/long_cs_ro.csproj       |   1 -
 .../JIT/Methodical/MDArray/DataTypes/sbyte.cs |   4 +-
 .../MDArray/DataTypes/sbyte_cs_d.csproj       |   1 -
 .../MDArray/DataTypes/sbyte_cs_do.csproj      |   1 -
 .../MDArray/DataTypes/sbyte_cs_r.csproj       |   1 -
 .../MDArray/DataTypes/sbyte_cs_ro.csproj      |   1 -
 .../JIT/Methodical/MDArray/DataTypes/short.cs |   4 +-
 .../MDArray/DataTypes/short_cs_d.csproj       |   1 -
 .../MDArray/DataTypes/short_cs_do.csproj      |   1 -
 .../MDArray/DataTypes/short_cs_r.csproj       |   1 -
 .../MDArray/DataTypes/short_cs_ro.csproj      |   1 -
 .../JIT/Methodical/MDArray/DataTypes/uint.cs  |   4 +-
 .../MDArray/DataTypes/uint_cs_d.csproj        |   1 -
 .../MDArray/DataTypes/uint_cs_do.csproj       |   1 -
 .../MDArray/DataTypes/uint_cs_r.csproj        |   1 -
 .../MDArray/DataTypes/uint_cs_ro.csproj       |   1 -
 .../JIT/Methodical/MDArray/DataTypes/ulong.cs |   4 +-
 .../MDArray/DataTypes/ulong_cs_d.csproj       |   1 -
 .../MDArray/DataTypes/ulong_cs_do.csproj      |   1 -
 .../MDArray/DataTypes/ulong_cs_r.csproj       |   1 -
 .../MDArray/DataTypes/ulong_cs_ro.csproj      |   1 -
 .../Methodical/MDArray/DataTypes/ushort.cs    |   4 +-
 .../MDArray/DataTypes/ushort_cs_d.csproj      |   1 -
 .../MDArray/DataTypes/ushort_cs_do.csproj     |   1 -
 .../MDArray/DataTypes/ushort_cs_r.csproj      |   1 -
 .../MDArray/DataTypes/ushort_cs_ro.csproj     |   1 -
 .../classarr_GaussJordan_cs_d.csproj          |   1 -
 .../classarr_GaussJordan_cs_do.csproj         |   1 -
 .../classarr_GaussJordan_cs_r.csproj          |   1 -
 .../classarr_GaussJordan_cs_ro.csproj         |   1 -
 .../MDArray/GaussJordan/jaggedarr.cs          |   6 +-
 .../jaggedarr_GaussJordan_cs_d.csproj         |   1 -
 .../jaggedarr_GaussJordan_cs_do.csproj        |   1 -
 .../jaggedarr_GaussJordan_cs_r.csproj         |   1 -
 .../jaggedarr_GaussJordan_cs_ro.csproj        |   1 -
 .../MDArray/GaussJordan/plainarr.cs           |   6 +-
 .../MDArray/GaussJordan/plainarr_cs_d.csproj  |   1 -
 .../MDArray/GaussJordan/plainarr_cs_do.csproj |   1 -
 .../MDArray/GaussJordan/plainarr_cs_r.csproj  |   1 -
 .../MDArray/GaussJordan/plainarr_cs_ro.csproj |   1 -
 .../structarr_GaussJordan_cs_d.csproj         |   1 -
 .../structarr_GaussJordan_cs_do.csproj        |   1 -
 .../structarr_GaussJordan_cs_r.csproj         |   1 -
 .../structarr_GaussJordan_cs_ro.csproj        |   1 -
 .../Methodical/MDArray/InnerProd/classarr.cs  |   7 +-
 .../InnerProd/classarr_InnerProd_cs_d.csproj  |   1 -
 .../InnerProd/classarr_InnerProd_cs_do.csproj |   1 -
 .../InnerProd/classarr_InnerProd_cs_r.csproj  |   1 -
 .../InnerProd/classarr_InnerProd_cs_ro.csproj |   1 -
 .../Methodical/MDArray/InnerProd/doublearr.cs |   7 +-
 .../InnerProd/doublearr_InnerProd_cs_d.csproj |   1 -
 .../doublearr_InnerProd_cs_do.csproj          |   1 -
 .../InnerProd/doublearr_InnerProd_cs_r.csproj |   1 -
 .../doublearr_InnerProd_cs_ro.csproj          |   1 -
 .../Methodical/MDArray/InnerProd/intarr.cs    |   7 +-
 .../MDArray/InnerProd/intarr_cs_d.csproj      |   1 -
 .../MDArray/InnerProd/intarr_cs_do.csproj     |   1 -
 .../MDArray/InnerProd/intarr_cs_r.csproj      |   1 -
 .../MDArray/InnerProd/intarr_cs_ro.csproj     |   1 -
 .../Methodical/MDArray/InnerProd/jaggedarr.cs |   7 +-
 .../InnerProd/jaggedarr_InnerProd_cs_d.csproj |   1 -
 .../jaggedarr_InnerProd_cs_do.csproj          |   1 -
 .../InnerProd/jaggedarr_InnerProd_cs_r.csproj |   1 -
 .../jaggedarr_InnerProd_cs_ro.csproj          |   1 -
 .../Methodical/MDArray/InnerProd/stringarr.cs |   4 +-
 .../InnerProd/stringarr_InnerProd_cs_d.csproj |   1 -
 .../stringarr_InnerProd_cs_do.csproj          |   1 -
 .../InnerProd/stringarr_InnerProd_cs_r.csproj |   1 -
 .../stringarr_InnerProd_cs_ro.csproj          |   1 -
 .../Methodical/MDArray/InnerProd/structarr.cs |   7 +-
 .../InnerProd/structarr_InnerProd_cs_d.csproj |   1 -
 .../structarr_InnerProd_cs_do.csproj          |   1 -
 .../InnerProd/structarr_InnerProd_cs_r.csproj |   1 -
 .../structarr_InnerProd_cs_ro.csproj          |   1 -
 .../JIT/Methodical/MDArray/basics/classarr.cs |   4 +-
 .../basics/classarr_basics_cs_d.csproj        |   1 -
 .../basics/classarr_basics_cs_do.csproj       |   1 -
 .../basics/classarr_basics_cs_r.csproj        |   1 -
 .../basics/classarr_basics_cs_ro.csproj       |   1 -
 .../Methodical/MDArray/basics/doublearr.cs    |   7 +-
 .../basics/doublearr_basics_cs_d.csproj       |   1 -
 .../basics/doublearr_basics_cs_do.csproj      |   1 -
 .../basics/doublearr_basics_cs_r.csproj       |   1 -
 .../basics/doublearr_basics_cs_ro.csproj      |   1 -
 .../Methodical/MDArray/basics/jaggedarr.cs    |   7 +-
 .../basics/jaggedarr_basics_cs_d.csproj       |   1 -
 .../basics/jaggedarr_basics_cs_do.csproj      |   1 -
 .../basics/jaggedarr_basics_cs_r.csproj       |   1 -
 .../basics/jaggedarr_basics_cs_ro.csproj      |   1 -
 .../Methodical/MDArray/basics/stringarr.cs    |   4 +-
 .../basics/stringarr_basics_cs_d.csproj       |   1 -
 .../basics/stringarr_basics_cs_do.csproj      |   1 -
 .../basics/stringarr_basics_cs_r.csproj       |   1 -
 .../basics/stringarr_basics_cs_ro.csproj      |   1 -
 .../Methodical/MDArray/basics/structarr.cs    |   4 +-
 .../basics/structarr_basics_cs_d.csproj       |   1 -
 .../basics/structarr_basics_cs_do.csproj      |   1 -
 .../basics/structarr_basics_cs_r.csproj       |   1 -
 .../basics/structarr_basics_cs_ro.csproj      |   1 -
 src/tests/JIT/Methodical/NaN/arithm32.cs      |   9 +-
 .../JIT/Methodical/NaN/arithm32_d.csproj      |   1 -
 .../JIT/Methodical/NaN/arithm32_do.csproj     |   1 -
 .../JIT/Methodical/NaN/arithm32_r.csproj      |   1 -
 .../JIT/Methodical/NaN/arithm32_ro.csproj     |   1 -
 src/tests/JIT/Methodical/NaN/arithm64.cs      |   9 +-
 .../JIT/Methodical/NaN/arithm64_d.csproj      |   1 -
 .../JIT/Methodical/NaN/arithm64_do.csproj     |   1 -
 .../JIT/Methodical/NaN/arithm64_r.csproj      |   1 -
 .../JIT/Methodical/NaN/arithm64_ro.csproj     |   1 -
 src/tests/JIT/Methodical/NaN/comp32.il        |   8 +-
 .../JIT/Methodical/NaN/comp32_il_d.ilproj     |   1 -
 .../JIT/Methodical/NaN/comp32_il_r.ilproj     |   1 -
 src/tests/JIT/Methodical/NaN/comp64.il        |   8 +-
 .../JIT/Methodical/NaN/comp64_il_d.ilproj     |   1 -
 .../JIT/Methodical/NaN/comp64_il_r.ilproj     |   1 -
 src/tests/JIT/Methodical/NaN/cond32.il        |   8 +-
 .../JIT/Methodical/NaN/cond32_il_d.ilproj     |   1 -
 .../JIT/Methodical/NaN/cond32_il_r.ilproj     |   1 -
 src/tests/JIT/Methodical/NaN/cond64.il        |   8 +-
 .../JIT/Methodical/NaN/cond64_il_d.ilproj     |   1 -
 .../JIT/Methodical/NaN/cond64_il_r.ilproj     |   1 -
 src/tests/JIT/Methodical/NaN/intrinsic.cs     |   9 +-
 .../JIT/Methodical/NaN/intrinsic_cs_d.csproj  |   1 -
 .../JIT/Methodical/NaN/intrinsic_cs_do.csproj |   1 -
 .../JIT/Methodical/NaN/intrinsic_cs_r.csproj  |   1 -
 .../JIT/Methodical/NaN/intrinsic_cs_ro.csproj |   1 -
 .../JIT/Methodical/NaN/intrinsic_nonf.il      | 210 ++---
 .../Methodical/NaN/intrinsic_nonf_il_d.ilproj |   1 -
 .../Methodical/NaN/intrinsic_nonf_il_r.ilproj |   1 -
 src/tests/JIT/Methodical/NaN/r4NaNadd.cs      |   6 +-
 .../JIT/Methodical/NaN/r4NaNadd_cs_d.csproj   |   1 -
 .../JIT/Methodical/NaN/r4NaNadd_cs_do.csproj  |   1 -
 .../JIT/Methodical/NaN/r4NaNadd_cs_r.csproj   |   1 -
 .../JIT/Methodical/NaN/r4NaNadd_cs_ro.csproj  |   1 -
 src/tests/JIT/Methodical/NaN/r4NaNconv.il     |  71 +-
 .../JIT/Methodical/NaN/r4NaNconv_il_d.ilproj  |   1 -
 .../JIT/Methodical/NaN/r4NaNconv_il_r.ilproj  |   1 -
 src/tests/JIT/Methodical/NaN/r4NaNdiv.cs      |   6 +-
 .../JIT/Methodical/NaN/r4NaNdiv_cs_d.csproj   |   1 -
 .../JIT/Methodical/NaN/r4NaNdiv_cs_do.csproj  |   1 -
 .../JIT/Methodical/NaN/r4NaNdiv_cs_r.csproj   |   1 -
 .../JIT/Methodical/NaN/r4NaNdiv_cs_ro.csproj  |   1 -
 src/tests/JIT/Methodical/NaN/r4NaNmul.cs      |   6 +-
 .../JIT/Methodical/NaN/r4NaNmul_cs_d.csproj   |   1 -
 .../JIT/Methodical/NaN/r4NaNmul_cs_do.csproj  |   1 -
 .../JIT/Methodical/NaN/r4NaNmul_cs_r.csproj   |   1 -
 .../JIT/Methodical/NaN/r4NaNmul_cs_ro.csproj  |   1 -
 src/tests/JIT/Methodical/NaN/r4NaNrem.cs      |   6 +-
 .../JIT/Methodical/NaN/r4NaNrem_cs_d.csproj   |   1 -
 .../JIT/Methodical/NaN/r4NaNrem_cs_do.csproj  |   1 -
 .../JIT/Methodical/NaN/r4NaNrem_cs_r.csproj   |   1 -
 .../JIT/Methodical/NaN/r4NaNrem_cs_ro.csproj  |   1 -
 src/tests/JIT/Methodical/NaN/r4NaNsub.cs      |   6 +-
 .../JIT/Methodical/NaN/r4NaNsub_cs_d.csproj   |   1 -
 .../JIT/Methodical/NaN/r4NaNsub_cs_do.csproj  |   1 -
 .../JIT/Methodical/NaN/r4NaNsub_cs_r.csproj   |   1 -
 .../JIT/Methodical/NaN/r4NaNsub_cs_ro.csproj  |   1 -
 src/tests/JIT/Methodical/NaN/r8NaNadd.cs      |   6 +-
 .../JIT/Methodical/NaN/r8NaNadd_cs_d.csproj   |   1 -
 .../JIT/Methodical/NaN/r8NaNadd_cs_do.csproj  |   1 -
 .../JIT/Methodical/NaN/r8NaNadd_cs_r.csproj   |   1 -
 .../JIT/Methodical/NaN/r8NaNadd_cs_ro.csproj  |   1 -
 src/tests/JIT/Methodical/NaN/r8NaNconv.il     |  71 +-
 .../JIT/Methodical/NaN/r8NaNconv_il_d.ilproj  |   1 -
 .../JIT/Methodical/NaN/r8NaNconv_il_r.ilproj  |   1 -
 src/tests/JIT/Methodical/NaN/r8NaNdiv.cs      |   6 +-
 .../JIT/Methodical/NaN/r8NaNdiv_cs_d.csproj   |   1 -
 .../JIT/Methodical/NaN/r8NaNdiv_cs_do.csproj  |   1 -
 .../JIT/Methodical/NaN/r8NaNdiv_cs_r.csproj   |   1 -
 .../JIT/Methodical/NaN/r8NaNdiv_cs_ro.csproj  |   1 -
 src/tests/JIT/Methodical/NaN/r8NaNmul.cs      |   6 +-
 .../JIT/Methodical/NaN/r8NaNmul_cs_d.csproj   |   1 -
 .../JIT/Methodical/NaN/r8NaNmul_cs_do.csproj  |   1 -
 .../JIT/Methodical/NaN/r8NaNmul_cs_r.csproj   |   1 -
 .../JIT/Methodical/NaN/r8NaNmul_cs_ro.csproj  |   1 -
 src/tests/JIT/Methodical/NaN/r8NaNrem.cs      |   6 +-
 .../JIT/Methodical/NaN/r8NaNrem_cs_d.csproj   |   1 -
 .../JIT/Methodical/NaN/r8NaNrem_cs_do.csproj  |   1 -
 .../JIT/Methodical/NaN/r8NaNrem_cs_r.csproj   |   1 -
 .../JIT/Methodical/NaN/r8NaNrem_cs_ro.csproj  |   1 -
 src/tests/JIT/Methodical/NaN/r8NaNsub.cs      |   6 +-
 .../JIT/Methodical/NaN/r8NaNsub_cs_d.csproj   |   1 -
 .../JIT/Methodical/NaN/r8NaNsub_cs_do.csproj  |   1 -
 .../JIT/Methodical/NaN/r8NaNsub_cs_r.csproj   |   1 -
 .../JIT/Methodical/NaN/r8NaNsub_cs_ro.csproj  |   1 -
 .../Overflow/FloatInfinitiesToInt.cs          |   9 +-
 .../Overflow/FloatInfinitiesToInt_d.csproj    |   1 -
 .../Overflow/FloatInfinitiesToInt_do.csproj   |   1 -
 .../Overflow/FloatInfinitiesToInt_r.csproj    |   1 -
 .../Overflow/FloatInfinitiesToInt_ro.csproj   |   1 -
 .../JIT/Methodical/Overflow/FloatOvfToInt2.cs |   9 +-
 .../Overflow/FloatOvfToInt2_d.csproj          |   1 -
 .../Overflow/FloatOvfToInt2_do.csproj         |   1 -
 .../Overflow/FloatOvfToInt2_r.csproj          |   1 -
 .../Overflow/FloatOvfToInt2_ro.csproj         |   1 -
 src/tests/JIT/Methodical/VT/callconv/aa.il    | 126 +--
 .../JIT/Methodical/VT/callconv/aa_il_d.ilproj |   1 -
 .../JIT/Methodical/VT/callconv/aa_il_r.ilproj |   1 -
 src/tests/JIT/Methodical/VT/callconv/call.cs  |   8 +-
 .../JIT/Methodical/VT/callconv/call_d.csproj  |   1 -
 .../JIT/Methodical/VT/callconv/call_do.csproj |   1 -
 .../JIT/Methodical/VT/callconv/call_r.csproj  |   1 -
 .../JIT/Methodical/VT/callconv/call_ro.csproj |   1 -
 src/tests/JIT/Methodical/VT/callconv/calli.il | 138 +--
 .../Methodical/VT/callconv/calli_il_d.ilproj  |   1 -
 .../Methodical/VT/callconv/calli_il_r.ilproj  |   1 -
 src/tests/JIT/Methodical/VT/callconv/dd.il    | 134 +--
 .../JIT/Methodical/VT/callconv/dd_il_d.ilproj |   1 -
 .../JIT/Methodical/VT/callconv/dd_il_r.ilproj |   1 -
 src/tests/JIT/Methodical/VT/callconv/ee.il    | 134 +--
 .../JIT/Methodical/VT/callconv/ee_il_d.ilproj |   1 -
 .../JIT/Methodical/VT/callconv/ee_il_r.ilproj |   1 -
 .../JIT/Methodical/VT/callconv/jumper.cs      |   8 +-
 .../JIT/Methodical/VT/callconv/jumper1.il     |  70 +-
 .../VT/callconv/jumper1_il_d.ilproj           |   1 -
 .../VT/callconv/jumper1_il_r.ilproj           |   1 -
 .../JIT/Methodical/VT/callconv/jumper2.il     |  68 +-
 .../VT/callconv/jumper2_il_d.ilproj           |   1 -
 .../VT/callconv/jumper2_il_r.ilproj           |   1 -
 .../JIT/Methodical/VT/callconv/jumper3.il     |  70 +-
 .../VT/callconv/jumper3_il_d.ilproj           |   1 -
 .../VT/callconv/jumper3_il_r.ilproj           |   1 -
 .../JIT/Methodical/VT/callconv/jumper4.il     |  68 +-
 .../VT/callconv/jumper4_il_d.ilproj           |   1 -
 .../VT/callconv/jumper4_il_r.ilproj           |   1 -
 .../JIT/Methodical/VT/callconv/jumper5.il     |  68 +-
 .../VT/callconv/jumper5_il_d.ilproj           |   1 -
 .../VT/callconv/jumper5_il_r.ilproj           |   1 -
 .../Methodical/VT/callconv/jumper_d.csproj    |   1 -
 .../Methodical/VT/callconv/jumper_do.csproj   |   1 -
 .../Methodical/VT/callconv/jumper_r.csproj    |   1 -
 .../Methodical/VT/callconv/jumper_ro.csproj   |   1 -
 src/tests/JIT/Methodical/VT/callconv/jumps.cs |   8 +-
 .../JIT/Methodical/VT/callconv/jumps1.il      | 102 +-
 .../Methodical/VT/callconv/jumps1_il_d.ilproj |   1 -
 .../Methodical/VT/callconv/jumps1_il_r.ilproj |   1 -
 .../JIT/Methodical/VT/callconv/jumps2.il      | 102 +-
 .../Methodical/VT/callconv/jumps2_il_d.ilproj |   1 -
 .../Methodical/VT/callconv/jumps2_il_r.ilproj |   1 -
 .../JIT/Methodical/VT/callconv/jumps3.il      | 102 +-
 .../Methodical/VT/callconv/jumps3_il_d.ilproj |   1 -
 .../Methodical/VT/callconv/jumps3_il_r.ilproj |   1 -
 .../JIT/Methodical/VT/callconv/jumps4.il      | 108 +--
 .../Methodical/VT/callconv/jumps4_il_d.ilproj |   1 -
 .../Methodical/VT/callconv/jumps4_il_r.ilproj |   1 -
 .../JIT/Methodical/VT/callconv/jumps5.il      | 102 +-
 .../Methodical/VT/callconv/jumps5_il_d.ilproj |   1 -
 .../Methodical/VT/callconv/jumps5_il_r.ilproj |   1 -
 .../JIT/Methodical/VT/callconv/jumps_d.csproj |   1 -
 .../Methodical/VT/callconv/jumps_do.csproj    |   1 -
 .../JIT/Methodical/VT/callconv/jumps_r.csproj |   1 -
 .../Methodical/VT/callconv/jumps_ro.csproj    |   1 -
 src/tests/JIT/Methodical/VT/callconv/vtret.cs |   8 +-
 src/tests/JIT/Methodical/VT/callconv/vtret.il |  58 +-
 .../JIT/Methodical/VT/callconv/vtret2.il      |  60 +-
 .../Methodical/VT/callconv/vtret2_il_d.ilproj |   1 -
 .../Methodical/VT/callconv/vtret2_il_r.ilproj |   1 -
 .../JIT/Methodical/VT/callconv/vtret_d.csproj |   1 -
 .../Methodical/VT/callconv/vtret_do.csproj    |   1 -
 .../Methodical/VT/callconv/vtret_il_d.ilproj  |   1 -
 .../Methodical/VT/callconv/vtret_il_r.ilproj  |   1 -
 .../JIT/Methodical/VT/callconv/vtret_r.csproj |   1 -
 .../Methodical/VT/callconv/vtret_ro.csproj    |   1 -
 .../Methodical/VT/etc/ctor_recurse_d.csproj   |   1 -
 .../Methodical/VT/etc/ctor_recurse_do.csproj  |   1 -
 .../Methodical/VT/etc/ctor_recurse_r.csproj   |   1 -
 .../Methodical/VT/etc/ctor_recurse_ro.csproj  |   1 -
 src/tests/JIT/Methodical/VT/etc/gc_nested.cs  |   8 +-
 .../JIT/Methodical/VT/etc/gc_nested_d.csproj  |   1 -
 .../JIT/Methodical/VT/etc/gc_nested_do.csproj |   1 -
 .../JIT/Methodical/VT/etc/gc_nested_r.csproj  |   1 -
 .../JIT/Methodical/VT/etc/gc_nested_ro.csproj |   1 -
 src/tests/JIT/Methodical/VT/etc/han2.cs       |   2 +-
 src/tests/JIT/Methodical/VT/etc/han2_d.csproj |   1 -
 .../JIT/Methodical/VT/etc/han2_do.csproj      |   1 -
 src/tests/JIT/Methodical/VT/etc/han2_r.csproj |   1 -
 .../JIT/Methodical/VT/etc/han2_ro.csproj      |   1 -
 src/tests/JIT/Methodical/VT/etc/han3.cs       |   2 +-
 src/tests/JIT/Methodical/VT/etc/han3.il       | 118 +--
 src/tests/JIT/Methodical/VT/etc/han3_ctor.cs  |   2 +-
 src/tests/JIT/Methodical/VT/etc/han3_ctor.il  | 120 +--
 .../JIT/Methodical/VT/etc/han3_ctor_d.csproj  |   1 -
 .../JIT/Methodical/VT/etc/han3_ctor_do.csproj |   1 -
 .../Methodical/VT/etc/han3_ctor_il_d.ilproj   |   1 -
 .../Methodical/VT/etc/han3_ctor_il_r.ilproj   |   1 -
 .../JIT/Methodical/VT/etc/han3_ctor_r.csproj  |   1 -
 .../JIT/Methodical/VT/etc/han3_ctor_ro.csproj |   1 -
 src/tests/JIT/Methodical/VT/etc/han3_d.csproj |   1 -
 .../JIT/Methodical/VT/etc/han3_do.csproj      |   1 -
 .../JIT/Methodical/VT/etc/han3_il_d.ilproj    |   1 -
 .../JIT/Methodical/VT/etc/han3_il_r.ilproj    |   1 -
 src/tests/JIT/Methodical/VT/etc/han3_r.csproj |   1 -
 src/tests/JIT/Methodical/VT/etc/han3_ref.cs   |   2 +-
 src/tests/JIT/Methodical/VT/etc/han3_ref.il   | 132 +--
 .../JIT/Methodical/VT/etc/han3_ref_d.csproj   |   1 -
 .../JIT/Methodical/VT/etc/han3_ref_do.csproj  |   1 -
 .../Methodical/VT/etc/han3_ref_il_d.ilproj    |   1 -
 .../Methodical/VT/etc/han3_ref_il_r.ilproj    |   1 -
 .../JIT/Methodical/VT/etc/han3_ref_r.csproj   |   1 -
 .../JIT/Methodical/VT/etc/han3_ref_ro.csproj  |   1 -
 .../JIT/Methodical/VT/etc/han3_ro.csproj      |   1 -
 src/tests/JIT/Methodical/VT/etc/hanoi.cs      |   8 +-
 src/tests/JIT/Methodical/VT/etc/hanoi.il      | 110 +--
 src/tests/JIT/Methodical/VT/etc/hanoi2.il     |  98 +-
 .../JIT/Methodical/VT/etc/hanoi2_il_d.ilproj  |   1 -
 .../JIT/Methodical/VT/etc/hanoi2_il_r.ilproj  |   1 -
 .../JIT/Methodical/VT/etc/hanoi_d.csproj      |   1 -
 .../JIT/Methodical/VT/etc/hanoi_do.csproj     |   1 -
 .../JIT/Methodical/VT/etc/hanoi_il_d.ilproj   |   1 -
 .../JIT/Methodical/VT/etc/hanoi_il_r.ilproj   |   1 -
 .../JIT/Methodical/VT/etc/hanoi_r.csproj      |   1 -
 .../JIT/Methodical/VT/etc/hanoi_ro.csproj     |   1 -
 src/tests/JIT/Methodical/VT/etc/knight.cs     |   8 +-
 src/tests/JIT/Methodical/VT/etc/knight.il     | 108 +--
 .../JIT/Methodical/VT/etc/knight_d.csproj     |   1 -
 .../JIT/Methodical/VT/etc/knight_do.csproj    |   1 -
 .../JIT/Methodical/VT/etc/knight_il_d.ilproj  |   1 -
 .../JIT/Methodical/VT/etc/knight_il_r.ilproj  |   1 -
 .../JIT/Methodical/VT/etc/knight_r.csproj     |   1 -
 .../JIT/Methodical/VT/etc/knight_ro.csproj    |   1 -
 src/tests/JIT/Methodical/VT/etc/nested.cs     |   8 +-
 src/tests/JIT/Methodical/VT/etc/nested.il     |  46 +-
 .../JIT/Methodical/VT/etc/nested_d.csproj     |   1 -
 .../JIT/Methodical/VT/etc/nested_do.csproj    |   1 -
 .../JIT/Methodical/VT/etc/nested_il_d.ilproj  |   1 -
 .../JIT/Methodical/VT/etc/nested_il_r.ilproj  |   1 -
 .../JIT/Methodical/VT/etc/nested_r.csproj     |   1 -
 .../JIT/Methodical/VT/etc/nested_ro.csproj    |   1 -
 src/tests/JIT/Methodical/VT/identity/accum.cs |   8 +-
 src/tests/JIT/Methodical/VT/identity/accum.il |  52 +-
 .../JIT/Methodical/VT/identity/accum_d.csproj |   1 -
 .../Methodical/VT/identity/accum_do.csproj    |   1 -
 .../Methodical/VT/identity/accum_il_d.ilproj  |   1 -
 .../Methodical/VT/identity/accum_il_r.ilproj  |   1 -
 .../JIT/Methodical/VT/identity/accum_r.csproj |   1 -
 .../Methodical/VT/identity/accum_ro.csproj    |   1 -
 .../JIT/Methodical/VT/identity/livecall.il    |  22 +-
 .../VT/identity/livecall_il_d.ilproj          |   1 -
 .../VT/identity/livecall_il_r.ilproj          |   1 -
 src/tests/JIT/Methodical/VT/identity/vcall.cs |   8 +-
 .../JIT/Methodical/VT/identity/vcall_d.csproj |   1 -
 .../Methodical/VT/identity/vcall_do.csproj    |   1 -
 .../JIT/Methodical/VT/identity/vcall_r.csproj |   1 -
 .../Methodical/VT/identity/vcall_ro.csproj    |   1 -
 .../JIT/Methodical/VT/identity/volatile.il    |  16 +-
 .../VT/identity/volatile_il_d.ilproj          |   1 -
 .../VT/identity/volatile_il_r.ilproj          |   1 -
 .../JIT/Methodical/VT/port/huge_gcref.il      |  48 +-
 .../Methodical/VT/port/huge_gcref_il_d.ilproj |   1 -
 .../Methodical/VT/port/huge_gcref_il_r.ilproj |   1 -
 src/tests/JIT/Methodical/VT/port/lcs.cs       |   8 +-
 src/tests/JIT/Methodical/VT/port/lcs_gcref.cs |   8 +-
 .../JIT/Methodical/VT/port/lcs_gcref_d.csproj |   1 -
 .../Methodical/VT/port/lcs_gcref_do.csproj    |   1 -
 .../JIT/Methodical/VT/port/lcs_gcref_r.csproj |   1 -
 .../Methodical/VT/port/lcs_gcref_ro.csproj    |   1 -
 .../JIT/Methodical/VT/port/lcs_port_d.csproj  |   1 -
 .../JIT/Methodical/VT/port/lcs_port_do.csproj |   1 -
 .../JIT/Methodical/VT/port/lcs_port_r.csproj  |   1 -
 .../JIT/Methodical/VT/port/lcs_port_ro.csproj |   1 -
 .../acceptance/Boxing/boxing001.ilproj        |   1 -
 .../JIT/Methodical/casts/SEH/cast_throw.cs    |   6 +-
 .../Methodical/casts/SEH/cast_throw_d.csproj  |   1 -
 .../Methodical/casts/SEH/cast_throw_do.csproj |   1 -
 .../Methodical/casts/SEH/cast_throw_r.csproj  |   1 -
 .../Methodical/casts/SEH/cast_throw_ro.csproj |   1 -
 .../Methodical/casts/SEH/castclass_catch.il   |   6 +-
 .../casts/SEH/castclass_catch_il_d.ilproj     |   1 -
 .../casts/SEH/castclass_catch_il_r.ilproj     |   1 -
 .../casts/SEH/castclass_catch_neg.il          |   6 +-
 .../casts/SEH/castclass_catch_neg_il_d.ilproj |   1 -
 .../casts/SEH/castclass_catch_neg_il_r.ilproj |   1 -
 src/tests/JIT/Methodical/casts/SEH/filter.il  |   6 +
 .../casts/SEH/filter_SEH_casts_il_d.ilproj    |   1 -
 .../casts/SEH/filter_SEH_casts_il_r.ilproj    |   1 -
 .../JIT/Methodical/casts/SEH/isinst_catch.il  |   6 +-
 .../casts/SEH/isinst_catch_il_d.ilproj        |   1 -
 .../casts/SEH/isinst_catch_il_r.ilproj        |   1 -
 .../Methodical/casts/SEH/isinst_catch_neg.il  |   6 +-
 .../casts/SEH/isinst_catch_neg_il_d.ilproj    |   1 -
 .../casts/SEH/isinst_catch_neg_il_r.ilproj    |   1 -
 src/tests/JIT/Methodical/casts/SEH/throw.cs   |   8 +-
 .../JIT/Methodical/casts/SEH/throw_d.csproj   |   1 -
 .../JIT/Methodical/casts/SEH/throw_do.csproj  |   1 -
 .../JIT/Methodical/casts/SEH/throw_r.csproj   |   1 -
 .../JIT/Methodical/casts/SEH/throw_ro.csproj  |   1 -
 .../JIT/Methodical/casts/array/arrays.il      |   6 +
 .../Methodical/casts/array/arrays_il_d.ilproj |   1 -
 .../Methodical/casts/array/arrays_il_r.ilproj |   1 -
 .../Methodical/casts/array/castclass_ldlen.il |   6 +-
 .../casts/array/castclass_ldlen_il_d.ilproj   |   1 -
 .../casts/array/castclass_ldlen_il_r.ilproj   |   1 -
 .../Methodical/casts/array/isinst_ldlen.il    |   6 +-
 .../casts/array/isinst_ldlen_il_d.ilproj      |   1 -
 .../casts/array/isinst_ldlen_il_r.ilproj      |   1 -
 .../casts/coverage/castclass_call.cs          |  10 +-
 .../casts/coverage/castclass_call.il          |  54 +-
 .../casts/coverage/castclass_call_d.csproj    |   1 -
 .../casts/coverage/castclass_call_do.csproj   |   1 -
 .../casts/coverage/castclass_call_il_d.ilproj |   1 -
 .../casts/coverage/castclass_call_il_r.ilproj |   1 -
 .../casts/coverage/castclass_call_r.csproj    |   1 -
 .../casts/coverage/castclass_call_ro.csproj   |   1 -
 .../casts/coverage/castclass_calli.il         |  58 +-
 .../coverage/castclass_calli_il_d.ilproj      |   1 -
 .../coverage/castclass_calli_il_r.ilproj      |   1 -
 .../casts/coverage/castclass_ldarg.cs         |  10 +-
 .../casts/coverage/castclass_ldarg.il         |  40 +-
 .../casts/coverage/castclass_ldarg_d.csproj   |   1 -
 .../casts/coverage/castclass_ldarg_do.csproj  |   1 -
 .../coverage/castclass_ldarg_il_d.ilproj      |   1 -
 .../coverage/castclass_ldarg_il_r.ilproj      |   1 -
 .../casts/coverage/castclass_ldarg_r.csproj   |   1 -
 .../casts/coverage/castclass_ldarg_ro.csproj  |   1 -
 .../casts/coverage/castclass_ldloc.cs         |  10 +-
 .../casts/coverage/castclass_ldloc.il         |  40 +-
 .../casts/coverage/castclass_ldloc_d.csproj   |   1 -
 .../casts/coverage/castclass_ldloc_do.csproj  |   1 -
 .../coverage/castclass_ldloc_il_d.ilproj      |   1 -
 .../coverage/castclass_ldloc_il_r.ilproj      |   1 -
 .../casts/coverage/castclass_ldloc_r.csproj   |   1 -
 .../casts/coverage/castclass_ldloc_ro.csproj  |   1 -
 .../casts/coverage/castclass_newobj.cs        |  10 +-
 .../casts/coverage/castclass_newobj_d.csproj  |   1 -
 .../casts/coverage/castclass_newobj_do.csproj |   1 -
 .../casts/coverage/castclass_newobj_r.csproj  |   1 -
 .../casts/coverage/castclass_newobj_ro.csproj |   1 -
 .../Methodical/casts/coverage/isinst_call.cs  |  10 +-
 .../Methodical/casts/coverage/isinst_call.il  |  46 +-
 .../casts/coverage/isinst_call_d.csproj       |   1 -
 .../casts/coverage/isinst_call_do.csproj      |   1 -
 .../casts/coverage/isinst_call_il_d.ilproj    |   1 -
 .../casts/coverage/isinst_call_il_r.ilproj    |   1 -
 .../casts/coverage/isinst_call_r.csproj       |   1 -
 .../casts/coverage/isinst_call_ro.csproj      |   1 -
 .../Methodical/casts/coverage/isinst_calli.il |  50 +-
 .../casts/coverage/isinst_calli_il_d.ilproj   |   1 -
 .../casts/coverage/isinst_calli_il_r.ilproj   |   1 -
 .../Methodical/casts/coverage/isinst_ldarg.cs |  10 +-
 .../Methodical/casts/coverage/isinst_ldarg.il |  40 +-
 .../casts/coverage/isinst_ldarg_d.csproj      |   1 -
 .../casts/coverage/isinst_ldarg_do.csproj     |   1 -
 .../casts/coverage/isinst_ldarg_il_d.ilproj   |   1 -
 .../casts/coverage/isinst_ldarg_il_r.ilproj   |   1 -
 .../casts/coverage/isinst_ldarg_r.csproj      |   1 -
 .../casts/coverage/isinst_ldarg_ro.csproj     |   1 -
 .../Methodical/casts/coverage/isinst_ldloc.cs |  10 +-
 .../Methodical/casts/coverage/isinst_ldloc.il |  40 +-
 .../casts/coverage/isinst_ldloc_d.csproj      |   1 -
 .../casts/coverage/isinst_ldloc_do.csproj     |   1 -
 .../casts/coverage/isinst_ldloc_il_d.ilproj   |   1 -
 .../casts/coverage/isinst_ldloc_il_r.ilproj   |   1 -
 .../casts/coverage/isinst_ldloc_r.csproj      |   1 -
 .../casts/coverage/isinst_ldloc_ro.csproj     |   1 -
 .../casts/coverage/isinst_newobj.cs           |  10 +-
 .../casts/coverage/isinst_newobj_d.csproj     |   1 -
 .../casts/coverage/isinst_newobj_do.csproj    |   1 -
 .../casts/coverage/isinst_newobj_r.csproj     |   1 -
 .../casts/coverage/isinst_newobj_ro.csproj    |   1 -
 .../JIT/Methodical/casts/coverage/ldnull.il   |  16 +-
 .../casts/coverage/ldnull_il_d.ilproj         |   1 -
 .../casts/coverage/ldnull_il_r.ilproj         |   1 -
 .../JIT/Methodical/casts/iface/iface1.cs      |  10 +-
 .../Methodical/casts/iface/iface1_d.csproj    |   1 -
 .../Methodical/casts/iface/iface1_do.csproj   |   1 -
 .../Methodical/casts/iface/iface1_r.csproj    |   1 -
 .../Methodical/casts/iface/iface1_ro.csproj   |   1 -
 .../JIT/Methodical/casts/iface/iface2.il      | 126 +--
 .../Methodical/casts/iface/iface2_il_d.ilproj |   1 -
 .../Methodical/casts/iface/iface2_il_r.ilproj |   1 -
 .../casts/ilseq/CommonBase_il_r.csproj        |   1 -
 .../JIT/Methodical/casts/ilseq/commonBase.cs  |   9 +-
 .../Methodical/cctor/misc/Desktop/throw.cs    |   9 +-
 .../misc/Desktop/throw_Desktop_cs_d.csproj    |   1 -
 .../misc/Desktop/throw_Desktop_cs_do.csproj   |   1 -
 .../misc/Desktop/throw_Desktop_cs_r.csproj    |   1 -
 .../misc/Desktop/throw_Desktop_cs_ro.csproj   |   1 -
 .../JIT/Methodical/cctor/misc/assemname.cs    |   6 +-
 .../cctor/misc/assemname_cs_d.csproj          |   1 -
 .../cctor/misc/assemname_cs_do.csproj         |   1 -
 .../cctor/misc/assemname_cs_r.csproj          |   1 -
 .../cctor/misc/assemname_cs_ro.csproj         |   1 -
 .../cctor/misc/deadlock_il_d.ilproj           |   1 -
 .../cctor/misc/deadlock_il_r.ilproj           |   1 -
 src/tests/JIT/Methodical/cctor/misc/global.il |   6 +
 .../Methodical/cctor/misc/global_il_d.ilproj  |   1 -
 .../Methodical/cctor/misc/global_il_r.ilproj  |   1 -
 .../JIT/Methodical/cctor/misc/threads1.cs     |   6 +-
 .../cctor/misc/threads1_cs_d.csproj           |   1 -
 .../cctor/misc/threads1_cs_do.csproj          |   1 -
 .../cctor/misc/threads1_cs_r.csproj           |   1 -
 .../cctor/misc/threads1_cs_ro.csproj          |   1 -
 .../JIT/Methodical/cctor/misc/threads2.cs     |   6 +-
 .../cctor/misc/threads2_cs_d.csproj           |   1 -
 .../cctor/misc/threads2_cs_do.csproj          |   1 -
 .../cctor/misc/threads2_cs_r.csproj           |   1 -
 .../cctor/misc/threads2_cs_ro.csproj          |   1 -
 src/tests/JIT/Methodical/cctor/misc/throw.cs  |   9 +-
 .../cctor/misc/throw_misc_cs_d.csproj         |   1 -
 .../cctor/misc/throw_misc_cs_do.csproj        |   1 -
 .../cctor/misc/throw_misc_cs_r.csproj         |   1 -
 .../cctor/misc/throw_misc_cs_ro.csproj        |   1 -
 .../cctor/simple/Desktop/prefldinit3.il       |  80 +-
 .../simple/Desktop/prefldinit3_il_r.ilproj    |   1 -
 .../JIT/Methodical/cctor/simple/precise1.cs   |   9 +-
 .../cctor/simple/precise1_cs_d.csproj         |   1 -
 .../cctor/simple/precise1_cs_do.csproj        |   1 -
 .../cctor/simple/precise1_cs_r.csproj         |   1 -
 .../cctor/simple/precise1_cs_ro.csproj        |   1 -
 .../JIT/Methodical/cctor/simple/precise1b.cs  |   9 +-
 .../cctor/simple/precise1b_cs_d.csproj        |   1 -
 .../cctor/simple/precise1b_cs_do.csproj       |   1 -
 .../cctor/simple/precise1b_cs_r.csproj        |   1 -
 .../cctor/simple/precise1b_cs_ro.csproj       |   1 -
 .../JIT/Methodical/cctor/simple/precise2.cs   |   9 +-
 .../cctor/simple/precise2_cs_d.csproj         |   1 -
 .../cctor/simple/precise2_cs_do.csproj        |   1 -
 .../cctor/simple/precise2_cs_r.csproj         |   1 -
 .../cctor/simple/precise2_cs_ro.csproj        |   1 -
 .../JIT/Methodical/cctor/simple/precise4.cs   |   9 +-
 .../cctor/simple/precise4_cs_d.csproj         |   1 -
 .../cctor/simple/precise4_cs_do.csproj        |   1 -
 .../cctor/simple/precise4_cs_r.csproj         |   1 -
 .../cctor/simple/precise4_cs_ro.csproj        |   1 -
 .../Methodical/cctor/simple/prefldinit1.il    |  66 +-
 .../cctor/simple/prefldinit1_il_d.ilproj      |   1 -
 .../cctor/simple/prefldinit1_il_r.ilproj      |   1 -
 .../Methodical/cctor/simple/prefldinit2.il    |  68 +-
 .../cctor/simple/prefldinit2_il_d.ilproj      |   1 -
 .../cctor/simple/prefldinit2_il_r.ilproj      |   1 -
 .../Methodical/cctor/simple/prefldinit4.il    |  70 +-
 .../cctor/simple/prefldinit4_il_d.ilproj      |   1 -
 .../cctor/simple/prefldinit4_il_r.ilproj      |   1 -
 .../JIT/Methodical/cctor/xassem/xprecise1.cs  |   6 +-
 .../cctor/xassem/xprecise1_cs_d.csproj        |   1 -
 .../cctor/xassem/xprecise1_cs_do.csproj       |   1 -
 .../cctor/xassem/xprecise1_cs_r.csproj        |   1 -
 .../cctor/xassem/xprecise1_cs_ro.csproj       |   1 -
 .../JIT/Methodical/cctor/xassem/xprecise1b.cs |   6 +-
 .../cctor/xassem/xprecise1b_cs_d.csproj       |   1 -
 .../cctor/xassem/xprecise1b_cs_do.csproj      |   1 -
 .../cctor/xassem/xprecise1b_cs_r.csproj       |   1 -
 .../cctor/xassem/xprecise1b_cs_ro.csproj      |   1 -
 .../JIT/Methodical/cctor/xassem/xprecise2.cs  |   6 +-
 .../cctor/xassem/xprecise2_cs_d.csproj        |   1 -
 .../cctor/xassem/xprecise2_cs_do.csproj       |   1 -
 .../cctor/xassem/xprecise2_cs_r.csproj        |   1 -
 .../cctor/xassem/xprecise2_cs_ro.csproj       |   1 -
 .../JIT/Methodical/cctor/xassem/xprecise4.cs  |   6 +-
 .../cctor/xassem/xprecise4_cs_d.csproj        |   1 -
 .../cctor/xassem/xprecise4_cs_do.csproj       |   1 -
 .../cctor/xassem/xprecise4_cs_r.csproj        |   1 -
 .../cctor/xassem/xprecise4_cs_ro.csproj       |   1 -
 .../Methodical/delegate/_simpleoddpower.il    |   2 +-
 .../delegate/_simpleoddpower_il_d.ilproj      |   1 -
 .../delegate/_simpleoddpower_il_r.ilproj      |   1 -
 .../JIT/Methodical/divrem/div/decimaldiv.cs   |   6 +-
 .../divrem/div/decimaldiv_cs_d.csproj         |   1 -
 .../divrem/div/decimaldiv_cs_do.csproj        |   1 -
 .../divrem/div/decimaldiv_cs_r.csproj         |   1 -
 .../divrem/div/decimaldiv_cs_ro.csproj        |   1 -
 src/tests/JIT/Methodical/divrem/div/i4div.cs  |   6 +-
 .../Methodical/divrem/div/i4div_cs_d.csproj   |   1 -
 .../Methodical/divrem/div/i4div_cs_do.csproj  |   1 -
 .../Methodical/divrem/div/i4div_cs_r.csproj   |   1 -
 .../Methodical/divrem/div/i4div_cs_ro.csproj  |   1 -
 src/tests/JIT/Methodical/divrem/div/i8div.cs  |   6 +-
 .../Methodical/divrem/div/i8div_cs_d.csproj   |   1 -
 .../Methodical/divrem/div/i8div_cs_do.csproj  |   1 -
 .../Methodical/divrem/div/i8div_cs_r.csproj   |   1 -
 .../Methodical/divrem/div/i8div_cs_ro.csproj  |   1 -
 .../JIT/Methodical/divrem/div/negSignedMod.cs |   6 +-
 .../Methodical/divrem/div/negSignedMod.csproj |   1 -
 .../JIT/Methodical/divrem/div/overlddiv.cs    |   6 +-
 .../divrem/div/overlddiv_cs_d.csproj          |   1 -
 .../divrem/div/overlddiv_cs_do.csproj         |   1 -
 .../divrem/div/overlddiv_cs_r.csproj          |   1 -
 .../divrem/div/overlddiv_cs_ro.csproj         |   1 -
 src/tests/JIT/Methodical/divrem/div/r4div.cs  |   6 +-
 .../Methodical/divrem/div/r4div_cs_d.csproj   |   1 -
 .../Methodical/divrem/div/r4div_cs_do.csproj  |   1 -
 .../Methodical/divrem/div/r4div_cs_r.csproj   |   1 -
 .../Methodical/divrem/div/r4div_cs_ro.csproj  |   1 -
 src/tests/JIT/Methodical/divrem/div/r8div.cs  |   6 +-
 .../Methodical/divrem/div/r8div_cs_d.csproj   |   1 -
 .../Methodical/divrem/div/r8div_cs_do.csproj  |   1 -
 .../Methodical/divrem/div/r8div_cs_r.csproj   |   1 -
 .../Methodical/divrem/div/r8div_cs_ro.csproj  |   1 -
 src/tests/JIT/Methodical/divrem/div/u4div.cs  |   6 +-
 .../Methodical/divrem/div/u4div_cs_d.csproj   |   1 -
 .../Methodical/divrem/div/u4div_cs_do.csproj  |   1 -
 .../Methodical/divrem/div/u4div_cs_r.csproj   |   1 -
 .../Methodical/divrem/div/u4div_cs_ro.csproj  |   1 -
 src/tests/JIT/Methodical/divrem/div/u8div.cs  |   6 +-
 .../Methodical/divrem/div/u8div_cs_d.csproj   |   1 -
 .../Methodical/divrem/div/u8div_cs_do.csproj  |   1 -
 .../Methodical/divrem/div/u8div_cs_r.csproj   |   1 -
 .../Methodical/divrem/div/u8div_cs_ro.csproj  |   1 -
 .../JIT/Methodical/divrem/rem/decimalrem.cs   |   6 +-
 .../divrem/rem/decimalrem_cs_d.csproj         |   1 -
 .../divrem/rem/decimalrem_cs_do.csproj        |   1 -
 .../divrem/rem/decimalrem_cs_r.csproj         |   1 -
 .../divrem/rem/decimalrem_cs_ro.csproj        |   1 -
 src/tests/JIT/Methodical/divrem/rem/i4rem.cs  |   6 +-
 .../Methodical/divrem/rem/i4rem_cs_d.csproj   |   1 -
 .../Methodical/divrem/rem/i4rem_cs_do.csproj  |   1 -
 .../Methodical/divrem/rem/i4rem_cs_r.csproj   |   1 -
 .../Methodical/divrem/rem/i4rem_cs_ro.csproj  |   1 -
 src/tests/JIT/Methodical/divrem/rem/i8rem.cs  |   6 +-
 .../Methodical/divrem/rem/i8rem_cs_d.csproj   |   1 -
 .../Methodical/divrem/rem/i8rem_cs_do.csproj  |   1 -
 .../Methodical/divrem/rem/i8rem_cs_r.csproj   |   1 -
 .../Methodical/divrem/rem/i8rem_cs_ro.csproj  |   1 -
 .../JIT/Methodical/divrem/rem/overldrem.cs    |   6 +-
 .../divrem/rem/overldrem_cs_d.csproj          |   1 -
 .../divrem/rem/overldrem_cs_do.csproj         |   1 -
 .../divrem/rem/overldrem_cs_r.csproj          |   1 -
 .../divrem/rem/overldrem_cs_ro.csproj         |   1 -
 src/tests/JIT/Methodical/divrem/rem/r4rem.cs  |   6 +-
 .../Methodical/divrem/rem/r4rem_cs_d.csproj   |   1 -
 .../Methodical/divrem/rem/r4rem_cs_do.csproj  |   1 -
 .../Methodical/divrem/rem/r4rem_cs_r.csproj   |   1 -
 .../Methodical/divrem/rem/r4rem_cs_ro.csproj  |   1 -
 src/tests/JIT/Methodical/divrem/rem/r8rem.cs  |   6 +-
 .../Methodical/divrem/rem/r8rem_cs_d.csproj   |   1 -
 .../Methodical/divrem/rem/r8rem_cs_do.csproj  |   1 -
 .../Methodical/divrem/rem/r8rem_cs_r.csproj   |   1 -
 .../Methodical/divrem/rem/r8rem_cs_ro.csproj  |   1 -
 src/tests/JIT/Methodical/divrem/rem/u4rem.cs  |   6 +-
 .../Methodical/divrem/rem/u4rem_cs_d.csproj   |   1 -
 .../Methodical/divrem/rem/u4rem_cs_do.csproj  |   1 -
 .../Methodical/divrem/rem/u4rem_cs_r.csproj   |   1 -
 .../Methodical/divrem/rem/u4rem_cs_ro.csproj  |   1 -
 src/tests/JIT/Methodical/divrem/rem/u8rem.cs  |   6 +-
 .../Methodical/divrem/rem/u8rem_cs_d.csproj   |   1 -
 .../Methodical/divrem/rem/u8rem_cs_do.csproj  |   1 -
 .../Methodical/divrem/rem/u8rem_cs_r.csproj   |   1 -
 .../Methodical/divrem/rem/u8rem_cs_ro.csproj  |   1 -
 .../JIT/Methodical/doublearray/dblarray1.cs   |   6 +-
 .../doublearray/dblarray1_cs_d.csproj         |   1 -
 .../doublearray/dblarray1_cs_do.csproj        |   1 -
 .../doublearray/dblarray1_cs_r.csproj         |   1 -
 .../doublearray/dblarray1_cs_ro.csproj        |   1 -
 .../JIT/Methodical/doublearray/dblarray2.cs   |   6 +-
 .../doublearray/dblarray2_cs_d.csproj         |   1 -
 .../doublearray/dblarray2_cs_do.csproj        |   1 -
 .../doublearray/dblarray2_cs_r.csproj         |   1 -
 .../doublearray/dblarray2_cs_ro.csproj        |   1 -
 .../JIT/Methodical/doublearray/dblarray3.cs   |   6 +-
 .../doublearray/dblarray3_cs_d.csproj         |   1 -
 .../doublearray/dblarray3_cs_do.csproj        |   1 -
 .../doublearray/dblarray3_cs_r.csproj         |   1 -
 .../doublearray/dblarray3_cs_ro.csproj        |   1 -
 .../JIT/Methodical/doublearray/dblarray4.cs   |   6 +-
 .../doublearray/dblarray4_cs_d.csproj         |   1 -
 .../doublearray/dblarray4_cs_do.csproj        |   1 -
 .../doublearray/dblarray4_cs_r.csproj         |   1 -
 .../doublearray/dblarray4_cs_ro.csproj        |   1 -
 .../Methodical/dynamic_methods/bug_445388.cs  |   9 +-
 .../dynamic_methods/bug_445388.csproj         |   1 -
 .../JIT/Methodical/eh/basics/emptyfinally.il  |  14 +-
 .../eh/basics/emptyfinally_il_d.ilproj        |   1 -
 .../eh/basics/emptyfinally_il_r.ilproj        |   1 -
 .../JIT/Methodical/eh/basics/multihandler.cs  |   8 +-
 .../eh/basics/multihandler_d.csproj           |   1 -
 .../eh/basics/multihandler_do.csproj          |   1 -
 .../eh/basics/multihandler_r.csproj           |   1 -
 .../eh/basics/multihandler_ro.csproj          |   1 -
 .../JIT/Methodical/eh/basics/throwincatch.cs  |   8 +-
 .../eh/basics/throwincatch_basics_d.csproj    |   1 -
 .../eh/basics/throwincatch_basics_do.csproj   |   1 -
 .../eh/basics/throwincatch_basics_r.csproj    |   1 -
 .../eh/basics/throwincatch_basics_ro.csproj   |   1 -
 .../eh/basics/throwinclassconstructor.cs      |   4 +-
 .../basics/throwinclassconstructor_d.csproj   |   1 -
 .../basics/throwinclassconstructor_do.csproj  |   1 -
 .../basics/throwinclassconstructor_r.csproj   |   1 -
 .../basics/throwinclassconstructor_ro.csproj  |   1 -
 .../JIT/Methodical/eh/basics/throwinexcept.il |   4 +
 .../eh/basics/throwinexcept_il_d.ilproj       |   1 -
 .../eh/basics/throwinexcept_il_r.ilproj       |   1 -
 .../JIT/Methodical/eh/basics/throwinfault.il  |   4 +
 .../eh/basics/throwinfault_il_d.ilproj        |   1 -
 .../eh/basics/throwinfault_il_r.ilproj        |   1 -
 .../JIT/Methodical/eh/basics/throwinfilter.il |   4 +
 .../eh/basics/throwinfilter_il_d.ilproj       |   1 -
 .../eh/basics/throwinfilter_il_r.ilproj       |   1 -
 .../Methodical/eh/basics/throwinfinally.cs    |   7 +-
 .../eh/basics/throwinfinally_basics_d.csproj  |   1 -
 .../eh/basics/throwinfinally_basics_do.csproj |   1 -
 .../eh/basics/throwinfinally_basics_r.csproj  |   1 -
 .../eh/basics/throwinfinally_basics_ro.csproj |   1 -
 .../eh/basics/throwinfinallyerrpath.cs        |   8 +-
 .../eh/basics/throwinfinallyerrpath_d.csproj  |   1 -
 .../eh/basics/throwinfinallyerrpath_do.csproj |   1 -
 .../eh/basics/throwinfinallyerrpath_r.csproj  |   1 -
 .../eh/basics/throwinfinallyerrpath_ro.csproj |   1 -
 .../eh/basics/throwinfinallyerrpathfn.cs      |   7 +-
 .../basics/throwinfinallyerrpathfn_d.csproj   |   1 -
 .../basics/throwinfinallyerrpathfn_do.csproj  |   1 -
 .../basics/throwinfinallyerrpathfn_r.csproj   |   1 -
 .../basics/throwinfinallyerrpathfn_ro.csproj  |   1 -
 .../eh/basics/throwinfinallyintryfilter1.il   |   4 +
 .../throwinfinallyintryfilter1_il_d.ilproj    |   1 -
 .../throwinfinallyintryfilter1_il_r.ilproj    |   1 -
 .../eh/basics/throwinfinallyintryfilter2.il   |   4 +
 .../throwinfinallyintryfilter2_il_d.ilproj    |   1 -
 .../throwinfinallyintryfilter2_il_r.ilproj    |   1 -
 .../eh/basics/throwinfinallyintryfilter3.il   |   4 +
 .../throwinfinallyintryfilter3_il_d.ilproj    |   1 -
 .../throwinfinallyintryfilter3_il_r.ilproj    |   1 -
 .../eh/basics/throwisfirstinstruction.il      |  13 +-
 .../throwisfirstinstruction_il_d.ilproj       |   1 -
 .../throwisfirstinstruction_il_r.ilproj       |   1 -
 .../JIT/Methodical/eh/basics/throwoutside.cs  |   7 +-
 .../eh/basics/throwoutside_d.csproj           |   1 -
 .../eh/basics/throwoutside_do.csproj          |   1 -
 .../eh/basics/throwoutside_r.csproj           |   1 -
 .../eh/basics/throwoutside_ro.csproj          |   1 -
 .../JIT/Methodical/eh/basics/trycatch.cs      |   8 +-
 .../Methodical/eh/basics/trycatch_d.csproj    |   1 -
 .../Methodical/eh/basics/trycatch_do.csproj   |   1 -
 .../Methodical/eh/basics/trycatch_r.csproj    |   1 -
 .../Methodical/eh/basics/trycatch_ro.csproj   |   1 -
 .../Methodical/eh/basics/trycatchtrycatch.cs  |   8 +-
 .../eh/basics/trycatchtrycatch_d.csproj       |   1 -
 .../eh/basics/trycatchtrycatch_do.csproj      |   1 -
 .../eh/basics/trycatchtrycatch_r.csproj       |   1 -
 .../eh/basics/trycatchtrycatch_ro.csproj      |   1 -
 .../JIT/Methodical/eh/basics/tryexcept.il     |   4 +
 .../eh/basics/tryexcept_il_d.ilproj           |   1 -
 .../eh/basics/tryexcept_il_r.ilproj           |   1 -
 .../JIT/Methodical/eh/basics/tryfault.il      |   4 +
 .../Methodical/eh/basics/tryfault_il_d.ilproj |   1 -
 .../Methodical/eh/basics/tryfault_il_r.ilproj |   1 -
 .../Methodical/eh/basics/tryfaulttrycatch.il  |   4 +
 .../eh/basics/tryfaulttrycatch_il_d.ilproj    |   1 -
 .../eh/basics/tryfaulttrycatch_il_r.ilproj    |   1 -
 .../eh/basics/tryfaulttrycatchfn.il           |   4 +
 .../eh/basics/tryfaulttrycatchfn_il_d.ilproj  |   1 -
 .../eh/basics/tryfaulttrycatchfn_il_r.ilproj  |   1 -
 .../JIT/Methodical/eh/basics/tryfinally.cs    |   8 +-
 .../Methodical/eh/basics/tryfinally_d.csproj  |   1 -
 .../Methodical/eh/basics/tryfinally_do.csproj |   1 -
 .../Methodical/eh/basics/tryfinally_r.csproj  |   1 -
 .../Methodical/eh/basics/tryfinally_ro.csproj |   1 -
 .../eh/basics/tryfinallytrycatch.cs           |   8 +-
 .../eh/basics/tryfinallytrycatch_d.csproj     |   1 -
 .../eh/basics/tryfinallytrycatch_do.csproj    |   1 -
 .../eh/basics/tryfinallytrycatch_r.csproj     |   1 -
 .../eh/basics/tryfinallytrycatch_ro.csproj    |   1 -
 .../eh/basics/tryfinallytryfinally.cs         |   8 +-
 .../eh/basics/tryfinallytryfinally_d.csproj   |   1 -
 .../eh/basics/tryfinallytryfinally_do.csproj  |   1 -
 .../eh/basics/tryfinallytryfinally_r.csproj   |   1 -
 .../eh/basics/tryfinallytryfinally_ro.csproj  |   1 -
 .../eh/basics/tryfinallywith2endfinally.il    |  12 +-
 .../tryfinallywith2endfinally_il_d.ilproj     |   1 -
 .../tryfinallywith2endfinally_il_r.ilproj     |   1 -
 .../tryfinallywith2reachableendfinally.il     |  12 +-
 ...inallywith2reachableendfinally_il_d.ilproj |   1 -
 ...inallywith2reachableendfinally_il_r.ilproj |   1 -
 .../JIT/Methodical/eh/basics/trythrowcatch.cs |   8 +-
 .../eh/basics/trythrowcatch_d.csproj          |   1 -
 .../eh/basics/trythrowcatch_do.csproj         |   1 -
 .../eh/basics/trythrowcatch_r.csproj          |   1 -
 .../eh/basics/trythrowcatch_ro.csproj         |   1 -
 .../eh/basics/trythrowcatchfinally.cs         |   9 +-
 .../eh/basics/trythrowcatchfinally_d.csproj   |   1 -
 .../eh/basics/trythrowcatchfinally_do.csproj  |   1 -
 .../eh/basics/trythrowcatchfinally_r.csproj   |   1 -
 .../eh/basics/trythrowcatchfinally_ro.csproj  |   1 -
 .../Methodical/eh/basics/trythrowexcept.il    |   4 +
 .../eh/basics/trythrowexcept_il_d.ilproj      |   1 -
 .../eh/basics/trythrowexcept_il_r.ilproj      |   1 -
 src/tests/JIT/Methodical/eh/cs/unsafe.cs      |   9 +-
 .../JIT/Methodical/eh/cs/unsafe_d.csproj      |   1 -
 .../JIT/Methodical/eh/cs/unsafe_do.csproj     |   1 -
 .../JIT/Methodical/eh/cs/unsafe_r.csproj      |   1 -
 .../JIT/Methodical/eh/cs/unsafe_ro.csproj     |   1 -
 .../eh/deadcode/badcodeaftercatch_il_d.ilproj |   1 -
 .../eh/deadcode/badcodeaftercatch_il_r.ilproj |   1 -
 .../eh/deadcode/badcodeafterfault_il_d.ilproj |   1 -
 .../eh/deadcode/badcodeafterfault_il_r.ilproj |   1 -
 .../deadcode/badcodeafterfilter_il_d.ilproj   |   1 -
 .../deadcode/badcodeafterfilter_il_r.ilproj   |   1 -
 .../deadcode/badcodeafterfinally_il_d.ilproj  |   1 -
 .../deadcode/badcodeafterfinally_il_r.ilproj  |   1 -
 .../eh/deadcode/badcodeaftertry_il_d.ilproj   |   1 -
 .../eh/deadcode/badcodeaftertry_il_r.ilproj   |   1 -
 .../deadcode/badcodeinsidefinally_il_d.ilproj |   1 -
 .../deadcode/badcodeinsidefinally_il_r.ilproj |   1 -
 .../eh/deadcode/branchoverendfinally.il       |  13 +-
 .../deadcode/branchoverendfinally_il_d.ilproj |   1 -
 .../deadcode/branchoverendfinally_il_r.ilproj |   1 -
 .../eh/deadcode/deadEHregionacrossBB.il       |  21 +-
 .../deadcode/deadEHregionacrossBB_il_d.ilproj |   1 -
 .../deadcode/deadEHregionacrossBB_il_r.ilproj |   1 -
 .../Methodical/eh/deadcode/deadcodeincatch.il |  24 +-
 .../eh/deadcode/deadcodeincatch_il_d.ilproj   |   1 -
 .../eh/deadcode/deadcodeincatch_il_r.ilproj   |   1 -
 .../eh/deadcode/deadnonlocalexit.il           |   4 +
 .../eh/deadcode/deadnonlocalexit_il_d.ilproj  |   1 -
 .../eh/deadcode/deadnonlocalexit_il_r.ilproj  |   1 -
 .../Methodical/eh/deadcode/deadoponerror.il   |   4 +-
 .../eh/deadcode/deadoponerror_il_d.ilproj     |   1 -
 .../eh/deadcode/deadoponerror_il_r.ilproj     |   1 -
 .../eh/deadcode/deadoponerrorinfunclet.il     |  14 +-
 .../eh/deadcode/deadrgninfunclet.il           |   4 +
 .../eh/deadcode/deadrgninfunclet_il_d.ilproj  |   1 -
 .../eh/deadcode/deadrgninfunclet_il_r.ilproj  |   1 -
 .../Methodical/eh/deadcode/deadtrycatch.il    |   4 +
 .../eh/deadcode/deadtrycatch_il_d.ilproj      |   1 -
 .../eh/deadcode/deadtrycatch_il_r.ilproj      |   1 -
 .../Methodical/eh/deadcode/deadtryfinally.il  |   4 +
 .../eh/deadcode/deadtryfinally_il_d.ilproj    |   1 -
 .../eh/deadcode/deadtryfinally_il_r.ilproj    |   1 -
 .../eh/deadcode/deadtryfinallythrow.il        |   4 +
 .../deadcode/deadtryfinallythrow_il_d.ilproj  |   1 -
 .../deadcode/deadtryfinallythrow_il_r.ilproj  |   1 -
 .../eh/deadcode/endfinallyinloop.il           |   5 +-
 .../eh/deadcode/endfinallyinloop_il_d.ilproj  |   1 -
 .../eh/deadcode/endfinallyinloop_il_r.ilproj  |   1 -
 .../eh/deadcode/loopstrswitchgoto.cs          |   8 +-
 .../eh/deadcode/loopstrswitchgoto_d.csproj    |   1 -
 .../eh/deadcode/loopstrswitchgoto_do.csproj   |   1 -
 .../eh/deadcode/loopstrswitchgoto_r.csproj    |   1 -
 .../eh/deadcode/loopstrswitchgoto_ro.csproj   |   1 -
 .../eh/deadcode/severaldeadehregions.il       |   4 +
 .../deadcode/severaldeadehregions_il_d.ilproj |   1 -
 .../deadcode/severaldeadehregions_il_r.ilproj |   1 -
 .../eh/deadcode/severalnesteddeadehregions.il |   4 +
 .../severalnesteddeadehregions_il_d.ilproj    |   1 -
 .../severalnesteddeadehregions_il_r.ilproj    |   1 -
 .../eh/deadcode/simpledeadehregion.il         |   4 +
 .../deadcode/simpledeadehregion_il_d.ilproj   |   1 -
 .../deadcode/simpledeadehregion_il_r.ilproj   |   1 -
 .../eh/disconnected/backwardleave.il          |   4 +
 .../eh/disconnected/backwardleave_il_d.ilproj |   1 -
 .../eh/disconnected/backwardleave_il_r.ilproj |   1 -
 .../eh/disconnected/catchbeforetrybody.il     |   4 +
 .../catchbeforetrybody_il_d.ilproj            |   1 -
 .../catchbeforetrybody_il_r.ilproj            |   1 -
 .../eh/disconnected/catchtryintryfinally.il   |   4 +
 .../catchtryintryfinally_il_d.ilproj          |   1 -
 .../catchtryintryfinally_il_r.ilproj          |   1 -
 .../eh/disconnected/faultbeforetrybody.il     |   4 +
 .../faultbeforetrybody_il_d.ilproj            |   1 -
 .../faultbeforetrybody_il_r.ilproj            |   1 -
 .../eh/disconnected/finallybeforetrybody.il   |   4 +
 .../finallybeforetrybody_il_d.ilproj          |   1 -
 .../finallybeforetrybody_il_r.ilproj          |   1 -
 .../eh/disconnected/finallytryintryfinally.il |   4 +
 .../finallytryintryfinally_il_d.ilproj        |   1 -
 .../finallytryintryfinally_il_r.ilproj        |   1 -
 .../eh/disconnected/reversedhandlers.il       |   4 +
 .../disconnected/reversedhandlers_il_d.ilproj |   1 -
 .../disconnected/reversedhandlers_il_r.ilproj |   1 -
 .../eh/disconnected/reversedtryblock.il       |   4 +
 .../disconnected/reversedtryblock_il_d.ilproj |   1 -
 .../disconnected/reversedtryblock_il_r.ilproj |   1 -
 .../eh/disconnected/sehhandlerbeforetry.il    |   4 +
 .../sehhandlerbeforetry_il_d.ilproj           |   1 -
 .../sehhandlerbeforetry_il_r.ilproj           |   1 -
 .../JIT/Methodical/eh/disconnected/testeit.il |   4 +
 .../eh/disconnected/testeit_il_d.ilproj       |   1 -
 .../eh/disconnected/testeit_il_r.ilproj       |   1 -
 .../trybodyinbetweencatchhandlers.il          |   4 +
 .../trybodyinbetweencatchhandlers_il_d.ilproj |   1 -
 .../trybodyinbetweencatchhandlers_il_r.ilproj |   1 -
 .../eh/disconnected/tryfinallyincatchtry.il   |   4 +
 .../tryfinallyincatchtry_il_d.ilproj          |   1 -
 .../tryfinallyincatchtry_il_r.ilproj          |   1 -
 .../eh/finallyexec/catchrettoinnertry.cs      |   8 +-
 .../eh/finallyexec/catchrettoinnertry.il      |  14 +-
 .../catchrettoinnertry_cs_d.csproj            |   1 -
 .../catchrettoinnertry_cs_do.csproj           |   1 -
 .../catchrettoinnertry_cs_r.csproj            |   1 -
 .../catchrettoinnertry_cs_ro.csproj           |   1 -
 .../catchrettoinnertry_il_d.ilproj            |   1 -
 .../catchrettoinnertry_il_r.ilproj            |   1 -
 .../eh/finallyexec/localgotoinahandler.cs     |   9 +-
 .../finallyexec/localgotoinahandler_d.csproj  |   1 -
 .../finallyexec/localgotoinahandler_do.csproj |   1 -
 .../finallyexec/localgotoinahandler_r.csproj  |   1 -
 .../finallyexec/localgotoinahandler_ro.csproj |   1 -
 .../eh/finallyexec/loopinfinally.cs           |   9 +-
 .../eh/finallyexec/loopinfinally_d.csproj     |   1 -
 .../eh/finallyexec/loopinfinally_do.csproj    |   1 -
 .../eh/finallyexec/loopinfinally_r.csproj     |   1 -
 .../eh/finallyexec/loopinfinally_ro.csproj    |   1 -
 .../finallyexec/nestedfinallycall_il_d.ilproj |   1 -
 .../finallyexec/nestedfinallycall_il_r.ilproj |   1 -
 .../nonlocalexittobeginningoftry.cs           |   8 +-
 .../nonlocalexittobeginningoftry_d.csproj     |   1 -
 .../nonlocalexittobeginningoftry_do.csproj    |   1 -
 .../nonlocalexittobeginningoftry_r.csproj     |   1 -
 .../nonlocalexittobeginningoftry_ro.csproj    |   1 -
 .../nonlocalexittonestedsibling.il            |  12 +-
 .../nonlocalexittonestedsibling_il_d.ilproj   |   1 -
 .../nonlocalexittonestedsibling_il_r.ilproj   |   1 -
 .../nonlocalgotoinatryblockinahandler.cs      |   6 +-
 ...nonlocalgotoinatryblockinahandler_d.csproj |   1 -
 ...onlocalgotoinatryblockinahandler_do.csproj |   1 -
 ...nonlocalgotoinatryblockinahandler_r.csproj |   1 -
 ...onlocalgotoinatryblockinahandler_ro.csproj |   1 -
 .../eh/finallyexec/simplenonlocalexit.cs      |   8 +-
 .../finallyexec/simplenonlocalexit_d.csproj   |   1 -
 .../finallyexec/simplenonlocalexit_do.csproj  |   1 -
 .../finallyexec/simplenonlocalexit_r.csproj   |   1 -
 .../finallyexec/simplenonlocalexit_ro.csproj  |   1 -
 .../simplenonlocalexitnestedintrycatch.cs     |   8 +-
 ...implenonlocalexitnestedintrycatch_d.csproj |   1 -
 ...mplenonlocalexitnestedintrycatch_do.csproj |   1 -
 ...implenonlocalexitnestedintrycatch_r.csproj |   1 -
 ...mplenonlocalexitnestedintrycatch_ro.csproj |   1 -
 .../eh/finallyexec/switchincatch.cs           |   8 +-
 .../eh/finallyexec/switchincatch_d.csproj     |   1 -
 .../eh/finallyexec/switchincatch_do.csproj    |   1 -
 .../eh/finallyexec/switchincatch_r.csproj     |   1 -
 .../eh/finallyexec/switchincatch_ro.csproj    |   1 -
 .../tryCatchFinallyThrow_nonlocalexit1.cs     |   9 +-
 ...ryCatchFinallyThrow_nonlocalexit1_d.csproj |   1 -
 ...yCatchFinallyThrow_nonlocalexit1_do.csproj |   1 -
 ...ryCatchFinallyThrow_nonlocalexit1_r.csproj |   1 -
 ...yCatchFinallyThrow_nonlocalexit1_ro.csproj |   1 -
 .../tryCatchFinallyThrow_nonlocalexit2.cs     |   9 +-
 ...ryCatchFinallyThrow_nonlocalexit2_d.csproj |   1 -
 ...yCatchFinallyThrow_nonlocalexit2_do.csproj |   1 -
 ...ryCatchFinallyThrow_nonlocalexit2_r.csproj |   1 -
 ...yCatchFinallyThrow_nonlocalexit2_ro.csproj |   1 -
 .../tryCatchFinallyThrow_nonlocalexit3.cs     |   9 +-
 ...ryCatchFinallyThrow_nonlocalexit3_d.csproj |   1 -
 ...yCatchFinallyThrow_nonlocalexit3_do.csproj |   1 -
 ...ryCatchFinallyThrow_nonlocalexit3_r.csproj |   1 -
 ...yCatchFinallyThrow_nonlocalexit3_ro.csproj |   1 -
 .../tryCatchFinallyThrow_nonlocalexit4.cs     |   9 +-
 ...ryCatchFinallyThrow_nonlocalexit4_d.csproj |   1 -
 ...yCatchFinallyThrow_nonlocalexit4_do.csproj |   1 -
 ...ryCatchFinallyThrow_nonlocalexit4_r.csproj |   1 -
 ...yCatchFinallyThrow_nonlocalexit4_ro.csproj |   1 -
 .../tryfinallythrow_nonlocalexit.cs           |   8 +-
 .../tryfinallythrow_nonlocalexit_d.csproj     |   1 -
 .../tryfinallythrow_nonlocalexit_do.csproj    |   1 -
 .../tryfinallythrow_nonlocalexit_r.csproj     |   1 -
 .../tryfinallythrow_nonlocalexit_ro.csproj    |   1 -
 .../Methodical/eh/generics/throwincatch.cs    |   4 +-
 .../generics/throwincatch_generics_d.csproj   |   1 -
 .../generics/throwincatch_generics_do.csproj  |   1 -
 .../generics/throwincatch_generics_r.csproj   |   1 -
 .../generics/throwincatch_generics_ro.csproj  |   1 -
 .../eh/generics/trycatchnestedtype.cs         |   4 +-
 .../eh/generics/trycatchnestedtype_d.csproj   |   1 -
 .../eh/generics/trycatchnestedtype_do.csproj  |   1 -
 .../eh/generics/trycatchnestedtype_r.csproj   |   1 -
 .../eh/generics/trycatchnestedtype_ro.csproj  |   1 -
 .../eh/generics/trycatchsimpletype.cs         |   4 +-
 .../eh/generics/trycatchsimpletype_d.csproj   |   1 -
 .../eh/generics/trycatchsimpletype_do.csproj  |   1 -
 .../eh/generics/trycatchsimpletype_r.csproj   |   1 -
 .../eh/generics/trycatchsimpletype_ro.csproj  |   1 -
 .../JIT/Methodical/eh/interactions/ehSO.cs    |   4 +-
 .../Methodical/eh/interactions/ehso.csproj    |   1 -
 .../Methodical/eh/interactions/gcincatch.cs   |   6 +-
 .../eh/interactions/gcincatch_d.csproj        |   1 -
 .../eh/interactions/gcincatch_do.csproj       |   1 -
 .../eh/interactions/gcincatch_r.csproj        |   1 -
 .../eh/interactions/gcincatch_ro.csproj       |   1 -
 .../eh/interactions/rangecheckinfinally.cs    |   8 +-
 .../interactions/rangecheckinfinally_d.csproj |   1 -
 .../rangecheckinfinally_do.csproj             |   1 -
 .../interactions/rangecheckinfinally_r.csproj |   1 -
 .../rangecheckinfinally_ro.csproj             |   1 -
 .../eh/interactions/strswitchfinal.cs         |   8 +-
 .../eh/interactions/strswitchfinal_d.csproj   |   1 -
 .../eh/interactions/strswitchfinal_do.csproj  |   1 -
 .../eh/interactions/strswitchfinal_r.csproj   |   1 -
 .../eh/interactions/strswitchfinal_ro.csproj  |   1 -
 .../eh/interactions/switchinfinally.cs        |   6 +-
 .../eh/interactions/switchinfinally_d.csproj  |   1 -
 .../eh/interactions/switchinfinally_do.csproj |   1 -
 .../eh/interactions/switchinfinally_r.csproj  |   1 -
 .../eh/interactions/switchinfinally_ro.csproj |   1 -
 .../eh/interactions/throw1dimarray.il         |   5 +-
 .../interactions/throw1dimarray_il_d.ilproj   |   1 -
 .../interactions/throw1dimarray_il_r.ilproj   |   1 -
 .../eh/interactions/throw2dimarray.il         |   5 +-
 .../interactions/throw2dimarray_il_d.ilproj   |   1 -
 .../interactions/throw2dimarray_il_r.ilproj   |   1 -
 .../eh/interactions/volatileFromFinally.cs    |   9 +-
 .../interactions/volatilefromfinally.csproj   |   1 -
 .../Methodical/eh/leaves/2branchesoutoftry.il |   4 +-
 .../eh/leaves/2branchesoutoftry_il_d.ilproj   |   1 -
 .../eh/leaves/2branchesoutoftry_il_r.ilproj   |   1 -
 .../eh/leaves/backwardleaveincatch.il         |  12 +-
 .../leaves/backwardleaveincatch_il_d.ilproj   |   1 -
 .../leaves/backwardleaveincatch_il_r.ilproj   |   1 -
 .../eh/leaves/branchbackwardswithcatch.il     |  12 +-
 .../branchbackwardswithcatch_il_d.ilproj      |   1 -
 .../branchbackwardswithcatch_il_r.ilproj      |   1 -
 .../eh/leaves/branchbackwardswithfinally.il   |  12 +-
 .../branchbackwardswithfinally_il_d.ilproj    |   1 -
 .../branchbackwardswithfinally_il_r.ilproj    |   1 -
 .../eh/leaves/branchoutofnestedtryfinally.il  |  14 +-
 .../branchoutofnestedtryfinally_il_d.ilproj   |   1 -
 .../branchoutofnestedtryfinally_il_r.ilproj   |   1 -
 .../eh/leaves/branchoutoftryfinally.il        |   4 +-
 .../leaves/branchoutoftryfinally_il_d.ilproj  |   1 -
 .../leaves/branchoutoftryfinally_il_r.ilproj  |   1 -
 .../leaves/catchretnonlocalexitinfunclet.cs   |   8 +-
 .../catchretnonlocalexitinfunclet_d.csproj    |   1 -
 .../catchretnonlocalexitinfunclet_do.csproj   |   1 -
 .../catchretnonlocalexitinfunclet_r.csproj    |   1 -
 .../catchretnonlocalexitinfunclet_ro.csproj   |   1 -
 .../eh/leaves/forwardleaveincatch.il          |  12 +-
 .../eh/leaves/forwardleaveincatch_il_d.ilproj |   1 -
 .../eh/leaves/forwardleaveincatch_il_r.ilproj |   1 -
 .../eh/leaves/labelbeforefinally.il           |   6 +-
 .../eh/leaves/labelbeforefinally_il_d.ilproj  |   1 -
 .../eh/leaves/labelbeforefinally_il_r.ilproj  |   1 -
 .../eh/leaves/labelbeginningfinally.il        |   6 +-
 .../leaves/labelbeginningfinally_il_d.ilproj  |   1 -
 .../leaves/labelbeginningfinally_il_r.ilproj  |   1 -
 .../Methodical/eh/leaves/leaveinsameregion.il |   8 +-
 .../eh/leaves/leaveinsameregion_il_d.ilproj   |   1 -
 .../eh/leaves/leaveinsameregion_il_r.ilproj   |   1 -
 .../Methodical/eh/leaves/leaveintotrybody.il  |  12 +-
 .../eh/leaves/leaveintotrybody_il_d.ilproj    |   1 -
 .../eh/leaves/leaveintotrybody_il_r.ilproj    |   1 -
 .../eh/leaves/nonlocalexitfromnestedcatch.cs  |   9 +-
 .../nonlocalexitfromnestedcatch_d.csproj      |   1 -
 .../nonlocalexitfromnestedcatch_do.csproj     |   1 -
 .../nonlocalexitfromnestedcatch_r.csproj      |   1 -
 .../nonlocalexitfromnestedcatch_ro.csproj     |   1 -
 .../JIT/Methodical/eh/leaves/oponerror.cs     |   8 +-
 .../Methodical/eh/leaves/oponerror_d.csproj   |   1 -
 .../Methodical/eh/leaves/oponerror_do.csproj  |   1 -
 .../Methodical/eh/leaves/oponerror_r.csproj   |   1 -
 .../Methodical/eh/leaves/oponerror_ro.csproj  |   1 -
 .../tryfinallyintrycatchwithleaveintotry.il   |  12 +-
 ...allyintrycatchwithleaveintotry_il_d.ilproj |   1 -
 ...allyintrycatchwithleaveintotry_il_r.ilproj |   1 -
 .../Methodical/eh/leaves/tryfinallyloop.cs    |   8 +-
 .../eh/leaves/tryfinallyloop_d.csproj         |   1 -
 .../eh/leaves/tryfinallyloop_do.csproj        |   1 -
 .../eh/leaves/tryfinallyloop_r.csproj         |   1 -
 .../eh/leaves/tryfinallyloop_ro.csproj        |   1 -
 .../eh/mixedhandler/catchfiltercatch.il       |   4 +-
 .../mixedhandler/catchfiltercatch_il_d.ilproj |   1 -
 .../mixedhandler/catchfiltercatch_il_r.ilproj |   1 -
 .../eh/mixedhandler/filterfiltercatchcatch.il |   4 +-
 .../filterfiltercatchcatch_il_d.ilproj        |   1 -
 .../filterfiltercatchcatch_il_r.ilproj        |   1 -
 .../nested/cascadedcatchret/cascadedcatch.il  |   4 +
 .../cascadedcatch_il_d.ilproj                 |   1 -
 .../cascadedcatch_il_r.ilproj                 |   1 -
 .../nested/cascadedcatchret/cascadedexcept.il |   4 +
 .../cascadedexcept_il_d.ilproj                |   1 -
 .../cascadedexcept_il_r.ilproj                |   1 -
 .../cascadedcatchret/throwincascadedcatch.il  |   4 +
 .../throwincascadedcatch_il_d.ilproj          |   1 -
 .../throwincascadedcatch_il_r.ilproj          |   1 -
 .../throwincascadedcatchnofin.il              |   4 +
 .../throwincascadedcatchnofin_il_d.ilproj     |   1 -
 .../throwincascadedcatchnofin_il_r.ilproj     |   1 -
 .../cascadedcatchret/throwincascadedexcept.il |   4 +
 .../throwincascadedexcept_il_d.ilproj         |   1 -
 .../throwincascadedexcept_il_r.ilproj         |   1 -
 .../throwincascadedexceptnofin.il             |   4 +
 .../throwincascadedexceptnofin_il_d.ilproj    |   1 -
 .../throwincascadedexceptnofin_il_r.ilproj    |   1 -
 .../eh/nested/general/cascadedcatch.cs        |   8 +-
 .../eh/nested/general/cascadedcatch_d.csproj  |   1 -
 .../eh/nested/general/cascadedcatch_do.csproj |   1 -
 .../eh/nested/general/cascadedcatch_r.csproj  |   1 -
 .../eh/nested/general/cascadedcatch_ro.csproj |   1 -
 .../eh/nested/general/localvarincatch.il      |   4 +
 .../general/localvarincatch_il_d.ilproj       |   1 -
 .../general/localvarincatch_il_r.ilproj       |   1 -
 .../nested/general/methodthrowsinfinally.cs   |   8 +-
 .../general/methodthrowsinfinally_d.csproj    |   1 -
 .../general/methodthrowsinfinally_do.csproj   |   1 -
 .../general/methodthrowsinfinally_r.csproj    |   1 -
 .../general/methodthrowsinfinally_ro.csproj   |   1 -
 .../general/rethrowincatchnestedinfinally.cs  |   8 +-
 .../rethrowincatchnestedinfinally_d.csproj    |   1 -
 .../rethrowincatchnestedinfinally_do.csproj   |   1 -
 .../rethrowincatchnestedinfinally_r.csproj    |   1 -
 .../rethrowincatchnestedinfinally_ro.csproj   |   1 -
 .../eh/nested/general/throwinfinally.cs       |   7 +-
 .../general/throwinfinally_general_d.csproj   |   1 -
 .../general/throwinfinally_general_do.csproj  |   1 -
 .../general/throwinfinally_general_r.csproj   |   1 -
 .../general/throwinfinally_general_ro.csproj  |   1 -
 .../general/throwinfinallynestedintry.cs      |   7 +-
 .../throwinfinallynestedintry_d.csproj        |   1 -
 .../throwinfinallynestedintry_do.csproj       |   1 -
 .../throwinfinallynestedintry_r.csproj        |   1 -
 .../throwinfinallynestedintry_ro.csproj       |   1 -
 .../eh/nested/general/throwinnestedcatch.il   |  13 +-
 .../general/throwinnestedcatch_il_d.ilproj    |   1 -
 .../general/throwinnestedcatch_il_r.ilproj    |   1 -
 .../eh/nested/general/throwinnestedfinally.cs |   7 +-
 .../general/throwinnestedfinally_d.csproj     |   1 -
 .../general/throwinnestedfinally_do.csproj    |   1 -
 .../general/throwinnestedfinally_r.csproj     |   1 -
 .../general/throwinnestedfinally_ro.csproj    |   1 -
 .../eh/nested/general/trycatchintryfinally.cs |   7 +-
 .../general/trycatchintryfinally_d.csproj     |   1 -
 .../general/trycatchintryfinally_do.csproj    |   1 -
 .../general/trycatchintryfinally_r.csproj     |   1 -
 .../general/trycatchintryfinally_ro.csproj    |   1 -
 .../eh/nested/nestedtry/nestedtrycatch.il     |   4 +
 .../nestedtry/nestedtrycatch_il_d.ilproj      |   1 -
 .../nestedtry/nestedtrycatch_il_r.ilproj      |   1 -
 .../eh/nested/nestedtry/nestedtryexcept.il    |   4 +
 .../nestedtry/nestedtryexcept_il_d.ilproj     |   1 -
 .../nestedtry/nestedtryexcept_il_r.ilproj     |   1 -
 .../eh/nested/nestedtry/nestedtryfault.il     |   4 +
 .../nestedtry/nestedtryfault_il_d.ilproj      |   1 -
 .../nestedtry/nestedtryfault_il_r.ilproj      |   1 -
 .../eh/nested/nestedtry/nestedtryfinally.il   |   4 +
 .../nestedtry/nestedtryfinally_il_d.ilproj    |   1 -
 .../nestedtry/nestedtryfinally_il_r.ilproj    |   1 -
 .../nested/nestedtry/throwinnestedtrycatch.il |   4 +
 .../throwinnestedtrycatch_il_d.ilproj         |   1 -
 .../throwinnestedtrycatch_il_r.ilproj         |   1 -
 .../nestedtry/throwinnestedtryexcept.il       |   4 +
 .../throwinnestedtryexcept_il_d.ilproj        |   1 -
 .../throwinnestedtryexcept_il_r.ilproj        |   1 -
 .../nested/nestedtry/throwinnestedtryfault.il |   4 +
 .../throwinnestedtryfault_il_d.ilproj         |   1 -
 .../throwinnestedtryfault_il_r.ilproj         |   1 -
 .../nestedtry/throwinnestedtryfinally.il      |   4 +
 .../throwinnestedtryfinally_il_d.ilproj       |   1 -
 .../throwinnestedtryfinally_il_r.ilproj       |   1 -
 .../nested/nonlocalexit/throwinfinally_50.cs  |   9 +-
 .../nonlocalexit/throwinfinally_50_d.csproj   |   1 -
 .../nonlocalexit/throwinfinally_50_do.csproj  |   1 -
 .../nonlocalexit/throwinfinally_50_r.csproj   |   1 -
 .../nonlocalexit/throwinfinally_50_ro.csproj  |   1 -
 .../throwinfinallynestedintry_30.cs           |   9 +-
 .../throwinfinallynestedintry_30_d.csproj     |   1 -
 .../throwinfinallynestedintry_30_do.csproj    |   1 -
 .../throwinfinallynestedintry_30_r.csproj     |   1 -
 .../throwinfinallynestedintry_30_ro.csproj    |   1 -
 .../throwinfinallyrecursive_20.cs             |   9 +-
 .../throwinfinallyrecursive_20_d.csproj       |   1 -
 .../throwinfinallyrecursive_20_do.csproj      |   1 -
 .../throwinfinallyrecursive_20_r.csproj       |   1 -
 .../throwinfinallyrecursive_20_ro.csproj      |   1 -
 .../regress/asurt/122239/outermostFinally.cs  |   8 +-
 .../asurt/122239/outermostFinally.csproj      |   1 -
 .../eh/regress/asurt/140713/innerFinally.cs   |   8 +-
 .../asurt/140713/innerFinally_d.csproj        |   1 -
 .../asurt/140713/innerFinally_do.csproj       |   1 -
 .../asurt/140713/innerFinally_r.csproj        |   1 -
 .../asurt/140713/innerFinally_ro.csproj       |   1 -
 .../regress/asurt/141358/uncaughtException.cs |   8 +-
 .../asurt/141358/uncaughtException_d.csproj   |   1 -
 .../asurt/141358/uncaughtException_do.csproj  |   1 -
 .../asurt/141358/uncaughtException_r.csproj   |   1 -
 .../asurt/141358/uncaughtException_ro.csproj  |   1 -
 .../eh/regress/vswhidbey/148190/baduwinfo.cs  |   6 +-
 .../regress/vswhidbey/148190/baduwinfo.csproj |   1 -
 .../eh/regress/vswhidbey/148190/baduwinfo1.cs |   6 +-
 .../vswhidbey/148190/baduwinfo1.csproj        |   1 -
 .../eh/rethrow/rethrowinfinallyaftercatch.cs  |   8 +-
 .../rethrowinfinallyaftercatch_d.csproj       |   1 -
 .../rethrowinfinallyaftercatch_do.csproj      |   1 -
 .../rethrowinfinallyaftercatch_r.csproj       |   1 -
 .../rethrowinfinallyaftercatch_ro.csproj      |   1 -
 .../eh/rethrow/rethrowinfinallyinsidecatch.il |  12 +-
 .../rethrowinfinallyinsidecatch_il_d.ilproj   |   1 -
 .../rethrowinfinallyinsidecatch_il_r.ilproj   |   1 -
 .../rethrowwithhandlerscatchingbase.cs        |   8 +-
 .../rethrowwithhandlerscatchingbase_d.csproj  |   1 -
 .../rethrowwithhandlerscatchingbase_do.csproj |   1 -
 .../rethrowwithhandlerscatchingbase_r.csproj  |   1 -
 .../rethrowwithhandlerscatchingbase_ro.csproj |   1 -
 .../Methodical/eh/rethrow/samerethrowtwice.cs |   8 +-
 .../eh/rethrow/samerethrowtwice_d.csproj      |   1 -
 .../eh/rethrow/samerethrowtwice_do.csproj     |   1 -
 .../eh/rethrow/samerethrowtwice_r.csproj      |   1 -
 .../eh/rethrow/samerethrowtwice_ro.csproj     |   1 -
 .../Methodical/eh/rethrow/samethrowtwice.cs   |   8 +-
 .../eh/rethrow/samethrowtwice_d.csproj        |   1 -
 .../eh/rethrow/samethrowtwice_do.csproj       |   1 -
 .../eh/rethrow/samethrowtwice_r.csproj        |   1 -
 .../eh/rethrow/samethrowtwice_ro.csproj       |   1 -
 .../Methodical/eh/rethrow/simplerethrow.cs    |   8 +-
 .../eh/rethrow/simplerethrow_d.csproj         |   1 -
 .../eh/rethrow/simplerethrow_do.csproj        |   1 -
 .../eh/rethrow/simplerethrow_r.csproj         |   1 -
 .../eh/rethrow/simplerethrow_ro.csproj        |   1 -
 .../rethrow/throwwithhandlerscatchingbase.cs  |   8 +-
 .../throwwithhandlerscatchingbase_d.csproj    |   1 -
 .../throwwithhandlerscatchingbase_do.csproj   |   1 -
 .../throwwithhandlerscatchingbase_r.csproj    |   1 -
 .../throwwithhandlerscatchingbase_ro.csproj   |   1 -
 .../JIT/Methodical/explicit/basic/refarg_c.cs |   8 +-
 .../JIT/Methodical/explicit/basic/refarg_c.il |  48 +-
 .../explicit/basic/refarg_c_d.csproj          |   1 -
 .../explicit/basic/refarg_c_do.csproj         |   1 -
 .../explicit/basic/refarg_c_il_d.ilproj       |   1 -
 .../explicit/basic/refarg_c_il_r.ilproj       |   1 -
 .../explicit/basic/refarg_c_r.csproj          |   1 -
 .../explicit/basic/refarg_c_ro.csproj         |   1 -
 .../Methodical/explicit/basic/refarg_f4.cs    |   8 +-
 .../Methodical/explicit/basic/refarg_f4.il    |  72 +-
 .../explicit/basic/refarg_f4_d.csproj         |   1 -
 .../explicit/basic/refarg_f4_do.csproj        |   1 -
 .../explicit/basic/refarg_f4_il_d.ilproj      |   1 -
 .../explicit/basic/refarg_f4_il_r.ilproj      |   1 -
 .../explicit/basic/refarg_f4_r.csproj         |   1 -
 .../explicit/basic/refarg_f4_ro.csproj        |   1 -
 .../Methodical/explicit/basic/refarg_f8.cs    |   8 +-
 .../Methodical/explicit/basic/refarg_f8.il    |  72 +-
 .../explicit/basic/refarg_f8_d.csproj         |   1 -
 .../explicit/basic/refarg_f8_do.csproj        |   1 -
 .../explicit/basic/refarg_f8_il_d.ilproj      |   1 -
 .../explicit/basic/refarg_f8_il_r.ilproj      |   1 -
 .../explicit/basic/refarg_f8_r.csproj         |   1 -
 .../explicit/basic/refarg_f8_ro.csproj        |   1 -
 .../Methodical/explicit/basic/refarg_i1.cs    |   8 +-
 .../Methodical/explicit/basic/refarg_i1.il    |  52 +-
 .../explicit/basic/refarg_i1_d.csproj         |   1 -
 .../explicit/basic/refarg_i1_do.csproj        |   1 -
 .../explicit/basic/refarg_i1_il_d.ilproj      |   1 -
 .../explicit/basic/refarg_i1_il_r.ilproj      |   1 -
 .../explicit/basic/refarg_i1_r.csproj         |   1 -
 .../explicit/basic/refarg_i1_ro.csproj        |   1 -
 .../Methodical/explicit/basic/refarg_i2.cs    |   8 +-
 .../Methodical/explicit/basic/refarg_i2.il    |  52 +-
 .../explicit/basic/refarg_i2_d.csproj         |   1 -
 .../explicit/basic/refarg_i2_do.csproj        |   1 -
 .../explicit/basic/refarg_i2_il_d.ilproj      |   1 -
 .../explicit/basic/refarg_i2_il_r.ilproj      |   1 -
 .../explicit/basic/refarg_i2_r.csproj         |   1 -
 .../explicit/basic/refarg_i2_ro.csproj        |   1 -
 .../Methodical/explicit/basic/refarg_i4.cs    |   8 +-
 .../Methodical/explicit/basic/refarg_i4.il    |  90 +-
 .../explicit/basic/refarg_i4_d.csproj         |   1 -
 .../explicit/basic/refarg_i4_do.csproj        |   1 -
 .../explicit/basic/refarg_i4_il_d.ilproj      |   1 -
 .../explicit/basic/refarg_i4_il_r.ilproj      |   1 -
 .../explicit/basic/refarg_i4_r.csproj         |   1 -
 .../explicit/basic/refarg_i4_ro.csproj        |   1 -
 .../JIT/Methodical/explicit/basic/refarg_o.cs |   8 +-
 .../JIT/Methodical/explicit/basic/refarg_o.il |  58 +-
 .../explicit/basic/refarg_o_d.csproj          |   1 -
 .../explicit/basic/refarg_o_do.csproj         |   1 -
 .../explicit/basic/refarg_o_il_d.ilproj       |   1 -
 .../explicit/basic/refarg_o_il_r.ilproj       |   1 -
 .../explicit/basic/refarg_o_r.csproj          |   1 -
 .../explicit/basic/refarg_o_ro.csproj         |   1 -
 .../JIT/Methodical/explicit/basic/refarg_s.cs |   8 +-
 .../JIT/Methodical/explicit/basic/refarg_s.il |  48 +-
 .../explicit/basic/refarg_s_d.csproj          |   1 -
 .../explicit/basic/refarg_s_do.csproj         |   1 -
 .../explicit/basic/refarg_s_il_d.ilproj       |   1 -
 .../explicit/basic/refarg_s_il_r.ilproj       |   1 -
 .../explicit/basic/refarg_s_r.csproj          |   1 -
 .../explicit/basic/refarg_s_ro.csproj         |   1 -
 .../JIT/Methodical/explicit/basic/refloc_c.il |  44 +-
 .../explicit/basic/refloc_c_il_d.ilproj       |   1 -
 .../explicit/basic/refloc_c_il_r.ilproj       |   1 -
 .../Methodical/explicit/basic/refloc_i1.il    |  44 +-
 .../explicit/basic/refloc_i1_il_d.ilproj      |   1 -
 .../explicit/basic/refloc_i1_il_r.ilproj      |   1 -
 .../Methodical/explicit/basic/refloc_i2.il    |  44 +-
 .../explicit/basic/refloc_i2_il_d.ilproj      |   1 -
 .../explicit/basic/refloc_i2_il_r.ilproj      |   1 -
 .../Methodical/explicit/basic/refloc_i4.il    |  44 +-
 .../explicit/basic/refloc_i4_il_d.ilproj      |   1 -
 .../explicit/basic/refloc_i4_il_r.ilproj      |   1 -
 .../JIT/Methodical/explicit/basic/refloc_o.il |  48 +-
 .../Methodical/explicit/basic/refloc_o2.il    |  52 +-
 .../explicit/basic/refloc_o2_il_d.ilproj      |   1 -
 .../explicit/basic/refloc_o2_il_r.ilproj      |   1 -
 .../explicit/basic/refloc_o_il_d.ilproj       |   1 -
 .../explicit/basic/refloc_o_il_r.ilproj       |   1 -
 .../Methodical/explicit/basic/refloc_r4.il    |  56 +-
 .../explicit/basic/refloc_r4_il_d.ilproj      |   1 -
 .../explicit/basic/refloc_r4_il_r.ilproj      |   1 -
 .../Methodical/explicit/basic/refloc_r8.il    |  44 +-
 .../explicit/basic/refloc_r8_il_d.ilproj      |   1 -
 .../explicit/basic/refloc_r8_il_r.ilproj      |   1 -
 .../Methodical/explicit/basic/refloc_u2.il    |  44 +-
 .../explicit/basic/refloc_u2_il_d.ilproj      |   1 -
 .../explicit/basic/refloc_u2_il_r.ilproj      |   1 -
 .../explicit/funcptr/expl_funcptr_gc.il       |  23 +-
 .../funcptr/expl_funcptr_gc_il_d.ilproj       |   1 -
 .../funcptr/expl_funcptr_gc_il_r.ilproj       |   1 -
 .../explicit/funcptr/expl_funcptr_val.il      |  21 +-
 .../funcptr/expl_funcptr_val_il_d.ilproj      |   1 -
 .../funcptr/expl_funcptr_val_il_r.ilproj      |   1 -
 .../explicit/funcptr/seq_funcptr_gc.il        |  23 +-
 .../funcptr/seq_funcptr_gc_il_d.ilproj        |   1 -
 .../funcptr/seq_funcptr_gc_il_r.ilproj        |   1 -
 .../explicit/funcptr/seq_funcptr_val.il       |  21 +-
 .../funcptr/seq_funcptr_val_il_d.ilproj       |   1 -
 .../funcptr/seq_funcptr_val_il_r.ilproj       |   1 -
 .../JIT/Methodical/explicit/misc/explicit1.cs |   8 +-
 .../explicit/misc/explicit1_d.csproj          |   1 -
 .../explicit/misc/explicit1_do.csproj         |   1 -
 .../explicit/misc/explicit1_r.csproj          |   1 -
 .../explicit/misc/explicit1_ro.csproj         |   1 -
 .../JIT/Methodical/explicit/misc/explicit2.cs |   8 +-
 .../explicit/misc/explicit2_d.csproj          |   1 -
 .../explicit/misc/explicit2_do.csproj         |   1 -
 .../explicit/misc/explicit2_r.csproj          |   1 -
 .../explicit/misc/explicit2_ro.csproj         |   1 -
 .../JIT/Methodical/explicit/misc/explicit3.cs |   8 +-
 .../explicit/misc/explicit3_d.csproj          |   1 -
 .../explicit/misc/explicit3_do.csproj         |   1 -
 .../explicit/misc/explicit3_r.csproj          |   1 -
 .../explicit/misc/explicit3_ro.csproj         |   1 -
 .../JIT/Methodical/explicit/misc/explicit4.cs |   8 +-
 .../explicit/misc/explicit4_d.csproj          |   1 -
 .../explicit/misc/explicit4_do.csproj         |   1 -
 .../explicit/misc/explicit4_r.csproj          |   1 -
 .../explicit/misc/explicit4_ro.csproj         |   1 -
 .../JIT/Methodical/explicit/misc/explicit5.cs |   8 +-
 .../explicit/misc/explicit5_d.csproj          |   1 -
 .../explicit/misc/explicit5_do.csproj         |   1 -
 .../explicit/misc/explicit5_r.csproj          |   1 -
 .../explicit/misc/explicit5_ro.csproj         |   1 -
 .../JIT/Methodical/explicit/misc/explicit6.cs |   8 +-
 .../explicit/misc/explicit6_d.csproj          |   1 -
 .../explicit/misc/explicit6_do.csproj         |   1 -
 .../explicit/misc/explicit6_r.csproj          |   1 -
 .../explicit/misc/explicit6_ro.csproj         |   1 -
 .../JIT/Methodical/explicit/misc/explicit7.cs |   8 +-
 .../explicit/misc/explicit7_d.csproj          |   1 -
 .../explicit/misc/explicit7_do.csproj         |   1 -
 .../explicit/misc/explicit7_r.csproj          |   1 -
 .../explicit/misc/explicit7_ro.csproj         |   1 -
 .../JIT/Methodical/explicit/misc/explicit8.cs |   8 +-
 .../explicit/misc/explicit8_d.csproj          |   1 -
 .../explicit/misc/explicit8_do.csproj         |   1 -
 .../explicit/misc/explicit8_r.csproj          |   1 -
 .../explicit/misc/explicit8_ro.csproj         |   1 -
 .../Methodical/explicit/misc/refarg_box_f8.il |  18 +-
 .../explicit/misc/refarg_box_f8_il_d.ilproj   |   1 -
 .../explicit/misc/refarg_box_f8_il_r.ilproj   |   1 -
 .../explicit/misc/refarg_box_val.il           |  46 +-
 .../explicit/misc/refarg_box_val_il_d.ilproj  |   1 -
 .../explicit/misc/refarg_box_val_il_r.ilproj  |   1 -
 .../explicit/rotate/rotarg_double.cs          |   8 +-
 .../explicit/rotate/rotarg_double.il          | 190 ++--
 .../explicit/rotate/rotarg_double_d.csproj    |   1 -
 .../explicit/rotate/rotarg_double_do.csproj   |   1 -
 .../explicit/rotate/rotarg_double_il_d.ilproj |   1 -
 .../explicit/rotate/rotarg_double_il_r.ilproj |   1 -
 .../explicit/rotate/rotarg_double_r.csproj    |   1 -
 .../explicit/rotate/rotarg_double_ro.csproj   |   1 -
 .../explicit/rotate/rotarg_float.cs           |   8 +-
 .../explicit/rotate/rotarg_float.il           | 190 ++--
 .../explicit/rotate/rotarg_float_d.csproj     |   1 -
 .../explicit/rotate/rotarg_float_do.csproj    |   1 -
 .../explicit/rotate/rotarg_float_il_d.ilproj  |   1 -
 .../explicit/rotate/rotarg_float_il_r.ilproj  |   1 -
 .../explicit/rotate/rotarg_float_r.csproj     |   1 -
 .../explicit/rotate/rotarg_float_ro.csproj    |   1 -
 .../explicit/rotate/rotarg_objref.cs          |   8 +-
 .../explicit/rotate/rotarg_objref.il          | 214 ++---
 .../explicit/rotate/rotarg_objref_d.csproj    |   1 -
 .../explicit/rotate/rotarg_objref_do.csproj   |   1 -
 .../explicit/rotate/rotarg_objref_il_d.ilproj |   1 -
 .../explicit/rotate/rotarg_objref_il_r.ilproj |   1 -
 .../explicit/rotate/rotarg_objref_r.csproj    |   1 -
 .../explicit/rotate/rotarg_objref_ro.csproj   |   1 -
 .../explicit/rotate/rotarg_valref.cs          |   8 +-
 .../explicit/rotate/rotarg_valref.il          | 234 ++---
 .../explicit/rotate/rotarg_valref_d.csproj    |   1 -
 .../explicit/rotate/rotarg_valref_do.csproj   |   1 -
 .../explicit/rotate/rotarg_valref_il_d.ilproj |   1 -
 .../explicit/rotate/rotarg_valref_il_r.ilproj |   1 -
 .../explicit/rotate/rotarg_valref_r.csproj    |   1 -
 .../explicit/rotate/rotarg_valref_ro.csproj   |   1 -
 .../Methodical/explicit/rotate/rotate_i4.il   | 128 +--
 .../explicit/rotate/rotate_i4_il_d.ilproj     |   1 -
 .../explicit/rotate/rotate_i4_il_r.ilproj     |   1 -
 .../Methodical/explicit/rotate/rotate_u2.il   | 128 +--
 .../explicit/rotate/rotate_u2_il_d.ilproj     |   1 -
 .../explicit/rotate/rotate_u2_il_r.ilproj     |   1 -
 .../flowgraph/bug614098/intToByte.cs          |   9 +-
 .../flowgraph/bug614098/intToByte.csproj      |   1 -
 .../flowgraph/bug619534/ILStackAllocRepro.il  |   4 +-
 .../bug619534/ILStackAllocRepro.ilproj        |   1 -
 .../flowgraph/bug619534/ehCodeMotion.cs       |   9 +-
 .../flowgraph/bug619534/ehCodeMotion.csproj   |   1 -
 .../flowgraph/bug619534/finallyclone.cs       |   7 +-
 .../flowgraph/bug619534/finallyclone.csproj   |   1 -
 .../flowgraph/bug619534/moduleHandleCache.cs  |   9 +-
 .../bug619534/moduleHandleCache.csproj        |   1 -
 .../flowgraph/bug619534/twoEndFinallys.cs     |   9 +-
 .../flowgraph/bug619534/twoEndFinallys.csproj |   1 -
 .../flowgraph/bug619534/twoEndFinallys.il     |   4 +-
 .../bug619534/twoEndFinallys_il_r.ilproj      |   1 -
 .../flowgraph/bug621705/ptuple_lost.cs        |   6 +-
 .../flowgraph/bug621705/ptuple_lost.csproj    |   1 -
 .../flowgraph/bug647189/ssa_tuIsAddr.cs       |   9 +-
 .../flowgraph/bug647189/ssa_tuIsAddr.csproj   |   1 -
 .../dev10_bug642944/GCMaskForGSCookie.il      |   4 +-
 .../dev10_bug642944/GCMaskForGSCookie.ilproj  |   1 -
 .../flowgraph/dev10_bug675304/arrayDim.cs     |   4 +-
 .../flowgraph/dev10_bug675304/arrayDim.csproj |   1 -
 .../flowgraph/dev10_bug675304/loopIV_init.il  |  23 +-
 .../dev10_bug675304/loopIV_init.ilproj        |   1 -
 .../dev10_bug675304/osrAddovershot.cs         |   9 +-
 .../dev10_bug675304/osrAddovershot.csproj     |   1 -
 .../flowgraph/dev10_bug679008/EHCopyProp.cs   |   6 +-
 .../dev10_bug679008/EHCopyProp.csproj         |   1 -
 .../dev10_bug679008/GCOverReporting.cs        |   3 +
 .../dev10_bug679008/GCOverReporting.csproj    |   1 -
 .../flowgraph/dev10_bug679008/castClassEH.cs  |   9 +-
 .../dev10_bug679008/castClassEH.csproj        |   1 -
 .../dev10_bug679008/dependentLifetimes.il     |   4 +-
 .../dev10_bug679008/dependentLifetimes.ilproj |   1 -
 .../ehDescriptorPtrUpdate.ilproj              |   1 -
 .../flowgraph/dev10_bug679008/fgloop.ilproj   |   1 -
 .../flowgraph/dev10_bug679008/fgloop2.ilproj  |   1 -
 .../dev10_bug679008/sealedCastVariance.cs     |   9 +-
 .../dev10_bug679008/sealedCastVariance.csproj |   1 -
 .../dev10_bug679008/singleRefField.cs         |   3 +
 .../dev10_bug679008/singleRefField.csproj     |   1 -
 .../dev10_bug679008/zeroInitStackSlot.cs      |   9 +-
 .../dev10_bug679008/zeroInitStackSlot.csproj  |   1 -
 .../flowgraph/dev10_bug679053/cpblkInt32.il   |   4 +-
 .../dev10_bug679053/cpblkInt32.ilproj         |   1 -
 .../flowgraph/dev10_bug679053/flowgraph.il    |   4 +-
 .../dev10_bug679053/flowgraph.ilproj          |   1 -
 .../dev10_bug679053/regionLive.ilproj         |   1 -
 .../dev10_bug679955/indexMinusOne.il          |   4 +-
 .../dev10_bug679955/indexMinusOne.ilproj      |   1 -
 .../dev10_bug679955/volatileLocal1.il         |   4 +-
 .../dev10_bug679955/volatileLocal1.ilproj     |   1 -
 .../dev10_bug679955/volatileLocal2.il         |   4 +-
 .../dev10_bug679955/volatileLocal2.ilproj     |   1 -
 .../flowgraph/dev10_bug723489/qMarkColon.cs   |   9 +-
 .../dev10_bug723489/qMarkColon.csproj         |   1 -
 .../JIT/Methodical/fp/apps/BouncingBall.cs    |   6 +-
 .../fp/apps/bouncingball_cs_d.csproj          |   1 -
 .../fp/apps/bouncingball_cs_do.csproj         |   1 -
 .../fp/apps/bouncingball_cs_r.csproj          |   1 -
 .../fp/apps/bouncingball_cs_ro.csproj         |   1 -
 src/tests/JIT/Methodical/fp/exgen/1000w1d.cs  |   9 +-
 .../Methodical/fp/exgen/1000w1d_cs_d.csproj   |   1 -
 .../Methodical/fp/exgen/1000w1d_cs_do.csproj  |   1 -
 .../Methodical/fp/exgen/1000w1d_cs_r.csproj   |   1 -
 .../Methodical/fp/exgen/1000w1d_cs_ro.csproj  |   1 -
 src/tests/JIT/Methodical/fp/exgen/10w250d.cs  |   9 +-
 .../Methodical/fp/exgen/10w250d_cs_d.csproj   |   1 -
 .../Methodical/fp/exgen/10w250d_cs_do.csproj  |   1 -
 .../Methodical/fp/exgen/10w250d_cs_r.csproj   |   1 -
 .../Methodical/fp/exgen/10w250d_cs_ro.csproj  |   1 -
 src/tests/JIT/Methodical/fp/exgen/10w5d.cs    |   9 +-
 .../JIT/Methodical/fp/exgen/10w5d_cs_d.csproj |   1 -
 .../Methodical/fp/exgen/10w5d_cs_do.csproj    |   1 -
 .../JIT/Methodical/fp/exgen/10w5d_cs_r.csproj |   1 -
 .../Methodical/fp/exgen/10w5d_cs_ro.csproj    |   1 -
 .../JIT/Methodical/fp/exgen/200w1d-01.cs      |   9 +-
 .../Methodical/fp/exgen/200w1d-01_cs_d.csproj |   1 -
 .../fp/exgen/200w1d-01_cs_do.csproj           |   1 -
 .../Methodical/fp/exgen/200w1d-01_cs_r.csproj |   1 -
 .../fp/exgen/200w1d-01_cs_ro.csproj           |   1 -
 .../JIT/Methodical/fp/exgen/200w1d-02.cs      |   9 +-
 .../Methodical/fp/exgen/200w1d-02_cs_d.csproj |   1 -
 .../fp/exgen/200w1d-02_cs_do.csproj           |   1 -
 .../Methodical/fp/exgen/200w1d-02_cs_r.csproj |   1 -
 .../fp/exgen/200w1d-02_cs_ro.csproj           |   1 -
 src/tests/JIT/Methodical/fp/exgen/3w1d-01.cs  |   9 +-
 .../Methodical/fp/exgen/3w1d-01_cs_d.csproj   |   1 -
 .../Methodical/fp/exgen/3w1d-01_cs_do.csproj  |   1 -
 .../Methodical/fp/exgen/3w1d-01_cs_r.csproj   |   1 -
 .../Methodical/fp/exgen/3w1d-01_cs_ro.csproj  |   1 -
 src/tests/JIT/Methodical/fp/exgen/3w1d-02.cs  |   9 +-
 .../Methodical/fp/exgen/3w1d-02_cs_d.csproj   |   1 -
 .../Methodical/fp/exgen/3w1d-02_cs_do.csproj  |   1 -
 .../Methodical/fp/exgen/3w1d-02_cs_r.csproj   |   1 -
 .../Methodical/fp/exgen/3w1d-02_cs_ro.csproj  |   1 -
 src/tests/JIT/Methodical/fp/exgen/5w1d-01.cs  |   9 +-
 .../Methodical/fp/exgen/5w1d-01_cs_d.csproj   |   1 -
 .../Methodical/fp/exgen/5w1d-01_cs_do.csproj  |   1 -
 .../Methodical/fp/exgen/5w1d-01_cs_r.csproj   |   1 -
 .../Methodical/fp/exgen/5w1d-01_cs_ro.csproj  |   1 -
 src/tests/JIT/Methodical/fp/exgen/5w1d-02.cs  |   9 +-
 .../Methodical/fp/exgen/5w1d-02_cs_d.csproj   |   1 -
 .../Methodical/fp/exgen/5w1d-02_cs_do.csproj  |   1 -
 .../Methodical/fp/exgen/5w1d-02_cs_r.csproj   |   1 -
 .../Methodical/fp/exgen/5w1d-02_cs_ro.csproj  |   1 -
 src/tests/JIT/Methodical/fp/exgen/5w1d-03.cs  |   9 +-
 .../Methodical/fp/exgen/5w1d-03_cs_d.csproj   |   1 -
 .../Methodical/fp/exgen/5w1d-03_cs_do.csproj  |   1 -
 .../Methodical/fp/exgen/5w1d-03_cs_r.csproj   |   1 -
 .../Methodical/fp/exgen/5w1d-03_cs_ro.csproj  |   1 -
 src/tests/JIT/Methodical/fp/exgen/5w1d-04.cs  |   9 +-
 .../Methodical/fp/exgen/5w1d-04_cs_d.csproj   |   1 -
 .../Methodical/fp/exgen/5w1d-04_cs_do.csproj  |   1 -
 .../Methodical/fp/exgen/5w1d-04_cs_r.csproj   |   1 -
 .../Methodical/fp/exgen/5w1d-04_cs_ro.csproj  |   1 -
 src/tests/JIT/Methodical/fp/exgen/5w1d-05.cs  |   9 +-
 .../Methodical/fp/exgen/5w1d-05_cs_d.csproj   |   1 -
 .../Methodical/fp/exgen/5w1d-05_cs_do.csproj  |   1 -
 .../Methodical/fp/exgen/5w1d-05_cs_r.csproj   |   1 -
 .../Methodical/fp/exgen/5w1d-05_cs_ro.csproj  |   1 -
 src/tests/JIT/Methodical/fp/exgen/5w1d-06.cs  |   9 +-
 .../Methodical/fp/exgen/5w1d-06_cs_d.csproj   |   1 -
 .../Methodical/fp/exgen/5w1d-06_cs_do.csproj  |   1 -
 .../Methodical/fp/exgen/5w1d-06_cs_r.csproj   |   1 -
 .../Methodical/fp/exgen/5w1d-06_cs_ro.csproj  |   1 -
 .../JIT/Methodical/gc_poll/InsertGCPoll.cs    |   6 +-
 .../Methodical/gc_poll/InsertGCPoll.csproj    |   3 +-
 .../Methodical/inlining/boolean/InlineBool.cs |   4 +-
 .../inlining/boolean/test_boolean.csproj      |   1 -
 .../JIT/Methodical/inlining/bug505642/test.cs |   6 +-
 .../inlining/bug505642/test_bug505642.csproj  |   1 -
 .../inlining/dev10_bug719093/variancesmall.il |  59 +-
 .../dev10_bug719093/variancesmall.ilproj      |   1 -
 .../JIT/Methodical/int64/arrays/hugedim.il    |   8 +-
 .../int64/arrays/hugedim_il_d.ilproj          |   1 -
 .../int64/arrays/hugedim_il_r.ilproj          |   1 -
 .../JIT/Methodical/int64/arrays/lcs_long.cs   |   8 +-
 .../JIT/Methodical/int64/arrays/lcs_long.il   |  16 +-
 .../Methodical/int64/arrays/lcs_long_d.csproj |   1 -
 .../int64/arrays/lcs_long_do.csproj           |   1 -
 .../int64/arrays/lcs_long_il_d.ilproj         |   1 -
 .../int64/arrays/lcs_long_il_r.ilproj         |   1 -
 .../Methodical/int64/arrays/lcs_long_r.csproj |   1 -
 .../int64/arrays/lcs_long_ro.csproj           |   1 -
 .../JIT/Methodical/int64/arrays/lcs_ulong.cs  |   8 +-
 .../JIT/Methodical/int64/arrays/lcs_ulong.il  |  16 +-
 .../int64/arrays/lcs_ulong_d.csproj           |   1 -
 .../int64/arrays/lcs_ulong_do.csproj          |   1 -
 .../int64/arrays/lcs_ulong_il_d.ilproj        |   1 -
 .../int64/arrays/lcs_ulong_il_r.ilproj        |   1 -
 .../int64/arrays/lcs_ulong_r.csproj           |   1 -
 .../int64/arrays/lcs_ulong_ro.csproj          |   1 -
 src/tests/JIT/Methodical/int64/misc/binop.cs  |   8 +-
 src/tests/JIT/Methodical/int64/misc/binop.il  |   8 +-
 .../JIT/Methodical/int64/misc/binop_d.csproj  |   1 -
 .../JIT/Methodical/int64/misc/binop_do.csproj |   1 -
 .../Methodical/int64/misc/binop_il_d.ilproj   |   1 -
 .../Methodical/int64/misc/binop_il_r.ilproj   |   1 -
 .../JIT/Methodical/int64/misc/binop_r.csproj  |   1 -
 .../JIT/Methodical/int64/misc/binop_ro.csproj |   1 -
 src/tests/JIT/Methodical/int64/misc/box.cs    |   8 +-
 src/tests/JIT/Methodical/int64/misc/box.il    |   8 +-
 .../JIT/Methodical/int64/misc/box_d.csproj    |   1 -
 .../JIT/Methodical/int64/misc/box_do.csproj   |   1 -
 .../JIT/Methodical/int64/misc/box_il_d.ilproj |   1 -
 .../JIT/Methodical/int64/misc/box_il_r.ilproj |   1 -
 .../JIT/Methodical/int64/misc/box_r.csproj    |   1 -
 .../JIT/Methodical/int64/misc/box_ro.csproj   |   1 -
 .../JIT/Methodical/int64/misc/longmul.il      |   4 +-
 .../JIT/Methodical/int64/misc/longmul.ilproj  |   1 -
 .../JIT/Methodical/int64/signed/s_addsub.cs   |   8 +-
 .../JIT/Methodical/int64/signed/s_addsub.il   | 520 +++++-----
 .../Methodical/int64/signed/s_addsub_d.csproj |   1 -
 .../int64/signed/s_addsub_do.csproj           |   1 -
 .../int64/signed/s_addsub_il_d.ilproj         |   1 -
 .../int64/signed/s_addsub_il_r.ilproj         |   1 -
 .../Methodical/int64/signed/s_addsub_r.csproj |   1 -
 .../int64/signed/s_addsub_ro.csproj           |   1 -
 .../JIT/Methodical/int64/signed/s_ldc_div.cs  |   8 +-
 .../JIT/Methodical/int64/signed/s_ldc_div.il  |  26 +-
 .../int64/signed/s_ldc_div_d.csproj           |   1 -
 .../int64/signed/s_ldc_div_do.csproj          |   1 -
 .../int64/signed/s_ldc_div_il_d.ilproj        |   1 -
 .../int64/signed/s_ldc_div_il_r.ilproj        |   1 -
 .../int64/signed/s_ldc_div_r.csproj           |   1 -
 .../int64/signed/s_ldc_div_ro.csproj          |   1 -
 .../JIT/Methodical/int64/signed/s_ldc_mul.cs  |   8 +-
 .../JIT/Methodical/int64/signed/s_ldc_mul.il  |  22 +-
 .../int64/signed/s_ldc_mul_d.csproj           |   1 -
 .../int64/signed/s_ldc_mul_do.csproj          |   1 -
 .../int64/signed/s_ldc_mul_il_d.ilproj        |   1 -
 .../int64/signed/s_ldc_mul_il_r.ilproj        |   1 -
 .../int64/signed/s_ldc_mul_r.csproj           |   1 -
 .../int64/signed/s_ldc_mul_ro.csproj          |   1 -
 .../Methodical/int64/signed/s_ldc_mulovf.cs   |   8 +-
 .../Methodical/int64/signed/s_ldc_mulovf.il   |  22 +-
 .../int64/signed/s_ldc_mulovf_d.csproj        |   1 -
 .../int64/signed/s_ldc_mulovf_do.csproj       |   1 -
 .../int64/signed/s_ldc_mulovf_il_d.ilproj     |   1 -
 .../int64/signed/s_ldc_mulovf_il_r.ilproj     |   1 -
 .../int64/signed/s_ldc_mulovf_r.csproj        |   1 -
 .../int64/signed/s_ldc_mulovf_ro.csproj       |   1 -
 .../Methodical/int64/signed/s_ldfld_mul.cs    |   8 +-
 .../Methodical/int64/signed/s_ldfld_mul.il    |  74 +-
 .../int64/signed/s_ldfld_mul_d.csproj         |   1 -
 .../int64/signed/s_ldfld_mul_do.csproj        |   1 -
 .../int64/signed/s_ldfld_mul_il_d.ilproj      |   1 -
 .../int64/signed/s_ldfld_mul_il_r.ilproj      |   1 -
 .../int64/signed/s_ldfld_mul_r.csproj         |   1 -
 .../int64/signed/s_ldfld_mul_ro.csproj        |   1 -
 .../Methodical/int64/signed/s_ldfld_mulovf.cs |   8 +-
 .../Methodical/int64/signed/s_ldfld_mulovf.il |  74 +-
 .../int64/signed/s_ldfld_mulovf_d.csproj      |   1 -
 .../int64/signed/s_ldfld_mulovf_do.csproj     |   1 -
 .../int64/signed/s_ldfld_mulovf_il_d.ilproj   |   1 -
 .../int64/signed/s_ldfld_mulovf_il_r.ilproj   |   1 -
 .../int64/signed/s_ldfld_mulovf_r.csproj      |   1 -
 .../int64/signed/s_ldfld_mulovf_ro.csproj     |   1 -
 .../Methodical/int64/signed/s_ldsfld_mul.cs   |   8 +-
 .../Methodical/int64/signed/s_ldsfld_mul.il   |  70 +-
 .../int64/signed/s_ldsfld_mul_d.csproj        |   1 -
 .../int64/signed/s_ldsfld_mul_do.csproj       |   1 -
 .../int64/signed/s_ldsfld_mul_il_d.ilproj     |   1 -
 .../int64/signed/s_ldsfld_mul_il_r.ilproj     |   1 -
 .../int64/signed/s_ldsfld_mul_r.csproj        |   1 -
 .../int64/signed/s_ldsfld_mul_ro.csproj       |   1 -
 .../int64/signed/s_ldsfld_mulovf.cs           |   8 +-
 .../int64/signed/s_ldsfld_mulovf.il           |  70 +-
 .../int64/signed/s_ldsfld_mulovf_d.csproj     |   1 -
 .../int64/signed/s_ldsfld_mulovf_do.csproj    |   1 -
 .../int64/signed/s_ldsfld_mulovf_il_d.ilproj  |   1 -
 .../int64/signed/s_ldsfld_mulovf_il_r.ilproj  |   1 -
 .../int64/signed/s_ldsfld_mulovf_r.csproj     |   1 -
 .../int64/signed/s_ldsfld_mulovf_ro.csproj    |   1 -
 .../JIT/Methodical/int64/signed/s_muldiv.cs   |   8 +-
 .../JIT/Methodical/int64/signed/s_muldiv.il   | 524 +++++------
 .../Methodical/int64/signed/s_muldiv_d.csproj |   1 -
 .../int64/signed/s_muldiv_do.csproj           |   1 -
 .../int64/signed/s_muldiv_il_d.ilproj         |   1 -
 .../int64/signed/s_muldiv_il_r.ilproj         |   1 -
 .../Methodical/int64/signed/s_muldiv_r.csproj |   1 -
 .../int64/signed/s_muldiv_ro.csproj           |   1 -
 .../Methodical/int64/superlong/superlong.cs   |   8 +-
 .../Methodical/int64/superlong/superlong.il   | 104 +-
 .../int64/superlong/superlong_d.csproj        |   1 -
 .../int64/superlong/superlong_do.csproj       |   1 -
 .../int64/superlong/superlong_il_d.ilproj     |   1 -
 .../int64/superlong/superlong_il_r.ilproj     |   1 -
 .../int64/superlong/superlong_r.csproj        |   1 -
 .../int64/superlong/superlong_ro.csproj       |   1 -
 .../JIT/Methodical/int64/unsigned/addsub.cs   |   8 +-
 .../JIT/Methodical/int64/unsigned/addsub.il   | 520 +++++-----
 .../Methodical/int64/unsigned/addsub_d.csproj |   1 -
 .../int64/unsigned/addsub_do.csproj           |   1 -
 .../int64/unsigned/addsub_il_d.ilproj         |   1 -
 .../int64/unsigned/addsub_il_r.ilproj         |   1 -
 .../Methodical/int64/unsigned/addsub_r.csproj |   1 -
 .../int64/unsigned/addsub_ro.csproj           |   1 -
 .../JIT/Methodical/int64/unsigned/ldc_mul.cs  |   8 +-
 .../JIT/Methodical/int64/unsigned/ldc_mul.il  |  20 +-
 .../int64/unsigned/ldc_mul_d.csproj           |   1 -
 .../int64/unsigned/ldc_mul_do.csproj          |   1 -
 .../int64/unsigned/ldc_mul_il_d.ilproj        |   1 -
 .../int64/unsigned/ldc_mul_il_r.ilproj        |   1 -
 .../int64/unsigned/ldc_mul_r.csproj           |   1 -
 .../int64/unsigned/ldc_mul_ro.csproj          |   1 -
 .../Methodical/int64/unsigned/ldc_mulovf.cs   |   8 +-
 .../Methodical/int64/unsigned/ldc_mulovf.il   |  20 +-
 .../int64/unsigned/ldc_mulovf_d.csproj        |   1 -
 .../int64/unsigned/ldc_mulovf_do.csproj       |   1 -
 .../int64/unsigned/ldc_mulovf_il_d.ilproj     |   1 -
 .../int64/unsigned/ldc_mulovf_il_r.ilproj     |   1 -
 .../int64/unsigned/ldc_mulovf_r.csproj        |   1 -
 .../int64/unsigned/ldc_mulovf_ro.csproj       |   1 -
 .../Methodical/int64/unsigned/ldfld_mul.cs    |   8 +-
 .../Methodical/int64/unsigned/ldfld_mul.il    |  56 +-
 .../int64/unsigned/ldfld_mul_d.csproj         |   1 -
 .../int64/unsigned/ldfld_mul_do.csproj        |   1 -
 .../int64/unsigned/ldfld_mul_il_d.ilproj      |   1 -
 .../int64/unsigned/ldfld_mul_il_r.ilproj      |   1 -
 .../int64/unsigned/ldfld_mul_r.csproj         |   1 -
 .../int64/unsigned/ldfld_mul_ro.csproj        |   1 -
 .../Methodical/int64/unsigned/ldfld_mulovf.cs |   8 +-
 .../Methodical/int64/unsigned/ldfld_mulovf.il |  56 +-
 .../int64/unsigned/ldfld_mulovf_d.csproj      |   1 -
 .../int64/unsigned/ldfld_mulovf_do.csproj     |   1 -
 .../int64/unsigned/ldfld_mulovf_il_d.ilproj   |   1 -
 .../int64/unsigned/ldfld_mulovf_il_r.ilproj   |   1 -
 .../int64/unsigned/ldfld_mulovf_r.csproj      |   1 -
 .../int64/unsigned/ldfld_mulovf_ro.csproj     |   1 -
 .../Methodical/int64/unsigned/ldsfld_mul.cs   |   8 +-
 .../Methodical/int64/unsigned/ldsfld_mul.il   |  52 +-
 .../int64/unsigned/ldsfld_mul_d.csproj        |   1 -
 .../int64/unsigned/ldsfld_mul_do.csproj       |   1 -
 .../int64/unsigned/ldsfld_mul_il_d.ilproj     |   1 -
 .../int64/unsigned/ldsfld_mul_il_r.ilproj     |   1 -
 .../int64/unsigned/ldsfld_mul_r.csproj        |   1 -
 .../int64/unsigned/ldsfld_mul_ro.csproj       |   1 -
 .../int64/unsigned/ldsfld_mulovf.cs           |   8 +-
 .../int64/unsigned/ldsfld_mulovf.il           |  52 +-
 .../int64/unsigned/ldsfld_mulovf_d.csproj     |   1 -
 .../int64/unsigned/ldsfld_mulovf_do.csproj    |   1 -
 .../int64/unsigned/ldsfld_mulovf_il_d.ilproj  |   1 -
 .../int64/unsigned/ldsfld_mulovf_il_r.ilproj  |   1 -
 .../int64/unsigned/ldsfld_mulovf_r.csproj     |   1 -
 .../int64/unsigned/ldsfld_mulovf_ro.csproj    |   1 -
 .../JIT/Methodical/int64/unsigned/muldiv.cs   |   8 +-
 .../JIT/Methodical/int64/unsigned/muldiv.il   | 524 +++++------
 .../Methodical/int64/unsigned/muldiv_d.csproj |   1 -
 .../int64/unsigned/muldiv_do.csproj           |   1 -
 .../int64/unsigned/muldiv_il_d.ilproj         |   1 -
 .../int64/unsigned/muldiv_il_r.ilproj         |   1 -
 .../Methodical/int64/unsigned/muldiv_r.csproj |   1 -
 .../int64/unsigned/muldiv_ro.csproj           |   1 -
 .../JIT/Methodical/jitinterface/bug603649.cs  |   9 +-
 .../Methodical/jitinterface/bug603649.csproj  |   1 -
 .../Methodical/largeframes/basic/bigframes.cs |   6 +-
 .../largeframes/basic/bigframes.csproj        |   1 -
 .../Methodical/largeframes/skip/skippage.cs   |   6 +-
 .../largeframes/skip/skippage.csproj          |   1 -
 .../Methodical/largeframes/skip2/skippage2.cs |   6 +-
 .../largeframes/skip2/skippage2.csproj        |   1 -
 .../Methodical/largeframes/skip3/skippage3.cs |   6 +-
 .../largeframes/skip3/skippage3.csproj        |   1 -
 .../Methodical/largeframes/skip4/skippage4.cs |   6 +-
 .../largeframes/skip4/skippage4.csproj        |   1 -
 .../Methodical/largeframes/skip5/skippage5.cs |   9 +-
 .../largeframes/skip5/skippage5.csproj        |   1 -
 .../Methodical/largeframes/skip6/skippage6.cs |   7 +-
 .../largeframes/skip6/skippage6.csproj        |   1 -
 .../Methodical/largeframes/skip7/skippage7.cs |   7 +-
 .../largeframes/skip7/skippage7.csproj        |   1 -
 src/tests/JIT/Methodical/ldtoken/ldtoken.il   |  44 +-
 .../Methodical/ldtoken/ldtoken_il_d.ilproj    |   1 -
 .../Methodical/ldtoken/ldtoken_il_r.ilproj    |   1 -
 src/tests/JIT/Methodical/ldtoken/ldtokena.il  |  32 +-
 .../Methodical/ldtoken/ldtokena_il_d.ilproj   |   1 -
 .../Methodical/ldtoken/ldtokena_il_r.ilproj   |   1 -
 src/tests/JIT/Methodical/ldtoken/ptr_types.il |  30 +-
 .../Methodical/ldtoken/ptr_types_il_d.ilproj  |   1 -
 .../Methodical/ldtoken/ptr_types_il_r.ilproj  |   1 -
 src/tests/JIT/Methodical/ldtoken/types.il     |  72 +-
 .../JIT/Methodical/ldtoken/types_il_d.ilproj  |   1 -
 .../JIT/Methodical/ldtoken/types_il_r.ilproj  |   1 -
 .../JIT/Methodical/localloc/call/call01.cs    |   9 +-
 .../localloc/call/call01_small.csproj         |   1 -
 .../localloc/verify/verify01_dynamic.il       |  21 +-
 .../localloc/verify/verify01_dynamic.ilproj   |   1 -
 .../localloc/verify/verify01_large.il         |  15 +-
 .../localloc/verify/verify01_large.ilproj     |   1 -
 .../localloc/verify/verify01_small.il         |  15 +-
 .../localloc/verify/verify01_small.ilproj     |   1 -
 .../localloc/zeroinit/zeroinit01_large.il     |   2 +-
 .../localloc/zeroinit/zeroinit01_large.ilproj |   1 -
 .../localloc/zeroinit/zeroinit01_small.il     |   2 +-
 .../localloc/zeroinit/zeroinit01_small.ilproj |   1 -
 .../JIT/Methodical/nonvirtualcall/classic.cs  |   7 +-
 .../Methodical/nonvirtualcall/classic.csproj  |   1 -
 .../nonvirtualcall/classic_il_d.ilproj        |   1 -
 .../nonvirtualcall/classic_il_r.ilproj        |   1 -
 .../JIT/Methodical/nonvirtualcall/delegate.cs |   7 +-
 .../Methodical/nonvirtualcall/delegate.csproj |   1 -
 .../nonvirtualcall/delegate_il_d.ilproj       |   1 -
 .../nonvirtualcall/delegate_il_r.ilproj       |   1 -
 .../JIT/Methodical/nonvirtualcall/generics.cs |   7 +-
 .../Methodical/nonvirtualcall/generics.csproj |   1 -
 .../Methodical/nonvirtualcall/generics2.cs    |   7 +-
 .../nonvirtualcall/generics2.csproj           |   1 -
 .../nonvirtualcall/generics2_il_d.ilproj      |   1 -
 .../nonvirtualcall/generics2_il_r.ilproj      |   1 -
 .../nonvirtualcall/generics_il_d.ilproj       |   1 -
 .../nonvirtualcall/generics_il_r.ilproj       |   1 -
 .../JIT/Methodical/nonvirtualcall/tailcall.cs |   7 +-
 .../Methodical/nonvirtualcall/tailcall.csproj |   1 -
 .../tailcall_nonvirtualcall_il_d.ilproj       |   1 -
 .../tailcall_nonvirtualcall_il_r.ilproj       |   1 -
 .../Methodical/nonvirtualcall/valuetype.cs    |   7 +-
 .../nonvirtualcall/valuetype.csproj           |   1 -
 .../nonvirtualcall/valuetype_il_d.ilproj      |   1 -
 .../nonvirtualcall/valuetype_il_r.ilproj      |   1 -
 src/tests/JIT/Methodical/refany/array1.cs     |   8 +-
 src/tests/JIT/Methodical/refany/array1.csproj |   1 -
 src/tests/JIT/Methodical/refany/array1.il     |  22 +-
 .../JIT/Methodical/refany/array1_il_d.ilproj  |   1 -
 .../JIT/Methodical/refany/array1_il_r.ilproj  |   1 -
 src/tests/JIT/Methodical/refany/array2.cs     |   8 +-
 src/tests/JIT/Methodical/refany/array2.csproj |   1 -
 src/tests/JIT/Methodical/refany/array2.il     |  14 +-
 .../JIT/Methodical/refany/array2_il_d.ilproj  |   1 -
 .../JIT/Methodical/refany/array2_il_r.ilproj  |   1 -
 src/tests/JIT/Methodical/refany/array3.il     |  14 +-
 .../JIT/Methodical/refany/array3_il_d.ilproj  |   1 -
 .../JIT/Methodical/refany/array3_il_r.ilproj  |   1 -
 src/tests/JIT/Methodical/refany/format.cs     |   8 +-
 src/tests/JIT/Methodical/refany/format.csproj |   1 -
 src/tests/JIT/Methodical/refany/format.il     | 220 ++---
 .../JIT/Methodical/refany/format_il_d.ilproj  |   1 -
 .../JIT/Methodical/refany/format_il_r.ilproj  |   1 -
 src/tests/JIT/Methodical/refany/gcreport.cs   |   8 +-
 .../JIT/Methodical/refany/gcreport_d.csproj   |   1 -
 .../JIT/Methodical/refany/gcreport_do.csproj  |   1 -
 .../JIT/Methodical/refany/gcreport_r.csproj   |   1 -
 .../JIT/Methodical/refany/gcreport_ro.csproj  |   1 -
 src/tests/JIT/Methodical/refany/indcall.il    |  14 +-
 .../JIT/Methodical/refany/indcall_il_d.ilproj |   1 -
 .../JIT/Methodical/refany/indcall_il_r.ilproj |   1 -
 src/tests/JIT/Methodical/refany/lcs.cs        |   8 +-
 src/tests/JIT/Methodical/refany/lcs.csproj    |   1 -
 src/tests/JIT/Methodical/refany/lcs.il        |  16 +-
 .../JIT/Methodical/refany/lcs_il_d.ilproj     |   1 -
 .../JIT/Methodical/refany/lcs_il_r.ilproj     |   1 -
 src/tests/JIT/Methodical/refany/longsig.il    | 222 ++---
 .../JIT/Methodical/refany/longsig_il_d.ilproj |   1 -
 .../JIT/Methodical/refany/longsig_il_r.ilproj |   1 -
 src/tests/JIT/Methodical/refany/native.cs     |   9 +-
 src/tests/JIT/Methodical/refany/native.il     |   8 +-
 .../JIT/Methodical/refany/native_d.csproj     |   1 -
 .../JIT/Methodical/refany/native_do.csproj    |   1 -
 .../JIT/Methodical/refany/native_il_d.ilproj  |   1 -
 .../JIT/Methodical/refany/native_il_r.ilproj  |   1 -
 .../JIT/Methodical/refany/native_r.csproj     |   1 -
 .../JIT/Methodical/refany/native_ro.csproj    |   1 -
 src/tests/JIT/Methodical/refany/seq.il        |  10 +-
 .../JIT/Methodical/refany/seq_il_d.ilproj     |   1 -
 .../JIT/Methodical/refany/seq_il_r.ilproj     |   1 -
 src/tests/JIT/Methodical/refany/shortsig.il   | 220 ++---
 .../Methodical/refany/shortsig_il_d.ilproj    |   1 -
 .../Methodical/refany/shortsig_il_r.ilproj    |   1 -
 src/tests/JIT/Methodical/refany/stress1.cs    |   9 +-
 .../JIT/Methodical/refany/stress1_d.csproj    |   1 -
 .../JIT/Methodical/refany/stress1_do.csproj   |   1 -
 .../JIT/Methodical/refany/stress1_r.csproj    |   1 -
 .../JIT/Methodical/refany/stress1_ro.csproj   |   1 -
 src/tests/JIT/Methodical/refany/stress2.il    |   8 +-
 .../JIT/Methodical/refany/stress2_il_d.ilproj |   1 -
 .../JIT/Methodical/refany/stress2_il_r.ilproj |   1 -
 .../JIT/Methodical/refany/stress3-64bit.cs    |   9 +-
 .../JIT/Methodical/refany/stress3_d.csproj    |   1 -
 .../JIT/Methodical/refany/stress3_do.csproj   |   1 -
 .../JIT/Methodical/refany/stress3_r.csproj    |   1 -
 .../JIT/Methodical/refany/stress3_ro.csproj   |   1 -
 src/tests/JIT/Methodical/refany/u_native.il   |   8 +-
 .../Methodical/refany/u_native_il_d.ilproj    |   1 -
 .../Methodical/refany/u_native_il_r.ilproj    |   1 -
 src/tests/JIT/Methodical/refany/virtcall.cs   |   8 +-
 .../JIT/Methodical/refany/virtcall_d.csproj   |   1 -
 .../JIT/Methodical/refany/virtcall_do.csproj  |   1 -
 .../JIT/Methodical/refany/virtcall_r.csproj   |   1 -
 .../JIT/Methodical/refany/virtcall_ro.csproj  |   1 -
 .../stringintern/_Simpleb207621.csproj        |   1 -
 .../stringintern/_Simpletest1.csproj          |   1 -
 .../stringintern/_Simpletest2.csproj          |   1 -
 .../stringintern/_Simpletest4.csproj          |   1 -
 .../JIT/Methodical/stringintern/b207621.cs    |   6 +-
 .../stringintern/test1-xassem.csproj          |   1 -
 .../JIT/Methodical/stringintern/test1.cs      |   4 +-
 .../stringintern/test2-xassem.csproj          |   1 -
 .../JIT/Methodical/stringintern/test2.cs      |   4 +-
 .../stringintern/test4-xassem.csproj          |   1 -
 .../JIT/Methodical/stringintern/test4.cs      |   4 +-
 .../Methodical/structs/ExplicitLayout.csproj  |   1 -
 .../Methodical/structs/StructStackParams.cs   |   4 +-
 .../structs/StructStackParams.csproj          |   1 -
 .../structs/StructWithSingleFloat.cs          |   9 +-
 .../structs/StructWithSingleFloat.csproj      |   3 +-
 .../systemvbringup/structinregs.csproj        |   1 -
 .../structs/systemvbringup/structpasstest.cs  |   4 +-
 .../JIT/Methodical/structs/valuetuple.cs      |   4 +-
 .../JIT/Methodical/structs/valuetuple.csproj  |   1 -
 .../JIT/Methodical/switch/switch1.ilproj      |   1 -
 .../JIT/Methodical/switch/switch10.ilproj     |   1 -
 .../JIT/Methodical/switch/switch11.ilproj     |   1 -
 .../JIT/Methodical/switch/switch2.ilproj      |   1 -
 .../JIT/Methodical/switch/switch3.ilproj      |   1 -
 .../JIT/Methodical/switch/switch4.ilproj      |   1 -
 .../JIT/Methodical/switch/switch5.ilproj      |   1 -
 .../JIT/Methodical/switch/switch6.ilproj      |   1 -
 .../JIT/Methodical/switch/switch7.ilproj      |   1 -
 .../JIT/Methodical/switch/switch8.ilproj      |   1 -
 .../JIT/Methodical/switch/switch9.ilproj      |   1 -
 .../JIT/Methodical/tailcall/test_implicit.il  |  67 +-
 .../tailcall_v4/delegateParamCallTarget.cs    |   9 +-
 .../delegateParamCallTarget.csproj            |   1 -
 .../Methodical/tailcall_v4/delegateTail.il    |  23 +-
 .../tailcall_v4/delegateTail.ilproj           |   1 -
 .../JIT/Methodical/tailcall_v4/hijacking.il   | 115 +--
 .../Methodical/tailcall_v4/hijacking.ilproj   |   1 -
 .../JIT/Methodical/tailcall_v4/smallFrame.il  |   4 +-
 .../Methodical/tailcall_v4/smallFrame.ilproj  |   1 -
 .../JIT/Methodical/unsafecsharp/unsafe-0.cs   |   9 +-
 .../Methodical/unsafecsharp/unsafe-0_d.csproj |   1 -
 .../unsafecsharp/unsafe-0_do.csproj           |   1 -
 .../Methodical/unsafecsharp/unsafe-0_r.csproj |   1 -
 .../unsafecsharp/unsafe-0_ro.csproj           |   1 -
 .../JIT/Methodical/unsafecsharp/unsafe-1.cs   |   9 +-
 .../Methodical/unsafecsharp/unsafe-1_d.csproj |   1 -
 .../unsafecsharp/unsafe-1_do.csproj           |   1 -
 .../Methodical/unsafecsharp/unsafe-1_r.csproj |   1 -
 .../unsafecsharp/unsafe-1_ro.csproj           |   1 -
 .../JIT/Methodical/unsafecsharp/unsafe-2.cs   |   9 +-
 .../Methodical/unsafecsharp/unsafe-2_d.csproj |   1 -
 .../unsafecsharp/unsafe-2_do.csproj           |   1 -
 .../Methodical/unsafecsharp/unsafe-2_r.csproj |   1 -
 .../unsafecsharp/unsafe-2_ro.csproj           |   1 -
 .../JIT/Methodical/unsafecsharp/unsafe-3.cs   |   9 +-
 .../Methodical/unsafecsharp/unsafe-3_d.csproj |   1 -
 .../unsafecsharp/unsafe-3_do.csproj           |   1 -
 .../Methodical/unsafecsharp/unsafe-3_r.csproj |   1 -
 .../unsafecsharp/unsafe-3_ro.csproj           |   1 -
 .../JIT/Methodical/unsafecsharp/unsafe-4.cs   |   9 +-
 .../Methodical/unsafecsharp/unsafe-4_d.csproj |   1 -
 .../unsafecsharp/unsafe-4_do.csproj           |   1 -
 .../Methodical/unsafecsharp/unsafe-4_r.csproj |   1 -
 .../unsafecsharp/unsafe-4_ro.csproj           |   1 -
 .../JIT/Methodical/unsafecsharp/unsafe-5.cs   |   9 +-
 .../Methodical/unsafecsharp/unsafe-5_d.csproj |   1 -
 .../unsafecsharp/unsafe-5_do.csproj           |   1 -
 .../Methodical/unsafecsharp/unsafe-5_r.csproj |   1 -
 .../unsafecsharp/unsafe-5_ro.csproj           |   1 -
 .../JIT/Methodical/unsafecsharp/unsafe-6.cs   |   9 +-
 .../Methodical/unsafecsharp/unsafe-6_d.csproj |   1 -
 .../unsafecsharp/unsafe-6_do.csproj           |   1 -
 .../Methodical/unsafecsharp/unsafe-6_r.csproj |   1 -
 .../unsafecsharp/unsafe-6_ro.csproj           |   1 -
 src/tests/JIT/Methodical/xxblk/cpblk3.il      |  41 +-
 .../JIT/Methodical/xxblk/cpblk3_il_d.ilproj   |   1 -
 .../JIT/Methodical/xxblk/cpblk3_il_r.ilproj   |   1 -
 src/tests/JIT/Methodical/xxblk/dynblk.il      |  27 +-
 .../JIT/Methodical/xxblk/dynblk_il_d.ilproj   |   1 -
 .../JIT/Methodical/xxblk/dynblk_il_r.ilproj   |   1 -
 .../JIT/Methodical/xxblk/dynblk_order.il      |   4 +-
 .../Methodical/xxblk/dynblk_order_il_d.ilproj |   1 -
 .../Methodical/xxblk/dynblk_order_il_r.ilproj |   1 -
 src/tests/JIT/Methodical/xxblk/initblk3.il    |  13 +-
 .../JIT/Methodical/xxblk/initblk3_il_d.ilproj |   1 -
 .../JIT/Methodical/xxblk/initblk3_il_r.ilproj |   1 -
 .../JIT/Methodical/xxobj/ldobj/ldobj_I.il     | 346 +++----
 .../JIT/Methodical/xxobj/ldobj/ldobj_I8.il    | 346 +++----
 .../xxobj/ldobj/ldobj_I8_il_d.ilproj          |   1 -
 .../xxobj/ldobj/ldobj_I8_il_r.ilproj          |   1 -
 .../xxobj/ldobj/ldobj_I_il_d.ilproj           |   1 -
 .../xxobj/ldobj/ldobj_I_il_r.ilproj           |   1 -
 .../JIT/Methodical/xxobj/ldobj/ldobj_R4.il    | 346 +++----
 .../xxobj/ldobj/ldobj_R4_il_d.ilproj          |   1 -
 .../xxobj/ldobj/ldobj_R4_il_r.ilproj          |   1 -
 .../JIT/Methodical/xxobj/ldobj/ldobj_R8.il    | 346 +++----
 .../xxobj/ldobj/ldobj_R8_il_d.ilproj          |   1 -
 .../xxobj/ldobj/ldobj_R8_il_r.ilproj          |   1 -
 .../JIT/Methodical/xxobj/ldobj/ldobj_U2.il    | 346 +++----
 .../xxobj/ldobj/ldobj_U2_il_d.ilproj          |   1 -
 .../xxobj/ldobj/ldobj_U2_il_r.ilproj          |   1 -
 .../JIT/Methodical/xxobj/ldobj/ldobj_V.il     | 888 +++++++++---------
 .../xxobj/ldobj/ldobj_V_il_d.ilproj           |   1 -
 .../xxobj/ldobj/ldobj_V_il_r.ilproj           |   1 -
 .../JIT/Methodical/xxobj/operand/const.il     |  14 +-
 .../xxobj/operand/const_il_d.ilproj           |   1 -
 .../xxobj/operand/const_il_r.ilproj           |   1 -
 .../JIT/Methodical/xxobj/operand/ldelema.il   |  90 +-
 .../xxobj/operand/ldelema_il_d.ilproj         |   1 -
 .../xxobj/operand/ldelema_il_r.ilproj         |   1 -
 .../JIT/Methodical/xxobj/operand/localloc.il  |  78 +-
 .../operand/localloc_operand_il_d.ilproj      |   1 -
 .../operand/localloc_operand_il_r.ilproj      |   1 -
 .../JIT/Methodical/xxobj/operand/mdarray.il   |  90 +-
 .../xxobj/operand/mdarray_il_d.ilproj         |   1 -
 .../xxobj/operand/mdarray_il_r.ilproj         |   1 -
 .../JIT/Methodical/xxobj/operand/refanyval.cs |   8 +-
 .../JIT/Methodical/xxobj/operand/refanyval.il |  88 +-
 .../xxobj/operand/refanyval_d.csproj          |   1 -
 .../xxobj/operand/refanyval_do.csproj         |   1 -
 .../xxobj/operand/refanyval_il_d.ilproj       |   1 -
 .../xxobj/operand/refanyval_il_r.ilproj       |   1 -
 .../xxobj/operand/refanyval_r.csproj          |   1 -
 .../xxobj/operand/refanyval_ro.csproj         |   1 -
 .../JIT/Methodical/xxobj/operand/unbox.cs     |   8 +-
 .../JIT/Methodical/xxobj/operand/unbox.il     |  98 +-
 .../Methodical/xxobj/operand/unbox_d.csproj   |   1 -
 .../Methodical/xxobj/operand/unbox_do.csproj  |   1 -
 .../xxobj/operand/unbox_il_d.ilproj           |   1 -
 .../xxobj/operand/unbox_il_r.ilproj           |   1 -
 .../Methodical/xxobj/operand/unbox_r.csproj   |   1 -
 .../Methodical/xxobj/operand/unbox_ro.csproj  |   1 -
 .../JIT/Methodical/xxobj/sizeof/sizeof.cs     |   9 +-
 .../JIT/Methodical/xxobj/sizeof/sizeof32.cs   |   8 +-
 .../xxobj/sizeof/sizeof32_Target_32Bit_x86.il |   4 +-
 .../sizeof32_Target_32Bit_x86_il_d.ilproj     |   1 -
 .../sizeof32_Target_32Bit_x86_il_r.ilproj     |   1 -
 .../sizeof/sizeof32_Target_64Bit_and_arm.il   |   4 +-
 .../sizeof32_Target_64Bit_and_arm_il_d.ilproj |   1 -
 .../sizeof32_Target_64Bit_and_arm_il_r.ilproj |   1 -
 .../Methodical/xxobj/sizeof/sizeof32_d.csproj |   1 -
 .../xxobj/sizeof/sizeof32_do.csproj           |   1 -
 .../Methodical/xxobj/sizeof/sizeof32_r.csproj |   1 -
 .../xxobj/sizeof/sizeof32_ro.csproj           |   1 -
 .../JIT/Methodical/xxobj/sizeof/sizeof64.cs   |   9 +-
 .../xxobj/sizeof/sizeof64_Target_32Bit_x86.il |   4 +-
 .../sizeof64_Target_32Bit_x86_il_d.ilproj     |   1 -
 .../sizeof64_Target_32Bit_x86_il_r.ilproj     |   1 -
 .../sizeof/sizeof64_Target_64Bit_and_arm.il   |   4 +-
 .../sizeof64_Target_64Bit_and_arm_il_d.ilproj |   1 -
 .../sizeof64_Target_64Bit_and_arm_il_r.ilproj |   1 -
 .../Methodical/xxobj/sizeof/sizeof64_d.csproj |   1 -
 .../xxobj/sizeof/sizeof64_do.csproj           |   1 -
 .../Methodical/xxobj/sizeof/sizeof64_r.csproj |   1 -
 .../xxobj/sizeof/sizeof64_ro.csproj           |   1 -
 .../xxobj/sizeof/sizeof_Target_32Bit_x86.il   |   4 +-
 .../sizeof_Target_32Bit_x86_il_d.ilproj       |   1 -
 .../sizeof_Target_32Bit_x86_il_r.ilproj       |   1 -
 .../sizeof/sizeof_Target_64Bit_and_arm.il     |   4 +-
 .../sizeof_Target_64Bit_and_arm_il_d.ilproj   |   1 -
 .../sizeof_Target_64Bit_and_arm_il_r.ilproj   |   1 -
 .../Methodical/xxobj/sizeof/sizeof_d.csproj   |   1 -
 .../Methodical/xxobj/sizeof/sizeof_do.csproj  |   1 -
 .../Methodical/xxobj/sizeof/sizeof_r.csproj   |   1 -
 .../Methodical/xxobj/sizeof/sizeof_ro.csproj  |   1 -
 2644 files changed, 10218 insertions(+), 10851 deletions(-)

diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_b.il b/src/tests/JIT/Methodical/Arrays/huge/huge_b.il
index 84c0771680cbb6..2ca4cb2ff324d2 100644
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_b.il
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_b.il
@@ -27,12 +27,12 @@
   
 }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_huge_b_huge_il
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends [mscorlib]System.Object
   {
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -457,4 +457,4 @@
     
   } // end of class 'Test'
   
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_huge_b_huge_il'
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_b_il_d.ilproj b/src/tests/JIT/Methodical/Arrays/huge/huge_b_il_d.ilproj
index 6650f42cea6765..2cbe0cc56f7d84 100644
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_b_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_b_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_b_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/huge/huge_b_il_r.ilproj
index acecaa18c97523..d2bb6937f20b29 100644
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_b_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_b_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_i4.il b/src/tests/JIT/Methodical/Arrays/huge/huge_i4.il
index 0e8b353b4fede2..a7d552018c1e66 100644
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_i4.il
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_i4.il
@@ -27,12 +27,12 @@
   
 }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_huge_i4_huge_il
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends [mscorlib]System.Object
   {
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -465,4 +465,4 @@
     
   } // end of class 'Test'
   
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_huge_i4_huge_il'
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_i4_il_d.ilproj b/src/tests/JIT/Methodical/Arrays/huge/huge_i4_il_d.ilproj
index 8bafa72ae50f91..f68f7ae40595a6 100644
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_i4_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_i4_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_i4_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/huge/huge_i4_il_r.ilproj
index 5c244351983fe8..88e02eafd12a6e 100644
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_i4_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_i4_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_objref.il b/src/tests/JIT/Methodical/Arrays/huge/huge_objref.il
index 313d277c88bc29..9715a4dbee3be6 100644
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_objref.il
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_objref.il
@@ -19,7 +19,7 @@
 {
 }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_huge_objref_huge_il
 {
   .class private auto ansi sealed TestClass extends [mscorlib]System.Object
   {
@@ -42,10 +42,10 @@
     }
   } // end of class 'TestClass'
   
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends [mscorlib]System.Object
   {
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -53,10 +53,10 @@
       )
       .entrypoint
       .maxstack  70
-      .locals (class JitTest.TestClass[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,] matrix,
+      .locals (class JitTest_huge_objref_huge_il.TestClass[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,] matrix,
                int32 count,
 			   int32[] dim,
-			   class JitTest.TestClass ref)
+			   class JitTest_huge_objref_huge_il.TestClass ref)
 
       			ldstr     "Creating 32-dimension array"
       			call       void [System.Console]System.Console::WriteLine(string)
@@ -182,7 +182,7 @@
 				ldloc dim ldc.i4 61 ldelem.i4
 				ldloc dim ldc.i4 62 ldelem.i4
 				ldloc dim ldc.i4 63 ldelem.i4
-				newobj		instance void class JitTest.TestClass[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::.ctor(
+				newobj		instance void class JitTest_huge_objref_huge_il.TestClass[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::.ctor(
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
@@ -235,7 +235,7 @@
 				ldloc dim ldc.i4 60 ldelem.i4
 				ldloc dim ldc.i4 62 ldelem.i4
 				
-				newobj   instance void JitTest.TestClass::.ctor()
+				newobj   instance void JitTest_huge_objref_huge_il.TestClass::.ctor()
 				dup
 				dup
 				ldc.i4	99
@@ -244,16 +244,16 @@
 				ldc.i4  98
 				ldc.r8	8.0
 				stelem.r8
-				stfld	float64[] JitTest.TestClass::dbl_ptr
+				stfld	float64[] JitTest_huge_objref_huge_il.TestClass::dbl_ptr
 				ldc.i4	0x05071975
-				stfld	int32 JitTest.TestClass::magic
+				stfld	int32 JitTest_huge_objref_huge_il.TestClass::magic
 			
 				call    void [mscorlib]System.GC::Collect()
 				
 				dup
 				stloc ref
 				
-      			callvirt 	instance void class JitTest.TestClass[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Set(
+      			callvirt 	instance void class JitTest_huge_objref_huge_il.TestClass[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Set(
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
@@ -262,7 +262,7 @@
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
-      					class JitTest.TestClass)
+      					class JitTest_huge_objref_huge_il.TestClass)
 
 				ldloc matrix
 				ldloc dim ldc.i4.0 ldelem.i4
@@ -297,7 +297,7 @@
 				ldloc dim ldc.i4 58 ldelem.i4
 				ldloc dim ldc.i4 60 ldelem.i4
 				ldloc dim ldc.i4 62 ldelem.i4
-      			callvirt 	instance class JitTest.TestClass class JitTest.TestClass[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Get(
+      			callvirt 	instance class JitTest_huge_objref_huge_il.TestClass class JitTest_huge_objref_huge_il.TestClass[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Get(
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
@@ -308,7 +308,7 @@
       					int32, int32, int32, int32)
 
       			dup
-      			ldfld   float64[] JitTest.TestClass::dbl_ptr
+      			ldfld   float64[] JitTest_huge_objref_huge_il.TestClass::dbl_ptr
       			ldc.i4 98
       			ldelem.r8
       			ldc.r8 8.0
@@ -317,7 +317,7 @@
       			pop
       			br  throw0
 			next0_0:
-      			ldfld   int32 JitTest.TestClass::magic
+      			ldfld   int32 JitTest_huge_objref_huge_il.TestClass::magic
       			ldc.i4  0x05071975
       			ceq
       			brfalse throw0
@@ -363,7 +363,7 @@
       			br cont3
       			
       		go1:
-      			call instance class JitTest.TestClass class JitTest.TestClass[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Get(
+      			call instance class JitTest_huge_objref_huge_il.TestClass class JitTest_huge_objref_huge_il.TestClass[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Get(
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
@@ -373,7 +373,7 @@
       					int32, int32, int32, int32,
       					int32, int32, int32, int32)
       			dup
-      			ldfld   float64[] JitTest.TestClass::dbl_ptr
+      			ldfld   float64[] JitTest_huge_objref_huge_il.TestClass::dbl_ptr
       			ldc.i4 98
       			ldelem.r8
       			ldc.r8 8.0
@@ -382,7 +382,7 @@
       			pop
       			br  throw0
 			next0_1:
-      			ldfld   int32 JitTest.TestClass::magic
+      			ldfld   int32 JitTest_huge_objref_huge_il.TestClass::magic
       			ldc.i4  0x05071975
       			ceq
       			brfalse throw0
@@ -431,7 +431,7 @@
 				ldloc dim ldc.i4 60 ldelem.i4
 				ldloc dim ldc.i4 62 ldelem.i4
 				ldloc ref
-      			call 	instance void class JitTest.TestClass[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Set(
+      			call 	instance void class JitTest_huge_objref_huge_il.TestClass[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Set(
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
@@ -440,7 +440,7 @@
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
-      					class JitTest.TestClass)
+      					class JitTest_huge_objref_huge_il.TestClass)
       			ldnull
       			stloc matrix
       			call void [mscorlib]System.GC::Collect()
@@ -490,7 +490,7 @@
 				ldloc dim ldc.i4 58 ldelem.i4
 				ldloc dim ldc.i4 60 ldelem.i4
 				ldloc dim ldc.i4 62 ldelem.i4
-      			callvirt instance class JitTest.TestClass& class JitTest.TestClass[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Address(
+      			callvirt instance class JitTest_huge_objref_huge_il.TestClass& class JitTest_huge_objref_huge_il.TestClass[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Address(
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
@@ -501,7 +501,7 @@
       					int32, int32, int32, int32)
       			dup
       			ldind.ref
-      			ldfld   float64[] JitTest.TestClass::dbl_ptr
+      			ldfld   float64[] JitTest_huge_objref_huge_il.TestClass::dbl_ptr
       			ldc.i4 98
       			ldelem.r8
       			ldc.r8 8.0
@@ -513,12 +513,12 @@
 			next0_2:
 				dup
       			ldind.ref
-      			ldfld   int32 JitTest.TestClass::magic
+      			ldfld   int32 JitTest_huge_objref_huge_il.TestClass::magic
       			ldc.i4  0x05071975
       			ceq
       			brfalse pop_and_throw
       			ldind.ref
-      			callvirt   instance  string JitTest.TestClass::ToString()
+      			callvirt   instance  string JitTest_huge_objref_huge_il.TestClass::ToString()
       			call       void [System.Console]System.Console::WriteLine(string)
       			br pass2
 
@@ -537,4 +537,4 @@
     
   } // end of class 'Test'
   
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_huge_objref_huge_il'
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_objref_il_d.ilproj b/src/tests/JIT/Methodical/Arrays/huge/huge_objref_il_d.ilproj
index 2f4175fe6d9607..25bbafa9e5668a 100644
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_objref_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_objref_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_objref_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/huge/huge_objref_il_r.ilproj
index 94e605a4c8eff9..66cf95a96a994a 100644
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_objref_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_objref_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_r4.il b/src/tests/JIT/Methodical/Arrays/huge/huge_r4.il
index bb92a5c83ce8f6..2c4c00076dbf03 100644
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_r4.il
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_r4.il
@@ -27,12 +27,12 @@
   
 }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_huge_r4_huge_il
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends [mscorlib]System.Object
   {
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -493,4 +493,4 @@
     
   } // end of class 'Test'
   
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_huge_r4_huge_il'
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_r4_il_d.ilproj b/src/tests/JIT/Methodical/Arrays/huge/huge_r4_il_d.ilproj
index 237b5460e7c877..b6ccf95c650ea4 100644
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_r4_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_r4_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_r4_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/huge/huge_r4_il_r.ilproj
index 02b8518cea66ba..53c12cb9b69533 100644
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_r4_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_r4_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_r8.il b/src/tests/JIT/Methodical/Arrays/huge/huge_r8.il
index 1b13ba7598097c..9d1532b447c9ef 100644
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_r8.il
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_r8.il
@@ -27,12 +27,12 @@
   
 }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_huge_r8_huge_il
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends [mscorlib]System.Object
   {
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -493,4 +493,4 @@
     
   } // end of class 'Test'
   
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_huge_r8_huge_il'
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_r8_il_d.ilproj b/src/tests/JIT/Methodical/Arrays/huge/huge_r8_il_d.ilproj
index aa21ccace97823..523f6fae457bdf 100644
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_r8_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_r8_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_r8_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/huge/huge_r8_il_r.ilproj
index c647fd99504edf..f043a6fa741783 100644
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_r8_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_r8_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_struct.il b/src/tests/JIT/Methodical/Arrays/huge/huge_struct.il
index 29863e2435b62d..94b13977aa30c7 100644
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_struct.il
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_struct.il
@@ -27,7 +27,7 @@
   
 }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_huge_struct_huge_il
 {
   .class value private auto ansi sealed TestStruct extends [mscorlib]System.ValueType
   {
@@ -37,10 +37,10 @@
     .field public unsigned int64[] ul_ptr
   } // end of class 'TestStruct'
   
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends [mscorlib]System.Object
   {
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -48,11 +48,11 @@
       )
       .entrypoint
       .maxstack  70
-      .locals (value class JitTest.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,] matrix,
+      .locals (value class JitTest_huge_struct_huge_il.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,] matrix,
                int32 count,
 			   int32[] dim,
-			   value class JitTest.TestStruct t,
-			   value class JitTest.TestStruct r)
+			   value class JitTest_huge_struct_huge_il.TestStruct t,
+			   value class JitTest_huge_struct_huge_il.TestStruct r)
 
       			ldstr     "Creating 32-dimension array"
       			call       void [System.Console]System.Console::WriteLine(string)
@@ -178,7 +178,7 @@
 				ldloc dim ldc.i4 61 ldelem.i4
 				ldloc dim ldc.i4 62 ldelem.i4
 				ldloc dim ldc.i4 63 ldelem.i4
-				newobj		instance void value class JitTest.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::.ctor(
+				newobj		instance void value class JitTest_huge_struct_huge_il.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::.ctor(
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
@@ -232,7 +232,7 @@
 				ldloc dim ldc.i4 62 ldelem.i4
 				
       			ldloca	t
-				initobj		JitTest.TestStruct
+				initobj		JitTest_huge_struct_huge_il.TestStruct
       			ldloca	t
       			dup
 				ldc.i4	99
@@ -241,14 +241,14 @@
 				ldc.i4  98
 				ldc.r8	8.0
 				stelem.r8
-				stfld	float64[] JitTest.TestStruct::dbl_ptr
+				stfld	float64[] JitTest_huge_struct_huge_il.TestStruct::dbl_ptr
 				ldc.i4	0x05071975
-				stfld	int32 JitTest.TestStruct::magic
+				stfld	int32 JitTest_huge_struct_huge_il.TestStruct::magic
 
 				call    void [mscorlib]System.GC::Collect()
 
 				ldloc	t
-      			callvirt 	instance void value class JitTest.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Set(
+      			callvirt 	instance void value class JitTest_huge_struct_huge_il.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Set(
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
@@ -257,7 +257,7 @@
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
-      					value class JitTest.TestStruct)
+      					value class JitTest_huge_struct_huge_il.TestStruct)
 
 				ldloc matrix
 				ldloc dim ldc.i4.0 ldelem.i4
@@ -292,7 +292,7 @@
 				ldloc dim ldc.i4 58 ldelem.i4
 				ldloc dim ldc.i4 60 ldelem.i4
 				ldloc dim ldc.i4 62 ldelem.i4
-      			callvirt 	instance value class JitTest.TestStruct value class JitTest.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Get(
+      			callvirt 	instance value class JitTest_huge_struct_huge_il.TestStruct value class JitTest_huge_struct_huge_il.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Get(
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
@@ -305,7 +305,7 @@
       			stloc r
       			ldloca r
       			dup
-      			ldfld   float64[] JitTest.TestStruct::dbl_ptr
+      			ldfld   float64[] JitTest_huge_struct_huge_il.TestStruct::dbl_ptr
       			ldc.i4 98
       			ldelem.r8
       			ldc.r8 8.0
@@ -314,7 +314,7 @@
       			pop
       			br  throw0
 			next0_0:
-      			ldfld   int32 JitTest.TestStruct::magic
+      			ldfld   int32 JitTest_huge_struct_huge_il.TestStruct::magic
       			ldc.i4  0x05071975
       			ceq
       			brfalse throw0
@@ -360,7 +360,7 @@
       			br cont3
       			
       		go1:
-      			callvirt instance value class JitTest.TestStruct value class JitTest.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Get(
+      			callvirt instance value class JitTest_huge_struct_huge_il.TestStruct value class JitTest_huge_struct_huge_il.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Get(
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
@@ -372,7 +372,7 @@
       			stloc r
       			ldloca r
       			dup
-      			ldfld   float64[] JitTest.TestStruct::dbl_ptr
+      			ldfld   float64[] JitTest_huge_struct_huge_il.TestStruct::dbl_ptr
       			ldc.i4 98
       			ldelem.r8
       			ldc.r8 8.0
@@ -381,7 +381,7 @@
       			pop
       			br  throw0
 			next0_1:
-      			ldfld   int32 JitTest.TestStruct::magic
+      			ldfld   int32 JitTest_huge_struct_huge_il.TestStruct::magic
       			ldc.i4  0x05071975
       			ceq
       			brfalse throw0
@@ -430,7 +430,7 @@
 				ldloc dim ldc.i4 60 ldelem.i4
 				ldloc dim ldc.i4 62 ldelem.i4
 				ldloc	t
-      			callvirt 	instance void value class JitTest.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Set(
+      			callvirt 	instance void value class JitTest_huge_struct_huge_il.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Set(
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
@@ -439,7 +439,7 @@
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
-      					value class JitTest.TestStruct)
+      					value class JitTest_huge_struct_huge_il.TestStruct)
       			ldnull
       			stloc matrix
       			call void [mscorlib]System.GC::Collect()
@@ -489,7 +489,7 @@
 				ldloc dim ldc.i4 58 ldelem.i4
 				ldloc dim ldc.i4 60 ldelem.i4
 				ldloc dim ldc.i4 62 ldelem.i4
-      			callvirt instance value class JitTest.TestStruct& value class JitTest.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Address(
+      			callvirt instance value class JitTest_huge_struct_huge_il.TestStruct& value class JitTest_huge_struct_huge_il.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Address(
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
@@ -499,7 +499,7 @@
       					int32, int32, int32, int32,
       					int32, int32, int32, int32)
       			dup
-      			ldfld   float64[] JitTest.TestStruct::dbl_ptr
+      			ldfld   float64[] JitTest_huge_struct_huge_il.TestStruct::dbl_ptr
       			ldc.i4 98
       			ldelem.r8
       			ldc.r8 8.0
@@ -508,7 +508,7 @@
       			pop
       			br  throw0
 			next0_2:
-      			ldfld   int32 JitTest.TestStruct::magic
+      			ldfld   int32 JitTest_huge_struct_huge_il.TestStruct::magic
       			ldc.i4  0x05071975
       			ceq
       			brfalse throw0
@@ -529,4 +529,4 @@
     
   } // end of class 'Test'
   
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_huge_struct_huge_il'
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_struct_il_d.ilproj b/src/tests/JIT/Methodical/Arrays/huge/huge_struct_il_d.ilproj
index d5d7f813795059..9483d38f9cd49d 100644
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_struct_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_struct_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_struct_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/huge/huge_struct_il_r.ilproj
index bcb4b57f54bdbb..f5b065d62f2d7d 100644
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_struct_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_struct_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_u8.il b/src/tests/JIT/Methodical/Arrays/huge/huge_u8.il
index abdf2a1b4760c2..6d9fe67461da60 100644
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_u8.il
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_u8.il
@@ -27,12 +27,12 @@
   
 }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_huge_u8_huge_il
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends [mscorlib]System.Object
   {
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -469,4 +469,4 @@
     
   } // end of class 'Test'
   
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_huge_u8_huge_il'
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_u8_il_d.ilproj b/src/tests/JIT/Methodical/Arrays/huge/huge_u8_il_d.ilproj
index b5ee3efc0d333c..8c7fc726f20d37 100644
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_u8_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_u8_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_u8_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/huge/huge_u8_il_r.ilproj
index a4bb97162faac4..e9352bee49b968 100644
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_u8_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_u8_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/huge_struct.il b/src/tests/JIT/Methodical/Arrays/huge_struct.il
index f774a4efcb79e1..0abc567d58c036 100644
--- a/src/tests/JIT/Methodical/Arrays/huge_struct.il
+++ b/src/tests/JIT/Methodical/Arrays/huge_struct.il
@@ -22,7 +22,7 @@
 }
 .assembly extern xunit.core {}
 // MVID: {23E3D49B-6CFD-4DA0-8C9D-A611CE0BA103}
-.namespace JitTest
+.namespace JitTest_huge_struct_Arrays_il
 {
   .class value private auto ansi sealed TestStruct extends [mscorlib]System.ValueType
   {
@@ -32,10 +32,10 @@
     .field public unsigned int64[] ul_ptr
   } // end of class 'TestStruct'
   
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends [mscorlib]System.Object
   {
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -44,11 +44,11 @@
       .entrypoint
       // Code size       38 (0x26)
       .maxstack  70
-      .locals init (value class JitTest.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,] matrix,
+      .locals init (value class JitTest_huge_struct_Arrays_il.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,] matrix,
                int32 count,
 			   int32[] dim,
-			   value class JitTest.TestStruct t,
-			   value class JitTest.TestStruct r)
+			   value class JitTest_huge_struct_Arrays_il.TestStruct t,
+			   value class JitTest_huge_struct_Arrays_il.TestStruct r)
 
 
       			ldc.i4	32
@@ -176,7 +176,7 @@
 				ldloc dim ldc.i4 61 ldelem.i4
 				ldloc dim ldc.i4 62 ldelem.i4
 				ldloc dim ldc.i4 63 ldelem.i4
-				newobj		instance void value class JitTest.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::.ctor(
+				newobj		instance void value class JitTest_huge_struct_Arrays_il.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::.ctor(
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
@@ -233,7 +233,7 @@
 				ldloc dim ldc.i4 62 ldelem.i4
 				
       			ldloca	t
-				initobj		JitTest.TestStruct
+				initobj		JitTest_huge_struct_Arrays_il.TestStruct
       			ldloca	t
       			dup
 				ldc.i4	99
@@ -242,14 +242,14 @@
 				ldc.i4  98
 				ldc.r8	8.0
 				stelem.r8
-				stfld	float64[] JitTest.TestStruct::dbl_ptr
+				stfld	float64[] JitTest_huge_struct_Arrays_il.TestStruct::dbl_ptr
 				ldc.i4	0x05071975
-				stfld	int32 JitTest.TestStruct::magic
+				stfld	int32 JitTest_huge_struct_Arrays_il.TestStruct::magic
 
 				call    void [mscorlib]System.GC::Collect()
 
 				ldloc	t
-      			callvirt 	instance void value class JitTest.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Set(
+      			callvirt 	instance void value class JitTest_huge_struct_Arrays_il.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Set(
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
@@ -258,7 +258,7 @@
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
-      					value class JitTest.TestStruct)
+      					value class JitTest_huge_struct_Arrays_il.TestStruct)
 
 				//---------------------------------------------------------------
 				//	Test typed array's Get method
@@ -296,7 +296,7 @@
 				ldloc dim ldc.i4 58 ldelem.i4
 				ldloc dim ldc.i4 60 ldelem.i4
 				ldloc dim ldc.i4 62 ldelem.i4
-      			callvirt 	instance value class JitTest.TestStruct value class JitTest.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Get(
+      			callvirt 	instance value class JitTest_huge_struct_Arrays_il.TestStruct value class JitTest_huge_struct_Arrays_il.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Get(
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
@@ -309,7 +309,7 @@
       			stloc r
       			ldloca r
       			dup
-      			ldfld   float64[] JitTest.TestStruct::dbl_ptr
+      			ldfld   float64[] JitTest_huge_struct_Arrays_il.TestStruct::dbl_ptr
       			ldc.i4 98
       			ldelem.r8
       			ldc.r8 8.0
@@ -318,7 +318,7 @@
       			pop
       			br  throw0
 			next0_0:
-      			ldfld   int32 JitTest.TestStruct::magic
+      			ldfld   int32 JitTest_huge_struct_Arrays_il.TestStruct::magic
       			ldc.i4  0x05071975
       			ceq
       			brfalse throw0
@@ -367,7 +367,7 @@
       			br cont3
       			
       		go1:
-      			callvirt instance value class JitTest.TestStruct value class JitTest.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Get(
+      			callvirt instance value class JitTest_huge_struct_Arrays_il.TestStruct value class JitTest_huge_struct_Arrays_il.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Get(
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
@@ -379,7 +379,7 @@
       			stloc r
       			ldloca r
       			dup
-      			ldfld   float64[] JitTest.TestStruct::dbl_ptr
+      			ldfld   float64[] JitTest_huge_struct_Arrays_il.TestStruct::dbl_ptr
       			ldc.i4 98
       			ldelem.r8
       			ldc.r8 8.0
@@ -388,7 +388,7 @@
       			pop
       			br  throw0
 			next0_1:
-      			ldfld   int32 JitTest.TestStruct::magic
+      			ldfld   int32 JitTest_huge_struct_Arrays_il.TestStruct::magic
       			ldc.i4  0x05071975
       			ceq
       			brfalse throw0
@@ -440,7 +440,7 @@
 				ldloc dim ldc.i4 60 ldelem.i4
 				ldloc dim ldc.i4 62 ldelem.i4
 				ldloc	t
-      			callvirt 	instance void value class JitTest.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Set(
+      			callvirt 	instance void value class JitTest_huge_struct_Arrays_il.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Set(
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
@@ -449,7 +449,7 @@
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
-      					value class JitTest.TestStruct)
+      					value class JitTest_huge_struct_Arrays_il.TestStruct)
       			ldnull
       			stloc matrix
       			call void [mscorlib]System.GC::Collect()
@@ -500,7 +500,7 @@
 				ldloc dim ldc.i4 58 ldelem.i4
 				ldloc dim ldc.i4 60 ldelem.i4
 				ldloc dim ldc.i4 62 ldelem.i4
-      			callvirt instance value class JitTest.TestStruct& value class JitTest.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Address(
+      			callvirt instance value class JitTest_huge_struct_Arrays_il.TestStruct& value class JitTest_huge_struct_Arrays_il.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Address(
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
@@ -510,7 +510,7 @@
       					int32, int32, int32, int32,
       					int32, int32, int32, int32)
       			dup
-      			ldfld   float64[] JitTest.TestStruct::dbl_ptr
+      			ldfld   float64[] JitTest_huge_struct_Arrays_il.TestStruct::dbl_ptr
       			ldc.i4 98
       			ldelem.r8
       			ldc.r8 8.0
@@ -519,7 +519,7 @@
       			pop
       			br  throw0
 			next0_2:
-      			ldfld   int32 JitTest.TestStruct::magic
+      			ldfld   int32 JitTest_huge_struct_Arrays_il.TestStruct::magic
       			ldc.i4  0x05071975
       			ceq
       			brfalse throw0
@@ -541,5 +541,5 @@
     
   } // end of class 'Test'
   
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_huge_struct_Arrays_il'
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/Arrays/huge_struct.ilproj b/src/tests/JIT/Methodical/Arrays/huge_struct.ilproj
index ad153de1e4815a..41a797bc4ff98d 100644
--- a/src/tests/JIT/Methodical/Arrays/huge_struct.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/huge_struct.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcs.cs b/src/tests/JIT/Methodical/Arrays/lcs/lcs.cs
index 05ab3b9a4ef2d1..c61ef112134d5e 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcs.cs
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcs.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_lcs_lcs_cs
 {
-    internal class LCS
+    public class LCS
     {
         private const int RANK = 4;
 
@@ -82,7 +83,8 @@ private static void findLCS(int[,,,] c, int[,,,] b, char[][] seq, int[] len)
             }
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             Console.WriteLine("Test searches for longest common subsequence of 4 strings\n\n");
             String[] str = new String[RANK] {
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcs2.cs b/src/tests/JIT/Methodical/Arrays/lcs/lcs2.cs
index 1345b3aac54b52..cfe3cc8e462697 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcs2.cs
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcs2.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_lcs2_lcs_cs
 {
-    internal class LCS
+    public class LCS
     {
         private const int RANK = 4;
 
@@ -82,7 +83,8 @@ private static void findLCS(ref int[][][][] c, ref int[][][][] b, ref char[][] s
             }
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             Console.WriteLine("Test searches for longest common subsequence of 4 strings\n\n");
             String[] str = {
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcs2_d.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcs2_d.csproj
index f8177935821665..651e6852855d04 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcs2_d.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcs2_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcs2_do.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcs2_do.csproj
index b862db8362a801..fe62ea39c1b6b5 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcs2_do.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcs2_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcs2_r.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcs2_r.csproj
index 6b7ddc76b585d7..b14635dffb49ed 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcs2_r.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcs2_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcs2_ro.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcs2_ro.csproj
index d48435b7572c1a..90a603bda84af9 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcs2_ro.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcs2_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcs_lcs_d.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcs_lcs_d.csproj
index 5bbd9d21654ea7..1cf5fa05ed4e81 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcs_lcs_d.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcs_lcs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcs_lcs_do.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcs_lcs_do.csproj
index 63954b94fd25c6..8523d170b69892 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcs_lcs_do.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcs_lcs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcs_lcs_r.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcs_lcs_r.csproj
index 08822aaa374d90..421d1332087229 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcs_lcs_r.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcs_lcs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcs_lcs_ro.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcs_lcs_ro.csproj
index be881386765990..1658068ca8c253 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcs_lcs_ro.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcs_lcs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcs_ldlen.il b/src/tests/JIT/Methodical/Arrays/lcs/lcs_ldlen.il
index 5c7529de4ea8db..b1094afaccfb01 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcs_ldlen.il
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcs_ldlen.il
@@ -23,9 +23,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {52ED7FCA-78F1-42F6-8DE5-7388302AFAA6}
-.namespace JitTest
+.namespace JitTest_lcs_ldlen_lcs_il
 {
-  .class private auto ansi LCS
+  .class public auto ansi LCS
          extends ['mscorlib']System.Object
   {
     .field private static literal int32 RANK = int32(0x00000004)
@@ -114,7 +114,7 @@
       IL_0051:  ldarg.0
       IL_0052:  ldarg.1
       IL_0053:  ldarg.2
-      IL_0054:  call       class System.String JitTest.LCS::buildLCS(int32[0...,0...,0...,0...],
+      IL_0054:  call       class System.String JitTest_lcs_ldlen_lcs_il.LCS::buildLCS(int32[0...,0...,0...,0...],
                                                                      wchar[],
                                                                      int32[])
       IL_0059:  ldarg.1
@@ -197,7 +197,7 @@
       IL_00b8:  ldarg.0
       IL_00b9:  ldarg.1
       IL_00ba:  ldarg.2
-      IL_00bb:  call       class System.String JitTest.LCS::buildLCS(int32[0...,0...,0...,0...],
+      IL_00bb:  call       class System.String JitTest_lcs_ldlen_lcs_il.LCS::buildLCS(int32[0...,0...,0...,0...],
                                                                      wchar[],
                                                                      int32[])
       IL_00c0:  stloc.3
@@ -600,7 +600,7 @@
       IL_0194:  ret
     } // end of method 'LCS::findLCS'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -710,7 +710,7 @@
       IL_0081:  ldloc.s    V_5
       IL_0083:  ldloc.2
       //IL_0084:  ldloc.1
-      IL_0085:  call       void JitTest.LCS::findLCS(int32[0...,0...,0...,0...],
+      IL_0085:  call       void JitTest_lcs_ldlen_lcs_il.LCS::findLCS(int32[0...,0...,0...,0...],
                                                      int32[0...,0...,0...,0...],
                                                      wchar[][])
       IL_008a:  ldc.i4.0
@@ -743,7 +743,7 @@
       IL_00b3:  ldc.i4.0
       IL_00b4:  ldelem.ref
       IL_00b5:  ldloc.1
-      IL_00b6:  call       class System.String JitTest.LCS::buildLCS(int32[0...,0...,0...,0...],
+      IL_00b6:  call       class System.String JitTest_lcs_ldlen_lcs_il.LCS::buildLCS(int32[0...,0...,0...,0...],
                                                                      wchar[],
                                                                      int32[])
       IL_00bb:  call       bool ['mscorlib']System.String::Equals(class System.String,
@@ -778,6 +778,6 @@
 
   } // end of class 'LCS'
 
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_lcs_ldlen_lcs_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcs_ldlen_il_d.ilproj b/src/tests/JIT/Methodical/Arrays/lcs/lcs_ldlen_il_d.ilproj
index 411ad1841e7a21..384d645d83d952 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcs_ldlen_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcs_ldlen_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcs_ldlen_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/lcs/lcs_ldlen_il_r.ilproj
index 19a4fa59d199ac..9db558bf08a2da 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcs_ldlen_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcs_ldlen_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsbas.cs b/src/tests/JIT/Methodical/Arrays/lcs/lcsbas.cs
index aa4c51b28c6c46..5c2eeb7721367e 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsbas.cs
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsbas.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_lcsbas_lcs_cs
 {
-    internal class LCS
+    public class LCS
     {
         private const int RANK = 4;
 
@@ -106,7 +107,8 @@ private static void findLCS(int[,,,] c, int[,,,] b, char[][] seq, int[] len)
             }
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             Console.WriteLine("Test searches for longest common subsequence of 4 strings\n\n");
             String[] str = new String[RANK] {
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsbas_d.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcsbas_d.csproj
index 92554f1f1070cc..0e9f76de538271 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsbas_d.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsbas_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsbas_do.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcsbas_do.csproj
index 00561c71ffd49d..1981cc9bb00dba 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsbas_do.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsbas_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsbas_r.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcsbas_r.csproj
index 14b58bc07892f8..7f9ef6e0aacc7d 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsbas_r.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsbas_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsbas_ro.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcsbas_ro.csproj
index f3efe433108288..3cc2117f7ce6e8 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsbas_ro.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsbas_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsbox.cs b/src/tests/JIT/Methodical/Arrays/lcs/lcsbox.cs
index b8c21e07f351a3..72807d02ca36ff 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsbox.cs
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsbox.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_lcsbox_lcs_cs
 {
-    internal class LCS
+    public class LCS
     {
         private const int RANK = 4;
 
@@ -82,7 +83,8 @@ private static void findLCS(int[,,,] c, int[,,,] b, char[][] seq, int[] len)
             }
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             Console.WriteLine("Test searches for longest common subsequence of 4 strings\n\n");
             String[] str = new String[RANK] {
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsbox_d.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcsbox_d.csproj
index 9bfd86e0ec3744..97b05853f1d546 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsbox_d.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsbox_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsbox_do.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcsbox_do.csproj
index fcc7f0192bbc1e..adf15757935b00 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsbox_do.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsbox_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsbox_r.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcsbox_r.csproj
index 588c1e65e8831c..a73777348a4123 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsbox_r.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsbox_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsbox_ro.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcsbox_ro.csproj
index 5a7134ab0a5c6d..8447615d9efad4 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsbox_ro.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsbox_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsmax.cs b/src/tests/JIT/Methodical/Arrays/lcs/lcsmax.cs
index 2aa9e9db0af632..875bc8f6eaae30 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsmax.cs
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsmax.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_lcsmax_lcs_cs
 {
-    internal class LCS
+    public class LCS
     {
         private const int RANK = 8;
 
@@ -87,7 +88,8 @@ private static void findLCS(int[,,,,,,,] c, int[,,,,,,,] b, char[][] seq, int[]
             }
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             Console.WriteLine("Test searches for longest common subsequence of 8 strings\n\n");
             String[] str = new String[RANK] {
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsmax_d.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcsmax_d.csproj
index 460340bda323e5..e6bbe6c02995bc 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsmax_d.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsmax_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsmax_do.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcsmax_do.csproj
index a27750d28654cd..0a019dbbc7b99a 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsmax_do.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsmax_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsmax_r.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcsmax_r.csproj
index a99f2e5731fcf1..1e17a021ce43d1 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsmax_r.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsmax_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsmax_ro.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcsmax_ro.csproj
index 111bf6e2c0d674..0e0ceee089fe89 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsmax_ro.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsmax_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsmixed.cs b/src/tests/JIT/Methodical/Arrays/lcs/lcsmixed.cs
index c8742adf5279a8..6a90978d9365c0 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsmixed.cs
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsmixed.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_lcsmixed_lcs_cs
 {
-    internal class LCS
+    public class LCS
     {
         private const int RANK = 8;
 
@@ -87,7 +88,8 @@ private static void findLCS(int[,,,][,,,] c, int[,][,][,][,] b, char[][] seq, in
             }
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             Console.WriteLine("Test searches for longest common subsequence of 8 strings\n\n");
             String[] str = {
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsmixed_d.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcsmixed_d.csproj
index da88bbcd34111c..9d0713c333c1bb 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsmixed_d.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsmixed_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsmixed_do.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcsmixed_do.csproj
index d720893f3cd0be..d44ee7bc77e64e 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsmixed_do.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsmixed_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsmixed_r.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcsmixed_r.csproj
index 599921301e8497..d33f975222bd2f 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsmixed_r.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsmixed_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsmixed_ro.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcsmixed_ro.csproj
index a8e456b2ef364e..045eebc682c13f 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsmixed_ro.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsmixed_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsval.cs b/src/tests/JIT/Methodical/Arrays/lcs/lcsval.cs
index 8658356aa36ae8..cebc53e7aacaf8 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsval.cs
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsval.cs
@@ -2,15 +2,16 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_lcsval_lcs_cs
 {
     internal struct Data
     {
         public int b, c;
     };
 
-    internal class LCS
+    public class LCS
     {
         private const int RANK = 4;
 
@@ -87,7 +88,8 @@ private static void findLCS(Data[,,,] mtx, char[][] seq, int[] len)
             }
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             Console.WriteLine("Test searches for longest common subsequence of 4 strings\n\n");
             String[] str = new String[RANK] {
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsval_d.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcsval_d.csproj
index 65b6c704429680..256916584879d6 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsval_d.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsval_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsval_do.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcsval_do.csproj
index 4964547a242c9a..0860ba2ca12582 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsval_do.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsval_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsval_r.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcsval_r.csproj
index 16b9e015d7a56f..224885505decca 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsval_r.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsval_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsval_ro.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcsval_ro.csproj
index fc65f9a3e0f0d5..bd95a12e7a8f4d 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsval_ro.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsval_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsvalbox.cs b/src/tests/JIT/Methodical/Arrays/lcs/lcsvalbox.cs
index 5b281fa80cb8b5..4653fcc67d29ef 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsvalbox.cs
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsvalbox.cs
@@ -2,15 +2,16 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_lcsvalbox_lcs_cs
 {
     internal struct Data
     {
         public int b, c;
     };
 
-    internal class LCS
+    public class LCS
     {
         private const int RANK = 4;
 
@@ -105,7 +106,8 @@ private static void findLCS(object[,,,] mtx, char[][] seq, int[] len)
             }
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             Console.WriteLine("Test searches for longest common subsequence of 4 strings\n\n");
             String[] str = new String[RANK] {
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsvalbox_d.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcsvalbox_d.csproj
index 4064bb61053fb1..205e5688fbaee1 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsvalbox_d.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsvalbox_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsvalbox_do.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcsvalbox_do.csproj
index 4a16f2c23b1493..236803fbf1d2a0 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsvalbox_do.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsvalbox_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsvalbox_r.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcsvalbox_r.csproj
index adda62bc6c1deb..54e5605516d5d3 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsvalbox_r.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsvalbox_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsvalbox_ro.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcsvalbox_ro.csproj
index cfc3527f000d00..485a8317e52900 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsvalbox_ro.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsvalbox_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/misc/address.il b/src/tests/JIT/Methodical/Arrays/misc/address.il
index 3f8ecc1360d62c..76d4b70de8f2ee 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/address.il
+++ b/src/tests/JIT/Methodical/Arrays/misc/address.il
@@ -20,9 +20,9 @@
 {
 }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_address_misc_il
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends [mscorlib]System.Object
   {
     .method private hidebysig static int32 
@@ -99,7 +99,7 @@
       ret
     } // end of method 'Test::try_index'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -148,43 +148,43 @@
       			ldloc.0
       			ldc.i4		-10000
       			ldc.i4.0
-      			call		int32 JitTest.Test::try_index(int32[10000...10005], int32, int32)
+      			call		int32 JitTest_address_misc_il.Test::try_index(int32[10000...10005], int32, int32)
       			brfalse		Failure
       			
       			ldloc.0
       			ldc.i4.m1
       			ldc.i4.0
-      			call		int32 JitTest.Test::try_index(int32[10000...10005], int32, int32)
+      			call		int32 JitTest_address_misc_il.Test::try_index(int32[10000...10005], int32, int32)
       			brfalse		Failure
       			
       			ldloc.0
       			ldc.i4.0
       			ldc.i4.0
-      			call		int32 JitTest.Test::try_index(int32[10000...10005], int32, int32)
+      			call		int32 JitTest_address_misc_il.Test::try_index(int32[10000...10005], int32, int32)
       			brfalse		Failure
       			
       			ldloc.0
       			ldc.i4.1
       			ldc.i4.0
-      			call		int32 JitTest.Test::try_index(int32[10000...10005], int32, int32)
+      			call		int32 JitTest_address_misc_il.Test::try_index(int32[10000...10005], int32, int32)
       			brfalse		Failure
       			
       			ldloc.0
       			ldc.i4		9999
       			ldc.i4.0
-      			call		int32 JitTest.Test::try_index(int32[10000...10005], int32, int32)
+      			call		int32 JitTest_address_misc_il.Test::try_index(int32[10000...10005], int32, int32)
       			brfalse		Failure
       			
       			ldloc.0
       			ldc.i4		10000
       			ldc.i4.1
-      			call		int32 JitTest.Test::try_index(int32[10000...10005], int32, int32)
+      			call		int32 JitTest_address_misc_il.Test::try_index(int32[10000...10005], int32, int32)
       			brfalse		Failure
       			
       			ldloc.0
       			ldc.i4		10006
       			ldc.i4.0
-      			call		int32 JitTest.Test::try_index(int32[10000...10005], int32, int32)
+      			call		int32 JitTest_address_misc_il.Test::try_index(int32[10000...10005], int32, int32)
       			brfalse		Failure
       			
       			ldloc.0
@@ -192,7 +192,7 @@
       			stloc.0
       			ldc.i4		10005
       			ldc.i4.1
-      			call		int32 JitTest.Test::try_index(int32[10000...10005], int32, int32)
+      			call		int32 JitTest_address_misc_il.Test::try_index(int32[10000...10005], int32, int32)
       			brfalse		Failure
       			
       			ldc.i4    0x64
@@ -218,5 +218,5 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_address_misc_il'
 
diff --git a/src/tests/JIT/Methodical/Arrays/misc/address_il_d.ilproj b/src/tests/JIT/Methodical/Arrays/misc/address_il_d.ilproj
index 0c4d8ed5bb2787..ca690302bacbb7 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/address_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/address_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/misc/address_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/misc/address_il_r.ilproj
index 509fbab284d769..3a4c133b2f425d 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/address_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/address_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/misc/arrres.cs b/src/tests/JIT/Methodical/Arrays/misc/arrres.cs
index 28379fca26b02b..907a0bb0e2de84 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/arrres.cs
+++ b/src/tests/JIT/Methodical/Arrays/misc/arrres.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace GCTest
+namespace GCTest_arrres_cs
 {
-    internal class Test
+    public class Test
     {
         private int _indx;
         public bool m_die = false;
@@ -32,7 +33,8 @@ public virtual void CheckValid()
             }
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             Test1();
             Test2();
diff --git a/src/tests/JIT/Methodical/Arrays/misc/arrres.il b/src/tests/JIT/Methodical/Arrays/misc/arrres.il
index 4374f269a72226..0475dddb3ca8a4 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/arrres.il
+++ b/src/tests/JIT/Methodical/Arrays/misc/arrres.il
@@ -20,14 +20,14 @@
 {
 }
 .assembly extern xunit.core {}
-.namespace GCTest
+.namespace GCTest_arrres_il
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends [mscorlib]System.Object
   {
     .field private int32 m_indx
     .field private int32 m_resCount
-    .field private static class GCTest.Test[-100...100] arr
+    .field private static class GCTest_arrres_il.Test[-100...100] arr
     .method public hidebysig specialname rtspecialname 
             instance void  .ctor(int32 indx) il managed
     {
@@ -36,10 +36,10 @@
       IL_0001:  call       instance void [mscorlib]System.Object::.ctor()
       IL_0006:  ldarg.0
       IL_0007:  ldarg.1
-      IL_0008:  stfld      int32 GCTest.Test::m_indx
+      IL_0008:  stfld      int32 GCTest_arrres_il.Test::m_indx
       IL_000d:  ldarg.0
       IL_000e:  ldc.i4.0
-      IL_000f:  stfld      int32 GCTest.Test::m_resCount
+      IL_000f:  stfld      int32 GCTest_arrres_il.Test::m_resCount
       IL_0014:  ret
     } // end of method 'Test::.ctor'
 
@@ -47,7 +47,7 @@
             instance void CheckValid() il managed
     {
       .maxstack  10
-      IL_0000:  ldsfld     class GCTest.Test[-100...100] GCTest.Test::arr
+      IL_0000:  ldsfld     class GCTest_arrres_il.Test[-100...100] GCTest_arrres_il.Test::arr
                 dup
       			brinst.s   IL_0005
       			
@@ -57,10 +57,10 @@
       			ret
 
       IL_0005:  ldarg.0
-      IL_0006:  ldfld      int32 GCTest.Test::m_indx
+      IL_0006:  ldfld      int32 GCTest_arrres_il.Test::m_indx
       
 
-      IL_000b:  callvirt   instance class GCTest.Test class GCTest.Test[-100...100]::Get(int32)
+      IL_000b:  callvirt   instance class GCTest_arrres_il.Test class GCTest_arrres_il.Test[-100...100]::Get(int32)
       IL_000c:  ldarg.0
       IL_000d:  beq.s      IL_0015
 
@@ -77,11 +77,11 @@
       .locals (string[] V_0,
                int32 V_1)
       			ldarg.0
-      			ldfld      int32 GCTest.Test::m_indx
+      			ldfld      int32 GCTest_arrres_il.Test::m_indx
       			ldc.i4 -10000
       			beq   IL_RET
       			
-      IL_0000:  ldsfld     class GCTest.Test[-100...100] GCTest.Test::arr
+      IL_0000:  ldsfld     class GCTest_arrres_il.Test[-100...100] GCTest_arrres_il.Test::arr
                 dup
       			brinst.s   IL_0005
       			
@@ -91,18 +91,18 @@
       			ret
       
       IL_0005:  ldarg.0
-      IL_0006:  ldfld      int32 GCTest.Test::m_indx
-      IL_000b:  callvirt   instance class GCTest.Test class GCTest.Test[-100...100]::Get(int32)
+      IL_0006:  ldfld      int32 GCTest_arrres_il.Test::m_indx
+      IL_000b:  callvirt   instance class GCTest_arrres_il.Test class GCTest_arrres_il.Test[-100...100]::Get(int32)
       IL_000c:  brfalse.s  IL_0014
 
       IL_000e:  newobj     instance void [mscorlib]System.Exception::.ctor()
       			throw
 
-      IL_0014:  ldsfld     class GCTest.Test[-100...100] GCTest.Test::arr
+      IL_0014:  ldsfld     class GCTest_arrres_il.Test[-100...100] GCTest_arrres_il.Test::arr
       IL_0019:  ldarg.0
-      IL_001a:  ldfld      int32 GCTest.Test::m_indx
+      IL_001a:  ldfld      int32 GCTest_arrres_il.Test::m_indx
       IL_001f:  ldarg.0
-      IL_0020:  callvirt   instance void class GCTest.Test[-100...100]::Set(int32, class GCTest.Test)
+      IL_0020:  callvirt   instance void class GCTest_arrres_il.Test[-100...100]::Set(int32, class GCTest_arrres_il.Test)
       IL_0021:  ldarg.0
       IL_0022:  call       void [mscorlib]System.GC::ReRegisterForFinalize(class [mscorlib]System.Object)
       IL_0027:  ldc.i4.5
@@ -115,7 +115,7 @@
       IL_0036:  ldloc.0
       IL_0037:  ldc.i4.1
       IL_0038:  ldarg.0
-      IL_0039:  ldflda     int32 GCTest.Test::m_indx
+      IL_0039:  ldflda     int32 GCTest_arrres_il.Test::m_indx
       IL_003e:  call       instance string [mscorlib]System.Int32::ToString()
       IL_0043:  stelem.ref
       IL_0044:  ldloc.0
@@ -126,12 +126,12 @@
       IL_004d:  ldc.i4.3
       IL_004e:  ldarg.0
       IL_004f:  dup
-      IL_0050:  ldfld      int32 GCTest.Test::m_resCount
+      IL_0050:  ldfld      int32 GCTest_arrres_il.Test::m_resCount
       IL_0055:  ldc.i4.1
       IL_0056:  add
       IL_0057:  dup
       IL_0058:  stloc.1
-      IL_0059:  stfld      int32 GCTest.Test::m_resCount
+      IL_0059:  stfld      int32 GCTest_arrres_il.Test::m_resCount
       IL_005e:  ldloc.1
       IL_005f:  stloc.1
       IL_0060:  ldloca.s   V_1
@@ -148,7 +148,7 @@
       IL_007b:  ret
     } // end of method 'Test::Finalize'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -167,11 +167,11 @@
       IL_0002:  stloc.0
       IL_0003:  br.s       IL_0017
 
-      IL_0005:  ldsfld     class GCTest.Test[-100...100] GCTest.Test::arr
+      IL_0005:  ldsfld     class GCTest_arrres_il.Test[-100...100] GCTest_arrres_il.Test::arr
       IL_000a:  ldloc.0
       IL_000b:  ldloc.0
-      IL_000c:  newobj     instance void GCTest.Test::.ctor(int32)
-      IL_0011:  callvirt   instance void class GCTest.Test[-100...100]::Set(int32, class GCTest.Test)
+      IL_000c:  newobj     instance void GCTest_arrres_il.Test::.ctor(int32)
+      IL_0011:  callvirt   instance void class GCTest_arrres_il.Test[-100...100]::Set(int32, class GCTest_arrres_il.Test)
       IL_0012:  ldloc.0
       IL_0013:  ldc.i4.s   50
       IL_0015:  add
@@ -188,23 +188,23 @@
       IL_002d:  stloc.1
       IL_002e:  br.s       IL_0058
 
-      IL_0030:  ldsfld     class GCTest.Test[-100...100] GCTest.Test::arr
+      IL_0030:  ldsfld     class GCTest_arrres_il.Test[-100...100] GCTest_arrres_il.Test::arr
       IL_0035:  ldloc.1
-      IL_0036:  callvirt   instance class GCTest.Test class GCTest.Test[-100...100]::Get(int32)
+      IL_0036:  callvirt   instance class GCTest_arrres_il.Test class GCTest_arrres_il.Test[-100...100]::Get(int32)
       IL_0037:  brtrue.s   IL_003f
 
       IL_0039:  newobj     instance void [mscorlib]System.Exception::.ctor()
       IL_003e:  throw
 
-      IL_003f:  ldsfld     class GCTest.Test[-100...100] GCTest.Test::arr
+      IL_003f:  ldsfld     class GCTest_arrres_il.Test[-100...100] GCTest_arrres_il.Test::arr
       IL_0044:  ldloc.1
-      IL_0045:  callvirt   instance class GCTest.Test class GCTest.Test[-100...100]::Get(int32)
-      IL_0046:  callvirt   instance void GCTest.Test::CheckValid()
-      IL_004b:  ldsfld     class GCTest.Test[-100...100] GCTest.Test::arr
+      IL_0045:  callvirt   instance class GCTest_arrres_il.Test class GCTest_arrres_il.Test[-100...100]::Get(int32)
+      IL_0046:  callvirt   instance void GCTest_arrres_il.Test::CheckValid()
+      IL_004b:  ldsfld     class GCTest_arrres_il.Test[-100...100] GCTest_arrres_il.Test::arr
       IL_0050:  ldloc.1
       IL_0051:  ldnull
       
-      IL_0052:  callvirt   instance void class GCTest.Test[-100...100]::Set(int32, class GCTest.Test)
+      IL_0052:  callvirt   instance void class GCTest_arrres_il.Test[-100...100]::Set(int32, class GCTest_arrres_il.Test)
       IL_0053:  ldloc.1
       IL_0054:  ldc.i4.s   50
       IL_0056:  add
@@ -221,22 +221,22 @@
       IL_006e:  stloc.2
       IL_006f:  br.s       IL_0099
 
-      IL_0071:  ldsfld     class GCTest.Test[-100...100] GCTest.Test::arr
+      IL_0071:  ldsfld     class GCTest_arrres_il.Test[-100...100] GCTest_arrres_il.Test::arr
       IL_0076:  ldloc.2
-      IL_0077:  callvirt   instance class GCTest.Test class GCTest.Test[-100...100]::Get(int32)
+      IL_0077:  callvirt   instance class GCTest_arrres_il.Test class GCTest_arrres_il.Test[-100...100]::Get(int32)
       IL_0078:  brtrue.s   IL_0080
 
       IL_007a:  newobj     instance void [mscorlib]System.Exception::.ctor()
       IL_007f:  throw
 
-      IL_0080:  ldsfld     class GCTest.Test[-100...100] GCTest.Test::arr
+      IL_0080:  ldsfld     class GCTest_arrres_il.Test[-100...100] GCTest_arrres_il.Test::arr
       IL_0085:  ldloc.2
-      IL_0086:  callvirt   instance class GCTest.Test class GCTest.Test[-100...100]::Get(int32)
-      IL_0087:  callvirt   instance void GCTest.Test::CheckValid()
-      IL_008c:  ldsfld     class GCTest.Test[-100...100] GCTest.Test::arr
+      IL_0086:  callvirt   instance class GCTest_arrres_il.Test class GCTest_arrres_il.Test[-100...100]::Get(int32)
+      IL_0087:  callvirt   instance void GCTest_arrres_il.Test::CheckValid()
+      IL_008c:  ldsfld     class GCTest_arrres_il.Test[-100...100] GCTest_arrres_il.Test::arr
       IL_0091:  ldloc.2
       IL_0092:  ldnull
-      IL_0093:  callvirt   instance void class GCTest.Test[-100...100]::Set(int32, class GCTest.Test)
+      IL_0093:  callvirt   instance void class GCTest_arrres_il.Test[-100...100]::Set(int32, class GCTest_arrres_il.Test)
       IL_0094:  ldloc.2
       IL_0095:  ldc.i4.s   50
       IL_0097:  add
@@ -252,22 +252,22 @@
       IL_00af:  stloc.3
       IL_00b0:  br.s       IL_00da
 
-      IL_00b2:  ldsfld     class GCTest.Test[-100...100] GCTest.Test::arr
+      IL_00b2:  ldsfld     class GCTest_arrres_il.Test[-100...100] GCTest_arrres_il.Test::arr
       IL_00b7:  ldloc.3
-      IL_00b8:  callvirt   instance class GCTest.Test class GCTest.Test[-100...100]::Get(int32)
+      IL_00b8:  callvirt   instance class GCTest_arrres_il.Test class GCTest_arrres_il.Test[-100...100]::Get(int32)
       IL_00b9:  brtrue.s   IL_00c1
 
       IL_00bb:  newobj     instance void [mscorlib]System.Exception::.ctor()
       IL_00c0:  throw
 
-      IL_00c1:  ldsfld     class GCTest.Test[-100...100] GCTest.Test::arr
+      IL_00c1:  ldsfld     class GCTest_arrres_il.Test[-100...100] GCTest_arrres_il.Test::arr
       IL_00c6:  ldloc.3
-      IL_00c7:  callvirt   instance class GCTest.Test class GCTest.Test[-100...100]::Get(int32)
-      IL_00c8:  callvirt   instance void GCTest.Test::CheckValid()
-      IL_00cd:  ldsfld     class GCTest.Test[-100...100] GCTest.Test::arr
+      IL_00c7:  callvirt   instance class GCTest_arrres_il.Test class GCTest_arrres_il.Test[-100...100]::Get(int32)
+      IL_00c8:  callvirt   instance void GCTest_arrres_il.Test::CheckValid()
+      IL_00cd:  ldsfld     class GCTest_arrres_il.Test[-100...100] GCTest_arrres_il.Test::arr
       IL_00d2:  ldloc.3
       IL_00d3:  ldnull
-      IL_00d4:  callvirt   instance void class GCTest.Test[-100...100]::Set(int32, class GCTest.Test)
+      IL_00d4:  callvirt   instance void class GCTest_arrres_il.Test[-100...100]::Set(int32, class GCTest_arrres_il.Test)
       IL_00d5:  ldloc.3
       IL_00d6:  ldc.i4.s   50
       IL_00d8:  add
@@ -283,22 +283,22 @@
       IL_00f0:  stloc.s    V_4
       IL_00f2:  br.s       IL_0121
 
-      IL_00f4:  ldsfld     class GCTest.Test[-100...100] GCTest.Test::arr
+      IL_00f4:  ldsfld     class GCTest_arrres_il.Test[-100...100] GCTest_arrres_il.Test::arr
       IL_00f9:  ldloc.s    V_4
-      IL_00fb:  callvirt   instance class GCTest.Test class GCTest.Test[-100...100]::Get(int32)
+      IL_00fb:  callvirt   instance class GCTest_arrres_il.Test class GCTest_arrres_il.Test[-100...100]::Get(int32)
       IL_00fc:  brtrue.s   IL_0104
 
       IL_00fe:  newobj     instance void [mscorlib]System.Exception::.ctor()
       IL_0103:  throw
 
-      IL_0104:  ldsfld     class GCTest.Test[-100...100] GCTest.Test::arr
+      IL_0104:  ldsfld     class GCTest_arrres_il.Test[-100...100] GCTest_arrres_il.Test::arr
       IL_0109:  ldloc.s    V_4
-      IL_010b:  callvirt   instance class GCTest.Test class GCTest.Test[-100...100]::Get(int32)
-      IL_010c:  callvirt   instance void GCTest.Test::CheckValid()
-      IL_0111:  ldsfld     class GCTest.Test[-100...100] GCTest.Test::arr
+      IL_010b:  callvirt   instance class GCTest_arrres_il.Test class GCTest_arrres_il.Test[-100...100]::Get(int32)
+      IL_010c:  callvirt   instance void GCTest_arrres_il.Test::CheckValid()
+      IL_0111:  ldsfld     class GCTest_arrres_il.Test[-100...100] GCTest_arrres_il.Test::arr
       IL_0116:  ldloc.s    V_4
       IL_0118:  ldnull
-      IL_0119:  callvirt   instance void class GCTest.Test[-100...100]::Set(int32, class GCTest.Test)
+      IL_0119:  callvirt   instance void class GCTest_arrres_il.Test[-100...100]::Set(int32, class GCTest_arrres_il.Test)
       IL_011a:  ldloc.s    V_4
       IL_011c:  ldc.i4.s   50
       IL_011e:  add
@@ -314,9 +314,9 @@
       IL_0138:  stloc.s    V_5
       IL_013a:  br.s       IL_0169
 
-      IL_013c:  ldsfld     class GCTest.Test[-100...100] GCTest.Test::arr
+      IL_013c:  ldsfld     class GCTest_arrres_il.Test[-100...100] GCTest_arrres_il.Test::arr
       IL_0141:  ldloc.s    V_5
-      IL_0143:  callvirt   instance class GCTest.Test class GCTest.Test[-100...100]::Get(int32)
+      IL_0143:  callvirt   instance class GCTest_arrres_il.Test class GCTest_arrres_il.Test[-100...100]::Get(int32)
       IL_0144:  brtrue.s   IL_014c
 
                 ldstr      "Warning: object at index "
@@ -327,18 +327,18 @@
 				call       void [System.Console]System.Console::WriteLine(string)
 				br.s       IL_0162
 		
-      IL_014c:  ldsfld     class GCTest.Test[-100...100] GCTest.Test::arr
+      IL_014c:  ldsfld     class GCTest_arrres_il.Test[-100...100] GCTest_arrres_il.Test::arr
       IL_0151:  ldloc.s    V_5
-      IL_0153:  callvirt   instance class GCTest.Test class GCTest.Test[-100...100]::Get(int32)
+      IL_0153:  callvirt   instance class GCTest_arrres_il.Test class GCTest_arrres_il.Test[-100...100]::Get(int32)
       			dup
-      IL_0154:  callvirt   instance void GCTest.Test::CheckValid()
+      IL_0154:  callvirt   instance void GCTest_arrres_il.Test::CheckValid()
       			ldc.i4 		-10000
-      			stfld      int32 GCTest.Test::m_indx
+      			stfld      int32 GCTest_arrres_il.Test::m_indx
       
-      IL_0159:  ldsfld     class GCTest.Test[-100...100] GCTest.Test::arr
+      IL_0159:  ldsfld     class GCTest_arrres_il.Test[-100...100] GCTest_arrres_il.Test::arr
       IL_015e:  ldloc.s    V_5
       IL_0160:  ldnull
-      IL_0161:  callvirt   instance void class GCTest.Test[-100...100]::Set(int32, class GCTest.Test)
+      IL_0161:  callvirt   instance void class GCTest_arrres_il.Test[-100...100]::Set(int32, class GCTest_arrres_il.Test)
       
       IL_0162:  ldloc.s    V_5
       IL_0164:  ldc.i4.s   50
@@ -349,7 +349,7 @@
       IL_016d:  ble.s      IL_013c
 
 				ldnull
-				stsfld     class GCTest.Test[-100...100] GCTest.Test::arr
+				stsfld     class GCTest_arrres_il.Test[-100...100] GCTest_arrres_il.Test::arr
 				
       IL_016f:  ldstr      "Test passed."
       IL_0174:  call       void [System.Console]System.Console::WriteLine(string)
@@ -367,12 +367,12 @@
       .maxstack  8
       			ldc.i4 -100
       			ldc.i4 201
-      			newobj      instance void class GCTest.Test[-100...100]::.ctor(int32, int32)
-      IL_0007:  stsfld     class GCTest.Test[-100...100] GCTest.Test::arr
+      			newobj      instance void class GCTest_arrres_il.Test[-100...100]::.ctor(int32, int32)
+      IL_0007:  stsfld     class GCTest_arrres_il.Test[-100...100] GCTest_arrres_il.Test::arr
       IL_000c:  ret
     } // end of method 'Test::.cctor'
 
   } // end of class 'Test'
 
-} // end of namespace 'GCTest'
+} // end of namespace 'GCTest_arrres_il'
 
diff --git a/src/tests/JIT/Methodical/Arrays/misc/arrres_d.csproj b/src/tests/JIT/Methodical/Arrays/misc/arrres_d.csproj
index 25fa17fe004b56..b31476f1f9edc8 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/arrres_d.csproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/arrres_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/misc/arrres_do.csproj b/src/tests/JIT/Methodical/Arrays/misc/arrres_do.csproj
index cf42b4d565e0cf..eb72b061372392 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/arrres_do.csproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/arrres_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/misc/arrres_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/misc/arrres_il_r.ilproj
index f40732f5ba2e9e..a6bfeac6a7b862 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/arrres_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/arrres_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/misc/arrres_r.csproj b/src/tests/JIT/Methodical/Arrays/misc/arrres_r.csproj
index f899f3813137fe..336061e896cbfe 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/arrres_r.csproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/arrres_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/misc/arrres_ro.csproj b/src/tests/JIT/Methodical/Arrays/misc/arrres_ro.csproj
index 27994eb220754c..250a14512a2666 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/arrres_ro.csproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/arrres_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/misc/gcarr.cs b/src/tests/JIT/Methodical/Arrays/misc/gcarr.cs
index 4724c971d96bed..7a130e78844006 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/gcarr.cs
+++ b/src/tests/JIT/Methodical/Arrays/misc/gcarr.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace GCTest
+namespace GCTest_gcarr_cs
 {
-    internal class Test
+    public class Test
     {
         private int _magic = 0x12345678;
         public virtual void CheckValid()
@@ -14,7 +15,8 @@ public virtual void CheckValid()
                 throw new Exception();
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             Test[] arr = new Test[97];
             for (int i = 0; i < 97; i++)
diff --git a/src/tests/JIT/Methodical/Arrays/misc/gcarr.il b/src/tests/JIT/Methodical/Arrays/misc/gcarr.il
index 2341ecc369d3c2..0d983860efffb5 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/gcarr.il
+++ b/src/tests/JIT/Methodical/Arrays/misc/gcarr.il
@@ -20,9 +20,9 @@
 {
 }
 .assembly extern xunit.core {}
-.namespace GCTest
+.namespace GCTest_gcarr_il
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends [mscorlib]System.Object
   {
     .field private int32 m_magic
@@ -30,7 +30,7 @@
     {
       .maxstack  8
       IL_0000:  ldarg.0
-      IL_0001:  ldfld      int32 GCTest.Test::m_magic
+      IL_0001:  ldfld      int32 GCTest_gcarr_il.Test::m_magic
       IL_0006:  ldc.i4     0x12345678
       IL_000b:  beq.s      IL_0013
 
@@ -40,7 +40,7 @@
       IL_0013:  ret
     } // end of method 'Test::CheckValid'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -48,13 +48,13 @@
       )
       .entrypoint
       .maxstack  3
-      .locals (class GCTest.Test[-10...10] V_0,
+      .locals (class GCTest_gcarr_il.Test[-10...10] V_0,
                int32 V_1,
                int32 V_2,
                int32 V_3)
       			ldc.i4 -10
       			ldc.i4 21
-      			newobj      instance void class GCTest.Test[-10...10]::.ctor(int32, int32)
+      			newobj      instance void class GCTest_gcarr_il.Test[-10...10]::.ctor(int32, int32)
       IL_0007:  stloc.0
       IL_0008:  ldc.i4	-10
       IL_0009:  stloc.1
@@ -64,8 +64,8 @@
       IL_000d:  ldloc.1
       			dup
       			call		void [System.Console]System.Console::WriteLine(int32)
-      IL_000e:  newobj     instance void GCTest.Test::.ctor()
-      			callvirt   instance void class GCTest.Test[-10...10]::Set(int32, class GCTest.Test)
+      IL_000e:  newobj     instance void GCTest_gcarr_il.Test::.ctor()
+      			callvirt   instance void class GCTest_gcarr_il.Test[-10...10]::Set(int32, class GCTest_gcarr_il.Test)
       IL_0014:  ldloc.1
       IL_0015:  ldc.i4.1
       IL_0016:  add
@@ -83,9 +83,9 @@
 
       IL_0030:  ldloc.0
       IL_0031:  ldloc.2
-      			callvirt   instance class GCTest.Test class GCTest.Test[-10...10]::Get(int32)
+      			callvirt   instance class GCTest_gcarr_il.Test class GCTest_gcarr_il.Test[-10...10]::Get(int32)
       			
-      IL_0033:  callvirt   instance void GCTest.Test::CheckValid()
+      IL_0033:  callvirt   instance void GCTest_gcarr_il.Test::CheckValid()
       IL_0038:  ldloc.2
       IL_0039:  ldc.i4.1
       IL_003a:  add
@@ -115,7 +115,7 @@
       .maxstack  8
       IL_0000:  ldarg.0
       IL_0001:  ldc.i4     0x12345678
-      IL_0006:  stfld      int32 GCTest.Test::m_magic
+      IL_0006:  stfld      int32 GCTest_gcarr_il.Test::m_magic
       IL_000b:  ldarg.0
       IL_000c:  call       instance void [mscorlib]System.Object::.ctor()
       IL_0011:  ret
@@ -123,5 +123,5 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'GCTest'
+} // end of namespace 'GCTest_gcarr_il'
 
diff --git a/src/tests/JIT/Methodical/Arrays/misc/gcarr_d.csproj b/src/tests/JIT/Methodical/Arrays/misc/gcarr_d.csproj
index 8a3e5b12929af3..d76984171f00aa 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/gcarr_d.csproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/gcarr_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/misc/gcarr_do.csproj b/src/tests/JIT/Methodical/Arrays/misc/gcarr_do.csproj
index 23904d3c5ddaaa..ce031e21e83111 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/gcarr_do.csproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/gcarr_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/misc/gcarr_il_d.ilproj b/src/tests/JIT/Methodical/Arrays/misc/gcarr_il_d.ilproj
index 7d36f5b50c7dfa..494b2846b684a9 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/gcarr_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/gcarr_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/misc/gcarr_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/misc/gcarr_il_r.ilproj
index 0dda3af06e5fad..0cfe7445a4ceab 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/gcarr_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/gcarr_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/misc/gcarr_r.csproj b/src/tests/JIT/Methodical/Arrays/misc/gcarr_r.csproj
index c7d4aa3058a9d4..ffc02501184504 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/gcarr_r.csproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/gcarr_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/misc/gcarr_ro.csproj b/src/tests/JIT/Methodical/Arrays/misc/gcarr_ro.csproj
index 1b5922fe48d3ee..46389d69bf8a63 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/gcarr_ro.csproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/gcarr_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/misc/initializearray.il b/src/tests/JIT/Methodical/Arrays/misc/initializearray.il
index 82fbad3f6b1000..214517c2982777 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/initializearray.il
+++ b/src/tests/JIT/Methodical/Arrays/misc/initializearray.il
@@ -18,9 +18,9 @@
 .subsystem 0x0003       // WINDOWS_CUI
 .corflags 0x00000001    // ILONLY
 
-.class private auto ansi beforefieldinit InitializeArray extends [mscorlib]System.Object
+.class public auto ansi beforefieldinit InitializeArray extends [mscorlib]System.Object
 {
-  .method private hidebysig static int32 Main() cil managed
+  .method public hidebysig static int32 Main() cil managed
   {
     .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
         01 00 00 00
diff --git a/src/tests/JIT/Methodical/Arrays/misc/initializearray_enum.il b/src/tests/JIT/Methodical/Arrays/misc/initializearray_enum.il
index f16a742294e447..d495248f16eda4 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/initializearray_enum.il
+++ b/src/tests/JIT/Methodical/Arrays/misc/initializearray_enum.il
@@ -96,7 +96,7 @@ class My {
   .field public static literal valuetype Color Blue = int32(0x00000002)
 } // end of class Color
 
-.class private auto ansi beforefieldinit My
+.class public auto ansi beforefieldinit My
        extends [mscorlib]System.Object
 {
   .method private hidebysig static valuetype Color[] 
@@ -127,7 +127,7 @@ class My {
     IL_0011:  ret
   } // end of method My::WithMinOpts
 
-  .method private hidebysig static int32 
+  .method public hidebysig static int32 
           Main() cil managed
   {
     .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
diff --git a/src/tests/JIT/Methodical/Arrays/misc/initializearray_enum_il_d.ilproj b/src/tests/JIT/Methodical/Arrays/misc/initializearray_enum_il_d.ilproj
index 82778fa3c95a23..e2f9d6a08e0314 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/initializearray_enum_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/initializearray_enum_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/misc/initializearray_enum_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/misc/initializearray_enum_il_r.ilproj
index 2a6d91a40f8213..f26b6b3066bc40 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/initializearray_enum_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/initializearray_enum_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/misc/initializearray_il_d.ilproj b/src/tests/JIT/Methodical/Arrays/misc/initializearray_il_d.ilproj
index dc93ec95205d99..cd43457cf41f16 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/initializearray_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/initializearray_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <DebugType>Full</DebugType>
     <Optimize>false</Optimize>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/misc/initializearray_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/misc/initializearray_il_r.ilproj
index 28d452815904a8..573a25a4ab9a38 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/initializearray_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/initializearray_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <Optimize>true</Optimize>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/misc/ldelem_get.il b/src/tests/JIT/Methodical/Arrays/misc/ldelem_get.il
index b43b63976f0719..92e8cb9c0fc448 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/ldelem_get.il
+++ b/src/tests/JIT/Methodical/Arrays/misc/ldelem_get.il
@@ -29,9 +29,9 @@
   
 }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_ldelem_get_misc_il
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends [mscorlib]System.Object
   {
     .method private hidebysig static int32 
@@ -94,7 +94,7 @@
       ret
     } // end of method 'Test::try_index'
 
-    .method private hidebysig static int32 Main() il managed
+    .method public hidebysig static int32 Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
           01 00 00 00
@@ -142,49 +142,49 @@
       			ldloc.0
       			ldc.i4		-10000
       			ldc.i4.0
-      			call		int32 JitTest.Test::try_index(float64[10000...10005], int32, int32)
+      			call		int32 JitTest_ldelem_get_misc_il.Test::try_index(float64[10000...10005], int32, int32)
       			brfalse		Failure
       			
       			ldloc.0
       			ldc.i4.m1
       			ldc.i4.0
-      			call		int32 JitTest.Test::try_index(float64[10000...10005], int32, int32)
+      			call		int32 JitTest_ldelem_get_misc_il.Test::try_index(float64[10000...10005], int32, int32)
       			brfalse		Failure
       			
       			ldloc.0
       			ldc.i4.0
       			ldc.i4.1
-      			call		int32 JitTest.Test::try_index(float64[10000...10005], int32, int32)
+      			call		int32 JitTest_ldelem_get_misc_il.Test::try_index(float64[10000...10005], int32, int32)
       			brfalse		Failure
       			
       			ldloc.0
       			ldc.i4.1
       			ldc.i4.1
-      			call		int32 JitTest.Test::try_index(float64[10000...10005], int32, int32)
+      			call		int32 JitTest_ldelem_get_misc_il.Test::try_index(float64[10000...10005], int32, int32)
       			brfalse		Failure
       			
       			ldloc.0
       			ldc.i4		5
       			ldc.i4.1
-      			call		int32 JitTest.Test::try_index(float64[10000...10005], int32, int32)
+      			call		int32 JitTest_ldelem_get_misc_il.Test::try_index(float64[10000...10005], int32, int32)
       			brfalse		Failure
       			
       			ldloc.0
       			ldc.i4		6
       			ldc.i4.0
-      			call		int32 JitTest.Test::try_index(float64[10000...10005], int32, int32)
+      			call		int32 JitTest_ldelem_get_misc_il.Test::try_index(float64[10000...10005], int32, int32)
       			brfalse		Failure
       			
       			ldloc.0
       			ldc.i4		10005
       			ldc.i4.0
-      			call		int32 JitTest.Test::try_index(float64[10000...10005], int32, int32)
+      			call		int32 JitTest_ldelem_get_misc_il.Test::try_index(float64[10000...10005], int32, int32)
       			brfalse		Failure
       			
       			ldloc.0
       			ldc.i4		10006
       			ldc.i4.0
-      			call		int32 JitTest.Test::try_index(float64[10000...10005], int32, int32)
+      			call		int32 JitTest_ldelem_get_misc_il.Test::try_index(float64[10000...10005], int32, int32)
       			brfalse		Failure
       			
       			ldc.i4    0x64
@@ -210,5 +210,5 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_ldelem_get_misc_il'
 
diff --git a/src/tests/JIT/Methodical/Arrays/misc/ldelem_get_il_d.ilproj b/src/tests/JIT/Methodical/Arrays/misc/ldelem_get_il_d.ilproj
index fe625754b56842..855e4d8f6ec2f3 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/ldelem_get_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/ldelem_get_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/misc/ldelem_get_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/misc/ldelem_get_il_r.ilproj
index 8548cbc0d3f57a..3a4dcb67f93132 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/ldelem_get_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/ldelem_get_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/misc/length0.il b/src/tests/JIT/Methodical/Arrays/misc/length0.il
index 20287f848a20cc..02cc7714ec1759 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/length0.il
+++ b/src/tests/JIT/Methodical/Arrays/misc/length0.il
@@ -28,9 +28,9 @@
   
 }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_length0_misc_il
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends [mscorlib]System.Object
   {
     .method private hidebysig static int32 
@@ -92,7 +92,7 @@
       ret
     } // end of method 'Test::try_index'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -133,27 +133,27 @@
 	      			ldloc.0
 	      			ldc.i4		-10000
 	      			ldc.i4.0
-	      			call		int32 JitTest.Test::try_index(int32[0...], int32, int32)
+	      			call		int32 JitTest_length0_misc_il.Test::try_index(int32[0...], int32, int32)
 	      			brfalse		Failure
       			ldloc.0
       			ldc.i4.m1
       			ldc.i4.0
-      			call		int32 JitTest.Test::try_index(int32[0...], int32, int32)
+      			call		int32 JitTest_length0_misc_il.Test::try_index(int32[0...], int32, int32)
       			brfalse		Failure
 	      			ldloc.0
 	      			ldc.i4.0
 	      			ldc.i4.0
-	      			call		int32 JitTest.Test::try_index(int32[0...], int32, int32)
+	      			call		int32 JitTest_length0_misc_il.Test::try_index(int32[0...], int32, int32)
 	      			brfalse		Failure
       			ldloc.0
       			ldc.i4.1
       			ldc.i4.0
-      			call		int32 JitTest.Test::try_index(int32[0...], int32, int32)
+      			call		int32 JitTest_length0_misc_il.Test::try_index(int32[0...], int32, int32)
       			brfalse		Failure
 	      			ldloc.0
 	      			ldc.i4		1000
 	      			ldc.i4.0
-	      			call		int32 JitTest.Test::try_index(int32[0...], int32, int32)
+	      			call		int32 JitTest_length0_misc_il.Test::try_index(int32[0...], int32, int32)
 	      			brfalse		Failure
 
       			ldstr     "\nCreating zero-length array (newarr instruction)"
@@ -188,27 +188,27 @@
 	      			ldloc.0
 	      			ldc.i4		-10000
 	      			ldc.i4.0
-	      			call		int32 JitTest.Test::try_index(int32[0...], int32, int32)
+	      			call		int32 JitTest_length0_misc_il.Test::try_index(int32[0...], int32, int32)
 	      			brfalse		Failure
       			ldloc.0
       			ldc.i4.m1
       			ldc.i4.0
-      			call		int32 JitTest.Test::try_index(int32[0...], int32, int32)
+      			call		int32 JitTest_length0_misc_il.Test::try_index(int32[0...], int32, int32)
       			brfalse		Failure
 	      			ldloc.0
 	      			ldc.i4.0
 	      			ldc.i4.0
-	      			call		int32 JitTest.Test::try_index(int32[0...], int32, int32)
+	      			call		int32 JitTest_length0_misc_il.Test::try_index(int32[0...], int32, int32)
 	      			brfalse		Failure
       			ldloc.0
       			ldc.i4.1
       			ldc.i4.0
-      			call		int32 JitTest.Test::try_index(int32[0...], int32, int32)
+      			call		int32 JitTest_length0_misc_il.Test::try_index(int32[0...], int32, int32)
       			brfalse		Failure
 	      			ldloc.0
 	      			ldc.i4		1000
 	      			ldc.i4.0
-	      			call		int32 JitTest.Test::try_index(int32[0...], int32, int32)
+	      			call		int32 JitTest_length0_misc_il.Test::try_index(int32[0...], int32, int32)
 	      			brfalse		Failure
 	      			
       			ldc.i4    0x64
@@ -234,5 +234,5 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_length0_misc_il'
 
diff --git a/src/tests/JIT/Methodical/Arrays/misc/length0_il_d.ilproj b/src/tests/JIT/Methodical/Arrays/misc/length0_il_d.ilproj
index 07ff3eb1e1a543..bb52e31721bd69 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/length0_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/length0_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/misc/length0_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/misc/length0_il_r.ilproj
index 56c6934dcebd01..1f851227d37137 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/length0_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/length0_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/misc/lengthm2.il b/src/tests/JIT/Methodical/Arrays/misc/lengthm2.il
index 65dbcefeda3640..fde5fe5d56cb73 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/lengthm2.il
+++ b/src/tests/JIT/Methodical/Arrays/misc/lengthm2.il
@@ -23,12 +23,12 @@
 }
 .assembly extern xunit.core {}
 // MVID: {23E3D49B-6CFD-4DA0-8C9D-A611CE0BA103}
-.namespace JitTest
+.namespace JitTest_lengthm2_misc_il
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends [mscorlib]System.Object
   {
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
 		.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -99,6 +99,6 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_lengthm2_misc_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/Arrays/misc/lengthm2_il_d.ilproj b/src/tests/JIT/Methodical/Arrays/misc/lengthm2_il_d.ilproj
index 3ba34a79c5b8c6..4bc51020eb8a07 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/lengthm2_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/lengthm2_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/Arrays/misc/lengthm2_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/misc/lengthm2_il_r.ilproj
index 4fcd5806ad2c5f..b7c2a3a23bbe4a 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/lengthm2_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/lengthm2_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/Arrays/misc/selfref.cs b/src/tests/JIT/Methodical/Arrays/misc/selfref.cs
index 3c2f912f6f408c..3ecdb648e1653b 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/selfref.cs
+++ b/src/tests/JIT/Methodical/Arrays/misc/selfref.cs
@@ -2,12 +2,14 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace GCTest
+namespace GCTest_selfref_cs
 {
-    internal class Test
+    public class Test
     {
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             object aref = null;
             object[] arr = new object[16];
diff --git a/src/tests/JIT/Methodical/Arrays/misc/selfref.il b/src/tests/JIT/Methodical/Arrays/misc/selfref.il
index 32ed4e32937e9e..39c02e0b1433d3 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/selfref.il
+++ b/src/tests/JIT/Methodical/Arrays/misc/selfref.il
@@ -23,12 +23,12 @@
 }
 .assembly extern xunit.core {}
 // MVID: {57800D71-6F51-4ACF-BC86-8F3D2FBAC8E1}
-.namespace GCTest
+.namespace GCTest_selfref_il
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends [mscorlib]System.Object
   {
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -141,6 +141,6 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'GCTest'
+} // end of namespace 'GCTest_selfref_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/Arrays/misc/selfref_d.csproj b/src/tests/JIT/Methodical/Arrays/misc/selfref_d.csproj
index 5095d6233e68b8..8f69ff79d00c7c 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/selfref_d.csproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/selfref_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/misc/selfref_do.csproj b/src/tests/JIT/Methodical/Arrays/misc/selfref_do.csproj
index 013b312ad8f328..f3bc3de00dcf67 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/selfref_do.csproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/selfref_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/misc/selfref_il_d.ilproj b/src/tests/JIT/Methodical/Arrays/misc/selfref_il_d.ilproj
index 89b3aff4fe7278..f7f419cb49bb00 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/selfref_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/selfref_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/misc/selfref_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/misc/selfref_il_r.ilproj
index 5f179d693da007..2abc470fa10a94 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/selfref_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/selfref_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/misc/selfref_r.csproj b/src/tests/JIT/Methodical/Arrays/misc/selfref_r.csproj
index 262a84742c06ad..f7edda42ad5742 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/selfref_r.csproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/selfref_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/misc/selfref_ro.csproj b/src/tests/JIT/Methodical/Arrays/misc/selfref_ro.csproj
index 3aab23b8de91b6..394cbcfd1a9846 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/selfref_ro.csproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/selfref_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Arrays/range/negIndexRngChkElim.il b/src/tests/JIT/Methodical/Arrays/range/negIndexRngChkElim.il
index 11bae844f16e08..bd9c9b20876085 100644
--- a/src/tests/JIT/Methodical/Arrays/range/negIndexRngChkElim.il
+++ b/src/tests/JIT/Methodical/Arrays/range/negIndexRngChkElim.il
@@ -5,7 +5,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib{auto}
 
-.class ILGEN_0x1d013582 {
+.class public ILGEN_0x1d013582 {
 
 //BEGIN STATIC FIELDS
 .field static	int8 field_0x0
@@ -1451,7 +1451,7 @@ End_Orphan_b_106:
 
  ret
 }
-.method static int32 Main() {
+.method public static int32 Main() {
 .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
     01 00 00 00
 )
diff --git a/src/tests/JIT/Methodical/AsgOp/i4/i4.cs b/src/tests/JIT/Methodical/AsgOp/i4/i4.cs
index 6320ad96b6e14d..fb4dda2b81745f 100644
--- a/src/tests/JIT/Methodical/AsgOp/i4/i4.cs
+++ b/src/tests/JIT/Methodical/AsgOp/i4/i4.cs
@@ -2,8 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-internal class test
+namespace Test_i4_cs
+{
+public class test
 {
     private static int f00(int x, int y)
     {
@@ -666,7 +669,8 @@ private static int f109(int x, int y)
     }
 
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         int x;
         bool pass = true;
@@ -1560,3 +1564,4 @@ public static int Main()
             return 1;
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/AsgOp/i4/i4_cs_d.csproj b/src/tests/JIT/Methodical/AsgOp/i4/i4_cs_d.csproj
index 68a1d48bc28c40..05c0eee6054e1d 100644
--- a/src/tests/JIT/Methodical/AsgOp/i4/i4_cs_d.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/i4/i4_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/AsgOp/i4/i4_cs_do.csproj b/src/tests/JIT/Methodical/AsgOp/i4/i4_cs_do.csproj
index 50a777bd135918..ba70fafb90d05c 100644
--- a/src/tests/JIT/Methodical/AsgOp/i4/i4_cs_do.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/i4/i4_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/AsgOp/i4/i4_cs_r.csproj b/src/tests/JIT/Methodical/AsgOp/i4/i4_cs_r.csproj
index c1088014e9b783..010aada021b848 100644
--- a/src/tests/JIT/Methodical/AsgOp/i4/i4_cs_r.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/i4/i4_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/AsgOp/i4/i4_cs_ro.csproj b/src/tests/JIT/Methodical/AsgOp/i4/i4_cs_ro.csproj
index a86937f950005c..70647bb039205f 100644
--- a/src/tests/JIT/Methodical/AsgOp/i4/i4_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/i4/i4_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/AsgOp/i4/i4flat.cs b/src/tests/JIT/Methodical/AsgOp/i4/i4flat.cs
index f9d5cda2faa0eb..c1342e077a4e2a 100644
--- a/src/tests/JIT/Methodical/AsgOp/i4/i4flat.cs
+++ b/src/tests/JIT/Methodical/AsgOp/i4/i4flat.cs
@@ -2,10 +2,14 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-internal class test
+namespace Test_i4flat_cs
 {
-    public static int Main()
+public class test
+{
+    [Fact]
+    public static int TestEntryPoint()
     {
         int x;
         int y;
@@ -1121,3 +1125,4 @@ public static int Main()
             return 1;
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/AsgOp/i4/i4flat_cs_d.csproj b/src/tests/JIT/Methodical/AsgOp/i4/i4flat_cs_d.csproj
index cfbf4ee7ef1ed1..0fc81d87794e36 100644
--- a/src/tests/JIT/Methodical/AsgOp/i4/i4flat_cs_d.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/i4/i4flat_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/AsgOp/i4/i4flat_cs_do.csproj b/src/tests/JIT/Methodical/AsgOp/i4/i4flat_cs_do.csproj
index 6877e9f6627e68..b84a9fa27477ec 100644
--- a/src/tests/JIT/Methodical/AsgOp/i4/i4flat_cs_do.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/i4/i4flat_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/AsgOp/i4/i4flat_cs_r.csproj b/src/tests/JIT/Methodical/AsgOp/i4/i4flat_cs_r.csproj
index 4ba1a1696a4dc7..ee8dfddaef6a32 100644
--- a/src/tests/JIT/Methodical/AsgOp/i4/i4flat_cs_r.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/i4/i4flat_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/AsgOp/i4/i4flat_cs_ro.csproj b/src/tests/JIT/Methodical/AsgOp/i4/i4flat_cs_ro.csproj
index 531d01f4f6741d..3d9f0176ec14fd 100644
--- a/src/tests/JIT/Methodical/AsgOp/i4/i4flat_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/i4/i4flat_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/AsgOp/i8/i8.cs b/src/tests/JIT/Methodical/AsgOp/i8/i8.cs
index 75caeb8fd93a7f..329bb3784c9c34 100644
--- a/src/tests/JIT/Methodical/AsgOp/i8/i8.cs
+++ b/src/tests/JIT/Methodical/AsgOp/i8/i8.cs
@@ -2,8 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-internal class test
+namespace Test_i8_cs
+{
+public class test
 {
     private static Int64 f00(Int64 x, Int64 y)
     {
@@ -666,7 +669,8 @@ private static Int64 f109(Int64 x, Int64 y)
     }
 
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         Int64 x;
         bool pass = true;
@@ -1676,3 +1680,4 @@ public static int Main()
             return 1;
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/AsgOp/i8/i8_cs_d.csproj b/src/tests/JIT/Methodical/AsgOp/i8/i8_cs_d.csproj
index 80569fe3b3a64b..637e3cf56d1b20 100644
--- a/src/tests/JIT/Methodical/AsgOp/i8/i8_cs_d.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/i8/i8_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/AsgOp/i8/i8_cs_do.csproj b/src/tests/JIT/Methodical/AsgOp/i8/i8_cs_do.csproj
index 7760c09650f9d5..4a98a6bb5a2e33 100644
--- a/src/tests/JIT/Methodical/AsgOp/i8/i8_cs_do.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/i8/i8_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/AsgOp/i8/i8_cs_r.csproj b/src/tests/JIT/Methodical/AsgOp/i8/i8_cs_r.csproj
index b8fd994fe9b827..d9f20b3c02c2df 100644
--- a/src/tests/JIT/Methodical/AsgOp/i8/i8_cs_r.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/i8/i8_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/AsgOp/i8/i8_cs_ro.csproj b/src/tests/JIT/Methodical/AsgOp/i8/i8_cs_ro.csproj
index 3e437a746eccc5..42d221b2eef547 100644
--- a/src/tests/JIT/Methodical/AsgOp/i8/i8_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/i8/i8_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/AsgOp/i8/i8flat.cs b/src/tests/JIT/Methodical/AsgOp/i8/i8flat.cs
index 76222aa513f6b8..9c8d0920e3dcb7 100644
--- a/src/tests/JIT/Methodical/AsgOp/i8/i8flat.cs
+++ b/src/tests/JIT/Methodical/AsgOp/i8/i8flat.cs
@@ -2,10 +2,14 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-internal class test
+namespace Test_i8flat_cs
 {
-    public static int Main()
+public class test
+{
+    [Fact]
+    public static int TestEntryPoint()
     {
         Int64 x;
         Int64 y;
@@ -1237,3 +1241,4 @@ public static int Main()
             return 1;
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/AsgOp/i8/i8flat_cs_d.csproj b/src/tests/JIT/Methodical/AsgOp/i8/i8flat_cs_d.csproj
index b58c78e9adb433..b87f2512a81220 100644
--- a/src/tests/JIT/Methodical/AsgOp/i8/i8flat_cs_d.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/i8/i8flat_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/AsgOp/i8/i8flat_cs_do.csproj b/src/tests/JIT/Methodical/AsgOp/i8/i8flat_cs_do.csproj
index ffc3f6da89b2e4..1b29e1eb7130cd 100644
--- a/src/tests/JIT/Methodical/AsgOp/i8/i8flat_cs_do.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/i8/i8flat_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/AsgOp/i8/i8flat_cs_r.csproj b/src/tests/JIT/Methodical/AsgOp/i8/i8flat_cs_r.csproj
index dc5d05c7dfa1fa..5dc888527a9325 100644
--- a/src/tests/JIT/Methodical/AsgOp/i8/i8flat_cs_r.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/i8/i8flat_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/AsgOp/i8/i8flat_cs_ro.csproj b/src/tests/JIT/Methodical/AsgOp/i8/i8flat_cs_ro.csproj
index d0c279241a9256..55ff13fc8d6643 100644
--- a/src/tests/JIT/Methodical/AsgOp/i8/i8flat_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/i8/i8flat_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/AsgOp/r4/r4.cs b/src/tests/JIT/Methodical/AsgOp/r4/r4.cs
index d94f838e6e7916..5af3f018592d8b 100644
--- a/src/tests/JIT/Methodical/AsgOp/r4/r4.cs
+++ b/src/tests/JIT/Methodical/AsgOp/r4/r4.cs
@@ -3,8 +3,11 @@
 
 using System;
 using System.Runtime.CompilerServices;
+using Xunit;
 
-internal class test
+namespace Test_r4_cs
+{
+public class test
 {
     [MethodImpl(MethodImplOptions.NoInlining)]
     private static float f00(float x, float y)
@@ -182,7 +185,8 @@ private static float f44(float x, float y)
     }
 
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         float x;
         bool pass = true;
@@ -396,3 +400,4 @@ public static int Main()
             return 1;
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/AsgOp/r4/r4_cs_d.csproj b/src/tests/JIT/Methodical/AsgOp/r4/r4_cs_d.csproj
index 5c7515b0f0f6cd..9f6c87a0df015b 100644
--- a/src/tests/JIT/Methodical/AsgOp/r4/r4_cs_d.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/r4/r4_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/AsgOp/r4/r4_cs_do.csproj b/src/tests/JIT/Methodical/AsgOp/r4/r4_cs_do.csproj
index c03fe5557aa269..e7bad46b084177 100644
--- a/src/tests/JIT/Methodical/AsgOp/r4/r4_cs_do.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/r4/r4_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/AsgOp/r4/r4_cs_r.csproj b/src/tests/JIT/Methodical/AsgOp/r4/r4_cs_r.csproj
index 05faf3938d08eb..53a19494c29cf5 100644
--- a/src/tests/JIT/Methodical/AsgOp/r4/r4_cs_r.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/r4/r4_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/AsgOp/r4/r4_cs_ro.csproj b/src/tests/JIT/Methodical/AsgOp/r4/r4_cs_ro.csproj
index 9c1afa7c544210..e718279daddec2 100644
--- a/src/tests/JIT/Methodical/AsgOp/r4/r4_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/r4/r4_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/AsgOp/r4/r4flat.cs b/src/tests/JIT/Methodical/AsgOp/r4/r4flat.cs
index 740e9e3969ed50..407bac354fb41d 100644
--- a/src/tests/JIT/Methodical/AsgOp/r4/r4flat.cs
+++ b/src/tests/JIT/Methodical/AsgOp/r4/r4flat.cs
@@ -2,10 +2,14 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-internal class test
+namespace Test_r4flat_cs
 {
-    public static int Main()
+public class test
+{
+    [Fact]
+    public static int TestEntryPoint()
     {
         float x;
         float y;
@@ -271,3 +275,4 @@ public static int Main()
             return 1;
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/AsgOp/r4/r4flat_cs_d.csproj b/src/tests/JIT/Methodical/AsgOp/r4/r4flat_cs_d.csproj
index e2548c848078d8..17c9ad7d050caf 100644
--- a/src/tests/JIT/Methodical/AsgOp/r4/r4flat_cs_d.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/r4/r4flat_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/AsgOp/r4/r4flat_cs_do.csproj b/src/tests/JIT/Methodical/AsgOp/r4/r4flat_cs_do.csproj
index a4ff63b59174aa..ccabbdc8860a16 100644
--- a/src/tests/JIT/Methodical/AsgOp/r4/r4flat_cs_do.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/r4/r4flat_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/AsgOp/r4/r4flat_cs_r.csproj b/src/tests/JIT/Methodical/AsgOp/r4/r4flat_cs_r.csproj
index 52460dc637b3cd..c3895441b31cad 100644
--- a/src/tests/JIT/Methodical/AsgOp/r4/r4flat_cs_r.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/r4/r4flat_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/AsgOp/r4/r4flat_cs_ro.csproj b/src/tests/JIT/Methodical/AsgOp/r4/r4flat_cs_ro.csproj
index 2dea1df4e783eb..454bcec299dee1 100644
--- a/src/tests/JIT/Methodical/AsgOp/r4/r4flat_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/r4/r4flat_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/AsgOp/r8/r8.cs b/src/tests/JIT/Methodical/AsgOp/r8/r8.cs
index 746cb95674b338..b922a458472276 100644
--- a/src/tests/JIT/Methodical/AsgOp/r8/r8.cs
+++ b/src/tests/JIT/Methodical/AsgOp/r8/r8.cs
@@ -2,8 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-internal class test
+namespace Test_r8_cs
+{
+public class test
 {
     private static double f00(double x, double y)
     {
@@ -156,7 +159,8 @@ private static double f44(double x, double y)
     }
 
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         double x;
         bool pass = true;
@@ -370,3 +374,4 @@ public static int Main()
             return 1;
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/AsgOp/r8/r8_cs_d.csproj b/src/tests/JIT/Methodical/AsgOp/r8/r8_cs_d.csproj
index 373857fd8e7f6c..55b5a0fd875279 100644
--- a/src/tests/JIT/Methodical/AsgOp/r8/r8_cs_d.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/r8/r8_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/AsgOp/r8/r8_cs_do.csproj b/src/tests/JIT/Methodical/AsgOp/r8/r8_cs_do.csproj
index cae872684f87d0..5b2b328e028dfd 100644
--- a/src/tests/JIT/Methodical/AsgOp/r8/r8_cs_do.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/r8/r8_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/AsgOp/r8/r8_cs_r.csproj b/src/tests/JIT/Methodical/AsgOp/r8/r8_cs_r.csproj
index 195ce7e88c938e..6bf2b5c2c0d0fe 100644
--- a/src/tests/JIT/Methodical/AsgOp/r8/r8_cs_r.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/r8/r8_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/AsgOp/r8/r8_cs_ro.csproj b/src/tests/JIT/Methodical/AsgOp/r8/r8_cs_ro.csproj
index 58a1e7184b52a5..b8bcdae4a3b365 100644
--- a/src/tests/JIT/Methodical/AsgOp/r8/r8_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/r8/r8_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/AsgOp/r8/r8flat.cs b/src/tests/JIT/Methodical/AsgOp/r8/r8flat.cs
index 6a5f623bfa721e..589832c58ab87f 100644
--- a/src/tests/JIT/Methodical/AsgOp/r8/r8flat.cs
+++ b/src/tests/JIT/Methodical/AsgOp/r8/r8flat.cs
@@ -2,10 +2,14 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-internal class test
+namespace Test_r8flat_cs
 {
-    public static int Main()
+public class test
+{
+    [Fact]
+    public static int TestEntryPoint()
     {
         double x;
         double y;
@@ -271,3 +275,4 @@ public static int Main()
             return 1;
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/AsgOp/r8/r8flat_cs_d.csproj b/src/tests/JIT/Methodical/AsgOp/r8/r8flat_cs_d.csproj
index 83abbaee0cb4ac..6a5ab9d69119d2 100644
--- a/src/tests/JIT/Methodical/AsgOp/r8/r8flat_cs_d.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/r8/r8flat_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/AsgOp/r8/r8flat_cs_do.csproj b/src/tests/JIT/Methodical/AsgOp/r8/r8flat_cs_do.csproj
index 26af1b3a683926..26f4d51aa87fb4 100644
--- a/src/tests/JIT/Methodical/AsgOp/r8/r8flat_cs_do.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/r8/r8flat_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/AsgOp/r8/r8flat_cs_r.csproj b/src/tests/JIT/Methodical/AsgOp/r8/r8flat_cs_r.csproj
index 46c96f35a82ead..a3b191fe8884e9 100644
--- a/src/tests/JIT/Methodical/AsgOp/r8/r8flat_cs_r.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/r8/r8flat_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/AsgOp/r8/r8flat_cs_ro.csproj b/src/tests/JIT/Methodical/AsgOp/r8/r8flat_cs_ro.csproj
index 936b3460e1750f..e05fc3eb00db8b 100644
--- a/src/tests/JIT/Methodical/AsgOp/r8/r8flat_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/r8/r8flat_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/KeepAliveBoxOpt.cs b/src/tests/JIT/Methodical/Boxing/boxunbox/KeepAliveBoxOpt.cs
index f16104b1627d08..37b41585259d26 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/KeepAliveBoxOpt.cs
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/KeepAliveBoxOpt.cs
@@ -2,13 +2,15 @@
 using System.Runtime.InteropServices;
 using System.Runtime.CompilerServices;
 using System.Runtime.Intrinsics;
+using Xunit;
 
 public class KeepAliveBoxFieldsTest
 {
     private static string _failedTest;
     private static string _failedFieldName;
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         TestLocalsOneBlock();
         Reset();
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/KeepAliveBoxOpt.csproj b/src/tests/JIT/Methodical/Boxing/boxunbox/KeepAliveBoxOpt.csproj
index 9dc98caff81a80..edca7b94fa4341 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/KeepAliveBoxOpt.csproj
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/KeepAliveBoxOpt.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/array.il b/src/tests/JIT/Methodical/Boxing/boxunbox/array.il
index b6fd3e93f75e2a..aa58277823c6fc 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/array.il
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/array.il
@@ -9,10 +9,10 @@
 }
 .assembly 'array' { }
 .assembly extern xunit.core {}
-.namespace JitTest {
-.class private auto ansi beforefieldinit Test extends [mscorlib]System.Object
+.namespace JitTest_array_boxunbox_il {
+.class public auto ansi beforefieldinit Test extends [mscorlib]System.Object
 {
-.method private hidebysig static int32 Main() cil managed
+.method public hidebysig static int32 Main() cil managed
 {
 	.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
 	    01 00 00 00
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/array_il_d.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/array_il_d.ilproj
index 7dc4ef6f3622ba..02a208431d3344 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/array_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/array_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/array_il_r.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/array_il_r.ilproj
index f852cae8a5c3b2..5ca46a8bc1a15b 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/array_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/array_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/chain.il b/src/tests/JIT/Methodical/Boxing/boxunbox/chain.il
index f5c13d7df74b82..dbaca559ab8250 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/chain.il
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/chain.il
@@ -9,10 +9,10 @@
 }
 .assembly 'chain' { }
 .assembly extern xunit.core {}
-.namespace JitTest {
-.class private auto ansi beforefieldinit Test extends [mscorlib]System.Object
+.namespace JitTest_chain_boxunbox_il {
+.class public auto ansi beforefieldinit Test extends [mscorlib]System.Object
 {
-.method private hidebysig static int32 Main() cil managed
+.method public hidebysig static int32 Main() cil managed
 {
 	.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
 	    01 00 00 00
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/chain_il_d.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/chain_il_d.ilproj
index e69b221904c0b5..460a0f66cac78d 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/chain_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/chain_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/chain_il_r.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/chain_il_r.ilproj
index 4317eefeeb631c..3f629d1397b1ce 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/chain_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/chain_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/finally.il b/src/tests/JIT/Methodical/Boxing/boxunbox/finally.il
index 00724e62a9efca..2e9140277ed878 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/finally.il
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/finally.il
@@ -10,9 +10,9 @@
 .assembly extern mscorlib { }
 .assembly 'finally' { }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_finally_boxunbox
 {
-  .class private auto ansi beforefieldinit App
+  .class public auto ansi beforefieldinit App
          extends [mscorlib]System.Object
   {
     .method private hidebysig static void 
@@ -182,7 +182,7 @@
       		ret
     } // end of method App::Test
 
-    .method private hidebysig static int32 
+    .method public hidebysig static int32 
             Main() cil managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -192,9 +192,9 @@
       .maxstack  1
       .locals (int32 V_0)
       IL_0000:  ldc.i4.0
-      IL_0001:  call       void JitTest.App::Test(bool)
+      IL_0001:  call       void JitTest_finally_boxunbox.App::Test(bool)
       IL_0006:  ldc.i4.1
-      IL_0007:  call       void JitTest.App::Test(bool)
+      IL_0007:  call       void JitTest_finally_boxunbox.App::Test(bool)
       IL_000c:  ldstr      "=== TEST PASSED ==="
       IL_0011:  call       void [System.Console]System.Console::WriteLine(string)
       IL_0016:  ldc.i4.s   100
@@ -216,5 +216,5 @@
 
   } // end of class App
 
-} // end of namespace JitTest
+} // end of namespace JitTest_finally_boxunbox
 
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/finally_il_d.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/finally_il_d.ilproj
index 59b63c4f754358..7b75a53474d880 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/finally_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/finally_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/finally_il_r.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/finally_il_r.ilproj
index 62f8bf6c98b883..e5515a562bfe20 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/finally_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/finally_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/huge_filter.il b/src/tests/JIT/Methodical/Boxing/boxunbox/huge_filter.il
index ba9c6cfab177d3..33eec92d301976 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/huge_filter.il
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/huge_filter.il
@@ -10,9 +10,9 @@
 .assembly extern mscorlib { }
 .assembly 'huge_filter' { }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_huge_filter_boxunbox
 {
-  .class private auto ansi beforefieldinit App
+  .class public auto ansi beforefieldinit App
          extends [mscorlib]System.Object
   {
     .method private hidebysig static void 
@@ -179,7 +179,7 @@
       .try IL_TRY to IL_FILTER filter IL_FILTER handler IL_EXCEPT to IL_END
     } // end of method App::Test
 
-    .method private hidebysig static int32 
+    .method public hidebysig static int32 
             Main() cil managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -189,9 +189,9 @@
       .maxstack  1
       .locals (int32 V_0)
       IL_0000:  ldc.i4.0
-      IL_0001:  call       void JitTest.App::Test(bool)
+      IL_0001:  call       void JitTest_huge_filter_boxunbox.App::Test(bool)
       IL_0006:  ldc.i4.1
-      IL_0007:  call       void JitTest.App::Test(bool)
+      IL_0007:  call       void JitTest_huge_filter_boxunbox.App::Test(bool)
       IL_000c:  ldstr      "=== TEST PASSED ==="
       IL_0011:  call       void [System.Console]System.Console::WriteLine(string)
       IL_0016:  ldc.i4.s   100
@@ -213,5 +213,5 @@
 
   } // end of class App
 
-} // end of namespace JitTest
+} // end of namespace JitTest_huge_filter_boxunbox
 
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/huge_filter_il_d.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/huge_filter_il_d.ilproj
index 3a87321418ef13..7edd0a5e0908dd 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/huge_filter_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/huge_filter_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/huge_filter_il_r.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/huge_filter_il_r.ilproj
index 64dae6a21d88e2..60ee26c8311656 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/huge_filter_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/huge_filter_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/jump.il b/src/tests/JIT/Methodical/Boxing/boxunbox/jump.il
index 0541f08a632ea1..680cb9500e336b 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/jump.il
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/jump.il
@@ -10,9 +10,9 @@
 .assembly extern mscorlib { }
 .assembly 'jump' { }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_jump_boxunbox
 {
-  .class private auto ansi beforefieldinit App
+  .class public auto ansi beforefieldinit App
          extends [mscorlib]System.Object
   {
     .method private hidebysig static int64 
@@ -178,11 +178,11 @@
 				pop
 				ldc.i4.0
 				starg 0
-				jmp       int64 JitTest.App::Test(bool)
+				jmp       int64 JitTest_jump_boxunbox.App::Test(bool)
 		 IL_RET:  ret
     } // end of method App::Test
 
-    .method private hidebysig static int32 
+    .method public hidebysig static int32 
             Main() cil managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -192,9 +192,9 @@
       .maxstack  4
       .locals (int32 V_0)
       IL_0000:  ldc.i4.0
-      IL_0001:  call       int64 JitTest.App::Test(bool)
+      IL_0001:  call       int64 JitTest_jump_boxunbox.App::Test(bool)
       IL_0006:  ldc.i4.1
-      IL_0007:  call       int64 JitTest.App::Test(bool)
+      IL_0007:  call       int64 JitTest_jump_boxunbox.App::Test(bool)
       			pop
       			pop
       IL_000c:  ldstr      "=== TEST PASSED ==="
@@ -218,5 +218,5 @@
 
   } // end of class App
 
-} // end of namespace JitTest
+} // end of namespace JitTest_jump_boxunbox
 
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/jump_il_d.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/jump_il_d.ilproj
index 22edaba8fde057..dffe0de0eebf91 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/jump_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/jump_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/jump_il_r.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/jump_il_r.ilproj
index a851f2a491c262..a503dfea831cb5 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/jump_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/jump_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/local.il b/src/tests/JIT/Methodical/Boxing/boxunbox/local.il
index ca0b40bc80a9f4..646f84004c224c 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/local.il
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/local.il
@@ -9,10 +9,10 @@
 }
 .assembly 'local' { }
 .assembly extern xunit.core {}
-.namespace JitTest {
-.class private auto ansi beforefieldinit Test extends [mscorlib]System.Object
+.namespace JitTest_local_boxunbox_il {
+.class public auto ansi beforefieldinit Test extends [mscorlib]System.Object
 {
-.method private hidebysig static int32 Main() cil managed
+.method public hidebysig static int32 Main() cil managed
 {
 	.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
 	    01 00 00 00
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/local_il_d.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/local_il_d.ilproj
index 897ba51b65b5e3..a0f837e77b7f7a 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/local_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/local_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/local_il_r.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/local_il_r.ilproj
index 9c7253101918fc..70e5d382279946 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/local_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/local_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/localloc.il b/src/tests/JIT/Methodical/Boxing/boxunbox/localloc.il
index 56436a78ebae76..519a13ae8650c4 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/localloc.il
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/localloc.il
@@ -10,9 +10,9 @@
 .assembly extern mscorlib { }
 .assembly 'localloc_boxunbox' { }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_localloc_boxunbox
 {
-  .class private auto ansi beforefieldinit App
+  .class public auto ansi beforefieldinit App
          extends [mscorlib]System.Object
   {
     .method private hidebysig static void 
@@ -177,7 +177,7 @@
       IL_01e9:  ret
     } // end of method App::Test
 
-    .method private hidebysig static int32 
+    .method public hidebysig static int32 
             Main() cil managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -187,9 +187,9 @@
       .maxstack  1
       .locals (int32 V_0)
       IL_0000:  ldc.i4.0
-      IL_0001:  call       void JitTest.App::Test(bool)
+      IL_0001:  call       void JitTest_localloc_boxunbox.App::Test(bool)
       IL_0006:  ldc.i4.1
-      IL_0007:  call       void JitTest.App::Test(bool)
+      IL_0007:  call       void JitTest_localloc_boxunbox.App::Test(bool)
       IL_000c:  ldstr      "=== TEST PASSED ==="
       IL_0011:  call       void [System.Console]System.Console::WriteLine(string)
       IL_0016:  ldc.i4.s   100
@@ -211,5 +211,5 @@
 
   } // end of class App
 
-} // end of namespace JitTest
+} // end of namespace JitTest_localloc_boxunbox
 
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/localloc_boxunbox_il_d.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/localloc_boxunbox_il_d.ilproj
index 7c26f8a1824df3..9ead303dbf4e98 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/localloc_boxunbox_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/localloc_boxunbox_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/localloc_boxunbox_il_r.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/localloc_boxunbox_il_r.ilproj
index fd6eaf6f4f6623..bb256aa51afecc 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/localloc_boxunbox_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/localloc_boxunbox_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/simple.il b/src/tests/JIT/Methodical/Boxing/boxunbox/simple.il
index 2a5fb5129550e6..a0c676f929a8b7 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/simple.il
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/simple.il
@@ -10,9 +10,9 @@
 .assembly extern mscorlib { }
 .assembly 'simple' { }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_simple_boxunbox
 {
-  .class private auto ansi beforefieldinit App
+  .class public auto ansi beforefieldinit App
          extends [mscorlib]System.Object
   {
     .method private hidebysig static void 
@@ -172,7 +172,7 @@
       IL_01e9:  ret
     } // end of method App::Test
 
-    .method private hidebysig static int32 
+    .method public hidebysig static int32 
             Main() cil managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -182,9 +182,9 @@
       .maxstack  1
       .locals (int32 V_0)
       IL_0000:  ldc.i4.0
-      IL_0001:  call       void JitTest.App::Test(bool)
+      IL_0001:  call       void JitTest_simple_boxunbox.App::Test(bool)
       IL_0006:  ldc.i4.1
-      IL_0007:  call       void JitTest.App::Test(bool)
+      IL_0007:  call       void JitTest_simple_boxunbox.App::Test(bool)
       IL_000c:  ldstr      "=== TEST PASSED ==="
       IL_0011:  call       void [System.Console]System.Console::WriteLine(string)
       IL_0016:  ldc.i4.s   100
@@ -206,5 +206,5 @@
 
   } // end of class App
 
-} // end of namespace JitTest
+} // end of namespace JitTest_simple_boxunbox
 
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/simple_il_d.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/simple_il_d.ilproj
index 0f10f9db1bcc59..14f90de11ba45d 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/simple_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/simple_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/simple_il_r.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/simple_il_r.ilproj
index b77928a47707b3..cbf627bb8599af 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/simple_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/simple_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/tailcall.il b/src/tests/JIT/Methodical/Boxing/boxunbox/tailcall.il
index 3ca39e2a949438..73473f18f70fcd 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/tailcall.il
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/tailcall.il
@@ -7,9 +7,9 @@
 
 .assembly 'tailcall_boxunbox' { }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_tailcall_boxunbox
 {
-  .class private auto ansi beforefieldinit App
+  .class public auto ansi beforefieldinit App
          extends [mscorlib]System.Object
   {
     .method private hidebysig static int64 
@@ -172,11 +172,11 @@
 				brfalse.s IL_RET
 				pop
 				ldc.i4.0
-		tail.   call       int64 JitTest.App::Test(bool)
+		tail.   call       int64 JitTest_tailcall_boxunbox.App::Test(bool)
       IL_RET:  ret
     } // end of method App::Test
 
-    .method private hidebysig static int32 
+    .method public hidebysig static int32 
             Main() cil managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -186,9 +186,9 @@
       .maxstack  4
       .locals (int32 V_0)
       IL_0000:  ldc.i4.0
-      IL_0001:  call       int64 JitTest.App::Test(bool)
+      IL_0001:  call       int64 JitTest_tailcall_boxunbox.App::Test(bool)
       IL_0006:  ldc.i4.1
-      IL_0007:  call       int64 JitTest.App::Test(bool)
+      IL_0007:  call       int64 JitTest_tailcall_boxunbox.App::Test(bool)
       			pop
       			pop
       IL_000c:  ldstr      "=== TEST PASSED ==="
@@ -212,5 +212,5 @@
 
   } // end of class App
 
-} // end of namespace JitTest
+} // end of namespace JitTest_tailcall_boxunbox
 
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/tailcall_boxunbox_il_d.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/tailcall_boxunbox_il_d.ilproj
index e2de19320855df..016dc7948fef1a 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/tailcall_boxunbox_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/tailcall_boxunbox_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/tailcall_boxunbox_il_r.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/tailcall_boxunbox_il_r.ilproj
index 72bf4abc368079..306a35dc708afa 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/tailcall_boxunbox_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/tailcall_boxunbox_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/try.il b/src/tests/JIT/Methodical/Boxing/boxunbox/try.il
index 3f4484c6c2e514..4daea08b91f46f 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/try.il
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/try.il
@@ -10,9 +10,9 @@
 .assembly extern mscorlib { }
 .assembly 'try_boxunbox' { }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_try_boxunbox
 {
-  .class private auto ansi beforefieldinit App
+  .class public auto ansi beforefieldinit App
          extends [mscorlib]System.Object
   {
     .method private hidebysig static void 
@@ -179,7 +179,7 @@
       		ret
     } // end of method App::Test
 
-    .method private hidebysig static int32 
+    .method public hidebysig static int32 
             Main() cil managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -189,9 +189,9 @@
       .maxstack  1
       .locals (int32 V_0)
       IL_0000:  ldc.i4.0
-      IL_0001:  call       void JitTest.App::Test(bool)
+      IL_0001:  call       void JitTest_try_boxunbox.App::Test(bool)
       IL_0006:  ldc.i4.1
-      IL_0007:  call       void JitTest.App::Test(bool)
+      IL_0007:  call       void JitTest_try_boxunbox.App::Test(bool)
       IL_000c:  ldstr      "=== TEST PASSED ==="
       IL_0011:  call       void [System.Console]System.Console::WriteLine(string)
       IL_0016:  ldc.i4.s   100
@@ -213,5 +213,5 @@
 
   } // end of class App
 
-} // end of namespace JitTest
+} // end of namespace JitTest_try_boxunbox
 
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/try_boxunbox_il_d.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/try_boxunbox_il_d.ilproj
index f6fb0e05ab386c..682ab9d3e48342 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/try_boxunbox_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/try_boxunbox_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/try_boxunbox_il_r.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/try_boxunbox_il_r.ilproj
index b7b089abf66e20..52ec4c2dd29017 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/try_boxunbox_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/try_boxunbox_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/callconv/instance.cs b/src/tests/JIT/Methodical/Boxing/callconv/instance.cs
index 8a74c65b0c7459..ece448e663a5ee 100644
--- a/src/tests/JIT/Methodical/Boxing/callconv/instance.cs
+++ b/src/tests/JIT/Methodical/Boxing/callconv/instance.cs
@@ -3,16 +3,17 @@
 
 
 using System;
+using Xunit;
 
 
-namespace BoxTest
+namespace BoxTest_instance_cs
 {
-    internal abstract class BaseTest
+    public abstract class BaseTest
     {
         protected abstract object Fibonacci2(object num, object flag);
     }
 
-    internal class Test : BaseTest
+    public class Test : BaseTest
     {
         private object _num;
 
@@ -49,7 +50,8 @@ public object Print()
             return _num;
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             Test test = new Test(20.0d);
             test.Print();
diff --git a/src/tests/JIT/Methodical/Boxing/callconv/instance.il b/src/tests/JIT/Methodical/Boxing/callconv/instance.il
index 0d6d53a562aa8d..b320d7d6da829f 100644
--- a/src/tests/JIT/Methodical/Boxing/callconv/instance.il
+++ b/src/tests/JIT/Methodical/Boxing/callconv/instance.il
@@ -14,7 +14,7 @@
 {
 }
 .assembly extern xunit.core {}
-.namespace BoxTest
+.namespace BoxTest_instance_il
 {
   .class abstract auto ansi BaseTest extends [mscorlib]System.Object
   {
@@ -33,7 +33,7 @@
 
   } // end of class 'BaseTest'
 
-  .class auto ansi Test extends BoxTest.BaseTest
+  .class public auto ansi Test extends BoxTest_instance_il.BaseTest
   {
     .field private class System.Object m_num
     .method family hidebysig instance class System.Object 
@@ -59,7 +59,7 @@
       IL_002a:  ldarg.0
       IL_002b:  ldarg.1
       IL_002c:  ldarg.2
-      IL_002d:  callvirt   instance class System.Object BoxTest.BaseTest::Fibonacci2(class System.Object,
+      IL_002d:  callvirt   instance class System.Object BoxTest_instance_il.BaseTest::Fibonacci2(class System.Object,
                                                                                      class System.Object)
       IL_0032:  ret
     } // end of method 'Test::Fibonacci'
@@ -96,7 +96,7 @@
       IL_002e:  stloc.2
       IL_002f:  ldloc.s   V_2
       IL_0031:  box        [mscorlib]System.Boolean
-      IL_0036:  call       instance class System.Object BoxTest.Test::Fibonacci(class System.Object,
+      IL_0036:  call       instance class System.Object BoxTest_instance_il.Test::Fibonacci(class System.Object,
                                                                                 class System.Object)
       IL_003b:  unbox      [mscorlib]System.Single
       IL_0040:  ldind.r4
@@ -110,7 +110,7 @@
       IL_0050:  ldloc.s   V_1
       IL_0052:  box        [mscorlib]System.Single
       IL_0057:  ldarg.2
-      IL_0058:  call       instance class System.Object BoxTest.Test::Fibonacci(class System.Object,
+      IL_0058:  call       instance class System.Object BoxTest_instance_il.Test::Fibonacci(class System.Object,
                                                                                 class System.Object)
       IL_005d:  unbox      [mscorlib]System.Single
       IL_0062:  ldind.r4
@@ -140,7 +140,7 @@
       .maxstack  2
       .locals ([0] float32 V_0)
       IL_0000:  ldarg.0
-      IL_0001:  call       instance void BoxTest.BaseTest::.ctor()
+      IL_0001:  call       instance void BoxTest_instance_il.BaseTest::.ctor()
       IL_0006:  ldarg.0
       IL_0007:  ldarg.1
       IL_0008:  unbox      [mscorlib]System.Double
@@ -149,7 +149,7 @@
       IL_000f:  stloc.0
       IL_0010:  ldloc.s   V_0
       IL_0012:  box        [mscorlib]System.Single
-      IL_0017:  stfld      class System.Object BoxTest.Test::m_num
+      IL_0017:  stfld      class System.Object BoxTest_instance_il.Test::m_num
       IL_001c:  ret
     } // end of method 'Test::.ctor'
 
@@ -160,21 +160,21 @@
       .locals ([0] bool V_0)
       IL_0000:  ldarg.0
       IL_0001:  ldarg.0
-      IL_0002:  ldfld      class System.Object BoxTest.Test::m_num
+      IL_0002:  ldfld      class System.Object BoxTest_instance_il.Test::m_num
       IL_0007:  ldc.i4.1
       IL_0008:  stloc.0
       IL_0009:  ldloc.s   V_0
       IL_000b:  box        [mscorlib]System.Boolean
-      IL_0010:  call       instance class System.Object BoxTest.Test::Fibonacci(class System.Object,
+      IL_0010:  call       instance class System.Object BoxTest_instance_il.Test::Fibonacci(class System.Object,
                                                                                 class System.Object)
       IL_0015:  pop
       IL_0016:  call       void [System.Console]System.Console::WriteLine()
       IL_001b:  ldarg.0
-      IL_001c:  ldfld      class System.Object BoxTest.Test::m_num
+      IL_001c:  ldfld      class System.Object BoxTest_instance_il.Test::m_num
       IL_0021:  ret
     } // end of method 'Test::Print'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -182,16 +182,16 @@
       )
       .entrypoint
       .maxstack  2
-      .locals ([0] class BoxTest.Test test,
+      .locals ([0] class BoxTest_instance_il.Test test,
                [1] float64 V_1)
       IL_0000:  ldc.r8     20.
       IL_0009:  stloc.1
       IL_000a:  ldloc.s   V_1
       IL_000c:  box        [mscorlib]System.Double
-      IL_0011:  newobj     instance void BoxTest.Test::.ctor(class System.Object)
+      IL_0011:  newobj     instance void BoxTest_instance_il.Test::.ctor(class System.Object)
       IL_0016:  stloc.0
       IL_0017:  ldloc.0
-      IL_0018:  call       instance class System.Object BoxTest.Test::Print()
+      IL_0018:  call       instance class System.Object BoxTest_instance_il.Test::Print()
       IL_001d:  pop
       IL_001e:  ldstr      "*** PASSED ***"
       IL_0023:  call       void [System.Console]System.Console::WriteLine(class System.String)
@@ -201,5 +201,5 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'BoxTest'
+} // end of namespace 'BoxTest_instance_il'
 
diff --git a/src/tests/JIT/Methodical/Boxing/callconv/instance_cs_d.csproj b/src/tests/JIT/Methodical/Boxing/callconv/instance_cs_d.csproj
index 7ad232f7846dcf..dc79a6298a6b93 100644
--- a/src/tests/JIT/Methodical/Boxing/callconv/instance_cs_d.csproj
+++ b/src/tests/JIT/Methodical/Boxing/callconv/instance_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
diff --git a/src/tests/JIT/Methodical/Boxing/callconv/instance_cs_do.csproj b/src/tests/JIT/Methodical/Boxing/callconv/instance_cs_do.csproj
index 4e8c25651e8dc3..95d46de5a917f0 100644
--- a/src/tests/JIT/Methodical/Boxing/callconv/instance_cs_do.csproj
+++ b/src/tests/JIT/Methodical/Boxing/callconv/instance_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/callconv/instance_cs_r.csproj b/src/tests/JIT/Methodical/Boxing/callconv/instance_cs_r.csproj
index c1ffaf4d6536af..732c284a3fba61 100644
--- a/src/tests/JIT/Methodical/Boxing/callconv/instance_cs_r.csproj
+++ b/src/tests/JIT/Methodical/Boxing/callconv/instance_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
diff --git a/src/tests/JIT/Methodical/Boxing/callconv/instance_cs_ro.csproj b/src/tests/JIT/Methodical/Boxing/callconv/instance_cs_ro.csproj
index 3d70d5b2454f8b..cd10ba24469e8c 100644
--- a/src/tests/JIT/Methodical/Boxing/callconv/instance_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/Boxing/callconv/instance_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/callconv/instance_il_d.ilproj b/src/tests/JIT/Methodical/Boxing/callconv/instance_il_d.ilproj
index 8efef995807d13..4b8a4872d1ba08 100644
--- a/src/tests/JIT/Methodical/Boxing/callconv/instance_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/callconv/instance_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/callconv/instance_il_r.ilproj b/src/tests/JIT/Methodical/Boxing/callconv/instance_il_r.ilproj
index 6248489558dcaf..98219e692a595d 100644
--- a/src/tests/JIT/Methodical/Boxing/callconv/instance_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/callconv/instance_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/functional/fibo.cs b/src/tests/JIT/Methodical/Boxing/functional/fibo.cs
index bcc16cae57090a..ccb0fc052ec870 100644
--- a/src/tests/JIT/Methodical/Boxing/functional/fibo.cs
+++ b/src/tests/JIT/Methodical/Boxing/functional/fibo.cs
@@ -3,11 +3,12 @@
 
 
 using System;
+using Xunit;
 
 
-namespace BoxTest
+namespace BoxTest_fibo_cs
 {
-    internal class Test
+    public class Test
     {
         protected object Fibonacci(object num, object flag)
         {
@@ -35,7 +36,8 @@ protected object Fibonacci2(object num, object flag)
             return N;
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             new Test().Fibonacci(20, true);
             Console.WriteLine();
diff --git a/src/tests/JIT/Methodical/Boxing/functional/fibo.il b/src/tests/JIT/Methodical/Boxing/functional/fibo.il
index bee24ee1f971ab..36a061eec8f0f1 100644
--- a/src/tests/JIT/Methodical/Boxing/functional/fibo.il
+++ b/src/tests/JIT/Methodical/Boxing/functional/fibo.il
@@ -10,9 +10,9 @@
 .assembly extern mscorlib { }
 .assembly 'fibo' { }
 .assembly extern xunit.core {}
-.namespace BoxTest
+.namespace BoxTest_fibo_il
 {
-  .class auto ansi Test extends [mscorlib]System.Object
+  .class public auto ansi Test extends [mscorlib]System.Object
   {
     .method family hidebysig instance class System.Object 
             Fibonacci(class System.Object num,
@@ -36,7 +36,7 @@
       IL_002a:  ldarg.0
       IL_002b:  ldarg.1
       IL_002c:  ldarg.2
-      IL_002d:  call       instance class System.Object BoxTest.Test::Fibonacci2(class System.Object,
+      IL_002d:  call       instance class System.Object BoxTest_fibo_il.Test::Fibonacci2(class System.Object,
                                                                                  class System.Object)
       IL_0032:  ret
     } // end of method 'Test::Fibonacci'
@@ -72,7 +72,7 @@
       IL_0021:  stloc.2
       IL_0022:  ldloc.s   V_2
       IL_0024:  box        [mscorlib]System.Boolean
-      IL_0029:  call       instance class System.Object BoxTest.Test::Fibonacci(class System.Object,
+      IL_0029:  call       instance class System.Object BoxTest_fibo_il.Test::Fibonacci(class System.Object,
                                                                                 class System.Object)
       IL_002e:  unbox      [mscorlib]System.Int32
       IL_0033:  ldind.i4
@@ -86,7 +86,7 @@
       IL_003f:  ldloc.s   V_1
       IL_0041:  box        [mscorlib]System.Int32
       IL_0046:  ldarg.2
-      IL_0047:  call       instance class System.Object BoxTest.Test::Fibonacci(class System.Object,
+      IL_0047:  call       instance class System.Object BoxTest_fibo_il.Test::Fibonacci(class System.Object,
                                                                                 class System.Object)
       IL_004c:  unbox      [mscorlib]System.Int32
       IL_0051:  ldind.i4
@@ -127,7 +127,7 @@
       IL_009e:  ret
     } // end of method 'Test::Fibonacci2'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -137,7 +137,7 @@
       .maxstack  3
       .locals ([0] int32 V_0,
                [1] bool V_1)
-      IL_0000:  newobj     instance void BoxTest.Test::.ctor()
+      IL_0000:  newobj     instance void BoxTest_fibo_il.Test::.ctor()
       IL_0005:  ldc.i4.s   20
       IL_0007:  stloc.0
       IL_0008:  ldloc.s   V_0
@@ -146,7 +146,7 @@
       IL_0010:  stloc.1
       IL_0011:  ldloc.s   V_1
       IL_0013:  box        [mscorlib]System.Boolean
-      IL_0018:  call       instance class System.Object BoxTest.Test::Fibonacci(class System.Object,
+      IL_0018:  call       instance class System.Object BoxTest_fibo_il.Test::Fibonacci(class System.Object,
                                                                                 class System.Object)
       IL_001d:  pop
       IL_001e:  call       void [System.Console]System.Console::WriteLine()
@@ -167,5 +167,5 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'BoxTest'
+} // end of namespace 'BoxTest_fibo_il'
 
diff --git a/src/tests/JIT/Methodical/Boxing/functional/fibo_cs_d.csproj b/src/tests/JIT/Methodical/Boxing/functional/fibo_cs_d.csproj
index e7698a67816918..8e78a31860ccb0 100644
--- a/src/tests/JIT/Methodical/Boxing/functional/fibo_cs_d.csproj
+++ b/src/tests/JIT/Methodical/Boxing/functional/fibo_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/functional/fibo_cs_do.csproj b/src/tests/JIT/Methodical/Boxing/functional/fibo_cs_do.csproj
index b92846cfe2211c..c6e5894e8f569c 100644
--- a/src/tests/JIT/Methodical/Boxing/functional/fibo_cs_do.csproj
+++ b/src/tests/JIT/Methodical/Boxing/functional/fibo_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
diff --git a/src/tests/JIT/Methodical/Boxing/functional/fibo_cs_r.csproj b/src/tests/JIT/Methodical/Boxing/functional/fibo_cs_r.csproj
index 9c8213593ba2c4..1344fc8b7ca5cf 100644
--- a/src/tests/JIT/Methodical/Boxing/functional/fibo_cs_r.csproj
+++ b/src/tests/JIT/Methodical/Boxing/functional/fibo_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
diff --git a/src/tests/JIT/Methodical/Boxing/functional/fibo_cs_ro.csproj b/src/tests/JIT/Methodical/Boxing/functional/fibo_cs_ro.csproj
index 0f0a5905273c54..331fa8188cc0ae 100644
--- a/src/tests/JIT/Methodical/Boxing/functional/fibo_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/Boxing/functional/fibo_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
diff --git a/src/tests/JIT/Methodical/Boxing/functional/fibo_il_d.ilproj b/src/tests/JIT/Methodical/Boxing/functional/fibo_il_d.ilproj
index 4214db5db64f0c..607f83dcc966f4 100644
--- a/src/tests/JIT/Methodical/Boxing/functional/fibo_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/functional/fibo_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/functional/fibo_il_r.ilproj b/src/tests/JIT/Methodical/Boxing/functional/fibo_il_r.ilproj
index 01388403bd1fe9..77fba604765e3e 100644
--- a/src/tests/JIT/Methodical/Boxing/functional/fibo_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/functional/fibo_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/functional/sin.cs b/src/tests/JIT/Methodical/Boxing/functional/sin.cs
index f9e983f48ca2fd..10543b74a8eb95 100644
--- a/src/tests/JIT/Methodical/Boxing/functional/sin.cs
+++ b/src/tests/JIT/Methodical/Boxing/functional/sin.cs
@@ -3,11 +3,12 @@
 
 
 using System;
+using Xunit;
 
 
-namespace SinCalc
+namespace SinCalc_sin_functional_cs
 {
-    internal class SinCalc
+    public class SinCalc
     {
         protected struct CalcCtx
         {
@@ -52,7 +53,8 @@ protected static object mySin(object Angle)
             return ctx.sumOfTerms;
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             object i;
             object Angle;
diff --git a/src/tests/JIT/Methodical/Boxing/functional/sin.il b/src/tests/JIT/Methodical/Boxing/functional/sin.il
index aae1f3aad84f14..2471fc9e3da273 100644
--- a/src/tests/JIT/Methodical/Boxing/functional/sin.il
+++ b/src/tests/JIT/Methodical/Boxing/functional/sin.il
@@ -13,9 +13,9 @@
 {
 }
 .assembly extern xunit.core {}
-.namespace SinCalc
+.namespace SinCalc_sin_functional_il
 {
-  .class private auto ansi SinCalc
+  .class public auto ansi SinCalc_sin_functional_il
          extends [mscorlib]System.Object
   {
     .class auto ansi sealed nested family SinCalc$CalcCtx
@@ -30,7 +30,7 @@
       {
         .maxstack  8
         IL_0000:  ldarg.0
-        IL_0001:  ldfld      float64 SinCalc.SinCalc/SinCalc$CalcCtx::m_powX
+        IL_0001:  ldfld      float64 SinCalc_sin_functional_il.SinCalc_sin_functional_il/SinCalc$CalcCtx::m_powX
         IL_0006:  ret
       } 
 
@@ -40,7 +40,7 @@
         .maxstack  8
         IL_0000:  ldarg.0
         IL_0001:  ldarg.1
-        IL_0002:  stfld      float64 SinCalc.SinCalc/SinCalc$CalcCtx::m_powX
+        IL_0002:  stfld      float64 SinCalc_sin_functional_il.SinCalc_sin_functional_il/SinCalc$CalcCtx::m_powX
         IL_0007:  ret
       } 
 
@@ -49,7 +49,7 @@
       {
         .maxstack  8
         IL_0000:  ldarg.0
-        IL_0001:  ldfld      float64 SinCalc.SinCalc/SinCalc$CalcCtx::m_sumOfTerms
+        IL_0001:  ldfld      float64 SinCalc_sin_functional_il.SinCalc_sin_functional_il/SinCalc$CalcCtx::m_sumOfTerms
         IL_0006:  ret
       } 
 
@@ -59,7 +59,7 @@
         .maxstack  8
         IL_0000:  ldarg.0
         IL_0001:  ldarg.1
-        IL_0002:  stfld      float64 SinCalc.SinCalc/SinCalc$CalcCtx::m_sumOfTerms
+        IL_0002:  stfld      float64 SinCalc_sin_functional_il.SinCalc_sin_functional_il/SinCalc$CalcCtx::m_sumOfTerms
         IL_0007:  ret
       } 
 
@@ -68,7 +68,7 @@
       {
         .maxstack  8
         IL_0000:  ldarg.0
-        IL_0001:  ldfld      object SinCalc.SinCalc/SinCalc$CalcCtx::m_term
+        IL_0001:  ldfld      object SinCalc_sin_functional_il.SinCalc_sin_functional_il/SinCalc$CalcCtx::m_term
         IL_0006:  unbox      [mscorlib]System.Double
         IL_000b:  ldind.r8
         IL_000c:  ret
@@ -81,19 +81,19 @@
         IL_0000:  ldarg.0
         IL_0001:  ldarg.s    'value'
         IL_0003:  box        [mscorlib]System.Double
-        IL_0008:  stfld      object SinCalc.SinCalc/SinCalc$CalcCtx::m_term
+        IL_0008:  stfld      object SinCalc_sin_functional_il.SinCalc_sin_functional_il/SinCalc$CalcCtx::m_term
         IL_000d:  ret
       } 
 
       .property instance float64 sumOfTerms()
       {
-        .get instance float64 SinCalc.SinCalc/SinCalc$CalcCtx::get_sumOfTerms()
-        .set instance void SinCalc.SinCalc/SinCalc$CalcCtx::set_sumOfTerms(float64)
+        .get instance float64 SinCalc_sin_functional_il.SinCalc_sin_functional_il/SinCalc$CalcCtx::get_sumOfTerms()
+        .set instance void SinCalc_sin_functional_il.SinCalc_sin_functional_il/SinCalc$CalcCtx::set_sumOfTerms(float64)
       } 
       .property instance float64 term()
       {
-        .get instance float64 SinCalc.SinCalc/SinCalc$CalcCtx::get_term()
-        .set instance void SinCalc.SinCalc/SinCalc$CalcCtx::set_term(float64)
+        .get instance float64 SinCalc_sin_functional_il.SinCalc_sin_functional_il/SinCalc$CalcCtx::get_term()
+        .set instance void SinCalc_sin_functional_il.SinCalc_sin_functional_il/SinCalc$CalcCtx::set_term(float64)
       } 
     } 
 
@@ -102,37 +102,37 @@
             mySin(object Angle) cil managed
     {
       .maxstack  4
-      .locals (valuetype SinCalc.SinCalc/SinCalc$CalcCtx V_0,
+      .locals (valuetype SinCalc_sin_functional_il.SinCalc_sin_functional_il/SinCalc$CalcCtx V_0,
                object V_1,
                object V_2,
                float64 V_3,
                int32 V_4)
       IL_0000:  ldloca.s   V_0
-      IL_0002:  initobj    SinCalc.SinCalc/SinCalc$CalcCtx
+      IL_0002:  initobj    SinCalc_sin_functional_il.SinCalc_sin_functional_il/SinCalc$CalcCtx
       IL_0008:  ldloc.s    V_0
-      IL_000a:  box        SinCalc.SinCalc/SinCalc$CalcCtx
+      IL_000a:  box        SinCalc_sin_functional_il.SinCalc_sin_functional_il/SinCalc$CalcCtx
       IL_000f:  stloc.1
       IL_0010:  ldloc      V_1
-      IL_0014:  unbox      SinCalc.SinCalc/SinCalc$CalcCtx
+      IL_0014:  unbox      SinCalc_sin_functional_il.SinCalc_sin_functional_il/SinCalc$CalcCtx
       IL_0019:  ldc.r8     1.
-      IL_0022:  stfld      float64 SinCalc.SinCalc/SinCalc$CalcCtx::fact
+      IL_0022:  stfld      float64 SinCalc_sin_functional_il.SinCalc_sin_functional_il/SinCalc$CalcCtx::fact
       IL_0027:  ldloc      V_1
-      IL_002b:  unbox      SinCalc.SinCalc/SinCalc$CalcCtx
+      IL_002b:  unbox      SinCalc_sin_functional_il.SinCalc_sin_functional_il/SinCalc$CalcCtx
       IL_0030:  ldloc      V_1
-      IL_0034:  unbox      SinCalc.SinCalc/SinCalc$CalcCtx
+      IL_0034:  unbox      SinCalc_sin_functional_il.SinCalc_sin_functional_il/SinCalc$CalcCtx
       IL_0039:  ldarg.0
       IL_003a:  unbox      [mscorlib]System.Double
       IL_003f:  ldind.r8
       IL_0040:  dup
       IL_0041:  stloc.3
-      IL_0042:  call       instance void SinCalc.SinCalc/SinCalc$CalcCtx::set_term(float64)
+      IL_0042:  call       instance void SinCalc_sin_functional_il.SinCalc_sin_functional_il/SinCalc$CalcCtx::set_term(float64)
       IL_0047:  ldloc.3
-      IL_0048:  ldftn      instance void SinCalc.SinCalc/SinCalc$CalcCtx::set_powX(float64)
+      IL_0048:  ldftn      instance void SinCalc_sin_functional_il.SinCalc_sin_functional_il/SinCalc$CalcCtx::set_powX(float64)
       IL_004e:  calli      instance void(float64)
       IL_0053:  ldloc      V_1
-      IL_0057:  unbox      SinCalc.SinCalc/SinCalc$CalcCtx
+      IL_0057:  unbox      SinCalc_sin_functional_il.SinCalc_sin_functional_il/SinCalc$CalcCtx
       IL_005c:  ldc.r8     0.0
-      IL_0065:  call       instance void SinCalc.SinCalc/SinCalc$CalcCtx::set_sumOfTerms(float64)
+      IL_0065:  call       instance void SinCalc_sin_functional_il.SinCalc_sin_functional_il/SinCalc$CalcCtx::set_sumOfTerms(float64)
       IL_006a:  ldc.i4.1
       IL_006b:  stloc.s    V_4
       IL_006d:  ldloc.s    V_4
@@ -141,20 +141,20 @@
       IL_0075:  br         IL_0142
 
       IL_007a:  ldloc      V_1
-      IL_007e:  unbox      SinCalc.SinCalc/SinCalc$CalcCtx
+      IL_007e:  unbox      SinCalc_sin_functional_il.SinCalc_sin_functional_il/SinCalc$CalcCtx
       IL_0083:  ldloc      V_1
-      IL_0087:  unbox      SinCalc.SinCalc/SinCalc$CalcCtx
-      IL_008c:  call       instance float64 SinCalc.SinCalc/SinCalc$CalcCtx::get_sumOfTerms()
+      IL_0087:  unbox      SinCalc_sin_functional_il.SinCalc_sin_functional_il/SinCalc$CalcCtx
+      IL_008c:  call       instance float64 SinCalc_sin_functional_il.SinCalc_sin_functional_il/SinCalc$CalcCtx::get_sumOfTerms()
       IL_0091:  ldloc      V_1
-      IL_0095:  unbox      SinCalc.SinCalc/SinCalc$CalcCtx
-      IL_009a:  call       instance float64 SinCalc.SinCalc/SinCalc$CalcCtx::get_term()
+      IL_0095:  unbox      SinCalc_sin_functional_il.SinCalc_sin_functional_il/SinCalc$CalcCtx
+      IL_009a:  call       instance float64 SinCalc_sin_functional_il.SinCalc_sin_functional_il/SinCalc$CalcCtx::get_term()
       IL_009f:  add
-      IL_00a0:  call       instance void SinCalc.SinCalc/SinCalc$CalcCtx::set_sumOfTerms(float64)
+      IL_00a0:  call       instance void SinCalc_sin_functional_il.SinCalc_sin_functional_il/SinCalc$CalcCtx::set_sumOfTerms(float64)
       IL_00a5:  ldloc      V_1
-      IL_00a9:  unbox      SinCalc.SinCalc/SinCalc$CalcCtx
+      IL_00a9:  unbox      SinCalc_sin_functional_il.SinCalc_sin_functional_il/SinCalc$CalcCtx
       IL_00ae:  ldloc      V_1
-      IL_00b2:  unbox      SinCalc.SinCalc/SinCalc$CalcCtx
-      IL_00b7:  call       instance float64 SinCalc.SinCalc/SinCalc$CalcCtx::get_powX()
+      IL_00b2:  unbox      SinCalc_sin_functional_il.SinCalc_sin_functional_il/SinCalc$CalcCtx
+      IL_00b7:  call       instance float64 SinCalc_sin_functional_il.SinCalc_sin_functional_il/SinCalc$CalcCtx::get_powX()
       IL_00bc:  ldarg.0
       IL_00bd:  unbox      [mscorlib]System.Double
       IL_00c2:  ldind.r8
@@ -164,12 +164,12 @@
       IL_00ca:  ldind.r8
       IL_00cb:  mul
       IL_00cc:  mul
-      IL_00cd:  call       instance void SinCalc.SinCalc/SinCalc$CalcCtx::set_powX(float64)
+      IL_00cd:  call       instance void SinCalc_sin_functional_il.SinCalc_sin_functional_il/SinCalc$CalcCtx::set_powX(float64)
       IL_00d2:  ldloc      V_1
-      IL_00d6:  unbox      SinCalc.SinCalc/SinCalc$CalcCtx
+      IL_00d6:  unbox      SinCalc_sin_functional_il.SinCalc_sin_functional_il/SinCalc$CalcCtx
       IL_00db:  ldloc      V_1
-      IL_00df:  unbox      SinCalc.SinCalc/SinCalc$CalcCtx
-      IL_00e4:  ldfld      float64 SinCalc.SinCalc/SinCalc$CalcCtx::fact
+      IL_00df:  unbox      SinCalc_sin_functional_il.SinCalc_sin_functional_il/SinCalc$CalcCtx
+      IL_00e4:  ldfld      float64 SinCalc_sin_functional_il.SinCalc_sin_functional_il/SinCalc$CalcCtx::fact
       IL_00e9:  ldloc.2
       IL_00ea:  unbox      [mscorlib]System.Int32
       IL_00ef:  ldind.i4
@@ -184,17 +184,17 @@
       IL_00fc:  add
       IL_00fd:  conv.r8
       IL_00fe:  mul
-      IL_00ff:  stfld      float64 SinCalc.SinCalc/SinCalc$CalcCtx::fact
+      IL_00ff:  stfld      float64 SinCalc_sin_functional_il.SinCalc_sin_functional_il/SinCalc$CalcCtx::fact
       IL_0104:  ldloc      V_1
-      IL_0108:  unbox      SinCalc.SinCalc/SinCalc$CalcCtx
+      IL_0108:  unbox      SinCalc_sin_functional_il.SinCalc_sin_functional_il/SinCalc$CalcCtx
       IL_010d:  ldloc      V_1
-      IL_0111:  unbox      SinCalc.SinCalc/SinCalc$CalcCtx
-      IL_0116:  call       instance float64 SinCalc.SinCalc/SinCalc$CalcCtx::get_powX()
+      IL_0111:  unbox      SinCalc_sin_functional_il.SinCalc_sin_functional_il/SinCalc$CalcCtx
+      IL_0116:  call       instance float64 SinCalc_sin_functional_il.SinCalc_sin_functional_il/SinCalc$CalcCtx::get_powX()
       IL_011b:  ldloc      V_1
-      IL_011f:  unbox      SinCalc.SinCalc/SinCalc$CalcCtx
-      IL_0124:  ldfld      float64 SinCalc.SinCalc/SinCalc$CalcCtx::fact
+      IL_011f:  unbox      SinCalc_sin_functional_il.SinCalc_sin_functional_il/SinCalc$CalcCtx
+      IL_0124:  ldfld      float64 SinCalc_sin_functional_il.SinCalc_sin_functional_il/SinCalc$CalcCtx::fact
       IL_0129:  div
-      IL_012a:  call       instance void SinCalc.SinCalc/SinCalc$CalcCtx::set_term(float64)
+      IL_012a:  call       instance void SinCalc_sin_functional_il.SinCalc_sin_functional_il/SinCalc$CalcCtx::set_term(float64)
       IL_012f:  ldloc.2
       IL_0130:  unbox      [mscorlib]System.Int32
       IL_0135:  ldind.i4
@@ -211,15 +211,15 @@
       IL_014e:  ble        IL_007a
 
       IL_0153:  ldloc      V_1
-      IL_0157:  unbox      SinCalc.SinCalc/SinCalc$CalcCtx
-      IL_015c:  call       instance float64 SinCalc.SinCalc/SinCalc$CalcCtx::get_sumOfTerms()
+      IL_0157:  unbox      SinCalc_sin_functional_il.SinCalc_sin_functional_il/SinCalc$CalcCtx
+      IL_015c:  call       instance float64 SinCalc_sin_functional_il.SinCalc_sin_functional_il/SinCalc$CalcCtx::get_sumOfTerms()
       IL_0161:  stloc.3
       IL_0162:  ldloc.s    V_3
       IL_0164:  box        [mscorlib]System.Double
       IL_0169:  ret
     } 
 
-    .method private hidebysig static int32 
+    .method public hidebysig static int32 
             Main() cil managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -320,7 +320,7 @@
       IL_0104:  stloc.0
       IL_0105:  br         IL_026a
 
-      IL_010a:  ldsfld     object SinCalc.SinCalc::PI
+      IL_010a:  ldsfld     object SinCalc_sin_functional_il.SinCalc_sin_functional_il::PI
       IL_010f:  unbox      [mscorlib]System.Double
       IL_0114:  ldind.r8
       IL_0115:  ldloc.0
@@ -357,7 +357,7 @@
       IL_0178:  ldstr      ")="
       IL_017d:  call       void [System.Console]System.Console::Write(string)
       IL_0182:  ldloc.1
-      IL_0183:  ldftn      object SinCalc.SinCalc::mySin(object)
+      IL_0183:  ldftn      object SinCalc_sin_functional_il.SinCalc_sin_functional_il::mySin(object)
       IL_0189:  calli      object(object)
       IL_018e:  unbox      [mscorlib]System.Double
       IL_0193:  ldind.r8
@@ -470,7 +470,7 @@
       IL_0009:  stloc.0
       IL_000a:  ldloc.s    V_0
       IL_000c:  box        [mscorlib]System.Double
-      IL_0011:  stsfld     object SinCalc.SinCalc::PI
+      IL_0011:  stsfld     object SinCalc_sin_functional_il.SinCalc_sin_functional_il::PI
       IL_0016:  ret
     } 
 
diff --git a/src/tests/JIT/Methodical/Boxing/functional/sin_functional_cs_d.csproj b/src/tests/JIT/Methodical/Boxing/functional/sin_functional_cs_d.csproj
index 32908171715147..b3e917eacccecc 100644
--- a/src/tests/JIT/Methodical/Boxing/functional/sin_functional_cs_d.csproj
+++ b/src/tests/JIT/Methodical/Boxing/functional/sin_functional_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
diff --git a/src/tests/JIT/Methodical/Boxing/functional/sin_functional_cs_do.csproj b/src/tests/JIT/Methodical/Boxing/functional/sin_functional_cs_do.csproj
index 5ec20697309a87..01ce725db0348d 100644
--- a/src/tests/JIT/Methodical/Boxing/functional/sin_functional_cs_do.csproj
+++ b/src/tests/JIT/Methodical/Boxing/functional/sin_functional_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/functional/sin_functional_cs_r.csproj b/src/tests/JIT/Methodical/Boxing/functional/sin_functional_cs_r.csproj
index 972dd5229e84f7..06a6dfa4cc91b5 100644
--- a/src/tests/JIT/Methodical/Boxing/functional/sin_functional_cs_r.csproj
+++ b/src/tests/JIT/Methodical/Boxing/functional/sin_functional_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/functional/sin_functional_cs_ro.csproj b/src/tests/JIT/Methodical/Boxing/functional/sin_functional_cs_ro.csproj
index 6fee27543cb9f2..96c01ae763afd3 100644
--- a/src/tests/JIT/Methodical/Boxing/functional/sin_functional_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/Boxing/functional/sin_functional_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
diff --git a/src/tests/JIT/Methodical/Boxing/functional/sin_il_d.ilproj b/src/tests/JIT/Methodical/Boxing/functional/sin_il_d.ilproj
index e2b839b8215e02..d5e79abe75e28c 100644
--- a/src/tests/JIT/Methodical/Boxing/functional/sin_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/functional/sin_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/functional/sin_il_r.ilproj b/src/tests/JIT/Methodical/Boxing/functional/sin_il_r.ilproj
index 805952b24414d1..5ebc02f642b02f 100644
--- a/src/tests/JIT/Methodical/Boxing/functional/sin_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/functional/sin_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/misc/concurgc.il b/src/tests/JIT/Methodical/Boxing/misc/concurgc.il
index c10bbfef571ea2..d03aac9bba0360 100644
--- a/src/tests/JIT/Methodical/Boxing/misc/concurgc.il
+++ b/src/tests/JIT/Methodical/Boxing/misc/concurgc.il
@@ -10,9 +10,9 @@
 {
 }
 .assembly extern xunit.core {}
-.namespace Test
+.namespace Test_concurgc_il
 {
-  .class auto ansi App extends [mscorlib]System.Object
+  .class public auto ansi App extends [mscorlib]System.Object
   {
     .field private static bool signal
 
@@ -24,12 +24,12 @@
                 ldc.i4 100
                 call       void [System.Threading.Thread]System.Threading.Thread::Sleep(int32)
                 volatile.
-                ldsfld     bool Test.App::signal
+                ldsfld     bool Test_concurgc_il.App::signal
                 brfalse.s  IL_0002
                 ret
     } // end of method 'App::Func'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -37,17 +37,17 @@
       )
       .entrypoint
       .maxstack  3
-      .locals ([0] class Test.App app,
+      .locals ([0] class Test_concurgc_il.App app,
                [1] class [System.Threading.Thread]System.Threading.ThreadStart ts,
                [2] class [System.Threading.Thread]System.Threading.Thread th,
                [3] class System.Object obj,
                [4] class System.Object I,
                [5] float64 V_5,
                [6] int32 V_6)
-      IL_0000:  newobj     instance void Test.App::.ctor()
+      IL_0000:  newobj     instance void Test_concurgc_il.App::.ctor()
       IL_0005:  stloc.0
       IL_0006:  ldloc.0
-      IL_0007:  ldftn      instance void Test.App::Func()
+      IL_0007:  ldftn      instance void Test_concurgc_il.App::Func()
       IL_000d:  newobj     instance void [System.Threading.Thread]System.Threading.ThreadStart::.ctor(class System.Object,native int)
       IL_0012:  stloc.1
       IL_0013:  ldloc.1
@@ -55,7 +55,7 @@
       IL_0019:  stloc.2
                 ldc.i4.0
                 volatile.
-                stsfld     bool  Test.App::signal
+                stsfld     bool  Test_concurgc_il.App::signal
       IL_001a:  ldloc.2
       IL_001b:  call       instance void [System.Threading.Thread]System.Threading.Thread::Start()
       IL_0020:  ldc.r8     11.
@@ -139,7 +139,7 @@
 
       IL_00c1:  ldc.i4.1
                 volatile.
-      IL_00c2:  stsfld     bool  Test.App::signal
+      IL_00c2:  stsfld     bool  Test_concurgc_il.App::signal
       IL_00c7:  ldstr      "**** PASSED ****"
       IL_00cc:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_00d1:  ldc.i4    0x64
@@ -157,5 +157,5 @@
 
   } // end of class 'App'
 
-} // end of namespace 'Test'
+} // end of namespace 'Test_concurgc_il'
 
diff --git a/src/tests/JIT/Methodical/Boxing/misc/concurgc_il_d.ilproj b/src/tests/JIT/Methodical/Boxing/misc/concurgc_il_d.ilproj
index 929b3b57d8ac3b..7571d0727dda10 100644
--- a/src/tests/JIT/Methodical/Boxing/misc/concurgc_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/misc/concurgc_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <!-- The test leaves a secondary thread running -->
     <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
diff --git a/src/tests/JIT/Methodical/Boxing/misc/concurgc_il_r.ilproj b/src/tests/JIT/Methodical/Boxing/misc/concurgc_il_r.ilproj
index e9cf0649b16841..4976ddb7578d51 100644
--- a/src/tests/JIT/Methodical/Boxing/misc/concurgc_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/misc/concurgc_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <!-- The test leaves a secondary thread running -->
     <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
diff --git a/src/tests/JIT/Methodical/Boxing/misc/enum.cs b/src/tests/JIT/Methodical/Boxing/misc/enum.cs
index c0f256cb0862aa..8f9f2872a41ae2 100644
--- a/src/tests/JIT/Methodical/Boxing/misc/enum.cs
+++ b/src/tests/JIT/Methodical/Boxing/misc/enum.cs
@@ -2,8 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace BoxTest
+namespace BoxTest_enum_cs
 {
     internal enum ToPrintOrNotToPrint
     {
@@ -11,7 +12,7 @@ internal enum ToPrintOrNotToPrint
         DoNotPrint
     }
 
-    internal class Test
+    public class Test
     {
         protected object Fibonacci(object num, object flag)
         {
@@ -35,7 +36,8 @@ protected object Fibonacci2(object num, object flag)
             return N;
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             new Test().Fibonacci(20, ToPrintOrNotToPrint.Print);
             Console.WriteLine();
diff --git a/src/tests/JIT/Methodical/Boxing/misc/enum.il b/src/tests/JIT/Methodical/Boxing/misc/enum.il
index bedbe2006ee3c9..15c7c07d7b877b 100644
--- a/src/tests/JIT/Methodical/Boxing/misc/enum.il
+++ b/src/tests/JIT/Methodical/Boxing/misc/enum.il
@@ -9,16 +9,16 @@
 }
 .assembly 'enum' { }
 .assembly extern xunit.core {}
-.namespace BoxTest
+.namespace BoxTest_enum_il
 {
   .class value auto ansi serializable sealed ToPrintOrNotToPrint extends [mscorlib]System.Enum
   {
     .field public specialname rtspecialname int32 value__
-    .field public static literal value class BoxTest.ToPrintOrNotToPrint Print = int32(0x00000000)
-    .field public static literal value class BoxTest.ToPrintOrNotToPrint DoNotPrint = int32(0x00000001)
+    .field public static literal value class BoxTest_enum_il.ToPrintOrNotToPrint Print = int32(0x00000000)
+    .field public static literal value class BoxTest_enum_il.ToPrintOrNotToPrint DoNotPrint = int32(0x00000001)
   } // end of class 'ToPrintOrNotToPrint'
 
-  .class auto ansi Test extends [mscorlib]System.Object
+  .class public auto ansi Test extends [mscorlib]System.Object
   {
     .method family hidebysig instance class System.Object 
             Fibonacci(class System.Object num,
@@ -27,7 +27,7 @@
       // Code size       49 (0x31)
       .maxstack  8
       IL_0000:  ldarg.2
-      IL_0001:  unbox      BoxTest.ToPrintOrNotToPrint
+      IL_0001:  unbox      BoxTest_enum_il.ToPrintOrNotToPrint
       IL_0006:  ldind.i4
       IL_0007:  ldc.i4.1
       IL_0008:  bne.un.s   IL_0013
@@ -35,7 +35,7 @@
       IL_000a:  ldarg.0
       IL_000b:  ldarg.1
       IL_000c:  ldarg.2
-      IL_000d:  call       instance class System.Object BoxTest.Test::Fibonacci2(class System.Object,
+      IL_000d:  call       instance class System.Object BoxTest_enum_il.Test::Fibonacci2(class System.Object,
                                                                                  class System.Object)
       IL_0012:  ret
 
@@ -50,14 +50,14 @@
       IL_001f:  ldarg.0
       IL_0020:  ldarg.1
       IL_0021:  ldarg.2
-      IL_0022:  call       instance class System.Object BoxTest.Test::Fibonacci2(class System.Object,
+      IL_0022:  call       instance class System.Object BoxTest_enum_il.Test::Fibonacci2(class System.Object,
                                                                                  class System.Object)
       IL_0027:  ret
 
       IL_0028:  ldarg.0
       IL_0029:  ldarg.1
       IL_002a:  ldarg.2
-      IL_002b:  call       instance class System.Object BoxTest.Test::Fibonacci2(class System.Object,
+      IL_002b:  call       instance class System.Object BoxTest_enum_il.Test::Fibonacci2(class System.Object,
                                                                                  class System.Object)
       IL_0030:  ret
     } // end of method 'Test::Fibonacci'
@@ -70,7 +70,7 @@
       .maxstack  4
       .locals ([0] int32 N,
                [1] int32 V_1,
-               [2] value class BoxTest.ToPrintOrNotToPrint V_2)
+               [2] value class BoxTest_enum_il.ToPrintOrNotToPrint V_2)
       IL_0000:  ldarg.1
       IL_0001:  unbox      [mscorlib]System.Int32
       IL_0006:  ldind.i4
@@ -95,8 +95,8 @@
       IL_0026:  ldc.i4.1
       IL_0027:  stloc.2
       IL_0028:  ldloc.s   V_2
-      IL_002a:  box BoxTest.ToPrintOrNotToPrint
-      IL_002f:  call       instance class System.Object BoxTest.Test::Fibonacci(class System.Object,
+      IL_002a:  box BoxTest_enum_il.ToPrintOrNotToPrint
+      IL_002f:  call       instance class System.Object BoxTest_enum_il.Test::Fibonacci(class System.Object,
                                                                                 class System.Object)
       IL_0034:  unbox      [mscorlib]System.Int32
       IL_0039:  ldind.i4
@@ -110,14 +110,14 @@
       IL_0045:  ldloc.s   V_1
       IL_0047:  box [mscorlib]System.Int32
       IL_004c:  ldarg.2
-      IL_004d:  call       instance class System.Object BoxTest.Test::Fibonacci(class System.Object,
+      IL_004d:  call       instance class System.Object BoxTest_enum_il.Test::Fibonacci(class System.Object,
                                                                                 class System.Object)
       IL_0052:  unbox      [mscorlib]System.Int32
       IL_0057:  ldind.i4
       IL_0058:  add
       IL_0059:  stloc.0
       IL_005a:  ldarg.2
-      IL_005b:  unbox      BoxTest.ToPrintOrNotToPrint
+      IL_005b:  unbox      BoxTest_enum_il.ToPrintOrNotToPrint
       IL_0060:  ldind.i4
       IL_0061:  ldc.i4.0
       IL_0062:  bne.un.s   IL_007a
@@ -133,7 +133,7 @@
       IL_0081:  ret
     } // end of method 'Test::Fibonacci2'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -143,8 +143,8 @@
       // Code size       47 (0x2f)
       .maxstack  3
       .locals ([0] int32 V_0,
-               [1] value class BoxTest.ToPrintOrNotToPrint V_1)
-      IL_0000:  newobj     instance void BoxTest.Test::.ctor()
+               [1] value class BoxTest_enum_il.ToPrintOrNotToPrint V_1)
+      IL_0000:  newobj     instance void BoxTest_enum_il.Test::.ctor()
       IL_0005:  ldc.i4.s   20
       IL_0007:  stloc.0
       IL_0008:  ldloc.s   V_0
@@ -152,8 +152,8 @@
       IL_000f:  ldc.i4.0
       IL_0010:  stloc.1
       IL_0011:  ldloc.s   V_1
-      IL_0013:  box BoxTest.ToPrintOrNotToPrint
-      IL_0018:  call       instance class System.Object BoxTest.Test::Fibonacci(class System.Object,
+      IL_0013:  box BoxTest_enum_il.ToPrintOrNotToPrint
+      IL_0018:  call       instance class System.Object BoxTest_enum_il.Test::Fibonacci(class System.Object,
                                                                                 class System.Object)
       IL_001d:  pop
       IL_001e:  call       void [System.Console]System.Console::WriteLine()
@@ -175,6 +175,6 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'BoxTest'
+} // end of namespace 'BoxTest_enum_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/Boxing/misc/enum_cs_d.csproj b/src/tests/JIT/Methodical/Boxing/misc/enum_cs_d.csproj
index 740bae8ac9b81d..fd9c03ea622be5 100644
--- a/src/tests/JIT/Methodical/Boxing/misc/enum_cs_d.csproj
+++ b/src/tests/JIT/Methodical/Boxing/misc/enum_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/Boxing/misc/enum_cs_do.csproj b/src/tests/JIT/Methodical/Boxing/misc/enum_cs_do.csproj
index 56b605ebd27d1f..e1b38bf214f6aa 100644
--- a/src/tests/JIT/Methodical/Boxing/misc/enum_cs_do.csproj
+++ b/src/tests/JIT/Methodical/Boxing/misc/enum_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/misc/enum_cs_r.csproj b/src/tests/JIT/Methodical/Boxing/misc/enum_cs_r.csproj
index c976b11ecd9e3e..a2d1e4acff4074 100644
--- a/src/tests/JIT/Methodical/Boxing/misc/enum_cs_r.csproj
+++ b/src/tests/JIT/Methodical/Boxing/misc/enum_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/misc/enum_cs_ro.csproj b/src/tests/JIT/Methodical/Boxing/misc/enum_cs_ro.csproj
index 7847dfaeb1aa9e..65e012cfebb5e8 100644
--- a/src/tests/JIT/Methodical/Boxing/misc/enum_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/Boxing/misc/enum_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/misc/enum_il_d.ilproj b/src/tests/JIT/Methodical/Boxing/misc/enum_il_d.ilproj
index 019d3a7f2be7eb..47192ba7c7219f 100644
--- a/src/tests/JIT/Methodical/Boxing/misc/enum_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/misc/enum_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/misc/enum_il_r.ilproj b/src/tests/JIT/Methodical/Boxing/misc/enum_il_r.ilproj
index 2708bfd54f1ec4..44893805362905 100644
--- a/src/tests/JIT/Methodical/Boxing/misc/enum_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/misc/enum_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/Boxing/misc/nestval.cs b/src/tests/JIT/Methodical/Boxing/misc/nestval.cs
index 4794aabdd046c5..c8583bfaa6ea71 100644
--- a/src/tests/JIT/Methodical/Boxing/misc/nestval.cs
+++ b/src/tests/JIT/Methodical/Boxing/misc/nestval.cs
@@ -2,8 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace BoxTest
+namespace BoxTest_nestval_cs
 {
     internal struct MyBool { public bool val; }
     internal struct MyInt { public int val; }
@@ -14,7 +15,7 @@ internal struct ArgInfo
         public MyInt m_num;
     }
 
-    internal class Test
+    public class Test
     {
         protected object Fibonacci(object args)
         {
@@ -48,7 +49,8 @@ protected object FibonacciImpl(object args)
             return N;
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             ArgInfo args = new ArgInfo();
             args.m_flag.val = true;
diff --git a/src/tests/JIT/Methodical/Boxing/misc/nestval.il b/src/tests/JIT/Methodical/Boxing/misc/nestval.il
index d06cd338b0b394..e97e2314eb985b 100644
--- a/src/tests/JIT/Methodical/Boxing/misc/nestval.il
+++ b/src/tests/JIT/Methodical/Boxing/misc/nestval.il
@@ -10,7 +10,7 @@
 .assembly extern mscorlib { }
 .assembly 'nestval' { }
 .assembly extern xunit.core {}
-.namespace BoxTest
+.namespace BoxTest_nestval_il
 {
   .class value auto ansi sealed MyBool extends [mscorlib]System.ValueType
   {
@@ -24,11 +24,11 @@
 
   .class value auto ansi sealed ArgInfo extends [mscorlib]System.ValueType
   {
-    .field public value class BoxTest.MyBool m_flag
-    .field public value class BoxTest.MyInt m_num
+    .field public value class BoxTest_nestval_il.MyBool m_flag
+    .field public value class BoxTest_nestval_il.MyInt m_num
   } // end of class 'ArgInfo'
 
-  .class auto ansi Test extends [mscorlib]System.Object
+  .class public auto ansi Test extends [mscorlib]System.Object
   {
     .method family hidebysig instance class System.Object 
             Fibonacci(class System.Object args) il managed
@@ -36,7 +36,7 @@
       .maxstack  8
       IL_0000:  ldarg.1
       IL_0001:  call       instance class [mscorlib]System.Type [mscorlib]System.Object::GetType()
-      IL_0006:  ldtoken    BoxTest.ArgInfo
+      IL_0006:  ldtoken    BoxTest_nestval_il.ArgInfo
       IL_000b:  call       class [mscorlib]System.Type [mscorlib]System.Type::GetTypeFromHandle(value class [mscorlib]System.RuntimeTypeHandle)
       IL_0010:  beq.s      IL_0018
 
@@ -45,7 +45,7 @@
 
       IL_0018:  ldarg.0
       IL_0019:  ldarg.1
-      IL_001a:  call       instance class System.Object BoxTest.Test::FibonacciImpl(class System.Object)
+      IL_001a:  call       instance class System.Object BoxTest_nestval_il.Test::FibonacciImpl(class System.Object)
       IL_001f:  ret
     } // end of method 'Test::Fibonacci'
 
@@ -54,33 +54,33 @@
     {
       .maxstack  3
       .locals ([0] class System.Object N,
-               [1] value class BoxTest.ArgInfo newargs1,
-               [2] value class BoxTest.ArgInfo newargs2,
-               [3] value class BoxTest.ArgInfo V_3,
-               [4] value class BoxTest.MyInt V_4,
+               [1] value class BoxTest_nestval_il.ArgInfo newargs1,
+               [2] value class BoxTest_nestval_il.ArgInfo newargs2,
+               [3] value class BoxTest_nestval_il.ArgInfo V_3,
+               [4] value class BoxTest_nestval_il.MyInt V_4,
                [5] int32 V_5,
-               [6] value class BoxTest.MyBool V_6)
+               [6] value class BoxTest_nestval_il.MyBool V_6)
       IL_0000:  ldarg.1
-      IL_0001:  unbox      BoxTest.ArgInfo
-      IL_0006:  ldobj      BoxTest.ArgInfo
+      IL_0001:  unbox      BoxTest_nestval_il.ArgInfo
+      IL_0006:  ldobj      BoxTest_nestval_il.ArgInfo
       IL_000b:  stloc.3
       IL_000c:  ldloca.s   V_3
-      IL_000e:  ldfld      value class BoxTest.MyInt BoxTest.ArgInfo::m_num
+      IL_000e:  ldfld      value class BoxTest_nestval_il.MyInt BoxTest_nestval_il.ArgInfo::m_num
       IL_0013:  stloc.s    V_4
       IL_0015:  ldloca.s   V_4
-      IL_0017:  ldfld      int32 BoxTest.MyInt::val
+      IL_0017:  ldfld      int32 BoxTest_nestval_il.MyInt::val
       IL_001c:  ldc.i4.1
       IL_001d:  bgt.s      IL_004a
 
       IL_001f:  ldarg.1
-      IL_0020:  unbox      BoxTest.ArgInfo
-      IL_0025:  ldobj      BoxTest.ArgInfo
+      IL_0020:  unbox      BoxTest_nestval_il.ArgInfo
+      IL_0025:  ldobj      BoxTest_nestval_il.ArgInfo
       IL_002a:  stloc.3
       IL_002b:  ldloca.s   V_3
-      IL_002d:  ldfld      value class BoxTest.MyInt BoxTest.ArgInfo::m_num
+      IL_002d:  ldfld      value class BoxTest_nestval_il.MyInt BoxTest_nestval_il.ArgInfo::m_num
       IL_0032:  stloc.s    V_4
       IL_0034:  ldloca.s   V_4
-      IL_0036:  ldfld      int32 BoxTest.MyInt::val
+      IL_0036:  ldfld      int32 BoxTest_nestval_il.MyInt::val
       IL_003b:  stloc.s    V_5
       IL_003d:  ldloc.s   V_5
       IL_003f:  box [mscorlib]System.Int32
@@ -88,63 +88,63 @@
       IL_0045:  br         IL_0114
 
       IL_004a:  ldloca.s   newargs1
-      IL_004c:  initobj    BoxTest.ArgInfo
+      IL_004c:  initobj    BoxTest_nestval_il.ArgInfo
       IL_0052:  ldloca.s   newargs1
-      IL_0054:  ldflda     value class BoxTest.MyInt BoxTest.ArgInfo::m_num
+      IL_0054:  ldflda     value class BoxTest_nestval_il.MyInt BoxTest_nestval_il.ArgInfo::m_num
       IL_0059:  ldarg.1
-      IL_005a:  unbox      BoxTest.ArgInfo
-      IL_005f:  ldobj      BoxTest.ArgInfo
+      IL_005a:  unbox      BoxTest_nestval_il.ArgInfo
+      IL_005f:  ldobj      BoxTest_nestval_il.ArgInfo
       IL_0064:  stloc.3
       IL_0065:  ldloca.s   V_3
-      IL_0067:  ldfld      value class BoxTest.MyInt BoxTest.ArgInfo::m_num
+      IL_0067:  ldfld      value class BoxTest_nestval_il.MyInt BoxTest_nestval_il.ArgInfo::m_num
       IL_006c:  stloc.s    V_4
       IL_006e:  ldloca.s   V_4
-      IL_0070:  ldfld      int32 BoxTest.MyInt::val
+      IL_0070:  ldfld      int32 BoxTest_nestval_il.MyInt::val
       IL_0075:  ldc.i4.2
       IL_0076:  sub
-      IL_0077:  stfld      int32 BoxTest.MyInt::val
+      IL_0077:  stfld      int32 BoxTest_nestval_il.MyInt::val
       IL_007c:  ldloca.s   newargs1
-      IL_007e:  ldflda     value class BoxTest.MyBool BoxTest.ArgInfo::m_flag
+      IL_007e:  ldflda     value class BoxTest_nestval_il.MyBool BoxTest_nestval_il.ArgInfo::m_flag
       IL_0083:  ldc.i4.0
-      IL_0084:  stfld      bool BoxTest.MyBool::val
+      IL_0084:  stfld      bool BoxTest_nestval_il.MyBool::val
       IL_0089:  ldloca.s   newargs2
-      IL_008b:  initobj    BoxTest.ArgInfo
+      IL_008b:  initobj    BoxTest_nestval_il.ArgInfo
       IL_0091:  ldloca.s   newargs2
-      IL_0093:  ldflda     value class BoxTest.MyInt BoxTest.ArgInfo::m_num
+      IL_0093:  ldflda     value class BoxTest_nestval_il.MyInt BoxTest_nestval_il.ArgInfo::m_num
       IL_0098:  ldarg.1
-      IL_0099:  unbox      BoxTest.ArgInfo
-      IL_009e:  ldobj      BoxTest.ArgInfo
+      IL_0099:  unbox      BoxTest_nestval_il.ArgInfo
+      IL_009e:  ldobj      BoxTest_nestval_il.ArgInfo
       IL_00a3:  stloc.3
       IL_00a4:  ldloca.s   V_3
-      IL_00a6:  ldfld      value class BoxTest.MyInt BoxTest.ArgInfo::m_num
+      IL_00a6:  ldfld      value class BoxTest_nestval_il.MyInt BoxTest_nestval_il.ArgInfo::m_num
       IL_00ab:  stloc.s    V_4
       IL_00ad:  ldloca.s   V_4
-      IL_00af:  ldfld      int32 BoxTest.MyInt::val
+      IL_00af:  ldfld      int32 BoxTest_nestval_il.MyInt::val
       IL_00b4:  ldc.i4.1
       IL_00b5:  sub
-      IL_00b6:  stfld      int32 BoxTest.MyInt::val
+      IL_00b6:  stfld      int32 BoxTest_nestval_il.MyInt::val
       IL_00bb:  ldloca.s   newargs2
-      IL_00bd:  ldflda     value class BoxTest.MyBool BoxTest.ArgInfo::m_flag
+      IL_00bd:  ldflda     value class BoxTest_nestval_il.MyBool BoxTest_nestval_il.ArgInfo::m_flag
       IL_00c2:  ldarg.1
-      IL_00c3:  unbox      BoxTest.ArgInfo
-      IL_00c8:  ldobj      BoxTest.ArgInfo
+      IL_00c3:  unbox      BoxTest_nestval_il.ArgInfo
+      IL_00c8:  ldobj      BoxTest_nestval_il.ArgInfo
       IL_00cd:  stloc.3
       IL_00ce:  ldloca.s   V_3
-      IL_00d0:  ldfld      value class BoxTest.MyBool BoxTest.ArgInfo::m_flag
+      IL_00d0:  ldfld      value class BoxTest_nestval_il.MyBool BoxTest_nestval_il.ArgInfo::m_flag
       IL_00d5:  stloc.s    V_6
       IL_00d7:  ldloca.s   V_6
-      IL_00d9:  ldfld      bool BoxTest.MyBool::val
-      IL_00de:  stfld      bool BoxTest.MyBool::val
+      IL_00d9:  ldfld      bool BoxTest_nestval_il.MyBool::val
+      IL_00de:  stfld      bool BoxTest_nestval_il.MyBool::val
       IL_00e3:  ldarg.0
       IL_00e4:  ldloc.s   newargs1
-      IL_00e6:  box BoxTest.ArgInfo
-      IL_00eb:  call       instance class System.Object BoxTest.Test::Fibonacci(class System.Object)
+      IL_00e6:  box BoxTest_nestval_il.ArgInfo
+      IL_00eb:  call       instance class System.Object BoxTest_nestval_il.Test::Fibonacci(class System.Object)
       IL_00f0:  unbox      [mscorlib]System.Int32
       IL_00f5:  ldind.i4
       IL_00f6:  ldarg.0
       IL_00f7:  ldloc.s   newargs2
-      IL_00f9:  box BoxTest.ArgInfo
-      IL_00fe:  call       instance class System.Object BoxTest.Test::Fibonacci(class System.Object)
+      IL_00f9:  box BoxTest_nestval_il.ArgInfo
+      IL_00fe:  call       instance class System.Object BoxTest_nestval_il.Test::Fibonacci(class System.Object)
       IL_0103:  unbox      [mscorlib]System.Int32
       IL_0108:  ldind.i4
       IL_0109:  add
@@ -153,25 +153,25 @@
       IL_010e:  box [mscorlib]System.Int32
       IL_0113:  stloc.0
       IL_0114:  ldarg.1
-      IL_0115:  unbox      BoxTest.ArgInfo
-      IL_011a:  ldobj      BoxTest.ArgInfo
+      IL_0115:  unbox      BoxTest_nestval_il.ArgInfo
+      IL_011a:  ldobj      BoxTest_nestval_il.ArgInfo
       IL_011f:  stloc.3
       IL_0120:  ldloca.s   V_3
-      IL_0122:  ldfld      value class BoxTest.MyBool BoxTest.ArgInfo::m_flag
+      IL_0122:  ldfld      value class BoxTest_nestval_il.MyBool BoxTest_nestval_il.ArgInfo::m_flag
       IL_0127:  stloc.s    V_6
       IL_0129:  ldloca.s   V_6
-      IL_012b:  ldfld      bool BoxTest.MyBool::val
+      IL_012b:  ldfld      bool BoxTest_nestval_il.MyBool::val
       IL_0130:  brfalse.s  IL_017f
 
       IL_0132:  ldarg.1
-      IL_0133:  unbox      BoxTest.ArgInfo
-      IL_0138:  ldobj      BoxTest.ArgInfo
+      IL_0133:  unbox      BoxTest_nestval_il.ArgInfo
+      IL_0138:  ldobj      BoxTest_nestval_il.ArgInfo
       IL_013d:  stloc.3
       IL_013e:  ldloca.s   V_3
-      IL_0140:  ldfld      value class BoxTest.MyInt BoxTest.ArgInfo::m_num
+      IL_0140:  ldfld      value class BoxTest_nestval_il.MyInt BoxTest_nestval_il.ArgInfo::m_num
       IL_0145:  stloc.s    V_4
       IL_0147:  ldloca.s   V_4
-      IL_0149:  ldfld      int32 BoxTest.MyInt::val
+      IL_0149:  ldfld      int32 BoxTest_nestval_il.MyInt::val
       IL_014e:  ldc.i4.2
       IL_014f:  rem
       IL_0150:  ldc.i4.0
@@ -195,7 +195,7 @@
       IL_0180:  ret
     } // end of method 'Test::FibonacciImpl'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -203,21 +203,21 @@
       )
       .entrypoint
       .maxstack  2
-      .locals ([0] value class BoxTest.ArgInfo args)
+      .locals ([0] value class BoxTest_nestval_il.ArgInfo args)
       IL_0000:  ldloca.s   args
-      IL_0002:  initobj    BoxTest.ArgInfo
+      IL_0002:  initobj    BoxTest_nestval_il.ArgInfo
       IL_0008:  ldloca.s   args
-      IL_000a:  ldflda     value class BoxTest.MyBool BoxTest.ArgInfo::m_flag
+      IL_000a:  ldflda     value class BoxTest_nestval_il.MyBool BoxTest_nestval_il.ArgInfo::m_flag
       IL_000f:  ldc.i4.1
-      IL_0010:  stfld      bool BoxTest.MyBool::val
+      IL_0010:  stfld      bool BoxTest_nestval_il.MyBool::val
       IL_0015:  ldloca.s   args
-      IL_0017:  ldflda     value class BoxTest.MyInt BoxTest.ArgInfo::m_num
+      IL_0017:  ldflda     value class BoxTest_nestval_il.MyInt BoxTest_nestval_il.ArgInfo::m_num
       IL_001c:  ldc.i4.s   20
-      IL_001e:  stfld      int32 BoxTest.MyInt::val
-      IL_0023:  newobj     instance void BoxTest.Test::.ctor()
+      IL_001e:  stfld      int32 BoxTest_nestval_il.MyInt::val
+      IL_0023:  newobj     instance void BoxTest_nestval_il.Test::.ctor()
       IL_0028:  ldloc.s   args
-      IL_002a:  box BoxTest.ArgInfo
-      IL_002f:  call       instance class System.Object BoxTest.Test::Fibonacci(class System.Object)
+      IL_002a:  box BoxTest_nestval_il.ArgInfo
+      IL_002f:  call       instance class System.Object BoxTest_nestval_il.Test::Fibonacci(class System.Object)
       IL_0034:  pop
       IL_0035:  call       void [System.Console]System.Console::WriteLine()
       IL_003a:  ldstr      "*** PASSED ***"
@@ -237,5 +237,5 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'BoxTest'
+} // end of namespace 'BoxTest_nestval_il'
 
diff --git a/src/tests/JIT/Methodical/Boxing/misc/nestval_cs_d.csproj b/src/tests/JIT/Methodical/Boxing/misc/nestval_cs_d.csproj
index 20e302e7fedd05..f0c9dd0c131b47 100644
--- a/src/tests/JIT/Methodical/Boxing/misc/nestval_cs_d.csproj
+++ b/src/tests/JIT/Methodical/Boxing/misc/nestval_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/Boxing/misc/nestval_cs_do.csproj b/src/tests/JIT/Methodical/Boxing/misc/nestval_cs_do.csproj
index a9f9da81734ca0..ec86af7b4e7ad7 100644
--- a/src/tests/JIT/Methodical/Boxing/misc/nestval_cs_do.csproj
+++ b/src/tests/JIT/Methodical/Boxing/misc/nestval_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/misc/nestval_cs_r.csproj b/src/tests/JIT/Methodical/Boxing/misc/nestval_cs_r.csproj
index aeadd6b63b86ec..5c23363c87040c 100644
--- a/src/tests/JIT/Methodical/Boxing/misc/nestval_cs_r.csproj
+++ b/src/tests/JIT/Methodical/Boxing/misc/nestval_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/Boxing/misc/nestval_cs_ro.csproj b/src/tests/JIT/Methodical/Boxing/misc/nestval_cs_ro.csproj
index 57bfb2e7da564c..107690f7f8b798 100644
--- a/src/tests/JIT/Methodical/Boxing/misc/nestval_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/Boxing/misc/nestval_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/Boxing/misc/nestval_il_d.ilproj b/src/tests/JIT/Methodical/Boxing/misc/nestval_il_d.ilproj
index 0eceb4c954b906..cb82717e2929c2 100644
--- a/src/tests/JIT/Methodical/Boxing/misc/nestval_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/misc/nestval_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/misc/nestval_il_r.ilproj b/src/tests/JIT/Methodical/Boxing/misc/nestval_il_r.ilproj
index de9333650c6284..200077f4d47401 100644
--- a/src/tests/JIT/Methodical/Boxing/misc/nestval_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/misc/nestval_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/misc/tailjump.cs b/src/tests/JIT/Methodical/Boxing/misc/tailjump.cs
index 50aa94a1b751cc..1f7d14de9dc5ba 100644
--- a/src/tests/JIT/Methodical/Boxing/misc/tailjump.cs
+++ b/src/tests/JIT/Methodical/Boxing/misc/tailjump.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace BoxTest
+namespace BoxTest_tailjump_cs
 {
-    internal class Test
+    public class Test
     {
         protected object Fibonacci(object num, object flag)
         {
@@ -28,7 +29,8 @@ protected object Fibonacci2(object num, object flag)
             return N;
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             new Test().Fibonacci(20, true);
             Console.WriteLine();
diff --git a/src/tests/JIT/Methodical/Boxing/misc/tailjump.il b/src/tests/JIT/Methodical/Boxing/misc/tailjump.il
index 08ad58752fd7eb..a9148dff7f1840 100644
--- a/src/tests/JIT/Methodical/Boxing/misc/tailjump.il
+++ b/src/tests/JIT/Methodical/Boxing/misc/tailjump.il
@@ -9,9 +9,9 @@
 }
 .assembly 'tailjump' { }
 .assembly extern xunit.core {}
-.namespace BoxTest
+.namespace BoxTest_tailjump_il
 {
-  .class auto ansi Test extends [mscorlib]System.Object
+  .class public auto ansi Test extends [mscorlib]System.Object
   {
     .method family hidebysig instance class System.Object 
             Fibonacci(class System.Object num,
@@ -27,7 +27,7 @@
       IL_0009:  ldarg.0
       IL_000a:  ldarg.1
       IL_000b:  ldarg.2
-      IL_000c:  tail. call       instance class System.Object BoxTest.Test::Fibonacci2(class System.Object,
+      IL_000c:  tail. call       instance class System.Object BoxTest_tailjump_il.Test::Fibonacci2(class System.Object,
                                                                                  class System.Object)
       IL_0011:  ret
 
@@ -39,11 +39,11 @@
       IL_001b:  ldc.i4.0
       IL_001c:  bne.un.s   IL_0027
 
-				jmp        instance class System.Object BoxTest.Test::Fibonacci2(class System.Object,
+				jmp        instance class System.Object BoxTest_tailjump_il.Test::Fibonacci2(class System.Object,
                                                                                  class System.Object)
                                                                                  
       IL_0027: 
-      			jmp       instance class System.Object BoxTest.Test::Fibonacci2(class System.Object,
+      			jmp       instance class System.Object BoxTest_tailjump_il.Test::Fibonacci2(class System.Object,
                                                                                  class System.Object)
     } // end of method 'Test::Fibonacci'
 
@@ -81,7 +81,7 @@
       IL_0027:  stloc.2
       IL_0028:  ldloc.s   V_2
       IL_002a:  box[mscorlib]System.Boolean
-      IL_002f:  call       instance class System.Object BoxTest.Test::Fibonacci(class System.Object,
+      IL_002f:  call       instance class System.Object BoxTest_tailjump_il.Test::Fibonacci(class System.Object,
                                                                                 class System.Object)
       IL_0034:  unbox      [mscorlib]System.Int32
       IL_0039:  ldind.i4
@@ -95,7 +95,7 @@
       IL_0045:  ldloc.s   V_1
       IL_0047:  box[mscorlib]System.Int32
       IL_004c:  ldarg.2
-      IL_004d:  call       instance class System.Object BoxTest.Test::Fibonacci(class System.Object,
+      IL_004d:  call       instance class System.Object BoxTest_tailjump_il.Test::Fibonacci(class System.Object,
                                                                                 class System.Object)
       IL_0052:  unbox      [mscorlib]System.Int32
       IL_0057:  ldind.i4
@@ -117,7 +117,7 @@
       IL_0080:  ret
     } // end of method 'Test::Fibonacci2'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -128,7 +128,7 @@
       .maxstack  3
       .locals ([0] int32 V_0,
                [1] bool V_1)
-      IL_0000:  newobj     instance void BoxTest.Test::.ctor()
+      IL_0000:  newobj     instance void BoxTest_tailjump_il.Test::.ctor()
       IL_0005:  ldc.i4.s   20
       IL_0007:  stloc.0
       IL_0008:  ldloc.s   V_0
@@ -137,7 +137,7 @@
       IL_0010:  stloc.1
       IL_0011:  ldloc.s   V_1
       IL_0013:  box[mscorlib]System.Boolean
-      IL_0018:  call       instance class System.Object BoxTest.Test::Fibonacci(class System.Object,
+      IL_0018:  call       instance class System.Object BoxTest_tailjump_il.Test::Fibonacci(class System.Object,
                                                                                 class System.Object)
       IL_001d:  pop
       IL_001e:  call       void [System.Console]System.Console::WriteLine()
@@ -159,6 +159,6 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'BoxTest'
+} // end of namespace 'BoxTest_tailjump_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/Boxing/misc/tailjump_cs_d.csproj b/src/tests/JIT/Methodical/Boxing/misc/tailjump_cs_d.csproj
index 857a53f310e139..6e519b07e4e00f 100644
--- a/src/tests/JIT/Methodical/Boxing/misc/tailjump_cs_d.csproj
+++ b/src/tests/JIT/Methodical/Boxing/misc/tailjump_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/Boxing/misc/tailjump_cs_do.csproj b/src/tests/JIT/Methodical/Boxing/misc/tailjump_cs_do.csproj
index e9122c8b044ed6..4c647e1e475da6 100644
--- a/src/tests/JIT/Methodical/Boxing/misc/tailjump_cs_do.csproj
+++ b/src/tests/JIT/Methodical/Boxing/misc/tailjump_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/misc/tailjump_cs_r.csproj b/src/tests/JIT/Methodical/Boxing/misc/tailjump_cs_r.csproj
index 03ddb4831573c5..064190d322503a 100644
--- a/src/tests/JIT/Methodical/Boxing/misc/tailjump_cs_r.csproj
+++ b/src/tests/JIT/Methodical/Boxing/misc/tailjump_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/Boxing/misc/tailjump_cs_ro.csproj b/src/tests/JIT/Methodical/Boxing/misc/tailjump_cs_ro.csproj
index a141156464fa02..d17cfa1f329024 100644
--- a/src/tests/JIT/Methodical/Boxing/misc/tailjump_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/Boxing/misc/tailjump_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/Boxing/misc/tailjump_il_d.ilproj b/src/tests/JIT/Methodical/Boxing/misc/tailjump_il_d.ilproj
index fccff9f706e9b8..8fbe24639d318e 100644
--- a/src/tests/JIT/Methodical/Boxing/misc/tailjump_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/misc/tailjump_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/Boxing/misc/tailjump_il_r.ilproj b/src/tests/JIT/Methodical/Boxing/misc/tailjump_il_r.ilproj
index 852a8299084190..54d39a17fde5c4 100644
--- a/src/tests/JIT/Methodical/Boxing/misc/tailjump_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/misc/tailjump_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/Boxing/misc/typedref.il b/src/tests/JIT/Methodical/Boxing/misc/typedref.il
index 6ccc23d5a81725..fc406fa0084617 100644
--- a/src/tests/JIT/Methodical/Boxing/misc/typedref.il
+++ b/src/tests/JIT/Methodical/Boxing/misc/typedref.il
@@ -10,9 +10,9 @@
 .assembly extern mscorlib { }
 .assembly 'typedref' { }
 .assembly extern xunit.core {}
-.namespace BoxTest
+.namespace BoxTest_typedref_il
 {
-  .class auto ansi Test extends [mscorlib]System.Object
+  .class public auto ansi Test extends [mscorlib]System.Object
   {
     .method family hidebysig instance class [mscorlib]System.Object 
             Fibonacci(typedref num, typedref flag) il managed
@@ -46,7 +46,7 @@ equal_types:
       			ldarg.2
 				refanyval	[mscorlib]System.Object
 				ldind.ref
-      			tail. call       instance class System.Object BoxTest.Test::Fibonacci2(class System.Object,
+      			tail. call       instance class System.Object BoxTest_typedref_il.Test::Fibonacci2(class System.Object,
                                                                                  class System.Object)
       			ret
     } // end of method 'Test::Fibonacci'
@@ -90,7 +90,7 @@ equal_types:
       			stloc buf2
       			ldloca buf2
       			mkrefany	[mscorlib]System.Object
-      IL_0029:  call       instance class [mscorlib]System.Object BoxTest.Test::Fibonacci(typedref, typedref)
+      IL_0029:  call       instance class [mscorlib]System.Object BoxTest_typedref_il.Test::Fibonacci(typedref, typedref)
       IL_002e:  unbox      [mscorlib]System.Int32
       IL_0033:  ldind.i4
       IL_0034:  ldarg.0
@@ -107,7 +107,7 @@ equal_types:
       			mkrefany	[mscorlib]System.Object
       IL_0046:  ldarga flag
       			mkrefany	[mscorlib]System.Object
-      IL_0047:  call       instance class [mscorlib]System.Object BoxTest.Test::Fibonacci(typedref, typedref)
+      IL_0047:  call       instance class [mscorlib]System.Object BoxTest_typedref_il.Test::Fibonacci(typedref, typedref)
       IL_004c:  unbox      [mscorlib]System.Int32
       IL_0051:  ldind.i4
       IL_0052:  add
@@ -146,7 +146,7 @@ equal_types:
       IL_009e:  ret
     } // end of method 'Test::Fibonacci2'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -158,7 +158,7 @@ equal_types:
                [1] bool V_1,
                [2] class [mscorlib]System.Object buf1,
                [3] class [mscorlib]System.Object buf2)
-      IL_0000:  newobj     instance void BoxTest.Test::.ctor()
+      IL_0000:  newobj     instance void BoxTest_typedref_il.Test::.ctor()
       IL_0005:  ldc.i4.s   20
       IL_0007:  stloc.0
       
@@ -176,7 +176,7 @@ equal_types:
       			ldloca buf2
       			mkrefany	[mscorlib]System.Object
       
-      IL_0018:  call       instance class [mscorlib]System.Object BoxTest.Test::Fibonacci(typedref, typedref)
+      IL_0018:  call       instance class [mscorlib]System.Object BoxTest_typedref_il.Test::Fibonacci(typedref, typedref)
       IL_001d:  pop
       IL_001e:  call       void [System.Console]System.Console::WriteLine()
       IL_0023:  ldstr      "*** PASSED ***"
@@ -196,5 +196,5 @@ equal_types:
 
   } // end of class 'Test'
 
-} // end of namespace 'BoxTest'
+} // end of namespace 'BoxTest_typedref_il'
 
diff --git a/src/tests/JIT/Methodical/Boxing/misc/typedref_il_d.ilproj b/src/tests/JIT/Methodical/Boxing/misc/typedref_il_d.ilproj
index 008552e861693e..8726384835cfd8 100644
--- a/src/tests/JIT/Methodical/Boxing/misc/typedref_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/misc/typedref_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/misc/typedref_il_r.ilproj b/src/tests/JIT/Methodical/Boxing/misc/typedref_il_r.ilproj
index 27305701ce8801..96199a179aea46 100644
--- a/src/tests/JIT/Methodical/Boxing/misc/typedref_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/misc/typedref_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/misc/unusedindir.cs b/src/tests/JIT/Methodical/Boxing/misc/unusedindir.cs
index cf0f1698e70cdf..5dabe1abd71d46 100644
--- a/src/tests/JIT/Methodical/Boxing/misc/unusedindir.cs
+++ b/src/tests/JIT/Methodical/Boxing/misc/unusedindir.cs
@@ -3,8 +3,11 @@
 
 using System;
 using System.Runtime.CompilerServices;
+using Xunit;
 
-class Program
+namespace Test_unusedindir_cs
+{
+public class Program
 {
     struct NotPromoted
     {
@@ -34,5 +37,7 @@ static NotPromoted Test(TypeWithStruct obj)
         return t;
     }
 
-    static int Main() => Test(new TypeWithStruct()).c;
+    [Fact]
+    public static int TestEntryPoint() => Test(new TypeWithStruct()).c;
+}
 }
diff --git a/src/tests/JIT/Methodical/Boxing/misc/unusedindir.csproj b/src/tests/JIT/Methodical/Boxing/misc/unusedindir.csproj
index 1554c2096d81a2..6bb31ca7e7eaa6 100644
--- a/src/tests/JIT/Methodical/Boxing/misc/unusedindir.csproj
+++ b/src/tests/JIT/Methodical/Boxing/misc/unusedindir.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/Boxing/morph/sin.cs b/src/tests/JIT/Methodical/Boxing/morph/sin.cs
index 71205f11897e2a..f377e145f9689d 100644
--- a/src/tests/JIT/Methodical/Boxing/morph/sin.cs
+++ b/src/tests/JIT/Methodical/Boxing/morph/sin.cs
@@ -3,11 +3,12 @@
 
 
 using System;
+using Xunit;
 
 
-namespace SinCalc
+namespace SinCalc_sin_morph_cs
 {
-    internal class SinCalc
+    public class SinCalc
     {
         protected static object PI = 3.1415926535897932384626433832795d;
 
@@ -28,7 +29,8 @@ protected static object mySin(object Angle)
             return sumOfTerms;
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             object i;
             object Angle;
diff --git a/src/tests/JIT/Methodical/Boxing/morph/sin3double.il b/src/tests/JIT/Methodical/Boxing/morph/sin3double.il
index 1a1ccd97d659c1..b29af2177d9acf 100644
--- a/src/tests/JIT/Methodical/Boxing/morph/sin3double.il
+++ b/src/tests/JIT/Methodical/Boxing/morph/sin3double.il
@@ -196,7 +196,7 @@
   IL_0130:  ret
 }
 
-.method static int32 Main() cil managed
+.method public static int32 Main() cil managed
 {
   .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
       01 00 00 00
diff --git a/src/tests/JIT/Methodical/Boxing/morph/sin3double.ilproj b/src/tests/JIT/Methodical/Boxing/morph/sin3double.ilproj
index b49291420fd12a..a855602e350421 100644
--- a/src/tests/JIT/Methodical/Boxing/morph/sin3double.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/morph/sin3double.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/Boxing/morph/sin_morph_cs_d.csproj b/src/tests/JIT/Methodical/Boxing/morph/sin_morph_cs_d.csproj
index 5c6a20156639a5..449344c35fb989 100644
--- a/src/tests/JIT/Methodical/Boxing/morph/sin_morph_cs_d.csproj
+++ b/src/tests/JIT/Methodical/Boxing/morph/sin_morph_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/morph/sin_morph_cs_do.csproj b/src/tests/JIT/Methodical/Boxing/morph/sin_morph_cs_do.csproj
index 5ba6965ad8a3c7..eff1294a83f27a 100644
--- a/src/tests/JIT/Methodical/Boxing/morph/sin_morph_cs_do.csproj
+++ b/src/tests/JIT/Methodical/Boxing/morph/sin_morph_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
diff --git a/src/tests/JIT/Methodical/Boxing/morph/sin_morph_cs_r.csproj b/src/tests/JIT/Methodical/Boxing/morph/sin_morph_cs_r.csproj
index 972dd5229e84f7..06a6dfa4cc91b5 100644
--- a/src/tests/JIT/Methodical/Boxing/morph/sin_morph_cs_r.csproj
+++ b/src/tests/JIT/Methodical/Boxing/morph/sin_morph_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/morph/sin_morph_cs_ro.csproj b/src/tests/JIT/Methodical/Boxing/morph/sin_morph_cs_ro.csproj
index 20e19140a25438..e6176c114768be 100644
--- a/src/tests/JIT/Methodical/Boxing/morph/sin_morph_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/Boxing/morph/sin_morph_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/seh/fault.il b/src/tests/JIT/Methodical/Boxing/seh/fault.il
index a0305a85f87f6e..32b2e7a0b1ecf8 100644
--- a/src/tests/JIT/Methodical/Boxing/seh/fault.il
+++ b/src/tests/JIT/Methodical/Boxing/seh/fault.il
@@ -14,7 +14,7 @@
 {
 }
 .assembly extern xunit.core {}
-.namespace SinCalc
+.namespace SinCalc_fault_seh_il
 {
   .class auto ansi MistakeException extends [mscorlib]System.Exception
   {
@@ -29,7 +29,7 @@
       IL_000b:  ldarg.0
       IL_000c:  ldarg.s   m
       IL_000e:  box        [mscorlib]System.Double
-      IL_0013:  stfld      class System.Object SinCalc.MistakeException::mistake
+      IL_0013:  stfld      class System.Object SinCalc_fault_seh_il.MistakeException::mistake
       IL_0018:  ret
     } // end of method 'MistakeException::.ctor'
 
@@ -39,7 +39,7 @@
       .maxstack  8
       IL_0000:  ldstr      "Mistake is "
       IL_0005:  ldarg.0
-      IL_0006:  ldfld      class System.Object SinCalc.MistakeException::mistake
+      IL_0006:  ldfld      class System.Object SinCalc_fault_seh_il.MistakeException::mistake
       IL_000b:  callvirt   instance class System.String [mscorlib]System.Object::ToString()
       IL_0010:  call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String)
@@ -48,7 +48,7 @@
 
   } // end of class 'MistakeException'
 
-  .class auto ansi SinCalc extends [mscorlib]System.Object
+  .class public auto ansi SinCalc_fault_seh_il extends [mscorlib]System.Object
   {
     .field static family class System.Object PI
     .method family hidebysig static class System.Object 
@@ -159,7 +159,7 @@
 
       IL_00df:  ldloc.1
       IL_00e0:  ret
-    } // end of method 'SinCalc::mySin'
+    } // end of method 'SinCalc_fault_seh_il::mySin'
 
     .method family hidebysig static class System.Object 
             CalcAndCheck(class System.Object Angle,
@@ -184,7 +184,7 @@
       IL_0021:  box        [mscorlib]System.Double
       IL_0026:  stloc.1
       IL_0027:  ldarg.0
-      IL_0028:  call       class System.Object SinCalc.SinCalc::mySin(class System.Object)
+      IL_0028:  call       class System.Object SinCalc_fault_seh_il.SinCalc_fault_seh_il::mySin(class System.Object)
       IL_002d:  unbox      [mscorlib]System.Double
       IL_0032:  ldind.r8
       IL_0033:  stloc.3
@@ -212,7 +212,7 @@
       IL_0066:  ldind.r8
       IL_0067:  sub
       IL_0068:  call       float64 [mscorlib]System.Math::Abs(float64)
-      IL_006d:  newobj     instance void SinCalc.MistakeException::.ctor(float64)
+      IL_006d:  newobj     instance void SinCalc_fault_seh_il.MistakeException::.ctor(float64)
       IL_0072:  throw
 
       IL_0073:  ldloc.1
@@ -236,7 +236,7 @@
       IL_009d:  ldind.r8
       IL_009e:  sub
       IL_009f:  call       float64 [mscorlib]System.Math::Abs(float64)
-      IL_00a4:  newobj     instance void SinCalc.MistakeException::.ctor(float64)
+      IL_00a4:  newobj     instance void SinCalc_fault_seh_il.MistakeException::.ctor(float64)
       IL_00a9:  throw
 
       IL_00aa:  ldloc.2
@@ -260,14 +260,14 @@
       IL_00d4:  ldind.r8
       IL_00d5:  sub
       IL_00d6:  call       float64 [mscorlib]System.Math::Abs(float64)
-      IL_00db:  newobj     instance void SinCalc.MistakeException::.ctor(float64)
+      IL_00db:  newobj     instance void SinCalc_fault_seh_il.MistakeException::.ctor(float64)
       IL_00e0:  throw
 
       IL_00e1:  ldloc.1
       IL_00e2:  ret
-    } // end of method 'SinCalc::CalcAndCheck'
+    } // end of method 'SinCalc_fault_seh_il::CalcAndCheck'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -281,7 +281,7 @@
                [3] class System.Object total1,
                [4] class System.Object total2,
                [5] class System.Object total3,
-               [6] class SinCalc.MistakeException ex,
+               [6] class SinCalc_fault_seh_il.MistakeException ex,
                [7] float64 V_7,
                [8] int32 V_8,
                [9] class System.String[] V_9)
@@ -384,7 +384,7 @@
       {
         .try
         {
-          IL_0126:  ldsfld     class System.Object SinCalc.SinCalc::PI
+          IL_0126:  ldsfld     class System.Object SinCalc_fault_seh_il.SinCalc_fault_seh_il::PI
           IL_012b:  unbox      [mscorlib]System.Double
           IL_0130:  ldind.r8
           IL_0131:  ldloc.0
@@ -430,7 +430,7 @@
           IL_0194:  stloc.s    V_7
           IL_0196:  ldloc.s   V_7
           IL_0198:  box        [mscorlib]System.Double
-          IL_019d:  call       class System.Object SinCalc.SinCalc::CalcAndCheck(class System.Object,
+          IL_019d:  call       class System.Object SinCalc_fault_seh_il.SinCalc_fault_seh_il::CalcAndCheck(class System.Object,
                                                                                  class System.Object)
           IL_01a2:  unbox      [mscorlib]System.Double
           IL_01a7:  ldind.r8
@@ -488,12 +488,12 @@
         IL_021a:  leave.s    IL_025a
 
       }  // end .try
-      catch SinCalc.MistakeException 
+      catch SinCalc_fault_seh_il.MistakeException 
       {
         IL_021c:  stloc.s    ex
         IL_021e:  ldstr      "Mistake is "
         IL_0223:  ldloc.s    ex
-        IL_0225:  ldfld      class System.Object SinCalc.MistakeException::mistake
+        IL_0225:  ldfld      class System.Object SinCalc_fault_seh_il.MistakeException::mistake
         IL_022a:  callvirt   instance class System.String [mscorlib]System.Object::ToString()
         IL_022f:  call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                  class System.String)
@@ -502,7 +502,7 @@
         IL_023a:  unbox      [mscorlib]System.Double
         IL_023f:  ldind.r8
         IL_0240:  ldloc.s    ex
-        IL_0242:  ldfld      class System.Object SinCalc.MistakeException::mistake
+        IL_0242:  ldfld      class System.Object SinCalc_fault_seh_il.MistakeException::mistake
         IL_0247:  unbox      [mscorlib]System.Double
         IL_024c:  ldind.r8
         IL_024d:  add
@@ -532,7 +532,7 @@
       IL_0280:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_0285:  ldc.i4    0x64
       IL_0286:  ret
-    } // end of method 'SinCalc::Main'
+    } // end of method 'SinCalc_fault_seh_il::Main'
 
     .method public hidebysig specialname rtspecialname static 
             void .cctor() il managed
@@ -543,9 +543,9 @@
       IL_0009:  stloc.0
       IL_000a:  ldloc.s   V_0
       IL_000c:  box        [mscorlib]System.Double
-      IL_0011:  stsfld     class System.Object SinCalc.SinCalc::PI
+      IL_0011:  stsfld     class System.Object SinCalc_fault_seh_il.SinCalc_fault_seh_il::PI
       IL_0016:  ret
-    } // end of method 'SinCalc::.cctor'
+    } // end of method 'SinCalc_fault_seh_il::.cctor'
 
     .method public hidebysig specialname rtspecialname 
             instance void .ctor() il managed
@@ -554,9 +554,9 @@
       IL_0000:  ldarg.0
       IL_0001:  call       instance void [mscorlib]System.Object::.ctor()
       IL_0006:  ret
-    } // end of method 'SinCalc::.ctor'
+    } // end of method 'SinCalc_fault_seh_il::.ctor'
 
-  } // end of class 'SinCalc'
+  } // end of class 'SinCalc_fault_seh_il'
 
-} // end of namespace 'SinCalc'
+} // end of namespace 'SinCalc_fault_seh_il'
 
diff --git a/src/tests/JIT/Methodical/Boxing/seh/fault_il_d.ilproj b/src/tests/JIT/Methodical/Boxing/seh/fault_il_d.ilproj
index 847a4f38c8401f..8b970c1b5ff5fe 100644
--- a/src/tests/JIT/Methodical/Boxing/seh/fault_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/seh/fault_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/seh/fault_il_r.ilproj b/src/tests/JIT/Methodical/Boxing/seh/fault_il_r.ilproj
index 172b289185b21f..028b8945f3b319 100644
--- a/src/tests/JIT/Methodical/Boxing/seh/fault_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/seh/fault_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/seh/filter.il b/src/tests/JIT/Methodical/Boxing/seh/filter.il
index 4ce4825d441ad7..b54dd192e5be99 100644
--- a/src/tests/JIT/Methodical/Boxing/seh/filter.il
+++ b/src/tests/JIT/Methodical/Boxing/seh/filter.il
@@ -10,7 +10,7 @@
 .assembly extern mscorlib { }
 .assembly 'filter_seh_Boxing' { }
 .assembly extern xunit.core {}
-.namespace SinCalc
+.namespace SinCalc_filter_seh_il
 {
   .class auto ansi MistakeException extends [mscorlib]System.Exception
   {
@@ -25,7 +25,7 @@
       IL_000b:  ldarg.0
       IL_000c:  ldarg.s   m
       IL_000e:  box       [mscorlib]System.Double
-      IL_0013:  stfld      class System.Object SinCalc.MistakeException::mistake
+      IL_0013:  stfld      class System.Object SinCalc_filter_seh_il.MistakeException::mistake
       IL_0018:  ret
     } // end of method 'MistakeException::.ctor'
 
@@ -35,7 +35,7 @@
       .maxstack  8
       IL_0000:  ldstr      "Mistake is "
       IL_0005:  ldarg.0
-      IL_0006:  ldfld      class System.Object SinCalc.MistakeException::mistake
+      IL_0006:  ldfld      class System.Object SinCalc_filter_seh_il.MistakeException::mistake
       IL_000b:  callvirt   instance class System.String [mscorlib]System.Object::ToString()
       IL_0010:  call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String)
@@ -44,7 +44,7 @@
 
   } // end of class 'MistakeException'
 
-  .class auto ansi SinCalc extends [mscorlib]System.Object
+  .class public auto ansi SinCalc_filter_seh_il extends [mscorlib]System.Object
   {
     .field static family class System.Object PI
     .method family hidebysig static class System.Object 
@@ -155,7 +155,7 @@
 
       IL_00df:  ldloc.1
       IL_00e0:  ret
-    } // end of method 'SinCalc::mySin'
+    } // end of method 'SinCalc_filter_seh_il::mySin'
 
     .method family hidebysig static class System.Object 
             CalcAndCheck(class System.Object Angle,
@@ -180,7 +180,7 @@
       IL_0021:  box       [mscorlib]System.Double
       IL_0026:  stloc.1
       IL_0027:  ldarg.0
-      IL_0028:  call       class System.Object SinCalc.SinCalc::mySin(class System.Object)
+      IL_0028:  call       class System.Object SinCalc_filter_seh_il.SinCalc_filter_seh_il::mySin(class System.Object)
       IL_002d:  unbox      [mscorlib]System.Double
       IL_0032:  ldind.r8
       IL_0033:  stloc.3
@@ -208,7 +208,7 @@
       IL_0066:  ldind.r8
       IL_0067:  sub
       IL_0068:  call       float64 [mscorlib]System.Math::Abs(float64)
-      IL_006d:  newobj     instance void SinCalc.MistakeException::.ctor(float64)
+      IL_006d:  newobj     instance void SinCalc_filter_seh_il.MistakeException::.ctor(float64)
       IL_0072:  throw
 
       IL_0073:  ldloc.1
@@ -232,7 +232,7 @@
       IL_009d:  ldind.r8
       IL_009e:  sub
       IL_009f:  call       float64 [mscorlib]System.Math::Abs(float64)
-      IL_00a4:  newobj     instance void SinCalc.MistakeException::.ctor(float64)
+      IL_00a4:  newobj     instance void SinCalc_filter_seh_il.MistakeException::.ctor(float64)
       IL_00a9:  throw
 
       IL_00aa:  ldloc.2
@@ -256,14 +256,14 @@
       IL_00d4:  ldind.r8
       IL_00d5:  sub
       IL_00d6:  call       float64 [mscorlib]System.Math::Abs(float64)
-      IL_00db:  newobj     instance void SinCalc.MistakeException::.ctor(float64)
+      IL_00db:  newobj     instance void SinCalc_filter_seh_il.MistakeException::.ctor(float64)
       IL_00e0:  throw
 
       IL_00e1:  ldloc.1
       IL_00e2:  ret
-    } // end of method 'SinCalc::CalcAndCheck'
+    } // end of method 'SinCalc_filter_seh_il::CalcAndCheck'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -277,7 +277,7 @@
                [3] class System.Object total1,
                [4] class System.Object total2,
                [5] class System.Object total3,
-               [6] class SinCalc.MistakeException ex,
+               [6] class SinCalc_filter_seh_il.MistakeException ex,
                [7] float64 V_7,
                [8] int32 V_8,
                [9] class System.String[] V_9)
@@ -381,7 +381,7 @@
         .try
         {
         	FILTER_TRY:
-	          IL_0126:  ldsfld     class System.Object SinCalc.SinCalc::PI
+	          IL_0126:  ldsfld     class System.Object SinCalc_filter_seh_il.SinCalc_filter_seh_il::PI
 	          IL_012b:  unbox      [mscorlib]System.Double
 	          IL_0130:  ldind.r8
 	          IL_0131:  ldloc.0
@@ -427,7 +427,7 @@
 	          IL_0194:  stloc.s    V_7
 	          IL_0196:  ldloc.s   V_7
 	          IL_0198:  box       [mscorlib]System.Double
-	          IL_019d:  call       class System.Object SinCalc.SinCalc::CalcAndCheck(class System.Object,
+	          IL_019d:  call       class System.Object SinCalc_filter_seh_il.SinCalc_filter_seh_il::CalcAndCheck(class System.Object,
 	                                                                                 class System.Object)
 	          IL_01a2:  unbox      [mscorlib]System.Double
 	          IL_01a7:  ldind.r8
@@ -490,12 +490,12 @@
           IL_01be:  leave.s    IL_01fe
 	    	.try FILTER_TRY to FILTER_FILTER filter FILTER_FILTER handler FILTER_HANDLER to FILTER_END
         }  // end .try
-        catch SinCalc.MistakeException 
+        catch SinCalc_filter_seh_il.MistakeException 
         {
           IL_01c0:  stloc.s    ex
           IL_01c2:  ldstr      "Mistake is "
           IL_01c7:  ldloc.s    ex
-          IL_01c9:  ldfld      class System.Object SinCalc.MistakeException::mistake
+          IL_01c9:  ldfld      class System.Object SinCalc_filter_seh_il.MistakeException::mistake
           IL_01ce:  callvirt   instance class System.String [mscorlib]System.Object::ToString()
           IL_01d3:  call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                    class System.String)
@@ -504,7 +504,7 @@
           IL_01de:  unbox      [mscorlib]System.Double
           IL_01e3:  ldind.r8
           IL_01e4:  ldloc.s    ex
-          IL_01e6:  ldfld      class System.Object SinCalc.MistakeException::mistake
+          IL_01e6:  ldfld      class System.Object SinCalc_filter_seh_il.MistakeException::mistake
           IL_01eb:  unbox      [mscorlib]System.Double
           IL_01f0:  ldind.r8
           IL_01f1:  add
@@ -578,7 +578,7 @@
       IL_0280:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_0285:  ldc.i4    0x64
       IL_0286:  ret
-    } // end of method 'SinCalc::Main'
+    } // end of method 'SinCalc_filter_seh_il::Main'
 
     .method public hidebysig specialname rtspecialname static 
             void .cctor() il managed
@@ -589,9 +589,9 @@
       IL_0009:  stloc.0
       IL_000a:  ldloc.s   V_0
       IL_000c:  box       [mscorlib]System.Double
-      IL_0011:  stsfld     class System.Object SinCalc.SinCalc::PI
+      IL_0011:  stsfld     class System.Object SinCalc_filter_seh_il.SinCalc_filter_seh_il::PI
       IL_0016:  ret
-    } // end of method 'SinCalc::.cctor'
+    } // end of method 'SinCalc_filter_seh_il::.cctor'
 
     .method public hidebysig specialname rtspecialname 
             instance void .ctor() il managed
@@ -600,9 +600,9 @@
       IL_0000:  ldarg.0
       IL_0001:  call       instance void [mscorlib]System.Object::.ctor()
       IL_0006:  ret
-    } // end of method 'SinCalc::.ctor'
+    } // end of method 'SinCalc_filter_seh_il::.ctor'
 
-  } // end of class 'SinCalc'
+  } // end of class 'SinCalc_filter_seh_il'
 
-} // end of namespace 'SinCalc'
+} // end of namespace 'SinCalc_filter_seh_il'
 
diff --git a/src/tests/JIT/Methodical/Boxing/seh/filter_seh_Boxing_il_d.ilproj b/src/tests/JIT/Methodical/Boxing/seh/filter_seh_Boxing_il_d.ilproj
index ac4743ccbbc46c..77298a176795d5 100644
--- a/src/tests/JIT/Methodical/Boxing/seh/filter_seh_Boxing_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/seh/filter_seh_Boxing_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/seh/filter_seh_Boxing_il_r.ilproj b/src/tests/JIT/Methodical/Boxing/seh/filter_seh_Boxing_il_r.ilproj
index e384cd6b477c5c..38dec424511908 100644
--- a/src/tests/JIT/Methodical/Boxing/seh/filter_seh_Boxing_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/seh/filter_seh_Boxing_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/seh/try.cs b/src/tests/JIT/Methodical/Boxing/seh/try.cs
index 1e0cb984974fbe..1177e3a449f5b2 100644
--- a/src/tests/JIT/Methodical/Boxing/seh/try.cs
+++ b/src/tests/JIT/Methodical/Boxing/seh/try.cs
@@ -3,9 +3,10 @@
 
 
 using System;
+using Xunit;
 
 
-namespace SinCalc
+namespace SinCalc_try_seh_cs
 {
     internal class MistakeException : Exception
     {
@@ -14,7 +15,7 @@ internal class MistakeException : Exception
         override public String ToString() { return "Mistake is " + mistake.ToString(); }
     }
 
-    internal class SinCalc
+    public class SinCalc
     {
         protected static object PI = 3.1415926535897932384626433832795d;
 
@@ -49,7 +50,8 @@ protected static object CalcAndCheck(object Angle, object Expected)
             return Result1;
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             object i;
             object Angle;
diff --git a/src/tests/JIT/Methodical/Boxing/seh/try.il b/src/tests/JIT/Methodical/Boxing/seh/try.il
index 660d8fc4338f91..5b35a820ffc2f0 100644
--- a/src/tests/JIT/Methodical/Boxing/seh/try.il
+++ b/src/tests/JIT/Methodical/Boxing/seh/try.il
@@ -10,7 +10,7 @@
 .assembly extern mscorlib { }
 .assembly 'try_seh' { }
 .assembly extern xunit.core {}
-.namespace SinCalc
+.namespace SinCalc_try_seh_il
 {
   .class auto ansi MistakeException extends [mscorlib]System.Exception
   {
@@ -25,7 +25,7 @@
       IL_000b:  ldarg.0
       IL_000c:  ldarg.s   m
       IL_000e:  box       [mscorlib]System.Double
-      IL_0013:  stfld      class System.Object SinCalc.MistakeException::mistake
+      IL_0013:  stfld      class System.Object SinCalc_try_seh_il.MistakeException::mistake
       IL_0018:  ret
     } // end of method 'MistakeException::.ctor'
 
@@ -35,7 +35,7 @@
       .maxstack  8
       IL_0000:  ldstr      "Mistake is "
       IL_0005:  ldarg.0
-      IL_0006:  ldfld      class System.Object SinCalc.MistakeException::mistake
+      IL_0006:  ldfld      class System.Object SinCalc_try_seh_il.MistakeException::mistake
       IL_000b:  callvirt   instance class System.String [mscorlib]System.Object::ToString()
       IL_0010:  call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String)
@@ -44,7 +44,7 @@
 
   } // end of class 'MistakeException'
 
-  .class auto ansi SinCalc extends [mscorlib]System.Object
+  .class public auto ansi SinCalc_try_seh_il extends [mscorlib]System.Object
   {
     .field static family class System.Object PI
     .method family hidebysig static class System.Object 
@@ -155,7 +155,7 @@
 
       IL_00df:  ldloc.1
       IL_00e0:  ret
-    } // end of method 'SinCalc::mySin'
+    } // end of method 'SinCalc_try_seh_il::mySin'
 
     .method family hidebysig static class System.Object 
             CalcAndCheck(class System.Object Angle,
@@ -180,7 +180,7 @@
       IL_0021:  box       [mscorlib]System.Double
       IL_0026:  stloc.1
       IL_0027:  ldarg.0
-      IL_0028:  call       class System.Object SinCalc.SinCalc::mySin(class System.Object)
+      IL_0028:  call       class System.Object SinCalc_try_seh_il.SinCalc_try_seh_il::mySin(class System.Object)
       IL_002d:  unbox      [mscorlib]System.Double
       IL_0032:  ldind.r8
       IL_0033:  stloc.3
@@ -208,7 +208,7 @@
       IL_0066:  ldind.r8
       IL_0067:  sub
       IL_0068:  call       float64 [mscorlib]System.Math::Abs(float64)
-      IL_006d:  newobj     instance void SinCalc.MistakeException::.ctor(float64)
+      IL_006d:  newobj     instance void SinCalc_try_seh_il.MistakeException::.ctor(float64)
       IL_0072:  throw
 
       IL_0073:  ldloc.1
@@ -232,7 +232,7 @@
       IL_009d:  ldind.r8
       IL_009e:  sub
       IL_009f:  call       float64 [mscorlib]System.Math::Abs(float64)
-      IL_00a4:  newobj     instance void SinCalc.MistakeException::.ctor(float64)
+      IL_00a4:  newobj     instance void SinCalc_try_seh_il.MistakeException::.ctor(float64)
       IL_00a9:  throw
 
       IL_00aa:  ldloc.2
@@ -256,14 +256,14 @@
       IL_00d4:  ldind.r8
       IL_00d5:  sub
       IL_00d6:  call       float64 [mscorlib]System.Math::Abs(float64)
-      IL_00db:  newobj     instance void SinCalc.MistakeException::.ctor(float64)
+      IL_00db:  newobj     instance void SinCalc_try_seh_il.MistakeException::.ctor(float64)
       IL_00e0:  throw
 
       IL_00e1:  ldloc.1
       IL_00e2:  ret
-    } // end of method 'SinCalc::CalcAndCheck'
+    } // end of method 'SinCalc_try_seh_il::CalcAndCheck'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -277,7 +277,7 @@
                [3] class System.Object total1,
                [4] class System.Object total2,
                [5] class System.Object total3,
-               [6] class SinCalc.MistakeException ex,
+               [6] class SinCalc_try_seh_il.MistakeException ex,
                [7] float64 V_7,
                [8] int32 V_8,
                [9] class System.String[] V_9)
@@ -380,7 +380,7 @@
       {
         .try
         {
-          IL_0126:  ldsfld     class System.Object SinCalc.SinCalc::PI
+          IL_0126:  ldsfld     class System.Object SinCalc_try_seh_il.SinCalc_try_seh_il::PI
           IL_012b:  unbox      [mscorlib]System.Double
           IL_0130:  ldind.r8
           IL_0131:  ldloc.0
@@ -426,7 +426,7 @@
           IL_0194:  stloc.s    V_7
           IL_0196:  ldloc.s   V_7
           IL_0198:  box       [mscorlib]System.Double
-          IL_019d:  call       class System.Object SinCalc.SinCalc::CalcAndCheck(class System.Object,
+          IL_019d:  call       class System.Object SinCalc_try_seh_il.SinCalc_try_seh_il::CalcAndCheck(class System.Object,
                                                                                  class System.Object)
           IL_01a2:  unbox      [mscorlib]System.Double
           IL_01a7:  ldind.r8
@@ -440,12 +440,12 @@
           IL_01be:  leave.s    IL_01fe
 
         }  // end .try
-        catch SinCalc.MistakeException 
+        catch SinCalc_try_seh_il.MistakeException 
         {
           IL_01c0:  stloc.s    ex
           IL_01c2:  ldstr      "Mistake is "
           IL_01c7:  ldloc.s    ex
-          IL_01c9:  ldfld      class System.Object SinCalc.MistakeException::mistake
+          IL_01c9:  ldfld      class System.Object SinCalc_try_seh_il.MistakeException::mistake
           IL_01ce:  callvirt   instance class System.String [mscorlib]System.Object::ToString()
           IL_01d3:  call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                    class System.String)
@@ -454,7 +454,7 @@
           IL_01de:  unbox      [mscorlib]System.Double
           IL_01e3:  ldind.r8
           IL_01e4:  ldloc.s    ex
-          IL_01e6:  ldfld      class System.Object SinCalc.MistakeException::mistake
+          IL_01e6:  ldfld      class System.Object SinCalc_try_seh_il.MistakeException::mistake
           IL_01eb:  unbox      [mscorlib]System.Double
           IL_01f0:  ldind.r8
           IL_01f1:  add
@@ -528,7 +528,7 @@
       IL_0280:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_0285:  ldc.i4    0x64
       IL_0286:  ret
-    } // end of method 'SinCalc::Main'
+    } // end of method 'SinCalc_try_seh_il::Main'
 
     .method public hidebysig specialname rtspecialname static 
             void .cctor() il managed
@@ -539,9 +539,9 @@
       IL_0009:  stloc.0
       IL_000a:  ldloc.s   V_0
       IL_000c:  box       [mscorlib]System.Double
-      IL_0011:  stsfld     class System.Object SinCalc.SinCalc::PI
+      IL_0011:  stsfld     class System.Object SinCalc_try_seh_il.SinCalc_try_seh_il::PI
       IL_0016:  ret
-    } // end of method 'SinCalc::.cctor'
+    } // end of method 'SinCalc_try_seh_il::.cctor'
 
     .method public hidebysig specialname rtspecialname 
             instance void .ctor() il managed
@@ -550,9 +550,9 @@
       IL_0000:  ldarg.0
       IL_0001:  call       instance void [mscorlib]System.Object::.ctor()
       IL_0006:  ret
-    } // end of method 'SinCalc::.ctor'
+    } // end of method 'SinCalc_try_seh_il::.ctor'
 
-  } // end of class 'SinCalc'
+  } // end of class 'SinCalc_try_seh_il'
 
-} // end of namespace 'SinCalc'
+} // end of namespace 'SinCalc_try_seh_il'
 
diff --git a/src/tests/JIT/Methodical/Boxing/seh/try_cs_d.csproj b/src/tests/JIT/Methodical/Boxing/seh/try_cs_d.csproj
index fab1f2ccfcacfa..b5ed0583f74c7b 100644
--- a/src/tests/JIT/Methodical/Boxing/seh/try_cs_d.csproj
+++ b/src/tests/JIT/Methodical/Boxing/seh/try_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/seh/try_cs_do.csproj b/src/tests/JIT/Methodical/Boxing/seh/try_cs_do.csproj
index f0f2c693cfcdd3..2c4d1cbe5790f5 100644
--- a/src/tests/JIT/Methodical/Boxing/seh/try_cs_do.csproj
+++ b/src/tests/JIT/Methodical/Boxing/seh/try_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
diff --git a/src/tests/JIT/Methodical/Boxing/seh/try_cs_r.csproj b/src/tests/JIT/Methodical/Boxing/seh/try_cs_r.csproj
index fb0fa65986e780..7d8785f2be3fc9 100644
--- a/src/tests/JIT/Methodical/Boxing/seh/try_cs_r.csproj
+++ b/src/tests/JIT/Methodical/Boxing/seh/try_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/seh/try_cs_ro.csproj b/src/tests/JIT/Methodical/Boxing/seh/try_cs_ro.csproj
index 7473b90f41b1e7..d248389023b920 100644
--- a/src/tests/JIT/Methodical/Boxing/seh/try_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/Boxing/seh/try_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
diff --git a/src/tests/JIT/Methodical/Boxing/seh/try_seh_il_d.ilproj b/src/tests/JIT/Methodical/Boxing/seh/try_seh_il_d.ilproj
index f6fb0e05ab386c..682ab9d3e48342 100644
--- a/src/tests/JIT/Methodical/Boxing/seh/try_seh_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/seh/try_seh_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/seh/try_seh_il_r.ilproj b/src/tests/JIT/Methodical/Boxing/seh/try_seh_il_r.ilproj
index ec376ba7c6ee75..d4db351e036d07 100644
--- a/src/tests/JIT/Methodical/Boxing/seh/try_seh_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/seh/try_seh_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/xlang/sin_cs.cs b/src/tests/JIT/Methodical/Boxing/xlang/sin_cs.cs
index 4e209220c42883..96a56bbe7af127 100644
--- a/src/tests/JIT/Methodical/Boxing/xlang/sin_cs.cs
+++ b/src/tests/JIT/Methodical/Boxing/xlang/sin_cs.cs
@@ -1,4 +1,5 @@
 // Licensed to the .NET Foundation under one or more agreements.
+using Xunit;
 // The .NET Foundation licenses this file to you under the MIT license.
 
 namespace SinCalc_against_sinlib_cs
@@ -6,9 +7,10 @@ namespace SinCalc_against_sinlib_cs
     using System;
     using SinCalcLib;
 
-    class SinCalc
+    public class SinCalc
     {
-        static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             object i;
             object Angle;
diff --git a/src/tests/JIT/Methodical/Boxing/xlang/sin_cs.il b/src/tests/JIT/Methodical/Boxing/xlang/sin_cs.il
index 7daf4196db5a6d..c3b41c0d03f8e4 100644
--- a/src/tests/JIT/Methodical/Boxing/xlang/sin_cs.il
+++ b/src/tests/JIT/Methodical/Boxing/xlang/sin_cs.il
@@ -12,11 +12,11 @@
 .assembly extern sinlib_cs
 {
 }
-.namespace SinCalc
+.namespace SinCalc_sin_cs_xlang_il
 {
-  .class auto ansi SinCalc extends [mscorlib]System.Object
+  .class public auto ansi SinCalc_sin_cs_xlang_il extends [mscorlib]System.Object
   {
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
diff --git a/src/tests/JIT/Methodical/Boxing/xlang/sin_cs_cs_sinlib_d.csproj b/src/tests/JIT/Methodical/Boxing/xlang/sin_cs_cs_sinlib_d.csproj
index 6e8810c8ff95cc..14593bb8c3d839 100644
--- a/src/tests/JIT/Methodical/Boxing/xlang/sin_cs_cs_sinlib_d.csproj
+++ b/src/tests/JIT/Methodical/Boxing/xlang/sin_cs_cs_sinlib_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/xlang/sin_cs_cs_sinlib_do.csproj b/src/tests/JIT/Methodical/Boxing/xlang/sin_cs_cs_sinlib_do.csproj
index 25895439ae2f0b..fa0e5420e47319 100644
--- a/src/tests/JIT/Methodical/Boxing/xlang/sin_cs_cs_sinlib_do.csproj
+++ b/src/tests/JIT/Methodical/Boxing/xlang/sin_cs_cs_sinlib_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/xlang/sin_cs_cs_sinlib_r.csproj b/src/tests/JIT/Methodical/Boxing/xlang/sin_cs_cs_sinlib_r.csproj
index 9117e658dc999b..f228bcbe5e678f 100644
--- a/src/tests/JIT/Methodical/Boxing/xlang/sin_cs_cs_sinlib_r.csproj
+++ b/src/tests/JIT/Methodical/Boxing/xlang/sin_cs_cs_sinlib_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/xlang/sin_cs_cs_sinlib_ro.csproj b/src/tests/JIT/Methodical/Boxing/xlang/sin_cs_cs_sinlib_ro.csproj
index a4d45edfaa2934..87f61d39f07723 100644
--- a/src/tests/JIT/Methodical/Boxing/xlang/sin_cs_cs_sinlib_ro.csproj
+++ b/src/tests/JIT/Methodical/Boxing/xlang/sin_cs_cs_sinlib_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/xlang/sin_cs_il_sinlib_d.csproj b/src/tests/JIT/Methodical/Boxing/xlang/sin_cs_il_sinlib_d.csproj
index ba920d376cc47b..9fc6ec3a403052 100644
--- a/src/tests/JIT/Methodical/Boxing/xlang/sin_cs_il_sinlib_d.csproj
+++ b/src/tests/JIT/Methodical/Boxing/xlang/sin_cs_il_sinlib_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/xlang/sin_cs_il_sinlib_do.csproj b/src/tests/JIT/Methodical/Boxing/xlang/sin_cs_il_sinlib_do.csproj
index 205a697e2dd594..db992213e1201b 100644
--- a/src/tests/JIT/Methodical/Boxing/xlang/sin_cs_il_sinlib_do.csproj
+++ b/src/tests/JIT/Methodical/Boxing/xlang/sin_cs_il_sinlib_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/xlang/sin_cs_il_sinlib_r.csproj b/src/tests/JIT/Methodical/Boxing/xlang/sin_cs_il_sinlib_r.csproj
index 0f558db2519673..5ca54fa2ed1dee 100644
--- a/src/tests/JIT/Methodical/Boxing/xlang/sin_cs_il_sinlib_r.csproj
+++ b/src/tests/JIT/Methodical/Boxing/xlang/sin_cs_il_sinlib_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/xlang/sin_cs_il_sinlib_ro.csproj b/src/tests/JIT/Methodical/Boxing/xlang/sin_cs_il_sinlib_ro.csproj
index e2b11c1f340734..2e948373cbf14c 100644
--- a/src/tests/JIT/Methodical/Boxing/xlang/sin_cs_il_sinlib_ro.csproj
+++ b/src/tests/JIT/Methodical/Boxing/xlang/sin_cs_il_sinlib_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/xlang/sin_il.cs b/src/tests/JIT/Methodical/Boxing/xlang/sin_il.cs
index e6d09d2e58f3aa..fa2ac8be446471 100644
--- a/src/tests/JIT/Methodical/Boxing/xlang/sin_il.cs
+++ b/src/tests/JIT/Methodical/Boxing/xlang/sin_il.cs
@@ -1,4 +1,5 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
+using Xunit;
 // The .NET Foundation licenses this file to you under the MIT license.
 
 namespace SinCalc_against_sinlib_il
@@ -6,9 +7,10 @@ namespace SinCalc_against_sinlib_il
     using System;
     using SinCalcLib;
 
-    class SinCalc
+    public class SinCalc
     {
-        static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             object i;
             object Angle;
diff --git a/src/tests/JIT/Methodical/Boxing/xlang/sin_il.il b/src/tests/JIT/Methodical/Boxing/xlang/sin_il.il
index c769dc5510b992..b6dde1c227f791 100644
--- a/src/tests/JIT/Methodical/Boxing/xlang/sin_il.il
+++ b/src/tests/JIT/Methodical/Boxing/xlang/sin_il.il
@@ -12,11 +12,11 @@
 .assembly extern sinlib_il
 {
 }
-.namespace SinCalc
+.namespace SinCalc_sin_il_xlang_il
 {
-  .class auto ansi SinCalc extends [mscorlib]System.Object
+  .class public auto ansi SinCalc_sin_il_xlang_il extends [mscorlib]System.Object
   {
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
diff --git a/src/tests/JIT/Methodical/Boxing/xlang/sin_il_cs_il_d.ilproj b/src/tests/JIT/Methodical/Boxing/xlang/sin_il_cs_il_d.ilproj
index 7ed1f56a2e3aa0..3a6db7e205f0c2 100644
--- a/src/tests/JIT/Methodical/Boxing/xlang/sin_il_cs_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/xlang/sin_il_cs_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/xlang/sin_il_cs_il_r.ilproj b/src/tests/JIT/Methodical/Boxing/xlang/sin_il_cs_il_r.ilproj
index 0354dfc68b9901..d04ca7f2a3ba1d 100644
--- a/src/tests/JIT/Methodical/Boxing/xlang/sin_il_cs_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/xlang/sin_il_cs_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/xlang/sin_il_il_d.ilproj b/src/tests/JIT/Methodical/Boxing/xlang/sin_il_il_d.ilproj
index d618a77bd80b9d..0e7167a55f662d 100644
--- a/src/tests/JIT/Methodical/Boxing/xlang/sin_il_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/xlang/sin_il_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Boxing/xlang/sin_il_il_r.ilproj b/src/tests/JIT/Methodical/Boxing/xlang/sin_il_il_r.ilproj
index 394d3415070127..dfd817dd92844d 100644
--- a/src/tests/JIT/Methodical/Boxing/xlang/sin_il_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/xlang/sin_il_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Coverage/arglist_pos.ilproj b/src/tests/JIT/Methodical/Coverage/arglist_pos.ilproj
index 0cc4217187a2fe..7e6379b9ea3b73 100644
--- a/src/tests/JIT/Methodical/Coverage/arglist_pos.ilproj
+++ b/src/tests/JIT/Methodical/Coverage/arglist_pos.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Coverage/b39946.il b/src/tests/JIT/Methodical/Coverage/b39946.il
index d9277a2b8c6824..5cb1688c2d596e 100644
--- a/src/tests/JIT/Methodical/Coverage/b39946.il
+++ b/src/tests/JIT/Methodical/Coverage/b39946.il
@@ -9,7 +9,7 @@
 }
 .assembly b39946 {}
 .assembly extern xunit.core {}
-.class ILGEN_0x5c383c7 {
+.class public ILGEN_0x5c383c7 {
 
 
 .field static	unsigned int8[] field_0x0
@@ -297,7 +297,7 @@ End_Orphan_44:
  mul conv.r4
 ret
 }
-.method static int32 Main() {
+.method public static int32 Main() {
 .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
     01 00 00 00
 )
diff --git a/src/tests/JIT/Methodical/Coverage/b39946.ilproj b/src/tests/JIT/Methodical/Coverage/b39946.ilproj
index fb7041d89d89f8..9accd6730381ed 100644
--- a/src/tests/JIT/Methodical/Coverage/b39946.ilproj
+++ b/src/tests/JIT/Methodical/Coverage/b39946.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType />
diff --git a/src/tests/JIT/Methodical/Coverage/b433189.cs b/src/tests/JIT/Methodical/Coverage/b433189.cs
index 233372e7a3b1ad..193aa1dc9e3a13 100644
--- a/src/tests/JIT/Methodical/Coverage/b433189.cs
+++ b/src/tests/JIT/Methodical/Coverage/b433189.cs
@@ -9,6 +9,7 @@
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using System.Collections;
+using Xunit;
 
 public delegate void MyDelegate();
 
@@ -45,7 +46,8 @@ public static void foo()
     {
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         try
         {
diff --git a/src/tests/JIT/Methodical/Coverage/b433189.csproj b/src/tests/JIT/Methodical/Coverage/b433189.csproj
index 3c6fc1eb26097f..e832736e93f242 100644
--- a/src/tests/JIT/Methodical/Coverage/b433189.csproj
+++ b/src/tests/JIT/Methodical/Coverage/b433189.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Coverage/b518440.il b/src/tests/JIT/Methodical/Coverage/b518440.il
index d7e11211972648..8045a40a64dbb5 100644
--- a/src/tests/JIT/Methodical/Coverage/b518440.il
+++ b/src/tests/JIT/Methodical/Coverage/b518440.il
@@ -6,6 +6,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
+.assembly extern xunit.core {}
 
 
 .assembly extern mscorlib{}
@@ -16,6 +17,9 @@
 {
   .method public hidebysig static int32 main()
   {
+    .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+        01 00 00 00
+    )
     .entrypoint
     .maxstack 2
   
diff --git a/src/tests/JIT/Methodical/Coverage/b518440.ilproj b/src/tests/JIT/Methodical/Coverage/b518440.ilproj
index a86b97655f01a3..59000e519a60a9 100644
--- a/src/tests/JIT/Methodical/Coverage/b518440.ilproj
+++ b/src/tests/JIT/Methodical/Coverage/b518440.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Coverage/copy_prop_byref_to_native_int.il b/src/tests/JIT/Methodical/Coverage/copy_prop_byref_to_native_int.il
index 86f30f1a985fe4..ce7e832abbf67f 100644
--- a/src/tests/JIT/Methodical/Coverage/copy_prop_byref_to_native_int.il
+++ b/src/tests/JIT/Methodical/Coverage/copy_prop_byref_to_native_int.il
@@ -10,12 +10,14 @@
 .typedef [System.Runtime]System.WeakReference as WeakRef
 .typedef [System.Runtime]System.GC as GC
 
-.class Program extends [System.Runtime]System.Object
+.namespace Test_copy_prop_byref_to_native_int_il
+{
+.class public Program extends [System.Runtime]System.Object
 {
   .field private static class WeakRef s_weakArrRef
   .field private static bool s_arrIsAlive
 
-  .method private static int32 Main() cil managed
+  .method public static int32 Main() cil managed
   {
     .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
         01 00 00 00
@@ -30,25 +32,25 @@
 
     ldloc arr
     newobj instance void WeakRef::.ctor(object)
-    stsfld class WeakRef Program::s_weakArrRef
+    stsfld class WeakRef Test_copy_prop_byref_to_native_int_il.Program::s_weakArrRef
 
     ldc.i4 1
-    stsfld bool Program::s_arrIsAlive
+    stsfld bool Test_copy_prop_byref_to_native_int_il.Program::s_arrIsAlive
 
     ldloc arr
     ldc.i4 0
     ldelema int32
     dup
     ldc.i4 1
-    call unsigned int8& Program::Problem(unsigned int8&, native int, int32)
+    call unsigned int8& Test_copy_prop_byref_to_native_int_il.Program::Problem(unsigned int8&, native int, int32)
     brtrue SKIP
 
     // Unreachable, exists to not have "arr"'s liveness extended.
-    call unsigned int8& Program::SideEffect()
+    call unsigned int8& Test_copy_prop_byref_to_native_int_il.Program::SideEffect()
     pop
 
   SKIP:
-    ldsfld bool Program::s_arrIsAlive
+    ldsfld bool Test_copy_prop_byref_to_native_int_il.Program::s_arrIsAlive
     brtrue SUCCESS
 
     ldc.i4 101
@@ -68,7 +70,7 @@
 
     // Before this point, array is kept alive by "byrefAddrArg".
     ldarg byrefAddrArg
-    call void Program::Use(unsigned int8&)
+    call void Test_copy_prop_byref_to_native_int_il.Program::Use(unsigned int8&)
     // Now the array should be kept alive by "byrefAddr".
 
     ldc.i4 0
@@ -79,7 +81,7 @@
     add
     stloc i
 
-    call void Program::TryCollectArr()
+    call void Test_copy_prop_byref_to_native_int_il.Program::TryCollectArr()
 
     ldloc i
     ldc.i4 10
@@ -96,7 +98,7 @@
     // that local copy propagation does not substitute
     // "nintAddrCopy" with "nintAddr" too early. We
     // want the fact they're equal to be discovered in VN.
-    call unsigned int8& Program::SideEffect()
+    call unsigned int8& Test_copy_prop_byref_to_native_int_il.Program::SideEffect()
     ret
 
   SKIP:
@@ -136,11 +138,11 @@
     call void GC::Collect(int32, valuetype [System.Runtime]System.GCCollectionMode)
     call void GC::WaitForPendingFinalizers()
 
-    ldsfld class WeakRef Program::s_weakArrRef
+    ldsfld class WeakRef Test_copy_prop_byref_to_native_int_il.Program::s_weakArrRef
     callvirt instance bool WeakRef::get_IsAlive()
-    ldsfld bool Program::s_arrIsAlive
+    ldsfld bool Test_copy_prop_byref_to_native_int_il.Program::s_arrIsAlive
     and
-    stsfld bool Program::s_arrIsAlive
+    stsfld bool Test_copy_prop_byref_to_native_int_il.Program::s_arrIsAlive
 
     ret
   }
@@ -157,3 +159,4 @@
     ret
   }
 }
+}
diff --git a/src/tests/JIT/Methodical/Coverage/copy_prop_byref_to_native_int.ilproj b/src/tests/JIT/Methodical/Coverage/copy_prop_byref_to_native_int.ilproj
index e7c67cc80e8533..eab21ad8f765d0 100644
--- a/src/tests/JIT/Methodical/Coverage/copy_prop_byref_to_native_int.ilproj
+++ b/src/tests/JIT/Methodical/Coverage/copy_prop_byref_to_native_int.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/Coverage/hole.ilproj b/src/tests/JIT/Methodical/Coverage/hole.ilproj
index 8c0e7cd5df8f5c..c976ba172a6a11 100644
--- a/src/tests/JIT/Methodical/Coverage/hole.ilproj
+++ b/src/tests/JIT/Methodical/Coverage/hole.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType />
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_i.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_i.il
index 0efd535cafd1d7..d54d109bc08156 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_i.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_i.il
@@ -12,9 +12,9 @@
 .assembly 'conv_i8_i'
 { }
 .assembly extern xunit.core {}
-.class private auto ansi Test_conv_i8_i extends [mscorlib]System.Object
+.class public auto ansi Test_conv_i8_i extends [mscorlib]System.Object
 {
-.method private hidebysig static int32 Main() il managed
+.method public hidebysig static int32 Main() il managed
 {
 	.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
 	    01 00 00 00
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_i_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_i_il_d.ilproj
index a315670877ef46..b845edf80abd1f 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_i_il_d.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_i_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_i_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_i_il_r.ilproj
index 7faaf6010827e0..e07c64d9dfabff 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_i_il_r.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_i_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_u.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_u.il
index 1d1467629ee928..071109f55dd442 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_u.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_u.il
@@ -12,9 +12,9 @@
 .assembly 'conv_i8_u'
 { }
 .assembly extern xunit.core {}
-.class private auto ansi Test_conv_i8_u extends [mscorlib]System.Object
+.class public auto ansi Test_conv_i8_u extends [mscorlib]System.Object
 {
-.method private hidebysig static int32 Main() il managed
+.method public hidebysig static int32 Main() il managed
 {
 	.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
 	    01 00 00 00
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_u_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_u_il_d.ilproj
index b979c52ce0234e..6695f3f2a64a7e 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_u_il_d.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_u_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_u_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_u_il_r.ilproj
index 19d78451dd2b98..62707228f4b39d 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_u_il_r.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_u_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_i.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_i.il
index 4735aac79d686b..d694fe892c9dcf 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_i.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_i.il
@@ -12,9 +12,9 @@
 .assembly 'convovf_i8_i'
 { }
 .assembly extern xunit.core {}
-.class private auto ansi Test_convovf_i8_i extends [mscorlib]System.Object
+.class public auto ansi Test_convovf_i8_i extends [mscorlib]System.Object
 {
-.method private hidebysig static int32 Main() il managed
+.method public hidebysig static int32 Main() il managed
 {
 	.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
 	    01 00 00 00
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_i_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_i_il_d.ilproj
index bb091a7e6410b6..d577a1d47d4d5f 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_i_il_d.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_i_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_i_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_i_il_r.ilproj
index 215cbf1d3bc5f7..92bb5fb315cffb 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_i_il_r.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_i_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_u_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_u_il_d.ilproj
index 319b465e00be67..8681ce11f6a056 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_u_il_d.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_u_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_u_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_u_il_r.ilproj
index b89cfa1a2c9842..7a129a0b0fbe63 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_u_il_r.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_u_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_32BIT.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_32BIT.il
index 5a2f5c343b7ba2..ac86ee98aedfc7 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_32BIT.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_32BIT.il
@@ -17,7 +17,7 @@
 .assembly extern TestLibrary {}
 .class public auto ansi Test_i_array_merge_Target_32BIT extends [mscorlib]System.Object
 {
-.method private hidebysig static int32 Main() il managed
+.method public hidebysig static int32 Main() il managed
 {
     // [ConditionalFact(typeof(TestLibrary.PlatformDetection), nameof(TestLibrary.PlatformDetection.Is32BitProcess))]
     .custom instance void [Microsoft.DotNet.XUnitExtensions]Xunit.ConditionalFactAttribute::.ctor(class [System.Runtime]System.Type,
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_32BIT_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_32BIT_il_d.ilproj
index d01c7a022a0333..ab8dedc7abcfb3 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_32BIT_il_d.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_32BIT_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <!-- There is a 32 and 64 version of this test to allow it to be compiled for all targets -->
     <CLRTestTargetUnsupported Condition="'$(TargetBits)' != '32'">true</CLRTestTargetUnsupported>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_32BIT_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_32BIT_il_r.ilproj
index e393cc3ea75303..c42eeb6ee82fc7 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_32BIT_il_r.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_32BIT_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <!-- There is a 32 and 64 version of this test to allow it to be compiled for all targets -->
     <CLRTestTargetUnsupported Condition="'$(TargetBits)' != '32'">true</CLRTestTargetUnsupported>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_64BIT.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_64BIT.il
index d53448f36a5741..bae6556aa9b6d1 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_64BIT.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_64BIT.il
@@ -17,7 +17,7 @@
 .assembly extern TestLibrary {}
 .class public auto ansi Test_i_array_merge_Target_64BIT extends [mscorlib]System.Object
 {
-.method private hidebysig static int32 Main() il managed
+.method public hidebysig static int32 Main() il managed
 {
     // [ConditionalFact(typeof(TestLibrary.PlatformDetection), nameof(TestLibrary.PlatformDetection.Is64BitProcess))]
     .custom instance void [Microsoft.DotNet.XUnitExtensions]Xunit.ConditionalFactAttribute::.ctor(class [System.Runtime]System.Type,
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_64BIT_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_64BIT_il_d.ilproj
index 256efbae92a7ab..5cdffec9a13fda 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_64BIT_il_d.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_64BIT_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <!-- There is a 32 and 64 version of this test to allow it to be compiled for all targets -->
     <CLRTestTargetUnsupported Condition="'$(TargetBits)' != '64'">true</CLRTestTargetUnsupported>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_64BIT_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_64BIT_il_r.ilproj
index c8b227d6ba71b8..c310c07eb693b1 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_64BIT_il_r.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_64BIT_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <!-- There is a 32 and 64 version of this test to allow it to be compiled for all targets -->
     <CLRTestTargetUnsupported Condition="'$(TargetBits)' != '64'">true</CLRTestTargetUnsupported>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_box.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_box.il
index 9ca8d1c88c1831..753aef7df13dcd 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_box.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_box.il
@@ -20,9 +20,9 @@
 {
 }
 .assembly extern xunit.core {}
-.namespace BoxTest
+.namespace BoxTest_i_box_il
 {
-  .class private auto ansi Test extends [mscorlib]System.Object
+  .class public auto ansi Test extends [mscorlib]System.Object
   {
     .method private hidebysig static void Test(class [mscorlib]System.Object, native int&) il managed
     {
@@ -45,7 +45,7 @@
     	stind.i
     	ret
     }
-    .method private hidebysig static int32 Main() il managed
+    .method public hidebysig static int32 Main() il managed
     {
 		.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
 		    01 00 00 00
@@ -59,13 +59,13 @@
 		box [mscorlib]System.IntPtr
 		dup
 		ldloca 0
-		call void BoxTest.Test::Test(class [mscorlib]System.Object, native int&)
+		call void BoxTest_i_box_il.Test::Test(class [mscorlib]System.Object, native int&)
 		ldloc.0
 		brtrue box_pop_fail
 		dup
 		dup
 		unbox [mscorlib]System.IntPtr
-		call void BoxTest.Test::Test(class [mscorlib]System.Object, native int&)
+		call void BoxTest_i_box_il.Test::Test(class [mscorlib]System.Object, native int&)
 		unbox [mscorlib]System.IntPtr
 		ldind.i
 		dup
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_box_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_box_il_d.ilproj
index 15c2af3a9a1d7f..bdcc662546a338 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_box_il_d.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_box_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_box_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_box_il_r.ilproj
index 06ec844a908fa6..52e5130f9a393b 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_box_il_r.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_box_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_conv.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_conv.il
index 6d3503aca31539..21fbf65c3849a6 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_conv.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_conv.il
@@ -12,7 +12,7 @@
 .assembly 'i_conv'
 { }
 .assembly extern xunit.core {}
-.class private auto ansi Test_i_conv extends [mscorlib]System.Object
+.class public auto ansi Test_i_conv extends [mscorlib]System.Object
 {
 .method private hidebysig static native int to_native(int32) il managed
 {
@@ -20,7 +20,7 @@
 	conv.ovf.i
 	ret
 }
-.method private hidebysig static int32 Main() il managed
+.method public hidebysig static int32 Main() il managed
 {
 	.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
 	    01 00 00 00
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_conv_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_conv_il_d.ilproj
index a61d4baf843605..54590c5ff0255d 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_conv_il_d.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_conv_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_conv_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_conv_il_r.ilproj
index 1cbb35c0df7569..060f213bddf4d3 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_conv_il_r.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_conv_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_fld.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_fld.il
index d709974c4a3407..9971186eb65e74 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_fld.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_fld.il
@@ -12,27 +12,27 @@
 .assembly 'i_fld'// as "qsort"
 { }
 .assembly extern xunit.core {}
-.namespace Test
+.namespace Test_i_fld
 {
-  .class private auto ansi AA extends [mscorlib]System.Object
+  .class public auto ansi AA extends [mscorlib]System.Object
   {
 	.field public native int m_i
 	.field public static native int s_i
 	.field public native int[0...] m_ai
 
-    .method private hidebysig static int32 Main() il managed
+    .method public hidebysig static int32 Main() il managed
     {
 		.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
 		    01 00 00 00
 		)
 		.entrypoint
 		.maxstack  8
-		.locals (class Test.AA pinned, native int[0...], native int, int32, native int[0...] pinned)
-		newobj instance void Test.AA::.ctor()
+		.locals (class Test_i_fld.AA pinned, native int[0...], native int, int32, native int[0...] pinned)
+		newobj instance void Test_i_fld.AA::.ctor()
 		stloc.0
 
 		ldloc.0
-		ldfld native int[0...] Test.AA::m_ai
+		ldfld native int[0...] Test_i_fld.AA::m_ai
 		stloc 4
 
 
@@ -47,11 +47,11 @@
 		dup
 
 		ldc.i4 16
-		ldsflda native int Test.AA::s_i
+		ldsflda native int Test_i_fld.AA::s_i
 		stelem.i
 		ldc.i4 17
 		ldloc.0
-		ldflda native int Test.AA::m_i
+		ldflda native int Test_i_fld.AA::m_i
 		stelem.i
 		ldc.i4 18
 		ldloca 2
@@ -63,7 +63,7 @@
 		ldloc.1
 		ldloc.3
 		ldloc.0
-		ldfld native int[0...] Test.AA::m_ai
+		ldfld native int[0...] Test_i_fld.AA::m_ai
 		ldloc.3
 		ldelema [mscorlib]System.IntPtr
 		stelem.i
@@ -119,7 +119,7 @@
     {
 	      .maxstack  8
 	      ldc.i4 100
-	      stsfld native int Test.AA::s_i
+	      stsfld native int Test_i_fld.AA::s_i
 	      ret
     } // end of method 'AA::.ctor'
     .method public hidebysig specialname rtspecialname instance void .ctor() il managed
@@ -130,11 +130,11 @@
 		call       instance void [mscorlib]System.Object::.ctor()
 		ldarg.0
 		ldc.i4 10
-		stfld native int Test.AA::m_i
+		stfld native int Test_i_fld.AA::m_i
 		ldarg.0
 		ldc.i4 16
 		newobj instance void native int[0...]::.ctor(int32)
-		stfld native int[0...] Test.AA::m_ai
+		stfld native int[0...] Test_i_fld.AA::m_ai
 
 		ldc.i4.0
 		br begin_loop
@@ -142,7 +142,7 @@
 		dup
 		stloc.0
 		ldarg.0
-		ldfld native int[0...] Test.AA::m_ai
+		ldfld native int[0...] Test_i_fld.AA::m_ai
 		ldloc.0
 		dup
 		stelem.i
@@ -160,6 +160,6 @@
 
   } // end of class 'AA'
 
-} // end of namespace 'Test'
+} // end of namespace 'Test_i_fld'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_fld_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_fld_il_d.ilproj
index a358b9cb9dd3f7..c49204ec216058 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_fld_il_d.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_fld_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_fld_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_fld_il_r.ilproj
index 000b4398690bd8..0d83f9b32ec6f1 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_fld_il_r.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_fld_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flood.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flood.il
index 5a8b8df4849287..fae6d4857dd034 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flood.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flood.il
@@ -18,9 +18,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {BCA6096F-DF11-4FA3-BF16-EEDA01729535}
-.namespace AvgTest {
-  .class private auto ansi Test extends [mscorlib]System.Object {
-    .method private hidebysig static int32 Main() il managed {
+.namespace AvgTest_i_flood {
+  .class public auto ansi Test extends [mscorlib]System.Object {
+    .method public hidebysig static int32 Main() il managed {
 	.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
 	    01 00 00 00
 	)
@@ -68,6 +68,6 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'AvgTest'
+} // end of namespace 'AvgTest_i_flood'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flood_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flood_il_d.ilproj
index c332bcf845a7f8..9301035c4022ca 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flood_il_d.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flood_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flood_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flood_il_r.ilproj
index 3b814524e429b2..0cd260e87eb4fa 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flood_il_r.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flood_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flow.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flow.il
index 548c08714f62bd..56c04d349d5efe 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flow.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flow.il
@@ -18,14 +18,14 @@
 }
 .assembly extern xunit.core {}
 // MVID: {3433C0F8-3BEA-4168-AB0C-C275EF054928}
-.namespace Test
+.namespace Test_i_flow
 {
-  .class private auto ansi AA extends [mscorlib]System.Object
+  .class public auto ansi AA extends [mscorlib]System.Object
   {
 	.field public native int m_i
 	.field public native int[0...] m_ai
 
-    .method private hidebysig static int32 Main() il managed
+    .method public hidebysig static int32 Main() il managed
     {
 		.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
 		    01 00 00 00
@@ -33,26 +33,26 @@
 		.entrypoint
 		// Code size       134 (0x86)
 		.maxstack  8
-		.locals (class Test.AA, native int i, native int& p1, native int& p2)
-		newobj instance void Test.AA::.ctor()
+		.locals (class Test_i_flow.AA, native int i, native int& p1, native int& p2)
+		newobj instance void Test_i_flow.AA::.ctor()
 		stloc.0
 		
 		ldloc.0
 		ldc.i4 0x80000000
-		stfld native int Test.AA::m_i
+		stfld native int Test_i_flow.AA::m_i
 
 		ldloc.0
-		ldfld native int Test.AA::m_i
+		ldfld native int Test_i_flow.AA::m_i
 		ldc.i4 0x7fffffff
 		bgt fail
 
 		ldloc.0
-		ldfld native int Test.AA::m_i
+		ldfld native int Test_i_flow.AA::m_i
 		ldc.i4 0x80000001
 		bgt fail
 
 		ldloc.0
-		ldfld native int Test.AA::m_i
+		ldfld native int Test_i_flow.AA::m_i
 		ldc.i4 0x80000001
 		conv.i
 		bgt.un fail
@@ -70,34 +70,34 @@
 		ldloca i
 	merge_2:
 		ldloc.0
-		ldfld native int[0...] Test.AA::m_ai
+		ldfld native int[0...] Test_i_flow.AA::m_ai
 		ldc.i4.1
 		ldelema [mscorlib]System.IntPtr
 		br final_merge
 	a3:
 		ldloc.0
-		ldflda native int Test.AA::m_i
+		ldflda native int Test_i_flow.AA::m_i
 	merge_3:
 		ldloca i
 		br final_merge
 	a4:
 		ldloc.0
-		ldflda native int Test.AA::m_i
+		ldflda native int Test_i_flow.AA::m_i
 		br merge_2
 	a5:
 		ldloc.0
-		ldfld native int[0...] Test.AA::m_ai
+		ldfld native int[0...] Test_i_flow.AA::m_ai
 		ldc.i4.1
 		ldelema [mscorlib]System.IntPtr
 		br merge_3
 	a6:
 		ldloc.0
-		ldfld native int[0...] Test.AA::m_ai
+		ldfld native int[0...] Test_i_flow.AA::m_ai
 		ldc.i4.1
 		ldelema [mscorlib]System.IntPtr
 	merge_1:
 		ldloc.0
-		ldflda native int Test.AA::m_i
+		ldflda native int Test_i_flow.AA::m_i
 	final_merge:
 		stloc p1
 		stloc p2
@@ -145,16 +145,16 @@
       call       instance void [mscorlib]System.Object::.ctor()
       ldarg.0
       ldc.i4.0
-      stfld		native int Test.AA::m_i
+      stfld		native int Test_i_flow.AA::m_i
       ldarg.0
       ldc.i4.8
       newobj   instance void native int[0...]::.ctor(int32)
-      stfld		native int[0...] Test.AA::m_ai
+      stfld		native int[0...] Test_i_flow.AA::m_ai
       ret
     } // end of method 'AA::.ctor'
 
   } // end of class 'AA'
 
-} // end of namespace 'Test'
+} // end of namespace 'Test_i_flow'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flow_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flow_il_d.ilproj
index 5fe3b59cd35415..cff07f7922db77 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flow_il_d.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flow_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flow_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flow_il_r.ilproj
index 6d221ffb44b94c..7ab811b222e2b5 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flow_il_r.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flow_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_prop.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_prop.il
index d5dcdcf26ed5e0..355c2d0fd5db5a 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_prop.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_prop.il
@@ -12,26 +12,26 @@
 .assembly 'i_prop'// as "qsort"
 { }
 .assembly extern xunit.core {}
-.namespace Test
+.namespace Test_i_prop
 {
-  .class private auto ansi BB extends [mscorlib]System.Object
+  .class public auto ansi BB extends [mscorlib]System.Object
   {
-    .method private hidebysig static int32 Main() il managed
+    .method public hidebysig static int32 Main() il managed
     {
 		.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
 		    01 00 00 00
 		)
 		.entrypoint
 		.maxstack  8
-		.locals (class Test.AA)
+		.locals (class Test_i_prop.AA)
 		
-		newobj instance void Test.AA::.ctor()
+		newobj instance void Test_i_prop.AA::.ctor()
 		stloc.0
 		ldloc.0
 		ldc.i4.0
-		call instance void Test.AA::set_I(native int)
+		call instance void Test_i_prop.AA::set_I(native int)
 		ldloc.0
-		call instance native int Test.AA::get_I()
+		call instance native int Test_i_prop.AA::get_I()
 		ldstr "passed"
 		call void [System.Console]System.Console::WriteLine(class [mscorlib]System.String)
 		ldc.i4 0x64
@@ -56,7 +56,7 @@
 	{
 		.maxstack  8
 		ldarg.0
-		ldfld native int Test.AA::m_i
+		ldfld native int Test_i_prop.AA::m_i
 		ret
 	}
 	
@@ -65,7 +65,7 @@
 		.maxstack  8
 		ldarg.0
 		ldarg.1
-		stfld native int Test.AA::m_i
+		stfld native int Test_i_prop.AA::m_i
 		ret
 	}
 	
@@ -77,12 +77,12 @@
       call       instance void [mscorlib]System.Object::.ctor()
       ldarg.0
       ldc.i4.0
-      stfld		native int Test.AA::m_i
+      stfld		native int Test_i_prop.AA::m_i
       ret
     } // end of method 'AA::.ctor'
 
   } // end of class 'AA'
 
-} // end of namespace 'Test'
+} // end of namespace 'Test_i_prop'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_prop_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_prop_il_d.ilproj
index 5fb42ecd6dae38..b239dd45c16e5f 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_prop_il_d.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_prop_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_prop_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_prop_il_r.ilproj
index b40480a7affeb3..7cb0d43c8016cf 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_prop_il_r.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_prop_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort1.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort1.il
index 149c053c506220..9bcc4642321e89 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort1.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort1.il
@@ -18,9 +18,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {D2333E3D-2CA6-4703-8D46-E41A46BDF801}
-.namespace QSortTest
+.namespace QSortTest_i_qsort1
 {
-  .class private auto ansi Sorter
+  .class public auto ansi Sorter
          extends [mscorlib]System.Object
   {
     .method private hidebysig static void Sort(native int[] A,
@@ -194,7 +194,7 @@
       IL_00b1:  ret
     } // end of method 'Sorter::Sort'
 
-    .method private hidebysig static int32 Main() il managed
+    .method public hidebysig static int32 Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
           01 00 00 00
@@ -248,7 +248,7 @@
       IL_0035:  ldloc.1
       IL_0036:  ldc.i4.1
       IL_0037:  ldloc.0
-      IL_0038:  call       void QSortTest.Sorter::Sort(native int[],
+      IL_0038:  call       void QSortTest_i_qsort1.Sorter::Sort(native int[],
                                                        native int,
                                                        native int)
       IL_003d:  ldc.i4.2
@@ -305,6 +305,6 @@
 
   } // end of class 'Sorter'
 
-} // end of namespace 'QSortTest'
+} // end of namespace 'QSortTest_i_qsort1'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort1_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort1_il_d.ilproj
index 14b7446b9670e2..626dc2ae38d780 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort1_il_d.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort1_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort1_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort1_il_r.ilproj
index fe83dad4416c04..b9cddf0ec783a3 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort1_il_r.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort1_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort2.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort2.il
index eff30d5e8d9479..7b9a043cca25aa 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort2.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort2.il
@@ -18,9 +18,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {D2333E3D-2CA6-4703-8D46-E41A46BDF801}
-.namespace QSortTest
+.namespace QSortTest_i_qsort2
 {
-  .class private auto ansi Sorter
+  .class public auto ansi Sorter
          extends [mscorlib]System.Object
   {
     .method private hidebysig static void Sort(native int[] A,
@@ -194,7 +194,7 @@
       IL_00b1:  ret
     } // end of method 'Sorter::Sort'
 
-    .method private hidebysig static int32 Main() il managed
+    .method public hidebysig static int32 Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
           01 00 00 00
@@ -248,7 +248,7 @@
       IL_0035:  ldloc.1
       IL_0036:  ldc.i4.1
       IL_0037:  ldloc.0
-      IL_0038:  call       void QSortTest.Sorter::Sort(native int[],
+      IL_0038:  call       void QSortTest_i_qsort2.Sorter::Sort(native int[],
                                                        native int,
                                                        native int)
       IL_003d:  ldc.i4.2
@@ -305,6 +305,6 @@
 
   } // end of class 'Sorter'
 
-} // end of namespace 'QSortTest'
+} // end of namespace 'QSortTest_i_qsort2'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort2_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort2_il_d.ilproj
index 0b531f1b6631de..a93af1f6b9e382 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort2_il_d.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort2_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort2_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort2_il_r.ilproj
index f548bfea09a777..7987c7a0dd0599 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort2_il_r.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort2_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_ref.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_ref.il
index e769815a52897b..9cfc829a3a9b78 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_ref.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_ref.il
@@ -18,12 +18,12 @@
 }
 .assembly extern xunit.core {}
 // MVID: {BCA6096F-DF11-4FA3-BF16-EEDA01729535}
-.namespace AvgTest
+.namespace AvgTest_i_ref
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends [mscorlib]System.Object
   {
-    .method private hidebysig static int32 Main() il managed
+    .method public hidebysig static int32 Main() il managed
     {
 		.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
 		    01 00 00 00
@@ -57,6 +57,6 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'AvgTest'
+} // end of namespace 'AvgTest_i_ref'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_ref_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_ref_il_d.ilproj
index 3880a8d982292c..5c659e764b5e04 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_ref_il_d.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_ref_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_ref_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_ref_il_r.ilproj
index 84881b4e62764c..614b6f9bc27295 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_ref_il_r.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_ref_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_seq.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_seq.il
index fdbc30b14fc3cd..ff0410155ad0de 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_seq.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_seq.il
@@ -12,7 +12,7 @@
 .assembly 'i_seq'
 { }
 .assembly extern xunit.core {}
-.class private auto ansi Test_i_seq extends [mscorlib]System.Object
+.class public auto ansi Test_i_seq extends [mscorlib]System.Object
 {
 .method private hidebysig static native int calc(native int, native int) il managed
 {
@@ -45,7 +45,7 @@ stop:
 	ret
 }
 
-.method private hidebysig static int32 Main() il managed
+.method public hidebysig static int32 Main() il managed
 {
 	.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
 	    01 00 00 00
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_seq_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_seq_il_d.ilproj
index 9bcb9184e4fa3c..ebceab794c221e 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_seq_il_d.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_seq_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_seq_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_seq_il_r.ilproj
index 1ee40448959c90..e9a1d646b1955b 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_seq_il_r.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_seq_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_vfld.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_vfld.il
index 1ee71853a116b2..69d5f09b6b7511 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_vfld.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_vfld.il
@@ -12,28 +12,28 @@
 .assembly 'i_vfld'// as "qsort"
 { }
 .assembly extern xunit.core {}
-.namespace Test
+.namespace Test_i_vfld
 {
-  .class private value sealed auto ansi AA extends [mscorlib]System.ValueType
+  .class public value sealed auto ansi AA extends [mscorlib]System.ValueType
   {
 	.field public native int m_i
 	.field public static native int s_i
 	.field public native int[0...] m_ai
 
-    .method private hidebysig static int32 Main() il managed
+    .method public hidebysig static int32 Main() il managed
     {
 		.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
 		    01 00 00 00
 		)
 		.entrypoint
 		.maxstack  8
-		.locals (value class Test.AA pinned, native int[0...], native int, int32, native int[0...] pinned)
-		newobj instance void Test.AA::.ctor()
+		.locals (value class Test_i_vfld.AA pinned, native int[0...], native int, int32, native int[0...] pinned)
+		newobj instance void Test_i_vfld.AA::.ctor()
 		stloc.0
 
 
 		ldloc.0
-		ldfld native int[0...] Test.AA::m_ai
+		ldfld native int[0...] Test_i_vfld.AA::m_ai
 		stloc 4
 
 		ldc.i4 18
@@ -47,11 +47,11 @@
 		dup
 
 		ldc.i4 16
-		ldsflda native int Test.AA::s_i
+		ldsflda native int Test_i_vfld.AA::s_i
 		stelem.i
 		ldc.i4 17
 		ldloca 0
-		ldflda native int Test.AA::m_i
+		ldflda native int Test_i_vfld.AA::m_i
 		stelem.i
 		ldc.i4 18
 		ldloca 2
@@ -63,7 +63,7 @@
 		ldloc.1
 		ldloc.3
 		ldloca 0
-		ldfld native int[0...] Test.AA::m_ai
+		ldfld native int[0...] Test_i_vfld.AA::m_ai
 		ldloc.3
 		ldelema [mscorlib]System.IntPtr
 		stelem.i
@@ -116,7 +116,7 @@
     {
 	      .maxstack  8
 	      ldc.i4 100
-	      stsfld native int Test.AA::s_i
+	      stsfld native int Test_i_vfld.AA::s_i
 	      ret
     } // end of method 'AA::.ctor'
     .method public hidebysig specialname rtspecialname instance void .ctor() il managed
@@ -127,11 +127,11 @@
 		//call       instance void [mscorlib]System.Object::.ctor()
 		ldarg.0
 		ldc.i4 10
-		stfld native int Test.AA::m_i
+		stfld native int Test_i_vfld.AA::m_i
 		ldarg.0
 		ldc.i4 16
 		newobj instance void native int[0...]::.ctor(int32)
-		stfld native int[0...] Test.AA::m_ai
+		stfld native int[0...] Test_i_vfld.AA::m_ai
 
 		ldc.i4.0
 		br begin_loop
@@ -139,7 +139,7 @@
 		dup
 		stloc.0
 		ldarg.0
-		ldfld native int[0...] Test.AA::m_ai
+		ldfld native int[0...] Test_i_vfld.AA::m_ai
 		ldloc.0
 		dup
 		stelem.i
@@ -156,6 +156,6 @@
 
   } // end of class 'AA'
 
-} // end of namespace 'Test'
+} // end of namespace 'Test_i_vfld'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_vfld_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_vfld_il_d.ilproj
index d230cd84fb3ce8..3328fa7adf718c 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_vfld_il_d.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_vfld_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_vfld_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_vfld_il_r.ilproj
index 8240cb1d5dfa0e..90bc776fa4c026 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_vfld_il_r.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_vfld_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/ptr.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/ptr.il
index 9cca4bf657e609..fca5b8311ec7d9 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/ptr.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/ptr.il
@@ -4,6 +4,7 @@
 //
 //.corflags 0x00000002
 .assembly extern mscorlib { }
+.assembly extern xunit.core {}
 .assembly extern System.Console
 {
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
@@ -11,26 +12,28 @@
 }
 .assembly 'ptr'
 { }
+.namespace Test_ptr
+{
 // MVID: {6048B3F7-DE21-4008-935A-6B43C5338841}
 .class value private explicit ansi sealed $MultiByte$size$120
 {
   .pack 1
   .size 120
-} // end of class '$MultiByte$size$120'
+} // end of class 'Test_ptr.$MultiByte$size$120'
 
 .class value private explicit ansi sealed $MultiByte$size$7
 {
   .pack 1
   .size 7
-} // end of class '$MultiByte$size$7'
+} // end of class 'Test_ptr.$MultiByte$size$7'
 
 .class value private explicit ansi sealed $MultiByte$size$32000
 {
   .pack 1
   .size 32000
-} // end of class '$MultiByte$size$32000'
+} // end of class 'Test_ptr.$MultiByte$size$32000'
 
-.class AA {
+.class public AA {
 .method public static void qsort(native unsigned int A_0,
               unsigned int32 A_1,
               unsigned int32 A_2,
@@ -44,8 +47,8 @@
            int8 * V_4,
            native uint V_5,
            int8 * V_6,
-           value class $MultiByte$size$120 V_7,
-           value class $MultiByte$size$120 V_8)
+           value class Test_ptr.$MultiByte$size$120 V_7,
+           value class Test_ptr.$MultiByte$size$120 V_8)
   IL_0000:  ldarg.1
   IL_0001:  ldc.i4.2
   IL_0002:  blt.un.s   IL_0007
@@ -83,7 +86,7 @@
   IL_0029:  ldloc.s    V_4
   IL_002b:  ldarg.2
   IL_002c:  ldarg.3
-  IL_002d:  call       void AA::shortsort(native unsigned int, native unsigned int, unsigned int32, method int32 *(native unsigned int,native unsigned int))
+  IL_002d:  call       void Test_ptr.AA::shortsort(native unsigned int, native unsigned int, unsigned int32, method int32 *(native unsigned int,native unsigned int))
   IL_0032:  br         IL_00ef
 
   IL_0037:  ldloc.0
@@ -98,7 +101,7 @@
   IL_0041:  ldloc.s    V_6
   IL_0043:  ldloc.0
   IL_0044:  ldarg.2
-  IL_0045:  call       void  AA::swap(native unsigned int, native unsigned int, unsigned int32)
+  IL_0045:  call       void  Test_ptr.AA::swap(native unsigned int, native unsigned int, unsigned int32)
   IL_004a:  ldloc.0
   IL_004b:  stloc.3
   IL_004c:  ldloc.s    V_4
@@ -144,13 +147,13 @@
   IL_007e:  ldloc.3
   IL_007f:  ldloc.2
   IL_0080:  ldarg.2
-  IL_0081:  call       void AA::swap(native unsigned int, native unsigned int, unsigned int32)
+  IL_0081:  call       void Test_ptr.AA::swap(native unsigned int, native unsigned int, unsigned int32)
   IL_0086:  br.s       IL_0051
 
   IL_0088:  ldloc.0
   IL_0089:  ldloc.2
   IL_008a:  ldarg.2
-  IL_008b:  call       void AA::swap(native unsigned int, native unsigned int, unsigned int32)
+  IL_008b:  call       void Test_ptr.AA::swap(native unsigned int, native unsigned int, unsigned int32)
   IL_0090:  ldloc.2
   IL_0091:  ldc.i4.1
   IL_0092:  sub
@@ -302,7 +305,7 @@
   IL_0023:  ldloc.1
   IL_0024:  ldarg.1
   IL_0025:  ldarg.2
-  IL_0026:  call       void  AA::swap(native unsigned int, native unsigned int, unsigned int32)
+  IL_0026:  call       void  Test_ptr.AA::swap(native unsigned int, native unsigned int, unsigned int32)
   IL_002b:  ldarg.1
   IL_002c:  ldarg.2
   IL_002d:  sub
@@ -388,11 +391,14 @@
 
 .method public static int32 main() il managed
 {
+  .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+      01 00 00 00
+  )
   .entrypoint
   .maxstack  4
   .locals (int32 V_0,
            unsigned int32 V_1,
-           value class $MultiByte$size$32000 V_2,
+           value class Test_ptr.$MultiByte$size$32000 V_2,
            int32 V_3)
   IL_0000:  ldc.i4     0x1f40
   IL_0005:  stloc.3
@@ -430,8 +436,8 @@
   IL_0034:  ldloca.s   V_2
   IL_0036:  ldc.i4     0x1f40
   IL_003b:  ldc.i4.4
-  			ldftn  int32 AA::mycomp(native unsigned int A_0, native unsigned int A_1)
-  IL_0041:  call       void AA::qsort(native unsigned int,unsigned int32,unsigned int32,
+  			ldftn  int32 Test_ptr.AA::mycomp(native unsigned int A_0, native unsigned int A_1)
+  IL_0041:  call       void Test_ptr.AA::qsort(native unsigned int,unsigned int32,unsigned int32,
   							method int32 *(native unsigned int, native unsigned int))
   IL_0046:  ldc.i4.1
   IL_0047:  stloc.0
@@ -481,4 +487,5 @@
   IL_0090:  ldc.i4.0
   IL_0091:  ret
 } // end of global method 'main'
-} //class AA
+} //class Test_ptr.AA
+}
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/ptr_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/ptr_il_d.ilproj
index a69858028946eb..97d11acfdd8dbb 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/ptr_il_d.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/ptr_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/ptr_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/ptr_il_r.ilproj
index 9d4c3a9f4a08ab..6f8f33a3ed2eef 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/ptr_il_r.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/ptr_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/qperm.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/qperm.il
index 6e21d80f7d107b..9048a5bf56b174 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/qperm.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/qperm.il
@@ -18,9 +18,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {D2333E3D-2CA6-4703-8D46-E41A46BDF801}
-.namespace QSortTest
+.namespace QSortTest_qperm
 {
-  .class private auto ansi Sorter
+  .class public auto ansi Sorter
          extends [mscorlib]System.Object
   {
     .method private hidebysig static void Sort(native unsigned int[] A,
@@ -197,7 +197,7 @@
       IL_00b1:  ret
     } // end of method 'Sorter::Sort'
 
-    .method private hidebysig static int32 Main() il managed
+    .method public hidebysig static int32 Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
           01 00 00 00
@@ -249,7 +249,7 @@
       IL_0035:  ldloc.1
       IL_0036:  ldc.i4.1
       IL_0037:  ldloc.0
-      IL_0038:  call       void QSortTest.Sorter::Sort(native unsigned int[],
+      IL_0038:  call       void QSortTest_qperm.Sorter::Sort(native unsigned int[],
                                                        native unsigned int,
                                                        native unsigned int)
       IL_003d:  ldc.i4.2
@@ -306,6 +306,6 @@
 
   } // end of class 'Sorter'
 
-} // end of namespace 'QSortTest'
+} // end of namespace 'QSortTest_qperm'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/qperm_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/qperm_il_d.ilproj
index e6a5efbf281a48..b9c17409e043f6 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/qperm_il_d.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/qperm_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/qperm_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/qperm_il_r.ilproj
index a82c9c4e6cf9a8..38a5b6e00c4d91 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/qperm_il_r.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/qperm_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_32BIT.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_32BIT.il
index 10f05df7286bfc..23d6491356d912 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_32BIT.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_32BIT.il
@@ -21,12 +21,12 @@
 .assembly extern Microsoft.DotNet.XUnitExtensions { .publickeytoken = (31 BF 38 56 AD 36 4E 35 ) }
 .assembly extern TestLibrary {}
 // MVID: {BCA6096F-DF11-4FA3-BF16-EEDA01729535}
-.namespace AvgTest
+.namespace AvgTest_sizeof_Target_32BIT
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends [mscorlib]System.Object
   {
-    .method private hidebysig static int32 Main() il managed
+    .method public hidebysig static int32 Main() il managed
     {
         // [ConditionalFact(typeof(TestLibrary.PlatformDetection), nameof(TestLibrary.PlatformDetection.Is32BitProcess))]
         .custom instance void [Microsoft.DotNet.XUnitExtensions]Xunit.ConditionalFactAttribute::.ctor(class [System.Runtime]System.Type,
@@ -83,6 +83,6 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'AvgTest'
+} // end of namespace 'AvgTest_sizeof_Target_32BIT'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_32BIT_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_32BIT_il_d.ilproj
index 36f1fa2e9c2e88..ba68bab98a49de 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_32BIT_il_d.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_32BIT_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
     <!-- There is a 32 and 64 version of this test to allow it to be compiled for all targets -->
     <CLRTestTargetUnsupported Condition="'$(TargetBits)' != '32'">true</CLRTestTargetUnsupported>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_32BIT_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_32BIT_il_r.ilproj
index c45415217944f5..01c485a6cbb993 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_32BIT_il_r.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_32BIT_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
     <!-- There is a 32 and 64 version of this test to allow it to be compiled for all targets -->
     <CLRTestTargetUnsupported Condition="'$(TargetBits)' != '32'">true</CLRTestTargetUnsupported>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_64BIT.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_64BIT.il
index fe96ed6e068ea7..69c812a3fd7cf7 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_64BIT.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_64BIT.il
@@ -23,10 +23,10 @@
 // MVID: {BCA6096F-DF11-4FA3-BF16-EEDA01729535}
 .namespace AvgTest_sizeof_Target_64BIT
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends [mscorlib]System.Object
   {
-    .method private hidebysig static int32 Main() il managed
+    .method public hidebysig static int32 Main() il managed
     {
         // [ConditionalFact(typeof(TestLibrary.PlatformDetection), nameof(TestLibrary.PlatformDetection.Is64BitProcess))]
         .custom instance void [Microsoft.DotNet.XUnitExtensions]Xunit.ConditionalFactAttribute::.ctor(class [System.Runtime]System.Type,
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_64BIT_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_64BIT_il_d.ilproj
index 9a112c2b454094..49754d19b72c42 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_64BIT_il_d.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_64BIT_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
     <!-- There is a 32 and 64 version of this test to allow it to be compiled for all targets -->
     <CLRTestTargetUnsupported Condition="'$(TargetBits)' != '64'">true</CLRTestTargetUnsupported>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_64BIT_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_64BIT_il_r.ilproj
index 4eb0977ace559b..9095bb7e22bc36 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_64BIT_il_r.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_64BIT_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
     <!-- There is a 32 and 64 version of this test to allow it to be compiled for all targets -->
     <CLRTestTargetUnsupported Condition="'$(TargetBits)' != '64'">true</CLRTestTargetUnsupported>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_32BIT.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_32BIT.il
index f48e22a1482dd0..f8575aba8961a4 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_32BIT.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_32BIT.il
@@ -17,7 +17,7 @@
 .assembly extern TestLibrary {}
 .class public auto ansi Test_u_array_merge_Target_32BIT extends [mscorlib]System.Object
 {
-.method private hidebysig static int32 Main() il managed
+.method public hidebysig static int32 Main() il managed
 {
         // [ConditionalFact(typeof(TestLibrary.PlatformDetection), nameof(TestLibrary.PlatformDetection.Is32BitProcess))]
         .custom instance void [Microsoft.DotNet.XUnitExtensions]Xunit.ConditionalFactAttribute::.ctor(class [System.Runtime]System.Type,
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_32BIT_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_32BIT_il_d.ilproj
index 7916e25b44e4a8..85a5b5be38470c 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_32BIT_il_d.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_32BIT_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <!-- There is a 32 and 64 version of this test to allow it to be compiled for all targets -->
     <CLRTestTargetUnsupported Condition="'$(TargetBits)' != '32'">true</CLRTestTargetUnsupported>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_32BIT_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_32BIT_il_r.ilproj
index b655d1fb99a0da..de64e5da18c9fd 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_32BIT_il_r.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_32BIT_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <!-- There is a 32 and 64 version of this test to allow it to be compiled for all targets -->
     <CLRTestTargetUnsupported Condition="'$(TargetBits)' != '32'">true</CLRTestTargetUnsupported>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_64BIT.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_64BIT.il
index cff14a324e3305..4da56c505da9fc 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_64BIT.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_64BIT.il
@@ -17,7 +17,7 @@
 .assembly extern TestLibrary {}
 .class public auto ansi Test_u_array_merge_Target_64BIT extends [mscorlib]System.Object
 {
-.method private hidebysig static int32 Main() il managed
+.method public hidebysig static int32 Main() il managed
 {
     // [ConditionalFact(typeof(TestLibrary.PlatformDetection), nameof(TestLibrary.PlatformDetection.Is64BitProcess))]
     .custom instance void [Microsoft.DotNet.XUnitExtensions]Xunit.ConditionalFactAttribute::.ctor(class [System.Runtime]System.Type,
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_64BIT_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_64BIT_il_d.ilproj
index b6c93aafc2ba71..63cc7d1ff34f52 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_64BIT_il_d.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_64BIT_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <!-- There is a 32 and 64 version of this test to allow it to be compiled for all targets -->
     <CLRTestTargetUnsupported Condition="'$(TargetBits)' != '64'">true</CLRTestTargetUnsupported>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_64BIT_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_64BIT_il_r.ilproj
index 34d5ee7f12b79b..b39facd158fabc 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_64BIT_il_r.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_64BIT_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <!-- There is a 32 and 64 version of this test to allow it to be compiled for all targets -->
     <CLRTestTargetUnsupported Condition="'$(TargetBits)' != '64'">true</CLRTestTargetUnsupported>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_box.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_box.il
index 1b066e701a1717..104db84364fb1e 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_box.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_box.il
@@ -20,9 +20,9 @@
 {
 }
 .assembly extern xunit.core {}
-.namespace BoxTest
+.namespace BoxTest_u_box_il
 {
-  .class private auto ansi Test extends [mscorlib]System.Object
+  .class public auto ansi Test extends [mscorlib]System.Object
   {
     .method private hidebysig static void Test(class [mscorlib]System.Object, native unsigned int&) il managed
     {
@@ -45,7 +45,7 @@
     	stind.i
     	ret
     }
-    .method private hidebysig static int32 Main() il managed
+    .method public hidebysig static int32 Main() il managed
     {
 		.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
 		    01 00 00 00
@@ -59,13 +59,13 @@
 		box [mscorlib]System.UIntPtr
 		dup
 		ldloca 0
-		call void BoxTest.Test::Test(class [mscorlib]System.Object, native unsigned int&)
+		call void BoxTest_u_box_il.Test::Test(class [mscorlib]System.Object, native unsigned int&)
 		ldloc.0
 		brtrue box_pop_fail
 		dup
 		dup
 		unbox [mscorlib]System.UIntPtr
-		call void BoxTest.Test::Test(class [mscorlib]System.Object, native unsigned int&)
+		call void BoxTest_u_box_il.Test::Test(class [mscorlib]System.Object, native unsigned int&)
 		unbox [mscorlib]System.UIntPtr
 		ldind.i
 		dup
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_box_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_box_il_d.ilproj
index a19d51fcb2d1f2..421e4847892c7e 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_box_il_d.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_box_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_box_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_box_il_r.ilproj
index 06a9d7f5d475fc..f97fa1960c274d 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_box_il_r.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_box_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_conv.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_conv.il
index 3983ee2b667007..e5e72336876477 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_conv.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_conv.il
@@ -12,7 +12,7 @@
 .assembly 'u_conv'
 { }
 .assembly extern xunit.core {}
-.class private auto ansi Test_u_conv extends [mscorlib]System.Object
+.class public auto ansi Test_u_conv extends [mscorlib]System.Object
 {
 .method private hidebysig static native unsigned int to_native(int32) il managed
 {
@@ -20,7 +20,7 @@
 	conv.ovf.i
 	ret
 }
-.method private hidebysig static int32 Main() il managed
+.method public hidebysig static int32 Main() il managed
 {
 	.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
 	    01 00 00 00
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_conv_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_conv_il_d.ilproj
index b1401d0620c650..ab1f33647fa1a3 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_conv_il_d.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_conv_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_fld.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_fld.il
index 9c6590144ac72f..721cd576aff1d1 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_fld.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_fld.il
@@ -12,28 +12,28 @@
 .assembly 'u_fld'// as "qsort"
 { }
 .assembly extern xunit.core {}
-.namespace Test
+.namespace Test_u_fld
 {
-  .class private auto ansi AA extends [mscorlib]System.Object
+  .class public auto ansi AA extends [mscorlib]System.Object
   {
 	.field public native unsigned int m_i
 	.field public static native unsigned int s_i
 	.field public native unsigned int[0...] m_ai
 
-    .method private hidebysig static int32 Main() il managed
+    .method public hidebysig static int32 Main() il managed
     {
 		.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
 		    01 00 00 00
 		)
 		.entrypoint
 		.maxstack  8
-		.locals (class Test.AA pinned, native unsigned int[0...], native unsigned int, int32, native unsigned int[0...] pinned)
-		newobj instance void Test.AA::.ctor()
+		.locals (class Test_u_fld.AA pinned, native unsigned int[0...], native unsigned int, int32, native unsigned int[0...] pinned)
+		newobj instance void Test_u_fld.AA::.ctor()
 		stloc.0
 
-		// test bug fix: make sure to pin Test.AA::m_ai
+		// test bug fix: make sure to pin Test_u_fld.AA::m_ai
 		ldloc.0
-		ldfld native unsigned int[0...] Test.AA::m_ai
+		ldfld native unsigned int[0...] Test_u_fld.AA::m_ai
 		stloc 4
 
 		ldc.i4 18
@@ -47,11 +47,11 @@
 		dup
 
 		ldc.i4 16
-		ldsflda native unsigned int Test.AA::s_i
+		ldsflda native unsigned int Test_u_fld.AA::s_i
 		stelem.i
 		ldc.i4 17
 		ldloc.0
-		ldflda native unsigned int Test.AA::m_i
+		ldflda native unsigned int Test_u_fld.AA::m_i
 		stelem.i
 		ldc.i4 18
 		ldloca 2
@@ -63,7 +63,7 @@
 		ldloc.1
 		ldloc.3
 		ldloc.0
-		ldfld native unsigned int[0...] Test.AA::m_ai
+		ldfld native unsigned int[0...] Test_u_fld.AA::m_ai
 		ldloc.3
 		ldelema [mscorlib]System.IntPtr
 		stelem.i
@@ -116,7 +116,7 @@
     {
 	      .maxstack  8
 	      ldc.i4 100
-	      stsfld native unsigned int Test.AA::s_i
+	      stsfld native unsigned int Test_u_fld.AA::s_i
 	      ret
     } // end of method 'AA::.ctor'
     .method public hidebysig specialname rtspecialname instance void .ctor() il managed
@@ -127,11 +127,11 @@
 		call       instance void [mscorlib]System.Object::.ctor()
 		ldarg.0
 		ldc.i4 10
-		stfld native unsigned int Test.AA::m_i
+		stfld native unsigned int Test_u_fld.AA::m_i
 		ldarg.0
 		ldc.i4 16
 		newobj instance void native unsigned int[0...]::.ctor(int32)
-		stfld native unsigned int[0...] Test.AA::m_ai
+		stfld native unsigned int[0...] Test_u_fld.AA::m_ai
 
 		ldc.i4.0
 		br begin_loop
@@ -139,7 +139,7 @@
 		dup
 		stloc.0
 		ldarg.0
-		ldfld native unsigned int[0...] Test.AA::m_ai
+		ldfld native unsigned int[0...] Test_u_fld.AA::m_ai
 		ldloc.0
 		dup
 		stelem.i
@@ -156,6 +156,6 @@
 
   } // end of class 'AA'
 
-} // end of namespace 'Test'
+} // end of namespace 'Test_u_fld'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_fld_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_fld_il_d.ilproj
index 46a226f70642c9..7c277859fd8b56 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_fld_il_d.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_fld_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_fld_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_fld_il_r.ilproj
index 4be1975043a4dc..3527dfcbea67a3 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_fld_il_r.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_fld_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flood.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flood.il
index fd2d11583233dc..d0962544b91a65 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flood.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flood.il
@@ -18,9 +18,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {BCA6096F-DF11-4FA3-BF16-EEDA01729535}
-.namespace AvgTest {
-  .class private auto ansi Test extends [mscorlib]System.Object {
-    .method private hidebysig static int32 Main() il managed {
+.namespace AvgTest_u_flood {
+  .class public auto ansi Test extends [mscorlib]System.Object {
+    .method public hidebysig static int32 Main() il managed {
 	.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
 	    01 00 00 00
 	)
@@ -69,6 +69,6 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'AvgTest'
+} // end of namespace 'AvgTest_u_flood'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flood_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flood_il_d.ilproj
index 7ffb1dc60b9ae1..0b2a98541dbb6a 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flood_il_d.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flood_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flood_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flood_il_r.ilproj
index eae48d4132aefb..feb67d80fbff8d 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flood_il_r.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flood_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flow.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flow.il
index 711a5d67e3ac67..764a9c36d079b5 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flow.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flow.il
@@ -18,14 +18,14 @@
 }
 .assembly extern xunit.core {}
 // MVID: {3433C0F8-3BEA-4168-AB0C-C275EF054928}
-.namespace Test
+.namespace Test_u_flow
 {
-  .class private auto ansi AA extends [mscorlib]System.Object
+  .class public auto ansi AA extends [mscorlib]System.Object
   {
 	.field public native unsigned int m_i
 	.field public native unsigned int[0...] m_ai
 
-    .method private hidebysig static int32 Main() il managed
+    .method public hidebysig static int32 Main() il managed
     {
 		.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
 		    01 00 00 00
@@ -33,29 +33,29 @@
 		.entrypoint
 		// Code size       134 (0x86)
 		.maxstack  8
-		.locals (class Test.AA, native unsigned int i, native unsigned int& p1, native unsigned int& p2)
-		newobj instance void Test.AA::.ctor()
+		.locals (class Test_u_flow.AA, native unsigned int i, native unsigned int& p1, native unsigned int& p2)
+		newobj instance void Test_u_flow.AA::.ctor()
 		stloc.0
 		
 		ldloc.0
 		ldc.i4 0x80000000
 		conv.u
-		stfld native unsigned int Test.AA::m_i
+		stfld native unsigned int Test_u_flow.AA::m_i
 
 		ldloc.0
-		ldfld native unsigned int Test.AA::m_i
+		ldfld native unsigned int Test_u_flow.AA::m_i
 		ldc.i4 0x7fffffff
 		conv.u
 		blt.un fail
 
 		ldloc.0
-		ldfld native unsigned int Test.AA::m_i
+		ldfld native unsigned int Test_u_flow.AA::m_i
 		ldc.i4 0x80000001
 		conv.u
 		bgt.un fail
 
 		ldloc.0
-		ldfld native unsigned int Test.AA::m_i
+		ldfld native unsigned int Test_u_flow.AA::m_i
 		ldc.i4 0x80000001
 		conv.u
 		bgt.un fail
@@ -73,34 +73,34 @@
 		ldloca i
 	merge_2:
 		ldloc.0
-		ldfld native unsigned int[0...] Test.AA::m_ai
+		ldfld native unsigned int[0...] Test_u_flow.AA::m_ai
 		ldc.i4.1
 		ldelema [mscorlib]System.IntPtr
 		br final_merge
 	a3:
 		ldloc.0
-		ldflda native unsigned int Test.AA::m_i
+		ldflda native unsigned int Test_u_flow.AA::m_i
 	merge_3:
 		ldloca i
 		br final_merge
 	a4:
 		ldloc.0
-		ldflda native unsigned int Test.AA::m_i
+		ldflda native unsigned int Test_u_flow.AA::m_i
 		br merge_2
 	a5:
 		ldloc.0
-		ldfld native unsigned int[0...] Test.AA::m_ai
+		ldfld native unsigned int[0...] Test_u_flow.AA::m_ai
 		ldc.i4.1
 		ldelema [mscorlib]System.IntPtr
 		br merge_3
 	a6:
 		ldloc.0
-		ldfld native unsigned int[0...] Test.AA::m_ai
+		ldfld native unsigned int[0...] Test_u_flow.AA::m_ai
 		ldc.i4.1
 		ldelema [mscorlib]System.IntPtr
 	merge_1:
 		ldloc.0
-		ldflda native unsigned int Test.AA::m_i
+		ldflda native unsigned int Test_u_flow.AA::m_i
 	final_merge:
 		stloc p1
 		stloc p2
@@ -147,16 +147,16 @@
       call       instance void [mscorlib]System.Object::.ctor()
       ldarg.0
       ldc.i4.0
-      stfld		native unsigned int Test.AA::m_i
+      stfld		native unsigned int Test_u_flow.AA::m_i
       ldarg.0
       ldc.i4.8
       newobj   instance void native unsigned int[0...]::.ctor(int32)
-      stfld		native unsigned int[0...] Test.AA::m_ai
+      stfld		native unsigned int[0...] Test_u_flow.AA::m_ai
       ret
     } // end of method 'AA::.ctor'
 
   } // end of class 'AA'
 
-} // end of namespace 'Test'
+} // end of namespace 'Test_u_flow'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flow_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flow_il_d.ilproj
index 3d5adeeaa214eb..55d1aecad76f1a 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flow_il_d.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flow_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flow_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flow_il_r.ilproj
index a1ecae97ff77b9..eec76e6cef45e9 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flow_il_r.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flow_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_prop.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_prop.il
index a78edf140abdfa..8878455e02de79 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_prop.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_prop.il
@@ -12,26 +12,26 @@
 .assembly 'u_prop'// as "qsort"
 { }
 .assembly extern xunit.core {}
-.namespace Test
+.namespace Test_u_prop
 {
-  .class private auto ansi BB extends [mscorlib]System.Object
+  .class public auto ansi BB extends [mscorlib]System.Object
   {
-    .method private hidebysig static int32 Main() il managed
+    .method public hidebysig static int32 Main() il managed
     {
 		.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
 		    01 00 00 00
 		)
 		.entrypoint
 		.maxstack  8
-		.locals (class Test.AA)
+		.locals (class Test_u_prop.AA)
 		
-		newobj instance void Test.AA::.ctor()
+		newobj instance void Test_u_prop.AA::.ctor()
 		stloc.0
 		ldloc.0
 		ldc.i4.0
-		call instance void Test.AA::set_I(native unsigned int)
+		call instance void Test_u_prop.AA::set_I(native unsigned int)
 		ldloc.0
-		call instance native unsigned int Test.AA::get_I()
+		call instance native unsigned int Test_u_prop.AA::get_I()
 		ldstr "passed"
 		call void [System.Console]System.Console::WriteLine(class [mscorlib]System.String)
 		ldc.i4 0x64
@@ -56,7 +56,7 @@
 	{
 		.maxstack  8
 		ldarg.0
-		ldfld native unsigned int Test.AA::m_i
+		ldfld native unsigned int Test_u_prop.AA::m_i
 		ret
 	}
 	
@@ -65,7 +65,7 @@
 		.maxstack  8
 		ldarg.0
 		ldarg.1
-		stfld native unsigned int Test.AA::m_i
+		stfld native unsigned int Test_u_prop.AA::m_i
 		ret
 	}
 	
@@ -77,12 +77,12 @@
       call       instance void [mscorlib]System.Object::.ctor()
       ldarg.0
       ldc.i4.0
-      stfld		native unsigned int Test.AA::m_i
+      stfld		native unsigned int Test_u_prop.AA::m_i
       ret
     } // end of method 'AA::.ctor'
 
   } // end of class 'AA'
 
-} // end of namespace 'Test'
+} // end of namespace 'Test_u_prop'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_prop_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_prop_il_d.ilproj
index d127183b61d544..1c4ffa415e036b 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_prop_il_d.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_prop_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_prop_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_prop_il_r.ilproj
index 12590ee2ecff93..0655002d567abe 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_prop_il_r.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_prop_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort1.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort1.il
index b4d73c0eb2a29e..a9abcdf2235f86 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort1.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort1.il
@@ -18,9 +18,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {D2333E3D-2CA6-4703-8D46-E41A46BDF801}
-.namespace QSortTest
+.namespace QSortTest_u_qsort1
 {
-  .class private auto ansi Sorter
+  .class public auto ansi Sorter
          extends [mscorlib]System.Object
   {
     .method private hidebysig static void Sort(native unsigned int[] A,
@@ -194,7 +194,7 @@
       IL_00b1:  ret
     } // end of method 'Sorter::Sort'
 
-    .method private hidebysig static int32 Main() il managed
+    .method public hidebysig static int32 Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
           01 00 00 00
@@ -246,7 +246,7 @@
       IL_0035:  ldloc.1
       IL_0036:  ldc.i4.1
       IL_0037:  ldloc.0
-      IL_0038:  call       void QSortTest.Sorter::Sort(native unsigned int[],
+      IL_0038:  call       void QSortTest_u_qsort1.Sorter::Sort(native unsigned int[],
                                                        native unsigned int,
                                                        native unsigned int)
       IL_003d:  ldc.i4.2
@@ -303,6 +303,6 @@
 
   } // end of class 'Sorter'
 
-} // end of namespace 'QSortTest'
+} // end of namespace 'QSortTest_u_qsort1'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort1_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort1_il_d.ilproj
index 9d0972296a1894..e5a5381afda017 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort1_il_d.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort1_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort1_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort1_il_r.ilproj
index 17f0779cd262a4..9fe419347239b9 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort1_il_r.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort1_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort2.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort2.il
index d528b2e7d7b7ed..830b9ea8592255 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort2.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort2.il
@@ -18,9 +18,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {D2333E3D-2CA6-4703-8D46-E41A46BDF801}
-.namespace QSortTest
+.namespace QSortTest_u_qsort2
 {
-  .class private auto ansi Sorter
+  .class public auto ansi Sorter
          extends [mscorlib]System.Object
   {
     .method private hidebysig static void Sort(native unsigned int[] A,
@@ -194,7 +194,7 @@
       IL_00b1:  ret
     } // end of method 'Sorter::Sort'
 
-    .method private hidebysig static int32 Main() il managed
+    .method public hidebysig static int32 Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
           01 00 00 00
@@ -246,7 +246,7 @@
       IL_0035:  ldloc.1
       IL_0036:  ldc.i4.1
       IL_0037:  ldloc.0
-      IL_0038:  call       void QSortTest.Sorter::Sort(native unsigned int[],
+      IL_0038:  call       void QSortTest_u_qsort2.Sorter::Sort(native unsigned int[],
                                                        native unsigned int,
                                                        native unsigned int)
       IL_003d:  ldc.i4.2
@@ -303,6 +303,6 @@
 
   } // end of class 'Sorter'
 
-} // end of namespace 'QSortTest'
+} // end of namespace 'QSortTest_u_qsort2'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort2_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort2_il_d.ilproj
index 9f7342b7f3cf63..85309e36b9221e 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort2_il_d.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort2_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort2_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort2_il_r.ilproj
index 6a67b9d6e03739..ed64912a0588a3 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort2_il_r.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort2_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_ref.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_ref.il
index bae5688d7392f4..5d1cf0b51cd4d1 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_ref.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_ref.il
@@ -18,11 +18,11 @@
 }
 .assembly extern xunit.core {}
 // MVID: {BCA6096F-DF11-4FA3-BF16-EEDA01729535}
-.namespace AvgTest
+.namespace AvgTest_u_ref
 {
-  .class private auto ansi Test extends [mscorlib]System.Object
+  .class public auto ansi Test extends [mscorlib]System.Object
   {
-    .method private hidebysig static int32 Main() il managed
+    .method public hidebysig static int32 Main() il managed
     {
 		.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
 		    01 00 00 00
@@ -58,6 +58,6 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'AvgTest'
+} // end of namespace 'AvgTest_u_ref'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_ref_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_ref_il_d.ilproj
index 01a9f11dd09d3f..7fc8ded3e125ff 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_ref_il_d.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_ref_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_ref_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_ref_il_r.ilproj
index cfa050013e7cec..5d2cd7906bcad3 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_ref_il_r.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_ref_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_seq.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_seq.il
index cd0a599c240c5a..2ae453039b04a5 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_seq.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_seq.il
@@ -12,7 +12,7 @@
 .assembly 'u_seq'
 { }
 .assembly extern xunit.core {}
-.class private auto ansi Test_u_seq extends [mscorlib]System.Object
+.class public auto ansi Test_u_seq extends [mscorlib]System.Object
 {
 .method private hidebysig static native unsigned int calc(native unsigned int, native unsigned int) il managed
 {
@@ -46,7 +46,7 @@ stop:
 	ret
 }
 
-.method private hidebysig static int32 Main() il managed
+.method public hidebysig static int32 Main() il managed
 {
 	.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
 	    01 00 00 00
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_seq_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_seq_il_d.ilproj
index bcfa4bf80ec511..3f4bfe9476c953 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_seq_il_d.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_seq_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_seq_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_seq_il_r.ilproj
index 6923c938db7781..f7678cd782fb8f 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_seq_il_r.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_seq_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_vfld.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_vfld.il
index 8b27631e2a7846..f6cbbed0fb986d 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_vfld.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_vfld.il
@@ -12,27 +12,27 @@
 .assembly 'u_vfld'// as "qsort"
 { }
 .assembly extern xunit.core {}
-.namespace Test
+.namespace Test_u_vfld
 {
-  .class private value sealed auto ansi AA extends [mscorlib]System.ValueType
+  .class public value sealed auto ansi AA extends [mscorlib]System.ValueType
   {
 	.field public native unsigned int m_i
 	.field public static native unsigned int s_i
 	.field public native unsigned int[0...] m_ai
 
-    .method private hidebysig static int32 Main() il managed
+    .method public hidebysig static int32 Main() il managed
     {
 		.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
 		    01 00 00 00
 		)
 		.entrypoint
 		.maxstack  8
-		.locals (value class Test.AA pinned, native unsigned int[0...], native unsigned int, int32, native unsigned int[0...] pinned)
-		newobj instance void Test.AA::.ctor()
+		.locals (value class Test_u_vfld.AA pinned, native unsigned int[0...], native unsigned int, int32, native unsigned int[0...] pinned)
+		newobj instance void Test_u_vfld.AA::.ctor()
 		stloc.0
 
 		ldloc.0
-		ldfld native unsigned int[0...] Test.AA::m_ai
+		ldfld native unsigned int[0...] Test_u_vfld.AA::m_ai
 		stloc 4
 
 		ldc.i4 18
@@ -46,11 +46,11 @@
 		dup
 
 		ldc.i4 16
-		ldsflda native unsigned int Test.AA::s_i
+		ldsflda native unsigned int Test_u_vfld.AA::s_i
 		stelem.i
 		ldc.i4 17
 		ldloca 0
-		ldflda native unsigned int Test.AA::m_i
+		ldflda native unsigned int Test_u_vfld.AA::m_i
 		stelem.i
 		ldc.i4 18
 		ldloca 2
@@ -62,7 +62,7 @@
 		ldloc.1
 		ldloc.3
 		ldloca 0
-		ldfld native unsigned int[0...] Test.AA::m_ai
+		ldfld native unsigned int[0...] Test_u_vfld.AA::m_ai
 		ldloc.3
 		ldelema [mscorlib]System.IntPtr
 		stelem.i
@@ -115,7 +115,7 @@
     {
 	      .maxstack  8
 	      ldc.i4 100
-	      stsfld native unsigned int Test.AA::s_i
+	      stsfld native unsigned int Test_u_vfld.AA::s_i
 	      ret
     } // end of method 'AA::.ctor'
     .method public hidebysig specialname rtspecialname instance void .ctor() il managed
@@ -126,11 +126,11 @@
 		//call       instance void [mscorlib]System.Object::.ctor()
 		ldarg.0
 		ldc.i4 10
-		stfld native unsigned int Test.AA::m_i
+		stfld native unsigned int Test_u_vfld.AA::m_i
 		ldarg.0
 		ldc.i4 16
 		newobj instance void native unsigned int[0...]::.ctor(int32)
-		stfld native unsigned int[0...] Test.AA::m_ai
+		stfld native unsigned int[0...] Test_u_vfld.AA::m_ai
 
 		ldc.i4.0
 		br begin_loop
@@ -138,7 +138,7 @@
 		dup
 		stloc.0
 		ldarg.0
-		ldfld native unsigned int[0...] Test.AA::m_ai
+		ldfld native unsigned int[0...] Test_u_vfld.AA::m_ai
 		ldloc.0
 		dup
 		stelem.i
@@ -155,6 +155,6 @@
 
   } // end of class 'AA'
 
-} // end of namespace 'Test'
+} // end of namespace 'Test_u_vfld'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_vfld_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_vfld_il_d.ilproj
index 119f57d1ca9efa..d4f3059caa2dde 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_vfld_il_d.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_vfld_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_vfld_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_vfld_il_r.ilproj
index 72d928f74543f2..b0e0720529c6a9 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_vfld_il_r.ilproj
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_vfld_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/FPtrunc/convX.il b/src/tests/JIT/Methodical/FPtrunc/convX.il
index f812897efe1ab6..3c285e1e8ac62a 100644
--- a/src/tests/JIT/Methodical/FPtrunc/convX.il
+++ b/src/tests/JIT/Methodical/FPtrunc/convX.il
@@ -9,7 +9,7 @@
 .assembly extern mscorlib {}
 .assembly convX {}
 .assembly extern xunit.core {}
-.class private auto ansi beforefieldinit convX
+.class public auto ansi beforefieldinit convX
        extends [mscorlib]System.Object
 {
   .method public hidebysig static int32  Main() cil managed
diff --git a/src/tests/JIT/Methodical/FPtrunc/convX_il_d.ilproj b/src/tests/JIT/Methodical/FPtrunc/convX_il_d.ilproj
index 4214c608f9ec82..9f81e53de1a9a7 100644
--- a/src/tests/JIT/Methodical/FPtrunc/convX_il_d.ilproj
+++ b/src/tests/JIT/Methodical/FPtrunc/convX_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/FPtrunc/convX_il_r.ilproj b/src/tests/JIT/Methodical/FPtrunc/convX_il_r.ilproj
index 7ae39f3389ef51..ad542d9e2896eb 100644
--- a/src/tests/JIT/Methodical/FPtrunc/convX_il_r.ilproj
+++ b/src/tests/JIT/Methodical/FPtrunc/convX_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/FPtrunc/convr4a.cs b/src/tests/JIT/Methodical/FPtrunc/convr4a.cs
index a0034a945dc6e0..98261a2db48fce 100644
--- a/src/tests/JIT/Methodical/FPtrunc/convr4a.cs
+++ b/src/tests/JIT/Methodical/FPtrunc/convr4a.cs
@@ -4,6 +4,7 @@
 //testing float narrowing upon conv.r4 explicit cast
 
 using System;
+using Xunit;
 
 public struct VT
 {
@@ -85,7 +86,8 @@ private static float floatdiv_inline()
         return s_f1 / s_a1;
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         bool pass = true;
 
diff --git a/src/tests/JIT/Methodical/FPtrunc/convr4a_cs_d.csproj b/src/tests/JIT/Methodical/FPtrunc/convr4a_cs_d.csproj
index 8c92e4c6e59b4f..3c337d79b07698 100644
--- a/src/tests/JIT/Methodical/FPtrunc/convr4a_cs_d.csproj
+++ b/src/tests/JIT/Methodical/FPtrunc/convr4a_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/FPtrunc/convr4a_cs_do.csproj b/src/tests/JIT/Methodical/FPtrunc/convr4a_cs_do.csproj
index 89aebed4a73f06..baf18011af7252 100644
--- a/src/tests/JIT/Methodical/FPtrunc/convr4a_cs_do.csproj
+++ b/src/tests/JIT/Methodical/FPtrunc/convr4a_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/FPtrunc/convr4a_cs_r.csproj b/src/tests/JIT/Methodical/FPtrunc/convr4a_cs_r.csproj
index 3e093ce5b10f8b..c30622aa080b1b 100644
--- a/src/tests/JIT/Methodical/FPtrunc/convr4a_cs_r.csproj
+++ b/src/tests/JIT/Methodical/FPtrunc/convr4a_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/FPtrunc/convr4a_cs_ro.csproj b/src/tests/JIT/Methodical/FPtrunc/convr4a_cs_ro.csproj
index 973a02fe78b971..b98525997efe76 100644
--- a/src/tests/JIT/Methodical/FPtrunc/convr4a_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/FPtrunc/convr4a_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/FPtrunc/convr4d_il_d.ilproj b/src/tests/JIT/Methodical/FPtrunc/convr4d_il_d.ilproj
index 7cde69635c947b..04ca6e5577eac0 100644
--- a/src/tests/JIT/Methodical/FPtrunc/convr4d_il_d.ilproj
+++ b/src/tests/JIT/Methodical/FPtrunc/convr4d_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/FPtrunc/convr4d_il_r.ilproj b/src/tests/JIT/Methodical/FPtrunc/convr4d_il_r.ilproj
index c0ea162e887b1f..20f1e6e43d86a3 100644
--- a/src/tests/JIT/Methodical/FPtrunc/convr4d_il_r.ilproj
+++ b/src/tests/JIT/Methodical/FPtrunc/convr4d_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/FPtrunc/convr8a.cs b/src/tests/JIT/Methodical/FPtrunc/convr8a.cs
index ce3ae321552b9f..9366d6058041e8 100644
--- a/src/tests/JIT/Methodical/FPtrunc/convr8a.cs
+++ b/src/tests/JIT/Methodical/FPtrunc/convr8a.cs
@@ -4,6 +4,7 @@
 //testing double narrowing
 
 using System;
+using Xunit;
 
 public struct VT
 {
@@ -85,7 +86,8 @@ private static double doublediv_inline()
         return s_f1 / s_a1;
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         bool pass = true;
 
diff --git a/src/tests/JIT/Methodical/FPtrunc/convr8a_cs_d.csproj b/src/tests/JIT/Methodical/FPtrunc/convr8a_cs_d.csproj
index c544e642d5ce8a..2257bd88469722 100644
--- a/src/tests/JIT/Methodical/FPtrunc/convr8a_cs_d.csproj
+++ b/src/tests/JIT/Methodical/FPtrunc/convr8a_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/FPtrunc/convr8a_cs_do.csproj b/src/tests/JIT/Methodical/FPtrunc/convr8a_cs_do.csproj
index 215f133b28e169..4983af729f3d27 100644
--- a/src/tests/JIT/Methodical/FPtrunc/convr8a_cs_do.csproj
+++ b/src/tests/JIT/Methodical/FPtrunc/convr8a_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/FPtrunc/convr8a_cs_r.csproj b/src/tests/JIT/Methodical/FPtrunc/convr8a_cs_r.csproj
index 63c77185358b8f..d461dabde9b93f 100644
--- a/src/tests/JIT/Methodical/FPtrunc/convr8a_cs_r.csproj
+++ b/src/tests/JIT/Methodical/FPtrunc/convr8a_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/FPtrunc/convr8a_cs_ro.csproj b/src/tests/JIT/Methodical/FPtrunc/convr8a_cs_ro.csproj
index d79c1672988fc8..75c0b116d0ffe7 100644
--- a/src/tests/JIT/Methodical/FPtrunc/convr8a_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/FPtrunc/convr8a_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/FPtrunc/convr8d_il_d.ilproj b/src/tests/JIT/Methodical/FPtrunc/convr8d_il_d.ilproj
index 509fbced58b7c5..7fc42adc07f0b4 100644
--- a/src/tests/JIT/Methodical/FPtrunc/convr8d_il_d.ilproj
+++ b/src/tests/JIT/Methodical/FPtrunc/convr8d_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/FPtrunc/convr8d_il_r.ilproj b/src/tests/JIT/Methodical/FPtrunc/convr8d_il_r.ilproj
index db63f790aebabd..21acebc285a85d 100644
--- a/src/tests/JIT/Methodical/FPtrunc/convr8d_il_r.ilproj
+++ b/src/tests/JIT/Methodical/FPtrunc/convr8d_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param1a.cs b/src/tests/JIT/Methodical/Invoke/25params/25param1a.cs
index b64755c624c1ee..3477fc30dff419 100644
--- a/src/tests/JIT/Methodical/Invoke/25params/25param1a.cs
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param1a.cs
@@ -2,7 +2,10 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
-internal class test
+using Xunit;
+namespace Test_25param1a_cs
+{
+public class test
 {
     private static int f1(int a1, int a2, int a3, int a4, int a5,
             int a6, int a7, int a8, int a9, int a10,
@@ -53,7 +56,8 @@ private static int f(int a1, int a2, int a3, int a4, int a5,
         return sum;
     }
 
-    private static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         Console.WriteLine("Testing method of 25 parameters, all of int data type");
         int sum = f(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25);
@@ -64,3 +68,4 @@ private static int Main()
     }
 }
 
+}
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param1a_cs_d.csproj b/src/tests/JIT/Methodical/Invoke/25params/25param1a_cs_d.csproj
index 8275c1ee957db5..0b46466dd311ec 100644
--- a/src/tests/JIT/Methodical/Invoke/25params/25param1a_cs_d.csproj
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param1a_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param1a_cs_do.csproj b/src/tests/JIT/Methodical/Invoke/25params/25param1a_cs_do.csproj
index 7b40fcfa9e55b0..70cbe173071043 100644
--- a/src/tests/JIT/Methodical/Invoke/25params/25param1a_cs_do.csproj
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param1a_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param1a_cs_r.csproj b/src/tests/JIT/Methodical/Invoke/25params/25param1a_cs_r.csproj
index 7bad4051263a3f..c745087b2dff79 100644
--- a/src/tests/JIT/Methodical/Invoke/25params/25param1a_cs_r.csproj
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param1a_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param1a_cs_ro.csproj b/src/tests/JIT/Methodical/Invoke/25params/25param1a_cs_ro.csproj
index 528764b900ea7d..6885bad37584b7 100644
--- a/src/tests/JIT/Methodical/Invoke/25params/25param1a_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param1a_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param1b.il b/src/tests/JIT/Methodical/Invoke/25params/25param1b.il
index 582a38e6bf3d58..43d81c4d3bd326 100644
--- a/src/tests/JIT/Methodical/Invoke/25params/25param1b.il
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param1b.il
@@ -9,7 +9,9 @@
 }
 .assembly '25param1b'{}
 .assembly extern xunit.core {}
-.class private auto ansi beforefieldinit test
+.namespace Test_25param1b_il
+{
+.class public auto ansi beforefieldinit test
        extends [mscorlib]System.Object
 {
   .method private hidebysig static int32 
@@ -104,7 +106,7 @@
 
     IL_005b:  ldloc.1
     IL_005c:  ret
-  } // end of method test::f1
+  } // end of method Test_25param1b_il.test::f1
 
   .method private hidebysig static int32 
           f(int32 a1,
@@ -187,7 +189,7 @@
     IL_009f:  call       void [System.Console]System.Console::WriteLine(int32)
     IL_00a4:  ldarg.s    a25
     IL_00a6:  call       void [System.Console]System.Console::WriteLine(int32)
-    jmp       int32 test::f1(int32,
+    jmp       int32 Test_25param1b_il.test::f1(int32,
                                         int32,
                                         int32,
                                         int32,
@@ -212,9 +214,9 @@
                                         int32,
                                         int32,
                                         int32)
-  } // end of method test::f
+  } // end of method Test_25param1b_il.test::f
 
-  .method private hidebysig static int32 
+  .method public hidebysig static int32 
           Main() cil managed
   {
     .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -252,7 +254,7 @@ call void [System.Console]System.Console::WriteLine(string)
     IL_0024:  ldc.i4.s   23
     IL_0026:  ldc.i4.s   24
     IL_0028:  ldc.i4.s   25
-    IL_002a:  call       int32 test::f(int32,
+    IL_002a:  call       int32 Test_25param1b_il.test::f(int32,
                                        int32,
                                        int32,
                                        int32,
@@ -292,7 +294,7 @@ call void [System.Console]System.Console::WriteLine(string)
 
     IL_0041:  ldloc.1
     IL_0042:  ret
-  } // end of method test::Main
+  } // end of method Test_25param1b_il.test::Main
 
   .method public hidebysig specialname rtspecialname 
           instance void  .ctor() cil managed
@@ -302,6 +304,7 @@ call void [System.Console]System.Console::WriteLine(string)
     IL_0000:  ldarg.0
     IL_0001:  call       instance void [mscorlib]System.Object::.ctor()
     IL_0006:  ret
-  } // end of method test::.ctor
+  } // end of method Test_25param1b_il.test::.ctor
 
 }
+}
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param1b_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/25params/25param1b_il_d.ilproj
index 6dcccdfaa7818f..05e5909e631b2f 100644
--- a/src/tests/JIT/Methodical/Invoke/25params/25param1b_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param1b_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param1b_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/25params/25param1b_il_r.ilproj
index 69981ee092337f..8a8d7574da628a 100644
--- a/src/tests/JIT/Methodical/Invoke/25params/25param1b_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param1b_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param1c.il b/src/tests/JIT/Methodical/Invoke/25params/25param1c.il
index 4d74509e212972..b1d9aa5177749a 100644
--- a/src/tests/JIT/Methodical/Invoke/25params/25param1c.il
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param1c.il
@@ -9,7 +9,9 @@
 }
 .assembly '25param1c'{}
 .assembly extern xunit.core {}
-.class private auto ansi beforefieldinit test
+.namespace Test_25param1c_il
+{
+.class public auto ansi beforefieldinit test
        extends [mscorlib]System.Object
 {
   .method private hidebysig static int32 
@@ -104,7 +106,7 @@
 
     IL_005b:  ldloc.1
     IL_005c:  ret
-  } // end of method test::f1
+  } // end of method Test_25param1c_il.test::f1
 
   .method private hidebysig static int32 
           f(int32 a1,
@@ -212,7 +214,7 @@
     IL_00d3:  ldarg.s    a23
     IL_00d5:  ldarg.s    a24
     IL_00d7:  ldarg.s    a25
-    IL_00d9:  tail. call       int32 test::f1(int32,
+    IL_00d9:  tail. call       int32 Test_25param1c_il.test::f1(int32,
                                         int32,
                                         int32,
                                         int32,
@@ -238,9 +240,9 @@
                                         int32,
                                         int32)
     IL_00e4:  ret
-  } // end of method test::f
+  } // end of method Test_25param1c_il.test::f
 
-  .method private hidebysig static int32 
+  .method public hidebysig static int32 
           Main() cil managed
   {
     .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -278,7 +280,7 @@ call void [System.Console]System.Console::WriteLine(string)
     IL_0024:  ldc.i4.s   23
     IL_0026:  ldc.i4.s   24
     IL_0028:  ldc.i4.s   25
-    IL_002a:  call       int32 test::f(int32,
+    IL_002a:  call       int32 Test_25param1c_il.test::f(int32,
                                        int32,
                                        int32,
                                        int32,
@@ -318,7 +320,7 @@ call void [System.Console]System.Console::WriteLine(string)
 
     IL_0041:  ldloc.1
     IL_0042:  ret
-  } // end of method test::Main
+  } // end of method Test_25param1c_il.test::Main
 
   .method public hidebysig specialname rtspecialname 
           instance void  .ctor() cil managed
@@ -328,6 +330,7 @@ call void [System.Console]System.Console::WriteLine(string)
     IL_0000:  ldarg.0
     IL_0001:  call       instance void [mscorlib]System.Object::.ctor()
     IL_0006:  ret
-  } // end of method test::.ctor
+  } // end of method Test_25param1c_il.test::.ctor
 
 }
+}
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param1c_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/25params/25param1c_il_d.ilproj
index 94cd2ee453b923..2763cbe25e0f62 100644
--- a/src/tests/JIT/Methodical/Invoke/25params/25param1c_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param1c_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param1c_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/25params/25param1c_il_r.ilproj
index 3275a47c901de9..69b2332fef0233 100644
--- a/src/tests/JIT/Methodical/Invoke/25params/25param1c_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param1c_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param2a.cs b/src/tests/JIT/Methodical/Invoke/25params/25param2a.cs
index 0ecc17f7624046..58ccf2922097a6 100644
--- a/src/tests/JIT/Methodical/Invoke/25params/25param2a.cs
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param2a.cs
@@ -2,6 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
+namespace Test_25param2a_cs
+{
 internal struct VT
 {
     public int m;
@@ -14,7 +17,7 @@ public CL(int a)
         n = a;
     }
 }
-internal class test
+public class test
 {
     private static int f1(short a1, ushort a2, int a3, uint a4, long a5,
             ulong a6, byte a7, sbyte a8, Decimal a9, int[] a10,
@@ -65,7 +68,8 @@ private static int f(short a1, ushort a2, int a3, uint a4, long a5,
         return sum;
     }
 
-    private static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         Console.WriteLine("Testing method of 25 parameters, mixed data type");
         VT vt = new VT();
@@ -77,3 +81,4 @@ private static int Main()
     }
 }
 
+}
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param2a_cs_d.csproj b/src/tests/JIT/Methodical/Invoke/25params/25param2a_cs_d.csproj
index a98abf99c1721c..fdef9835f1fa04 100644
--- a/src/tests/JIT/Methodical/Invoke/25params/25param2a_cs_d.csproj
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param2a_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param2a_cs_do.csproj b/src/tests/JIT/Methodical/Invoke/25params/25param2a_cs_do.csproj
index 6c8a83273bfa35..c653a2f08bdb61 100644
--- a/src/tests/JIT/Methodical/Invoke/25params/25param2a_cs_do.csproj
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param2a_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param2a_cs_r.csproj b/src/tests/JIT/Methodical/Invoke/25params/25param2a_cs_r.csproj
index ade94114eac7b8..717962f43ce462 100644
--- a/src/tests/JIT/Methodical/Invoke/25params/25param2a_cs_r.csproj
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param2a_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param2a_cs_ro.csproj b/src/tests/JIT/Methodical/Invoke/25params/25param2a_cs_ro.csproj
index 93c3ae62f317da..558423c30f810a 100644
--- a/src/tests/JIT/Methodical/Invoke/25params/25param2a_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param2a_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param2b.il b/src/tests/JIT/Methodical/Invoke/25params/25param2b.il
index d4ba5369ae72e1..0a0fe9f965876e 100644
--- a/src/tests/JIT/Methodical/Invoke/25params/25param2b.il
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param2b.il
@@ -9,6 +9,8 @@
 .assembly extern mscorlib {}
 .assembly '25param2b'{}
 .assembly extern xunit.core {}
+.namespace Test_25param2b_il
+{
 .class private sequential ansi sealed beforefieldinit VT
        extends [mscorlib]System.ValueType
 {
@@ -27,13 +29,13 @@
     IL_0001:  call       instance void [mscorlib]System.Object::.ctor()
     IL_0006:  ldarg.0
     IL_0007:  ldarg.1
-    IL_0008:  stfld      int32 CL::n
+    IL_0008:  stfld      int32 Test_25param2b_il.CL::n
     IL_000d:  ret
   } 
 
 } 
 
-.class private auto ansi beforefieldinit test
+.class public auto ansi beforefieldinit test
        extends [mscorlib]System.Object
 {
   .method private hidebysig static int32 
@@ -47,8 +49,8 @@
              int8 a8,
              valuetype [mscorlib]System.Decimal a9,
              int32[] a10,
-             valuetype VT a11,
-             class CL a12,
+             valuetype Test_25param2b_il.VT a11,
+             class Test_25param2b_il.CL a12,
              int32 a13,
              int32 a14,
              int32 a15,
@@ -99,11 +101,11 @@
     IL_0028:  conv.i8
     IL_0029:  add
     IL_002a:  ldarga.s   a11
-    IL_002c:  ldfld      int32 VT::m
+    IL_002c:  ldfld      int32 Test_25param2b_il.VT::m
     IL_0031:  conv.i8
     IL_0032:  add
     IL_0033:  ldarg.s    a12
-    IL_0035:  ldfld      int32 CL::n
+    IL_0035:  ldfld      int32 Test_25param2b_il.CL::n
     IL_003a:  conv.i8
     IL_003b:  add
     IL_003c:  ldarg.s    a13
@@ -171,8 +173,8 @@
             int8 a8,
             valuetype [mscorlib]System.Decimal a9,
             int32[] a10,
-            valuetype VT a11,
-            class CL a12,
+            valuetype Test_25param2b_il.VT a11,
+            class Test_25param2b_il.CL a12,
             int32 a13,
             int32 a14,
             int32 a15,
@@ -213,10 +215,10 @@
     IL_003e:  ldelem.i4
     IL_003f:  call       void [System.Console]System.Console::WriteLine(int32)
     IL_0044:  ldarga.s   a11
-    IL_0046:  ldfld      int32 VT::m
+    IL_0046:  ldfld      int32 Test_25param2b_il.VT::m
     IL_004b:  call       void [System.Console]System.Console::WriteLine(int32)
     IL_0050:  ldarg.s    a12
-    IL_0052:  ldfld      int32 CL::n
+    IL_0052:  ldfld      int32 Test_25param2b_il.CL::n
     IL_0057:  call       void [System.Console]System.Console::WriteLine(int32)
     IL_005c:  ldarg.s    a13
     IL_005e:  call       void [System.Console]System.Console::WriteLine(int32)
@@ -244,7 +246,7 @@
     IL_00ab:  call       void [System.Console]System.Console::WriteLine(int32)
     IL_00b0:  ldarg.s    a25
     IL_00b2:  call       void [System.Console]System.Console::WriteLine(int32)
-    jmp       int32 test::f1(int16,
+    jmp       int32 Test_25param2b_il.test::f1(int16,
                                         uint16,
                                         int32,
                                         uint32,
@@ -254,8 +256,8 @@
                                         int8,
                                         valuetype [mscorlib]System.Decimal,
                                         int32[],
-                                        valuetype VT,
-                                        class CL,
+                                        valuetype Test_25param2b_il.VT,
+                                        class Test_25param2b_il.CL,
                                         int32,
                                         int32,
                                         int32,
@@ -271,7 +273,7 @@
                                         int32)
   } 
 
-  .method private hidebysig static int32 
+  .method public hidebysig static int32 
           Main() cil managed
   {
     .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -279,20 +281,20 @@
     )
     .entrypoint
     .maxstack  25
-    .locals init ([0] valuetype VT vt,
-             [1] class CL cl,
+    .locals init ([0] valuetype Test_25param2b_il.VT vt,
+             [1] class Test_25param2b_il.CL cl,
              [2] int32 sum,
              [3] int32 CS$00000003$00000000,
              [4] int32[] CS$00000002$00000001)
 ldstr "Testing method of 25 parameters, mixed data type, jmp"
 call void [System.Console]System.Console::WriteLine(string)
     IL_0000:  ldloca.s   vt
-    IL_0002:  initobj    VT
+    IL_0002:  initobj    Test_25param2b_il.VT
     IL_0008:  ldloca.s   vt
     IL_000a:  ldc.i4.s   11
-    IL_000c:  stfld      int32 VT::m
+    IL_000c:  stfld      int32 Test_25param2b_il.VT::m
     IL_0011:  ldc.i4.s   12
-    IL_0013:  newobj     instance void CL::.ctor(int32)
+    IL_0013:  newobj     instance void Test_25param2b_il.CL::.ctor(int32)
     IL_0018:  stloc.1
     IL_0019:  ldc.i4.1
     IL_001a:  ldc.i4.2
@@ -329,7 +331,7 @@ call void [System.Console]System.Console::WriteLine(string)
     IL_0050:  ldc.i4.s   23
     IL_0052:  ldc.i4.s   24
     IL_0054:  ldc.i4.s   25
-    IL_0056:  call       int32 test::f(int16,
+    IL_0056:  call       int32 Test_25param2b_il.test::f(int16,
                                        uint16,
                                        int32,
                                        uint32,
@@ -339,8 +341,8 @@ call void [System.Console]System.Console::WriteLine(string)
                                        int8,
                                        valuetype [mscorlib]System.Decimal,
                                        int32[],
-                                       valuetype VT,
-                                       class CL,
+                                       valuetype Test_25param2b_il.VT,
+                                       class Test_25param2b_il.CL,
                                        int32,
                                        int32,
                                        int32,
@@ -380,3 +382,4 @@ call void [System.Console]System.Console::WriteLine(string)
     IL_0006:  ret
   } 
 }
+}
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param2b_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/25params/25param2b_il_d.ilproj
index 2f600cca3d1b5b..405ad121491bfc 100644
--- a/src/tests/JIT/Methodical/Invoke/25params/25param2b_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param2b_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param2b_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/25params/25param2b_il_r.ilproj
index 870d60f1fc5d02..aa2d07aa5aa86f 100644
--- a/src/tests/JIT/Methodical/Invoke/25params/25param2b_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param2b_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param2c.il b/src/tests/JIT/Methodical/Invoke/25params/25param2c.il
index 75876304505342..33f8812bad7755 100644
--- a/src/tests/JIT/Methodical/Invoke/25params/25param2c.il
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param2c.il
@@ -9,6 +9,8 @@
 .assembly extern mscorlib {}
 .assembly '25param2c' {}
 .assembly extern xunit.core {}
+.namespace Test_25param2c_il
+{
 .class private sequential ansi sealed beforefieldinit VT
        extends [mscorlib]System.ValueType
 {
@@ -27,13 +29,13 @@
     IL_0001:  call       instance void [mscorlib]System.Object::.ctor()
     IL_0006:  ldarg.0
     IL_0007:  ldarg.1
-    IL_0008:  stfld      int32 CL::n
+    IL_0008:  stfld      int32 Test_25param2c_il.CL::n
     IL_000d:  ret
   } 
 
 } 
 
-.class private auto ansi beforefieldinit test
+.class public auto ansi beforefieldinit test
        extends [mscorlib]System.Object
 {
   .method private hidebysig static int32 
@@ -47,8 +49,8 @@
              int8 a8,
              valuetype [mscorlib]System.Decimal a9,
              int32[] a10,
-             valuetype VT a11,
-             class CL a12,
+             valuetype Test_25param2c_il.VT a11,
+             class Test_25param2c_il.CL a12,
              int32 a13,
              int32 a14,
              int32 a15,
@@ -99,11 +101,11 @@
     IL_0028:  conv.i8
     IL_0029:  add
     IL_002a:  ldarga.s   a11
-    IL_002c:  ldfld      int32 VT::m
+    IL_002c:  ldfld      int32 Test_25param2c_il.VT::m
     IL_0031:  conv.i8
     IL_0032:  add
     IL_0033:  ldarg.s    a12
-    IL_0035:  ldfld      int32 CL::n
+    IL_0035:  ldfld      int32 Test_25param2c_il.CL::n
     IL_003a:  conv.i8
     IL_003b:  add
     IL_003c:  ldarg.s    a13
@@ -171,8 +173,8 @@
             int8 a8,
             valuetype [mscorlib]System.Decimal a9,
             int32[] a10,
-            valuetype VT a11,
-            class CL a12,
+            valuetype Test_25param2c_il.VT a11,
+            class Test_25param2c_il.CL a12,
             int32 a13,
             int32 a14,
             int32 a15,
@@ -213,10 +215,10 @@
     IL_003e:  ldelem.i4
     IL_003f:  call       void [System.Console]System.Console::WriteLine(int32)
     IL_0044:  ldarga.s   a11
-    IL_0046:  ldfld      int32 VT::m
+    IL_0046:  ldfld      int32 Test_25param2c_il.VT::m
     IL_004b:  call       void [System.Console]System.Console::WriteLine(int32)
     IL_0050:  ldarg.s    a12
-    IL_0052:  ldfld      int32 CL::n
+    IL_0052:  ldfld      int32 Test_25param2c_il.CL::n
     IL_0057:  call       void [System.Console]System.Console::WriteLine(int32)
     IL_005c:  ldarg.s    a13
     IL_005e:  call       void [System.Console]System.Console::WriteLine(int32)
@@ -269,7 +271,7 @@
     IL_00df:  ldarg.s    a23
     IL_00e1:  ldarg.s    a24
     IL_00e3:  ldarg.s    a25
-    tail.  call       int32 test::f1(int16,
+    tail.  call       int32 Test_25param2c_il.test::f1(int16,
                                         uint16,
                                         int32,
                                         uint32,
@@ -279,8 +281,8 @@
                                         int8,
                                         valuetype [mscorlib]System.Decimal,
                                         int32[],
-                                        valuetype VT,
-                                        class CL,
+                                        valuetype Test_25param2c_il.VT,
+                                        class Test_25param2c_il.CL,
                                         int32,
                                         int32,
                                         int32,
@@ -297,7 +299,7 @@
     IL_00f0:  ret
   } 
 
-  .method private hidebysig static int32 
+  .method public hidebysig static int32 
           Main() cil managed
   {
     .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -305,20 +307,20 @@
     )
     .entrypoint
     .maxstack  25
-    .locals init ([0] valuetype VT vt,
-             [1] class CL cl,
+    .locals init ([0] valuetype Test_25param2c_il.VT vt,
+             [1] class Test_25param2c_il.CL cl,
              [2] int32 sum,
              [3] int32 CS$00000003$00000000,
              [4] int32[] CS$00000002$00000001)
 ldstr "Testing method of 25 parameters, mixed data type, tail.call"
 call void [System.Console]System.Console::WriteLine(string)
     IL_0000:  ldloca.s   vt
-    IL_0002:  initobj    VT
+    IL_0002:  initobj    Test_25param2c_il.VT
     IL_0008:  ldloca.s   vt
     IL_000a:  ldc.i4.s   11
-    IL_000c:  stfld      int32 VT::m
+    IL_000c:  stfld      int32 Test_25param2c_il.VT::m
     IL_0011:  ldc.i4.s   12
-    IL_0013:  newobj     instance void CL::.ctor(int32)
+    IL_0013:  newobj     instance void Test_25param2c_il.CL::.ctor(int32)
     IL_0018:  stloc.1
     IL_0019:  ldc.i4.1
     IL_001a:  ldc.i4.2
@@ -355,7 +357,7 @@ call void [System.Console]System.Console::WriteLine(string)
     IL_0050:  ldc.i4.s   23
     IL_0052:  ldc.i4.s   24
     IL_0054:  ldc.i4.s   25
-    IL_0056:  call       int32 test::f(int16,
+    IL_0056:  call       int32 Test_25param2c_il.test::f(int16,
                                        uint16,
                                        int32,
                                        uint32,
@@ -365,8 +367,8 @@ call void [System.Console]System.Console::WriteLine(string)
                                        int8,
                                        valuetype [mscorlib]System.Decimal,
                                        int32[],
-                                       valuetype VT,
-                                       class CL,
+                                       valuetype Test_25param2c_il.VT,
+                                       class Test_25param2c_il.CL,
                                        int32,
                                        int32,
                                        int32,
@@ -406,3 +408,4 @@ call void [System.Console]System.Console::WriteLine(string)
     IL_0006:  ret
   } 
 }
+}
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param2c_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/25params/25param2c_il_d.ilproj
index bef9bd80eb5a8a..b4bff83a181af5 100644
--- a/src/tests/JIT/Methodical/Invoke/25params/25param2c_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param2c_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param2c_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/25params/25param2c_il_r.ilproj
index aaba30918fff92..fc75df9d2a5294 100644
--- a/src/tests/JIT/Methodical/Invoke/25params/25param2c_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param2c_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param3a.cs b/src/tests/JIT/Methodical/Invoke/25params/25param3a.cs
index af2b2cd404c623..0d8cab25562280 100644
--- a/src/tests/JIT/Methodical/Invoke/25params/25param3a.cs
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param3a.cs
@@ -4,7 +4,10 @@
 // long chain of methods
 
 using System;
-internal class test
+using Xunit;
+namespace Test_25param3a_cs
+{
+public class test
 {
     private static int f1(int a1, int a2, int a3, int a4, int a5,
             int a6, int a7, int a8, int a9, int a10,
@@ -319,7 +322,8 @@ private static int f(int a1, int a2, int a3, int a4, int a5,
         return sum;
     }
 
-    private static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         Console.WriteLine("Testing method of 25 parameters, all of int data type, long chain of method calls");
         int sum = f(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25);
@@ -331,3 +335,4 @@ private static int Main()
     }
 }
 
+}
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param3a_cs_d.csproj b/src/tests/JIT/Methodical/Invoke/25params/25param3a_cs_d.csproj
index bc457d87376e87..fe4f27d06a2e9f 100644
--- a/src/tests/JIT/Methodical/Invoke/25params/25param3a_cs_d.csproj
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param3a_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param3a_cs_do.csproj b/src/tests/JIT/Methodical/Invoke/25params/25param3a_cs_do.csproj
index b5bece6d7441c4..ccb1c350324c99 100644
--- a/src/tests/JIT/Methodical/Invoke/25params/25param3a_cs_do.csproj
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param3a_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param3a_cs_r.csproj b/src/tests/JIT/Methodical/Invoke/25params/25param3a_cs_r.csproj
index cc88164cfda97c..cbe2ce9b36e264 100644
--- a/src/tests/JIT/Methodical/Invoke/25params/25param3a_cs_r.csproj
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param3a_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param3a_cs_ro.csproj b/src/tests/JIT/Methodical/Invoke/25params/25param3a_cs_ro.csproj
index 601eac066392b8..e223075df538c6 100644
--- a/src/tests/JIT/Methodical/Invoke/25params/25param3a_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param3a_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param3b.il b/src/tests/JIT/Methodical/Invoke/25params/25param3b.il
index ba740319a50f7f..d5161bddc7cc6c 100644
--- a/src/tests/JIT/Methodical/Invoke/25params/25param3b.il
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param3b.il
@@ -9,7 +9,9 @@
 }
 .assembly '25param3b' {}
 .assembly extern xunit.core {}
-.class private auto ansi beforefieldinit test
+.namespace Test_25param3b_il
+{
+.class public auto ansi beforefieldinit test
        extends [mscorlib]System.Object
 {
   .method private hidebysig static int32 
@@ -45,7 +47,7 @@
              int32 V_1)
     IL_0000:  ldarg.0
     IL_0001:  call       void [System.Console]System.Console::WriteLine(int32)
-    jmp       int32 test::f2(int32,
+    jmp       int32 Test_25param3b_il.test::f2(int32,
                                         int32,
                                         int32,
                                         int32,
@@ -70,7 +72,7 @@
                                         int32,
                                         int32,
                                         int32)
-  } // end of method test::f1
+  } // end of method Test_25param3b_il.test::f1
 
   .method private hidebysig static int32 
           f2(int32 a1,
@@ -105,7 +107,7 @@
              int32 V_1)
     IL_0000:  ldarg.1
     IL_0001:  call       void [System.Console]System.Console::WriteLine(int32)
-    jmp       int32 test::f3(int32,
+    jmp       int32 Test_25param3b_il.test::f3(int32,
                                         int32,
                                         int32,
                                         int32,
@@ -130,7 +132,7 @@
                                         int32,
                                         int32,
                                         int32)
-  } // end of method test::f2
+  } // end of method Test_25param3b_il.test::f2
 
   .method private hidebysig static int32 
           f3(int32 a1,
@@ -165,7 +167,7 @@
              int32 V_1)
     IL_0000:  ldarg.2
     IL_0001:  call       void [System.Console]System.Console::WriteLine(int32)
-    jmp       int32 test::f4(int32,
+    jmp       int32 Test_25param3b_il.test::f4(int32,
                                         int32,
                                         int32,
                                         int32,
@@ -190,7 +192,7 @@
                                         int32,
                                         int32,
                                         int32)
-  } // end of method test::f3
+  } // end of method Test_25param3b_il.test::f3
 
   .method private hidebysig static int32 
           f4(int32 a1,
@@ -225,7 +227,7 @@
              int32 V_1)
     IL_0000:  ldarg.3
     IL_0001:  call       void [System.Console]System.Console::WriteLine(int32)
-    jmp      int32 test::f5(int32,
+    jmp      int32 Test_25param3b_il.test::f5(int32,
                                         int32,
                                         int32,
                                         int32,
@@ -250,7 +252,7 @@
                                         int32,
                                         int32,
                                         int32)
-  } // end of method test::f4
+  } // end of method Test_25param3b_il.test::f4
 
   .method private hidebysig static int32 
           f5(int32 a1,
@@ -285,7 +287,7 @@
              int32 V_1)
     IL_0000:  ldarg.s    a5
     IL_0002:  call       void [System.Console]System.Console::WriteLine(int32)
-    jmp      int32 test::f6(int32,
+    jmp      int32 Test_25param3b_il.test::f6(int32,
                                         int32,
                                         int32,
                                         int32,
@@ -310,7 +312,7 @@
                                         int32,
                                         int32,
                                         int32)
-      } // end of method test::f5
+      } // end of method Test_25param3b_il.test::f5
 
   .method private hidebysig static int32 
           f6(int32 a1,
@@ -345,7 +347,7 @@
              int32 V_1)
     IL_0000:  ldarg.s    a6
     IL_0002:  call       void [System.Console]System.Console::WriteLine(int32)
-    jmp      int32 test::f7(int32,
+    jmp      int32 Test_25param3b_il.test::f7(int32,
                                         int32,
                                         int32,
                                         int32,
@@ -370,7 +372,7 @@
                                         int32,
                                         int32,
                                         int32)
-      } // end of method test::f6
+      } // end of method Test_25param3b_il.test::f6
 
   .method private hidebysig static int32 
           f7(int32 a1,
@@ -405,7 +407,7 @@
              int32 V_1)
     IL_0000:  ldarg.s    a7
     IL_0002:  call       void [System.Console]System.Console::WriteLine(int32)
-    jmp      int32 test::f8(int32,
+    jmp      int32 Test_25param3b_il.test::f8(int32,
                                         int32,
                                         int32,
                                         int32,
@@ -430,7 +432,7 @@
                                         int32,
                                         int32,
                                         int32)
-      } // end of method test::f7
+      } // end of method Test_25param3b_il.test::f7
 
   .method private hidebysig static int32 
           f8(int32 a1,
@@ -465,7 +467,7 @@
              int32 V_1)
     IL_0000:  ldarg.s    a8
     IL_0002:  call       void [System.Console]System.Console::WriteLine(int32)
-    jmp      int32 test::f9(int32,
+    jmp      int32 Test_25param3b_il.test::f9(int32,
                                         int32,
                                         int32,
                                         int32,
@@ -490,7 +492,7 @@
                                         int32,
                                         int32,
                                         int32)
-      } // end of method test::f8
+      } // end of method Test_25param3b_il.test::f8
 
   .method private hidebysig static int32 
           f9(int32 a1,
@@ -525,7 +527,7 @@
              int32 V_1)
     IL_0000:  ldarg.s    a9
     IL_0002:  call       void [System.Console]System.Console::WriteLine(int32)
-    jmp      int32 test::f10(int32,
+    jmp      int32 Test_25param3b_il.test::f10(int32,
                                          int32,
                                          int32,
                                          int32,
@@ -550,7 +552,7 @@
                                          int32,
                                          int32,
                                          int32)
-      } // end of method test::f9
+      } // end of method Test_25param3b_il.test::f9
 
   .method private hidebysig static int32 
           f10(int32 a1,
@@ -585,7 +587,7 @@
              int32 V_1)
     IL_0000:  ldarg.s    a10
     IL_0002:  call       void [System.Console]System.Console::WriteLine(int32)
-    jmp      int32 test::f11(int32,
+    jmp      int32 Test_25param3b_il.test::f11(int32,
                                          int32,
                                          int32,
                                          int32,
@@ -610,7 +612,7 @@
                                          int32,
                                          int32,
                                          int32)
-      } // end of method test::f10
+      } // end of method Test_25param3b_il.test::f10
 
   .method private hidebysig static int32 
           f11(int32 a1,
@@ -645,7 +647,7 @@
              int32 V_1)
     IL_0000:  ldarg.s    a11
     IL_0002:  call       void [System.Console]System.Console::WriteLine(int32)
-    jmp      int32 test::f12(int32,
+    jmp      int32 Test_25param3b_il.test::f12(int32,
                                          int32,
                                          int32,
                                          int32,
@@ -670,7 +672,7 @@
                                          int32,
                                          int32,
                                          int32)
-      } // end of method test::f11
+      } // end of method Test_25param3b_il.test::f11
 
   .method private hidebysig static int32 
           f12(int32 a1,
@@ -705,7 +707,7 @@
              int32 V_1)
     IL_0000:  ldarg.s    a12
     IL_0002:  call       void [System.Console]System.Console::WriteLine(int32)
-    jmp      int32 test::f13(int32,
+    jmp      int32 Test_25param3b_il.test::f13(int32,
                                          int32,
                                          int32,
                                          int32,
@@ -730,7 +732,7 @@
                                          int32,
                                          int32,
                                          int32)
-      } // end of method test::f12
+      } // end of method Test_25param3b_il.test::f12
 
   .method private hidebysig static int32 
           f13(int32 a1,
@@ -765,7 +767,7 @@
              int32 V_1)
     IL_0000:  ldarg.s    a13
     IL_0002:  call       void [System.Console]System.Console::WriteLine(int32)
-    jmp      int32 test::f14(int32,
+    jmp      int32 Test_25param3b_il.test::f14(int32,
                                          int32,
                                          int32,
                                          int32,
@@ -790,7 +792,7 @@
                                          int32,
                                          int32,
                                          int32)
-      } // end of method test::f13
+      } // end of method Test_25param3b_il.test::f13
 
   .method private hidebysig static int32 
           f14(int32 a1,
@@ -825,7 +827,7 @@
              int32 V_1)
     IL_0000:  ldarg.s    a14
     IL_0002:  call       void [System.Console]System.Console::WriteLine(int32)
-    jmp      int32 test::f15(int32,
+    jmp      int32 Test_25param3b_il.test::f15(int32,
                                          int32,
                                          int32,
                                          int32,
@@ -850,7 +852,7 @@
                                          int32,
                                          int32,
                                          int32)
-      } // end of method test::f14
+      } // end of method Test_25param3b_il.test::f14
 
   .method private hidebysig static int32 
           f15(int32 a1,
@@ -885,7 +887,7 @@
              int32 V_1)
     IL_0000:  ldarg.s    a15
     IL_0002:  call       void [System.Console]System.Console::WriteLine(int32)
-    jmp      int32 test::f16(int32,
+    jmp      int32 Test_25param3b_il.test::f16(int32,
                                          int32,
                                          int32,
                                          int32,
@@ -910,7 +912,7 @@
                                          int32,
                                          int32,
                                          int32)
-      } // end of method test::f15
+      } // end of method Test_25param3b_il.test::f15
 
   .method private hidebysig static int32 
           f16(int32 a1,
@@ -945,7 +947,7 @@
              int32 V_1)
     IL_0000:  ldarg.s    a16
     IL_0002:  call       void [System.Console]System.Console::WriteLine(int32)
-    jmp      int32 test::f17(int32,
+    jmp      int32 Test_25param3b_il.test::f17(int32,
                                          int32,
                                          int32,
                                          int32,
@@ -970,7 +972,7 @@
                                          int32,
                                          int32,
                                          int32)
-      } // end of method test::f16
+      } // end of method Test_25param3b_il.test::f16
 
   .method private hidebysig static int32 
           f17(int32 a1,
@@ -1005,7 +1007,7 @@
              int32 V_1)
     IL_0000:  ldarg.s    a17
     IL_0002:  call       void [System.Console]System.Console::WriteLine(int32)
-    jmp      int32 test::f18(int32,
+    jmp      int32 Test_25param3b_il.test::f18(int32,
                                          int32,
                                          int32,
                                          int32,
@@ -1030,7 +1032,7 @@
                                          int32,
                                          int32,
                                          int32)
-      } // end of method test::f17
+      } // end of method Test_25param3b_il.test::f17
 
   .method private hidebysig static int32 
           f18(int32 a1,
@@ -1065,7 +1067,7 @@
              int32 V_1)
     IL_0000:  ldarg.s    a18
     IL_0002:  call       void [System.Console]System.Console::WriteLine(int32)
-    jmp      int32 test::f19(int32,
+    jmp      int32 Test_25param3b_il.test::f19(int32,
                                          int32,
                                          int32,
                                          int32,
@@ -1090,7 +1092,7 @@
                                          int32,
                                          int32,
                                          int32)
-      } // end of method test::f18
+      } // end of method Test_25param3b_il.test::f18
 
   .method private hidebysig static int32 
           f19(int32 a1,
@@ -1125,7 +1127,7 @@
              int32 V_1)
     IL_0000:  ldarg.s    a19
     IL_0002:  call       void [System.Console]System.Console::WriteLine(int32)
-    jmp      int32 test::f20(int32,
+    jmp      int32 Test_25param3b_il.test::f20(int32,
                                          int32,
                                          int32,
                                          int32,
@@ -1150,7 +1152,7 @@
                                          int32,
                                          int32,
                                          int32)
-      } // end of method test::f19
+      } // end of method Test_25param3b_il.test::f19
 
   .method private hidebysig static int32 
           f20(int32 a1,
@@ -1185,7 +1187,7 @@
              int32 V_1)
     IL_0000:  ldarg.s    a20
     IL_0002:  call       void [System.Console]System.Console::WriteLine(int32)
-    jmp      int32 test::f21(int32,
+    jmp      int32 Test_25param3b_il.test::f21(int32,
                                          int32,
                                          int32,
                                          int32,
@@ -1210,7 +1212,7 @@
                                          int32,
                                          int32,
                                          int32)
-      } // end of method test::f20
+      } // end of method Test_25param3b_il.test::f20
 
   .method private hidebysig static int32 
           f21(int32 a1,
@@ -1245,7 +1247,7 @@
              int32 V_1)
     IL_0000:  ldarg.s    a21
     IL_0002:  call       void [System.Console]System.Console::WriteLine(int32)
-    jmp      int32 test::f22(int32,
+    jmp      int32 Test_25param3b_il.test::f22(int32,
                                          int32,
                                          int32,
                                          int32,
@@ -1270,7 +1272,7 @@
                                          int32,
                                          int32,
                                          int32)
-      } // end of method test::f21
+      } // end of method Test_25param3b_il.test::f21
 
   .method private hidebysig static int32 
           f22(int32 a1,
@@ -1305,7 +1307,7 @@
              int32 V_1)
     IL_0000:  ldarg.s    a22
     IL_0002:  call       void [System.Console]System.Console::WriteLine(int32)
-    jmp      int32 test::f23(int32,
+    jmp      int32 Test_25param3b_il.test::f23(int32,
                                          int32,
                                          int32,
                                          int32,
@@ -1330,7 +1332,7 @@
                                          int32,
                                          int32,
                                          int32)
-      } // end of method test::f22
+      } // end of method Test_25param3b_il.test::f22
 
   .method private hidebysig static int32 
           f23(int32 a1,
@@ -1365,7 +1367,7 @@
              int32 V_1)
     IL_0000:  ldarg.s    a23
     IL_0002:  call       void [System.Console]System.Console::WriteLine(int32)
-    jmp      int32 test::f24(int32,
+    jmp      int32 Test_25param3b_il.test::f24(int32,
                                          int32,
                                          int32,
                                          int32,
@@ -1390,7 +1392,7 @@
                                          int32,
                                          int32,
                                          int32)
-      } // end of method test::f23
+      } // end of method Test_25param3b_il.test::f23
 
   .method private hidebysig static int32 
           f24(int32 a1,
@@ -1425,7 +1427,7 @@
              int32 V_1)
     IL_0000:  ldarg.s    a24
     IL_0002:  call       void [System.Console]System.Console::WriteLine(int32)
-    jmp      int32 test::f25(int32,
+    jmp      int32 Test_25param3b_il.test::f25(int32,
                                          int32,
                                          int32,
                                          int32,
@@ -1450,7 +1452,7 @@
                                          int32,
                                          int32,
                                          int32)
-      } // end of method test::f24
+      } // end of method Test_25param3b_il.test::f24
 
   .method private hidebysig static int32 
           f25(int32 a1,
@@ -1541,7 +1543,7 @@
 
     IL_0052:  ldloc.1
     IL_0053:  ret
-  } // end of method test::f25
+  } // end of method Test_25param3b_il.test::f25
 
   .method private hidebysig static int32 
           f(int32 a1,
@@ -1599,7 +1601,7 @@
     IL_0028:  ldarg.s    a23
     IL_002a:  ldarg.s    a24
     IL_002c:  ldarg.s    a25
-    IL_002e:  call       int32 test::f1(int32,
+    IL_002e:  call       int32 Test_25param3b_il.test::f1(int32,
                                         int32,
                                         int32,
                                         int32,
@@ -1631,9 +1633,9 @@
 
     IL_0038:  ldloc.1
     IL_0039:  ret
-  } // end of method test::f
+  } // end of method Test_25param3b_il.test::f
 
-  .method private hidebysig static int32 
+  .method public hidebysig static int32 
           Main() cil managed
   {
     .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -1671,7 +1673,7 @@ call void [System.Console]System.Console::WriteLine(string)
     IL_0024:  ldc.i4.s   23
     IL_0026:  ldc.i4.s   24
     IL_0028:  ldc.i4.s   25
-    IL_002a:  call       int32 test::f(int32,
+    IL_002a:  call       int32 Test_25param3b_il.test::f(int32,
                                        int32,
                                        int32,
                                        int32,
@@ -1716,7 +1718,7 @@ call void [System.Console]System.Console::WriteLine(string)
 
     IL_0051:  ldloc.1
     IL_0052:  ret
-  } // end of method test::Main
+  } // end of method Test_25param3b_il.test::Main
 
   .method public hidebysig specialname rtspecialname 
           instance void  .ctor() cil managed
@@ -1726,6 +1728,7 @@ call void [System.Console]System.Console::WriteLine(string)
     IL_0000:  ldarg.0
     IL_0001:  call       instance void [mscorlib]System.Object::.ctor()
     IL_0006:  ret
-  } // end of method test::.ctor
+  } // end of method Test_25param3b_il.test::.ctor
 
 }
+}
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param3b_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/25params/25param3b_il_d.ilproj
index 5d1d7b886d344c..a46fb470b7e4c2 100644
--- a/src/tests/JIT/Methodical/Invoke/25params/25param3b_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param3b_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param3b_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/25params/25param3b_il_r.ilproj
index 0b02047626c97a..7faff4e8ff5ede 100644
--- a/src/tests/JIT/Methodical/Invoke/25params/25param3b_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param3b_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param3c.il b/src/tests/JIT/Methodical/Invoke/25params/25param3c.il
index b2c508ea0f02cd..176150abdda40f 100644
--- a/src/tests/JIT/Methodical/Invoke/25params/25param3c.il
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param3c.il
@@ -9,7 +9,9 @@
 }
 .assembly '25param3c' {}
 .assembly extern xunit.core {}
-.class private auto ansi beforefieldinit test
+.namespace Test_25param3c_il
+{
+.class public auto ansi beforefieldinit test
        extends [mscorlib]System.Object
 {
   .method private hidebysig static int32 
@@ -70,7 +72,7 @@
     IL_002e:  ldarg.s    a23
     IL_0030:  ldarg.s    a24
     IL_0032:  ldarg.s    a25
-    tail.  call       int32 test::f2(int32,
+    tail.  call       int32 Test_25param3c_il.test::f2(int32,
                                         int32,
                                         int32,
                                         int32,
@@ -96,7 +98,7 @@
                                         int32,
                                         int32)
     IL_003f:  ret
-  } // end of method test::f1
+  } // end of method Test_25param3c_il.test::f1
 
   .method private hidebysig static int32 
           f2(int32 a1,
@@ -156,7 +158,7 @@
     IL_002e:  ldarg.s    a23
     IL_0030:  ldarg.s    a24
     IL_0032:  ldarg.s    a25
-    tail.  call       int32 test::f3(int32,
+    tail.  call       int32 Test_25param3c_il.test::f3(int32,
                                         int32,
                                         int32,
                                         int32,
@@ -182,7 +184,7 @@
                                         int32,
                                         int32)
     IL_003f:  ret
-  } // end of method test::f2
+  } // end of method Test_25param3c_il.test::f2
 
   .method private hidebysig static int32 
           f3(int32 a1,
@@ -242,7 +244,7 @@
     IL_002e:  ldarg.s    a23
     IL_0030:  ldarg.s    a24
     IL_0032:  ldarg.s    a25
-    tail.  call       int32 test::f4(int32,
+    tail.  call       int32 Test_25param3c_il.test::f4(int32,
                                         int32,
                                         int32,
                                         int32,
@@ -268,7 +270,7 @@
                                         int32,
                                         int32)
     IL_003f:  ret
-  } // end of method test::f3
+  } // end of method Test_25param3c_il.test::f3
 
   .method private hidebysig static int32 
           f4(int32 a1,
@@ -328,7 +330,7 @@
     IL_002e:  ldarg.s    a23
     IL_0030:  ldarg.s    a24
     IL_0032:  ldarg.s    a25
-    tail.  call       int32 test::f5(int32,
+    tail.  call       int32 Test_25param3c_il.test::f5(int32,
                                         int32,
                                         int32,
                                         int32,
@@ -354,7 +356,7 @@
                                         int32,
                                         int32)
     IL_003f:  ret
-  } // end of method test::f4
+  } // end of method Test_25param3c_il.test::f4
 
   .method private hidebysig static int32 
           f5(int32 a1,
@@ -414,7 +416,7 @@
     IL_002f:  ldarg.s    a23
     IL_0031:  ldarg.s    a24
     IL_0033:  ldarg.s    a25
-    tail.  call       int32 test::f6(int32,
+    tail.  call       int32 Test_25param3c_il.test::f6(int32,
                                         int32,
                                         int32,
                                         int32,
@@ -440,7 +442,7 @@
                                         int32,
                                         int32)
     IL_0040:  ret
-  } // end of method test::f5
+  } // end of method Test_25param3c_il.test::f5
 
   .method private hidebysig static int32 
           f6(int32 a1,
@@ -500,7 +502,7 @@
     IL_002f:  ldarg.s    a23
     IL_0031:  ldarg.s    a24
     IL_0033:  ldarg.s    a25
-    tail. call       int32 test::f7(int32,
+    tail. call       int32 Test_25param3c_il.test::f7(int32,
                                         int32,
                                         int32,
                                         int32,
@@ -526,7 +528,7 @@
                                         int32,
                                         int32)
         IL_0040:  ret
-  } // end of method test::f6
+  } // end of method Test_25param3c_il.test::f6
 
   .method private hidebysig static int32 
           f7(int32 a1,
@@ -586,7 +588,7 @@
     IL_002f:  ldarg.s    a23
     IL_0031:  ldarg.s    a24
     IL_0033:  ldarg.s    a25
-    tail. call       int32 test::f8(int32,
+    tail. call       int32 Test_25param3c_il.test::f8(int32,
                                         int32,
                                         int32,
                                         int32,
@@ -612,7 +614,7 @@
                                         int32,
                                         int32)
         IL_0040:  ret
-  } // end of method test::f7
+  } // end of method Test_25param3c_il.test::f7
 
   .method private hidebysig static int32 
           f8(int32 a1,
@@ -672,7 +674,7 @@
     IL_002f:  ldarg.s    a23
     IL_0031:  ldarg.s    a24
     IL_0033:  ldarg.s    a25
-    tail. call       int32 test::f9(int32,
+    tail. call       int32 Test_25param3c_il.test::f9(int32,
                                         int32,
                                         int32,
                                         int32,
@@ -698,7 +700,7 @@
                                         int32,
                                         int32)
         IL_0040:  ret
-  } // end of method test::f8
+  } // end of method Test_25param3c_il.test::f8
 
   .method private hidebysig static int32 
           f9(int32 a1,
@@ -758,7 +760,7 @@
     IL_002f:  ldarg.s    a23
     IL_0031:  ldarg.s    a24
     IL_0033:  ldarg.s    a25
-    tail. call       int32 test::f10(int32,
+    tail. call       int32 Test_25param3c_il.test::f10(int32,
                                          int32,
                                          int32,
                                          int32,
@@ -784,7 +786,7 @@
                                          int32,
                                          int32)
         IL_0040:  ret
-  } // end of method test::f9
+  } // end of method Test_25param3c_il.test::f9
 
   .method private hidebysig static int32 
           f10(int32 a1,
@@ -844,7 +846,7 @@
     IL_002f:  ldarg.s    a23
     IL_0031:  ldarg.s    a24
     IL_0033:  ldarg.s    a25
-    tail. call       int32 test::f11(int32,
+    tail. call       int32 Test_25param3c_il.test::f11(int32,
                                          int32,
                                          int32,
                                          int32,
@@ -870,7 +872,7 @@
                                          int32,
                                          int32)
         IL_0040:  ret
-  } // end of method test::f10
+  } // end of method Test_25param3c_il.test::f10
 
   .method private hidebysig static int32 
           f11(int32 a1,
@@ -930,7 +932,7 @@
     IL_002f:  ldarg.s    a23
     IL_0031:  ldarg.s    a24
     IL_0033:  ldarg.s    a25
-    tail. call       int32 test::f12(int32,
+    tail. call       int32 Test_25param3c_il.test::f12(int32,
                                          int32,
                                          int32,
                                          int32,
@@ -956,7 +958,7 @@
                                          int32,
                                          int32)
         IL_0040:  ret
-  } // end of method test::f11
+  } // end of method Test_25param3c_il.test::f11
 
   .method private hidebysig static int32 
           f12(int32 a1,
@@ -1016,7 +1018,7 @@
     IL_002f:  ldarg.s    a23
     IL_0031:  ldarg.s    a24
     IL_0033:  ldarg.s    a25
-    tail. call       int32 test::f13(int32,
+    tail. call       int32 Test_25param3c_il.test::f13(int32,
                                          int32,
                                          int32,
                                          int32,
@@ -1042,7 +1044,7 @@
                                          int32,
                                          int32)
         IL_0040:  ret
-  } // end of method test::f12
+  } // end of method Test_25param3c_il.test::f12
 
   .method private hidebysig static int32 
           f13(int32 a1,
@@ -1102,7 +1104,7 @@
     IL_002f:  ldarg.s    a23
     IL_0031:  ldarg.s    a24
     IL_0033:  ldarg.s    a25
-    tail. call       int32 test::f14(int32,
+    tail. call       int32 Test_25param3c_il.test::f14(int32,
                                          int32,
                                          int32,
                                          int32,
@@ -1128,7 +1130,7 @@
                                          int32,
                                          int32)
         IL_0040:  ret
-  } // end of method test::f13
+  } // end of method Test_25param3c_il.test::f13
 
   .method private hidebysig static int32 
           f14(int32 a1,
@@ -1188,7 +1190,7 @@
     IL_002f:  ldarg.s    a23
     IL_0031:  ldarg.s    a24
     IL_0033:  ldarg.s    a25
-    tail. call       int32 test::f15(int32,
+    tail. call       int32 Test_25param3c_il.test::f15(int32,
                                          int32,
                                          int32,
                                          int32,
@@ -1214,7 +1216,7 @@
                                          int32,
                                          int32)
         IL_0040:  ret
-  } // end of method test::f14
+  } // end of method Test_25param3c_il.test::f14
 
   .method private hidebysig static int32 
           f15(int32 a1,
@@ -1274,7 +1276,7 @@
     IL_002f:  ldarg.s    a23
     IL_0031:  ldarg.s    a24
     IL_0033:  ldarg.s    a25
-    tail. call       int32 test::f16(int32,
+    tail. call       int32 Test_25param3c_il.test::f16(int32,
                                          int32,
                                          int32,
                                          int32,
@@ -1300,7 +1302,7 @@
                                          int32,
                                          int32)
         IL_0040:  ret
-  } // end of method test::f15
+  } // end of method Test_25param3c_il.test::f15
 
   .method private hidebysig static int32 
           f16(int32 a1,
@@ -1360,7 +1362,7 @@
     IL_002f:  ldarg.s    a23
     IL_0031:  ldarg.s    a24
     IL_0033:  ldarg.s    a25
-    tail. call       int32 test::f17(int32,
+    tail. call       int32 Test_25param3c_il.test::f17(int32,
                                          int32,
                                          int32,
                                          int32,
@@ -1386,7 +1388,7 @@
                                          int32,
                                          int32)
         IL_0040:  ret
-  } // end of method test::f16
+  } // end of method Test_25param3c_il.test::f16
 
   .method private hidebysig static int32 
           f17(int32 a1,
@@ -1446,7 +1448,7 @@
     IL_002f:  ldarg.s    a23
     IL_0031:  ldarg.s    a24
     IL_0033:  ldarg.s    a25
-    tail. call       int32 test::f18(int32,
+    tail. call       int32 Test_25param3c_il.test::f18(int32,
                                          int32,
                                          int32,
                                          int32,
@@ -1472,7 +1474,7 @@
                                          int32,
                                          int32)
         IL_0040:  ret
-  } // end of method test::f17
+  } // end of method Test_25param3c_il.test::f17
 
   .method private hidebysig static int32 
           f18(int32 a1,
@@ -1532,7 +1534,7 @@
     IL_002f:  ldarg.s    a23
     IL_0031:  ldarg.s    a24
     IL_0033:  ldarg.s    a25
-    tail. call       int32 test::f19(int32,
+    tail. call       int32 Test_25param3c_il.test::f19(int32,
                                          int32,
                                          int32,
                                          int32,
@@ -1558,7 +1560,7 @@
                                          int32,
                                          int32)
         IL_0040:  ret
-  } // end of method test::f18
+  } // end of method Test_25param3c_il.test::f18
 
   .method private hidebysig static int32 
           f19(int32 a1,
@@ -1618,7 +1620,7 @@
     IL_002f:  ldarg.s    a23
     IL_0031:  ldarg.s    a24
     IL_0033:  ldarg.s    a25
-    tail. call       int32 test::f20(int32,
+    tail. call       int32 Test_25param3c_il.test::f20(int32,
                                          int32,
                                          int32,
                                          int32,
@@ -1644,7 +1646,7 @@
                                          int32,
                                          int32)
         IL_0040:  ret
-  } // end of method test::f19
+  } // end of method Test_25param3c_il.test::f19
 
   .method private hidebysig static int32 
           f20(int32 a1,
@@ -1704,7 +1706,7 @@
     IL_002f:  ldarg.s    a23
     IL_0031:  ldarg.s    a24
     IL_0033:  ldarg.s    a25
-    tail. call       int32 test::f21(int32,
+    tail. call       int32 Test_25param3c_il.test::f21(int32,
                                          int32,
                                          int32,
                                          int32,
@@ -1730,7 +1732,7 @@
                                          int32,
                                          int32)
         IL_0040:  ret
-  } // end of method test::f20
+  } // end of method Test_25param3c_il.test::f20
 
   .method private hidebysig static int32 
           f21(int32 a1,
@@ -1790,7 +1792,7 @@
     IL_002f:  ldarg.s    a23
     IL_0031:  ldarg.s    a24
     IL_0033:  ldarg.s    a25
-    tail. call       int32 test::f22(int32,
+    tail. call       int32 Test_25param3c_il.test::f22(int32,
                                          int32,
                                          int32,
                                          int32,
@@ -1816,7 +1818,7 @@
                                          int32,
                                          int32)
         IL_0040:  ret
-  } // end of method test::f21
+  } // end of method Test_25param3c_il.test::f21
 
   .method private hidebysig static int32 
           f22(int32 a1,
@@ -1876,7 +1878,7 @@
     IL_002f:  ldarg.s    a23
     IL_0031:  ldarg.s    a24
     IL_0033:  ldarg.s    a25
-    tail. call       int32 test::f23(int32,
+    tail. call       int32 Test_25param3c_il.test::f23(int32,
                                          int32,
                                          int32,
                                          int32,
@@ -1902,7 +1904,7 @@
                                          int32,
                                          int32)
         IL_0040:  ret
-  } // end of method test::f22
+  } // end of method Test_25param3c_il.test::f22
 
   .method private hidebysig static int32 
           f23(int32 a1,
@@ -1962,7 +1964,7 @@
     IL_002f:  ldarg.s    a23
     IL_0031:  ldarg.s    a24
     IL_0033:  ldarg.s    a25
-    tail. call       int32 test::f24(int32,
+    tail. call       int32 Test_25param3c_il.test::f24(int32,
                                          int32,
                                          int32,
                                          int32,
@@ -1988,7 +1990,7 @@
                                          int32,
                                          int32)
         IL_0040:  ret
-  } // end of method test::f23
+  } // end of method Test_25param3c_il.test::f23
 
   .method private hidebysig static int32 
           f24(int32 a1,
@@ -2048,7 +2050,7 @@
     IL_002f:  ldarg.s    a23
     IL_0031:  ldarg.s    a24
     IL_0033:  ldarg.s    a25
-    tail. call       int32 test::f25(int32,
+    tail. call       int32 Test_25param3c_il.test::f25(int32,
                                          int32,
                                          int32,
                                          int32,
@@ -2074,7 +2076,7 @@
                                          int32,
                                          int32)
         IL_0040:  ret
-  } // end of method test::f24
+  } // end of method Test_25param3c_il.test::f24
 
   .method private hidebysig static int32 
           f25(int32 a1,
@@ -2165,7 +2167,7 @@
 
     IL_0052:  ldloc.1
     IL_0053:  ret
-  } // end of method test::f25
+  } // end of method Test_25param3c_il.test::f25
 
   .method private hidebysig static int32 
           f(int32 a1,
@@ -2223,7 +2225,7 @@
     IL_0028:  ldarg.s    a23
     IL_002a:  ldarg.s    a24
     IL_002c:  ldarg.s    a25
-    IL_002e:  call       int32 test::f1(int32,
+    IL_002e:  call       int32 Test_25param3c_il.test::f1(int32,
                                         int32,
                                         int32,
                                         int32,
@@ -2255,9 +2257,9 @@
 
     IL_0038:  ldloc.1
     IL_0039:  ret
-  } // end of method test::f
+  } // end of method Test_25param3c_il.test::f
 
-  .method private hidebysig static int32 
+  .method public hidebysig static int32 
           Main() cil managed
   {
     .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -2295,7 +2297,7 @@ call void [System.Console]System.Console::WriteLine(string)
     IL_0024:  ldc.i4.s   23
     IL_0026:  ldc.i4.s   24
     IL_0028:  ldc.i4.s   25
-    IL_002a:  call       int32 test::f(int32,
+    IL_002a:  call       int32 Test_25param3c_il.test::f(int32,
                                        int32,
                                        int32,
                                        int32,
@@ -2340,7 +2342,7 @@ call void [System.Console]System.Console::WriteLine(string)
 
     IL_0051:  ldloc.1
     IL_0052:  ret
-  } // end of method test::Main
+  } // end of method Test_25param3c_il.test::Main
 
   .method public hidebysig specialname rtspecialname 
           instance void  .ctor() cil managed
@@ -2350,6 +2352,7 @@ call void [System.Console]System.Console::WriteLine(string)
     IL_0000:  ldarg.0
     IL_0001:  call       instance void [mscorlib]System.Object::.ctor()
     IL_0006:  ret
-  } // end of method test::.ctor
+  } // end of method Test_25param3c_il.test::.ctor
 
 }
+}
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param3c_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/25params/25param3c_il_d.ilproj
index d4acb246f15004..c3dca6b8f51871 100644
--- a/src/tests/JIT/Methodical/Invoke/25params/25param3c_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param3c_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param3c_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/25params/25param3c_il_r.ilproj
index 1a985e7b94af8f..0b4ef8e2a7b715 100644
--- a/src/tests/JIT/Methodical/Invoke/25params/25param3c_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param3c_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25paramMixed.il b/src/tests/JIT/Methodical/Invoke/25params/25paramMixed.il
index f560a5ca2a3fda..0e7d2e4cd25ecc 100644
--- a/src/tests/JIT/Methodical/Invoke/25params/25paramMixed.il
+++ b/src/tests/JIT/Methodical/Invoke/25params/25paramMixed.il
@@ -9,7 +9,9 @@
 }
 .assembly '25paramMixed' {}
 .assembly extern xunit.core {}
-.class private auto ansi beforefieldinit test
+.namespace Test_25paramMixed_il
+{
+.class public auto ansi beforefieldinit test
        extends [mscorlib]System.Object
 {
   .method private hidebysig static int32 
@@ -70,7 +72,7 @@
     IL_002e:  ldarg.s    a23
     IL_0030:  ldarg.s    a24
     IL_0032:  ldarg.s    a25
-    call       int32 test::f2(int32,
+    call       int32 Test_25paramMixed_il.test::f2(int32,
                                         int32,
                                         int32,
                                         int32,
@@ -96,7 +98,7 @@
                                         int32,
                                         int32)
     IL_003f:  ret
-  } // end of method test::f1
+  } // end of method Test_25paramMixed_il.test::f1
 
   .method private hidebysig static int32 
           f2(int32 a1,
@@ -156,7 +158,7 @@
     IL_002e:  ldarg.s    a23
     IL_0030:  ldarg.s    a24
     IL_0032:  ldarg.s    a25
-    tail.  call       int32 test::f3(int32,
+    tail.  call       int32 Test_25paramMixed_il.test::f3(int32,
                                         int32,
                                         int32,
                                         int32,
@@ -182,7 +184,7 @@
                                         int32,
                                         int32)
     IL_003f:  ret
-  } // end of method test::f2
+  } // end of method Test_25paramMixed_il.test::f2
 
   .method private hidebysig static int32 
           f3(int32 a1,
@@ -217,7 +219,7 @@
              int32 V_1)
     IL_0000:  ldarg.2
     IL_0001:  call       void [System.Console]System.Console::WriteLine(int32)
-    jmp       int32 test::f4(int32,
+    jmp       int32 Test_25paramMixed_il.test::f4(int32,
                                         int32,
                                         int32,
                                         int32,
@@ -242,7 +244,7 @@
                                         int32,
                                         int32,
                                         int32)
-  } // end of method test::f3
+  } // end of method Test_25paramMixed_il.test::f3
 
   .method private hidebysig static int32 
           f4(int32 a1,
@@ -302,7 +304,7 @@
     IL_002e:  ldarg.s    a23
     IL_0030:  ldarg.s    a24
     IL_0032:  ldarg.s    a25
-    tail.  call       int32 test::f5(int32,
+    tail.  call       int32 Test_25paramMixed_il.test::f5(int32,
                                         int32,
                                         int32,
                                         int32,
@@ -328,7 +330,7 @@
                                         int32,
                                         int32)
     IL_003f:  ret
-  } // end of method test::f4
+  } // end of method Test_25paramMixed_il.test::f4
 
   .method private hidebysig static int32 
           f5(int32 a1,
@@ -388,7 +390,7 @@
     IL_002f:  ldarg.s    a23
     IL_0031:  ldarg.s    a24
     IL_0033:  ldarg.s    a25
-    tail.  call       int32 test::f6(int32,
+    tail.  call       int32 Test_25paramMixed_il.test::f6(int32,
                                         int32,
                                         int32,
                                         int32,
@@ -414,7 +416,7 @@
                                         int32,
                                         int32)
     IL_0040:  ret
-  } // end of method test::f5
+  } // end of method Test_25paramMixed_il.test::f5
 
   .method private hidebysig static int32 
           f6(int32 a1,
@@ -449,7 +451,7 @@
              int32 V_1)
     IL_0000:  ldarg.s    a6
     IL_0002:  call       void [System.Console]System.Console::WriteLine(int32)
-    jmp       int32 test::f7(int32,
+    jmp       int32 Test_25paramMixed_il.test::f7(int32,
                                         int32,
                                         int32,
                                         int32,
@@ -474,7 +476,7 @@
                                         int32,
                                         int32,
                                         int32)
-  } // end of method test::f6
+  } // end of method Test_25paramMixed_il.test::f6
 
   .method private hidebysig static int32 
           f7(int32 a1,
@@ -534,7 +536,7 @@
     IL_002f:  ldarg.s    a23
     IL_0031:  ldarg.s    a24
     IL_0033:  ldarg.s    a25
-    call       int32 test::f8(int32,
+    call       int32 Test_25paramMixed_il.test::f8(int32,
                                         int32,
                                         int32,
                                         int32,
@@ -564,7 +566,7 @@
 	stloc.1
 	ldloc.1
         IL_0040:  ret
-  } // end of method test::f7
+  } // end of method Test_25paramMixed_il.test::f7
 
   .method private hidebysig static int32 
           f8(int32 a1,
@@ -599,7 +601,7 @@
              int32 V_1)
     IL_0000:  ldarg.s    a8
     IL_0002:  call       void [System.Console]System.Console::WriteLine(int32)
-    jmp       int32 test::f9(int32,
+    jmp       int32 Test_25paramMixed_il.test::f9(int32,
                                         int32,
                                         int32,
                                         int32,
@@ -624,7 +626,7 @@
                                         int32,
                                         int32,
                                         int32)
-  } // end of method test::f8
+  } // end of method Test_25paramMixed_il.test::f8
 
   .method private hidebysig static int32 
           f9(int32 a1,
@@ -659,7 +661,7 @@
              int32 V_1)
     IL_0000:  ldarg.s    a9
     IL_0002:  call       void [System.Console]System.Console::WriteLine(int32)
-    jmp       int32 test::f10(int32,
+    jmp       int32 Test_25paramMixed_il.test::f10(int32,
                                          int32,
                                          int32,
                                          int32,
@@ -684,7 +686,7 @@
                                          int32,
                                          int32,
                                          int32)
-  } // end of method test::f9
+  } // end of method Test_25paramMixed_il.test::f9
 
   .method private hidebysig static int32 
           f10(int32 a1,
@@ -744,7 +746,7 @@
     IL_002f:  ldarg.s    a23
     IL_0031:  ldarg.s    a24
     IL_0033:  ldarg.s    a25
-    call       int32 test::f11(int32,
+    call       int32 Test_25paramMixed_il.test::f11(int32,
                                          int32,
                                          int32,
                                          int32,
@@ -770,7 +772,7 @@
                                          int32,
                                          int32)
         IL_0040:  ret
-  } // end of method test::f10
+  } // end of method Test_25paramMixed_il.test::f10
 
   .method private hidebysig static int32 
           f11(int32 a1,
@@ -830,7 +832,7 @@
     IL_002f:  ldarg.s    a23
     IL_0031:  ldarg.s    a24
     IL_0033:  ldarg.s    a25
-    call       int32 test::f12(int32,
+    call       int32 Test_25paramMixed_il.test::f12(int32,
                                          int32,
                                          int32,
                                          int32,
@@ -856,7 +858,7 @@
                                          int32,
                                          int32)
         IL_0040:  ret
-  } // end of method test::f11
+  } // end of method Test_25paramMixed_il.test::f11
 
   .method private hidebysig static int32 
           f12(int32 a1,
@@ -891,7 +893,7 @@
              int32 V_1)
     IL_0000:  ldarg.s    a12
     IL_0002:  call       void [System.Console]System.Console::WriteLine(int32)
-    jmp       int32 test::f13(int32,
+    jmp       int32 Test_25paramMixed_il.test::f13(int32,
                                          int32,
                                          int32,
                                          int32,
@@ -916,7 +918,7 @@
                                          int32,
                                          int32,
                                          int32)
-  } // end of method test::f12
+  } // end of method Test_25paramMixed_il.test::f12
 
   .method private hidebysig static int32 
           f13(int32 a1,
@@ -976,7 +978,7 @@
     IL_002f:  ldarg.s    a23
     IL_0031:  ldarg.s    a24
     IL_0033:  ldarg.s    a25
-    tail. call       int32 test::f14(int32,
+    tail. call       int32 Test_25paramMixed_il.test::f14(int32,
                                          int32,
                                          int32,
                                          int32,
@@ -1002,7 +1004,7 @@
                                          int32,
                                          int32)
         IL_0040:  ret
-  } // end of method test::f13
+  } // end of method Test_25paramMixed_il.test::f13
 
   .method private hidebysig static int32 
           f14(int32 a1,
@@ -1062,7 +1064,7 @@
     IL_002f:  ldarg.s    a23
     IL_0031:  ldarg.s    a24
     IL_0033:  ldarg.s    a25
-    tail. call       int32 test::f15(int32,
+    tail. call       int32 Test_25paramMixed_il.test::f15(int32,
                                          int32,
                                          int32,
                                          int32,
@@ -1088,7 +1090,7 @@
                                          int32,
                                          int32)
         IL_0040:  ret
-  } // end of method test::f14
+  } // end of method Test_25paramMixed_il.test::f14
 
   .method private hidebysig static int32 
           f15(int32 a1,
@@ -1148,7 +1150,7 @@
     IL_002f:  ldarg.s    a23
     IL_0031:  ldarg.s    a24
     IL_0033:  ldarg.s    a25
-    tail. call       int32 test::f16(int32,
+    tail. call       int32 Test_25paramMixed_il.test::f16(int32,
                                          int32,
                                          int32,
                                          int32,
@@ -1174,7 +1176,7 @@
                                          int32,
                                          int32)
         IL_0040:  ret
-  } // end of method test::f15
+  } // end of method Test_25paramMixed_il.test::f15
 
   .method private hidebysig static int32 
           f16(int32 a1,
@@ -1234,7 +1236,7 @@
     IL_002f:  ldarg.s    a23
     IL_0031:  ldarg.s    a24
     IL_0033:  ldarg.s    a25
-    tail. call       int32 test::f17(int32,
+    tail. call       int32 Test_25paramMixed_il.test::f17(int32,
                                          int32,
                                          int32,
                                          int32,
@@ -1260,7 +1262,7 @@
                                          int32,
                                          int32)
         IL_0040:  ret
-  } // end of method test::f16
+  } // end of method Test_25paramMixed_il.test::f16
 
   .method private hidebysig static int32 
           f17(int32 a1,
@@ -1295,7 +1297,7 @@
              int32 V_1)
     IL_0000:  ldarg.s    a17
     IL_0002:  call       void [System.Console]System.Console::WriteLine(int32)
-    jmp       int32 test::f18(int32,
+    jmp       int32 Test_25paramMixed_il.test::f18(int32,
                                          int32,
                                          int32,
                                          int32,
@@ -1320,7 +1322,7 @@
                                          int32,
                                          int32,
                                          int32)
-  } // end of method test::f17
+  } // end of method Test_25paramMixed_il.test::f17
 
   .method private hidebysig static int32 
           f18(int32 a1,
@@ -1355,7 +1357,7 @@
              int32 V_1)
     IL_0000:  ldarg.s    a18
     IL_0002:  call       void [System.Console]System.Console::WriteLine(int32)
-    jmp       int32 test::f19(int32,
+    jmp       int32 Test_25paramMixed_il.test::f19(int32,
                                          int32,
                                          int32,
                                          int32,
@@ -1380,7 +1382,7 @@
                                          int32,
                                          int32,
                                          int32)
-  } // end of method test::f18
+  } // end of method Test_25paramMixed_il.test::f18
 
   .method private hidebysig static int32 
           f19(int32 a1,
@@ -1417,7 +1419,7 @@
     IL_0002:  call       void [System.Console]System.Console::WriteLine(int32)
 	call void [mscorlib]System.GC::Collect()
 	call void [mscorlib]System.GC::Collect()
-    jmp       int32 test::f20(int32,
+    jmp       int32 Test_25paramMixed_il.test::f20(int32,
                                          int32,
                                          int32,
                                          int32,
@@ -1442,7 +1444,7 @@
                                          int32,
                                          int32,
                                          int32)
-  } // end of method test::f19
+  } // end of method Test_25paramMixed_il.test::f19
 
   .method private hidebysig static int32 
           f20(int32 a1,
@@ -1477,7 +1479,7 @@
              int32 V_1)
     IL_0000:  ldarg.s    a20
     IL_0002:  call       void [System.Console]System.Console::WriteLine(int32)
-    jmp       int32 test::f21(int32,
+    jmp       int32 Test_25paramMixed_il.test::f21(int32,
                                          int32,
                                          int32,
                                          int32,
@@ -1502,7 +1504,7 @@
                                          int32,
                                          int32,
                                          int32)
-  } // end of method test::f20
+  } // end of method Test_25paramMixed_il.test::f20
 
   .method private hidebysig static int32 
           f21(int32 a1,
@@ -1537,7 +1539,7 @@
              int32 V_1)
     IL_0000:  ldarg.s    a21
     IL_0002:  call       void [System.Console]System.Console::WriteLine(int32)
-    jmp       int32 test::f22(int32,
+    jmp       int32 Test_25paramMixed_il.test::f22(int32,
                                          int32,
                                          int32,
                                          int32,
@@ -1562,7 +1564,7 @@
                                          int32,
                                          int32,
                                          int32)
-  } // end of method test::f21
+  } // end of method Test_25paramMixed_il.test::f21
 
   .method private hidebysig static int32 
           f22(int32 a1,
@@ -1597,7 +1599,7 @@
              int32 V_1)
     IL_0000:  ldarg.s    a22
     IL_0002:  call       void [System.Console]System.Console::WriteLine(int32)
-    jmp       int32 test::f23(int32,
+    jmp       int32 Test_25paramMixed_il.test::f23(int32,
                                          int32,
                                          int32,
                                          int32,
@@ -1622,7 +1624,7 @@
                                          int32,
                                          int32,
                                          int32)
-  } // end of method test::f22
+  } // end of method Test_25paramMixed_il.test::f22
 
   .method private hidebysig static int32 
           f23(int32 a1,
@@ -1682,7 +1684,7 @@
     IL_002f:  ldarg.s    a23
     IL_0031:  ldarg.s    a24
     IL_0033:  ldarg.s    a25
-    tail. call       int32 test::f24(int32,
+    tail. call       int32 Test_25paramMixed_il.test::f24(int32,
                                          int32,
                                          int32,
                                          int32,
@@ -1708,7 +1710,7 @@
                                          int32,
                                          int32)
         IL_0040:  ret
-  } // end of method test::f23
+  } // end of method Test_25paramMixed_il.test::f23
 
   .method private hidebysig static int32 
           f24(int32 a1,
@@ -1772,7 +1774,7 @@
 	call void [mscorlib]System.GC::Collect()
 	call void [mscorlib]System.GC::Collect()
 	call void [mscorlib]System.GC::Collect()
-    tail. call       int32 test::f25(int32,
+    tail. call       int32 Test_25paramMixed_il.test::f25(int32,
                                          int32,
                                          int32,
                                          int32,
@@ -1798,7 +1800,7 @@
                                          int32,
                                          int32)
         IL_0040:  ret
-  } // end of method test::f24
+  } // end of method Test_25paramMixed_il.test::f24
 
   .method private hidebysig static int32 
           f25(int32 a1,
@@ -1892,7 +1894,7 @@
 	call void [mscorlib]System.GC::Collect()
 	call void [mscorlib]System.GC::Collect()
     IL_0053:  ret
-  } // end of method test::f25
+  } // end of method Test_25paramMixed_il.test::f25
 
   .method private hidebysig static int32 
           f(int32 a1,
@@ -1950,7 +1952,7 @@
     IL_0028:  ldarg.s    a23
     IL_002a:  ldarg.s    a24
     IL_002c:  ldarg.s    a25
-    IL_002e:  call       int32 test::f1(int32,
+    IL_002e:  call       int32 Test_25paramMixed_il.test::f1(int32,
                                         int32,
                                         int32,
                                         int32,
@@ -1982,9 +1984,9 @@
 
     IL_0038:  ldloc.1
     IL_0039:  ret
-  } // end of method test::f
+  } // end of method Test_25paramMixed_il.test::f
 
-  .method private hidebysig static int32 
+  .method public hidebysig static int32 
           Main() cil managed
   {
     .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -2022,7 +2024,7 @@ call void [System.Console]System.Console::WriteLine(string)
     IL_0024:  ldc.i4.s   23
     IL_0026:  ldc.i4.s   24
     IL_0028:  ldc.i4.s   25
-    IL_002a:  call       int32 test::f(int32,
+    IL_002a:  call       int32 Test_25paramMixed_il.test::f(int32,
                                        int32,
                                        int32,
                                        int32,
@@ -2067,7 +2069,7 @@ call void [System.Console]System.Console::WriteLine(string)
 
     IL_0051:  ldloc.1
     IL_0052:  ret
-  } // end of method test::Main
+  } // end of method Test_25paramMixed_il.test::Main
 
   .method public hidebysig specialname rtspecialname 
           instance void  .ctor() cil managed
@@ -2077,6 +2079,7 @@ call void [System.Console]System.Console::WriteLine(string)
     IL_0000:  ldarg.0
     IL_0001:  call       instance void [mscorlib]System.Object::.ctor()
     IL_0006:  ret
-  } // end of method test::.ctor
+  } // end of method Test_25paramMixed_il.test::.ctor
 
 }
+}
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25paramMixed_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/25params/25paramMixed_il_d.ilproj
index 82d4eadc725bc1..33afd667e58dc0 100644
--- a/src/tests/JIT/Methodical/Invoke/25params/25paramMixed_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/25params/25paramMixed_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25paramMixed_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/25params/25paramMixed_il_r.ilproj
index 1e004af675f32a..234bdde3e927ec 100644
--- a/src/tests/JIT/Methodical/Invoke/25params/25paramMixed_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/25params/25paramMixed_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfault.il b/src/tests/JIT/Methodical/Invoke/SEH/catchfault.il
index b4c63e688194cf..e37ddbbd88e6e7 100644
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfault.il
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfault.il
@@ -16,9 +16,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {FCE369B5-E876-4E32-B744-1740582FF3B2}
-.namespace JitTest
+.namespace JitTest_catchfault_SEH_il
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends ['mscorlib']System.Object
   {
     .field private static bool globalFlag
@@ -35,17 +35,17 @@
 
       .try
       {
-        IL_0004:  ldsfld     bool JitTest.Test::globalFlag
+        IL_0004:  ldsfld     bool JitTest_catchfault_SEH_il.Test::globalFlag
         IL_0009:  ldc.i4.0
         IL_000a:  ceq
         IL_000c:  dup
-        IL_000d:  stsfld     bool JitTest.Test::globalFlag
+        IL_000d:  stsfld     bool JitTest_catchfault_SEH_il.Test::globalFlag
         IL_0012:  brfalse.s  IL_001f
 
         IL_0014:  ldarg.0
         IL_0015:  ldc.i4.2
         IL_0016:  sub
-        IL_0017:  call       bool JitTest.Test::TestTryFinally(int32)
+        IL_0017:  call       bool JitTest_catchfault_SEH_il.Test::TestTryFinally(int32)
         IL_001c:  stloc.1
         IL_001d:  leave.s    IL_0046
 
@@ -65,7 +65,7 @@
       {
         IL_0035:  pop
         IL_0036:  ldarg.0
-        IL_0037:  call       bool JitTest.Test::TestTryCatch(int32)
+        IL_0037:  call       bool JitTest_catchfault_SEH_il.Test::TestTryCatch(int32)
         IL_003c:  stloc.1
         IL_003d:  leave.s    IL_0046
 
@@ -98,17 +98,17 @@
       {
         .try
         {
-          IL_0006:  ldsfld     bool JitTest.Test::globalFlag
+          IL_0006:  ldsfld     bool JitTest_catchfault_SEH_il.Test::globalFlag
           IL_000b:  ldc.i4.0
           IL_000c:  ceq
           IL_000e:  dup
-          IL_000f:  stsfld     bool JitTest.Test::globalFlag
+          IL_000f:  stsfld     bool JitTest_catchfault_SEH_il.Test::globalFlag
           IL_0014:  brfalse.s  IL_0021
 
           IL_0016:  ldarg.0
           IL_0017:  ldc.i4.2
           IL_0018:  sub
-          IL_0019:  call       bool JitTest.Test::TestTryCatch(int32)
+          IL_0019:  call       bool JitTest_catchfault_SEH_il.Test::TestTryCatch(int32)
           IL_001e:  stloc.2
           IL_001f:  leave.s    IL_004d
 
@@ -127,7 +127,7 @@
         fault
         {
           IL_0037:  ldarg.0
-          IL_0038:  call       bool JitTest.Test::TestTryFinally(int32)
+          IL_0038:  call       bool JitTest_catchfault_SEH_il.Test::TestTryFinally(int32)
           IL_003d:  stloc.0
           IL_003e:  endfinally
         }  // end handler
@@ -152,7 +152,7 @@
       IL_004e:  ret
     } // end of method 'Test::TestTryFinally'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -165,11 +165,11 @@
       .try
       {
         IL_0000:  ldc.i4.s   15
-        IL_0002:  call       bool JitTest.Test::TestTryCatch(int32)
+        IL_0002:  call       bool JitTest_catchfault_SEH_il.Test::TestTryCatch(int32)
         IL_0007:  brtrue.s   IL_0012
 
         IL_0009:  ldc.i4.s   18
-        IL_000b:  call       bool JitTest.Test::TestTryCatch(int32)
+        IL_000b:  call       bool JitTest_catchfault_SEH_il.Test::TestTryCatch(int32)
         IL_0010:  brtrue.s   IL_0020
 
         IL_0012:  ldstr      "try...catch test failed."
@@ -179,11 +179,11 @@
         IL_001e:  leave.s    IL_005f
 
         IL_0020:  ldc.i4.s   19
-        IL_0022:  call       bool JitTest.Test::TestTryFinally(int32)
+        IL_0022:  call       bool JitTest_catchfault_SEH_il.Test::TestTryFinally(int32)
         IL_0027:  brtrue.s   IL_0032
 
         IL_0029:  ldc.i4.s   12
-        IL_002b:  call       bool JitTest.Test::TestTryFinally(int32)
+        IL_002b:  call       bool JitTest_catchfault_SEH_il.Test::TestTryFinally(int32)
         IL_0030:  brtrue.s   IL_0040
 
         IL_0032:  ldstr      "try...finally test failed."
@@ -221,7 +221,7 @@
       // Code size       7 (0x7)
       .maxstack  8
       IL_0000:  ldc.i4.0
-      IL_0001:  stsfld     bool JitTest.Test::globalFlag
+      IL_0001:  stsfld     bool JitTest_catchfault_SEH_il.Test::globalFlag
       IL_0006:  ret
     } // end of method 'Test::.cctor'
 
@@ -237,6 +237,6 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_catchfault_SEH_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfault_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/SEH/catchfault_il_d.ilproj
index 9e481fb56aa71b..ca5e92493ff084 100644
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfault_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfault_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfault_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/SEH/catchfault_il_r.ilproj
index d8e431d31aabfb..bdd2007edc1a19 100644
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfault_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfault_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfault_jmp.il b/src/tests/JIT/Methodical/Invoke/SEH/catchfault_jmp.il
index 61e52ef7b9bd85..8c0d00e88d57fc 100644
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfault_jmp.il
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfault_jmp.il
@@ -16,9 +16,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {7D0BA0DB-DCB6-4997-83C9-9F31894A25EF}
-.namespace JitTest
+.namespace JitTest_catchfault_jmp_il
 {
-  .class private auto ansi Test1
+  .class public auto ansi Test1
          extends ['mscorlib']System.Object
   {
     .field private static bool globalFlag
@@ -36,17 +36,17 @@
 
       .try
       {
-        IL_0004:  ldsfld     bool JitTest.Test1::globalFlag
+        IL_0004:  ldsfld     bool JitTest_catchfault_jmp_il.Test1::globalFlag
         IL_0009:  ldc.i4.0
         IL_000a:  ceq
         IL_000c:  dup
-        IL_000d:  stsfld     bool JitTest.Test1::globalFlag
+        IL_000d:  stsfld     bool JitTest_catchfault_jmp_il.Test1::globalFlag
         IL_0012:  brfalse.s  IL_001f
 
         IL_0014:  ldarg.0
         IL_0015:  ldc.i4.2
         IL_0016:  sub
-        IL_0017:  call       bool JitTest.Test1::TestTryCatch(int32)
+        IL_0017:  call       bool JitTest_catchfault_jmp_il.Test1::TestTryCatch(int32)
         IL_001c:  stloc.1
         IL_001d:  leave.s    IL_0046
 
@@ -66,7 +66,7 @@
       {
         IL_0035:  pop
         IL_0036:  ldarg.0
-        IL_0037:  call       bool JitTest.Test1::Test(int32)
+        IL_0037:  call       bool JitTest_catchfault_jmp_il.Test1::Test(int32)
         IL_003c:  stloc.1
         IL_003d:  leave.s    IL_0046
 
@@ -99,17 +99,17 @@
       {
         .try
         {
-          IL_0006:  ldsfld     bool JitTest.Test1::globalFlag
+          IL_0006:  ldsfld     bool JitTest_catchfault_jmp_il.Test1::globalFlag
           IL_000b:  ldc.i4.0
           IL_000c:  ceq
           IL_000e:  dup
-          IL_000f:  stsfld     bool JitTest.Test1::globalFlag
+          IL_000f:  stsfld     bool JitTest_catchfault_jmp_il.Test1::globalFlag
           IL_0014:  brfalse.s  IL_0021
 
           IL_0016:  ldarg.0
           IL_0017:  ldc.i4.2
           IL_0018:  sub
-          IL_0019:  call       bool JitTest.Test1::TestTryCatch(int32)
+          IL_0019:  call       bool JitTest_catchfault_jmp_il.Test1::TestTryCatch(int32)
           IL_001e:  stloc.2
           IL_001f:  leave.s    IL_004d
 
@@ -128,7 +128,7 @@
         fault
         {
           IL_0037:  ldarg.0
-          IL_0038:  call       bool JitTest.Test1::Test(int32)
+          IL_0038:  call       bool JitTest_catchfault_jmp_il.Test1::Test(int32)
           IL_003d:  stloc.0
           IL_003e:  endfinally
         }  // end handler
@@ -159,19 +159,19 @@
       // Code size       36 (0x24)
       .maxstack  2
       .locals (bool V_0)
-      IL_0000:  ldsfld     bool JitTest.Test1::globalFlag2
+      IL_0000:  ldsfld     bool JitTest_catchfault_jmp_il.Test1::globalFlag2
       IL_0005:  ldc.i4.0
       IL_0006:  ceq
       IL_0008:  dup
-      IL_0009:  stsfld     bool JitTest.Test1::globalFlag2
+      IL_0009:  stsfld     bool JitTest_catchfault_jmp_il.Test1::globalFlag2
       IL_000e:  brfalse.s  IL_0019
 
-      			jmp    bool JitTest.Test1::TestTryCatch(int32)
+      			jmp    bool JitTest_catchfault_jmp_il.Test1::TestTryCatch(int32)
 
-      IL_0019:  jmp    bool JitTest.Test1::TestTryFinally(int32)
+      IL_0019:  jmp    bool JitTest_catchfault_jmp_il.Test1::TestTryFinally(int32)
     } // end of method 'Test1::Test'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -184,11 +184,11 @@
       .try
       {
         IL_0000:  ldc.i4.s   15
-        IL_0002:  call       bool JitTest.Test1::TestTryCatch(int32)
+        IL_0002:  call       bool JitTest_catchfault_jmp_il.Test1::TestTryCatch(int32)
         IL_0007:  brtrue.s   IL_0012
 
         IL_0009:  ldc.i4.s   18
-        IL_000b:  call       bool JitTest.Test1::TestTryCatch(int32)
+        IL_000b:  call       bool JitTest_catchfault_jmp_il.Test1::TestTryCatch(int32)
         IL_0010:  brtrue.s   IL_0020
 
         IL_0012:  ldstr      "try...catch test failed."
@@ -198,11 +198,11 @@
         IL_001e:  leave.s    IL_005f
 
         IL_0020:  ldc.i4.s   19
-        IL_0022:  call       bool JitTest.Test1::TestTryFinally(int32)
+        IL_0022:  call       bool JitTest_catchfault_jmp_il.Test1::TestTryFinally(int32)
         IL_0027:  brtrue.s   IL_0032
 
         IL_0029:  ldc.i4.s   12
-        IL_002b:  call       bool JitTest.Test1::TestTryFinally(int32)
+        IL_002b:  call       bool JitTest_catchfault_jmp_il.Test1::TestTryFinally(int32)
         IL_0030:  brtrue.s   IL_0040
 
         IL_0032:  ldstr      "try...finally test failed."
@@ -240,9 +240,9 @@
       // Code size       13 (0xd)
       .maxstack  8
       IL_0000:  ldc.i4.0
-      IL_0001:  stsfld     bool JitTest.Test1::globalFlag
+      IL_0001:  stsfld     bool JitTest_catchfault_jmp_il.Test1::globalFlag
       IL_0006:  ldc.i4.1
-      IL_0007:  stsfld     bool JitTest.Test1::globalFlag2
+      IL_0007:  stsfld     bool JitTest_catchfault_jmp_il.Test1::globalFlag2
       IL_000c:  ret
     } // end of method 'Test1::.cctor'
 
@@ -258,6 +258,6 @@
 
   } // end of class 'Test1'
 
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_catchfault_jmp_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfault_jmp_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/SEH/catchfault_jmp_il_d.ilproj
index 996ecf78d9b6a8..d2e6d4a7e31a72 100644
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfault_jmp_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfault_jmp_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfault_jmp_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/SEH/catchfault_jmp_il_r.ilproj
index 0b19db7084a97a..187b036ff60250 100644
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfault_jmp_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfault_jmp_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfault_tail.il b/src/tests/JIT/Methodical/Invoke/SEH/catchfault_tail.il
index a27ca4a49745bd..a8ca798cc8454f 100644
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfault_tail.il
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfault_tail.il
@@ -16,9 +16,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {7D0BA0DB-DCB6-4997-83C9-9F31894A25EF}
-.namespace JitTest
+.namespace JitTest_catchfault_tail_il
 {
-  .class private auto ansi Test1
+  .class public auto ansi Test1
          extends ['mscorlib']System.Object
   {
     .field private static bool globalFlag
@@ -36,17 +36,17 @@
 
       .try
       {
-        IL_0004:  ldsfld     bool JitTest.Test1::globalFlag
+        IL_0004:  ldsfld     bool JitTest_catchfault_tail_il.Test1::globalFlag
         IL_0009:  ldc.i4.0
         IL_000a:  ceq
         IL_000c:  dup
-        IL_000d:  stsfld     bool JitTest.Test1::globalFlag
+        IL_000d:  stsfld     bool JitTest_catchfault_tail_il.Test1::globalFlag
         IL_0012:  brfalse.s  IL_001f
 
         IL_0014:  ldarg.0
         IL_0015:  ldc.i4.2
         IL_0016:  sub
-        IL_0017:  call       bool JitTest.Test1::TestTryCatch(int32)
+        IL_0017:  call       bool JitTest_catchfault_tail_il.Test1::TestTryCatch(int32)
         IL_001c:  stloc.1
         IL_001d:  leave.s    IL_0046
 
@@ -66,7 +66,7 @@
       {
         IL_0035:  pop
         IL_0036:  ldarg.0
-        IL_0037:  call       bool JitTest.Test1::Test(int32)
+        IL_0037:  call       bool JitTest_catchfault_tail_il.Test1::Test(int32)
         IL_003c:  stloc.1
         IL_003d:  leave.s    IL_0046
 
@@ -99,17 +99,17 @@
       {
         .try
         {
-          IL_0006:  ldsfld     bool JitTest.Test1::globalFlag
+          IL_0006:  ldsfld     bool JitTest_catchfault_tail_il.Test1::globalFlag
           IL_000b:  ldc.i4.0
           IL_000c:  ceq
           IL_000e:  dup
-          IL_000f:  stsfld     bool JitTest.Test1::globalFlag
+          IL_000f:  stsfld     bool JitTest_catchfault_tail_il.Test1::globalFlag
           IL_0014:  brfalse.s  IL_0021
 
           IL_0016:  ldarg.0
           IL_0017:  ldc.i4.2
           IL_0018:  sub
-          IL_0019:  call       bool JitTest.Test1::TestTryCatch(int32)
+          IL_0019:  call       bool JitTest_catchfault_tail_il.Test1::TestTryCatch(int32)
           IL_001e:  stloc.2
           IL_001f:  leave.s    IL_004d
 
@@ -128,7 +128,7 @@
         fault
         {
           IL_0037:  ldarg.0
-          IL_0038:  call       bool JitTest.Test1::Test(int32)
+          IL_0038:  call       bool JitTest_catchfault_tail_il.Test1::Test(int32)
           IL_003d:  stloc.0
           IL_003e:  endfinally
         }  // end handler
@@ -159,23 +159,23 @@
       // Code size       36 (0x24)
       .maxstack  2
       .locals (bool V_0)
-      IL_0000:  ldsfld     bool JitTest.Test1::globalFlag2
+      IL_0000:  ldsfld     bool JitTest_catchfault_tail_il.Test1::globalFlag2
       IL_0005:  ldc.i4.0
       IL_0006:  ceq
       IL_0008:  dup
-      IL_0009:  stsfld     bool JitTest.Test1::globalFlag2
+      IL_0009:  stsfld     bool JitTest_catchfault_tail_il.Test1::globalFlag2
       IL_000e:  brfalse.s  IL_0019
 
       			ldarg.0
-      			tail. call       bool JitTest.Test1::TestTryCatch(int32)
+      			tail. call       bool JitTest_catchfault_tail_il.Test1::TestTryCatch(int32)
       			ret
 
       IL_0019:  ldarg.0
-      			tail. call       bool JitTest.Test1::TestTryFinally(int32)
+      			tail. call       bool JitTest_catchfault_tail_il.Test1::TestTryFinally(int32)
       			ret
     } // end of method 'Test1::Test'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -188,11 +188,11 @@
       .try
       {
         IL_0000:  ldc.i4.s   15
-        IL_0002:  call       bool JitTest.Test1::TestTryCatch(int32)
+        IL_0002:  call       bool JitTest_catchfault_tail_il.Test1::TestTryCatch(int32)
         IL_0007:  brtrue.s   IL_0012
 
         IL_0009:  ldc.i4.s   18
-        IL_000b:  call       bool JitTest.Test1::TestTryCatch(int32)
+        IL_000b:  call       bool JitTest_catchfault_tail_il.Test1::TestTryCatch(int32)
         IL_0010:  brtrue.s   IL_0020
 
         IL_0012:  ldstr      "try...catch test failed."
@@ -202,11 +202,11 @@
         IL_001e:  leave.s    IL_005f
 
         IL_0020:  ldc.i4.s   19
-        IL_0022:  call       bool JitTest.Test1::TestTryFinally(int32)
+        IL_0022:  call       bool JitTest_catchfault_tail_il.Test1::TestTryFinally(int32)
         IL_0027:  brtrue.s   IL_0032
 
         IL_0029:  ldc.i4.s   12
-        IL_002b:  call       bool JitTest.Test1::TestTryFinally(int32)
+        IL_002b:  call       bool JitTest_catchfault_tail_il.Test1::TestTryFinally(int32)
         IL_0030:  brtrue.s   IL_0040
 
         IL_0032:  ldstr      "try...finally test failed."
@@ -244,9 +244,9 @@
       // Code size       13 (0xd)
       .maxstack  8
       IL_0000:  ldc.i4.0
-      IL_0001:  stsfld     bool JitTest.Test1::globalFlag
+      IL_0001:  stsfld     bool JitTest_catchfault_tail_il.Test1::globalFlag
       IL_0006:  ldc.i4.1
-      IL_0007:  stsfld     bool JitTest.Test1::globalFlag2
+      IL_0007:  stsfld     bool JitTest_catchfault_tail_il.Test1::globalFlag2
       IL_000c:  ret
     } // end of method 'Test1::.cctor'
 
@@ -262,6 +262,6 @@
 
   } // end of class 'Test1'
 
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_catchfault_tail_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfault_tail_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/SEH/catchfault_tail_il_d.ilproj
index f4f6541e07c286..b240fa535078bb 100644
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfault_tail_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfault_tail_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfault_tail_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/SEH/catchfault_tail_il_r.ilproj
index f2827982763c85..2d986eaabfb954 100644
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfault_tail_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfault_tail_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally.cs b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally.cs
index 8c4f1b7d869067..1020aec0c74481 100644
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally.cs
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_catchfinally_SEH_cs
 {
-    internal class Test
+    public class Test
     {
         private static bool s_globalFlag = false;
 
@@ -83,7 +84,8 @@ private static bool TestTryFinally(int recurseLevel)
             return recurseLevel == 0;
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             try
             {
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_d.csproj b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_d.csproj
index cde5b25efae126..0b14296c45686c 100644
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_d.csproj
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_do.csproj b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_do.csproj
index 6c3eda03012cc6..a55844ea464aec 100644
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_do.csproj
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_ind.il b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_ind.il
index d1c25733fe16d3..671b1e34db678a 100644
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_ind.il
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_ind.il
@@ -16,9 +16,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {15FE650F-7944-4B46-86D7-2ECCFDC924C2}
-.namespace JitTest
+.namespace JitTest_catchfinally_ind_SEH_il
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends ['mscorlib']System.Object
   {
     .field private static bool globalFlag
@@ -32,9 +32,9 @@
                method bool *(int32) FTN1,
                method bool *(int32) FTN2)
                
-        		ldftn      bool JitTest.Test::TestTryFinally(int32)
+        		ldftn      bool JitTest_catchfinally_ind_SEH_il.Test::TestTryFinally(int32)
         		stloc.2
-        		ldftn      bool JitTest.Test::TestTryCatch(int32)
+        		ldftn      bool JitTest_catchfinally_ind_SEH_il.Test::TestTryCatch(int32)
         		stloc.3
         		
       IL_0000:  ldarg.0
@@ -43,11 +43,11 @@
 
       .try
       {
-        IL_0004:  ldsfld     bool JitTest.Test::globalFlag
+        IL_0004:  ldsfld     bool JitTest_catchfinally_ind_SEH_il.Test::globalFlag
         IL_0009:  ldc.i4.0
         IL_000a:  ceq
         IL_000c:  dup
-        IL_000d:  stsfld     bool JitTest.Test::globalFlag
+        IL_000d:  stsfld     bool JitTest_catchfinally_ind_SEH_il.Test::globalFlag
         IL_0012:  brfalse.s  IL_001f
 
         IL_0014:  ldarg.0
@@ -102,9 +102,9 @@
                method bool *(int32) FTN1,
                method bool *(int32) FTN2)
                
-        		ldftn      bool JitTest.Test::TestTryFinally(int32)
+        		ldftn      bool JitTest_catchfinally_ind_SEH_il.Test::TestTryFinally(int32)
         		stloc	FTN1
-        		ldftn      bool JitTest.Test::TestTryCatch(int32)
+        		ldftn      bool JitTest_catchfinally_ind_SEH_il.Test::TestTryCatch(int32)
         		stloc	FTN2
         		
       IL_0000:  ldarg.0
@@ -119,11 +119,11 @@
         IL_0007:  stloc.1
         .try
         {
-          IL_0008:  ldsfld     bool JitTest.Test::globalFlag
+          IL_0008:  ldsfld     bool JitTest_catchfinally_ind_SEH_il.Test::globalFlag
           IL_000d:  ldc.i4.0
           IL_000e:  ceq
           IL_0010:  dup
-          IL_0011:  stsfld     bool JitTest.Test::globalFlag
+          IL_0011:  stsfld     bool JitTest_catchfinally_ind_SEH_il.Test::globalFlag
           IL_0016:  brfalse.s  IL_0023
 
           IL_0018:  ldarg.0
@@ -180,7 +180,7 @@
       IL_0055:  ret
     } // end of method 'Test::TestTryFinally'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -193,11 +193,11 @@
       .try
       {
         IL_0000:  ldc.i4.s   15
-        IL_0002:  call       bool JitTest.Test::TestTryCatch(int32)
+        IL_0002:  call       bool JitTest_catchfinally_ind_SEH_il.Test::TestTryCatch(int32)
         IL_0007:  brtrue.s   IL_0012
 
         IL_0009:  ldc.i4.s   18
-        IL_000b:  call       bool JitTest.Test::TestTryCatch(int32)
+        IL_000b:  call       bool JitTest_catchfinally_ind_SEH_il.Test::TestTryCatch(int32)
         IL_0010:  brtrue.s   IL_0020
 
         IL_0012:  ldstr      "try...catch test failed."
@@ -207,11 +207,11 @@
         IL_001e:  leave.s    IL_005f
 
         IL_0020:  ldc.i4.s   19
-        IL_0022:  call       bool JitTest.Test::TestTryFinally(int32)
+        IL_0022:  call       bool JitTest_catchfinally_ind_SEH_il.Test::TestTryFinally(int32)
         IL_0027:  brtrue.s   IL_0032
 
         IL_0029:  ldc.i4.s   12
-        IL_002b:  call       bool JitTest.Test::TestTryFinally(int32)
+        IL_002b:  call       bool JitTest_catchfinally_ind_SEH_il.Test::TestTryFinally(int32)
         IL_0030:  brtrue.s   IL_0040
 
         IL_0032:  ldstr      "try...finally test failed."
@@ -249,7 +249,7 @@
       // Code size       7 (0x7)
       .maxstack  8
       IL_0000:  ldc.i4.0
-      IL_0001:  stsfld     bool JitTest.Test::globalFlag
+      IL_0001:  stsfld     bool JitTest_catchfinally_ind_SEH_il.Test::globalFlag
       IL_0006:  ret
     } // end of method 'Test::.cctor'
 
@@ -265,6 +265,6 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_catchfinally_ind_SEH_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_ind_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_ind_il_d.ilproj
index c893fef79b073d..8e730207c6f36e 100644
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_ind_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_ind_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_ind_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_ind_il_r.ilproj
index 04078bcb1a2653..3462692e205c6c 100644
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_ind_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_ind_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmp.il b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmp.il
index 9d58b5797f1035..277174aa88d6e5 100644
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmp.il
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmp.il
@@ -16,9 +16,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {CCB52291-4072-427C-8C14-2780C164EB2B}
-.namespace JitTest
+.namespace JitTest_catchfinally_jmp_il
 {
-  .class private auto ansi Test1
+  .class public auto ansi Test1
          extends ['mscorlib']System.Object
   {
     .field private static bool globalFlag
@@ -36,17 +36,17 @@
 
       .try
       {
-        IL_0004:  ldsfld     bool JitTest.Test1::globalFlag
+        IL_0004:  ldsfld     bool JitTest_catchfinally_jmp_il.Test1::globalFlag
         IL_0009:  ldc.i4.0
         IL_000a:  ceq
         IL_000c:  dup
-        IL_000d:  stsfld     bool JitTest.Test1::globalFlag
+        IL_000d:  stsfld     bool JitTest_catchfinally_jmp_il.Test1::globalFlag
         IL_0012:  brfalse.s  IL_001f
 
         IL_0014:  ldarg.0
         IL_0015:  ldc.i4.2
         IL_0016:  sub
-        IL_0017:  call       bool JitTest.Test1::TestTryCatch(int32)
+        IL_0017:  call       bool JitTest_catchfinally_jmp_il.Test1::TestTryCatch(int32)
         IL_001c:  stloc.1
         IL_001d:  leave.s    IL_0046
 
@@ -66,7 +66,7 @@
       {
         IL_0035:  pop
         IL_0036:  ldarg.0
-        IL_0037:  call       bool JitTest.Test1::Test(int32)
+        IL_0037:  call       bool JitTest_catchfinally_jmp_il.Test1::Test(int32)
         IL_003c:  stloc.1
         IL_003d:  leave.s    IL_0046
 
@@ -102,17 +102,17 @@
         IL_0007:  stloc.1
         .try
         {
-          IL_0008:  ldsfld     bool JitTest.Test1::globalFlag
+          IL_0008:  ldsfld     bool JitTest_catchfinally_jmp_il.Test1::globalFlag
           IL_000d:  ldc.i4.0
           IL_000e:  ceq
           IL_0010:  dup
-          IL_0011:  stsfld     bool JitTest.Test1::globalFlag
+          IL_0011:  stsfld     bool JitTest_catchfinally_jmp_il.Test1::globalFlag
           IL_0016:  brfalse.s  IL_0023
 
           IL_0018:  ldarg.0
           IL_0019:  ldc.i4.2
           IL_001a:  sub
-          IL_001b:  call       bool JitTest.Test1::Test(int32)
+          IL_001b:  call       bool JitTest_catchfinally_jmp_il.Test1::Test(int32)
           IL_0020:  stloc.3
           IL_0021:  leave.s    IL_0054
 
@@ -136,7 +136,7 @@
           IL_003c:  brfalse.s  IL_0045
 
           IL_003e:  ldarg.0
-          IL_003f:  call       bool JitTest.Test1::TestTryCatch(int32)
+          IL_003f:  call       bool JitTest_catchfinally_jmp_il.Test1::TestTryCatch(int32)
           IL_0044:  stloc.0
           IL_0045:  endfinally
         }  // end handler
@@ -167,17 +167,17 @@
       // Code size       36 (0x24)
       .maxstack  2
       .locals (bool V_0)
-  			ldsfld     bool JitTest.Test1::globalFlag2
+  			ldsfld     bool JitTest_catchfinally_jmp_il.Test1::globalFlag2
   			ldc.i4.0
   			ceq
   			dup
-  			stsfld     bool JitTest.Test1::globalFlag2
+  			stsfld     bool JitTest_catchfinally_jmp_il.Test1::globalFlag2
   			brfalse.s  IL_0019
-  			jmp   bool JitTest.Test1::TestTryCatch(int32)
-  IL_0019: 	jmp   bool JitTest.Test1::TestTryFinally(int32)
+  			jmp   bool JitTest_catchfinally_jmp_il.Test1::TestTryCatch(int32)
+  IL_0019: 	jmp   bool JitTest_catchfinally_jmp_il.Test1::TestTryFinally(int32)
     } // end of method 'Test1::Test'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -190,11 +190,11 @@
       .try
       {
         IL_0000:  ldc.i4.s   15
-        IL_0002:  call       bool JitTest.Test1::TestTryCatch(int32)
+        IL_0002:  call       bool JitTest_catchfinally_jmp_il.Test1::TestTryCatch(int32)
         IL_0007:  brtrue.s   IL_0012
 
         IL_0009:  ldc.i4.s   18
-        IL_000b:  call       bool JitTest.Test1::TestTryCatch(int32)
+        IL_000b:  call       bool JitTest_catchfinally_jmp_il.Test1::TestTryCatch(int32)
         IL_0010:  brtrue.s   IL_0020
 
         IL_0012:  ldstr      "try...catch test failed."
@@ -204,11 +204,11 @@
         IL_001e:  leave.s    IL_005f
 
         IL_0020:  ldc.i4.s   19
-        IL_0022:  call       bool JitTest.Test1::TestTryFinally(int32)
+        IL_0022:  call       bool JitTest_catchfinally_jmp_il.Test1::TestTryFinally(int32)
         IL_0027:  brtrue.s   IL_0032
 
         IL_0029:  ldc.i4.s   12
-        IL_002b:  call       bool JitTest.Test1::TestTryFinally(int32)
+        IL_002b:  call       bool JitTest_catchfinally_jmp_il.Test1::TestTryFinally(int32)
         IL_0030:  brtrue.s   IL_0040
 
         IL_0032:  ldstr      "try...finally test failed."
@@ -246,9 +246,9 @@
       // Code size       13 (0xd)
       .maxstack  8
       IL_0000:  ldc.i4.0
-      IL_0001:  stsfld     bool JitTest.Test1::globalFlag
+      IL_0001:  stsfld     bool JitTest_catchfinally_jmp_il.Test1::globalFlag
       IL_0006:  ldc.i4.1
-      IL_0007:  stsfld     bool JitTest.Test1::globalFlag2
+      IL_0007:  stsfld     bool JitTest_catchfinally_jmp_il.Test1::globalFlag2
       IL_000c:  ret
     } // end of method 'Test1::.cctor'
 
@@ -264,6 +264,6 @@
 
   } // end of class 'Test1'
 
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_catchfinally_jmp_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmp_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmp_il_d.ilproj
index f5134e078e8315..7cdebfed27dfc8 100644
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmp_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmp_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmp_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmp_il_r.ilproj
index f46e0cf4ec508b..84e316caa6392a 100644
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmp_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmp_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmpind.il b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmpind.il
index 421bbf43492ed6..7049cd2ec466a2 100644
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmpind.il
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmpind.il
@@ -16,9 +16,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {CCB52291-4072-427C-8C14-2780C164EB2B}
-.namespace JitTest
+.namespace JitTest_catchfinally_jmpind_il
 {
-  .class private auto ansi Test1
+  .class public auto ansi Test1
          extends ['mscorlib']System.Object
   {
     .field private static bool globalFlag
@@ -36,17 +36,17 @@
 
       .try
       {
-        IL_0004:  ldsfld     bool JitTest.Test1::globalFlag
+        IL_0004:  ldsfld     bool JitTest_catchfinally_jmpind_il.Test1::globalFlag
         IL_0009:  ldc.i4.0
         IL_000a:  ceq
         IL_000c:  dup
-        IL_000d:  stsfld     bool JitTest.Test1::globalFlag
+        IL_000d:  stsfld     bool JitTest_catchfinally_jmpind_il.Test1::globalFlag
         IL_0012:  brfalse.s  IL_001f
 
         IL_0014:  ldarg.0
         IL_0015:  ldc.i4.2
         IL_0016:  sub
-        IL_0017:  call       bool JitTest.Test1::TestTryCatch(int32)
+        IL_0017:  call       bool JitTest_catchfinally_jmpind_il.Test1::TestTryCatch(int32)
         IL_001c:  stloc.1
         IL_001d:  leave.s    IL_0046
 
@@ -66,7 +66,7 @@
       {
         IL_0035:  pop
         IL_0036:  ldarg.0
-        IL_0037:  call       bool JitTest.Test1::Test(int32)
+        IL_0037:  call       bool JitTest_catchfinally_jmpind_il.Test1::Test(int32)
         IL_003c:  stloc.1
         IL_003d:  leave.s    IL_0046
 
@@ -102,17 +102,17 @@
         IL_0007:  stloc.1
         .try
         {
-          IL_0008:  ldsfld     bool JitTest.Test1::globalFlag
+          IL_0008:  ldsfld     bool JitTest_catchfinally_jmpind_il.Test1::globalFlag
           IL_000d:  ldc.i4.0
           IL_000e:  ceq
           IL_0010:  dup
-          IL_0011:  stsfld     bool JitTest.Test1::globalFlag
+          IL_0011:  stsfld     bool JitTest_catchfinally_jmpind_il.Test1::globalFlag
           IL_0016:  brfalse.s  IL_0023
 
           IL_0018:  ldarg.0
           IL_0019:  ldc.i4.2
           IL_001a:  sub
-          IL_001b:  call       bool JitTest.Test1::Test(int32)
+          IL_001b:  call       bool JitTest_catchfinally_jmpind_il.Test1::Test(int32)
           IL_0020:  stloc.3
           IL_0021:  leave.s    IL_0054
 
@@ -136,7 +136,7 @@
           IL_003c:  brfalse.s  IL_0045
 
           IL_003e:  ldarg.0
-          IL_003f:  call       bool JitTest.Test1::TestTryCatch(int32)
+          IL_003f:  call       bool JitTest_catchfinally_jmpind_il.Test1::TestTryCatch(int32)
           IL_0044:  stloc.0
           IL_0045:  endfinally
         }  // end handler
@@ -167,18 +167,18 @@
       // Code size       36 (0x24)
       .maxstack  2
       .locals (bool V_0)
-  			ldsfld     bool JitTest.Test1::globalFlag2
+  			ldsfld     bool JitTest_catchfinally_jmpind_il.Test1::globalFlag2
   			ldc.i4.0
   			ceq
   			dup
-  			stsfld     bool JitTest.Test1::globalFlag2
+  			stsfld     bool JitTest_catchfinally_jmpind_il.Test1::globalFlag2
   			brfalse.s  IL_0019
   			
-  			jmp   bool JitTest.Test1::TestTryCatch(int32)
-  IL_0019: 	jmp  bool JitTest.Test1::TestTryFinally(int32)
+  			jmp   bool JitTest_catchfinally_jmpind_il.Test1::TestTryCatch(int32)
+  IL_0019: 	jmp  bool JitTest_catchfinally_jmpind_il.Test1::TestTryFinally(int32)
     } // end of method 'Test1::Test'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -191,11 +191,11 @@
       .try
       {
         IL_0000:  ldc.i4.s   15
-        IL_0002:  call       bool JitTest.Test1::TestTryCatch(int32)
+        IL_0002:  call       bool JitTest_catchfinally_jmpind_il.Test1::TestTryCatch(int32)
         IL_0007:  brtrue.s   IL_0012
 
         IL_0009:  ldc.i4.s   18
-        IL_000b:  call       bool JitTest.Test1::TestTryCatch(int32)
+        IL_000b:  call       bool JitTest_catchfinally_jmpind_il.Test1::TestTryCatch(int32)
         IL_0010:  brtrue.s   IL_0020
 
         IL_0012:  ldstr      "try...catch test failed."
@@ -205,11 +205,11 @@
         IL_001e:  leave.s    IL_005f
 
         IL_0020:  ldc.i4.s   19
-        IL_0022:  call       bool JitTest.Test1::TestTryFinally(int32)
+        IL_0022:  call       bool JitTest_catchfinally_jmpind_il.Test1::TestTryFinally(int32)
         IL_0027:  brtrue.s   IL_0032
 
         IL_0029:  ldc.i4.s   12
-        IL_002b:  call       bool JitTest.Test1::TestTryFinally(int32)
+        IL_002b:  call       bool JitTest_catchfinally_jmpind_il.Test1::TestTryFinally(int32)
         IL_0030:  brtrue.s   IL_0040
 
         IL_0032:  ldstr      "try...finally test failed."
@@ -247,9 +247,9 @@
       // Code size       13 (0xd)
       .maxstack  8
       IL_0000:  ldc.i4.0
-      IL_0001:  stsfld     bool JitTest.Test1::globalFlag
+      IL_0001:  stsfld     bool JitTest_catchfinally_jmpind_il.Test1::globalFlag
       IL_0006:  ldc.i4.1
-      IL_0007:  stsfld     bool JitTest.Test1::globalFlag2
+      IL_0007:  stsfld     bool JitTest_catchfinally_jmpind_il.Test1::globalFlag2
       IL_000c:  ret
     } // end of method 'Test1::.cctor'
 
@@ -265,6 +265,6 @@
 
   } // end of class 'Test1'
 
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_catchfinally_jmpind_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmpind_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmpind_il_d.ilproj
index bcf24148538c0c..07d1426de66fa5 100644
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmpind_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmpind_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmpind_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmpind_il_r.ilproj
index b95fc458f4800c..5756507f72ab71 100644
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmpind_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmpind_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_r.csproj b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_r.csproj
index f5901e2f2c8f28..7869d0ba4bc10e 100644
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_r.csproj
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_ro.csproj b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_ro.csproj
index 26ca281e7d5c32..dbf86d2dab81c3 100644
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_ro.csproj
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_tail.cs b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_tail.cs
index cdd54b540a3917..941c347a482fbe 100644
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_tail.cs
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_tail.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_catchfinally_tail_cs
 {
-    internal class Test1
+    public class Test1
     {
         private static bool s_globalFlag = false,s_globalFlag2 = true;
 
@@ -91,7 +92,8 @@ private static bool Test(int recurseLevel)
                 return TestTryFinally(recurseLevel);
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             try
             {
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_tail.il b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_tail.il
index bcde1f2467b329..09e193a780bda1 100644
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_tail.il
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_tail.il
@@ -16,9 +16,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {CCB52291-4072-427C-8C14-2780C164EB2B}
-.namespace JitTest
+.namespace JitTest_catchfinally_tail_il
 {
-  .class private auto ansi Test1
+  .class public auto ansi Test1
          extends ['mscorlib']System.Object
   {
     .field private static bool globalFlag
@@ -36,17 +36,17 @@
 
       .try
       {
-        IL_0004:  ldsfld     bool JitTest.Test1::globalFlag
+        IL_0004:  ldsfld     bool JitTest_catchfinally_tail_il.Test1::globalFlag
         IL_0009:  ldc.i4.0
         IL_000a:  ceq
         IL_000c:  dup
-        IL_000d:  stsfld     bool JitTest.Test1::globalFlag
+        IL_000d:  stsfld     bool JitTest_catchfinally_tail_il.Test1::globalFlag
         IL_0012:  brfalse.s  IL_001f
 
         IL_0014:  ldarg.0
         IL_0015:  ldc.i4.2
         IL_0016:  sub
-        IL_0017:  call       bool JitTest.Test1::TestTryCatch(int32)
+        IL_0017:  call       bool JitTest_catchfinally_tail_il.Test1::TestTryCatch(int32)
         IL_001c:  stloc.1
         IL_001d:  leave.s    IL_0046
 
@@ -66,7 +66,7 @@
       {
         IL_0035:  pop
         IL_0036:  ldarg.0
-        IL_0037:  call       bool JitTest.Test1::Test(int32)
+        IL_0037:  call       bool JitTest_catchfinally_tail_il.Test1::Test(int32)
         IL_003c:  stloc.1
         IL_003d:  leave.s    IL_0046
 
@@ -102,17 +102,17 @@
         IL_0007:  stloc.1
         .try
         {
-          IL_0008:  ldsfld     bool JitTest.Test1::globalFlag
+          IL_0008:  ldsfld     bool JitTest_catchfinally_tail_il.Test1::globalFlag
           IL_000d:  ldc.i4.0
           IL_000e:  ceq
           IL_0010:  dup
-          IL_0011:  stsfld     bool JitTest.Test1::globalFlag
+          IL_0011:  stsfld     bool JitTest_catchfinally_tail_il.Test1::globalFlag
           IL_0016:  brfalse.s  IL_0023
 
           IL_0018:  ldarg.0
           IL_0019:  ldc.i4.2
           IL_001a:  sub
-          IL_001b:  call       bool JitTest.Test1::Test(int32)
+          IL_001b:  call       bool JitTest_catchfinally_tail_il.Test1::Test(int32)
           IL_0020:  stloc.3
           IL_0021:  leave.s    IL_0054
 
@@ -136,7 +136,7 @@
           IL_003c:  brfalse.s  IL_0045
 
           IL_003e:  ldarg.0
-          IL_003f:  call       bool JitTest.Test1::TestTryCatch(int32)
+          IL_003f:  call       bool JitTest_catchfinally_tail_il.Test1::TestTryCatch(int32)
           IL_0044:  stloc.0
           IL_0045:  endfinally
         }  // end handler
@@ -167,23 +167,23 @@
       // Code size       36 (0x24)
       .maxstack  2
       .locals (bool V_0)
-      IL_0000:  ldsfld     bool JitTest.Test1::globalFlag2
+      IL_0000:  ldsfld     bool JitTest_catchfinally_tail_il.Test1::globalFlag2
       IL_0005:  ldc.i4.0
       IL_0006:  ceq
       IL_0008:  dup
-      IL_0009:  stsfld     bool JitTest.Test1::globalFlag2
+      IL_0009:  stsfld     bool JitTest_catchfinally_tail_il.Test1::globalFlag2
       IL_000e:  brfalse.s  IL_0019
 
       IL_0010:  ldarg.0
-      			tail. call       bool JitTest.Test1::TestTryCatch(int32)
+      			tail. call       bool JitTest_catchfinally_tail_il.Test1::TestTryCatch(int32)
       			ret
 
       IL_0019:  ldarg.0
-      			tail. call       bool JitTest.Test1::TestTryFinally(int32)
+      			tail. call       bool JitTest_catchfinally_tail_il.Test1::TestTryFinally(int32)
       			ret
     } // end of method 'Test1::Test'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -196,11 +196,11 @@
       .try
       {
         IL_0000:  ldc.i4.s   15
-        IL_0002:  call       bool JitTest.Test1::TestTryCatch(int32)
+        IL_0002:  call       bool JitTest_catchfinally_tail_il.Test1::TestTryCatch(int32)
         IL_0007:  brtrue.s   IL_0012
 
         IL_0009:  ldc.i4.s   18
-        IL_000b:  call       bool JitTest.Test1::TestTryCatch(int32)
+        IL_000b:  call       bool JitTest_catchfinally_tail_il.Test1::TestTryCatch(int32)
         IL_0010:  brtrue.s   IL_0020
 
         IL_0012:  ldstr      "try...catch test failed."
@@ -210,11 +210,11 @@
         IL_001e:  leave.s    IL_005f
 
         IL_0020:  ldc.i4.s   19
-        IL_0022:  call       bool JitTest.Test1::TestTryFinally(int32)
+        IL_0022:  call       bool JitTest_catchfinally_tail_il.Test1::TestTryFinally(int32)
         IL_0027:  brtrue.s   IL_0032
 
         IL_0029:  ldc.i4.s   12
-        IL_002b:  call       bool JitTest.Test1::TestTryFinally(int32)
+        IL_002b:  call       bool JitTest_catchfinally_tail_il.Test1::TestTryFinally(int32)
         IL_0030:  brtrue.s   IL_0040
 
         IL_0032:  ldstr      "try...finally test failed."
@@ -252,9 +252,9 @@
       // Code size       13 (0xd)
       .maxstack  8
       IL_0000:  ldc.i4.0
-      IL_0001:  stsfld     bool JitTest.Test1::globalFlag
+      IL_0001:  stsfld     bool JitTest_catchfinally_tail_il.Test1::globalFlag
       IL_0006:  ldc.i4.1
-      IL_0007:  stsfld     bool JitTest.Test1::globalFlag2
+      IL_0007:  stsfld     bool JitTest_catchfinally_tail_il.Test1::globalFlag2
       IL_000c:  ret
     } // end of method 'Test1::.cctor'
 
@@ -270,6 +270,6 @@
 
   } // end of class 'Test1'
 
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_catchfinally_tail_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_tail_d.csproj b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_tail_d.csproj
index 3f608fe412503e..49a1509c8e4d1e 100644
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_tail_d.csproj
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_tail_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_tail_do.csproj b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_tail_do.csproj
index b15b7d6da6d9e8..52ce19644d06ea 100644
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_tail_do.csproj
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_tail_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_tail_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_tail_il_d.ilproj
index 11fd2d4a4d6434..f6403ea25c76cc 100644
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_tail_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_tail_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_tail_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_tail_il_r.ilproj
index 3fae3697796ef9..caabfa4864050a 100644
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_tail_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_tail_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_tail_r.csproj b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_tail_r.csproj
index 4864930bad7867..0f084f4e648b10 100644
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_tail_r.csproj
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_tail_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_tail_ro.csproj b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_tail_ro.csproj
index e2090b482449d9..4b07443da60582 100644
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_tail_ro.csproj
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_tail_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/Invoke/callvirt/test1.cs b/src/tests/JIT/Methodical/Invoke/callvirt/test1.cs
index db746405139336..cfe1cffc4ab370 100644
--- a/src/tests/JIT/Methodical/Invoke/callvirt/test1.cs
+++ b/src/tests/JIT/Methodical/Invoke/callvirt/test1.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace Test
+namespace Test_test1_cs
 {
-    internal class Base
+    public class Base
     {
         public double m;
         public Base() { m = 1.0; }
@@ -19,7 +20,7 @@ public virtual Base[] Clone(int numOfCopies)
         }
     }
 
-    internal class Derived : Base
+    public class Derived : Base
     {
         public Derived() { m = 2.0; }
 
@@ -31,7 +32,8 @@ public override Base[] Clone(int numOfCopies)
             return arr;
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             Base bas = new Derived();
             bas = bas.Clone(11)[10];
diff --git a/src/tests/JIT/Methodical/Invoke/callvirt/test1.il b/src/tests/JIT/Methodical/Invoke/callvirt/test1.il
index 91d85b1450ca5a..21a5acbbadd41f 100644
--- a/src/tests/JIT/Methodical/Invoke/callvirt/test1.il
+++ b/src/tests/JIT/Methodical/Invoke/callvirt/test1.il
@@ -21,7 +21,7 @@
 }
 .assembly extern xunit.core {}
 // MVID: {0D28B100-FF93-4AA9-8EDA-33F3D5D2A136}
-.namespace Test
+.namespace Test_test1_il
 {
   .class private auto ansi Base extends ['mscorlib']System.Object
   {
@@ -35,21 +35,21 @@
       IL_0001:  call       instance void ['mscorlib']System.Object::.ctor()
       IL_0006:  ldarg.0
       IL_0007:  ldc.i4.1
-      IL_0008:  stfld      int32 Test.Base::m
+      IL_0008:  stfld      int32 Test_test1_il.Base::m
       IL_000d:  ret
       IL_000e:  
     } // end of method 'Base::.ctor'
 
     .method public hidebysig newslot virtual 
-            instance class Test.Base[]  Clone(int32 numOfCopies) il managed
+            instance class Test_test1_il.Base[]  Clone(int32 numOfCopies) il managed
     {
       // Code size       33 (0x21)
       .maxstack  3
-      .locals (class Test.Base[] V_0,
+      .locals (class Test_test1_il.Base[] V_0,
                int32 V_1,
-               class Test.Base[] V_2)
+               class Test_test1_il.Base[] V_2)
       IL_0000:  ldarg.1
-      IL_0001:  newarr     Test.Base
+      IL_0001:  newarr     Test_test1_il.Base
       IL_0006:  stloc.0
       IL_0007:  ldc.i4.0
       IL_0008:  stloc.1
@@ -57,7 +57,7 @@
 
       IL_000b:  ldloc.0
       IL_000c:  ldloc.1
-      IL_000d:  newobj     instance void Test.Base::.ctor()
+      IL_000d:  newobj     instance void Test_test1_il.Base::.ctor()
       IL_0012:  stelem.ref
       IL_0013:  ldloc.1
       IL_0014:  ldc.i4.1
@@ -78,7 +78,7 @@
 
   } // end of class 'Base'
 
-  .class private auto ansi Derived extends Test.Base
+  .class public auto ansi Derived extends Test_test1_il.Base
   {
     .method public hidebysig specialname rtspecialname 
             instance void .ctor() il managed
@@ -86,24 +86,24 @@
       // Code size       14 (0xe)
       .maxstack  8
       IL_0000:  ldarg.0
-      IL_0001:  call       instance void Test.Base::.ctor()
+      IL_0001:  call       instance void Test_test1_il.Base::.ctor()
       IL_0006:  ldarg.0
       IL_0007:  ldc.i4.2
-      IL_0008:  stfld      int32 Test.Base::m
+      IL_0008:  stfld      int32 Test_test1_il.Base::m
       IL_000d:  ret
       IL_000e:  
     } // end of method 'Derived::.ctor'
 
-    .method public hidebysig virtual instance class Test.Base[] 
+    .method public hidebysig virtual instance class Test_test1_il.Base[] 
             Clone(int32 numOfCopies) il managed
     {
       // Code size       33 (0x21)
       .maxstack  3
-      .locals (class Test.Derived[] V_0,
+      .locals (class Test_test1_il.Derived[] V_0,
                int32 V_1,
-               class Test.Base[] V_2)
+               class Test_test1_il.Base[] V_2)
       IL_0000:  ldarg.1
-      IL_0001:  newarr     Test.Derived
+      IL_0001:  newarr     Test_test1_il.Derived
       IL_0006:  stloc.0
       IL_0007:  ldc.i4.0
       IL_0008:  stloc.1
@@ -111,7 +111,7 @@
 
       IL_000b:  ldloc.0
       IL_000c:  ldloc.1
-      IL_000d:  newobj     instance void Test.Derived::.ctor()
+      IL_000d:  newobj     instance void Test_test1_il.Derived::.ctor()
       IL_0012:  stelem.ref
       IL_0013:  ldloc.1
       IL_0014:  ldc.i4.1
@@ -130,7 +130,7 @@
       IL_0021:  
     } // end of method 'Derived::Clone'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -139,19 +139,19 @@
       .entrypoint
       // Code size       99 (0x63)
       .maxstack  2
-      .locals (class Test.Base V_0,
-               class Test.Derived V_1,
+      .locals (class Test_test1_il.Base V_0,
+               class Test_test1_il.Derived V_1,
                int32 V_2)
-      IL_0000:  newobj     instance void Test.Derived::.ctor()
+      IL_0000:  newobj     instance void Test_test1_il.Derived::.ctor()
       IL_0005:  stloc.0
       IL_0006:  ldloc.0
       IL_0007:  ldc.i4.s   11
-      IL_0009:  callvirt   instance class Test.Base[] Test.Base::Clone(int32)
+      IL_0009:  callvirt   instance class Test_test1_il.Base[] Test_test1_il.Base::Clone(int32)
       IL_000e:  ldc.i4.s   10
       IL_0010:  ldelem.ref
       IL_0011:  stloc.0
       IL_0012:  ldloc.0
-      IL_0013:  ldfld      int32 Test.Base::m
+      IL_0013:  ldfld      int32 Test_test1_il.Base::m
       IL_0018:  ldc.i4.2
       IL_0019:  beq.s      IL_0029
 
@@ -162,16 +162,16 @@
       IL_0027:  br.s       IL_0061
 
       IL_0029:  ldloc.0
-      IL_002a:  castclass  Test.Derived
+      IL_002a:  castclass  Test_test1_il.Derived
       IL_002f:  stloc.1
       IL_0030:  ldloc.1
       IL_0031:  ldc.i4.s   11
-      IL_0033:  callvirt   instance class Test.Base[] Test.Base::Clone(int32)
+      IL_0033:  callvirt   instance class Test_test1_il.Base[] Test_test1_il.Base::Clone(int32)
       IL_0038:  ldc.i4.s   10
       IL_003a:  ldelem.ref
       IL_003b:  stloc.0
       IL_003c:  ldloc.0
-      IL_003d:  ldfld      int32 Test.Base::m
+      IL_003d:  ldfld      int32 Test_test1_il.Base::m
       IL_0042:  ldc.i4.2
       IL_0043:  beq.s      IL_0053
 
@@ -194,6 +194,6 @@
 
   } // end of class 'Derived'
 
-} // end of namespace 'Test'
+} // end of namespace 'Test_test1_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/Invoke/callvirt/test1_d.csproj b/src/tests/JIT/Methodical/Invoke/callvirt/test1_d.csproj
index 4162a7e21dbda9..2c61b708a51322 100644
--- a/src/tests/JIT/Methodical/Invoke/callvirt/test1_d.csproj
+++ b/src/tests/JIT/Methodical/Invoke/callvirt/test1_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/callvirt/test1_do.csproj b/src/tests/JIT/Methodical/Invoke/callvirt/test1_do.csproj
index 4f79e1520993e3..84f675709b5ec9 100644
--- a/src/tests/JIT/Methodical/Invoke/callvirt/test1_do.csproj
+++ b/src/tests/JIT/Methodical/Invoke/callvirt/test1_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/callvirt/test1_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/callvirt/test1_il_d.ilproj
index 40f8a4d89574b4..fc0cef7fa7aba7 100644
--- a/src/tests/JIT/Methodical/Invoke/callvirt/test1_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/callvirt/test1_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/callvirt/test1_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/callvirt/test1_il_r.ilproj
index d14fcf0b4fd322..814b17a9df6f71 100644
--- a/src/tests/JIT/Methodical/Invoke/callvirt/test1_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/callvirt/test1_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/callvirt/test1_r.csproj b/src/tests/JIT/Methodical/Invoke/callvirt/test1_r.csproj
index d32c9a15172427..35cc80ba00d7ca 100644
--- a/src/tests/JIT/Methodical/Invoke/callvirt/test1_r.csproj
+++ b/src/tests/JIT/Methodical/Invoke/callvirt/test1_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/callvirt/test1_ro.csproj b/src/tests/JIT/Methodical/Invoke/callvirt/test1_ro.csproj
index 1d9ee3989374f4..1f9e49aa62e21d 100644
--- a/src/tests/JIT/Methodical/Invoke/callvirt/test1_ro.csproj
+++ b/src/tests/JIT/Methodical/Invoke/callvirt/test1_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/callvirt/test2.il b/src/tests/JIT/Methodical/Invoke/callvirt/test2.il
index 7248f4d30dec5c..3f7ffe40724cf7 100644
--- a/src/tests/JIT/Methodical/Invoke/callvirt/test2.il
+++ b/src/tests/JIT/Methodical/Invoke/callvirt/test2.il
@@ -21,7 +21,7 @@
 }
 .assembly extern xunit.core {}
 // MVID: {A1B2C1C6-25C2-4DB7-AE55-41CA3A00F290}
-.namespace Test
+.namespace Test_test2_il
 {
   .class private auto ansi Base extends ['mscorlib']System.Object
   {
@@ -35,21 +35,21 @@
       IL_0001:  call       instance void ['mscorlib']System.Object::.ctor()
       IL_0006:  ldarg.0
       IL_0007:  ldc.i4.1
-      IL_0008:  stfld      int32 Test.Base::m
+      IL_0008:  stfld      int32 Test_test2_il.Base::m
       IL_000d:  ret
       IL_000e:  
     } // end of method 'Base::.ctor'
 
     .method public hidebysig newslot virtual 
-            instance class Test.Base[]  Clone(int32 numOfCopies) il managed
+            instance class Test_test2_il.Base[]  Clone(int32 numOfCopies) il managed
     {
       // Code size       33 (0x21)
       .maxstack  3
-      .locals (class Test.Base[] V_0,
+      .locals (class Test_test2_il.Base[] V_0,
                int32 V_1,
-               class Test.Base[] V_2)
+               class Test_test2_il.Base[] V_2)
       IL_0000:  ldarg.1
-      IL_0001:  newarr     Test.Base
+      IL_0001:  newarr     Test_test2_il.Base
       IL_0006:  stloc.0
       IL_0007:  ldc.i4.0
       IL_0008:  stloc.1
@@ -57,7 +57,7 @@
 
       IL_000b:  ldloc.0
       IL_000c:  ldloc.1
-      IL_000d:  newobj     instance void Test.Base::.ctor()
+      IL_000d:  newobj     instance void Test_test2_il.Base::.ctor()
       IL_0012:  stelem.ref
       IL_0013:  ldloc.1
       IL_0014:  ldc.i4.1
@@ -78,7 +78,7 @@
 
   } // end of class 'Base'
 
-  .class private auto ansi Derived extends Test.Base
+  .class public auto ansi Derived extends Test_test2_il.Base
   {
     .method public hidebysig specialname rtspecialname 
             instance void .ctor() il managed
@@ -86,24 +86,24 @@
       // Code size       14 (0xe)
       .maxstack  8
       IL_0000:  ldarg.0
-      IL_0001:  call       instance void Test.Base::.ctor()
+      IL_0001:  call       instance void Test_test2_il.Base::.ctor()
       IL_0006:  ldarg.0
       IL_0007:  ldc.i4.2
-      IL_0008:  stfld      int32 Test.Base::m
+      IL_0008:  stfld      int32 Test_test2_il.Base::m
       IL_000d:  ret
       IL_000e:  
     } // end of method 'Derived::.ctor'
 
-    .method public hidebysig virtual instance class Test.Base[] 
+    .method public hidebysig virtual instance class Test_test2_il.Base[] 
             Clone(int32 numOfCopies) il managed
     {
       // Code size       33 (0x21)
       .maxstack  3
-      .locals (class Test.Derived[] V_0,
+      .locals (class Test_test2_il.Derived[] V_0,
                int32 V_1,
-               class Test.Base[] V_2)
+               class Test_test2_il.Base[] V_2)
       IL_0000:  ldarg.1
-      IL_0001:  newarr     Test.Derived
+      IL_0001:  newarr     Test_test2_il.Derived
       IL_0006:  stloc.0
       IL_0007:  ldc.i4.0
       IL_0008:  stloc.1
@@ -111,7 +111,7 @@
 
       IL_000b:  ldloc.0
       IL_000c:  ldloc.1
-      IL_000d:  newobj     instance void Test.Derived::.ctor()
+      IL_000d:  newobj     instance void Test_test2_il.Derived::.ctor()
       IL_0012:  stelem.ref
       IL_0013:  ldloc.1
       IL_0014:  ldc.i4.1
@@ -130,7 +130,7 @@
       IL_0021:  
     } // end of method 'Derived::Clone'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -139,19 +139,19 @@
       .entrypoint
       // Code size       99 (0x63)
       .maxstack  2
-      .locals (class Test.Derived V_0,
-               class Test.Base V_1,
+      .locals (class Test_test2_il.Derived V_0,
+               class Test_test2_il.Base V_1,
                int32 V_2)
-      IL_0000:  newobj     instance void Test.Derived::.ctor()
+      IL_0000:  newobj     instance void Test_test2_il.Derived::.ctor()
       IL_0005:  stloc.0
       IL_0006:  ldloc.0
       IL_0007:  ldc.i4.s   11
-      IL_0009:  call   instance class Test.Base[] Test.Base::Clone(int32)
+      IL_0009:  call   instance class Test_test2_il.Base[] Test_test2_il.Base::Clone(int32)
       IL_000e:  ldc.i4.s   10
       IL_0010:  ldelem.ref
       IL_0011:  stloc.0
       IL_0012:  ldloc.0
-      IL_0013:  ldfld      int32 Test.Base::m
+      IL_0013:  ldfld      int32 Test_test2_il.Base::m
       IL_0018:  ldc.i4.1
       IL_0019:  beq.s      IL_0029
 
@@ -162,16 +162,16 @@
       IL_0027:  br.s       IL_0061
 
       IL_0029:  ldloc.0
-      IL_002a:  castclass  Test.Base
+      IL_002a:  castclass  Test_test2_il.Base
       IL_002f:  stloc.1
       IL_0030:  ldloc.1
       IL_0031:  ldc.i4.s   11
-      IL_0033:  call		instance class Test.Base[] Test.Base::Clone(int32)
+      IL_0033:  call		instance class Test_test2_il.Base[] Test_test2_il.Base::Clone(int32)
       IL_0038:  ldc.i4.s   10
       IL_003a:  ldelem.ref
       IL_003b:  stloc.0
       IL_003c:  ldloc.0
-      IL_003d:  ldfld      int32 Test.Base::m
+      IL_003d:  ldfld      int32 Test_test2_il.Base::m
       IL_0042:  ldc.i4.1
       IL_0043:  beq.s      IL_0053
 
@@ -194,6 +194,6 @@
 
   } // end of class 'Derived'
 
-} // end of namespace 'Test'
+} // end of namespace 'Test_test2_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/Invoke/callvirt/test2_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/callvirt/test2_il_d.ilproj
index a35a0a0f4e1087..373632372f3c98 100644
--- a/src/tests/JIT/Methodical/Invoke/callvirt/test2_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/callvirt/test2_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/callvirt/test2_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/callvirt/test2_il_r.ilproj
index 05c5e1071bbe71..80f092e3de6f15 100644
--- a/src/tests/JIT/Methodical/Invoke/callvirt/test2_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/callvirt/test2_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/callvirt/test3.il b/src/tests/JIT/Methodical/Invoke/callvirt/test3.il
index 882d0901f45371..e721a1bdfd0365 100644
--- a/src/tests/JIT/Methodical/Invoke/callvirt/test3.il
+++ b/src/tests/JIT/Methodical/Invoke/callvirt/test3.il
@@ -23,7 +23,7 @@
 // MVID: {D9CB467A-BD94-4D87-BB6B-ABB1D4B12E50}
 .namespace Test
 {
-  .class private auto ansi Base extends ['mscorlib']System.Object
+  .class public auto ansi Base extends ['mscorlib']System.Object
   {
     .field public float64 m
     .method public hidebysig specialname rtspecialname 
@@ -76,7 +76,7 @@
       IL_0021:  
     } // end of method 'Base::Clone'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
diff --git a/src/tests/JIT/Methodical/Invoke/callvirt/test3_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/callvirt/test3_il_d.ilproj
index 26225373d254da..f54861b761e50a 100644
--- a/src/tests/JIT/Methodical/Invoke/callvirt/test3_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/callvirt/test3_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/callvirt/test3_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/callvirt/test3_il_r.ilproj
index 9a5fa8e3309e4e..a218259d10468e 100644
--- a/src/tests/JIT/Methodical/Invoke/callvirt/test3_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/callvirt/test3_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/ctor/val_cctor.il b/src/tests/JIT/Methodical/Invoke/ctor/val_cctor.il
index 174bbbb7ff796d..05dc0b3330e18a 100644
--- a/src/tests/JIT/Methodical/Invoke/ctor/val_cctor.il
+++ b/src/tests/JIT/Methodical/Invoke/ctor/val_cctor.il
@@ -21,9 +21,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {1C70E5EE-C023-4741-BFC0-A85E3927FB65}
-.namespace JitTest
+.namespace JitTest_val_cctor_il
 {
-  .class value private auto ansi sealed TestStruct
+  .class value public auto ansi sealed TestStruct
          extends ['mscorlib']System.ValueType
   {
     .field private int64 m_testParam
@@ -33,16 +33,16 @@
     {
       // Code size       46 (0x2e)
       .maxstack  3
-      .locals (value class JitTest.TestStruct V_0)
+      .locals (value class JitTest_val_cctor_il.TestStruct V_0)
       IL_0000:  ldarg.0
       IL_0001:  ldarg.1
-      IL_0002:  stfld      int64 JitTest.TestStruct::m_testParam
-      IL_0007:  ldsfld     int64 JitTest.TestStruct::m_sum
+      IL_0002:  stfld      int64 JitTest_val_cctor_il.TestStruct::m_testParam
+      IL_0007:  ldsfld     int64 JitTest_val_cctor_il.TestStruct::m_sum
       IL_000c:  ldarg.0
-      IL_000d:  ldfld      int64 JitTest.TestStruct::m_testParam
+      IL_000d:  ldfld      int64 JitTest_val_cctor_il.TestStruct::m_testParam
       IL_0012:  add
-      IL_0013:  stsfld     int64 JitTest.TestStruct::m_sum
-      IL_0018:  ldsfld     int64 JitTest.TestStruct::m_sum
+      IL_0013:  stsfld     int64 JitTest_val_cctor_il.TestStruct::m_sum
+      IL_0018:  ldsfld     int64 JitTest_val_cctor_il.TestStruct::m_sum
       IL_001d:  ldc.i4.s   100
       IL_001f:  conv.i8
       IL_0020:  bge.s      IL_002d
@@ -52,11 +52,11 @@
       IL_0025:  ldc.i4.1
       IL_0026:  conv.i8
       IL_0027:  add
-      IL_0028:  call       instance void JitTest.TestStruct::.ctor(unsigned int64)
+      IL_0028:  call       instance void JitTest_val_cctor_il.TestStruct::.ctor(unsigned int64)
       IL_002d:  ret
     } // end of method 'TestStruct::.ctor'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -65,15 +65,15 @@
       .entrypoint
       // Code size       66 (0x42)
       .maxstack  2
-      .locals (value class JitTest.TestStruct V_0,
+      .locals (value class JitTest_val_cctor_il.TestStruct V_0,
                int32 V_1)
       .try
       {
 //        IL_0000:  ldloca.s   V_0
 //        IL_0002:  ldc.i4.0
 //        IL_0003:  conv.i8
-//        IL_0004:  call       instance void JitTest.TestStruct::.ctor(unsigned int64)
-        IL_0009:  ldsfld     int64 JitTest.TestStruct::m_sum
+//        IL_0004:  call       instance void JitTest_val_cctor_il.TestStruct::.ctor(unsigned int64)
+        IL_0009:  ldsfld     int64 JitTest_val_cctor_il.TestStruct::m_sum
         IL_000e:  ldc.i4.s   105
         IL_0010:  conv.i8
         IL_0011:  beq.s      IL_0021
@@ -114,11 +114,11 @@
       .maxstack  8
       IL_0000:  ldc.i4.0
       IL_0001:  conv.i8
-      IL_0002:  stsfld     int64 JitTest.TestStruct::m_sum
+      IL_0002:  stsfld     int64 JitTest_val_cctor_il.TestStruct::m_sum
       
         		ldc.i4.0
         		conv.i8
-				newobj 	instance void JitTest.TestStruct::.ctor(unsigned int64)
+				newobj 	instance void JitTest_val_cctor_il.TestStruct::.ctor(unsigned int64)
       			pop
       			
       IL_0007:  ret
@@ -126,6 +126,6 @@
 
   } // end of class 'TestStruct'
 
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_val_cctor_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/Invoke/ctor/val_cctor_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/ctor/val_cctor_il_d.ilproj
index 18af4e08dbd198..1eb00865ab92ed 100644
--- a/src/tests/JIT/Methodical/Invoke/ctor/val_cctor_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/ctor/val_cctor_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/ctor/val_cctor_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/ctor/val_cctor_il_r.ilproj
index 88988ac13799ab..547d43b806d361 100644
--- a/src/tests/JIT/Methodical/Invoke/ctor/val_cctor_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/ctor/val_cctor_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/ctor/val_ctor.cs b/src/tests/JIT/Methodical/Invoke/ctor/val_ctor.cs
index 7c0a55d5eea533..1340acfbfcf7a4 100644
--- a/src/tests/JIT/Methodical/Invoke/ctor/val_ctor.cs
+++ b/src/tests/JIT/Methodical/Invoke/ctor/val_ctor.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_val_ctor_cs
 {
-    internal struct TestStruct
+    public struct TestStruct
     {
         private long _m_testParam;
         private static long s_m_sum = 0;
@@ -21,7 +22,8 @@ private TestStruct(ulong testParam)
             }
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             try
             {
diff --git a/src/tests/JIT/Methodical/Invoke/ctor/val_ctor_d.csproj b/src/tests/JIT/Methodical/Invoke/ctor/val_ctor_d.csproj
index 73a43f262ed2b4..170949d5fd7753 100644
--- a/src/tests/JIT/Methodical/Invoke/ctor/val_ctor_d.csproj
+++ b/src/tests/JIT/Methodical/Invoke/ctor/val_ctor_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/ctor/val_ctor_do.csproj b/src/tests/JIT/Methodical/Invoke/ctor/val_ctor_do.csproj
index 72146e9c4ecc30..af3e7148f21927 100644
--- a/src/tests/JIT/Methodical/Invoke/ctor/val_ctor_do.csproj
+++ b/src/tests/JIT/Methodical/Invoke/ctor/val_ctor_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/ctor/val_ctor_newobj.il b/src/tests/JIT/Methodical/Invoke/ctor/val_ctor_newobj.il
index baa17c131b61ab..c832373a990465 100644
--- a/src/tests/JIT/Methodical/Invoke/ctor/val_ctor_newobj.il
+++ b/src/tests/JIT/Methodical/Invoke/ctor/val_ctor_newobj.il
@@ -21,9 +21,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {B57C6031-B1F4-4BAC-A5DE-7943EA8B199E}
-.namespace JitTest
+.namespace JitTest_val_ctor_newobj_il
 {
-  .class value private auto ansi sealed TestStruct
+  .class value public auto ansi sealed TestStruct
          extends ['mscorlib']System.ValueType
   {
     .field private int64 m_testParam
@@ -35,13 +35,13 @@
       .maxstack  3
       IL_0000:  ldarg.0
       IL_0001:  ldarg.1
-      IL_0002:  stfld      int64 JitTest.TestStruct::m_testParam
-      IL_0007:  ldsfld     int64 JitTest.TestStruct::m_sum
+      IL_0002:  stfld      int64 JitTest_val_ctor_newobj_il.TestStruct::m_testParam
+      IL_0007:  ldsfld     int64 JitTest_val_ctor_newobj_il.TestStruct::m_sum
       IL_000c:  ldarg.0
-      IL_000d:  ldfld      int64 JitTest.TestStruct::m_testParam
+      IL_000d:  ldfld      int64 JitTest_val_ctor_newobj_il.TestStruct::m_testParam
       IL_0012:  add
-      IL_0013:  stsfld     int64 JitTest.TestStruct::m_sum
-      IL_0018:  ldsfld     int64 JitTest.TestStruct::m_sum
+      IL_0013:  stsfld     int64 JitTest_val_ctor_newobj_il.TestStruct::m_sum
+      IL_0018:  ldsfld     int64 JitTest_val_ctor_newobj_il.TestStruct::m_sum
       IL_001d:  ldc.i4.s   100
       IL_001f:  conv.i8
       IL_0020:  bge.s      IL_002d
@@ -51,12 +51,12 @@
       IL_0025:  ldc.i4.1
       IL_0026:  conv.i8
       IL_0027:  add
-      IL_0028:  newobj    instance void JitTest.TestStruct::.ctor(unsigned int64)
+      IL_0028:  newobj    instance void JitTest_val_ctor_newobj_il.TestStruct::.ctor(unsigned int64)
       			pop
       IL_002d:  ret
     } // end of method 'TestStruct::.ctor'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -70,9 +70,9 @@
       {
         IL_0002:  ldc.i4.0
         IL_0003:  conv.i8
-        IL_0004:  newobj       instance void JitTest.TestStruct::.ctor(unsigned int64)
+        IL_0004:  newobj       instance void JitTest_val_ctor_newobj_il.TestStruct::.ctor(unsigned int64)
         			pop
-        IL_0009:  ldsfld     int64 JitTest.TestStruct::m_sum
+        IL_0009:  ldsfld     int64 JitTest_val_ctor_newobj_il.TestStruct::m_sum
         IL_000e:  ldc.i4.s   105
         IL_0010:  conv.i8
         IL_0011:  beq.s      IL_0021
@@ -113,12 +113,12 @@
       .maxstack  8
       IL_0000:  ldc.i4.0
       IL_0001:  conv.i8
-      IL_0002:  stsfld     int64 JitTest.TestStruct::m_sum
+      IL_0002:  stsfld     int64 JitTest_val_ctor_newobj_il.TestStruct::m_sum
       IL_0007:  ret
     } // end of method 'TestStruct::.cctor'
 
   } // end of class 'TestStruct'
 
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_val_ctor_newobj_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/Invoke/ctor/val_ctor_newobj_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/ctor/val_ctor_newobj_il_d.ilproj
index a2f63886330a0f..e43dfcb9e40d8d 100644
--- a/src/tests/JIT/Methodical/Invoke/ctor/val_ctor_newobj_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/ctor/val_ctor_newobj_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/ctor/val_ctor_newobj_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/ctor/val_ctor_newobj_il_r.ilproj
index b0bc4241ee2b6f..d479dcd2ee547f 100644
--- a/src/tests/JIT/Methodical/Invoke/ctor/val_ctor_newobj_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/ctor/val_ctor_newobj_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/ctor/val_ctor_r.csproj b/src/tests/JIT/Methodical/Invoke/ctor/val_ctor_r.csproj
index c8e55989da9506..bea8e3ea840d6a 100644
--- a/src/tests/JIT/Methodical/Invoke/ctor/val_ctor_r.csproj
+++ b/src/tests/JIT/Methodical/Invoke/ctor/val_ctor_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/ctor/val_ctor_ro.csproj b/src/tests/JIT/Methodical/Invoke/ctor/val_ctor_ro.csproj
index 4c282a4f77188d..357055668cbce2 100644
--- a/src/tests/JIT/Methodical/Invoke/ctor/val_ctor_ro.csproj
+++ b/src/tests/JIT/Methodical/Invoke/ctor/val_ctor_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/deep/deep.cs b/src/tests/JIT/Methodical/Invoke/deep/deep.cs
index a8ad8c5863e1e9..6ccb6103a3ef5c 100644
--- a/src/tests/JIT/Methodical/Invoke/deep/deep.cs
+++ b/src/tests/JIT/Methodical/Invoke/deep/deep.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_deep_deep_cs
 {
-    internal class Test
+    public class Test
     {
         private static double[] Method(double arg1, float arg2, ref double refarg)
         {
@@ -34,7 +35,8 @@ private static double Method2(double arg1, int arg2, double refarg)
             return ret[0] + ret[1] + ret[2] + ret[3];
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             try
             {
diff --git a/src/tests/JIT/Methodical/Invoke/deep/deep1.il b/src/tests/JIT/Methodical/Invoke/deep/deep1.il
index 9898c2e4566e6a..e53c07ecf18ea2 100644
--- a/src/tests/JIT/Methodical/Invoke/deep/deep1.il
+++ b/src/tests/JIT/Methodical/Invoke/deep/deep1.il
@@ -16,9 +16,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {AA806490-3696-4693-BEEE-68E449C58639}
-.namespace JitTest
+.namespace JitTest_deep1_deep_il
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends ['mscorlib']System.Object
   {
     .method private hidebysig static float64[] Method(float64 arg1, float32 arg2, float64& refarg) il managed
@@ -42,7 +42,7 @@
       IL_0023:  add
       IL_0024:  ldarg.1
       IL_0025:  ldarg.2
-      IL_0026:  call       float64[] JitTest.Test::Method(float64,
+      IL_0026:  call       float64[] JitTest_deep1_deep_il.Test::Method(float64,
                                                           float32,
                                                           float64&)
       IL_002b:  ldc.i4.0
@@ -60,7 +60,7 @@
       IL_003f:  ldloc.0
       IL_0040:  ldc.i4.0
       IL_0041:  ldelema    ['mscorlib']System.Double
-      IL_0046:  call       float64[] JitTest.Test::Method(float64,
+      IL_0046:  call       float64[] JitTest_deep1_deep_il.Test::Method(float64,
                                                           float32,
                                                           float64&)
       IL_004b:  ldc.i4.1
@@ -80,7 +80,7 @@
       IL_0061:  ldloc.0
       IL_0062:  ldc.i4.1
       IL_0063:  ldelema    ['mscorlib']System.Double
-      IL_0068:  call       float64[] JitTest.Test::Method(float64,
+      IL_0068:  call       float64[] JitTest_deep1_deep_il.Test::Method(float64,
                                                           float32,
                                                           float64&)
       IL_006d:  ldc.i4.2
@@ -102,7 +102,7 @@
       IL_0089:  ldloc.0
       IL_008a:  ldc.i4.2
       IL_008b:  ldelema    ['mscorlib']System.Double
-      IL_0090:  call       float64[] JitTest.Test::Method(float64,
+      IL_0090:  call       float64[] JitTest_deep1_deep_il.Test::Method(float64,
                                                           float32,
                                                           float64&)
       IL_0095:  ldc.i4.3
@@ -147,7 +147,7 @@
       IL_0020:  add
       IL_0021:  ldarg.1
       IL_0022:  ldarg.2
-      IL_0023:  call       float64 JitTest.Test::Method2(float64,
+      IL_0023:  call       float64 JitTest_deep1_deep_il.Test::Method2(float64,
                                                          int32,
                                                          float64)
       IL_0028:  add
@@ -163,7 +163,7 @@
       IL_003a:  ldloc.0
       IL_003b:  ldc.i4.0
       IL_003c:  ldelem.r8
-      IL_003d:  call       float64 JitTest.Test::Method2(float64,
+      IL_003d:  call       float64 JitTest_deep1_deep_il.Test::Method2(float64,
                                                          int32,
                                                          float64)
       IL_0042:  add
@@ -181,7 +181,7 @@
       IL_0056:  ldloc.0
       IL_0057:  ldc.i4.1
       IL_0058:  ldelem.r8
-      IL_0059:  call       float64 JitTest.Test::Method2(float64,
+      IL_0059:  call       float64 JitTest_deep1_deep_il.Test::Method2(float64,
                                                          int32,
                                                          float64)
       IL_005e:  add
@@ -201,7 +201,7 @@
       IL_0074:  ldloc.0
       IL_0075:  ldc.i4.2
       IL_0076:  ldelem.r8
-      IL_0077:  call       float64 JitTest.Test::Method2(float64,
+      IL_0077:  call       float64 JitTest_deep1_deep_il.Test::Method2(float64,
                                                          int32,
                                                          float64)
       IL_007c:  add
@@ -228,7 +228,7 @@
       IL_0091:  ret
     } // end of method 'Test::Method2'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -243,9 +243,9 @@
                method float64 *(float64, int32, float64) FPTR2
                )
                
-	ldftn float64[] JitTest.Test::Method(float64, float32, float64&)
+	ldftn float64[] JitTest_deep1_deep_il.Test::Method(float64, float32, float64&)
 	stloc FPTR1                             
-	ldftn float64 JitTest.Test::Method2(float64, int32, float64)
+	ldftn float64 JitTest_deep1_deep_il.Test::Method2(float64, int32, float64)
 	stloc FPTR2
 
       .try
@@ -255,7 +255,7 @@
         IL_000a:  ldc.r8     0.
         IL_0013:  ldc.r4     1.
         IL_0018:  ldloca.s   V_0
-        IL_001a:  call       float64[] JitTest.Test::Method(float64,
+        IL_001a:  call       float64[] JitTest_deep1_deep_il.Test::Method(float64,
                                                             float32,
                                                             float64&)
         IL_001f:  ldc.i4.3
@@ -493,7 +493,7 @@
         IL_0356:  ldloc FPTR2   calli       float64 (float64,
                                                            int32,
                                                            float64)
-        IL_035b:  call      float64 JitTest.Test::Method2(float64,
+        IL_035b:  call      float64 JitTest_deep1_deep_il.Test::Method2(float64,
                                                            int32,
                                                            float64)
         IL_0360:  ldloc FPTR2   calli       float64 (float64,
@@ -511,13 +511,13 @@
         IL_0374:  ldloc FPTR2   calli       float64 (float64,
                                                            int32,
                                                            float64)
-        IL_0379:  call      float64 JitTest.Test::Method2(float64,
+        IL_0379:  call      float64 JitTest_deep1_deep_il.Test::Method2(float64,
                                                            int32,
                                                            float64)
         IL_037e:  ldloc FPTR2   calli       float64 (float64,
                                                            int32,
                                                            float64)
-        IL_0383:  call      float64 JitTest.Test::Method2(float64,
+        IL_0383:  call      float64 JitTest_deep1_deep_il.Test::Method2(float64,
                                                            int32,
                                                            float64)
         IL_0388:  ldloc FPTR2   calli       float64 (float64,
@@ -568,6 +568,6 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_deep1_deep_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/Invoke/deep/deep1_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/deep/deep1_il_d.ilproj
index 91de69d2fc8647..a3661a0ca954ff 100644
--- a/src/tests/JIT/Methodical/Invoke/deep/deep1_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/deep/deep1_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/Invoke/deep/deep1_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/deep/deep1_il_r.ilproj
index ca2085829bd281..27e8b3c2f9a2ca 100644
--- a/src/tests/JIT/Methodical/Invoke/deep/deep1_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/deep/deep1_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/Invoke/deep/deep2.il b/src/tests/JIT/Methodical/Invoke/deep/deep2.il
index 8d8b538b2fd215..0b632a4c8abb0e 100644
--- a/src/tests/JIT/Methodical/Invoke/deep/deep2.il
+++ b/src/tests/JIT/Methodical/Invoke/deep/deep2.il
@@ -16,9 +16,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {AA806490-3696-4693-BEEE-68E449C58639}
-.namespace JitTest
+.namespace JitTest_deep2_deep_il
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends ['mscorlib']System.Object
   {
     .method private hidebysig static float64[] 
@@ -45,7 +45,7 @@
       IL_0023:  add
       IL_0024:  ldarg.1
       IL_0025:  ldarg.2
-      IL_0026:  call       float64[] JitTest.Test::Method(float64,
+      IL_0026:  call       float64[] JitTest_deep2_deep_il.Test::Method(float64,
                                                           float32,
                                                           float64&)
       IL_002b:  ldc.i4.0
@@ -63,7 +63,7 @@
       IL_003f:  ldloc.0
       IL_0040:  ldc.i4.0
       IL_0041:  ldelema    ['mscorlib']System.Double
-      IL_0046:  call       float64[] JitTest.Test::Method(float64,
+      IL_0046:  call       float64[] JitTest_deep2_deep_il.Test::Method(float64,
                                                           float32,
                                                           float64&)
       IL_004b:  ldc.i4.1
@@ -83,7 +83,7 @@
       IL_0061:  ldloc.0
       IL_0062:  ldc.i4.1
       IL_0063:  ldelema    ['mscorlib']System.Double
-      IL_0068:  call       float64[] JitTest.Test::Method(float64,
+      IL_0068:  call       float64[] JitTest_deep2_deep_il.Test::Method(float64,
                                                           float32,
                                                           float64&)
       IL_006d:  ldc.i4.2
@@ -105,7 +105,7 @@
       IL_0089:  ldloc.0
       IL_008a:  ldc.i4.2
       IL_008b:  ldelema    ['mscorlib']System.Double
-      IL_0090:  call       float64[] JitTest.Test::Method(float64,
+      IL_0090:  call       float64[] JitTest_deep2_deep_il.Test::Method(float64,
                                                           float32,
                                                           float64&)
       IL_0095:  ldc.i4.3
@@ -150,7 +150,7 @@
       IL_0020:  add
       IL_0021:  ldarg.1
       IL_0022:  ldarg.2
-      IL_0023:  call       float64 JitTest.Test::Method2(float64,
+      IL_0023:  call       float64 JitTest_deep2_deep_il.Test::Method2(float64,
                                                          int32,
                                                          float64)
       IL_0028:  add
@@ -166,7 +166,7 @@
       IL_003a:  ldloc.0
       IL_003b:  ldc.i4.0
       IL_003c:  ldelem.r8
-      IL_003d:  call       float64 JitTest.Test::Method2(float64,
+      IL_003d:  call       float64 JitTest_deep2_deep_il.Test::Method2(float64,
                                                          int32,
                                                          float64)
       IL_0042:  add
@@ -184,7 +184,7 @@
       IL_0056:  ldloc.0
       IL_0057:  ldc.i4.1
       IL_0058:  ldelem.r8
-      IL_0059:  call       float64 JitTest.Test::Method2(float64,
+      IL_0059:  call       float64 JitTest_deep2_deep_il.Test::Method2(float64,
                                                          int32,
                                                          float64)
       IL_005e:  add
@@ -204,7 +204,7 @@
       IL_0074:  ldloc.0
       IL_0075:  ldc.i4.2
       IL_0076:  ldelem.r8
-      IL_0077:  call       float64 JitTest.Test::Method2(float64,
+      IL_0077:  call       float64 JitTest_deep2_deep_il.Test::Method2(float64,
                                                          int32,
                                                          float64)
       IL_007c:  add
@@ -231,7 +231,7 @@
       IL_0091:  ret
     } // end of method 'Test::Method2'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -249,7 +249,7 @@
         IL_000a:  ldc.r8     0.
         IL_0013:  ldc.r4     1.
         IL_0018:  ldloca.s   V_0
-        IL_001a:  call       float64[] JitTest.Test::Method(float64,
+        IL_001a:  call       float64[] JitTest_deep2_deep_il.Test::Method(float64,
                                                             float32,
                                                             float64&)
         IL_001f:  ldc.i4.3
@@ -305,112 +305,112 @@
         IL_0158:  ldc.r8     0.
         IL_0161:  ldc.r4     12.
         IL_0166:  ldloca.s   V_0
-        IL_0168:  call       float64[] JitTest.Test::Method(float64,
+        IL_0168:  call       float64[] JitTest_deep2_deep_il.Test::Method(float64,
                                                             float32,
                                                             float64&)
         IL_016d:  ldc.i4.1
         IL_016e:  ldelema    ['mscorlib']System.Double
-        IL_0173:  call       float64[] JitTest.Test::Method(float64,
+        IL_0173:  call       float64[] JitTest_deep2_deep_il.Test::Method(float64,
                                                             float32,
                                                             float64&)
         IL_0178:  ldc.i4.2
         IL_0179:  ldelema    ['mscorlib']System.Double
-        IL_017e:  call       float64[] JitTest.Test::Method(float64,
+        IL_017e:  call       float64[] JitTest_deep2_deep_il.Test::Method(float64,
                                                             float32,
                                                             float64&)
         IL_0183:  ldc.i4.3
         IL_0184:  ldelema    ['mscorlib']System.Double
-        IL_0189:  call       float64[] JitTest.Test::Method(float64,
+        IL_0189:  call       float64[] JitTest_deep2_deep_il.Test::Method(float64,
                                                             float32,
                                                             float64&)
         IL_018e:  ldc.i4.0
         IL_018f:  ldelema    ['mscorlib']System.Double
-        IL_0194:  call       float64[] JitTest.Test::Method(float64,
+        IL_0194:  call       float64[] JitTest_deep2_deep_il.Test::Method(float64,
                                                             float32,
                                                             float64&)
         IL_0199:  ldc.i4.1
         IL_019a:  ldelema    ['mscorlib']System.Double
-        IL_019f:  call       float64[] JitTest.Test::Method(float64,
+        IL_019f:  call       float64[] JitTest_deep2_deep_il.Test::Method(float64,
                                                             float32,
                                                             float64&)
         IL_01a4:  ldc.i4.2
         IL_01a5:  ldelema    ['mscorlib']System.Double
-        IL_01aa:  call       float64[] JitTest.Test::Method(float64,
+        IL_01aa:  call       float64[] JitTest_deep2_deep_il.Test::Method(float64,
                                                             float32,
                                                             float64&)
         IL_01af:  ldc.i4.3
         IL_01b0:  ldelema    ['mscorlib']System.Double
-        IL_01b5:  call       float64[] JitTest.Test::Method(float64,
+        IL_01b5:  call       float64[] JitTest_deep2_deep_il.Test::Method(float64,
                                                             float32,
                                                             float64&)
         IL_01ba:  ldc.i4.2
         IL_01bb:  ldelema    ['mscorlib']System.Double
-        IL_01c0:  call       float64[] JitTest.Test::Method(float64,
+        IL_01c0:  call       float64[] JitTest_deep2_deep_il.Test::Method(float64,
                                                             float32,
                                                             float64&)
         IL_01c5:  ldc.i4.1
         IL_01c6:  ldelema    ['mscorlib']System.Double
-        IL_01cb:  call       float64[] JitTest.Test::Method(float64,
+        IL_01cb:  call       float64[] JitTest_deep2_deep_il.Test::Method(float64,
                                                             float32,
                                                             float64&)
         IL_01d0:  ldc.i4.0
         IL_01d1:  ldelema    ['mscorlib']System.Double
-        IL_01d6:  call       float64[] JitTest.Test::Method(float64,
+        IL_01d6:  call       float64[] JitTest_deep2_deep_il.Test::Method(float64,
                                                             float32,
                                                             float64&)
         IL_01db:  ldc.i4.0
         IL_01dc:  ldelema    ['mscorlib']System.Double
-        IL_01e1:  call       float64[] JitTest.Test::Method(float64,
+        IL_01e1:  call       float64[] JitTest_deep2_deep_il.Test::Method(float64,
                                                             float32,
                                                             float64&)
         IL_01e6:  ldc.i4.1
         IL_01e7:  ldelema    ['mscorlib']System.Double
-        IL_01ec:  call       float64[] JitTest.Test::Method(float64,
+        IL_01ec:  call       float64[] JitTest_deep2_deep_il.Test::Method(float64,
                                                             float32,
                                                             float64&)
         IL_01f1:  ldc.i4.2
         IL_01f2:  ldelema    ['mscorlib']System.Double
-        IL_01f7:  call       float64[] JitTest.Test::Method(float64,
+        IL_01f7:  call       float64[] JitTest_deep2_deep_il.Test::Method(float64,
                                                             float32,
                                                             float64&)
         IL_01fc:  ldc.i4.2
         IL_01fd:  ldelema    ['mscorlib']System.Double
-        IL_0202:  call       float64[] JitTest.Test::Method(float64,
+        IL_0202:  call       float64[] JitTest_deep2_deep_il.Test::Method(float64,
                                                             float32,
                                                             float64&)
         IL_0207:  ldc.i4.3
         IL_0208:  ldelema    ['mscorlib']System.Double
-        IL_020d:  call       float64[] JitTest.Test::Method(float64,
+        IL_020d:  call       float64[] JitTest_deep2_deep_il.Test::Method(float64,
                                                             float32,
                                                             float64&)
         IL_0212:  ldc.i4.2
         IL_0213:  ldelema    ['mscorlib']System.Double
-        IL_0218:  call       float64[] JitTest.Test::Method(float64,
+        IL_0218:  call       float64[] JitTest_deep2_deep_il.Test::Method(float64,
                                                             float32,
                                                             float64&)
         IL_021d:  ldc.i4.1
         IL_021e:  ldelema    ['mscorlib']System.Double
-        IL_0223:  call       float64[] JitTest.Test::Method(float64,
+        IL_0223:  call       float64[] JitTest_deep2_deep_il.Test::Method(float64,
                                                             float32,
                                                             float64&)
         IL_0228:  ldc.i4.0
         IL_0229:  ldelema    ['mscorlib']System.Double
-        IL_022e:  call       float64[] JitTest.Test::Method(float64,
+        IL_022e:  call       float64[] JitTest_deep2_deep_il.Test::Method(float64,
                                                             float32,
                                                             float64&)
         IL_0233:  ldc.i4.1
         IL_0234:  ldelema    ['mscorlib']System.Double
-        IL_0239:  call       float64[] JitTest.Test::Method(float64,
+        IL_0239:  call       float64[] JitTest_deep2_deep_il.Test::Method(float64,
                                                             float32,
                                                             float64&)
         IL_023e:  ldc.i4.1
         IL_023f:  ldelema    ['mscorlib']System.Double
-        IL_0244:  call       float64[] JitTest.Test::Method(float64,
+        IL_0244:  call       float64[] JitTest_deep2_deep_il.Test::Method(float64,
                                                             float32,
                                                             float64&)
         IL_0249:  ldc.i4.1
         IL_024a:  ldelema    ['mscorlib']System.Double
-        IL_024f:  call       float64[] JitTest.Test::Method(float64,
+        IL_024f:  call       float64[] JitTest_deep2_deep_il.Test::Method(float64,
                                                             float32,
                                                             float64&)
         IL_0254:  ldc.i4.1
@@ -459,70 +459,70 @@
         IL_0322:  ldc.r8     0.
         IL_032b:  ldc.i4.s   12
         IL_032d:  ldloc.0
-        IL_032e:  call       float64 JitTest.Test::Method2(float64,
+        IL_032e:  call       float64 JitTest_deep2_deep_il.Test::Method2(float64,
                                                            int32,
                                                            float64)
-        IL_0333:  call       float64 JitTest.Test::Method2(float64,
+        IL_0333:  call       float64 JitTest_deep2_deep_il.Test::Method2(float64,
                                                            int32,
                                                            float64)
-        IL_0338:  call       float64 JitTest.Test::Method2(float64,
+        IL_0338:  call       float64 JitTest_deep2_deep_il.Test::Method2(float64,
                                                            int32,
                                                            float64)
-        IL_033d:  call       float64 JitTest.Test::Method2(float64,
+        IL_033d:  call       float64 JitTest_deep2_deep_il.Test::Method2(float64,
                                                            int32,
                                                            float64)
-        IL_0342:  call       float64 JitTest.Test::Method2(float64,
+        IL_0342:  call       float64 JitTest_deep2_deep_il.Test::Method2(float64,
                                                            int32,
                                                            float64)
-        IL_0347:  call       float64 JitTest.Test::Method2(float64,
+        IL_0347:  call       float64 JitTest_deep2_deep_il.Test::Method2(float64,
                                                            int32,
                                                            float64)
-        IL_034c:  call       float64 JitTest.Test::Method2(float64,
+        IL_034c:  call       float64 JitTest_deep2_deep_il.Test::Method2(float64,
                                                            int32,
                                                            float64)
-        IL_0351:  call       float64 JitTest.Test::Method2(float64,
+        IL_0351:  call       float64 JitTest_deep2_deep_il.Test::Method2(float64,
                                                            int32,
                                                            float64)
-        IL_0356:  call       float64 JitTest.Test::Method2(float64,
+        IL_0356:  call       float64 JitTest_deep2_deep_il.Test::Method2(float64,
                                                            int32,
                                                            float64)
-        IL_035b:  call       float64 JitTest.Test::Method2(float64,
+        IL_035b:  call       float64 JitTest_deep2_deep_il.Test::Method2(float64,
                                                            int32,
                                                            float64)
-        IL_0360:  call       float64 JitTest.Test::Method2(float64,
+        IL_0360:  call       float64 JitTest_deep2_deep_il.Test::Method2(float64,
                                                            int32,
                                                            float64)
-        IL_0365:  call       float64 JitTest.Test::Method2(float64,
+        IL_0365:  call       float64 JitTest_deep2_deep_il.Test::Method2(float64,
                                                            int32,
                                                            float64)
-        IL_036a:  call       float64 JitTest.Test::Method2(float64,
+        IL_036a:  call       float64 JitTest_deep2_deep_il.Test::Method2(float64,
                                                            int32,
                                                            float64)
-        IL_036f:  call       float64 JitTest.Test::Method2(float64,
+        IL_036f:  call       float64 JitTest_deep2_deep_il.Test::Method2(float64,
                                                            int32,
                                                            float64)
-        IL_0374:  call       float64 JitTest.Test::Method2(float64,
+        IL_0374:  call       float64 JitTest_deep2_deep_il.Test::Method2(float64,
                                                            int32,
                                                            float64)
-        IL_0379:  call       float64 JitTest.Test::Method2(float64,
+        IL_0379:  call       float64 JitTest_deep2_deep_il.Test::Method2(float64,
                                                            int32,
                                                            float64)
-        IL_037e:  call       float64 JitTest.Test::Method2(float64,
+        IL_037e:  call       float64 JitTest_deep2_deep_il.Test::Method2(float64,
                                                            int32,
                                                            float64)
-        IL_0383:  call       float64 JitTest.Test::Method2(float64,
+        IL_0383:  call       float64 JitTest_deep2_deep_il.Test::Method2(float64,
                                                            int32,
                                                            float64)
-        IL_0388:  call       float64 JitTest.Test::Method2(float64,
+        IL_0388:  call       float64 JitTest_deep2_deep_il.Test::Method2(float64,
                                                            int32,
                                                            float64)
-        IL_038d:  call       float64 JitTest.Test::Method2(float64,
+        IL_038d:  call       float64 JitTest_deep2_deep_il.Test::Method2(float64,
                                                            int32,
                                                            float64)
-        IL_0392:  call       float64 JitTest.Test::Method2(float64,
+        IL_0392:  call       float64 JitTest_deep2_deep_il.Test::Method2(float64,
                                                            int32,
                                                            float64)
-        IL_0397:  call       float64 JitTest.Test::Method2(float64,
+        IL_0397:  call       float64 JitTest_deep2_deep_il.Test::Method2(float64,
                                                            int32,
                                                            float64)
         IL_039c:  stloc.0
@@ -561,6 +561,6 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_deep2_deep_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/Invoke/deep/deep2_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/deep/deep2_il_d.ilproj
index 30dd317c854bee..6cba3d5516723d 100644
--- a/src/tests/JIT/Methodical/Invoke/deep/deep2_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/deep/deep2_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/Invoke/deep/deep2_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/deep/deep2_il_r.ilproj
index 4ca99fca90fd0e..3671956baf13b8 100644
--- a/src/tests/JIT/Methodical/Invoke/deep/deep2_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/deep/deep2_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/Invoke/deep/deep_d.csproj b/src/tests/JIT/Methodical/Invoke/deep/deep_d.csproj
index 89d5c7d2ed08ce..42ba1e956a12d3 100644
--- a/src/tests/JIT/Methodical/Invoke/deep/deep_d.csproj
+++ b/src/tests/JIT/Methodical/Invoke/deep/deep_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/Invoke/deep/deep_do.csproj b/src/tests/JIT/Methodical/Invoke/deep/deep_do.csproj
index 4a923afb688f80..098efe8d15913e 100644
--- a/src/tests/JIT/Methodical/Invoke/deep/deep_do.csproj
+++ b/src/tests/JIT/Methodical/Invoke/deep/deep_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/Invoke/deep/deep_r.csproj b/src/tests/JIT/Methodical/Invoke/deep/deep_r.csproj
index 338029b7d39799..a68cfa2a3421c0 100644
--- a/src/tests/JIT/Methodical/Invoke/deep/deep_r.csproj
+++ b/src/tests/JIT/Methodical/Invoke/deep/deep_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/Invoke/deep/deep_ro.csproj b/src/tests/JIT/Methodical/Invoke/deep/deep_ro.csproj
index 286c4fc11b7e90..f2a09b8976bb29 100644
--- a/src/tests/JIT/Methodical/Invoke/deep/deep_ro.csproj
+++ b/src/tests/JIT/Methodical/Invoke/deep/deep_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/ftn_t.il b/src/tests/JIT/Methodical/Invoke/fptr/ftn_t.il
index c06aaa5fa958b1..a8433c597f20b9 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/ftn_t.il
+++ b/src/tests/JIT/Methodical/Invoke/fptr/ftn_t.il
@@ -21,9 +21,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {90803FD0-8E18-44C9-A242-98463ADD450D}
-.namespace JitTest
+.namespace JitTest_ftn_t_fptr_il
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends ['mscorlib']System.Object
   {
     .method private hidebysig static void DoStuff(method void *()) il managed
@@ -38,7 +38,7 @@
     {
       // Code size       1 (0x1)
       .maxstack  8
-      ldftn 		void JitTest.Test::DummyMethod()
+      ldftn 		void JitTest_ftn_t_fptr_il.Test::DummyMethod()
       ret
     } // end of method 'Test::DoStuff'
     .method private hidebysig static void DummyMethod() il managed
@@ -54,23 +54,23 @@
     {
 		.maxstack  4
 		.locals (int32 V_0)
-		ldftn 		void JitTest.Test::DummyMethod()
-		ldftn		void JitTest.Test::DoStuff(method void *())
+		ldftn 		void JitTest_ftn_t_fptr_il.Test::DummyMethod()
+		ldftn		void JitTest_ftn_t_fptr_il.Test::DoStuff(method void *())
 		calli		void (method void *())
-		ldftn		method void *() JitTest.Test::RetStuff()
+		ldftn		method void *() JitTest_ftn_t_fptr_il.Test::RetStuff()
 		calli		method void *()()
 		tail. calli void()
 		ret
     } // end of method 'Test::TestMain'
 
-    .method private hidebysig static int32 Main() il managed
+    .method public hidebysig static int32 Main() il managed
     {
 		.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
 		    01 00 00 00
 		)
 		.entrypoint
 		.maxstack  4
-		ldftn 		void JitTest.Test::TestMain()
+		ldftn 		void JitTest_ftn_t_fptr_il.Test::TestMain()
 		calli		void ()
 		ldc.i4 0x64
 		ret
@@ -88,5 +88,5 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_ftn_t_fptr_il'
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/ftn_t_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/ftn_t_il_d.ilproj
index caf6aafae79e69..b7c02cf48c01a1 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/ftn_t_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/fptr/ftn_t_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/ftn_t_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/ftn_t_il_r.ilproj
index bf099dab929455..d881ea1a8de317 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/ftn_t_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/fptr/ftn_t_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/instftn.il b/src/tests/JIT/Methodical/Invoke/fptr/instftn.il
index c536d9d4992c1d..d915ef9eb2d020 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/instftn.il
+++ b/src/tests/JIT/Methodical/Invoke/fptr/instftn.il
@@ -21,9 +21,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {90803FD0-8E18-44C9-A242-98463ADD450D}
-.namespace JitTest
+.namespace JitTest_instftn_fptr_il
 {
-  .class private auto ansi Test extends ['mscorlib']System.Object
+  .class public auto ansi Test extends ['mscorlib']System.Object
   {
     .method private hidebysig instance int32 DoStuff(method instance int32 *()) il managed
     {
@@ -38,7 +38,7 @@
     {
 			// Code size       1 (0x1)
 			.maxstack  8
-			ldftn 		instance int32 JitTest.Test::DummyMethod()
+			ldftn 		instance int32 JitTest_instftn_fptr_il.Test::DummyMethod()
 			ret
     } // end of method 'Test::DoStuff'
     .method private hidebysig instance int32 DummyMethod() il managed
@@ -53,7 +53,7 @@
 			ret
     } // end of method 'Test::DoStuff'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
 			.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -62,15 +62,15 @@
 			.entrypoint
 			.maxstack  6
 			.locals (int32 V_0, int32)
-			newobj		instance void JitTest.Test::.ctor()
+			newobj		instance void JitTest_instftn_fptr_il.Test::.ctor()
 			dup
 			dup
-			ldftn 		instance int32 JitTest.Test::DummyMethod()
-			ldftn		instance int32 JitTest.Test::DoStuff(method instance int32 *())
+			ldftn 		instance int32 JitTest_instftn_fptr_il.Test::DummyMethod()
+			ldftn		instance int32 JitTest_instftn_fptr_il.Test::DoStuff(method instance int32 *())
 			calli		instance int32 (method instance int32 *())
 			stloc.1
 			
-			ldftn		instance method instance int32 *() JitTest.Test::RetStuff()
+			ldftn		instance method instance int32 *() JitTest_instftn_fptr_il.Test::RetStuff()
 			calli		instance method instance int32 *()()
 			calli		instance int32 ()
 			ldloc.1
@@ -93,5 +93,5 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_instftn_fptr_il'
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/instftn_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/instftn_il_d.ilproj
index 4a43e6e1771aa0..97d094fbe99b5d 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/instftn_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/fptr/instftn_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/instftn_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/instftn_il_r.ilproj
index d9ab4a06d3a679..fea2acbab0cfad 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/instftn_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/fptr/instftn_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/instftn_t.il b/src/tests/JIT/Methodical/Invoke/fptr/instftn_t.il
index d1a1633f52fc33..bd8f3f84036a9b 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/instftn_t.il
+++ b/src/tests/JIT/Methodical/Invoke/fptr/instftn_t.il
@@ -21,9 +21,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {90803FD0-8E18-44C9-A242-98463ADD450D}
-.namespace JitTest
+.namespace JitTest_instftn_t_fptr_il
 {
-  .class private auto ansi Test extends [mscorlib]System.Object
+  .class public auto ansi Test extends [mscorlib]System.Object
   {
     .method private hidebysig instance int32 DoStuff(method instance int32 *()) il managed
     {
@@ -38,7 +38,7 @@
     {
 			// Code size       1 (0x1)
 			.maxstack  8
-			ldftn 		instance int32 JitTest.Test::DummyMethod()
+			ldftn 		instance int32 JitTest_instftn_t_fptr_il.Test::DummyMethod()
 			ret
     } // end of method 'Test::DoStuff'
     .method private hidebysig instance int32 DummyMethod() il managed
@@ -58,22 +58,22 @@
     {
 			.maxstack  6
 			.locals (int32 V_0, int32)
-			newobj		instance void JitTest.Test::.ctor()
+			newobj		instance void JitTest_instftn_t_fptr_il.Test::.ctor()
 			dup
 			dup
-			ldftn 		instance int32 JitTest.Test::DummyMethod()
-			ldftn		instance int32 JitTest.Test::DoStuff(method instance int32 *())
+			ldftn 		instance int32 JitTest_instftn_t_fptr_il.Test::DummyMethod()
+			ldftn		instance int32 JitTest_instftn_t_fptr_il.Test::DoStuff(method instance int32 *())
 			calli		instance int32 (method instance int32 *())
 			stloc.1
 			
-			ldftn		instance method instance int32 *() JitTest.Test::RetStuff()
+			ldftn		instance method instance int32 *() JitTest_instftn_t_fptr_il.Test::RetStuff()
 			calli		instance method instance int32 *()()
 			tail. calli		instance int32 ()
 
 			ret
     } // end of method 'Test::TestMain'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
 			.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -81,7 +81,7 @@
 			)
 			.entrypoint
 			.maxstack  6
-			ldftn 		int32 JitTest.Test::TestMain()
+			ldftn 		int32 JitTest_instftn_t_fptr_il.Test::TestMain()
 			calli		int32 ()
 
 			ldc.i4 0x64
@@ -102,5 +102,5 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_instftn_t_fptr_il'
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/instftn_t_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/instftn_t_il_d.ilproj
index 8df1cc6b7d2b30..6e67d48237a043 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/instftn_t_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/fptr/instftn_t_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/instftn_t_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/instftn_t_il_r.ilproj
index 752e28b73ea2a2..5e7478b0b69166 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/instftn_t_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/fptr/instftn_t_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse.cs b/src/tests/JIT/Methodical/Invoke/fptr/recurse.cs
index 6978659f2e7e10..8a24975211135a 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/recurse.cs
+++ b/src/tests/JIT/Methodical/Invoke/fptr/recurse.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace TestCase
+namespace TestCase_recurse_cs
 {
-    internal class Test
+    public class Test
     {
         private static int Fact1(ref int arg, ref int result)
         {
@@ -18,7 +19,8 @@ private static int Fact1(ref int arg, ref int result)
             return 0x12345;
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             int arg = 6;
             int result = 1;
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_calli.il b/src/tests/JIT/Methodical/Invoke/fptr/recurse_calli.il
index e454019f0b5720..c181f727186bd0 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/recurse_calli.il
+++ b/src/tests/JIT/Methodical/Invoke/fptr/recurse_calli.il
@@ -21,9 +21,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {885F4995-E80A-480B-BB9B-30139BED90E1}
-.namespace TestCase
+.namespace TestCase_recurse_calli_il
 {
-  .class private auto ansi Test extends ['mscorlib']System.Object
+  .class public auto ansi Test extends ['mscorlib']System.Object
   {
     .method private hidebysig static int32 
             Fact1(int32& arg,
@@ -55,7 +55,7 @@
       			
       			ldarg.0
       			ldarg.1
-      			ldftn      int32 TestCase.Test::Fact1(int32&, int32&)
+      			ldftn      int32 TestCase_recurse_calli_il.Test::Fact1(int32&, int32&)
       			calli      int32 (int32&, int32&)
       			
       end_of_method:
@@ -63,7 +63,7 @@
 
     } // end of method 'Test::Fact1'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -81,7 +81,7 @@
       IL_0003:  stloc.1
       IL_0004:  ldloca.s   V_0
       IL_0006:  ldloca.s   V_1
-      IL_0008:  call       int32 TestCase.Test::Fact1(int32&,
+      IL_0008:  call       int32 TestCase_recurse_calli_il.Test::Fact1(int32&,
                                                       int32&)
       IL_000d:  ldc.i4     0x12345
       IL_0012:  beq.s      IL_0022
@@ -126,6 +126,6 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'TestCase'
+} // end of namespace 'TestCase_recurse_calli_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_calli_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/recurse_calli_il_d.ilproj
index 13a9ed063981c2..633029673cb756 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/recurse_calli_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/fptr/recurse_calli_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_calli_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/recurse_calli_il_r.ilproj
index 11170f6c1dd15f..8d1c349dc37bbd 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/recurse_calli_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/fptr/recurse_calli_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_d.csproj b/src/tests/JIT/Methodical/Invoke/fptr/recurse_d.csproj
index 8b5a41e611a25f..ddd4e01a987d05 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/recurse_d.csproj
+++ b/src/tests/JIT/Methodical/Invoke/fptr/recurse_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_do.csproj b/src/tests/JIT/Methodical/Invoke/fptr/recurse_do.csproj
index 193f5e84cd9dbc..368344e1b41b4e 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/recurse_do.csproj
+++ b/src/tests/JIT/Methodical/Invoke/fptr/recurse_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmp.il b/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmp.il
index 8536ae41ea49b1..3be6a3f9406fa0 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmp.il
+++ b/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmp.il
@@ -21,9 +21,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {885F4995-E80A-480B-BB9B-30139BED90E1}
-.namespace TestCase
+.namespace TestCase_recurse_jmp_il
 {
-  .class private auto ansi Test extends ['mscorlib']System.Object
+  .class public auto ansi Test extends ['mscorlib']System.Object
   {
     .method private hidebysig static int32 
             Fact1(int32& arg,
@@ -53,7 +53,7 @@
       IL_0010:  sub
       IL_0011:  stind.i4
       			
-      			jmp			int32 TestCase.Test::Fact1(int32&, int32&)
+      			jmp			int32 TestCase_recurse_jmp_il.Test::Fact1(int32&, int32&)
       			ldc.i4.0
       			
       end_of_method:
@@ -61,7 +61,7 @@
 
     } // end of method 'Test::Fact1'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -79,7 +79,7 @@
       IL_0003:  stloc.1
       IL_0004:  ldloca.s   V_0
       IL_0006:  ldloca.s   V_1
-      IL_0008:  call       int32 TestCase.Test::Fact1(int32&,
+      IL_0008:  call       int32 TestCase_recurse_jmp_il.Test::Fact1(int32&,
                                                       int32&)
       IL_000d:  ldc.i4     0x12345
       IL_0012:  beq.s      IL_0022
@@ -124,6 +124,6 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'TestCase'
+} // end of namespace 'TestCase_recurse_jmp_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmp_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmp_il_d.ilproj
index 82815820ab4877..3210433111ce5c 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmp_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmp_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmp_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmp_il_r.ilproj
index 5e41da102a27bf..aaba4c370b0723 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmp_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmp_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmpi.il b/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmpi.il
index 5fc34d03e8ee03..33a63f8229cbaf 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmpi.il
+++ b/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmpi.il
@@ -21,9 +21,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {885F4995-E80A-480B-BB9B-30139BED90E1}
-.namespace TestCase
+.namespace TestCase_recurse_jmpi_il
 {
-  .class private auto ansi Test extends ['mscorlib']System.Object
+  .class public auto ansi Test extends ['mscorlib']System.Object
   {
     .method private hidebysig static int32 
             Fact1(int32& arg,
@@ -53,7 +53,7 @@
       IL_0010:  sub
       IL_0011:  stind.i4
       			
-      			jmp		int32 TestCase.Test::Fact1(int32&, int32&)
+      			jmp		int32 TestCase_recurse_jmpi_il.Test::Fact1(int32&, int32&)
 				ldc.i4.0
 
       end_of_method:
@@ -61,7 +61,7 @@
 
     } // end of method 'Test::Fact1'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -79,7 +79,7 @@
       IL_0003:  stloc.1
       IL_0004:  ldloca.s   V_0
       IL_0006:  ldloca.s   V_1
-      IL_0008:  call       int32 TestCase.Test::Fact1(int32&,
+      IL_0008:  call       int32 TestCase_recurse_jmpi_il.Test::Fact1(int32&,
                                                       int32&)
       IL_000d:  ldc.i4     0x12345
       IL_0012:  beq.s      IL_0022
@@ -124,6 +124,6 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'TestCase'
+} // end of namespace 'TestCase_recurse_jmpi_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmpi_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmpi_il_d.ilproj
index be078ac422f22d..dfb063df1917fb 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmpi_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmpi_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmpi_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmpi_il_r.ilproj
index 6e8e2e531105c3..b2179e61e9fb4f 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmpi_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmpi_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_r.csproj b/src/tests/JIT/Methodical/Invoke/fptr/recurse_r.csproj
index bef79e7b29367d..637f035d9010d8 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/recurse_r.csproj
+++ b/src/tests/JIT/Methodical/Invoke/fptr/recurse_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_ro.csproj b/src/tests/JIT/Methodical/Invoke/fptr/recurse_ro.csproj
index 83a85f3a9b9860..67c1449c9d3bb8 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/recurse_ro.csproj
+++ b/src/tests/JIT/Methodical/Invoke/fptr/recurse_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_call.il b/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_call.il
index 69fddb6e96020f..b9f4221fcc2f31 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_call.il
+++ b/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_call.il
@@ -21,9 +21,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {885F4995-E80A-480B-BB9B-30139BED90E1}
-.namespace TestCase
+.namespace TestCase_recurse_tail_call_il
 {
-  .class private auto ansi Test extends ['mscorlib']System.Object
+  .class public auto ansi Test extends ['mscorlib']System.Object
   {
     .method private hidebysig static int32 
             Fact1(int32& arg,
@@ -55,14 +55,14 @@
       			
       			ldarg.0
       			ldarg.1
-      			tail. call      int32 TestCase.Test::Fact1(int32&, int32&)
+      			tail. call      int32 TestCase_recurse_tail_call_il.Test::Fact1(int32&, int32&)
       			
       end_of_method:
       			ret
 
     } // end of method 'Test::Fact1'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -80,7 +80,7 @@
       IL_0003:  stloc.1
       IL_0004:  ldloca.s   V_0
       IL_0006:  ldloca.s   V_1
-      IL_0008:  call       int32 TestCase.Test::Fact1(int32&,
+      IL_0008:  call       int32 TestCase_recurse_tail_call_il.Test::Fact1(int32&,
                                                       int32&)
       IL_000d:  ldc.i4     0x12345
       IL_0012:  beq.s      IL_0022
@@ -125,6 +125,6 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'TestCase'
+} // end of namespace 'TestCase_recurse_tail_call_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_call_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_call_il_d.ilproj
index b4775f12ec0f57..fcec29ef2e64e5 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_call_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_call_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_call_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_call_il_r.ilproj
index 047901cc70e96e..7fbde58d5f1fe5 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_call_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_call_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_calli.il b/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_calli.il
index cb734644bbc2ab..002136a722e0e5 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_calli.il
+++ b/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_calli.il
@@ -21,9 +21,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {885F4995-E80A-480B-BB9B-30139BED90E1}
-.namespace TestCase
+.namespace TestCase_recurse_tail_calli_il
 {
-  .class private auto ansi Test extends ['mscorlib']System.Object
+  .class public auto ansi Test extends ['mscorlib']System.Object
   {
     .method private hidebysig static int32 
             Fact1(int32& arg,
@@ -55,7 +55,7 @@
       			
       			ldarg.0
       			ldarg.1
-      			ldftn      int32 TestCase.Test::Fact1(int32&, int32&)
+      			ldftn      int32 TestCase_recurse_tail_calli_il.Test::Fact1(int32&, int32&)
       			tail. calli      int32 (int32&, int32&)
       			
       end_of_method:
@@ -63,7 +63,7 @@
 
     } // end of method 'Test::Fact1'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -81,7 +81,7 @@
       IL_0003:  stloc.1
       IL_0004:  ldloca.s   V_0
       IL_0006:  ldloca.s   V_1
-      IL_0008:  call       int32 TestCase.Test::Fact1(int32&,
+      IL_0008:  call       int32 TestCase_recurse_tail_calli_il.Test::Fact1(int32&,
                                                       int32&)
       IL_000d:  ldc.i4     0x12345
       IL_0012:  beq.s      IL_0022
@@ -126,6 +126,6 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'TestCase'
+} // end of namespace 'TestCase_recurse_tail_calli_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_calli_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_calli_il_d.ilproj
index 56a3f466e87762..7474aaad4a1d54 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_calli_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_calli_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_calli_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_calli_il_r.ilproj
index 2b183359c26298..1a0d9c9411e963 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_calli_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_calli_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/valftn.il b/src/tests/JIT/Methodical/Invoke/fptr/valftn.il
index 64f8864940a2f0..825729dcc2276a 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/valftn.il
+++ b/src/tests/JIT/Methodical/Invoke/fptr/valftn.il
@@ -12,9 +12,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {90803FD0-8E18-44C9-A242-98463ADD450D}
-.namespace JitTest
+.namespace JitTest_valftn_fptr_il
 {
-  .class private value sealed Test extends ['mscorlib']System.ValueType
+  .class public value sealed Test extends ['mscorlib']System.ValueType
   {
     .method private hidebysig instance int32 DoStuff(method instance int32 *()) il managed
     {
@@ -29,7 +29,7 @@
     {
 			// Code size       1 (0x1)
 			.maxstack  8
-			ldftn 		instance int32 JitTest.Test::DummyMethod()
+			ldftn 		instance int32 JitTest_valftn_fptr_il.Test::DummyMethod()
 			ret
     } // end of method 'Test::DoStuff'
     .method private hidebysig instance int32 DummyMethod() il managed
@@ -37,8 +37,8 @@
 			// Code size       1 (0x1)
 			.maxstack  8
 			ldarg.0
-			ldobj		JitTest.Test
-			box		JitTest.Test
+			ldobj		JitTest_valftn_fptr_il.Test
+			box		JitTest_valftn_fptr_il.Test
 			callvirt instance class [mscorlib]System.Type [mscorlib]System.Object::GetType()
 			callvirt instance class [mscorlib]System.String [mscorlib]System.Type::ToString()
 			call  void [System.Console]System.Console::WriteLine(class [mscorlib]System.String)
@@ -46,7 +46,7 @@
 			ret
     } // end of method 'Test::DoStuff'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
 			.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -54,18 +54,18 @@
 			)
 			.entrypoint
 			.maxstack  10
-			.locals (int32 V_0, value class JitTest.Test v)
+			.locals (int32 V_0, value class JitTest_valftn_fptr_il.Test v)
 			ldloca v
-			initobj		value class JitTest.Test
+			initobj		value class JitTest_valftn_fptr_il.Test
 
 			ldloca v
-			ldftn 		instance int32 JitTest.Test::DummyMethod()
-			ldftn		instance int32 JitTest.Test::DoStuff(method instance int32 *())
+			ldftn 		instance int32 JitTest_valftn_fptr_il.Test::DummyMethod()
+			ldftn		instance int32 JitTest_valftn_fptr_il.Test::DoStuff(method instance int32 *())
 			calli		instance int32 (method instance int32 *())
 
 			ldloca v
 			ldloca v
-			ldftn		instance method instance int32 *() JitTest.Test::RetStuff()
+			ldftn		instance method instance int32 *() JitTest_valftn_fptr_il.Test::RetStuff()
 			calli		instance method instance int32 *()()
 			calli		instance int32 ()
 			
@@ -86,5 +86,5 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_valftn_fptr_il'
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/valftn_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/valftn_il_d.ilproj
index 5b05f46da8e263..204b654d3ba98e 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/valftn_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/fptr/valftn_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/valftn_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/valftn_il_r.ilproj
index 1016dbfd7191df..6a68e7746cf44e 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/valftn_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/fptr/valftn_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/valftn_t.il b/src/tests/JIT/Methodical/Invoke/fptr/valftn_t.il
index 5fd3d52ace971a..95c77d21f02b3b 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/valftn_t.il
+++ b/src/tests/JIT/Methodical/Invoke/fptr/valftn_t.il
@@ -21,9 +21,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {90803FD0-8E18-44C9-A242-98463ADD450D}
-.namespace JitTest
+.namespace JitTest_valftn_t_fptr_il
 {
-  .class private value sealed Test extends [mscorlib]System.ValueType
+  .class public value sealed Test extends [mscorlib]System.ValueType
   {
     .method private hidebysig instance int32 DoStuff(method instance int32 *()) il managed
     {
@@ -38,7 +38,7 @@
     {
 			// Code size       1 (0x1)
 			.maxstack  8
-			ldftn 		instance int32 JitTest.Test::DummyMethod()
+			ldftn 		instance int32 JitTest_valftn_t_fptr_il.Test::DummyMethod()
 			ret
     } // end of method 'Test::DoStuff'
     .method private hidebysig instance int32 DummyMethod() il managed
@@ -46,8 +46,8 @@
 			// Code size       1 (0x1)
 			.maxstack  8
 			ldarg.0
-			ldobj		JitTest.Test
-			box		JitTest.Test
+			ldobj		JitTest_valftn_t_fptr_il.Test
+			box		JitTest_valftn_t_fptr_il.Test
 			callvirt instance class [mscorlib]System.Type [mscorlib]System.Object::GetType()
 			callvirt instance class [mscorlib]System.String [mscorlib]System.Type::ToString()
 			call  void [System.Console]System.Console::WriteLine(class [mscorlib]System.String)
@@ -59,26 +59,26 @@
             TestMain() il managed
     {
 			.maxstack  10
-			.locals (int32 V_0, value class JitTest.Test v)
+			.locals (int32 V_0, value class JitTest_valftn_t_fptr_il.Test v)
 			ldloca v
-			initobj		value class JitTest.Test
+			initobj		value class JitTest_valftn_t_fptr_il.Test
 
 			ldloca v
-			ldftn 		instance int32 JitTest.Test::DummyMethod()
-			ldftn		instance int32 JitTest.Test::DoStuff(method instance int32 *())
+			ldftn 		instance int32 JitTest_valftn_t_fptr_il.Test::DummyMethod()
+			ldftn		instance int32 JitTest_valftn_t_fptr_il.Test::DoStuff(method instance int32 *())
 			calli		instance int32 (method instance int32 *())
 			pop
 
 			ldloca v
 			ldloca v
-			ldftn		instance method instance int32 *() JitTest.Test::RetStuff()
+			ldftn		instance method instance int32 *() JitTest_valftn_t_fptr_il.Test::RetStuff()
 			calli		instance method instance int32 *()()
 			tail. calli		instance int32 ()
 
 			ret
     } // end of method 'Test::TestMain'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
 			.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -86,7 +86,7 @@
 			)
 			.entrypoint
 			.maxstack  4
-			ldftn 		int32 JitTest.Test::TestMain()
+			ldftn 		int32 JitTest_valftn_t_fptr_il.Test::TestMain()
 			calli		int32 ()
 
 			ldc.i4		0x64
@@ -105,5 +105,5 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_valftn_t_fptr_il'
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/valftn_t_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/valftn_t_il_d.ilproj
index 9f5f64401a2d91..6aaa23e4333939 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/valftn_t_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/fptr/valftn_t_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/valftn_t_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/valftn_t_il_r.ilproj
index 2f8b38190158be..0230f4f46febef 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/valftn_t_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/fptr/valftn_t_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/virtftn.il b/src/tests/JIT/Methodical/Invoke/fptr/virtftn.il
index a2f7b929993f4d..b896bc33e3d7fa 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/virtftn.il
+++ b/src/tests/JIT/Methodical/Invoke/fptr/virtftn.il
@@ -21,9 +21,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {90803FD0-8E18-44C9-A242-98463ADD450D}
-.namespace JitTest
+.namespace JitTest_virtftn_fptr_il
 {
-  .class private auto ansi Test extends ['mscorlib']System.Object
+  .class public auto ansi Test extends ['mscorlib']System.Object
   {
     .method private hidebysig virtual instance int32 DoStuff(method instance int32 *()) il managed
     {
@@ -39,7 +39,7 @@
 			// Code size       1 (0x1)
 			.maxstack  8
 			ldarg.0
-			ldvirtftn 		instance int32 JitTest.Test::DummyMethod()
+			ldvirtftn 		instance int32 JitTest_virtftn_fptr_il.Test::DummyMethod()
 			ret
     } // end of method 'Test::DoStuff'
     .method private hidebysig virtual instance int32 DummyMethod() il managed
@@ -54,7 +54,7 @@
 			ret
     } // end of method 'Test::DoStuff'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
 			.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -62,21 +62,21 @@
 			)
 			.entrypoint
 			.maxstack  8
-			.locals (class JitTest.Test, int32)
-			newobj		instance void JitTest.Test::.ctor()
+			.locals (class JitTest_virtftn_fptr_il.Test, int32)
+			newobj		instance void JitTest_virtftn_fptr_il.Test::.ctor()
 			stloc.0
 			ldloc.0
 			dup
 			dup
 			dup
-			ldvirtftn 	instance int32 JitTest.Test::DummyMethod()
+			ldvirtftn 	instance int32 JitTest_virtftn_fptr_il.Test::DummyMethod()
 			ldloc.0
-			ldvirtftn	instance int32 JitTest.Test::DoStuff(method instance int32 *())
+			ldvirtftn	instance int32 JitTest_virtftn_fptr_il.Test::DoStuff(method instance int32 *())
 			calli		instance int32 (method instance int32 *())
 			stloc.1
 			
 			ldloc.0
-			ldvirtftn	instance method instance int32 *() JitTest.Test::RetStuff()
+			ldvirtftn	instance method instance int32 *() JitTest_virtftn_fptr_il.Test::RetStuff()
 			calli		instance method instance int32 *()()
 			calli		instance int32 ()
 			
@@ -100,5 +100,5 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_virtftn_fptr_il'
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/virtftn_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/virtftn_il_d.ilproj
index ab7b7033e8d4ac..cc631d948366dc 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/virtftn_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/fptr/virtftn_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/virtftn_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/virtftn_il_r.ilproj
index fd22dd3561afd8..2a02cd83f09abd 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/virtftn_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/fptr/virtftn_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/virtftn_t.il b/src/tests/JIT/Methodical/Invoke/fptr/virtftn_t.il
index 8b311f778b8683..46a832b7b8ad8d 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/virtftn_t.il
+++ b/src/tests/JIT/Methodical/Invoke/fptr/virtftn_t.il
@@ -21,9 +21,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {90803FD0-8E18-44C9-A242-98463ADD450D}
-.namespace JitTest
+.namespace JitTest_virtftn_t_fptr_il
 {
-  .class private auto ansi Test extends [mscorlib]System.Object
+  .class public auto ansi Test extends [mscorlib]System.Object
   {
     .method private hidebysig virtual instance int32 DoStuff(method instance int32 *()) il managed
     {
@@ -39,7 +39,7 @@
 			// Code size       1 (0x1)
 			.maxstack  8
 			ldarg.0
-			ldvirtftn 		instance int32 JitTest.Test::DummyMethod()
+			ldvirtftn 		instance int32 JitTest_virtftn_t_fptr_il.Test::DummyMethod()
 			ret
     } // end of method 'Test::DoStuff'
     .method private hidebysig virtual instance int32 DummyMethod() il managed
@@ -59,28 +59,28 @@
             TestMain() il managed
     {
 			.maxstack  8
-			.locals (class JitTest.Test)
-			newobj		instance void JitTest.Test::.ctor()
+			.locals (class JitTest_virtftn_t_fptr_il.Test)
+			newobj		instance void JitTest_virtftn_t_fptr_il.Test::.ctor()
 			stloc.0
 			ldloc.0
 			dup
 			dup
 			dup
-			ldvirtftn 	instance int32 JitTest.Test::DummyMethod()
+			ldvirtftn 	instance int32 JitTest_virtftn_t_fptr_il.Test::DummyMethod()
 			ldloc.0
-			ldvirtftn	instance int32 JitTest.Test::DoStuff(method instance int32 *())
+			ldvirtftn	instance int32 JitTest_virtftn_t_fptr_il.Test::DoStuff(method instance int32 *())
 			calli		instance int32 (method instance int32 *())
 			pop
 			
 			ldloc.0
-			ldvirtftn	instance method instance int32 *() JitTest.Test::RetStuff()
+			ldvirtftn	instance method instance int32 *() JitTest_virtftn_t_fptr_il.Test::RetStuff()
 			calli		instance method instance int32 *()()
 			tail. calli		instance int32 ()
 			ret
 
     } // end of method 'Test::TestMain'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
 			.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -88,7 +88,7 @@
 			)
 			.entrypoint
 			.maxstack  4
-			ldftn 		int32 JitTest.Test::TestMain()
+			ldftn 		int32 JitTest_virtftn_t_fptr_il.Test::TestMain()
 			calli		int32 ()
 
 			ldc.i4		0x64
@@ -109,5 +109,5 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_virtftn_t_fptr_il'
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/virtftn_t_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/virtftn_t_il_d.ilproj
index 937f7f18cd8818..0299e44265c3d8 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/virtftn_t_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/fptr/virtftn_t_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/virtftn_t_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/virtftn_t_il_r.ilproj
index d81ae802371a89..64f8b561a9feab 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/virtftn_t_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/fptr/virtftn_t_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/Invoke/hfa_params/hfa_params.cs b/src/tests/JIT/Methodical/Invoke/hfa_params/hfa_params.cs
index 0ed06cbb77c515..58a806b05d00b8 100644
--- a/src/tests/JIT/Methodical/Invoke/hfa_params/hfa_params.cs
+++ b/src/tests/JIT/Methodical/Invoke/hfa_params/hfa_params.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
 namespace Test_hfa_params
 {
@@ -42,7 +43,8 @@ static bool foo(doublesStruct d1, doublesStruct d2, doublesStruct d3)
         return success;
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         // Test that a function with HFA args gets the expected contents of the structs.
 
diff --git a/src/tests/JIT/Methodical/Invoke/hfa_params/hfa_params_cs_d.csproj b/src/tests/JIT/Methodical/Invoke/hfa_params/hfa_params_cs_d.csproj
index eb9895473eea6c..b4429d7e26d146 100644
--- a/src/tests/JIT/Methodical/Invoke/hfa_params/hfa_params_cs_d.csproj
+++ b/src/tests/JIT/Methodical/Invoke/hfa_params/hfa_params_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/Invoke/hfa_params/hfa_params_cs_do.csproj b/src/tests/JIT/Methodical/Invoke/hfa_params/hfa_params_cs_do.csproj
index 0c1811b796d6fb..264ecb88c69d29 100644
--- a/src/tests/JIT/Methodical/Invoke/hfa_params/hfa_params_cs_do.csproj
+++ b/src/tests/JIT/Methodical/Invoke/hfa_params/hfa_params_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/Invoke/hfa_params/hfa_params_cs_r.csproj b/src/tests/JIT/Methodical/Invoke/hfa_params/hfa_params_cs_r.csproj
index 94cc711940c2f8..fc50543be3caa0 100644
--- a/src/tests/JIT/Methodical/Invoke/hfa_params/hfa_params_cs_r.csproj
+++ b/src/tests/JIT/Methodical/Invoke/hfa_params/hfa_params_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/Invoke/hfa_params/hfa_params_cs_ro.csproj b/src/tests/JIT/Methodical/Invoke/hfa_params/hfa_params_cs_ro.csproj
index 35271733831034..2961237f04d301 100644
--- a/src/tests/JIT/Methodical/Invoke/hfa_params/hfa_params_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/Invoke/hfa_params/hfa_params_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/fr4.il b/src/tests/JIT/Methodical/Invoke/implicit/fr4.il
index a52dd7fa71c2dd..5fbe9c9ee8fc02 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/fr4.il
+++ b/src/tests/JIT/Methodical/Invoke/implicit/fr4.il
@@ -21,9 +21,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {B1A03CB5-0762-4E9F-BA39-E5C10C9A69AE}
-.namespace JitTest
+.namespace JitTest_fr4_implicit_il
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends ['mscorlib']System.Object
   {
     .method private hidebysig instance void 
@@ -56,7 +56,7 @@
       			throw
     } // end of method 'Test::MulTest'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -68,11 +68,11 @@
       .locals (int32 V_0)
       .try
       {
-        IL_0000:  newobj     instance void JitTest.Test::.ctor()
+        IL_0000:  newobj     instance void JitTest_fr4_implicit_il.Test::.ctor()
         IL_0005:  ldc.r8     0.12345679
         IL_000a:  ldc.r8     123456789.0
         IL_000f:  ldc.r8     15241579.4
-        IL_0014:  call       instance void JitTest.Test::MulTest(float32, float32, float32)
+        IL_0014:  call       instance void JitTest_fr4_implicit_il.Test::MulTest(float32, float32, float32)
         IL_0019:  leave.s    IL_002a
       }  // end .try
       catch ['mscorlib']System.Object 
@@ -107,6 +107,6 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_fr4_implicit_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/fr4_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/fr4_il_d.ilproj
index 778ae01e3909df..e7397cd571426a 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/fr4_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/implicit/fr4_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/fr4_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/fr4_il_r.ilproj
index 3bc158a3916aca..e9b0707d3993f2 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/fr4_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/implicit/fr4_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/fr8.il b/src/tests/JIT/Methodical/Invoke/implicit/fr8.il
index a95905a8650760..f2cedeb50eb91d 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/fr8.il
+++ b/src/tests/JIT/Methodical/Invoke/implicit/fr8.il
@@ -21,9 +21,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {B1A03CB5-0762-4E9F-BA39-E5C10C9A69AE}
-.namespace JitTest
+.namespace JitTest_fr8_implicit_il
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends ['mscorlib']System.Object
   {
     .method private hidebysig instance void 
@@ -56,7 +56,7 @@
       			throw
     } // end of method 'Test::MulTest'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -68,11 +68,11 @@
       .locals (int32 V_0)
       .try
       {
-        IL_0000:  newobj     instance void JitTest.Test::.ctor()
+        IL_0000:  newobj     instance void JitTest_fr8_implicit_il.Test::.ctor()
         IL_0005:  ldc.r8     0.12345679
         IL_000a:  ldc.r8     123456789.0
         IL_000f:  ldc.r8     15241579.4
-        IL_0014:  call       instance void JitTest.Test::MulTest(float64, float64, float64)
+        IL_0014:  call       instance void JitTest_fr8_implicit_il.Test::MulTest(float64, float64, float64)
         IL_0019:  leave.s    IL_002a
       }  // end .try
       catch ['mscorlib']System.Object 
@@ -107,6 +107,6 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_fr8_implicit_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/fr8_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/fr8_il_d.ilproj
index 419c1091a3b05c..86ba6e51d4177f 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/fr8_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/implicit/fr8_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/fr8_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/fr8_il_r.ilproj
index ea833e713bd1f7..f9bebd2ff1f1bf 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/fr8_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/implicit/fr8_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i4i1.il b/src/tests/JIT/Methodical/Invoke/implicit/i4i1.il
index 7da5c0e087d025..cf945d3828e9eb 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/i4i1.il
+++ b/src/tests/JIT/Methodical/Invoke/implicit/i4i1.il
@@ -24,9 +24,9 @@
   
 }
 .assembly extern xunit.core {}
-.namespace TestCase
+.namespace TestCase_i4i1_il
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends ['mscorlib']System.Object
   {
     .method private hidebysig static int8 compare(int8 arg1, int8 arg2) il managed
@@ -81,7 +81,7 @@
       IL_0019:  ret
     } // end of method 'Test::compare'
 
-    .method private hidebysig static int32 Main() il managed
+    .method public hidebysig static int32 Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
           01 00 00 00
@@ -91,7 +91,7 @@
       .locals (int32 V_0)
       IL_0000:  ldc.i4 0xfffffff2
       IL_0001:  ldc.i4 0xfff2
-      IL_0002:  call       int8 TestCase.Test::compare(int8,
+      IL_0002:  call       int8 TestCase_i4i1_il.Test::compare(int8,
                                                         int8)
                 dup
                 ldc.i4.1
@@ -138,5 +138,5 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'TestCase'
+} // end of namespace 'TestCase_i4i1_il'
 
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i4i1_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/i4i1_il_d.ilproj
index 6d606204851c77..b7850b8d8bec53 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/i4i1_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/implicit/i4i1_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i4i1_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/i4i1_il_r.ilproj
index 2f09d6bfeab627..0c508aae8eba7a 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/i4i1_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/implicit/i4i1_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i4i2.il b/src/tests/JIT/Methodical/Invoke/implicit/i4i2.il
index 21f71a576ac00a..d7acf0994fa96f 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/i4i2.il
+++ b/src/tests/JIT/Methodical/Invoke/implicit/i4i2.il
@@ -24,9 +24,9 @@
   
 }
 .assembly extern xunit.core {}
-.namespace TestCase
+.namespace TestCase_i4i2_il
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends ['mscorlib']System.Object
   {
     .method private hidebysig static int16 compare(int16 arg1, int16 arg2) il managed
@@ -81,7 +81,7 @@
       IL_0019:  ret
     } // end of method 'Test::compare'
 
-    .method private hidebysig static int32 Main() il managed
+    .method public hidebysig static int32 Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
           01 00 00 00
@@ -91,7 +91,7 @@
       .locals (int32 V_0)
       IL_0000:  ldc.i4 0xfffffff2
       IL_0001:  ldc.i4 0xfff2
-      IL_0002:  call       int16 TestCase.Test::compare(int16,
+      IL_0002:  call       int16 TestCase_i4i2_il.Test::compare(int16,
                                                         int16)
                 dup
                 ldc.i4.1
@@ -138,5 +138,5 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'TestCase'
+} // end of namespace 'TestCase_i4i2_il'
 
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i4i2_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/i4i2_il_d.ilproj
index c90e2a6d04ede6..c0a32ad6439027 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/i4i2_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/implicit/i4i2_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i4i2_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/i4i2_il_r.ilproj
index 2d6f39b7e4715e..b0dbdd3c39bb11 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/i4i2_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/implicit/i4i2_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i4u1.il b/src/tests/JIT/Methodical/Invoke/implicit/i4u1.il
index 722be108a108c4..552310481cc6a1 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/i4u1.il
+++ b/src/tests/JIT/Methodical/Invoke/implicit/i4u1.il
@@ -24,9 +24,9 @@
   
 }
 .assembly extern xunit.core {}
-.namespace TestCase
+.namespace TestCase_i4u1_il
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends ['mscorlib']System.Object
   {
     .method private hidebysig static int32 
@@ -74,7 +74,7 @@
       IL_0019:  ret
     } // end of method 'Test::compare'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -85,7 +85,7 @@
       .locals (int32 V_0)
       IL_0000:  ldc.i4 0x00002
       IL_0001:  ldc.i4 0x20002
-      IL_0002:  call       int32 TestCase.Test::compare(unsigned int8,
+      IL_0002:  call       int32 TestCase_i4u1_il.Test::compare(unsigned int8,
                                                         unsigned int8)
       IL_0007:  brfalse.s  IL_0017
 
@@ -116,5 +116,5 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'TestCase'
+} // end of namespace 'TestCase_i4u1_il'
 
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i4u1_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/i4u1_il_d.ilproj
index 00382a49f62147..7cdf32699f6fef 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/i4u1_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/implicit/i4u1_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i4u1_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/i4u1_il_r.ilproj
index 1b5ed944e07c92..d22c814e1e3595 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/i4u1_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/implicit/i4u1_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i4u2.il b/src/tests/JIT/Methodical/Invoke/implicit/i4u2.il
index 7916f7a2e29bae..c6c09120257342 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/i4u2.il
+++ b/src/tests/JIT/Methodical/Invoke/implicit/i4u2.il
@@ -21,9 +21,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {37F05BF1-E8CC-42FA-A268-D866F07CFFF8}
-.namespace TestCase
+.namespace TestCase_i4u2_il
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends ['mscorlib']System.Object
   {
     .method private hidebysig static int32 
@@ -57,7 +57,7 @@
       IL_0019:  ret
     } // end of method 'Test::compare'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -69,7 +69,7 @@
       .locals (int32 V_0)
       IL_0000:  ldc.i4 0x00002
       IL_0001:  ldc.i4 0x20002
-      IL_0002:  call       int32 TestCase.Test::compare(unsigned int16,
+      IL_0002:  call       int32 TestCase_i4u2_il.Test::compare(unsigned int16,
                                                         unsigned int16)
       IL_0007:  brfalse.s  IL_0017
 
@@ -101,6 +101,6 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'TestCase'
+} // end of namespace 'TestCase_i4u2_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i4u2_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/i4u2_il_d.ilproj
index df5b9ceb1be753..b7a7aa719ff136 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/i4u2_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/implicit/i4u2_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i4u2_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/i4u2_il_r.ilproj
index c9b39fc7914813..6bfbb3b017e4a5 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/i4u2_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/implicit/i4u2_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i4u4.il b/src/tests/JIT/Methodical/Invoke/implicit/i4u4.il
index 6b962a741493cd..fb170f807c5083 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/i4u4.il
+++ b/src/tests/JIT/Methodical/Invoke/implicit/i4u4.il
@@ -21,9 +21,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {B4ADAE94-5F38-493D-A41E-0ED51F697371}
-.namespace TestCase
+.namespace TestCase_i4u4_il
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends ['mscorlib']System.Object
   {
     .method private hidebysig static int32 
@@ -57,7 +57,7 @@
       IL_0015:  ret
     } // end of method 'Test::compare'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -69,7 +69,7 @@
       .locals (int32 V_0)
       IL_0000:  ldc.i4.1
       IL_0001:  ldc.i4.m1
-      IL_0002:  call       int32 TestCase.Test::compare(unsigned int32,
+      IL_0002:  call       int32 TestCase_i4u4_il.Test::compare(unsigned int32,
                                                         unsigned int32)
       IL_0007:  ldc.i4.0
       IL_0008:  blt.s      IL_0018
@@ -102,6 +102,6 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'TestCase'
+} // end of namespace 'TestCase_i4u4_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i4u4_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/i4u4_il_d.ilproj
index 529f067021bba3..412f892a09fa32 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/i4u4_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/implicit/i4u4_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i4u4_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/i4u4_il_r.ilproj
index fc80bed8b3fdb8..87923b3a6ba44e 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/i4u4_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/implicit/i4u4_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i8u8.il b/src/tests/JIT/Methodical/Invoke/implicit/i8u8.il
index d6ea5f3229f603..b06702c520f6d2 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/i8u8.il
+++ b/src/tests/JIT/Methodical/Invoke/implicit/i8u8.il
@@ -21,9 +21,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {FBE787B7-6007-478A-AA78-9465C2020C0C}
-.namespace TestCase
+.namespace TestCase_i8u8_il
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends ['mscorlib']System.Object
   {
     .method private hidebysig static int32 
@@ -57,7 +57,7 @@
       IL_0015:  ret
     } // end of method 'Test::compare'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -69,7 +69,7 @@
       .locals (int32 V_0)
       IL_0000:  ldc.i8 1
       IL_0002:  ldc.i8 -1
-      IL_0004:  call       int32 TestCase.Test::compare(unsigned int64,
+      IL_0004:  call       int32 TestCase_i8u8_il.Test::compare(unsigned int64,
                                                         unsigned int64)
       IL_0009:  ldc.i4.0
       IL_000a:  blt.s      IL_001a
@@ -102,6 +102,6 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'TestCase'
+} // end of namespace 'TestCase_i8u8_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i8u8_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/i8u8_il_d.ilproj
index f07b30e4c4bb91..ade0fbdb6af51c 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/i8u8_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/implicit/i8u8_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i8u8_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/i8u8_il_r.ilproj
index 7fa242ab30c711..8aab3d10217a57 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/i8u8_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/implicit/i8u8_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/ii1.il b/src/tests/JIT/Methodical/Invoke/implicit/ii1.il
index dd09ba03079bb3..ff58b7bb1d6b14 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/ii1.il
+++ b/src/tests/JIT/Methodical/Invoke/implicit/ii1.il
@@ -21,9 +21,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {37F05BF1-E8CC-42FA-A268-D866F07CFFF8}
-.namespace TestCase
+.namespace TestCase_ii1_il
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends ['mscorlib']System.Object
   {
     .method private hidebysig static int32 compare(int8 arg1, int8 arg2) il managed
@@ -79,7 +79,7 @@
       IL_0019:  ret
     } // end of method 'Test::compare'
 
-    .method private hidebysig static int32 Main() il managed
+    .method public hidebysig static int32 Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
           01 00 00 00
@@ -92,7 +92,7 @@
       			conv.i
       IL_0001:  ldc.i4 0xfff2
       			conv.i
-      IL_0002:  call       int32 TestCase.Test::compare(int8,
+      IL_0002:  call       int32 TestCase_ii1_il.Test::compare(int8,
                                                         int8)
       IL_0007:  brfalse.s  IL_0017
 
@@ -124,6 +124,6 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'TestCase'
+} // end of namespace 'TestCase_ii1_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/ii1_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/ii1_il_d.ilproj
index ea891bc8b64edf..e28f11170cad3e 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/ii1_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/implicit/ii1_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/ii1_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/ii1_il_r.ilproj
index d884f6e786d1c4..71051a6d216527 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/ii1_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/implicit/ii1_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/ii2.il b/src/tests/JIT/Methodical/Invoke/implicit/ii2.il
index 12396c47b5e8b6..f9be11852e29b9 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/ii2.il
+++ b/src/tests/JIT/Methodical/Invoke/implicit/ii2.il
@@ -21,9 +21,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {37F05BF1-E8CC-42FA-A268-D866F07CFFF8}
-.namespace TestCase
+.namespace TestCase_ii2_il
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends ['mscorlib']System.Object
   {
     .method private hidebysig static int32 compare(int16 arg1, int16 arg2) il managed
@@ -79,7 +79,7 @@
       IL_0019:  ret
     } // end of method 'Test::compare'
 
-    .method private hidebysig static int32 Main() il managed
+    .method public hidebysig static int32 Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
           01 00 00 00
@@ -92,7 +92,7 @@
       			conv.i
       IL_0001:  ldc.i4 0xfff2
       			conv.i
-      IL_0002:  call       int32 TestCase.Test::compare(int16,
+      IL_0002:  call       int32 TestCase_ii2_il.Test::compare(int16,
                                                         int16)
       IL_0007:  brfalse.s  IL_0017
 
@@ -124,6 +124,6 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'TestCase'
+} // end of namespace 'TestCase_ii2_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/ii2_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/ii2_il_d.ilproj
index 8f503c370b6791..6c26e0dd0f8b6b 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/ii2_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/implicit/ii2_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/ii2_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/ii2_il_r.ilproj
index 2655646b1e68d9..6ab4e029932aa6 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/ii2_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/implicit/ii2_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/ii4.il b/src/tests/JIT/Methodical/Invoke/implicit/ii4.il
index f84d50872068e8..c12a398d342d79 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/ii4.il
+++ b/src/tests/JIT/Methodical/Invoke/implicit/ii4.il
@@ -21,9 +21,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {B4ADAE94-5F38-493D-A41E-0ED51F697371}
-.namespace TestCase
+.namespace TestCase_ii4_il
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends ['mscorlib']System.Object
   {
     .method private hidebysig static int32 
@@ -66,7 +66,7 @@
       IL_0015:  ret
     } // end of method 'Test::compare'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -80,7 +80,7 @@
       			conv.i
       IL_0001:  ldc.i4.m1
       			conv.i
-      IL_0002:  call       int32 TestCase.Test::compare(int32,
+      IL_0002:  call       int32 TestCase_ii4_il.Test::compare(int32,
                                                         int32)
       IL_0007:  ldc.i4.0
       IL_0008:  bgt.s      IL_0018
@@ -113,6 +113,6 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'TestCase'
+} // end of namespace 'TestCase_ii4_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/ii4_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/ii4_il_d.ilproj
index 39a2bd7662ffc3..3afc5c20d7319b 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/ii4_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/implicit/ii4_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/ii4_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/ii4_il_r.ilproj
index d6aafc20a32c05..74ca866aef120d 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/ii4_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/implicit/ii4_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/iu1.il b/src/tests/JIT/Methodical/Invoke/implicit/iu1.il
index 6480890d8bc0d3..5b2c9f4c0c6735 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/iu1.il
+++ b/src/tests/JIT/Methodical/Invoke/implicit/iu1.il
@@ -24,9 +24,9 @@
   
 }
 .assembly extern xunit.core {}
-.namespace TestCase
+.namespace TestCase_iu1_il
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends ['mscorlib']System.Object
   {
     .method private hidebysig int32 
@@ -75,7 +75,7 @@
       IL_0019:  ret
     } // end of method 'Test::compare'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -84,12 +84,12 @@
       .entrypoint
       .maxstack  3
       .locals (int32 V_0)
-      			newobj		instance void TestCase.Test::.ctor()
+      			newobj		instance void TestCase_iu1_il.Test::.ctor()
       IL_0000:  ldc.i4 0xfffff2
       			conv.i
       IL_0001:  ldc.i4 0xfff2
       			conv.i
-      IL_0002:  call       instance int32 TestCase.Test::compare(unsigned int8,
+      IL_0002:  call       instance int32 TestCase_iu1_il.Test::compare(unsigned int8,
                                                         unsigned int8)
       IL_0007:  brfalse.s  IL_0017
 
@@ -120,5 +120,5 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'TestCase'
+} // end of namespace 'TestCase_iu1_il'
 
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/iu1_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/iu1_il_d.ilproj
index 7e631ca2074ff9..69ba95d14bd8a9 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/iu1_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/implicit/iu1_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/iu1_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/iu1_il_r.ilproj
index a04ef450bce049..0411635612c6b7 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/iu1_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/implicit/iu1_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/iu2.il b/src/tests/JIT/Methodical/Invoke/implicit/iu2.il
index b0c0fb3ac1a868..aa1dede658372b 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/iu2.il
+++ b/src/tests/JIT/Methodical/Invoke/implicit/iu2.il
@@ -21,9 +21,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {37F05BF1-E8CC-42FA-A268-D866F07CFFF8}
-.namespace TestCase
+.namespace TestCase_iu2_il
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends ['mscorlib']System.Object
   {
     .method private hidebysig int32 
@@ -57,7 +57,7 @@
       IL_0019:  ret
     } // end of method 'Test::compare'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -67,12 +67,12 @@
       // Code size       39 (0x27)
       .maxstack  3
       .locals (int32 V_0)
-      			newobj		instance void TestCase.Test::.ctor()
+      			newobj		instance void TestCase_iu2_il.Test::.ctor()
       IL_0000:  ldc.i4 0xfffff2
       			conv.i
       IL_0001:  ldc.i4 0xfff2
       			conv.i
-      IL_0002:  call       instance int32 TestCase.Test::compare(unsigned int16,
+      IL_0002:  call       instance int32 TestCase_iu2_il.Test::compare(unsigned int16,
                                                         unsigned int16)
       IL_0007:  brfalse.s  IL_0017
 
@@ -104,6 +104,6 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'TestCase'
+} // end of namespace 'TestCase_iu2_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/iu2_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/iu2_il_d.ilproj
index 60efd97337b975..05e8ba4f961173 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/iu2_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/implicit/iu2_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/iu2_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/iu2_il_r.ilproj
index 819505f2b4adf4..6a4b1b3d390065 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/iu2_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/implicit/iu2_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/iu4.il b/src/tests/JIT/Methodical/Invoke/implicit/iu4.il
index d35e75c625171d..2cafc17b554b10 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/iu4.il
+++ b/src/tests/JIT/Methodical/Invoke/implicit/iu4.il
@@ -21,9 +21,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {B4ADAE94-5F38-493D-A41E-0ED51F697371}
-.namespace TestCase
+.namespace TestCase_iu4_il
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends ['mscorlib']System.Object
   {
     .method private hidebysig static int32 
@@ -57,7 +57,7 @@
       IL_0015:  ret
     } // end of method 'Test::compare'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -71,7 +71,7 @@
       			conv.i
       IL_0001:  ldc.i4.m1
       			conv.i
-      IL_0002:  call       int32 TestCase.Test::compare(unsigned int32,
+      IL_0002:  call       int32 TestCase_iu4_il.Test::compare(unsigned int32,
                                                         unsigned int32)
       IL_0007:  ldc.i4.0
       IL_0008:  blt.s      IL_0018
@@ -104,6 +104,6 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'TestCase'
+} // end of namespace 'TestCase_iu4_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/iu4_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/iu4_il_d.ilproj
index 7b11a654a30064..4e19e42c60fc12 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/iu4_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/implicit/iu4_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/iu4_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/iu4_il_r.ilproj
index 2d55445dae5594..19e07afbb7a3fe 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/iu4_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/implicit/iu4_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/obj.cs b/src/tests/JIT/Methodical/Invoke/implicit/obj.cs
index 6bea2ea340647a..6d0b12ed403e17 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/obj.cs
+++ b/src/tests/JIT/Methodical/Invoke/implicit/obj.cs
@@ -2,15 +2,16 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_obj_implicit_cs
 {
-    internal class Base
+    public class Base
     {
         public override String ToString() { return "Base class"; }
     }
 
-    internal class Test : Base
+    public class Test : Base
     {
         public override String ToString() { return "Test class"; }
 
@@ -19,7 +20,8 @@ private static void TestFunc(Base obj)
             Console.WriteLine(obj.ToString());
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             try
             {
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/obj_d.csproj b/src/tests/JIT/Methodical/Invoke/implicit/obj_d.csproj
index 5cce1ed491e525..611011a1f3dc94 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/obj_d.csproj
+++ b/src/tests/JIT/Methodical/Invoke/implicit/obj_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/obj_do.csproj b/src/tests/JIT/Methodical/Invoke/implicit/obj_do.csproj
index 4432620d07812b..a11b139f0bf6e9 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/obj_do.csproj
+++ b/src/tests/JIT/Methodical/Invoke/implicit/obj_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/obj_r.csproj b/src/tests/JIT/Methodical/Invoke/implicit/obj_r.csproj
index 2bbd31437c6576..6839bca24a6499 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/obj_r.csproj
+++ b/src/tests/JIT/Methodical/Invoke/implicit/obj_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/obj_ro.csproj b/src/tests/JIT/Methodical/Invoke/implicit/obj_ro.csproj
index aa5477f58c7527..6375b0ac7a393c 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/obj_ro.csproj
+++ b/src/tests/JIT/Methodical/Invoke/implicit/obj_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/objref.il b/src/tests/JIT/Methodical/Invoke/implicit/objref.il
index 4010d817478761..8c7ef691386619 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/objref.il
+++ b/src/tests/JIT/Methodical/Invoke/implicit/objref.il
@@ -21,7 +21,7 @@
 }
 .assembly extern xunit.core {}
 // MVID: {4F6CDA4F-13A9-40C8-ADF8-98FBBEF21260}
-.namespace JitTest
+.namespace JitTest_objref_implicit_il
 {
   .class private auto ansi Base extends ['mscorlib']System.Object
   {
@@ -51,7 +51,7 @@
 
   } // end of class 'Base'
 
-  .class private auto ansi Test extends JitTest.Base
+  .class public auto ansi Test extends JitTest_objref_implicit_il.Base
   {
     .method public hidebysig virtual instance class System.String ToString() il managed
     {
@@ -66,29 +66,29 @@
       IL_0009:  ret
     } // end of method 'Test::ToString'
 
-    .method private hidebysig static void TestFunc1(class JitTest.Base& obj) il managed
+    .method private hidebysig static void TestFunc1(class JitTest_objref_implicit_il.Base& obj) il managed
     {
       // Code size       13 (0xd)
       .maxstack  8
       IL_0000:  ldarg.0
       IL_0001:  ldind.ref
-      IL_0002:  callvirt   instance class System.String JitTest.Base::ToString()
+      IL_0002:  callvirt   instance class System.String JitTest_objref_implicit_il.Base::ToString()
       IL_0007:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_000c:  ret
     } // end of method 'Test::TestFunc'
 
-    .method private hidebysig static void TestFunc2(class JitTest.Test& obj) il managed
+    .method private hidebysig static void TestFunc2(class JitTest_objref_implicit_il.Test& obj) il managed
     {
       // Code size       13 (0xd)
       .maxstack  8
       IL_0000:  ldarg.0
       IL_0001:  ldind.ref
-      IL_0002:  callvirt   instance class System.String JitTest.Base::ToString()
+      IL_0002:  callvirt   instance class System.String JitTest_objref_implicit_il.Base::ToString()
       IL_0007:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_000c:  ret
     } // end of method 'Test::TestFunc'
 
-    .method private hidebysig static int32 Main() il managed
+    .method public hidebysig static int32 Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
           01 00 00 00
@@ -96,23 +96,23 @@
       .entrypoint
       // Code size       59 (0x3b)
       .maxstack  1
-      .locals (class JitTest.Base V_0, class JitTest.Test V_1, int32 V_2)
+      .locals (class JitTest_objref_implicit_il.Base V_0, class JitTest_objref_implicit_il.Test V_1, int32 V_2)
       .try
       {
-        newobj     instance void JitTest.Base::.ctor()
+        newobj     instance void JitTest_objref_implicit_il.Base::.ctor()
         stloc.0
-        newobj     instance void JitTest.Test::.ctor()
+        newobj     instance void JitTest_objref_implicit_il.Test::.ctor()
         stloc.1
         
         ldloca.s   V_0
-        call       void JitTest.Test::TestFunc1(class JitTest.Base&)
+        call       void JitTest_objref_implicit_il.Test::TestFunc1(class JitTest_objref_implicit_il.Base&)
         ldloca.s   V_1
-        call       void JitTest.Test::TestFunc1(class JitTest.Base&)
+        call       void JitTest_objref_implicit_il.Test::TestFunc1(class JitTest_objref_implicit_il.Base&)
         leave.s    IL_002b
         ldloca.s   V_0
-        call       void JitTest.Test::TestFunc2(class JitTest.Test&)
+        call       void JitTest_objref_implicit_il.Test::TestFunc2(class JitTest_objref_implicit_il.Test&)
         ldloca.s   V_1
-        call       void JitTest.Test::TestFunc2(class JitTest.Test&)
+        call       void JitTest_objref_implicit_il.Test::TestFunc2(class JitTest_objref_implicit_il.Test&)
         leave.s    IL_002b
 
       }  // end .try
@@ -141,12 +141,12 @@
       // Code size       7 (0x7)
       .maxstack  8
       IL_0000:  ldarg.0
-      IL_0001:  call       instance void JitTest.Base::.ctor()
+      IL_0001:  call       instance void JitTest_objref_implicit_il.Base::.ctor()
       IL_0006:  ret
     } // end of method 'Test::.ctor'
 
   } // end of class 'Test'
 
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_objref_implicit_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/objref_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/objref_il_d.ilproj
index a0bfe68bbdce4e..a80d834a63403a 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/objref_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/implicit/objref_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/objref_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/objref_il_r.ilproj
index 71c184748e3f9a..337684d6c874e3 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/objref_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/implicit/objref_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Invoke/thiscall/thisnull.il b/src/tests/JIT/Methodical/Invoke/thiscall/thisnull.il
index 56dccef0ca7c7d..86afc19892c82d 100644
--- a/src/tests/JIT/Methodical/Invoke/thiscall/thisnull.il
+++ b/src/tests/JIT/Methodical/Invoke/thiscall/thisnull.il
@@ -11,9 +11,9 @@
 {
 }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_thisnull_thiscall
 {
-  .class private auto ansi beforefieldinit App
+  .class public auto ansi beforefieldinit App
          extends [mscorlib]System.Object
   {
     .field private float64 m_field
@@ -27,7 +27,7 @@
       IL_0001:  brfalse.s  IL_000c
 
       IL_0003:  ldarg.0
-      IL_0004:  ldfld      float64 JitTest.App::m_field
+      IL_0004:  ldfld      float64 JitTest_thisnull_thiscall.App::m_field
       IL_0009:  stloc.0
       IL_000a:  br.s       IL_0018
 
@@ -49,7 +49,7 @@
       IL_0001:  brfalse.s  IL_000c
 
       IL_0003:  ldarg.0
-      IL_0004:  ldfld      float64 JitTest.App::m_field
+      IL_0004:  ldfld      float64 JitTest_thisnull_thiscall.App::m_field
       IL_0009:  stloc.0
       IL_000a:  br.s       IL_0018
 
@@ -61,7 +61,7 @@
       IL_0019:  ret
     } // end of method App::VirtTestMethod
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() cil managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -70,13 +70,13 @@
       .entrypoint
       // Code size       95 (0x5f)
       .maxstack  2
-      .locals (class JitTest.App V_0,
+      .locals (class JitTest_thisnull_thiscall.App V_0,
                int32 V_1)
       IL_0000:  ldnull
       IL_0001:  stloc.0
       IL_0002:  ldloc.0
       IL_0003:  ldc.i4.0
-      IL_0004:  call   instance float64 JitTest.App::TestMethod(bool)
+      IL_0004:  call   instance float64 JitTest_thisnull_thiscall.App::TestMethod(bool)
       IL_0009:  ldc.r8     3.1415926000000001
       IL_0012:  beq.s      IL_0022
 
@@ -90,7 +90,7 @@
       {
         IL_0022:  ldloc.0
         IL_0023:  ldc.i4.1
-        IL_0024:  call   instance float64 JitTest.App::TestMethod(bool)
+        IL_0024:  call   instance float64 JitTest_thisnull_thiscall.App::TestMethod(bool)
         IL_0029:  pop
         IL_002a:  ldc.i4.2
         IL_002b:  stloc.1
@@ -107,7 +107,7 @@
       {
         IL_0031:  ldloc.0
         IL_0032:  ldc.i4.0
-        IL_0033:  callvirt   instance float64 JitTest.App::VirtTestMethod(bool)
+        IL_0033:  callvirt   instance float64 JitTest_thisnull_thiscall.App::VirtTestMethod(bool)
         IL_0038:  pop
         IL_0039:  ldc.i4.2
         IL_003a:  stloc.1
@@ -124,7 +124,7 @@
       {
         IL_0040:  ldloc.0
         IL_0041:  ldc.i4.1
-        IL_0042:  callvirt   instance float64 JitTest.App::VirtTestMethod(bool)
+        IL_0042:  callvirt   instance float64 JitTest_thisnull_thiscall.App::VirtTestMethod(bool)
         IL_0047:  pop
         IL_0048:  ldc.i4.2
         IL_0049:  stloc.1
@@ -154,7 +154,7 @@
       .maxstack  8
       IL_0000:  ldarg.0
       IL_0001:  ldc.r8     1.
-      IL_000a:  stfld      float64 JitTest.App::m_field
+      IL_000a:  stfld      float64 JitTest_thisnull_thiscall.App::m_field
       IL_000f:  ldarg.0
       IL_0010:  call       instance void [mscorlib]System.Object::.ctor()
       IL_0015:  ret
@@ -162,7 +162,7 @@
 
   } // end of class App
 
-} // end of namespace JitTest
+} // end of namespace JitTest_thisnull_thiscall
 
 //*********** DISASSEMBLY COMPLETE ***********************
 // WARNING: Created Win32 resource file thisnull.res
diff --git a/src/tests/JIT/Methodical/Invoke/thiscall/thisnull_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/thiscall/thisnull_il_d.ilproj
index ec225c8775c6f2..9303653ee50bee 100644
--- a/src/tests/JIT/Methodical/Invoke/thiscall/thisnull_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/thiscall/thisnull_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/Invoke/thiscall/thisnull_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/thiscall/thisnull_il_r.ilproj
index b1dad17f64b3fa..8cc6fac650ba81 100644
--- a/src/tests/JIT/Methodical/Invoke/thiscall/thisnull_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/thiscall/thisnull_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/bool.cs b/src/tests/JIT/Methodical/MDArray/DataTypes/bool.cs
index 8edf0a94d65a31..07290367103175 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/bool.cs
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/bool.cs
@@ -3,6 +3,7 @@
 //
 
 using System;
+using Xunit;
 
 public struct VT
 {
@@ -25,7 +26,8 @@ public class Bool2D3DArrTest
     static bool[][,] ja1 = new bool[2][,];
     static bool[][, ,] ja2 = new bool[2][, ,];
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
 
         bool pass = true;
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/bool_cs_d.csproj b/src/tests/JIT/Methodical/MDArray/DataTypes/bool_cs_d.csproj
index 8317cf1a673f53..0c8121d59d35de 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/bool_cs_d.csproj
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/bool_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/bool_cs_do.csproj b/src/tests/JIT/Methodical/MDArray/DataTypes/bool_cs_do.csproj
index 3c749bb02f283d..00dfa1dc5eeeb0 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/bool_cs_do.csproj
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/bool_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/bool_cs_r.csproj b/src/tests/JIT/Methodical/MDArray/DataTypes/bool_cs_r.csproj
index 7aac09df78ac42..1ab614913821ea 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/bool_cs_r.csproj
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/bool_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/bool_cs_ro.csproj b/src/tests/JIT/Methodical/MDArray/DataTypes/bool_cs_ro.csproj
index 8c25fd681ff49e..cd51352afca0e7 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/bool_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/bool_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/byte.cs b/src/tests/JIT/Methodical/MDArray/DataTypes/byte.cs
index 6aad4120c2f255..374db66f3560e3 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/byte.cs
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/byte.cs
@@ -3,6 +3,7 @@
 //
 
 using System;
+using Xunit;
 
 public struct VT
 {
@@ -34,7 +35,8 @@ public class byteMDArrTest
     static byte[][,] ja1_b = new byte[2][,];
     static byte[][, ,] ja2_b = new byte[2][, ,];
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
 
         bool pass = true;
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/byte_cs_d.csproj b/src/tests/JIT/Methodical/MDArray/DataTypes/byte_cs_d.csproj
index da1303f152d365..4c6fc6e69b15ff 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/byte_cs_d.csproj
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/byte_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/byte_cs_do.csproj b/src/tests/JIT/Methodical/MDArray/DataTypes/byte_cs_do.csproj
index 58f960e4da2509..f66120f5c086b9 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/byte_cs_do.csproj
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/byte_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/byte_cs_r.csproj b/src/tests/JIT/Methodical/MDArray/DataTypes/byte_cs_r.csproj
index ee09df147c2d43..261e5566d7dc83 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/byte_cs_r.csproj
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/byte_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/byte_cs_ro.csproj b/src/tests/JIT/Methodical/MDArray/DataTypes/byte_cs_ro.csproj
index 7ab49592b2b451..f1bb8a230c6911 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/byte_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/byte_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/char.cs b/src/tests/JIT/Methodical/MDArray/DataTypes/char.cs
index d8063d6f9a30f6..14cb4384bed04f 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/char.cs
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/char.cs
@@ -3,6 +3,7 @@
 //
 
 using System;
+using Xunit;
 
 public struct VT
 {
@@ -25,7 +26,8 @@ public class charMDArrTest
     static char[][,] ja1 = new char[2][,];
     static char[][, ,] ja2 = new char[2][, ,];
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
 
         bool pass = true;
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/char_cs_d.csproj b/src/tests/JIT/Methodical/MDArray/DataTypes/char_cs_d.csproj
index 34b1c8a6f90d0c..b37219c9030674 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/char_cs_d.csproj
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/char_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/char_cs_do.csproj b/src/tests/JIT/Methodical/MDArray/DataTypes/char_cs_do.csproj
index fe607e6835274f..4641bc78ce0292 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/char_cs_do.csproj
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/char_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/char_cs_r.csproj b/src/tests/JIT/Methodical/MDArray/DataTypes/char_cs_r.csproj
index dc5c70cc2acadc..f86c853a03df51 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/char_cs_r.csproj
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/char_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/char_cs_ro.csproj b/src/tests/JIT/Methodical/MDArray/DataTypes/char_cs_ro.csproj
index 017677bee73bfc..2dbc05babd5909 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/char_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/char_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/decimal.cs b/src/tests/JIT/Methodical/MDArray/DataTypes/decimal.cs
index 3dde7c5bd7c55f..5651dcc57280b2 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/decimal.cs
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/decimal.cs
@@ -3,6 +3,7 @@
 //
 
 using System;
+using Xunit;
 
 public struct VT
 {
@@ -33,7 +34,8 @@ public class decimalMDArrTest
     static decimal[][,] ja1_b = new decimal[2][,];
     static decimal[][, ,] ja2_b = new decimal[2][, ,];
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
 
         bool pass = true;
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/decimal_cs_d.csproj b/src/tests/JIT/Methodical/MDArray/DataTypes/decimal_cs_d.csproj
index 5bdfc16db161a6..9eed23b0f5adbc 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/decimal_cs_d.csproj
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/decimal_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/decimal_cs_do.csproj b/src/tests/JIT/Methodical/MDArray/DataTypes/decimal_cs_do.csproj
index da107c703244a1..ed85b7af8e8514 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/decimal_cs_do.csproj
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/decimal_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/decimal_cs_r.csproj b/src/tests/JIT/Methodical/MDArray/DataTypes/decimal_cs_r.csproj
index b80799e85683c4..b1b739899dc234 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/decimal_cs_r.csproj
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/decimal_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/decimal_cs_ro.csproj b/src/tests/JIT/Methodical/MDArray/DataTypes/decimal_cs_ro.csproj
index a71b3f2b68973d..f89c061ab67b4c 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/decimal_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/decimal_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/double.cs b/src/tests/JIT/Methodical/MDArray/DataTypes/double.cs
index 107c96d967151f..3309a4997356c8 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/double.cs
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/double.cs
@@ -3,6 +3,7 @@
 //
 
 using System;
+using Xunit;
 
 public struct VT
 {
@@ -33,7 +34,8 @@ public class doubleMDArrTest
     static double[][,] ja1_b = new double[2][,];
     static double[][, ,] ja2_b = new double[2][, ,];
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
 
         bool pass = true;
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/double_cs_d.csproj b/src/tests/JIT/Methodical/MDArray/DataTypes/double_cs_d.csproj
index 2c072cfe62e468..0b5e5714c74f04 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/double_cs_d.csproj
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/double_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/double_cs_do.csproj b/src/tests/JIT/Methodical/MDArray/DataTypes/double_cs_do.csproj
index 284801087f9627..d2bf76f44415df 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/double_cs_do.csproj
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/double_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/double_cs_r.csproj b/src/tests/JIT/Methodical/MDArray/DataTypes/double_cs_r.csproj
index ffbb4df67de899..50f578bddb68cc 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/double_cs_r.csproj
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/double_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/double_cs_ro.csproj b/src/tests/JIT/Methodical/MDArray/DataTypes/double_cs_ro.csproj
index cea410f5f41c1c..75129c47c52498 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/double_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/double_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/float.cs b/src/tests/JIT/Methodical/MDArray/DataTypes/float.cs
index f9d71ef3232415..651196612ce5c7 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/float.cs
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/float.cs
@@ -3,6 +3,7 @@
 //
 
 using System;
+using Xunit;
 
 public struct VT
 {
@@ -33,7 +34,8 @@ public class floatMDArrTest
     static float[][,] ja1_b = new float[2][,];
     static float[][, ,] ja2_b = new float[2][, ,];
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
 
         bool pass = true;
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/float_cs_d.csproj b/src/tests/JIT/Methodical/MDArray/DataTypes/float_cs_d.csproj
index 6055a81a4acd01..464d58d710cdc1 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/float_cs_d.csproj
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/float_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/float_cs_do.csproj b/src/tests/JIT/Methodical/MDArray/DataTypes/float_cs_do.csproj
index 465c48bd87b2da..3bfc6cad62b2c3 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/float_cs_do.csproj
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/float_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/float_cs_r.csproj b/src/tests/JIT/Methodical/MDArray/DataTypes/float_cs_r.csproj
index 2e36ace56c4970..3203113766fc79 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/float_cs_r.csproj
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/float_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/float_cs_ro.csproj b/src/tests/JIT/Methodical/MDArray/DataTypes/float_cs_ro.csproj
index 8213f6d1320441..de0e72b3e8b4c9 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/float_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/float_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/int.cs b/src/tests/JIT/Methodical/MDArray/DataTypes/int.cs
index 6b86a9a618c440..90303200e3f70d 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/int.cs
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/int.cs
@@ -3,6 +3,7 @@
 //
 
 using System;
+using Xunit;
 
 public struct VT
 {
@@ -42,7 +43,8 @@ public class intMDArrTest
 
 
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
 
         bool pass = true;
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/int_cs_d.csproj b/src/tests/JIT/Methodical/MDArray/DataTypes/int_cs_d.csproj
index ae0a6be5e29f36..7eefde30191b14 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/int_cs_d.csproj
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/int_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/int_cs_do.csproj b/src/tests/JIT/Methodical/MDArray/DataTypes/int_cs_do.csproj
index 5363e4daba4e4c..43c627c15d9135 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/int_cs_do.csproj
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/int_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/int_cs_r.csproj b/src/tests/JIT/Methodical/MDArray/DataTypes/int_cs_r.csproj
index 2285b81fe92661..8b9c6537ab0690 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/int_cs_r.csproj
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/int_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/int_cs_ro.csproj b/src/tests/JIT/Methodical/MDArray/DataTypes/int_cs_ro.csproj
index 1a411e280feb03..6f1a579557a220 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/int_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/int_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/long.cs b/src/tests/JIT/Methodical/MDArray/DataTypes/long.cs
index b0649235c0341b..da68fe99b4ff19 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/long.cs
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/long.cs
@@ -3,6 +3,7 @@
 //
 
 using System;
+using Xunit;
 
 public struct VT
 {
@@ -41,7 +42,8 @@ public class longMDArrTest
     static long[][,] ja1_c = new long[2][,];
     static long[][, ,] ja2_c = new long[2][, ,];
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
 
         bool pass = true;
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/long_cs_d.csproj b/src/tests/JIT/Methodical/MDArray/DataTypes/long_cs_d.csproj
index 5b6b405f8fe1e6..0347b14c8d6b3e 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/long_cs_d.csproj
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/long_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/long_cs_do.csproj b/src/tests/JIT/Methodical/MDArray/DataTypes/long_cs_do.csproj
index c1f7e37153587f..b1342493dcc7f5 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/long_cs_do.csproj
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/long_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/long_cs_r.csproj b/src/tests/JIT/Methodical/MDArray/DataTypes/long_cs_r.csproj
index d58269b5cd306d..c74ddc6b4ac49d 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/long_cs_r.csproj
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/long_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/long_cs_ro.csproj b/src/tests/JIT/Methodical/MDArray/DataTypes/long_cs_ro.csproj
index a292176dbb736c..71491f4179cfeb 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/long_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/long_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/sbyte.cs b/src/tests/JIT/Methodical/MDArray/DataTypes/sbyte.cs
index 51adfc37f8f528..b87f2e8dd57305 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/sbyte.cs
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/sbyte.cs
@@ -3,6 +3,7 @@
 //
 
 using System;
+using Xunit;
 
 public struct VT
 {
@@ -33,7 +34,8 @@ public class sbyteMDArrTest
     static sbyte[][,] ja1_b = new sbyte[2][,];
     static sbyte[][, ,] ja2_b = new sbyte[2][, ,];
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
 
         bool pass = true;
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/sbyte_cs_d.csproj b/src/tests/JIT/Methodical/MDArray/DataTypes/sbyte_cs_d.csproj
index 581f1a45e7d288..94e32357926549 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/sbyte_cs_d.csproj
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/sbyte_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/sbyte_cs_do.csproj b/src/tests/JIT/Methodical/MDArray/DataTypes/sbyte_cs_do.csproj
index b7c7793d50b2b4..703974e4979080 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/sbyte_cs_do.csproj
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/sbyte_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/sbyte_cs_r.csproj b/src/tests/JIT/Methodical/MDArray/DataTypes/sbyte_cs_r.csproj
index 30da4edb086d7b..a390883cd8e3be 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/sbyte_cs_r.csproj
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/sbyte_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/sbyte_cs_ro.csproj b/src/tests/JIT/Methodical/MDArray/DataTypes/sbyte_cs_ro.csproj
index 85ce9c90b0dffc..052c79d0da4564 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/sbyte_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/sbyte_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/short.cs b/src/tests/JIT/Methodical/MDArray/DataTypes/short.cs
index 06fe7c895ece3c..1292a35d60c01e 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/short.cs
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/short.cs
@@ -3,6 +3,7 @@
 //
 
 using System;
+using Xunit;
 
 public struct VT
 {
@@ -33,7 +34,8 @@ public class shortMDArrTest
     static short[][,] ja1_b = new short[2][,];
     static short[][, ,] ja2_b = new short[2][, ,];
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
 
         bool pass = true;
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/short_cs_d.csproj b/src/tests/JIT/Methodical/MDArray/DataTypes/short_cs_d.csproj
index 3d709524379bf2..753cc7fc93f5a2 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/short_cs_d.csproj
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/short_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/short_cs_do.csproj b/src/tests/JIT/Methodical/MDArray/DataTypes/short_cs_do.csproj
index bf6c6f4d5aadc9..231f1ec3906a15 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/short_cs_do.csproj
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/short_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/short_cs_r.csproj b/src/tests/JIT/Methodical/MDArray/DataTypes/short_cs_r.csproj
index 102186e596714a..4601ccff222dac 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/short_cs_r.csproj
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/short_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/short_cs_ro.csproj b/src/tests/JIT/Methodical/MDArray/DataTypes/short_cs_ro.csproj
index 1278f9211e041c..b0c5ea988569fe 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/short_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/short_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/uint.cs b/src/tests/JIT/Methodical/MDArray/DataTypes/uint.cs
index 8aa85e1a3fc907..50c785be76871c 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/uint.cs
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/uint.cs
@@ -3,6 +3,7 @@
 //
 
 using System;
+using Xunit;
 
 public struct VT
 {
@@ -33,7 +34,8 @@ public class uintMDArrTest
     static uint[][,] ja1_b = new uint[2][,];
     static uint[][, ,] ja2_b = new uint[2][, ,];
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
 
         bool pass = true;
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/uint_cs_d.csproj b/src/tests/JIT/Methodical/MDArray/DataTypes/uint_cs_d.csproj
index 019d68b1006baa..8cd16c0c896f1c 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/uint_cs_d.csproj
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/uint_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/uint_cs_do.csproj b/src/tests/JIT/Methodical/MDArray/DataTypes/uint_cs_do.csproj
index f4d0064bcc7508..9662d192d59f53 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/uint_cs_do.csproj
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/uint_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/uint_cs_r.csproj b/src/tests/JIT/Methodical/MDArray/DataTypes/uint_cs_r.csproj
index 3e895f5b6a03d6..68321a84d5b995 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/uint_cs_r.csproj
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/uint_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/uint_cs_ro.csproj b/src/tests/JIT/Methodical/MDArray/DataTypes/uint_cs_ro.csproj
index 2e2b1abde38f99..88089a23f70e55 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/uint_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/uint_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/ulong.cs b/src/tests/JIT/Methodical/MDArray/DataTypes/ulong.cs
index e0f3fe5149f6d5..1bbe44887214d3 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/ulong.cs
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/ulong.cs
@@ -3,6 +3,7 @@
 //
 
 using System;
+using Xunit;
 
 public struct VT
 {
@@ -33,7 +34,8 @@ public class ulongMDArrTest
     static ulong[][,] ja1_b = new ulong[2][,];
     static ulong[][, ,] ja2_b = new ulong[2][, ,];
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
 
         bool pass = true;
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/ulong_cs_d.csproj b/src/tests/JIT/Methodical/MDArray/DataTypes/ulong_cs_d.csproj
index a55a314a98769d..f7e9772c936963 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/ulong_cs_d.csproj
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/ulong_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/ulong_cs_do.csproj b/src/tests/JIT/Methodical/MDArray/DataTypes/ulong_cs_do.csproj
index cf5017794dc357..a4e72accaa8a14 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/ulong_cs_do.csproj
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/ulong_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/ulong_cs_r.csproj b/src/tests/JIT/Methodical/MDArray/DataTypes/ulong_cs_r.csproj
index a00d076994ab00..65b0220c0a1be5 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/ulong_cs_r.csproj
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/ulong_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/ulong_cs_ro.csproj b/src/tests/JIT/Methodical/MDArray/DataTypes/ulong_cs_ro.csproj
index 114cef3ad58e2e..becd80f86d5b29 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/ulong_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/ulong_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/ushort.cs b/src/tests/JIT/Methodical/MDArray/DataTypes/ushort.cs
index a9f3c4cf82dfd9..4f1e35e0bd4cfc 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/ushort.cs
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/ushort.cs
@@ -3,6 +3,7 @@
 //
 
 using System;
+using Xunit;
 
 public struct VT
 {
@@ -33,7 +34,8 @@ public class ushortMDArrTest
     static ushort[][,] ja1_b = new ushort[2][,];
     static ushort[][, ,] ja2_b = new ushort[2][, ,];
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
 
         bool pass = true;
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/ushort_cs_d.csproj b/src/tests/JIT/Methodical/MDArray/DataTypes/ushort_cs_d.csproj
index e238e5d817e131..459cedb93eca68 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/ushort_cs_d.csproj
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/ushort_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/ushort_cs_do.csproj b/src/tests/JIT/Methodical/MDArray/DataTypes/ushort_cs_do.csproj
index 8dec90834657e5..2c0edbebd4424a 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/ushort_cs_do.csproj
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/ushort_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/ushort_cs_r.csproj b/src/tests/JIT/Methodical/MDArray/DataTypes/ushort_cs_r.csproj
index 64c4c5b7e02c3a..08d77e95e01de2 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/ushort_cs_r.csproj
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/ushort_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/DataTypes/ushort_cs_ro.csproj b/src/tests/JIT/Methodical/MDArray/DataTypes/ushort_cs_ro.csproj
index 79d3b6fa5b1e34..c18c1e8b093f26 100644
--- a/src/tests/JIT/Methodical/MDArray/DataTypes/ushort_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/MDArray/DataTypes/ushort_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/GaussJordan/classarr_GaussJordan_cs_d.csproj b/src/tests/JIT/Methodical/MDArray/GaussJordan/classarr_GaussJordan_cs_d.csproj
index b403decb86a0ff..7d9e47e5ff1a40 100644
--- a/src/tests/JIT/Methodical/MDArray/GaussJordan/classarr_GaussJordan_cs_d.csproj
+++ b/src/tests/JIT/Methodical/MDArray/GaussJordan/classarr_GaussJordan_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/GaussJordan/classarr_GaussJordan_cs_do.csproj b/src/tests/JIT/Methodical/MDArray/GaussJordan/classarr_GaussJordan_cs_do.csproj
index 5d6d368ba2d755..f69c3c32a88a28 100644
--- a/src/tests/JIT/Methodical/MDArray/GaussJordan/classarr_GaussJordan_cs_do.csproj
+++ b/src/tests/JIT/Methodical/MDArray/GaussJordan/classarr_GaussJordan_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/MDArray/GaussJordan/classarr_GaussJordan_cs_r.csproj b/src/tests/JIT/Methodical/MDArray/GaussJordan/classarr_GaussJordan_cs_r.csproj
index 482125683d030b..5114d79e78c41b 100644
--- a/src/tests/JIT/Methodical/MDArray/GaussJordan/classarr_GaussJordan_cs_r.csproj
+++ b/src/tests/JIT/Methodical/MDArray/GaussJordan/classarr_GaussJordan_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/GaussJordan/classarr_GaussJordan_cs_ro.csproj b/src/tests/JIT/Methodical/MDArray/GaussJordan/classarr_GaussJordan_cs_ro.csproj
index 184b06a1f99259..e688c56182c883 100644
--- a/src/tests/JIT/Methodical/MDArray/GaussJordan/classarr_GaussJordan_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/MDArray/GaussJordan/classarr_GaussJordan_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/MDArray/GaussJordan/jaggedarr.cs b/src/tests/JIT/Methodical/MDArray/GaussJordan/jaggedarr.cs
index e8b1b092d29060..6f01ff3a9577ef 100644
--- a/src/tests/JIT/Methodical/MDArray/GaussJordan/jaggedarr.cs
+++ b/src/tests/JIT/Methodical/MDArray/GaussJordan/jaggedarr.cs
@@ -4,8 +4,9 @@
 //Solving AX=B and the inverse of A with Gauss-Jordan algorithm
 
 using System;
+using Xunit;
 
-internal class jaggedarr
+public class jaggedarr
 {
     public static double[][,] jaggeda;
     public static double[][,] jaggedb;
@@ -87,7 +88,8 @@ public static void gaussj(double[][,] a, int n, double[][,] b, int m)
         }
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         bool pass = false;
 
diff --git a/src/tests/JIT/Methodical/MDArray/GaussJordan/jaggedarr_GaussJordan_cs_d.csproj b/src/tests/JIT/Methodical/MDArray/GaussJordan/jaggedarr_GaussJordan_cs_d.csproj
index ea0bcd42700348..19d97893fb5b24 100644
--- a/src/tests/JIT/Methodical/MDArray/GaussJordan/jaggedarr_GaussJordan_cs_d.csproj
+++ b/src/tests/JIT/Methodical/MDArray/GaussJordan/jaggedarr_GaussJordan_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/GaussJordan/jaggedarr_GaussJordan_cs_do.csproj b/src/tests/JIT/Methodical/MDArray/GaussJordan/jaggedarr_GaussJordan_cs_do.csproj
index 19c96ce529078e..69994ed5d9ea73 100644
--- a/src/tests/JIT/Methodical/MDArray/GaussJordan/jaggedarr_GaussJordan_cs_do.csproj
+++ b/src/tests/JIT/Methodical/MDArray/GaussJordan/jaggedarr_GaussJordan_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/MDArray/GaussJordan/jaggedarr_GaussJordan_cs_r.csproj b/src/tests/JIT/Methodical/MDArray/GaussJordan/jaggedarr_GaussJordan_cs_r.csproj
index 38752472d16df6..8a50b699d34265 100644
--- a/src/tests/JIT/Methodical/MDArray/GaussJordan/jaggedarr_GaussJordan_cs_r.csproj
+++ b/src/tests/JIT/Methodical/MDArray/GaussJordan/jaggedarr_GaussJordan_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/GaussJordan/jaggedarr_GaussJordan_cs_ro.csproj b/src/tests/JIT/Methodical/MDArray/GaussJordan/jaggedarr_GaussJordan_cs_ro.csproj
index de02ea92468314..4af2dc59f2a14b 100644
--- a/src/tests/JIT/Methodical/MDArray/GaussJordan/jaggedarr_GaussJordan_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/MDArray/GaussJordan/jaggedarr_GaussJordan_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/MDArray/GaussJordan/plainarr.cs b/src/tests/JIT/Methodical/MDArray/GaussJordan/plainarr.cs
index a0e28f17b6dba8..9bd82bbbd1d8bf 100644
--- a/src/tests/JIT/Methodical/MDArray/GaussJordan/plainarr.cs
+++ b/src/tests/JIT/Methodical/MDArray/GaussJordan/plainarr.cs
@@ -4,8 +4,9 @@
 //Solving AX=B and the inverse of A with Gauss-Jordan algorithm
 
 using System;
+using Xunit;
 
-internal class plainarr
+public class plainarr
 {
     private static double s_tolerance = 0.0000000000001;
     public static bool AreEqual(double left, double right)
@@ -84,7 +85,8 @@ public static void gaussj(double[,] a, int n, double[,] b, int m)
         }
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         bool pass = false;
 
diff --git a/src/tests/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_d.csproj b/src/tests/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_d.csproj
index a4e0ca738dec42..13cfec1fb63a68 100644
--- a/src/tests/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_d.csproj
+++ b/src/tests/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_do.csproj b/src/tests/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_do.csproj
index 2e421c5c553b8c..f4d0ded42316ac 100644
--- a/src/tests/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_do.csproj
+++ b/src/tests/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_r.csproj b/src/tests/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_r.csproj
index 97324b64394261..071c9317d56701 100644
--- a/src/tests/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_r.csproj
+++ b/src/tests/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_ro.csproj b/src/tests/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_ro.csproj
index 7252aec596f8b3..33db54aeef3379 100644
--- a/src/tests/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/MDArray/GaussJordan/structarr_GaussJordan_cs_d.csproj b/src/tests/JIT/Methodical/MDArray/GaussJordan/structarr_GaussJordan_cs_d.csproj
index 45e7a7bb76ae0b..1e2c2233f77ca1 100644
--- a/src/tests/JIT/Methodical/MDArray/GaussJordan/structarr_GaussJordan_cs_d.csproj
+++ b/src/tests/JIT/Methodical/MDArray/GaussJordan/structarr_GaussJordan_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/GaussJordan/structarr_GaussJordan_cs_do.csproj b/src/tests/JIT/Methodical/MDArray/GaussJordan/structarr_GaussJordan_cs_do.csproj
index c0b4738d0b1c4d..b5c32456236138 100644
--- a/src/tests/JIT/Methodical/MDArray/GaussJordan/structarr_GaussJordan_cs_do.csproj
+++ b/src/tests/JIT/Methodical/MDArray/GaussJordan/structarr_GaussJordan_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/MDArray/GaussJordan/structarr_GaussJordan_cs_r.csproj b/src/tests/JIT/Methodical/MDArray/GaussJordan/structarr_GaussJordan_cs_r.csproj
index 031f57f712e9ee..87bd03e993c416 100644
--- a/src/tests/JIT/Methodical/MDArray/GaussJordan/structarr_GaussJordan_cs_r.csproj
+++ b/src/tests/JIT/Methodical/MDArray/GaussJordan/structarr_GaussJordan_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/GaussJordan/structarr_GaussJordan_cs_ro.csproj b/src/tests/JIT/Methodical/MDArray/GaussJordan/structarr_GaussJordan_cs_ro.csproj
index 19241161e324d0..8f4ce659ede9eb 100644
--- a/src/tests/JIT/Methodical/MDArray/GaussJordan/structarr_GaussJordan_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/MDArray/GaussJordan/structarr_GaussJordan_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/MDArray/InnerProd/classarr.cs b/src/tests/JIT/Methodical/MDArray/InnerProd/classarr.cs
index e9eb77de4ee558..e55008d21ffcc1 100644
--- a/src/tests/JIT/Methodical/MDArray/InnerProd/classarr.cs
+++ b/src/tests/JIT/Methodical/MDArray/InnerProd/classarr.cs
@@ -4,7 +4,10 @@
 //Inner Product of two 2D array
 
 using System;
+using Xunit;
 
+namespace Test_classarr_InnerProd
+{
 public class ArrayClass
 {
     public int[,] a2d;
@@ -120,7 +123,8 @@ public static void InnerProduct3DRef(out int res, int[][] a3d, int[][] b, int ro
         }
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         bool pass = false;
 
@@ -243,3 +247,4 @@ string seedStr when int.TryParse(seedStr, out int envSeed) => envSeed,
         }
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/MDArray/InnerProd/classarr_InnerProd_cs_d.csproj b/src/tests/JIT/Methodical/MDArray/InnerProd/classarr_InnerProd_cs_d.csproj
index b403decb86a0ff..7d9e47e5ff1a40 100644
--- a/src/tests/JIT/Methodical/MDArray/InnerProd/classarr_InnerProd_cs_d.csproj
+++ b/src/tests/JIT/Methodical/MDArray/InnerProd/classarr_InnerProd_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/InnerProd/classarr_InnerProd_cs_do.csproj b/src/tests/JIT/Methodical/MDArray/InnerProd/classarr_InnerProd_cs_do.csproj
index 7b2aa4aa7eba84..48c35fde4e691a 100644
--- a/src/tests/JIT/Methodical/MDArray/InnerProd/classarr_InnerProd_cs_do.csproj
+++ b/src/tests/JIT/Methodical/MDArray/InnerProd/classarr_InnerProd_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/InnerProd/classarr_InnerProd_cs_r.csproj b/src/tests/JIT/Methodical/MDArray/InnerProd/classarr_InnerProd_cs_r.csproj
index 482125683d030b..5114d79e78c41b 100644
--- a/src/tests/JIT/Methodical/MDArray/InnerProd/classarr_InnerProd_cs_r.csproj
+++ b/src/tests/JIT/Methodical/MDArray/InnerProd/classarr_InnerProd_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/InnerProd/classarr_InnerProd_cs_ro.csproj b/src/tests/JIT/Methodical/MDArray/InnerProd/classarr_InnerProd_cs_ro.csproj
index 3fe7c1f47bef64..19ea8d2814304b 100644
--- a/src/tests/JIT/Methodical/MDArray/InnerProd/classarr_InnerProd_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/MDArray/InnerProd/classarr_InnerProd_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/InnerProd/doublearr.cs b/src/tests/JIT/Methodical/MDArray/InnerProd/doublearr.cs
index 7c8913b30e7f45..7c212ddd8f7bcd 100644
--- a/src/tests/JIT/Methodical/MDArray/InnerProd/doublearr.cs
+++ b/src/tests/JIT/Methodical/MDArray/InnerProd/doublearr.cs
@@ -2,7 +2,10 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
+namespace Test_doublearr_InnerProd
+{
 public class doublemm
 {
     public static Random rand;
@@ -114,7 +117,8 @@ public static void InnerProduct3DRef(out double res, double[][] a, double[][] b,
         }
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         bool pass = false;
 
@@ -240,3 +244,4 @@ string seedStr when int.TryParse(seedStr, out int envSeed) => envSeed,
         }
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/MDArray/InnerProd/doublearr_InnerProd_cs_d.csproj b/src/tests/JIT/Methodical/MDArray/InnerProd/doublearr_InnerProd_cs_d.csproj
index 053b60fc13853c..4c0d77324fee5b 100644
--- a/src/tests/JIT/Methodical/MDArray/InnerProd/doublearr_InnerProd_cs_d.csproj
+++ b/src/tests/JIT/Methodical/MDArray/InnerProd/doublearr_InnerProd_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/InnerProd/doublearr_InnerProd_cs_do.csproj b/src/tests/JIT/Methodical/MDArray/InnerProd/doublearr_InnerProd_cs_do.csproj
index 84c65542ba6bbd..f8b336279b1728 100644
--- a/src/tests/JIT/Methodical/MDArray/InnerProd/doublearr_InnerProd_cs_do.csproj
+++ b/src/tests/JIT/Methodical/MDArray/InnerProd/doublearr_InnerProd_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/MDArray/InnerProd/doublearr_InnerProd_cs_r.csproj b/src/tests/JIT/Methodical/MDArray/InnerProd/doublearr_InnerProd_cs_r.csproj
index 783bc9f9c79f6e..71b566b5c13c09 100644
--- a/src/tests/JIT/Methodical/MDArray/InnerProd/doublearr_InnerProd_cs_r.csproj
+++ b/src/tests/JIT/Methodical/MDArray/InnerProd/doublearr_InnerProd_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/InnerProd/doublearr_InnerProd_cs_ro.csproj b/src/tests/JIT/Methodical/MDArray/InnerProd/doublearr_InnerProd_cs_ro.csproj
index daa0c4a316cf11..4f370680e9f4b0 100644
--- a/src/tests/JIT/Methodical/MDArray/InnerProd/doublearr_InnerProd_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/MDArray/InnerProd/doublearr_InnerProd_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/MDArray/InnerProd/intarr.cs b/src/tests/JIT/Methodical/MDArray/InnerProd/intarr.cs
index 7d1f0cfb98e7a1..78b2bfd7e9fd48 100644
--- a/src/tests/JIT/Methodical/MDArray/InnerProd/intarr.cs
+++ b/src/tests/JIT/Methodical/MDArray/InnerProd/intarr.cs
@@ -2,7 +2,10 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
+namespace Test_intarr_InnerProd
+{
 public class intmm
 {
     public static int size;
@@ -101,7 +104,8 @@ public static void InnerProduct3DRef(out int res, int[][] a, int[][] b, int row,
         }
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         bool pass = false;
 
@@ -227,3 +231,4 @@ string seedStr when int.TryParse(seedStr, out int envSeed) => envSeed,
         }
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/MDArray/InnerProd/intarr_cs_d.csproj b/src/tests/JIT/Methodical/MDArray/InnerProd/intarr_cs_d.csproj
index 684e60d3ea22c1..eab81c392e1182 100644
--- a/src/tests/JIT/Methodical/MDArray/InnerProd/intarr_cs_d.csproj
+++ b/src/tests/JIT/Methodical/MDArray/InnerProd/intarr_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/InnerProd/intarr_cs_do.csproj b/src/tests/JIT/Methodical/MDArray/InnerProd/intarr_cs_do.csproj
index f3edb1a407d4eb..f272a66c631eac 100644
--- a/src/tests/JIT/Methodical/MDArray/InnerProd/intarr_cs_do.csproj
+++ b/src/tests/JIT/Methodical/MDArray/InnerProd/intarr_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/MDArray/InnerProd/intarr_cs_r.csproj b/src/tests/JIT/Methodical/MDArray/InnerProd/intarr_cs_r.csproj
index 8812db0773730c..d94ed43f8caef6 100644
--- a/src/tests/JIT/Methodical/MDArray/InnerProd/intarr_cs_r.csproj
+++ b/src/tests/JIT/Methodical/MDArray/InnerProd/intarr_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/InnerProd/intarr_cs_ro.csproj b/src/tests/JIT/Methodical/MDArray/InnerProd/intarr_cs_ro.csproj
index ff1f3322aae53d..44871e505d94bc 100644
--- a/src/tests/JIT/Methodical/MDArray/InnerProd/intarr_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/MDArray/InnerProd/intarr_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/MDArray/InnerProd/jaggedarr.cs b/src/tests/JIT/Methodical/MDArray/InnerProd/jaggedarr.cs
index 1523054dc48157..e2db95651bf30d 100644
--- a/src/tests/JIT/Methodical/MDArray/InnerProd/jaggedarr.cs
+++ b/src/tests/JIT/Methodical/MDArray/InnerProd/jaggedarr.cs
@@ -2,7 +2,10 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
+namespace Test_jaggedarr_InnerProd
+{
 public class doublemm
 {
     public static Random rand;
@@ -114,7 +117,8 @@ public static void InnerProduct3DRef(out double res, double[][] a, double[][] b,
         }
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         bool pass = false;
 
@@ -246,3 +250,4 @@ string seedStr when int.TryParse(seedStr, out int envSeed) => envSeed,
         }
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/MDArray/InnerProd/jaggedarr_InnerProd_cs_d.csproj b/src/tests/JIT/Methodical/MDArray/InnerProd/jaggedarr_InnerProd_cs_d.csproj
index ea0bcd42700348..19d97893fb5b24 100644
--- a/src/tests/JIT/Methodical/MDArray/InnerProd/jaggedarr_InnerProd_cs_d.csproj
+++ b/src/tests/JIT/Methodical/MDArray/InnerProd/jaggedarr_InnerProd_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/InnerProd/jaggedarr_InnerProd_cs_do.csproj b/src/tests/JIT/Methodical/MDArray/InnerProd/jaggedarr_InnerProd_cs_do.csproj
index 19c96ce529078e..69994ed5d9ea73 100644
--- a/src/tests/JIT/Methodical/MDArray/InnerProd/jaggedarr_InnerProd_cs_do.csproj
+++ b/src/tests/JIT/Methodical/MDArray/InnerProd/jaggedarr_InnerProd_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/MDArray/InnerProd/jaggedarr_InnerProd_cs_r.csproj b/src/tests/JIT/Methodical/MDArray/InnerProd/jaggedarr_InnerProd_cs_r.csproj
index 38752472d16df6..8a50b699d34265 100644
--- a/src/tests/JIT/Methodical/MDArray/InnerProd/jaggedarr_InnerProd_cs_r.csproj
+++ b/src/tests/JIT/Methodical/MDArray/InnerProd/jaggedarr_InnerProd_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/InnerProd/jaggedarr_InnerProd_cs_ro.csproj b/src/tests/JIT/Methodical/MDArray/InnerProd/jaggedarr_InnerProd_cs_ro.csproj
index de02ea92468314..4af2dc59f2a14b 100644
--- a/src/tests/JIT/Methodical/MDArray/InnerProd/jaggedarr_InnerProd_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/MDArray/InnerProd/jaggedarr_InnerProd_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/MDArray/InnerProd/stringarr.cs b/src/tests/JIT/Methodical/MDArray/InnerProd/stringarr.cs
index a26d0e279635d0..02e8d21a8753ac 100644
--- a/src/tests/JIT/Methodical/MDArray/InnerProd/stringarr.cs
+++ b/src/tests/JIT/Methodical/MDArray/InnerProd/stringarr.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
 public class Stringmm
 {
@@ -131,7 +132,8 @@ public static void InnerProduct3DRef(out String res, String[][] a, String[][] b,
         }
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         bool pass = false;
 
diff --git a/src/tests/JIT/Methodical/MDArray/InnerProd/stringarr_InnerProd_cs_d.csproj b/src/tests/JIT/Methodical/MDArray/InnerProd/stringarr_InnerProd_cs_d.csproj
index 132fe99028ef6e..f0a0845255f4a1 100644
--- a/src/tests/JIT/Methodical/MDArray/InnerProd/stringarr_InnerProd_cs_d.csproj
+++ b/src/tests/JIT/Methodical/MDArray/InnerProd/stringarr_InnerProd_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/InnerProd/stringarr_InnerProd_cs_do.csproj b/src/tests/JIT/Methodical/MDArray/InnerProd/stringarr_InnerProd_cs_do.csproj
index 8bb9d0d6b05d49..56a3e3f941c03d 100644
--- a/src/tests/JIT/Methodical/MDArray/InnerProd/stringarr_InnerProd_cs_do.csproj
+++ b/src/tests/JIT/Methodical/MDArray/InnerProd/stringarr_InnerProd_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/MDArray/InnerProd/stringarr_InnerProd_cs_r.csproj b/src/tests/JIT/Methodical/MDArray/InnerProd/stringarr_InnerProd_cs_r.csproj
index 74c3495f20369a..df0113a204b262 100644
--- a/src/tests/JIT/Methodical/MDArray/InnerProd/stringarr_InnerProd_cs_r.csproj
+++ b/src/tests/JIT/Methodical/MDArray/InnerProd/stringarr_InnerProd_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/InnerProd/stringarr_InnerProd_cs_ro.csproj b/src/tests/JIT/Methodical/MDArray/InnerProd/stringarr_InnerProd_cs_ro.csproj
index 0980a19f93df50..d59e9f27058dad 100644
--- a/src/tests/JIT/Methodical/MDArray/InnerProd/stringarr_InnerProd_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/MDArray/InnerProd/stringarr_InnerProd_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/MDArray/InnerProd/structarr.cs b/src/tests/JIT/Methodical/MDArray/InnerProd/structarr.cs
index 7b9d65e5c72460..537787541a5dbb 100644
--- a/src/tests/JIT/Methodical/MDArray/InnerProd/structarr.cs
+++ b/src/tests/JIT/Methodical/MDArray/InnerProd/structarr.cs
@@ -2,7 +2,10 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
+namespace Test_structarr_InnerProd
+{
 public struct ArrayStruct
 {
     public int[,] a2d;
@@ -117,7 +120,8 @@ public static void InnerProduct3DRef(out int res, int[][] a3d, int[][] b, int ro
         }
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         bool pass = false;
 
@@ -243,3 +247,4 @@ string seedStr when int.TryParse(seedStr, out int envSeed) => envSeed,
         }
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/MDArray/InnerProd/structarr_InnerProd_cs_d.csproj b/src/tests/JIT/Methodical/MDArray/InnerProd/structarr_InnerProd_cs_d.csproj
index 45e7a7bb76ae0b..1e2c2233f77ca1 100644
--- a/src/tests/JIT/Methodical/MDArray/InnerProd/structarr_InnerProd_cs_d.csproj
+++ b/src/tests/JIT/Methodical/MDArray/InnerProd/structarr_InnerProd_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/InnerProd/structarr_InnerProd_cs_do.csproj b/src/tests/JIT/Methodical/MDArray/InnerProd/structarr_InnerProd_cs_do.csproj
index b338426bfff3f5..fab39bbae71ba0 100644
--- a/src/tests/JIT/Methodical/MDArray/InnerProd/structarr_InnerProd_cs_do.csproj
+++ b/src/tests/JIT/Methodical/MDArray/InnerProd/structarr_InnerProd_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/InnerProd/structarr_InnerProd_cs_r.csproj b/src/tests/JIT/Methodical/MDArray/InnerProd/structarr_InnerProd_cs_r.csproj
index 031f57f712e9ee..87bd03e993c416 100644
--- a/src/tests/JIT/Methodical/MDArray/InnerProd/structarr_InnerProd_cs_r.csproj
+++ b/src/tests/JIT/Methodical/MDArray/InnerProd/structarr_InnerProd_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/InnerProd/structarr_InnerProd_cs_ro.csproj b/src/tests/JIT/Methodical/MDArray/InnerProd/structarr_InnerProd_cs_ro.csproj
index 7b045eddfe9e98..4208472e59c260 100644
--- a/src/tests/JIT/Methodical/MDArray/InnerProd/structarr_InnerProd_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/MDArray/InnerProd/structarr_InnerProd_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/MDArray/basics/classarr.cs b/src/tests/JIT/Methodical/MDArray/basics/classarr.cs
index a2938aa224eb5a..5e7702b2e61082 100644
--- a/src/tests/JIT/Methodical/MDArray/basics/classarr.cs
+++ b/src/tests/JIT/Methodical/MDArray/basics/classarr.cs
@@ -4,6 +4,7 @@
 //Simple arithmatic manipulation of one 2D array elements
 
 using System;
+using Xunit;
 
 public class Arrayclass
 {
@@ -156,7 +157,8 @@ public static void ProcessJagged3DArray(double[][] a3d)
             }
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         bool pass = false;
 
diff --git a/src/tests/JIT/Methodical/MDArray/basics/classarr_basics_cs_d.csproj b/src/tests/JIT/Methodical/MDArray/basics/classarr_basics_cs_d.csproj
index 5d290fe9742301..04e71b03f23a03 100644
--- a/src/tests/JIT/Methodical/MDArray/basics/classarr_basics_cs_d.csproj
+++ b/src/tests/JIT/Methodical/MDArray/basics/classarr_basics_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/MDArray/basics/classarr_basics_cs_do.csproj b/src/tests/JIT/Methodical/MDArray/basics/classarr_basics_cs_do.csproj
index 5d6d368ba2d755..f69c3c32a88a28 100644
--- a/src/tests/JIT/Methodical/MDArray/basics/classarr_basics_cs_do.csproj
+++ b/src/tests/JIT/Methodical/MDArray/basics/classarr_basics_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/MDArray/basics/classarr_basics_cs_r.csproj b/src/tests/JIT/Methodical/MDArray/basics/classarr_basics_cs_r.csproj
index d481bcc264378b..914f7d83727378 100644
--- a/src/tests/JIT/Methodical/MDArray/basics/classarr_basics_cs_r.csproj
+++ b/src/tests/JIT/Methodical/MDArray/basics/classarr_basics_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/MDArray/basics/classarr_basics_cs_ro.csproj b/src/tests/JIT/Methodical/MDArray/basics/classarr_basics_cs_ro.csproj
index 184b06a1f99259..e688c56182c883 100644
--- a/src/tests/JIT/Methodical/MDArray/basics/classarr_basics_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/MDArray/basics/classarr_basics_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/MDArray/basics/doublearr.cs b/src/tests/JIT/Methodical/MDArray/basics/doublearr.cs
index 06fb8eab3f1f97..58483aa8e686f8 100644
--- a/src/tests/JIT/Methodical/MDArray/basics/doublearr.cs
+++ b/src/tests/JIT/Methodical/MDArray/basics/doublearr.cs
@@ -4,7 +4,10 @@
 //Simple arithmatic manipulation of one 2D array elements
 
 using System;
+using Xunit;
 
+namespace Test_doublearr_basics
+{
 public class double1
 {
     public static Random rand;
@@ -130,7 +133,8 @@ public static void ProcessJagged3DArray(double[][] a)
             }
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         bool pass = false;
 
@@ -259,3 +263,4 @@ string seedStr when int.TryParse(seedStr, out int envSeed) => envSeed,
         }
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/MDArray/basics/doublearr_basics_cs_d.csproj b/src/tests/JIT/Methodical/MDArray/basics/doublearr_basics_cs_d.csproj
index f6a5885cc37f97..d9a216dfc1511f 100644
--- a/src/tests/JIT/Methodical/MDArray/basics/doublearr_basics_cs_d.csproj
+++ b/src/tests/JIT/Methodical/MDArray/basics/doublearr_basics_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/MDArray/basics/doublearr_basics_cs_do.csproj b/src/tests/JIT/Methodical/MDArray/basics/doublearr_basics_cs_do.csproj
index 84c65542ba6bbd..f8b336279b1728 100644
--- a/src/tests/JIT/Methodical/MDArray/basics/doublearr_basics_cs_do.csproj
+++ b/src/tests/JIT/Methodical/MDArray/basics/doublearr_basics_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/MDArray/basics/doublearr_basics_cs_r.csproj b/src/tests/JIT/Methodical/MDArray/basics/doublearr_basics_cs_r.csproj
index 6a5638a9d8e87a..a041bd00fadb31 100644
--- a/src/tests/JIT/Methodical/MDArray/basics/doublearr_basics_cs_r.csproj
+++ b/src/tests/JIT/Methodical/MDArray/basics/doublearr_basics_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/MDArray/basics/doublearr_basics_cs_ro.csproj b/src/tests/JIT/Methodical/MDArray/basics/doublearr_basics_cs_ro.csproj
index daa0c4a316cf11..4f370680e9f4b0 100644
--- a/src/tests/JIT/Methodical/MDArray/basics/doublearr_basics_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/MDArray/basics/doublearr_basics_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/MDArray/basics/jaggedarr.cs b/src/tests/JIT/Methodical/MDArray/basics/jaggedarr.cs
index e2fe98404c6295..962b85b40941da 100644
--- a/src/tests/JIT/Methodical/MDArray/basics/jaggedarr.cs
+++ b/src/tests/JIT/Methodical/MDArray/basics/jaggedarr.cs
@@ -4,7 +4,10 @@
 //Simple arithmatic manipulation of one 2D array elements
 
 using System;
+using Xunit;
 
+namespace Test_jaggedarr_basics
+{
 public class double1
 {
     public static Random rand;
@@ -125,7 +128,8 @@ public static void ProcessJagged3DArray(double[][] a)
             }
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         bool pass = false;
 
@@ -256,3 +260,4 @@ string seedStr when int.TryParse(seedStr, out int envSeed) => envSeed,
         }
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/MDArray/basics/jaggedarr_basics_cs_d.csproj b/src/tests/JIT/Methodical/MDArray/basics/jaggedarr_basics_cs_d.csproj
index adf53b709acd97..f497dfce1954c3 100644
--- a/src/tests/JIT/Methodical/MDArray/basics/jaggedarr_basics_cs_d.csproj
+++ b/src/tests/JIT/Methodical/MDArray/basics/jaggedarr_basics_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/MDArray/basics/jaggedarr_basics_cs_do.csproj b/src/tests/JIT/Methodical/MDArray/basics/jaggedarr_basics_cs_do.csproj
index 19c96ce529078e..69994ed5d9ea73 100644
--- a/src/tests/JIT/Methodical/MDArray/basics/jaggedarr_basics_cs_do.csproj
+++ b/src/tests/JIT/Methodical/MDArray/basics/jaggedarr_basics_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/MDArray/basics/jaggedarr_basics_cs_r.csproj b/src/tests/JIT/Methodical/MDArray/basics/jaggedarr_basics_cs_r.csproj
index 01762ab47610ce..5dd5ff10ef767f 100644
--- a/src/tests/JIT/Methodical/MDArray/basics/jaggedarr_basics_cs_r.csproj
+++ b/src/tests/JIT/Methodical/MDArray/basics/jaggedarr_basics_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/MDArray/basics/jaggedarr_basics_cs_ro.csproj b/src/tests/JIT/Methodical/MDArray/basics/jaggedarr_basics_cs_ro.csproj
index de02ea92468314..4af2dc59f2a14b 100644
--- a/src/tests/JIT/Methodical/MDArray/basics/jaggedarr_basics_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/MDArray/basics/jaggedarr_basics_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/MDArray/basics/stringarr.cs b/src/tests/JIT/Methodical/MDArray/basics/stringarr.cs
index 70e3fa83affc14..46906688065d56 100644
--- a/src/tests/JIT/Methodical/MDArray/basics/stringarr.cs
+++ b/src/tests/JIT/Methodical/MDArray/basics/stringarr.cs
@@ -4,6 +4,7 @@
 //Simple arithmatic manipulation of one 2D array elements
 
 using System;
+using Xunit;
 
 public class string1
 {
@@ -132,7 +133,8 @@ public static void ProcessJagged3DArray(String[][] a)
             }
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         bool pass = false;
 
diff --git a/src/tests/JIT/Methodical/MDArray/basics/stringarr_basics_cs_d.csproj b/src/tests/JIT/Methodical/MDArray/basics/stringarr_basics_cs_d.csproj
index 0bddc6f92bc403..6917472c8c9d11 100644
--- a/src/tests/JIT/Methodical/MDArray/basics/stringarr_basics_cs_d.csproj
+++ b/src/tests/JIT/Methodical/MDArray/basics/stringarr_basics_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/MDArray/basics/stringarr_basics_cs_do.csproj b/src/tests/JIT/Methodical/MDArray/basics/stringarr_basics_cs_do.csproj
index 8bb9d0d6b05d49..56a3e3f941c03d 100644
--- a/src/tests/JIT/Methodical/MDArray/basics/stringarr_basics_cs_do.csproj
+++ b/src/tests/JIT/Methodical/MDArray/basics/stringarr_basics_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/MDArray/basics/stringarr_basics_cs_r.csproj b/src/tests/JIT/Methodical/MDArray/basics/stringarr_basics_cs_r.csproj
index 5f3dce2570a248..ee12f245b94ec6 100644
--- a/src/tests/JIT/Methodical/MDArray/basics/stringarr_basics_cs_r.csproj
+++ b/src/tests/JIT/Methodical/MDArray/basics/stringarr_basics_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/MDArray/basics/stringarr_basics_cs_ro.csproj b/src/tests/JIT/Methodical/MDArray/basics/stringarr_basics_cs_ro.csproj
index 0980a19f93df50..d59e9f27058dad 100644
--- a/src/tests/JIT/Methodical/MDArray/basics/stringarr_basics_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/MDArray/basics/stringarr_basics_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/MDArray/basics/structarr.cs b/src/tests/JIT/Methodical/MDArray/basics/structarr.cs
index 4556ba6aa8e27a..1233b4a8de3415 100644
--- a/src/tests/JIT/Methodical/MDArray/basics/structarr.cs
+++ b/src/tests/JIT/Methodical/MDArray/basics/structarr.cs
@@ -4,6 +4,7 @@
 //Simple arithmatic manipulation of one 2D array elements
 
 using System;
+using Xunit;
 
 public struct ArrayStruct
 {
@@ -150,7 +151,8 @@ public static void ProcessJagged3DArray(double[][] a3d)
             }
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         bool pass = false;
 
diff --git a/src/tests/JIT/Methodical/MDArray/basics/structarr_basics_cs_d.csproj b/src/tests/JIT/Methodical/MDArray/basics/structarr_basics_cs_d.csproj
index 855bcd57805815..273a24d2222ada 100644
--- a/src/tests/JIT/Methodical/MDArray/basics/structarr_basics_cs_d.csproj
+++ b/src/tests/JIT/Methodical/MDArray/basics/structarr_basics_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/MDArray/basics/structarr_basics_cs_do.csproj b/src/tests/JIT/Methodical/MDArray/basics/structarr_basics_cs_do.csproj
index c0b4738d0b1c4d..b5c32456236138 100644
--- a/src/tests/JIT/Methodical/MDArray/basics/structarr_basics_cs_do.csproj
+++ b/src/tests/JIT/Methodical/MDArray/basics/structarr_basics_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/MDArray/basics/structarr_basics_cs_r.csproj b/src/tests/JIT/Methodical/MDArray/basics/structarr_basics_cs_r.csproj
index 41c3d777e7d14b..6330437001a1c7 100644
--- a/src/tests/JIT/Methodical/MDArray/basics/structarr_basics_cs_r.csproj
+++ b/src/tests/JIT/Methodical/MDArray/basics/structarr_basics_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/MDArray/basics/structarr_basics_cs_ro.csproj b/src/tests/JIT/Methodical/MDArray/basics/structarr_basics_cs_ro.csproj
index 19241161e324d0..8f4ce659ede9eb 100644
--- a/src/tests/JIT/Methodical/MDArray/basics/structarr_basics_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/MDArray/basics/structarr_basics_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/NaN/arithm32.cs b/src/tests/JIT/Methodical/NaN/arithm32.cs
index 687b567e6b2add..3e60df9a4ff25c 100644
--- a/src/tests/JIT/Methodical/NaN/arithm32.cs
+++ b/src/tests/JIT/Methodical/NaN/arithm32.cs
@@ -1,4 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
+using Xunit;
+namespace Test_arithm32
+{
 // The .NET Foundation licenses this file to you under the MIT license.
 //
 
@@ -6,7 +9,7 @@ namespace JitTest
 {
     using System;
 
-    class Test
+    public class Test
     {
         static void RunTests(float nan, float plusinf, float minusinf)
         {
@@ -84,7 +87,8 @@ static void RunTests(float nan, float plusinf, float minusinf)
                 throw new Exception("! Single.IsNegativeInfinity(minusinf + minusinf)");
         }
 
-        static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             RunTests(Single.NaN, Single.PositiveInfinity, Single.NegativeInfinity);
             Console.WriteLine("=== PASSED ===");
@@ -92,3 +96,4 @@ static int Main()
         }
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/NaN/arithm32_d.csproj b/src/tests/JIT/Methodical/NaN/arithm32_d.csproj
index 0393187262b021..21ac1e0e2277a4 100644
--- a/src/tests/JIT/Methodical/NaN/arithm32_d.csproj
+++ b/src/tests/JIT/Methodical/NaN/arithm32_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/NaN/arithm32_do.csproj b/src/tests/JIT/Methodical/NaN/arithm32_do.csproj
index 3f3b6b6c80701a..c4f71540a710ca 100644
--- a/src/tests/JIT/Methodical/NaN/arithm32_do.csproj
+++ b/src/tests/JIT/Methodical/NaN/arithm32_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/NaN/arithm32_r.csproj b/src/tests/JIT/Methodical/NaN/arithm32_r.csproj
index 1d4bb8124b1536..aab9e0160bcb06 100644
--- a/src/tests/JIT/Methodical/NaN/arithm32_r.csproj
+++ b/src/tests/JIT/Methodical/NaN/arithm32_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/NaN/arithm32_ro.csproj b/src/tests/JIT/Methodical/NaN/arithm32_ro.csproj
index 0e464aed7200c3..cf6568f602c3b2 100644
--- a/src/tests/JIT/Methodical/NaN/arithm32_ro.csproj
+++ b/src/tests/JIT/Methodical/NaN/arithm32_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/NaN/arithm64.cs b/src/tests/JIT/Methodical/NaN/arithm64.cs
index dc7bf30670d7a8..042590300f81cb 100644
--- a/src/tests/JIT/Methodical/NaN/arithm64.cs
+++ b/src/tests/JIT/Methodical/NaN/arithm64.cs
@@ -1,4 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
+using Xunit;
+namespace Test_arithm64
+{
 // The .NET Foundation licenses this file to you under the MIT license.
 //
 
@@ -6,7 +9,7 @@ namespace JitTest
 {
     using System;
 
-    class Test
+    public class Test
     {
         static void RunTests(double nan, double plusinf, double minusinf)
         {
@@ -84,7 +87,8 @@ static void RunTests(double nan, double plusinf, double minusinf)
                 throw new Exception("! Double.IsNegativeInfinity(minusinf + minusinf)");
         }
 
-        static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             RunTests(Double.NaN, Double.PositiveInfinity, Double.NegativeInfinity);
             Console.WriteLine("=== PASSED ===");
@@ -92,3 +96,4 @@ static int Main()
         }
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/NaN/arithm64_d.csproj b/src/tests/JIT/Methodical/NaN/arithm64_d.csproj
index c24e108444a36b..44cd6d87f5d117 100644
--- a/src/tests/JIT/Methodical/NaN/arithm64_d.csproj
+++ b/src/tests/JIT/Methodical/NaN/arithm64_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>full</DebugType>
diff --git a/src/tests/JIT/Methodical/NaN/arithm64_do.csproj b/src/tests/JIT/Methodical/NaN/arithm64_do.csproj
index c0d4904a06e4d5..0477ad657c295d 100644
--- a/src/tests/JIT/Methodical/NaN/arithm64_do.csproj
+++ b/src/tests/JIT/Methodical/NaN/arithm64_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>full</DebugType>
diff --git a/src/tests/JIT/Methodical/NaN/arithm64_r.csproj b/src/tests/JIT/Methodical/NaN/arithm64_r.csproj
index 0a1a2646677569..f7bbf7c0d96d61 100644
--- a/src/tests/JIT/Methodical/NaN/arithm64_r.csproj
+++ b/src/tests/JIT/Methodical/NaN/arithm64_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/NaN/arithm64_ro.csproj b/src/tests/JIT/Methodical/NaN/arithm64_ro.csproj
index 5baf4cd370ba43..2f19dd595f5194 100644
--- a/src/tests/JIT/Methodical/NaN/arithm64_ro.csproj
+++ b/src/tests/JIT/Methodical/NaN/arithm64_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType />
diff --git a/src/tests/JIT/Methodical/NaN/comp32.il b/src/tests/JIT/Methodical/NaN/comp32.il
index 65dbd9908b4482..6d0a3a421222b1 100644
--- a/src/tests/JIT/Methodical/NaN/comp32.il
+++ b/src/tests/JIT/Methodical/NaN/comp32.il
@@ -9,8 +9,8 @@
 }
 .assembly comp32 { }
 .assembly extern xunit.core {}
-.namespace JitTest {
-.class private auto ansi beforefieldinit Test extends [mscorlib]System.Object
+.namespace JitTest_comp32_NaN_il {
+.class public auto ansi beforefieldinit Test extends [mscorlib]System.Object
 {
 .method private hidebysig static void RunTests(float32 nan,
                      	float32 plusinf, float32 zero, float32 minusinf) cil managed
@@ -662,7 +662,7 @@ IL_THROW:
 	throw
 }
 
-.method private hidebysig static int32 Main() cil managed
+.method public hidebysig static int32 Main() cil managed
 {
 	.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
 	    01 00 00 00
@@ -674,7 +674,7 @@ IL_THROW:
   	ldc.r4     (00 00 80 7F)
   	ldc.r4     0
 	ldc.r4     (00 00 80 FF)
-	call       void JitTest.Test::RunTests(float32,
+	call       void JitTest_comp32_NaN_il.Test::RunTests(float32,
                                            float32,
                                            float32,
                                            float32)
diff --git a/src/tests/JIT/Methodical/NaN/comp32_il_d.ilproj b/src/tests/JIT/Methodical/NaN/comp32_il_d.ilproj
index 5418370c13e9eb..b00ea9c173eeaf 100644
--- a/src/tests/JIT/Methodical/NaN/comp32_il_d.ilproj
+++ b/src/tests/JIT/Methodical/NaN/comp32_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/NaN/comp32_il_r.ilproj b/src/tests/JIT/Methodical/NaN/comp32_il_r.ilproj
index 815a3428128ad5..afdf384577c7d6 100644
--- a/src/tests/JIT/Methodical/NaN/comp32_il_r.ilproj
+++ b/src/tests/JIT/Methodical/NaN/comp32_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/NaN/comp64.il b/src/tests/JIT/Methodical/NaN/comp64.il
index af41601192f9ba..feaa6169d1adff 100644
--- a/src/tests/JIT/Methodical/NaN/comp64.il
+++ b/src/tests/JIT/Methodical/NaN/comp64.il
@@ -9,8 +9,8 @@
 }
 .assembly comp64 { }
 .assembly extern xunit.core {}
-.namespace JitTest {
-.class private auto ansi beforefieldinit Test extends [mscorlib]System.Object
+.namespace JitTest_comp64_NaN_il {
+.class public auto ansi beforefieldinit Test extends [mscorlib]System.Object
 {
 .method private hidebysig static void RunTests(float64 nan,
                      	float64 plusinf, float64 zero, float64 minusinf) cil managed
@@ -662,7 +662,7 @@ IL_THROW:
 	throw
 }
 
-.method private hidebysig static int32 Main() cil managed
+.method public hidebysig static int32 Main() cil managed
 {
 	.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
 	    01 00 00 00
@@ -674,7 +674,7 @@ IL_THROW:
 	ldc.r8     (00 00 00 00 00 00 F0 7F)
 	ldc.r8     0
 	ldc.r8     (00 00 00 00 00 00 F0 FF)
-	call       void JitTest.Test::RunTests(float64,
+	call       void JitTest_comp64_NaN_il.Test::RunTests(float64,
                                            float64,
                                            float64,
                                            float64)
diff --git a/src/tests/JIT/Methodical/NaN/comp64_il_d.ilproj b/src/tests/JIT/Methodical/NaN/comp64_il_d.ilproj
index 7de1bbb849e7a4..ad78f628077815 100644
--- a/src/tests/JIT/Methodical/NaN/comp64_il_d.ilproj
+++ b/src/tests/JIT/Methodical/NaN/comp64_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/NaN/comp64_il_r.ilproj b/src/tests/JIT/Methodical/NaN/comp64_il_r.ilproj
index 09c21c1e8c7e71..a31dd4cddca350 100644
--- a/src/tests/JIT/Methodical/NaN/comp64_il_r.ilproj
+++ b/src/tests/JIT/Methodical/NaN/comp64_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/NaN/cond32.il b/src/tests/JIT/Methodical/NaN/cond32.il
index 31c83a19acb883..a73cfb187d823d 100644
--- a/src/tests/JIT/Methodical/NaN/cond32.il
+++ b/src/tests/JIT/Methodical/NaN/cond32.il
@@ -9,8 +9,8 @@
 }
 .assembly cond32 { }
 .assembly extern xunit.core {}
-.namespace JitTest {
-.class private auto ansi beforefieldinit Test extends [mscorlib]System.Object
+.namespace JitTest_cond32_NaN_il {
+.class public auto ansi beforefieldinit Test extends [mscorlib]System.Object
 {
 .method private hidebysig static void RunTests(float32 nan,
                      	float32 plusinf, float32 zero, float32 minusinf) cil managed
@@ -1302,7 +1302,7 @@ IL_THROW:
 	throw
 }
 
-.method private hidebysig static int32 Main() cil managed
+.method public hidebysig static int32 Main() cil managed
 {
 	.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
 	    01 00 00 00
@@ -1314,7 +1314,7 @@ IL_THROW:
   	ldc.r4     (00 00 80 7F)
   	ldc.r4     0
 	ldc.r4     (00 00 80 FF)
-	call       void JitTest.Test::RunTests(float32,
+	call       void JitTest_cond32_NaN_il.Test::RunTests(float32,
                                            float32,
                                            float32,
                                            float32)
diff --git a/src/tests/JIT/Methodical/NaN/cond32_il_d.ilproj b/src/tests/JIT/Methodical/NaN/cond32_il_d.ilproj
index e9a1c1d7521166..8db5c2ef6b7121 100644
--- a/src/tests/JIT/Methodical/NaN/cond32_il_d.ilproj
+++ b/src/tests/JIT/Methodical/NaN/cond32_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/NaN/cond32_il_r.ilproj b/src/tests/JIT/Methodical/NaN/cond32_il_r.ilproj
index 2b3829c417b35d..cf80067fbf819e 100644
--- a/src/tests/JIT/Methodical/NaN/cond32_il_r.ilproj
+++ b/src/tests/JIT/Methodical/NaN/cond32_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/NaN/cond64.il b/src/tests/JIT/Methodical/NaN/cond64.il
index 8b477637b4cc8e..1acb530bfa2967 100644
--- a/src/tests/JIT/Methodical/NaN/cond64.il
+++ b/src/tests/JIT/Methodical/NaN/cond64.il
@@ -9,8 +9,8 @@
 }
 .assembly cond64 { }
 .assembly extern xunit.core {}
-.namespace JitTest {
-.class private auto ansi beforefieldinit Test extends [mscorlib]System.Object
+.namespace JitTest_cond64_NaN_il {
+.class public auto ansi beforefieldinit Test extends [mscorlib]System.Object
 {
 .method private hidebysig static void RunTests(float64 nan,
                      	float64 plusinf, float64 zero, float64 minusinf) cil managed
@@ -1302,7 +1302,7 @@ IL_THROW:
 	throw
 }
 
-.method private hidebysig static int32 Main() cil managed
+.method public hidebysig static int32 Main() cil managed
 {
 	.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
 	    01 00 00 00
@@ -1314,7 +1314,7 @@ IL_THROW:
 	ldc.r8     (00 00 00 00 00 00 F0 7F)
 	ldc.r8     0
 	ldc.r8     (00 00 00 00 00 00 F0 FF)
-	call       void JitTest.Test::RunTests(float64,
+	call       void JitTest_cond64_NaN_il.Test::RunTests(float64,
                                            float64,
                                            float64,
                                            float64)
diff --git a/src/tests/JIT/Methodical/NaN/cond64_il_d.ilproj b/src/tests/JIT/Methodical/NaN/cond64_il_d.ilproj
index 8fe86db401bd3e..de5bee187933b4 100644
--- a/src/tests/JIT/Methodical/NaN/cond64_il_d.ilproj
+++ b/src/tests/JIT/Methodical/NaN/cond64_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/NaN/cond64_il_r.ilproj b/src/tests/JIT/Methodical/NaN/cond64_il_r.ilproj
index 4a2bd7907207af..b818c6eeb8644a 100644
--- a/src/tests/JIT/Methodical/NaN/cond64_il_r.ilproj
+++ b/src/tests/JIT/Methodical/NaN/cond64_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/NaN/intrinsic.cs b/src/tests/JIT/Methodical/NaN/intrinsic.cs
index 7b45fcd70b5f19..38d906a4ba02fb 100644
--- a/src/tests/JIT/Methodical/NaN/intrinsic.cs
+++ b/src/tests/JIT/Methodical/NaN/intrinsic.cs
@@ -1,11 +1,14 @@
 // Licensed to the .NET Foundation under one or more agreements.
+using Xunit;
+namespace Test_intrinsic
+{
 // The .NET Foundation licenses this file to you under the MIT license.
 
 namespace JitTest
 {
     using System;
 
-    internal class Test
+    public class Test
     {
         private static void Fail(String func, double arg, double exp, double res)
         {
@@ -482,7 +485,8 @@ private static void TestAtan2(double arg1, double arg2, double exp)
             Fail2("Atan2", arg1, arg2, exp, res);
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             try
             {
@@ -598,3 +602,4 @@ private static int Main()
         }
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/NaN/intrinsic_cs_d.csproj b/src/tests/JIT/Methodical/NaN/intrinsic_cs_d.csproj
index 657c13dd92921b..c71235481eb2ac 100644
--- a/src/tests/JIT/Methodical/NaN/intrinsic_cs_d.csproj
+++ b/src/tests/JIT/Methodical/NaN/intrinsic_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/NaN/intrinsic_cs_do.csproj b/src/tests/JIT/Methodical/NaN/intrinsic_cs_do.csproj
index 1450c765986412..ce3d1723430591 100644
--- a/src/tests/JIT/Methodical/NaN/intrinsic_cs_do.csproj
+++ b/src/tests/JIT/Methodical/NaN/intrinsic_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/NaN/intrinsic_cs_r.csproj b/src/tests/JIT/Methodical/NaN/intrinsic_cs_r.csproj
index 482c5c271b4c34..c795356b316bb0 100644
--- a/src/tests/JIT/Methodical/NaN/intrinsic_cs_r.csproj
+++ b/src/tests/JIT/Methodical/NaN/intrinsic_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/NaN/intrinsic_cs_ro.csproj b/src/tests/JIT/Methodical/NaN/intrinsic_cs_ro.csproj
index 869df5d057b876..7b024d7ec8e648 100644
--- a/src/tests/JIT/Methodical/NaN/intrinsic_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/NaN/intrinsic_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/NaN/intrinsic_nonf.il b/src/tests/JIT/Methodical/NaN/intrinsic_nonf.il
index d7261e3efb2ade..4d17c057bdc0e0 100644
--- a/src/tests/JIT/Methodical/NaN/intrinsic_nonf.il
+++ b/src/tests/JIT/Methodical/NaN/intrinsic_nonf.il
@@ -20,9 +20,9 @@
 
 .file alignment 512
 
-.namespace JitTest
+.namespace JitTest_intrinsic_nonf_NaN_il
 {
-  .class private auto ansi beforefieldinit Test
+  .class public auto ansi beforefieldinit Test
          extends [mscorlib]System.Object
   {
     .method private hidebysig static void 
@@ -233,7 +233,7 @@
       IL_00c0:  ldarg.0
       IL_00c1:  ldarg.1
       IL_00c2:  ldloc.0
-      IL_00c3:  call       void JitTest.Test::Fail(string,
+      IL_00c3:  call       void JitTest_intrinsic_nonf_NaN_il.Test::Fail(string,
                                                    float64,
                                                    float64,
                                                    float64)
@@ -342,7 +342,7 @@
       IL_00c0:  ldloc.0
       IL_00c1:  ldarg.0
       IL_00c2:  ldarg.1
-      IL_00c3:  call       void JitTest.Test::Fail(string,
+      IL_00c3:  call       void JitTest_intrinsic_nonf_NaN_il.Test::Fail(string,
                                                    float64,
                                                    float64,
                                                    float64)
@@ -451,7 +451,7 @@
       IL_00c0:  ldloc.0
       IL_00c1:  ldarg.0
       IL_00c2:  ldarg.1
-      IL_00c3:  call       void JitTest.Test::Fail(string,
+      IL_00c3:  call       void JitTest_intrinsic_nonf_NaN_il.Test::Fail(string,
                                                    float64,
                                                    float64,
                                                    float64)
@@ -560,7 +560,7 @@
       IL_00c0:  ldloc.0
       IL_00c1:  ldarg.0
       IL_00c2:  ldarg.1
-      IL_00c3:  call       void JitTest.Test::Fail(string,
+      IL_00c3:  call       void JitTest_intrinsic_nonf_NaN_il.Test::Fail(string,
                                                    float64,
                                                    float64,
                                                    float64)
@@ -669,7 +669,7 @@
       IL_00c0:  ldloc.0
       IL_00c1:  ldarg.0
       IL_00c2:  ldarg.1
-      IL_00c3:  call       void JitTest.Test::Fail(string,
+      IL_00c3:  call       void JitTest_intrinsic_nonf_NaN_il.Test::Fail(string,
                                                    float64,
                                                    float64,
                                                    float64)
@@ -778,7 +778,7 @@
       IL_00c0:  ldloc.0
       IL_00c1:  ldarg.0
       IL_00c2:  ldarg.1
-      IL_00c3:  call       void JitTest.Test::Fail(string,
+      IL_00c3:  call       void JitTest_intrinsic_nonf_NaN_il.Test::Fail(string,
                                                    float64,
                                                    float64,
                                                    float64)
@@ -887,7 +887,7 @@
       IL_00c0:  ldloc.0
       IL_00c1:  ldarg.0
       IL_00c2:  ldarg.1
-      IL_00c3:  call       void JitTest.Test::Fail(string,
+      IL_00c3:  call       void JitTest_intrinsic_nonf_NaN_il.Test::Fail(string,
                                                    float64,
                                                    float64,
                                                    float64)
@@ -996,7 +996,7 @@
       IL_00c0:  ldloc.0
       IL_00c1:  ldarg.0
       IL_00c2:  ldarg.1
-      IL_00c3:  call       void JitTest.Test::Fail(string,
+      IL_00c3:  call       void JitTest_intrinsic_nonf_NaN_il.Test::Fail(string,
                                                    float64,
                                                    float64,
                                                    float64)
@@ -1105,7 +1105,7 @@
       IL_00c0:  ldloc.0
       IL_00c1:  ldarg.0
       IL_00c2:  ldarg.1
-      IL_00c3:  call       void JitTest.Test::Fail(string,
+      IL_00c3:  call       void JitTest_intrinsic_nonf_NaN_il.Test::Fail(string,
                                                    float64,
                                                    float64,
                                                    float64)
@@ -1214,7 +1214,7 @@
       IL_00c0:  ldloc.0
       IL_00c1:  ldarg.0
       IL_00c2:  ldarg.1
-      IL_00c3:  call       void JitTest.Test::Fail(string,
+      IL_00c3:  call       void JitTest_intrinsic_nonf_NaN_il.Test::Fail(string,
                                                    float64,
                                                    float64,
                                                    float64)
@@ -1323,7 +1323,7 @@
       IL_00c0:  ldloc.0
       IL_00c1:  ldarg.0
       IL_00c2:  ldarg.1
-      IL_00c3:  call       void JitTest.Test::Fail(string,
+      IL_00c3:  call       void JitTest_intrinsic_nonf_NaN_il.Test::Fail(string,
                                                    float64,
                                                    float64,
                                                    float64)
@@ -1432,7 +1432,7 @@
       IL_00c0:  ldloc.0
       IL_00c1:  ldarg.0
       IL_00c2:  ldarg.1
-      IL_00c3:  call       void JitTest.Test::Fail(string,
+      IL_00c3:  call       void JitTest_intrinsic_nonf_NaN_il.Test::Fail(string,
                                                    float64,
                                                    float64,
                                                    float64)
@@ -1542,7 +1542,7 @@
       IL_00c1:  ldloc.0
       IL_00c2:  ldarg.0
       IL_00c3:  ldarg.1
-      IL_00c4:  call       void JitTest.Test::Fail(string,
+      IL_00c4:  call       void JitTest_intrinsic_nonf_NaN_il.Test::Fail(string,
                                                    float64,
                                                    float64,
                                                    float64)
@@ -1651,7 +1651,7 @@
       IL_00c0:  ldloc.0
       IL_00c1:  ldarg.0
       IL_00c2:  ldarg.1
-      IL_00c3:  call       void JitTest.Test::Fail(string,
+      IL_00c3:  call       void JitTest_intrinsic_nonf_NaN_il.Test::Fail(string,
                                                    float64,
                                                    float64,
                                                    float64)
@@ -1760,7 +1760,7 @@
       IL_00c0:  ldloc.0
       IL_00c1:  ldarg.0
       IL_00c2:  ldarg.1
-      IL_00c3:  call       void JitTest.Test::Fail(string,
+      IL_00c3:  call       void JitTest_intrinsic_nonf_NaN_il.Test::Fail(string,
                                                    float64,
                                                    float64,
                                                    float64)
@@ -1869,7 +1869,7 @@
       IL_00c0:  ldloc.0
       IL_00c1:  ldarg.0
       IL_00c2:  ldarg.1
-      IL_00c3:  call       void JitTest.Test::Fail(string,
+      IL_00c3:  call       void JitTest_intrinsic_nonf_NaN_il.Test::Fail(string,
                                                    float64,
                                                    float64,
                                                    float64)
@@ -1978,7 +1978,7 @@
       IL_00c0:  ldloc.0
       IL_00c1:  ldarg.0
       IL_00c2:  ldarg.1
-      IL_00c3:  call       void JitTest.Test::Fail(string,
+      IL_00c3:  call       void JitTest_intrinsic_nonf_NaN_il.Test::Fail(string,
                                                    float64,
                                                    float64,
                                                    float64)
@@ -2087,7 +2087,7 @@
       IL_00c0:  ldloc.0
       IL_00c1:  ldarg.0
       IL_00c2:  ldarg.1
-      IL_00c3:  call       void JitTest.Test::Fail(string,
+      IL_00c3:  call       void JitTest_intrinsic_nonf_NaN_il.Test::Fail(string,
                                                    float64,
                                                    float64,
                                                    float64)
@@ -2218,7 +2218,7 @@
       IL_00e6:  ldarg.1
       IL_00e7:  ldarg.2
       IL_00e8:  ldloc.0
-      IL_00e9:  call       void JitTest.Test::Fail2(string,
+      IL_00e9:  call       void JitTest_intrinsic_nonf_NaN_il.Test::Fail2(string,
                                                     float64,
                                                     float64,
                                                     float64,
@@ -2350,7 +2350,7 @@
       IL_00e6:  ldarg.1
       IL_00e7:  ldarg.2
       IL_00e8:  ldloc.0
-      IL_00e9:  call       void JitTest.Test::Fail2(string,
+      IL_00e9:  call       void JitTest_intrinsic_nonf_NaN_il.Test::Fail2(string,
                                                     float64,
                                                     float64,
                                                     float64,
@@ -2482,7 +2482,7 @@
       IL_00e6:  ldarg.1
       IL_00e7:  ldarg.2
       IL_00e8:  ldloc.0
-      IL_00e9:  call       void JitTest.Test::Fail2(string,
+      IL_00e9:  call       void JitTest_intrinsic_nonf_NaN_il.Test::Fail2(string,
                                                     float64,
                                                     float64,
                                                     float64,
@@ -2490,7 +2490,7 @@
       IL_00ee:  ret
     } // end of method Test::TestAtan2
 
-    .method private hidebysig static int32 
+    .method public hidebysig static int32 
             Main() cil managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -2504,376 +2504,376 @@
       {
         IL_0000:  ldc.r8     (FF FF FF FF FF FF FF 7F)
         IL_0009:  ldc.r8     (FF FF FF FF FF FF FF 7F)
-        IL_0012:  call       void JitTest.Test::TestAbs(float64,
+        IL_0012:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestAbs(float64,
                                                         float64)
         IL_0017:  ldc.r8     (00 00 00 00 00 00 F0 FF)
         IL_0020:  ldc.r8     (00 00 00 00 00 00 F0 7F)
-        IL_0029:  call       void JitTest.Test::TestAbs(float64,
+        IL_0029:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestAbs(float64,
                                                         float64)
         IL_002e:  ldc.r8     (00 00 00 00 00 00 F0 7F)
         IL_0037:  ldc.r8     (00 00 00 00 00 00 F0 7F)
-        IL_0040:  call       void JitTest.Test::TestAbs(float64,
+        IL_0040:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestAbs(float64,
                                                         float64)
         IL_0045:  ldc.r8     (FF FF FF FF FF FF FF 7F)
         IL_004e:  ldc.r8     (FF FF FF FF FF FF FF 7F)
-        IL_0057:  call       void JitTest.Test::TestAcos(float64,
+        IL_0057:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestAcos(float64,
                                                          float64)
         IL_005c:  ldc.r8     (00 00 00 00 00 00 F0 FF)
         IL_0065:  ldc.r8     (FF FF FF FF FF FF FF 7F)
-        IL_006e:  call       void JitTest.Test::TestAcos(float64,
+        IL_006e:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestAcos(float64,
                                                          float64)
         IL_0073:  ldc.r8     (00 00 00 00 00 00 F0 7F)
         IL_007c:  ldc.r8     (FF FF FF FF FF FF FF 7F)
-        IL_0085:  call       void JitTest.Test::TestAcos(float64,
+        IL_0085:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestAcos(float64,
                                                          float64)
         IL_008a:  ldc.r8     (FF FF FF FF FF FF FF 7F)
         IL_0093:  ldc.r8     (FF FF FF FF FF FF FF 7F)
-        IL_009c:  call       void JitTest.Test::TestAsin(float64,
+        IL_009c:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestAsin(float64,
                                                          float64)
         IL_00a1:  ldc.r8     (00 00 00 00 00 00 F0 FF)
         IL_00aa:  ldc.r8     (FF FF FF FF FF FF FF 7F)
-        IL_00b3:  call       void JitTest.Test::TestAsin(float64,
+        IL_00b3:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestAsin(float64,
                                                          float64)
         IL_00b8:  ldc.r8     (00 00 00 00 00 00 F0 7F)
         IL_00c1:  ldc.r8     (FF FF FF FF FF FF FF 7F)
-        IL_00ca:  call       void JitTest.Test::TestAsin(float64,
+        IL_00ca:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestAsin(float64,
                                                          float64)
         IL_00cf:  ldc.r8     (FF FF FF FF FF FF FF 7F)
         IL_00d8:  ldc.r8     (FF FF FF FF FF FF FF 7F)
-        IL_00e1:  call       void JitTest.Test::TestAtan(float64,
+        IL_00e1:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestAtan(float64,
                                                          float64)
         IL_00e6:  ldc.r8     (00 00 00 00 00 00 F0 FF)
         IL_00ef:  ldc.r8     -1.5707963267948966
-        IL_00f8:  call       void JitTest.Test::TestAtan(float64,
+        IL_00f8:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestAtan(float64,
                                                          float64)
         IL_00fd:  ldc.r8     (00 00 00 00 00 00 F0 7F)
         IL_0106:  ldc.r8     1.5707963267948966
-        IL_010f:  call       void JitTest.Test::TestAtan(float64,
+        IL_010f:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestAtan(float64,
                                                          float64)
         IL_0114:  ldc.r8     (FF FF FF FF FF FF FF 7F)
         IL_011d:  ldc.r8     (FF FF FF FF FF FF FF 7F)
-        IL_0126:  call       void JitTest.Test::TestCeiling(float64,
+        IL_0126:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestCeiling(float64,
                                                             float64)
         IL_012b:  ldc.r8     (00 00 00 00 00 00 F0 FF)
         IL_0134:  ldc.r8     (00 00 00 00 00 00 F0 FF)
-        IL_013d:  call       void JitTest.Test::TestCeiling(float64,
+        IL_013d:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestCeiling(float64,
                                                             float64)
         IL_0142:  ldc.r8     (00 00 00 00 00 00 F0 7F)
         IL_014b:  ldc.r8     (00 00 00 00 00 00 F0 7F)
-        IL_0154:  call       void JitTest.Test::TestCeiling(float64,
+        IL_0154:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestCeiling(float64,
                                                             float64)
         IL_0159:  ldc.r8     (FF FF FF FF FF FF FF 7F)
         IL_0162:  ldc.r8     (FF FF FF FF FF FF FF 7F)
-        IL_016b:  call       void JitTest.Test::TestCos(float64,
+        IL_016b:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestCos(float64,
                                                         float64)
         IL_0170:  ldc.r8     (00 00 00 00 00 00 F0 FF)
         IL_0179:  ldc.r8     (FF FF FF FF FF FF FF 7F)
-        IL_0182:  call       void JitTest.Test::TestCos(float64,
+        IL_0182:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestCos(float64,
                                                         float64)
         IL_0187:  ldc.r8     (00 00 00 00 00 00 F0 7F)
         IL_0190:  ldc.r8     (FF FF FF FF FF FF FF 7F)
-        IL_0199:  call       void JitTest.Test::TestCos(float64,
+        IL_0199:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestCos(float64,
                                                         float64)
         IL_019e:  ldc.r8     (FF FF FF FF FF FF FF 7F)
         IL_01a7:  ldc.r8     (FF FF FF FF FF FF FF 7F)
-        IL_01b0:  call       void JitTest.Test::TestCosh(float64,
+        IL_01b0:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestCosh(float64,
                                                          float64)
         IL_01b5:  ldc.r8     (00 00 00 00 00 00 F0 FF)
         IL_01be:  ldc.r8     (00 00 00 00 00 00 F0 7F)
-        IL_01c7:  call       void JitTest.Test::TestCosh(float64,
+        IL_01c7:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestCosh(float64,
                                                          float64)
         IL_01cc:  ldc.r8     (00 00 00 00 00 00 F0 7F)
         IL_01d5:  ldc.r8     (00 00 00 00 00 00 F0 7F)
-        IL_01de:  call       void JitTest.Test::TestCosh(float64,
+        IL_01de:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestCosh(float64,
                                                          float64)
         IL_01e3:  ldc.r8     (FF FF FF FF FF FF FF 7F)
         IL_01ec:  ldc.r8     (FF FF FF FF FF FF FF 7F)
-        IL_01f5:  call       void JitTest.Test::TestExp(float64,
+        IL_01f5:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestExp(float64,
                                                         float64)
         IL_01fa:  ldc.r8     (00 00 00 00 00 00 F0 FF)
         IL_0203:  ldc.r8     0.
-        IL_020c:  call       void JitTest.Test::TestExp(float64,
+        IL_020c:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestExp(float64,
                                                         float64)
         IL_0211:  ldc.r8     (00 00 00 00 00 00 F0 7F)
         IL_021a:  ldc.r8     (00 00 00 00 00 00 F0 7F)
-        IL_0223:  call       void JitTest.Test::TestExp(float64,
+        IL_0223:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestExp(float64,
                                                         float64)
         IL_0228:  ldc.r8     (FF FF FF FF FF FF FF 7F)
         IL_0231:  ldc.r8     (FF FF FF FF FF FF FF 7F)
-        IL_023a:  call       void JitTest.Test::TestFloor(float64,
+        IL_023a:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestFloor(float64,
                                                           float64)
         IL_023f:  ldc.r8     (00 00 00 00 00 00 F0 FF)
         IL_0248:  ldc.r8     (00 00 00 00 00 00 F0 FF)
-        IL_0251:  call       void JitTest.Test::TestFloor(float64,
+        IL_0251:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestFloor(float64,
                                                           float64)
         IL_0256:  ldc.r8     (00 00 00 00 00 00 F0 7F)
         IL_025f:  ldc.r8     (00 00 00 00 00 00 F0 7F)
-        IL_0268:  call       void JitTest.Test::TestFloor(float64,
+        IL_0268:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestFloor(float64,
                                                           float64)
         IL_026d:  ldc.r8     (FF FF FF FF FF FF FF 7F)
         IL_0276:  ldc.r8     (FF FF FF FF FF FF FF 7F)
-        IL_027f:  call       void JitTest.Test::TestLog(float64,
+        IL_027f:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestLog(float64,
                                                         float64)
         IL_0284:  ldc.r8     (00 00 00 00 00 00 F0 FF)
         IL_028d:  ldc.r8     (FF FF FF FF FF FF FF 7F)
-        IL_0296:  call       void JitTest.Test::TestLog(float64,
+        IL_0296:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestLog(float64,
                                                         float64)
         IL_029b:  ldc.r8     (00 00 00 00 00 00 F0 7F)
         IL_02a4:  ldc.r8     (00 00 00 00 00 00 F0 7F)
-        IL_02ad:  call       void JitTest.Test::TestLog(float64,
+        IL_02ad:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestLog(float64,
                                                         float64)
         IL_02b2:  ldc.r8     (FF FF FF FF FF FF FF 7F)
         IL_02bb:  ldc.r8     (FF FF FF FF FF FF FF 7F)
-        IL_02c4:  call       void JitTest.Test::TestLog10(float64,
+        IL_02c4:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestLog10(float64,
                                                           float64)
         IL_02c9:  ldc.r8     (00 00 00 00 00 00 F0 FF)
         IL_02d2:  ldc.r8     (FF FF FF FF FF FF FF 7F)
-        IL_02db:  call       void JitTest.Test::TestLog10(float64,
+        IL_02db:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestLog10(float64,
                                                           float64)
         IL_02e0:  ldc.r8     (00 00 00 00 00 00 F0 7F)
         IL_02e9:  ldc.r8     (00 00 00 00 00 00 F0 7F)
-        IL_02f2:  call       void JitTest.Test::TestLog10(float64,
+        IL_02f2:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestLog10(float64,
                                                           float64)
         IL_02f7:  ldc.r8     (FF FF FF FF FF FF FF 7F)
         IL_0300:  ldc.r8     (FF FF FF FF FF FF FF 7F)
-        IL_0309:  call       void JitTest.Test::TestRound(float64,
+        IL_0309:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestRound(float64,
                                                           float64)
         IL_030e:  ldc.r8     (00 00 00 00 00 00 F0 FF)
         IL_0317:  ldc.r8     (00 00 00 00 00 00 F0 FF)
-        IL_0320:  call       void JitTest.Test::TestRound(float64,
+        IL_0320:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestRound(float64,
                                                           float64)
         IL_0325:  ldc.r8     (00 00 00 00 00 00 F0 7F)
         IL_032e:  ldc.r8     (00 00 00 00 00 00 F0 7F)
-        IL_0337:  call       void JitTest.Test::TestRound(float64,
+        IL_0337:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestRound(float64,
                                                           float64)
         IL_033c:  ldc.r8     (00 00 00 00 00 00 F0 FF)
         IL_0345:  ldc.r8     -1.
-        IL_034e:  call       void JitTest.Test::TestSign(float64,
+        IL_034e:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestSign(float64,
                                                          float64)
         IL_0353:  ldc.r8     (00 00 00 00 00 00 F0 7F)
         IL_035c:  ldc.r8     1.
-        IL_0365:  call       void JitTest.Test::TestSign(float64,
+        IL_0365:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestSign(float64,
                                                          float64)
         IL_036a:  ldc.r8     (FF FF FF FF FF FF FF 7F)
         IL_0373:  ldc.r8     (FF FF FF FF FF FF FF 7F)
-        IL_037c:  call       void JitTest.Test::TestSin(float64,
+        IL_037c:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestSin(float64,
                                                         float64)
         IL_0381:  ldc.r8     (00 00 00 00 00 00 F0 FF)
         IL_038a:  ldc.r8     (FF FF FF FF FF FF FF 7F)
-        IL_0393:  call       void JitTest.Test::TestSin(float64,
+        IL_0393:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestSin(float64,
                                                         float64)
         IL_0398:  ldc.r8     (00 00 00 00 00 00 F0 7F)
         IL_03a1:  ldc.r8     (FF FF FF FF FF FF FF 7F)
-        IL_03aa:  call       void JitTest.Test::TestSin(float64,
+        IL_03aa:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestSin(float64,
                                                         float64)
         IL_03af:  ldc.r8     (FF FF FF FF FF FF FF 7F)
         IL_03b8:  ldc.r8     (FF FF FF FF FF FF FF 7F)
-        IL_03c1:  call       void JitTest.Test::TestSinh(float64,
+        IL_03c1:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestSinh(float64,
                                                          float64)
         IL_03c6:  ldc.r8     (00 00 00 00 00 00 F0 FF)
         IL_03cf:  ldc.r8     (00 00 00 00 00 00 F0 FF)
-        IL_03d8:  call       void JitTest.Test::TestSinh(float64,
+        IL_03d8:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestSinh(float64,
                                                          float64)
         IL_03dd:  ldc.r8     (00 00 00 00 00 00 F0 7F)
         IL_03e6:  ldc.r8     (00 00 00 00 00 00 F0 7F)
-        IL_03ef:  call       void JitTest.Test::TestSinh(float64,
+        IL_03ef:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestSinh(float64,
                                                          float64)
         IL_03f4:  ldc.r8     (FF FF FF FF FF FF FF 7F)
         IL_03fd:  ldc.r8     (FF FF FF FF FF FF FF 7F)
-        IL_0406:  call       void JitTest.Test::TestSqrt(float64,
+        IL_0406:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestSqrt(float64,
                                                          float64)
         IL_040b:  ldc.r8     (00 00 00 00 00 00 F0 FF)
         IL_0414:  ldc.r8     (FF FF FF FF FF FF FF 7F)
-        IL_041d:  call       void JitTest.Test::TestSqrt(float64,
+        IL_041d:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestSqrt(float64,
                                                          float64)
         IL_0422:  ldc.r8     (00 00 00 00 00 00 F0 7F)
         IL_042b:  ldc.r8     (00 00 00 00 00 00 F0 7F)
-        IL_0434:  call       void JitTest.Test::TestSqrt(float64,
+        IL_0434:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestSqrt(float64,
                                                          float64)
         IL_0439:  ldc.r8     (FF FF FF FF FF FF FF 7F)
         IL_0442:  ldc.r8     (FF FF FF FF FF FF FF 7F)
-        IL_044b:  call       void JitTest.Test::TestTan(float64,
+        IL_044b:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestTan(float64,
                                                         float64)
         IL_0450:  ldc.r8     (00 00 00 00 00 00 F0 FF)
         IL_0459:  ldc.r8     (FF FF FF FF FF FF FF 7F)
-        IL_0462:  call       void JitTest.Test::TestTan(float64,
+        IL_0462:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestTan(float64,
                                                         float64)
         IL_0467:  ldc.r8     (00 00 00 00 00 00 F0 7F)
         IL_0470:  ldc.r8     (FF FF FF FF FF FF FF 7F)
-        IL_0479:  call       void JitTest.Test::TestTan(float64,
+        IL_0479:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestTan(float64,
                                                         float64)
         IL_047e:  ldc.r8     (FF FF FF FF FF FF FF 7F)
         IL_0487:  ldc.r8     (FF FF FF FF FF FF FF 7F)
-        IL_0490:  call       void JitTest.Test::TestTanh(float64,
+        IL_0490:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestTanh(float64,
                                                          float64)
         IL_0495:  ldc.r8     (00 00 00 00 00 00 F0 FF)
         IL_049e:  ldc.r8     -1.
-        IL_04a7:  call       void JitTest.Test::TestTanh(float64,
+        IL_04a7:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestTanh(float64,
                                                          float64)
         IL_04ac:  ldc.r8     (00 00 00 00 00 00 F0 7F)
         IL_04b5:  ldc.r8     1.
-        IL_04be:  call       void JitTest.Test::TestTanh(float64,
+        IL_04be:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestTanh(float64,
                                                          float64)
         IL_04c3:  ldc.r8     (FF FF FF FF FF FF FF 7F)
         IL_04cc:  ldc.r8     (FF FF FF FF FF FF FF 7F)
         IL_04d5:  ldc.r8     (FF FF FF FF FF FF FF 7F)
-        IL_04de:  call       void JitTest.Test::TestLog2(float64,
+        IL_04de:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestLog2(float64,
                                                          float64,
                                                          float64)
         IL_04e3:  ldc.r8     (FF FF FF FF FF FF FF 7F)
         IL_04ec:  ldc.r8     (00 00 00 00 00 00 F0 7F)
         IL_04f5:  ldc.r8     (FF FF FF FF FF FF FF 7F)
-        IL_04fe:  call       void JitTest.Test::TestLog2(float64,
+        IL_04fe:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestLog2(float64,
                                                          float64,
                                                          float64)
         IL_0503:  ldc.r8     (FF FF FF FF FF FF FF 7F)
         IL_050c:  ldc.r8     (00 00 00 00 00 00 F0 FF)
         IL_0515:  ldc.r8     (FF FF FF FF FF FF FF 7F)
-        IL_051e:  call       void JitTest.Test::TestLog2(float64,
+        IL_051e:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestLog2(float64,
                                                          float64,
                                                          float64)
         IL_0523:  ldc.r8     (00 00 00 00 00 00 F0 7F)
         IL_052c:  ldc.r8     (FF FF FF FF FF FF FF 7F)
         IL_0535:  ldc.r8     (FF FF FF FF FF FF FF 7F)
-        IL_053e:  call       void JitTest.Test::TestLog2(float64,
+        IL_053e:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestLog2(float64,
                                                          float64,
                                                          float64)
         IL_0543:  ldc.r8     (00 00 00 00 00 00 F0 7F)
         IL_054c:  ldc.r8     (00 00 00 00 00 00 F0 7F)
         IL_0555:  ldc.r8     (FF FF FF FF FF FF FF 7F)
-        IL_055e:  call       void JitTest.Test::TestLog2(float64,
+        IL_055e:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestLog2(float64,
                                                          float64,
                                                          float64)
         IL_0563:  ldc.r8     (00 00 00 00 00 00 F0 7F)
         IL_056c:  ldc.r8     (00 00 00 00 00 00 F0 FF)
         IL_0575:  ldc.r8     (FF FF FF FF FF FF FF 7F)
-        IL_057e:  call       void JitTest.Test::TestLog2(float64,
+        IL_057e:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestLog2(float64,
                                                          float64,
                                                          float64)
         IL_0583:  ldc.r8     (00 00 00 00 00 00 F0 FF)
         IL_058c:  ldc.r8     (FF FF FF FF FF FF FF 7F)
         IL_0595:  ldc.r8     (FF FF FF FF FF FF FF 7F)
-        IL_059e:  call       void JitTest.Test::TestLog2(float64,
+        IL_059e:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestLog2(float64,
                                                          float64,
                                                          float64)
         IL_05a3:  ldc.r8     (00 00 00 00 00 00 F0 FF)
         IL_05ac:  ldc.r8     (00 00 00 00 00 00 F0 7F)
         IL_05b5:  ldc.r8     (FF FF FF FF FF FF FF 7F)
-        IL_05be:  call       void JitTest.Test::TestLog2(float64,
+        IL_05be:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestLog2(float64,
                                                          float64,
                                                          float64)
         IL_05c3:  ldc.r8     (00 00 00 00 00 00 F0 FF)
         IL_05cc:  ldc.r8     (00 00 00 00 00 00 F0 FF)
         IL_05d5:  ldc.r8     (FF FF FF FF FF FF FF 7F)
-        IL_05de:  call       void JitTest.Test::TestLog2(float64,
+        IL_05de:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestLog2(float64,
                                                          float64,
                                                          float64)
         IL_05e3:  ldc.r8     (FF FF FF FF FF FF FF 7F)
         IL_05ec:  ldc.r8     (FF FF FF FF FF FF FF 7F)
         IL_05f5:  ldc.r8     (FF FF FF FF FF FF FF 7F)
-        IL_05fe:  call       void JitTest.Test::TestPow(float64,
+        IL_05fe:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestPow(float64,
                                                         float64,
                                                         float64)
         IL_0603:  ldc.r8     (FF FF FF FF FF FF FF 7F)
         IL_060c:  ldc.r8     (00 00 00 00 00 00 F0 7F)
         IL_0615:  ldc.r8     (FF FF FF FF FF FF FF 7F)
-        IL_061e:  call       void JitTest.Test::TestPow(float64,
+        IL_061e:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestPow(float64,
                                                         float64,
                                                         float64)
         IL_0623:  ldc.r8     (FF FF FF FF FF FF FF 7F)
         IL_062c:  ldc.r8     (00 00 00 00 00 00 F0 FF)
         IL_0635:  ldc.r8     (FF FF FF FF FF FF FF 7F)
-        IL_063e:  call       void JitTest.Test::TestPow(float64,
+        IL_063e:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestPow(float64,
                                                         float64,
                                                         float64)
         IL_0643:  ldc.r8     (00 00 00 00 00 00 F0 7F)
         IL_064c:  ldc.r8     (FF FF FF FF FF FF FF 7F)
         IL_0655:  ldc.r8     (FF FF FF FF FF FF FF 7F)
-        IL_065e:  call       void JitTest.Test::TestPow(float64,
+        IL_065e:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestPow(float64,
                                                         float64,
                                                         float64)
         IL_0663:  ldc.r8     (00 00 00 00 00 00 F0 7F)
         IL_066c:  ldc.r8     (00 00 00 00 00 00 F0 7F)
         IL_0675:  ldc.r8     (00 00 00 00 00 00 F0 7F)
-        IL_067e:  call       void JitTest.Test::TestPow(float64,
+        IL_067e:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestPow(float64,
                                                         float64,
                                                         float64)
         IL_0683:  ldc.r8     (00 00 00 00 00 00 F0 7F)
         IL_068c:  ldc.r8     (00 00 00 00 00 00 F0 FF)
         IL_0695:  ldc.r8     0.
-        IL_069e:  call       void JitTest.Test::TestPow(float64,
+        IL_069e:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestPow(float64,
                                                         float64,
                                                         float64)
         IL_06a3:  ldc.r8     (00 00 00 00 00 00 F0 FF)
         IL_06ac:  ldc.r8     (FF FF FF FF FF FF FF 7F)
         IL_06b5:  ldc.r8     (FF FF FF FF FF FF FF 7F)
-        IL_06be:  call       void JitTest.Test::TestPow(float64,
+        IL_06be:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestPow(float64,
                                                         float64,
                                                         float64)
         IL_06c3:  ldc.r8     (00 00 00 00 00 00 F0 FF)
         IL_06cc:  ldc.r8     (00 00 00 00 00 00 F0 7F)
         IL_06d5:  ldc.r8     (00 00 00 00 00 00 F0 7F)
-        IL_06de:  call       void JitTest.Test::TestPow(float64,
+        IL_06de:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestPow(float64,
                                                         float64,
                                                         float64)
         IL_06e3:  ldc.r8     (00 00 00 00 00 00 F0 FF)
         IL_06ec:  ldc.r8     (00 00 00 00 00 00 F0 FF)
         IL_06f5:  ldc.r8     0.
-        IL_06fe:  call       void JitTest.Test::TestPow(float64,
+        IL_06fe:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestPow(float64,
                                                         float64,
                                                         float64)
         IL_0703:  ldc.r8     (FF FF FF FF FF FF FF 7F)
         IL_070c:  ldc.r8     (FF FF FF FF FF FF FF 7F)
         IL_0715:  ldc.r8     (FF FF FF FF FF FF FF 7F)
-        IL_071e:  call       void JitTest.Test::TestAtan2(float64,
+        IL_071e:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestAtan2(float64,
                                                           float64,
                                                           float64)
         IL_0723:  ldc.r8     (FF FF FF FF FF FF FF 7F)
         IL_072c:  ldc.r8     (00 00 00 00 00 00 F0 7F)
         IL_0735:  ldc.r8     (FF FF FF FF FF FF FF 7F)
-        IL_073e:  call       void JitTest.Test::TestAtan2(float64,
+        IL_073e:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestAtan2(float64,
                                                           float64,
                                                           float64)
         IL_0743:  ldc.r8     (FF FF FF FF FF FF FF 7F)
         IL_074c:  ldc.r8     (00 00 00 00 00 00 F0 FF)
         IL_0755:  ldc.r8     (FF FF FF FF FF FF FF 7F)
-        IL_075e:  call       void JitTest.Test::TestAtan2(float64,
+        IL_075e:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestAtan2(float64,
                                                           float64,
                                                           float64)
         IL_0763:  ldc.r8     (00 00 00 00 00 00 F0 7F)
         IL_076c:  ldc.r8     (FF FF FF FF FF FF FF 7F)
         IL_0775:  ldc.r8     (FF FF FF FF FF FF FF 7F)
-        IL_077e:  call       void JitTest.Test::TestAtan2(float64,
+        IL_077e:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestAtan2(float64,
                                                           float64,
                                                           float64)
         IL_0783:  ldc.r8     (00 00 00 00 00 00 F0 7F)
         IL_078c:  ldc.r8     (00 00 00 00 00 00 F0 7F)
         IL_0795:  ldc.r8     0.78539816339744828
-        IL_079e:  call       void JitTest.Test::TestAtan2(float64,
+        IL_079e:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestAtan2(float64,
                                                           float64,
                                                           float64)
         IL_07a3:  ldc.r8     (00 00 00 00 00 00 F0 7F)
         IL_07ac:  ldc.r8     (00 00 00 00 00 00 F0 FF)
         IL_07b5:  ldc.r8     2.3561944901923448
-        IL_07be:  call       void JitTest.Test::TestAtan2(float64,
+        IL_07be:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestAtan2(float64,
                                                           float64,
                                                           float64)
         IL_07c3:  ldc.r8     (00 00 00 00 00 00 F0 FF)
         IL_07cc:  ldc.r8     (FF FF FF FF FF FF FF 7F)
         IL_07d5:  ldc.r8     (FF FF FF FF FF FF FF 7F)
-        IL_07de:  call       void JitTest.Test::TestAtan2(float64,
+        IL_07de:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestAtan2(float64,
                                                           float64,
                                                           float64)
         IL_07e3:  ldc.r8     (00 00 00 00 00 00 F0 FF)
         IL_07ec:  ldc.r8     (00 00 00 00 00 00 F0 7F)
         IL_07f5:  ldc.r8     -0.78539816339744828
-        IL_07fe:  call       void JitTest.Test::TestAtan2(float64,
+        IL_07fe:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestAtan2(float64,
                                                           float64,
                                                           float64)
         IL_0803:  ldc.r8     (00 00 00 00 00 00 F0 FF)
         IL_080c:  ldc.r8     (00 00 00 00 00 00 F0 FF)
         IL_0815:  ldc.r8     -2.3561944901923448
-        IL_081e:  call       void JitTest.Test::TestAtan2(float64,
+        IL_081e:  call       void JitTest_intrinsic_nonf_NaN_il.Test::TestAtan2(float64,
                                                           float64,
                                                           float64)
         IL_0823:  leave.s    IL_0840
@@ -2913,5 +2913,5 @@
 
   } // end of class Test
 
-} // end of namespace JitTest
+} // end of namespace JitTest_intrinsic_nonf_NaN_il
 
diff --git a/src/tests/JIT/Methodical/NaN/intrinsic_nonf_il_d.ilproj b/src/tests/JIT/Methodical/NaN/intrinsic_nonf_il_d.ilproj
index e15f49a9cefff5..474e40eed35cba 100644
--- a/src/tests/JIT/Methodical/NaN/intrinsic_nonf_il_d.ilproj
+++ b/src/tests/JIT/Methodical/NaN/intrinsic_nonf_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/NaN/intrinsic_nonf_il_r.ilproj b/src/tests/JIT/Methodical/NaN/intrinsic_nonf_il_r.ilproj
index 2b85a882725ad4..a63303bba5ea86 100644
--- a/src/tests/JIT/Methodical/NaN/intrinsic_nonf_il_r.ilproj
+++ b/src/tests/JIT/Methodical/NaN/intrinsic_nonf_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/NaN/r4NaNadd.cs b/src/tests/JIT/Methodical/NaN/r4NaNadd.cs
index 92bdc195ef1882..397e599598b55f 100644
--- a/src/tests/JIT/Methodical/NaN/r4NaNadd.cs
+++ b/src/tests/JIT/Methodical/NaN/r4NaNadd.cs
@@ -3,7 +3,8 @@
 //
 
 using System;
-class r4NaNadd
+using Xunit;
+public class r4NaNadd
 {
 
     //user-defined class that overloads operator +
@@ -78,7 +79,8 @@ struct VT
         public float f_vt_test3_op2;
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         bool passed = true;
         //initialize class
diff --git a/src/tests/JIT/Methodical/NaN/r4NaNadd_cs_d.csproj b/src/tests/JIT/Methodical/NaN/r4NaNadd_cs_d.csproj
index bc40bdc6d86ac6..64ec94f4e9bdfa 100644
--- a/src/tests/JIT/Methodical/NaN/r4NaNadd_cs_d.csproj
+++ b/src/tests/JIT/Methodical/NaN/r4NaNadd_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/NaN/r4NaNadd_cs_do.csproj b/src/tests/JIT/Methodical/NaN/r4NaNadd_cs_do.csproj
index a516757b061f0f..26421229e29987 100644
--- a/src/tests/JIT/Methodical/NaN/r4NaNadd_cs_do.csproj
+++ b/src/tests/JIT/Methodical/NaN/r4NaNadd_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/NaN/r4NaNadd_cs_r.csproj b/src/tests/JIT/Methodical/NaN/r4NaNadd_cs_r.csproj
index 9c1904042fcfb6..3953ab994c6838 100644
--- a/src/tests/JIT/Methodical/NaN/r4NaNadd_cs_r.csproj
+++ b/src/tests/JIT/Methodical/NaN/r4NaNadd_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/NaN/r4NaNadd_cs_ro.csproj b/src/tests/JIT/Methodical/NaN/r4NaNadd_cs_ro.csproj
index 7ad0b954637433..eea14ca406805f 100644
--- a/src/tests/JIT/Methodical/NaN/r4NaNadd_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/NaN/r4NaNadd_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/NaN/r4NaNconv.il b/src/tests/JIT/Methodical/NaN/r4NaNconv.il
index e621e741daac0b..4f7ae8bc35de70 100644
--- a/src/tests/JIT/Methodical/NaN/r4NaNconv.il
+++ b/src/tests/JIT/Methodical/NaN/r4NaNconv.il
@@ -12,7 +12,9 @@
 }
 .assembly 'r4NaNconv' {}
 .assembly extern xunit.core {}
-.class private auto ansi beforefieldinit ConvTest
+.namespace Test_r4NaNconv
+{
+.class public auto ansi beforefieldinit ConvTest
        extends [mscorlib]System.Object
 {
 	.method public hidebysig static int8 test1() cil managed 
@@ -432,31 +434,31 @@
     ldc.i4.1
     stloc.0
     
-	call       int8 ConvTest::test1()
+	call       int8 Test_r4NaNconv.ConvTest::test1()
 	pop
-	call       int16 ConvTest::test2()
+	call       int16 Test_r4NaNconv.ConvTest::test2()
 	pop
-	call       int32 ConvTest::test3()
+	call       int32 Test_r4NaNconv.ConvTest::test3()
 	pop
-	call       int64 ConvTest::test4()
+	call       int64 Test_r4NaNconv.ConvTest::test4()
 	pop
-	call       float32 ConvTest::test5()
+	call       float32 Test_r4NaNconv.ConvTest::test5()
 	pop
-	call       float64 ConvTest::test6()
+	call       float64 Test_r4NaNconv.ConvTest::test6()
 	pop
-	call       unsigned int8 ConvTest::test7()
+	call       unsigned int8 Test_r4NaNconv.ConvTest::test7()
 	pop
-	call       unsigned int16 ConvTest::test8()
+	call       unsigned int16 Test_r4NaNconv.ConvTest::test8()
 	pop
-	call       unsigned int32 ConvTest::test9()
+	call       unsigned int32 Test_r4NaNconv.ConvTest::test9()
 	pop
-	call       unsigned int64 ConvTest::test10()
+	call       unsigned int64 Test_r4NaNconv.ConvTest::test10()
 	pop
-	call       int32 ConvTest::test11()
+	call       int32 Test_r4NaNconv.ConvTest::test11()
 	pop
-	call       unsigned int32 ConvTest::test12()
+	call       unsigned int32 Test_r4NaNconv.ConvTest::test12()
 	pop
-	call       float32 ConvTest::test13()
+	call       float32 Test_r4NaNconv.ConvTest::test13()
 	pop
 
 
@@ -464,7 +466,7 @@
 	  {
 	    ldc.i4.0
 	    stloc.0
-	    call       int8 ConvTest::test14()
+	    call       int8 Test_r4NaNconv.ConvTest::test14()
 	    leave.s    Test_15
 	  }  
 	  catch [mscorlib]System.OverflowException 
@@ -481,7 +483,7 @@
 	  {
 	    ldc.i4.0
 	    stloc.0
-	    call       int16 ConvTest::test15()
+	    call       int16 Test_r4NaNconv.ConvTest::test15()
 	    leave.s    Test_16
 	  }  
 	  catch [mscorlib]System.OverflowException 
@@ -498,7 +500,7 @@
 	  {
 	    ldc.i4.0
 	    stloc.0
-	    call       int32 ConvTest::test16()
+	    call       int32 Test_r4NaNconv.ConvTest::test16()
 	    leave.s    Test_17
 	  }  
 	  catch [mscorlib]System.OverflowException 
@@ -515,7 +517,7 @@
 	  {
 	    ldc.i4.0
 	    stloc.0
-	    call       int64 ConvTest::test17()
+	    call       int64 Test_r4NaNconv.ConvTest::test17()
 	    leave.s    Test_18
 	  }  
 	  catch [mscorlib]System.OverflowException 
@@ -532,7 +534,7 @@
 	  {
 	    ldc.i4.0
 	    stloc.0
-	    call       unsigned int8 ConvTest::test18()
+	    call       unsigned int8 Test_r4NaNconv.ConvTest::test18()
 	    leave.s    Test_19
 	  }  
 	  catch [mscorlib]System.OverflowException 
@@ -549,7 +551,7 @@
 	  {
 	    ldc.i4.0
 	    stloc.0
-	    call       unsigned int16 ConvTest::test19()
+	    call       unsigned int16 Test_r4NaNconv.ConvTest::test19()
 	    leave.s    Test_20
 	  }  
 	  catch [mscorlib]System.OverflowException 
@@ -566,7 +568,7 @@
 	  {
 	    ldc.i4.0
 	    stloc.0
-	    call       unsigned int32 ConvTest::test20()
+	    call       unsigned int32 Test_r4NaNconv.ConvTest::test20()
 	    leave.s    Test_21
 	  }  
 	  catch [mscorlib]System.OverflowException 
@@ -583,7 +585,7 @@
 	  {
 	    ldc.i4.0
 	    stloc.0
-	    call       unsigned int64 ConvTest::test21()
+	    call       unsigned int64 Test_r4NaNconv.ConvTest::test21()
 	    leave.s    Test_22
 	  }  
 	  catch [mscorlib]System.OverflowException 
@@ -600,7 +602,7 @@
 	  {
 	    ldc.i4.0
 	    stloc.0
-	    call       int32 ConvTest::test22()
+	    call       int32 Test_r4NaNconv.ConvTest::test22()
 	    leave.s    Test_23
 	  }  
 	  catch [mscorlib]System.OverflowException 
@@ -617,7 +619,7 @@
 	  {
 	    ldc.i4.0
 	    stloc.0
-	    call       unsigned int32 ConvTest::test23()
+	    call       unsigned int32 Test_r4NaNconv.ConvTest::test23()
 	    leave.s    Test_24
 	  }  
 	  catch [mscorlib]System.OverflowException 
@@ -634,7 +636,7 @@
 	  {
 	    ldc.i4.0
 	    stloc.0
-	    call       int8 ConvTest::test24()
+	    call       int8 Test_r4NaNconv.ConvTest::test24()
 	    leave.s    Test_25
 	  }  
 	  catch [mscorlib]System.OverflowException 
@@ -651,7 +653,7 @@
 	  {
 	    ldc.i4.0
 	    stloc.0
-	    call       int16 ConvTest::test25()
+	    call       int16 Test_r4NaNconv.ConvTest::test25()
 	    leave.s    Test_26
 	  }  
 	  catch [mscorlib]System.OverflowException 
@@ -668,7 +670,7 @@
 	  {
 	    ldc.i4.0
 	    stloc.0
-	    call       int32 ConvTest::test26()
+	    call       int32 Test_r4NaNconv.ConvTest::test26()
 	    leave.s    Test_27
 	  }  
 	  catch [mscorlib]System.OverflowException 
@@ -685,7 +687,7 @@
 	  {
 	    ldc.i4.0
 	    stloc.0
-	    call       int64 ConvTest::test27()
+	    call       int64 Test_r4NaNconv.ConvTest::test27()
 	    leave.s    Test_28
 	  }  
 	  catch [mscorlib]System.OverflowException 
@@ -702,7 +704,7 @@
 	  {
 	    ldc.i4.0
 	    stloc.0
-	    call       unsigned int8 ConvTest::test28()
+	    call       unsigned int8 Test_r4NaNconv.ConvTest::test28()
 	    leave.s    Test_29
 	  }  
 	  catch [mscorlib]System.OverflowException 
@@ -719,7 +721,7 @@
 	  {
 	    ldc.i4.0
 	    stloc.0
-	    call       unsigned int16 ConvTest::test29()
+	    call       unsigned int16 Test_r4NaNconv.ConvTest::test29()
 	    leave.s    Test_30
 	  }  
 	  catch [mscorlib]System.OverflowException 
@@ -736,7 +738,7 @@
 	  {
 	    ldc.i4.0
 	    stloc.0
-	    call       unsigned int32 ConvTest::test30()
+	    call       unsigned int32 Test_r4NaNconv.ConvTest::test30()
 	    leave.s    Test_31
 	  }  
 	  catch [mscorlib]System.OverflowException 
@@ -753,7 +755,7 @@
 	  {
 	    ldc.i4.0
 	    stloc.0
-	    call       unsigned int64 ConvTest::test31()
+	    call       unsigned int64 Test_r4NaNconv.ConvTest::test31()
 	    leave.s    Test_32
 	  }  
 	  catch [mscorlib]System.OverflowException 
@@ -770,7 +772,7 @@
 	  {
 	    ldc.i4.0
 	    stloc.0
-	    call       int32 ConvTest::test32()
+	    call       int32 Test_r4NaNconv.ConvTest::test32()
 	    leave.s    Test_33
 	  }  
 	  catch [mscorlib]System.OverflowException 
@@ -787,7 +789,7 @@
 	  {
 	    ldc.i4.0
 	    stloc.0
-	    call       unsigned int32 ConvTest::test33()
+	    call       unsigned int32 Test_r4NaNconv.ConvTest::test33()
 	    leave.s    Test_34
 	  }  
 	  catch [mscorlib]System.OverflowException 
@@ -832,3 +834,4 @@
   } 
 
 } 
+}
diff --git a/src/tests/JIT/Methodical/NaN/r4NaNconv_il_d.ilproj b/src/tests/JIT/Methodical/NaN/r4NaNconv_il_d.ilproj
index 57925670d0bd8e..7c1c4bc63d95f7 100644
--- a/src/tests/JIT/Methodical/NaN/r4NaNconv_il_d.ilproj
+++ b/src/tests/JIT/Methodical/NaN/r4NaNconv_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/NaN/r4NaNconv_il_r.ilproj b/src/tests/JIT/Methodical/NaN/r4NaNconv_il_r.ilproj
index c7a2535023b448..285c2adeb9353e 100644
--- a/src/tests/JIT/Methodical/NaN/r4NaNconv_il_r.ilproj
+++ b/src/tests/JIT/Methodical/NaN/r4NaNconv_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/NaN/r4NaNdiv.cs b/src/tests/JIT/Methodical/NaN/r4NaNdiv.cs
index 1ee1f993c28cd2..c8188e8bb75910 100644
--- a/src/tests/JIT/Methodical/NaN/r4NaNdiv.cs
+++ b/src/tests/JIT/Methodical/NaN/r4NaNdiv.cs
@@ -3,7 +3,8 @@
 //
 
 using System;
-class r4NaNdiv
+using Xunit;
+public class r4NaNdiv
 {
 
     //user-defined class that overloads operator /
@@ -78,7 +79,8 @@ struct VT
         public float f_vt_test3_op2;
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         bool passed = true;
         //initialize class
diff --git a/src/tests/JIT/Methodical/NaN/r4NaNdiv_cs_d.csproj b/src/tests/JIT/Methodical/NaN/r4NaNdiv_cs_d.csproj
index 0b5dd0454ccb7b..fcec16e76bc574 100644
--- a/src/tests/JIT/Methodical/NaN/r4NaNdiv_cs_d.csproj
+++ b/src/tests/JIT/Methodical/NaN/r4NaNdiv_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/NaN/r4NaNdiv_cs_do.csproj b/src/tests/JIT/Methodical/NaN/r4NaNdiv_cs_do.csproj
index 28b8956d6da994..7b5dea0c17da41 100644
--- a/src/tests/JIT/Methodical/NaN/r4NaNdiv_cs_do.csproj
+++ b/src/tests/JIT/Methodical/NaN/r4NaNdiv_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/NaN/r4NaNdiv_cs_r.csproj b/src/tests/JIT/Methodical/NaN/r4NaNdiv_cs_r.csproj
index 510db7d821a0c7..a7b7c035e58a43 100644
--- a/src/tests/JIT/Methodical/NaN/r4NaNdiv_cs_r.csproj
+++ b/src/tests/JIT/Methodical/NaN/r4NaNdiv_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/NaN/r4NaNdiv_cs_ro.csproj b/src/tests/JIT/Methodical/NaN/r4NaNdiv_cs_ro.csproj
index 4bda786ec9d6df..f94063970f8255 100644
--- a/src/tests/JIT/Methodical/NaN/r4NaNdiv_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/NaN/r4NaNdiv_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/NaN/r4NaNmul.cs b/src/tests/JIT/Methodical/NaN/r4NaNmul.cs
index 16745f72ff506b..3c1a480b074260 100644
--- a/src/tests/JIT/Methodical/NaN/r4NaNmul.cs
+++ b/src/tests/JIT/Methodical/NaN/r4NaNmul.cs
@@ -3,7 +3,8 @@
 //
 
 using System;
-class r4NaNmul
+using Xunit;
+public class r4NaNmul
 {
 
     //user-defined class that overloads operator *
@@ -78,7 +79,8 @@ struct VT
         public float f_vt_test3_op2;
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         bool passed = true;
         //initialize class
diff --git a/src/tests/JIT/Methodical/NaN/r4NaNmul_cs_d.csproj b/src/tests/JIT/Methodical/NaN/r4NaNmul_cs_d.csproj
index 63baeba6d1b312..35562db9e90a6d 100644
--- a/src/tests/JIT/Methodical/NaN/r4NaNmul_cs_d.csproj
+++ b/src/tests/JIT/Methodical/NaN/r4NaNmul_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/NaN/r4NaNmul_cs_do.csproj b/src/tests/JIT/Methodical/NaN/r4NaNmul_cs_do.csproj
index 324139c74098e6..61cb7b9a1b764c 100644
--- a/src/tests/JIT/Methodical/NaN/r4NaNmul_cs_do.csproj
+++ b/src/tests/JIT/Methodical/NaN/r4NaNmul_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/NaN/r4NaNmul_cs_r.csproj b/src/tests/JIT/Methodical/NaN/r4NaNmul_cs_r.csproj
index af39889ce05e5f..310b7867c86999 100644
--- a/src/tests/JIT/Methodical/NaN/r4NaNmul_cs_r.csproj
+++ b/src/tests/JIT/Methodical/NaN/r4NaNmul_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/NaN/r4NaNmul_cs_ro.csproj b/src/tests/JIT/Methodical/NaN/r4NaNmul_cs_ro.csproj
index 8389a1417a45c3..57ae5e95cd5a32 100644
--- a/src/tests/JIT/Methodical/NaN/r4NaNmul_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/NaN/r4NaNmul_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/NaN/r4NaNrem.cs b/src/tests/JIT/Methodical/NaN/r4NaNrem.cs
index 075cd5ce30df3c..46d218f5223e39 100644
--- a/src/tests/JIT/Methodical/NaN/r4NaNrem.cs
+++ b/src/tests/JIT/Methodical/NaN/r4NaNrem.cs
@@ -3,7 +3,8 @@
 //
 
 using System;
-class r4NaNrem
+using Xunit;
+public class r4NaNrem
 {
 
     //user-defined class that overloads operator %
@@ -78,7 +79,8 @@ struct VT
         public float f_vt_test3_op2;
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         bool passed = true;
         //initialize class
diff --git a/src/tests/JIT/Methodical/NaN/r4NaNrem_cs_d.csproj b/src/tests/JIT/Methodical/NaN/r4NaNrem_cs_d.csproj
index 97175896a12ece..91734cf7f95092 100644
--- a/src/tests/JIT/Methodical/NaN/r4NaNrem_cs_d.csproj
+++ b/src/tests/JIT/Methodical/NaN/r4NaNrem_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/NaN/r4NaNrem_cs_do.csproj b/src/tests/JIT/Methodical/NaN/r4NaNrem_cs_do.csproj
index aaae0e6388ccfd..9a2ddd77f4d68c 100644
--- a/src/tests/JIT/Methodical/NaN/r4NaNrem_cs_do.csproj
+++ b/src/tests/JIT/Methodical/NaN/r4NaNrem_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/NaN/r4NaNrem_cs_r.csproj b/src/tests/JIT/Methodical/NaN/r4NaNrem_cs_r.csproj
index 766b6e17316523..35a17465d4cc4f 100644
--- a/src/tests/JIT/Methodical/NaN/r4NaNrem_cs_r.csproj
+++ b/src/tests/JIT/Methodical/NaN/r4NaNrem_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/NaN/r4NaNrem_cs_ro.csproj b/src/tests/JIT/Methodical/NaN/r4NaNrem_cs_ro.csproj
index 956913615d055d..a8f22fa1361a73 100644
--- a/src/tests/JIT/Methodical/NaN/r4NaNrem_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/NaN/r4NaNrem_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/NaN/r4NaNsub.cs b/src/tests/JIT/Methodical/NaN/r4NaNsub.cs
index e0bcd1fb5c9eec..9f0e2bed91dfca 100644
--- a/src/tests/JIT/Methodical/NaN/r4NaNsub.cs
+++ b/src/tests/JIT/Methodical/NaN/r4NaNsub.cs
@@ -3,7 +3,8 @@
 //
 
 using System;
-class r4NaNsub
+using Xunit;
+public class r4NaNsub
 {
 
     //user-defined class that overloads operator -
@@ -78,7 +79,8 @@ struct VT
         public float f_vt_test3_op2;
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         bool passed = true;
         //initialize class
diff --git a/src/tests/JIT/Methodical/NaN/r4NaNsub_cs_d.csproj b/src/tests/JIT/Methodical/NaN/r4NaNsub_cs_d.csproj
index fb36daa7d4ed41..89dd7d3fed50c8 100644
--- a/src/tests/JIT/Methodical/NaN/r4NaNsub_cs_d.csproj
+++ b/src/tests/JIT/Methodical/NaN/r4NaNsub_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/NaN/r4NaNsub_cs_do.csproj b/src/tests/JIT/Methodical/NaN/r4NaNsub_cs_do.csproj
index 3a13f0f60c5147..712afb92432aaf 100644
--- a/src/tests/JIT/Methodical/NaN/r4NaNsub_cs_do.csproj
+++ b/src/tests/JIT/Methodical/NaN/r4NaNsub_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/NaN/r4NaNsub_cs_r.csproj b/src/tests/JIT/Methodical/NaN/r4NaNsub_cs_r.csproj
index c0a3b1faba3074..f1f7f425c99812 100644
--- a/src/tests/JIT/Methodical/NaN/r4NaNsub_cs_r.csproj
+++ b/src/tests/JIT/Methodical/NaN/r4NaNsub_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/NaN/r4NaNsub_cs_ro.csproj b/src/tests/JIT/Methodical/NaN/r4NaNsub_cs_ro.csproj
index 4912c8a01eccb2..24f100812c3bb9 100644
--- a/src/tests/JIT/Methodical/NaN/r4NaNsub_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/NaN/r4NaNsub_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/NaN/r8NaNadd.cs b/src/tests/JIT/Methodical/NaN/r8NaNadd.cs
index 8c8ab0cfde2157..684643af482dc9 100644
--- a/src/tests/JIT/Methodical/NaN/r8NaNadd.cs
+++ b/src/tests/JIT/Methodical/NaN/r8NaNadd.cs
@@ -3,7 +3,8 @@
 //
 
 using System;
-class r8NaNadd
+using Xunit;
+public class r8NaNadd
 {
 
     //user-defined class that overloads operator +
@@ -77,7 +78,8 @@ struct VT
         public double d_vt_test3_op1;
         public double d_vt_test3_op2;
     }
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         bool passed = true;
         //initialize class
diff --git a/src/tests/JIT/Methodical/NaN/r8NaNadd_cs_d.csproj b/src/tests/JIT/Methodical/NaN/r8NaNadd_cs_d.csproj
index 0f0df01452fcdd..604fa3ce50f38a 100644
--- a/src/tests/JIT/Methodical/NaN/r8NaNadd_cs_d.csproj
+++ b/src/tests/JIT/Methodical/NaN/r8NaNadd_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/NaN/r8NaNadd_cs_do.csproj b/src/tests/JIT/Methodical/NaN/r8NaNadd_cs_do.csproj
index 7379ab3b25edbe..d2ba9c82a66d6b 100644
--- a/src/tests/JIT/Methodical/NaN/r8NaNadd_cs_do.csproj
+++ b/src/tests/JIT/Methodical/NaN/r8NaNadd_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/NaN/r8NaNadd_cs_r.csproj b/src/tests/JIT/Methodical/NaN/r8NaNadd_cs_r.csproj
index a51e5c61954a79..038c8b89a12f52 100644
--- a/src/tests/JIT/Methodical/NaN/r8NaNadd_cs_r.csproj
+++ b/src/tests/JIT/Methodical/NaN/r8NaNadd_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/NaN/r8NaNadd_cs_ro.csproj b/src/tests/JIT/Methodical/NaN/r8NaNadd_cs_ro.csproj
index 06a60d0c516e85..f1da836bd5b2a1 100644
--- a/src/tests/JIT/Methodical/NaN/r8NaNadd_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/NaN/r8NaNadd_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/NaN/r8NaNconv.il b/src/tests/JIT/Methodical/NaN/r8NaNconv.il
index 7363482fd09fc4..4cfc156cd3cc66 100644
--- a/src/tests/JIT/Methodical/NaN/r8NaNconv.il
+++ b/src/tests/JIT/Methodical/NaN/r8NaNconv.il
@@ -12,7 +12,9 @@
 }
 .assembly 'r8NaNconv' {}
 .assembly extern xunit.core {}
-.class private auto ansi beforefieldinit ConvTest
+.namespace Test_r8NaNconv
+{
+.class public auto ansi beforefieldinit ConvTest
        extends [mscorlib]System.Object
 {
 	.method public hidebysig static int8 test1() cil managed 
@@ -431,31 +433,31 @@
     ldc.i4.1
     stloc.0
     
-	call       int8 ConvTest::test1()
+	call       int8 Test_r8NaNconv.ConvTest::test1()
 	pop
-	call       int16 ConvTest::test2()
+	call       int16 Test_r8NaNconv.ConvTest::test2()
 	pop
-	call       int32 ConvTest::test3()
+	call       int32 Test_r8NaNconv.ConvTest::test3()
 	pop
-	call       int64 ConvTest::test4()
+	call       int64 Test_r8NaNconv.ConvTest::test4()
 	pop
-	call       float32 ConvTest::test5()
+	call       float32 Test_r8NaNconv.ConvTest::test5()
 	pop
-	call       float64 ConvTest::test6()
+	call       float64 Test_r8NaNconv.ConvTest::test6()
 	pop
-	call       unsigned int8 ConvTest::test7()
+	call       unsigned int8 Test_r8NaNconv.ConvTest::test7()
 	pop
-	call       unsigned int16 ConvTest::test8()
+	call       unsigned int16 Test_r8NaNconv.ConvTest::test8()
 	pop
-	call       unsigned int32 ConvTest::test9()
+	call       unsigned int32 Test_r8NaNconv.ConvTest::test9()
 	pop
-	call       unsigned int64 ConvTest::test10()
+	call       unsigned int64 Test_r8NaNconv.ConvTest::test10()
 	pop
-	call       int32 ConvTest::test11()
+	call       int32 Test_r8NaNconv.ConvTest::test11()
 	pop
-	call       unsigned int32 ConvTest::test12()
+	call       unsigned int32 Test_r8NaNconv.ConvTest::test12()
 	pop
-	call       float32 ConvTest::test13()
+	call       float32 Test_r8NaNconv.ConvTest::test13()
 	pop
 
 
@@ -463,7 +465,7 @@
 	  {
 	    ldc.i4.0
 	    stloc.0
-	    call       int8 ConvTest::test14()
+	    call       int8 Test_r8NaNconv.ConvTest::test14()
 	    leave.s    Test_15
 	  }  
 	  catch [mscorlib]System.OverflowException 
@@ -480,7 +482,7 @@
 	  {
 	    ldc.i4.0
 	    stloc.0
-	    call       int16 ConvTest::test15()
+	    call       int16 Test_r8NaNconv.ConvTest::test15()
 	    leave.s    Test_16
 	  }  
 	  catch [mscorlib]System.OverflowException 
@@ -497,7 +499,7 @@
 	  {
 	    ldc.i4.0
 	    stloc.0
-	    call       int32 ConvTest::test16()
+	    call       int32 Test_r8NaNconv.ConvTest::test16()
 	    leave.s    Test_17
 	  }  
 	  catch [mscorlib]System.OverflowException 
@@ -514,7 +516,7 @@
 	  {
 	    ldc.i4.0
 	    stloc.0
-	    call       int64 ConvTest::test17()
+	    call       int64 Test_r8NaNconv.ConvTest::test17()
 	    leave.s    Test_18
 	  }  
 	  catch [mscorlib]System.OverflowException 
@@ -531,7 +533,7 @@
 	  {
 	    ldc.i4.0
 	    stloc.0
-	    call       unsigned int8 ConvTest::test18()
+	    call       unsigned int8 Test_r8NaNconv.ConvTest::test18()
 	    leave.s    Test_19
 	  }  
 	  catch [mscorlib]System.OverflowException 
@@ -548,7 +550,7 @@
 	  {
 	    ldc.i4.0
 	    stloc.0
-	    call       unsigned int16 ConvTest::test19()
+	    call       unsigned int16 Test_r8NaNconv.ConvTest::test19()
 	    leave.s    Test_20
 	  }  
 	  catch [mscorlib]System.OverflowException 
@@ -565,7 +567,7 @@
 	  {
 	    ldc.i4.0
 	    stloc.0
-	    call       unsigned int32 ConvTest::test20()
+	    call       unsigned int32 Test_r8NaNconv.ConvTest::test20()
 	    leave.s    Test_21
 	  }  
 	  catch [mscorlib]System.OverflowException 
@@ -582,7 +584,7 @@
 	  {
 	    ldc.i4.0
 	    stloc.0
-	    call       unsigned int64 ConvTest::test21()
+	    call       unsigned int64 Test_r8NaNconv.ConvTest::test21()
 	    leave.s    Test_22
 	  }  
 	  catch [mscorlib]System.OverflowException 
@@ -599,7 +601,7 @@
 	  {
 	    ldc.i4.0
 	    stloc.0
-	    call       int32 ConvTest::test22()
+	    call       int32 Test_r8NaNconv.ConvTest::test22()
 	    leave.s    Test_23
 	  }  
 	  catch [mscorlib]System.OverflowException 
@@ -616,7 +618,7 @@
 	  {
 	    ldc.i4.0
 	    stloc.0
-	    call       unsigned int32 ConvTest::test23()
+	    call       unsigned int32 Test_r8NaNconv.ConvTest::test23()
 	    leave.s    Test_24
 	  }  
 	  catch [mscorlib]System.OverflowException 
@@ -633,7 +635,7 @@
 	  {
 	    ldc.i4.0
 	    stloc.0
-	    call       int8 ConvTest::test24()
+	    call       int8 Test_r8NaNconv.ConvTest::test24()
 	    leave.s    Test_25
 	  }  
 	  catch [mscorlib]System.OverflowException 
@@ -650,7 +652,7 @@
 	  {
 	    ldc.i4.0
 	    stloc.0
-	    call       int16 ConvTest::test25()
+	    call       int16 Test_r8NaNconv.ConvTest::test25()
 	    leave.s    Test_26
 	  }  
 	  catch [mscorlib]System.OverflowException 
@@ -667,7 +669,7 @@
 	  {
 	    ldc.i4.0
 	    stloc.0
-	    call       int32 ConvTest::test26()
+	    call       int32 Test_r8NaNconv.ConvTest::test26()
 	    leave.s    Test_27
 	  }  
 	  catch [mscorlib]System.OverflowException 
@@ -684,7 +686,7 @@
 	  {
 	    ldc.i4.0
 	    stloc.0
-	    call       int64 ConvTest::test27()
+	    call       int64 Test_r8NaNconv.ConvTest::test27()
 	    leave.s    Test_28
 	  }  
 	  catch [mscorlib]System.OverflowException 
@@ -701,7 +703,7 @@
 	  {
 	    ldc.i4.0
 	    stloc.0
-	    call       unsigned int8 ConvTest::test28()
+	    call       unsigned int8 Test_r8NaNconv.ConvTest::test28()
 	    leave.s    Test_29
 	  }  
 	  catch [mscorlib]System.OverflowException 
@@ -718,7 +720,7 @@
 	  {
 	    ldc.i4.0
 	    stloc.0
-	    call       unsigned int16 ConvTest::test29()
+	    call       unsigned int16 Test_r8NaNconv.ConvTest::test29()
 	    leave.s    Test_30
 	  }  
 	  catch [mscorlib]System.OverflowException 
@@ -735,7 +737,7 @@
 	  {
 	    ldc.i4.0
 	    stloc.0
-	    call       unsigned int32 ConvTest::test30()
+	    call       unsigned int32 Test_r8NaNconv.ConvTest::test30()
 	    leave.s    Test_31
 	  }  
 	  catch [mscorlib]System.OverflowException 
@@ -752,7 +754,7 @@
 	  {
 	    ldc.i4.0
 	    stloc.0
-	    call       unsigned int64 ConvTest::test31()
+	    call       unsigned int64 Test_r8NaNconv.ConvTest::test31()
 	    leave.s    Test_32
 	  }  
 	  catch [mscorlib]System.OverflowException 
@@ -769,7 +771,7 @@
 	  {
 	    ldc.i4.0
 	    stloc.0
-	    call       int32 ConvTest::test32()
+	    call       int32 Test_r8NaNconv.ConvTest::test32()
 	    leave.s    Test_33
 	  }  
 	  catch [mscorlib]System.OverflowException 
@@ -786,7 +788,7 @@
 	  {
 	    ldc.i4.0
 	    stloc.0
-	    call       unsigned int32 ConvTest::test33()
+	    call       unsigned int32 Test_r8NaNconv.ConvTest::test33()
 	    leave.s    Test_34
 	  }  
 	  catch [mscorlib]System.OverflowException 
@@ -828,3 +830,4 @@
   } 
 
 } 
+}
diff --git a/src/tests/JIT/Methodical/NaN/r8NaNconv_il_d.ilproj b/src/tests/JIT/Methodical/NaN/r8NaNconv_il_d.ilproj
index 11cc69019a8594..3142de57080888 100644
--- a/src/tests/JIT/Methodical/NaN/r8NaNconv_il_d.ilproj
+++ b/src/tests/JIT/Methodical/NaN/r8NaNconv_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/NaN/r8NaNconv_il_r.ilproj b/src/tests/JIT/Methodical/NaN/r8NaNconv_il_r.ilproj
index e34bc1822013c9..7961c0b8fbf98b 100644
--- a/src/tests/JIT/Methodical/NaN/r8NaNconv_il_r.ilproj
+++ b/src/tests/JIT/Methodical/NaN/r8NaNconv_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/NaN/r8NaNdiv.cs b/src/tests/JIT/Methodical/NaN/r8NaNdiv.cs
index ed93da7e6efa1a..ef79ddcc88012d 100644
--- a/src/tests/JIT/Methodical/NaN/r8NaNdiv.cs
+++ b/src/tests/JIT/Methodical/NaN/r8NaNdiv.cs
@@ -3,7 +3,8 @@
 //
 
 using System;
-class r8NaNdiv
+using Xunit;
+public class r8NaNdiv
 {
 
     //user-defined class that overloads operator /
@@ -78,7 +79,8 @@ struct VT
         public double d_vt_test3_op2;
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         bool passed = true;
         //initialize class
diff --git a/src/tests/JIT/Methodical/NaN/r8NaNdiv_cs_d.csproj b/src/tests/JIT/Methodical/NaN/r8NaNdiv_cs_d.csproj
index db2391946153a0..f23db0ddcc20c8 100644
--- a/src/tests/JIT/Methodical/NaN/r8NaNdiv_cs_d.csproj
+++ b/src/tests/JIT/Methodical/NaN/r8NaNdiv_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/NaN/r8NaNdiv_cs_do.csproj b/src/tests/JIT/Methodical/NaN/r8NaNdiv_cs_do.csproj
index 040baa535609fe..e75e94654741d7 100644
--- a/src/tests/JIT/Methodical/NaN/r8NaNdiv_cs_do.csproj
+++ b/src/tests/JIT/Methodical/NaN/r8NaNdiv_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/NaN/r8NaNdiv_cs_r.csproj b/src/tests/JIT/Methodical/NaN/r8NaNdiv_cs_r.csproj
index 52083de73d8f8a..dc6c9aa84d7ee3 100644
--- a/src/tests/JIT/Methodical/NaN/r8NaNdiv_cs_r.csproj
+++ b/src/tests/JIT/Methodical/NaN/r8NaNdiv_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/NaN/r8NaNdiv_cs_ro.csproj b/src/tests/JIT/Methodical/NaN/r8NaNdiv_cs_ro.csproj
index a69637457b2bcd..df32d870bd1181 100644
--- a/src/tests/JIT/Methodical/NaN/r8NaNdiv_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/NaN/r8NaNdiv_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/NaN/r8NaNmul.cs b/src/tests/JIT/Methodical/NaN/r8NaNmul.cs
index 811a0d9697db5a..739904b3bfbc4c 100644
--- a/src/tests/JIT/Methodical/NaN/r8NaNmul.cs
+++ b/src/tests/JIT/Methodical/NaN/r8NaNmul.cs
@@ -3,7 +3,8 @@
 //
 
 using System;
-class r8NaNmul
+using Xunit;
+public class r8NaNmul
 {
 
     //user-defined class that overloads operator *
@@ -78,7 +79,8 @@ struct VT
         public double d_vt_test3_op2;
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         bool passed = true;
         //initialize class
diff --git a/src/tests/JIT/Methodical/NaN/r8NaNmul_cs_d.csproj b/src/tests/JIT/Methodical/NaN/r8NaNmul_cs_d.csproj
index b47f65047d3129..f9fc826b6fa392 100644
--- a/src/tests/JIT/Methodical/NaN/r8NaNmul_cs_d.csproj
+++ b/src/tests/JIT/Methodical/NaN/r8NaNmul_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/NaN/r8NaNmul_cs_do.csproj b/src/tests/JIT/Methodical/NaN/r8NaNmul_cs_do.csproj
index 25a6d6fbb2df2a..331b700789fa56 100644
--- a/src/tests/JIT/Methodical/NaN/r8NaNmul_cs_do.csproj
+++ b/src/tests/JIT/Methodical/NaN/r8NaNmul_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/NaN/r8NaNmul_cs_r.csproj b/src/tests/JIT/Methodical/NaN/r8NaNmul_cs_r.csproj
index a34c4187dc8aad..fed177b036e190 100644
--- a/src/tests/JIT/Methodical/NaN/r8NaNmul_cs_r.csproj
+++ b/src/tests/JIT/Methodical/NaN/r8NaNmul_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/NaN/r8NaNmul_cs_ro.csproj b/src/tests/JIT/Methodical/NaN/r8NaNmul_cs_ro.csproj
index 74db1510f132c4..6af5b84510d0df 100644
--- a/src/tests/JIT/Methodical/NaN/r8NaNmul_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/NaN/r8NaNmul_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/NaN/r8NaNrem.cs b/src/tests/JIT/Methodical/NaN/r8NaNrem.cs
index 4351a42473e390..69218ff1ab7ae2 100644
--- a/src/tests/JIT/Methodical/NaN/r8NaNrem.cs
+++ b/src/tests/JIT/Methodical/NaN/r8NaNrem.cs
@@ -3,7 +3,8 @@
 //
 
 using System;
-class r8NaNrem
+using Xunit;
+public class r8NaNrem
 {
 
     //user-defined class that overloads operator %
@@ -78,7 +79,8 @@ struct VT
         public double d_vt_test3_op2;
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         bool passed = true;
         //initialize class
diff --git a/src/tests/JIT/Methodical/NaN/r8NaNrem_cs_d.csproj b/src/tests/JIT/Methodical/NaN/r8NaNrem_cs_d.csproj
index 61b047c7c3039b..b96535f61969b7 100644
--- a/src/tests/JIT/Methodical/NaN/r8NaNrem_cs_d.csproj
+++ b/src/tests/JIT/Methodical/NaN/r8NaNrem_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/NaN/r8NaNrem_cs_do.csproj b/src/tests/JIT/Methodical/NaN/r8NaNrem_cs_do.csproj
index 0e799e0f9aef70..69eea1d8384997 100644
--- a/src/tests/JIT/Methodical/NaN/r8NaNrem_cs_do.csproj
+++ b/src/tests/JIT/Methodical/NaN/r8NaNrem_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/NaN/r8NaNrem_cs_r.csproj b/src/tests/JIT/Methodical/NaN/r8NaNrem_cs_r.csproj
index be280dab15c323..e880611ca99290 100644
--- a/src/tests/JIT/Methodical/NaN/r8NaNrem_cs_r.csproj
+++ b/src/tests/JIT/Methodical/NaN/r8NaNrem_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/NaN/r8NaNrem_cs_ro.csproj b/src/tests/JIT/Methodical/NaN/r8NaNrem_cs_ro.csproj
index 4d8ba7ba63d81a..4ac89aa4fd612a 100644
--- a/src/tests/JIT/Methodical/NaN/r8NaNrem_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/NaN/r8NaNrem_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/NaN/r8NaNsub.cs b/src/tests/JIT/Methodical/NaN/r8NaNsub.cs
index 4ba2bd82b280b9..1138aaf6808e81 100644
--- a/src/tests/JIT/Methodical/NaN/r8NaNsub.cs
+++ b/src/tests/JIT/Methodical/NaN/r8NaNsub.cs
@@ -3,7 +3,8 @@
 //
 
 using System;
-class r8NaNsub
+using Xunit;
+public class r8NaNsub
 {
 
     //user-defined class that overloads operator -
@@ -77,7 +78,8 @@ struct VT
         public double d_vt_test3_op1;
         public double d_vt_test3_op2;
     }
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         bool passed = true;
         //initialize class
diff --git a/src/tests/JIT/Methodical/NaN/r8NaNsub_cs_d.csproj b/src/tests/JIT/Methodical/NaN/r8NaNsub_cs_d.csproj
index f896fbd020127a..56e7ff6e67ce0d 100644
--- a/src/tests/JIT/Methodical/NaN/r8NaNsub_cs_d.csproj
+++ b/src/tests/JIT/Methodical/NaN/r8NaNsub_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/NaN/r8NaNsub_cs_do.csproj b/src/tests/JIT/Methodical/NaN/r8NaNsub_cs_do.csproj
index b54fdfb5debeab..0569abad1702b4 100644
--- a/src/tests/JIT/Methodical/NaN/r8NaNsub_cs_do.csproj
+++ b/src/tests/JIT/Methodical/NaN/r8NaNsub_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/NaN/r8NaNsub_cs_r.csproj b/src/tests/JIT/Methodical/NaN/r8NaNsub_cs_r.csproj
index c5b726512cc180..7aae2abffb2456 100644
--- a/src/tests/JIT/Methodical/NaN/r8NaNsub_cs_r.csproj
+++ b/src/tests/JIT/Methodical/NaN/r8NaNsub_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/NaN/r8NaNsub_cs_ro.csproj b/src/tests/JIT/Methodical/NaN/r8NaNsub_cs_ro.csproj
index 39af8f7f7e41f5..2f057ee93fd8c1 100644
--- a/src/tests/JIT/Methodical/NaN/r8NaNsub_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/NaN/r8NaNsub_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Overflow/FloatInfinitiesToInt.cs b/src/tests/JIT/Methodical/Overflow/FloatInfinitiesToInt.cs
index 032e4280559efe..6065d9b96c6567 100644
--- a/src/tests/JIT/Methodical/Overflow/FloatInfinitiesToInt.cs
+++ b/src/tests/JIT/Methodical/Overflow/FloatInfinitiesToInt.cs
@@ -3,8 +3,11 @@
 
 using System;
 using System.Runtime.CompilerServices;
+using Xunit;
 
-internal class FloatOvfToInt
+namespace Test_FloatInfinitiesToInt
+{
+public class FloatOvfToInt
 {
     [MethodImpl(MethodImplOptions.NoInlining)]
     public static long FloatToLong(float f)
@@ -300,10 +303,12 @@ public static int TestValues()
         return res;
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         int res = TestValues();
         Console.WriteLine("Test " + (res == 100 ? "passed" : "failed"));
         return res;
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/Overflow/FloatInfinitiesToInt_d.csproj b/src/tests/JIT/Methodical/Overflow/FloatInfinitiesToInt_d.csproj
index 192a850f1daa92..422f6af75ccf16 100644
--- a/src/tests/JIT/Methodical/Overflow/FloatInfinitiesToInt_d.csproj
+++ b/src/tests/JIT/Methodical/Overflow/FloatInfinitiesToInt_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Overflow/FloatInfinitiesToInt_do.csproj b/src/tests/JIT/Methodical/Overflow/FloatInfinitiesToInt_do.csproj
index 19e66ad381a940..af67b9f5dfccbe 100644
--- a/src/tests/JIT/Methodical/Overflow/FloatInfinitiesToInt_do.csproj
+++ b/src/tests/JIT/Methodical/Overflow/FloatInfinitiesToInt_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Overflow/FloatInfinitiesToInt_r.csproj b/src/tests/JIT/Methodical/Overflow/FloatInfinitiesToInt_r.csproj
index 0c4444c66cd0ab..58b2ef94fd373c 100644
--- a/src/tests/JIT/Methodical/Overflow/FloatInfinitiesToInt_r.csproj
+++ b/src/tests/JIT/Methodical/Overflow/FloatInfinitiesToInt_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Overflow/FloatInfinitiesToInt_ro.csproj b/src/tests/JIT/Methodical/Overflow/FloatInfinitiesToInt_ro.csproj
index 5ff3c81b0e0acc..319e759d1b41c3 100644
--- a/src/tests/JIT/Methodical/Overflow/FloatInfinitiesToInt_ro.csproj
+++ b/src/tests/JIT/Methodical/Overflow/FloatInfinitiesToInt_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Overflow/FloatOvfToInt2.cs b/src/tests/JIT/Methodical/Overflow/FloatOvfToInt2.cs
index 061d6de67753dd..9b3226f44ca05c 100644
--- a/src/tests/JIT/Methodical/Overflow/FloatOvfToInt2.cs
+++ b/src/tests/JIT/Methodical/Overflow/FloatOvfToInt2.cs
@@ -3,8 +3,11 @@
 
 using System;
 using System.Runtime.CompilerServices;
+using Xunit;
 
-internal class FloatOvfToInt
+namespace Test_FloatOvfToInt2
+{
+public class FloatOvfToInt
 {
     [MethodImpl(MethodImplOptions.NoInlining)]
     public static bool BreakUpFlow() => false;
@@ -887,10 +890,12 @@ public static int TestValues()
         return res;
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         int res = TestValues();
         Console.WriteLine("Test " + (res == 100 ? "passed" : "failed"));
         return res;
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/Overflow/FloatOvfToInt2_d.csproj b/src/tests/JIT/Methodical/Overflow/FloatOvfToInt2_d.csproj
index c62cbe0010f710..57f519c54f2675 100644
--- a/src/tests/JIT/Methodical/Overflow/FloatOvfToInt2_d.csproj
+++ b/src/tests/JIT/Methodical/Overflow/FloatOvfToInt2_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Overflow/FloatOvfToInt2_do.csproj b/src/tests/JIT/Methodical/Overflow/FloatOvfToInt2_do.csproj
index b3dddc7d6c4989..bd606339512b42 100644
--- a/src/tests/JIT/Methodical/Overflow/FloatOvfToInt2_do.csproj
+++ b/src/tests/JIT/Methodical/Overflow/FloatOvfToInt2_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Overflow/FloatOvfToInt2_r.csproj b/src/tests/JIT/Methodical/Overflow/FloatOvfToInt2_r.csproj
index 6b22921c91cc50..8734cb7d210e26 100644
--- a/src/tests/JIT/Methodical/Overflow/FloatOvfToInt2_r.csproj
+++ b/src/tests/JIT/Methodical/Overflow/FloatOvfToInt2_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/Overflow/FloatOvfToInt2_ro.csproj b/src/tests/JIT/Methodical/Overflow/FloatOvfToInt2_ro.csproj
index 9bd495c8338a8f..cf7fc648ddc931 100644
--- a/src/tests/JIT/Methodical/Overflow/FloatOvfToInt2_ro.csproj
+++ b/src/tests/JIT/Methodical/Overflow/FloatOvfToInt2_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/callconv/aa.il b/src/tests/JIT/Methodical/VT/callconv/aa.il
index 209c4f6a364551..b95764bee9b985 100644
--- a/src/tests/JIT/Methodical/VT/callconv/aa.il
+++ b/src/tests/JIT/Methodical/VT/callconv/aa.il
@@ -17,27 +17,27 @@
 }
 .assembly extern xunit.core {}
 // MVID: {CF1D567F-C985-45B8-8028-219BDC43D791}
-.namespace JitTest
+.namespace JitTest_aa_il
 {
   .class interface private abstract auto ansi ISomething
   {
     .method public hidebysig newslot virtual abstract 
-            instance void  DoSomething(value class JitTest.VT vt1,
-                                       value class JitTest.VT& vt2) il managed
+            instance void  DoSomething(value class JitTest_aa_il.VT vt1,
+                                       value class JitTest_aa_il.VT& vt2) il managed
     {
     } // end of method ISomething::DoSomething
 
     .method public hidebysig newslot virtual abstract 
-            instance value class JitTest.VT 
-            RetSomething(value class JitTest.VT vt) il managed
+            instance value class JitTest_aa_il.VT 
+            RetSomething(value class JitTest_aa_il.VT vt) il managed
     {
     } // end of method ISomething::RetSomething
 
   } // end of class ISomething
 
-  .class value private auto ansi sealed VT
+  .class value public auto ansi sealed VT
          extends [mscorlib]System.ValueType
-         implements JitTest.ISomething
+         implements JitTest_aa_il.ISomething
   {
     .field private int32 m_vn
     .field private class System.String m_vs
@@ -49,16 +49,16 @@
       .maxstack  8
       IL_0000:  ldarg.0
       IL_0001:  ldarg.1
-      IL_0002:  stfld      int32 JitTest.VT::m_vn
+      IL_0002:  stfld      int32 JitTest_aa_il.VT::m_vn
       IL_0007:  ldarg.0
       IL_0008:  ldarg.2
-      IL_0009:  stfld      class System.String JitTest.VT::m_vs
+      IL_0009:  stfld      class System.String JitTest_aa_il.VT::m_vs
       IL_000e:  ret
     } // end of method VT::.ctor
 
     .method public hidebysig newslot final virtual 
-            instance void  DoSomething(value class JitTest.VT vt1,
-                                       value class JitTest.VT& vt2) il managed
+            instance void  DoSomething(value class JitTest_aa_il.VT vt1,
+                                       value class JitTest_aa_il.VT& vt2) il managed
     {
       // Code size       80 (0x50)
       .maxstack  3
@@ -73,7 +73,7 @@
       IL_000f:  ldloc.0
       IL_0010:  ldc.i4.1
       IL_0011:  ldarga.s   vt1
-      IL_0013:  call       instance class System.String JitTest.VT::ToString()
+      IL_0013:  call       instance class System.String JitTest_aa_il.VT::ToString()
       IL_0018:  stelem.ref
       IL_0019:  ldloc.0
       IL_001a:  ldc.i4.2
@@ -82,14 +82,14 @@
       IL_0021:  ldloc.0
       IL_0022:  ldc.i4.3
       IL_0023:  ldarg.2
-      IL_0024:  call       instance class System.String JitTest.VT::ToString()
+      IL_0024:  call       instance class System.String JitTest_aa_il.VT::ToString()
       IL_0029:  stelem.ref
       IL_002a:  ldloc.0
       IL_002b:  call       class System.String [mscorlib]System.String::Concat(class System.String[])
       IL_0030:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_0035:  ldstr      "this is {"
       IL_003a:  ldarg.0
-      IL_003b:  call       instance class System.String JitTest.VT::ToString()
+      IL_003b:  call       instance class System.String JitTest_aa_il.VT::ToString()
       IL_0040:  ldstr      "}"
       IL_0045:  call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String,
@@ -99,37 +99,37 @@
     } // end of method VT::DoSomething
 
     .method public hidebysig newslot final virtual 
-            instance value class JitTest.VT 
-            RetSomething(value class JitTest.VT vt) il managed
+            instance value class JitTest_aa_il.VT 
+            RetSomething(value class JitTest_aa_il.VT vt) il managed
     {
       // Code size       68 (0x44)
       .maxstack  3
       IL_0000:  ldstr      "ISomething::RetSomething - "
       IL_0005:  ldarga.s   vt
-      IL_0007:  call       instance class System.String JitTest.VT::ToString()
+      IL_0007:  call       instance class System.String JitTest_aa_il.VT::ToString()
       IL_000c:  call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String)
       IL_0011:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_0016:  ldstr      "this is {"
       IL_001b:  ldarg.0
-      IL_001c:  call       instance class System.String JitTest.VT::ToString()
+      IL_001c:  call       instance class System.String JitTest_aa_il.VT::ToString()
       IL_0021:  ldstr      "}"
       IL_0026:  call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String,
                                                                                class System.String)
       IL_002b:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_0030:  ldarga.s   vt
-      IL_0032:  ldfld      int32 JitTest.VT::m_vn
+      IL_0032:  ldfld      int32 JitTest_aa_il.VT::m_vn
       IL_0037:  ldarga.s   vt
-      IL_0039:  ldfld      class System.String JitTest.VT::m_vs
-      IL_003e:  newobj     instance void JitTest.VT::.ctor(int32,
+      IL_0039:  ldfld      class System.String JitTest_aa_il.VT::m_vs
+      IL_003e:  newobj     instance void JitTest_aa_il.VT::.ctor(int32,
                                                            class System.String)
       IL_0043:  ret
     } // end of method VT::RetSomething
 
     .method public hidebysig instance void 
-            _DoSomething(value class JitTest.VT vt1,
-                         value class JitTest.VT& vt2) il managed
+            _DoSomething(value class JitTest_aa_il.VT vt1,
+                         value class JitTest_aa_il.VT& vt2) il managed
     {
       // Code size       80 (0x50)
       .maxstack  3
@@ -144,7 +144,7 @@
       IL_000f:  ldloc.0
       IL_0010:  ldc.i4.1
       IL_0011:  ldarga.s   vt1
-      IL_0013:  call       instance class System.String JitTest.VT::ToString()
+      IL_0013:  call       instance class System.String JitTest_aa_il.VT::ToString()
       IL_0018:  stelem.ref
       IL_0019:  ldloc.0
       IL_001a:  ldc.i4.2
@@ -153,14 +153,14 @@
       IL_0021:  ldloc.0
       IL_0022:  ldc.i4.3
       IL_0023:  ldarg.2
-      IL_0024:  call       instance class System.String JitTest.VT::ToString()
+      IL_0024:  call       instance class System.String JitTest_aa_il.VT::ToString()
       IL_0029:  stelem.ref
       IL_002a:  ldloc.0
       IL_002b:  call       class System.String [mscorlib]System.String::Concat(class System.String[])
       IL_0030:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_0035:  ldstr      "this is {"
       IL_003a:  ldarg.0
-      IL_003b:  call       instance class System.String JitTest.VT::ToString()
+      IL_003b:  call       instance class System.String JitTest_aa_il.VT::ToString()
       IL_0040:  ldstr      "}"
       IL_0045:  call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String,
@@ -169,30 +169,30 @@
       IL_004f:  ret
     } // end of method VT::_DoSomething
 
-    .method public hidebysig instance value class JitTest.VT 
-            _RetSomething(value class JitTest.VT vt) il managed
+    .method public hidebysig instance value class JitTest_aa_il.VT 
+            _RetSomething(value class JitTest_aa_il.VT vt) il managed
     {
       // Code size       68 (0x44)
       .maxstack  3
       IL_0000:  ldstr      "ISomething::RetSomething - "
       IL_0005:  ldarga.s   vt
-      IL_0007:  call       instance class System.String JitTest.VT::ToString()
+      IL_0007:  call       instance class System.String JitTest_aa_il.VT::ToString()
       IL_000c:  call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String)
       IL_0011:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_0016:  ldstr      "this is {"
       IL_001b:  ldarg.0
-      IL_001c:  call       instance class System.String JitTest.VT::ToString()
+      IL_001c:  call       instance class System.String JitTest_aa_il.VT::ToString()
       IL_0021:  ldstr      "}"
       IL_0026:  call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String,
                                                                                class System.String)
       IL_002b:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_0030:  ldarga.s   vt
-      IL_0032:  ldfld      int32 JitTest.VT::m_vn
+      IL_0032:  ldfld      int32 JitTest_aa_il.VT::m_vn
       IL_0037:  ldarga.s   vt
-      IL_0039:  ldfld      class System.String JitTest.VT::m_vs
-      IL_003e:  newobj     instance void JitTest.VT::.ctor(int32,
+      IL_0039:  ldfld      class System.String JitTest_aa_il.VT::m_vs
+      IL_003e:  newobj     instance void JitTest_aa_il.VT::.ctor(int32,
                                                            class System.String)
       IL_0043:  ret
     } // end of method VT::_RetSomething
@@ -203,11 +203,11 @@
       // Code size       28 (0x1c)
       .maxstack  8
       IL_0000:  ldarg.0
-      IL_0001:  ldflda     int32 JitTest.VT::m_vn
+      IL_0001:  ldflda     int32 JitTest_aa_il.VT::m_vn
       IL_0006:  call       instance class System.String [mscorlib]System.Int32::ToString()
       IL_000b:  ldstr      "/"
       IL_0010:  ldarg.0
-      IL_0011:  ldfld      class System.String JitTest.VT::m_vs
+      IL_0011:  ldfld      class System.String JitTest_aa_il.VT::m_vs
       IL_0016:  call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String,
                                                                                class System.String)
@@ -215,38 +215,38 @@
     } // end of method VT::ToString
 
     .method private hidebysig static void 
-            TryInterface(class JitTest.ISomething smth) il managed
+            TryInterface(class JitTest_aa_il.ISomething smth) il managed
     {
       // Code size       64 (0x40)
       .maxstack  4
-      .locals (value class JitTest.VT V_0)
+      .locals (value class JitTest_aa_il.VT V_0)
       IL_0000:  ldloca.s   V_0
       IL_0002:  ldc.i4.s   11
       IL_0004:  ldstr      "11"
-      IL_0009:  call       instance void JitTest.VT::.ctor(int32,
+      IL_0009:  call       instance void JitTest_aa_il.VT::.ctor(int32,
                                                            class System.String)
       IL_000e:  ldarg.0
       IL_000f:  ldc.i4.0
       IL_0010:  ldstr      "-"
-      IL_0015:  newobj     instance void JitTest.VT::.ctor(int32,
+      IL_0015:  newobj     instance void JitTest_aa_il.VT::.ctor(int32,
                                                            class System.String)
       IL_001a:  ldloca.s   V_0
-      IL_001c:  callvirt   instance void JitTest.ISomething::DoSomething(value class JitTest.VT,
-                                                                         value class JitTest.VT&)
+      IL_001c:  callvirt   instance void JitTest_aa_il.ISomething::DoSomething(value class JitTest_aa_il.VT,
+                                                                         value class JitTest_aa_il.VT&)
       IL_0021:  ldarg.0
       IL_0022:  ldloc.0
-      IL_0023:  callvirt   instance value class JitTest.VT JitTest.ISomething::RetSomething(value class JitTest.VT)
+      IL_0023:  callvirt   instance value class JitTest_aa_il.VT JitTest_aa_il.ISomething::RetSomething(value class JitTest_aa_il.VT)
       IL_0028:  stloc.0
       IL_0029:  ldstr      "Got : "
       IL_002e:  ldloca.s   V_0
-      IL_0030:  call       instance class System.String JitTest.VT::ToString()
+      IL_0030:  call       instance class System.String JitTest_aa_il.VT::ToString()
       IL_0035:  call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String)
       IL_003a:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_003f:  ret
     } // end of method VT::TryInterface
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -255,37 +255,37 @@
       .entrypoint
       // Code size       227 (0xe3)
       .maxstack  4
-      .locals (value class JitTest.VT V_0)
+      .locals (value class JitTest_aa_il.VT V_0)
       IL_0000:  ldloca.s   V_0
       IL_0002:  ldc.i4.s   10
       IL_0004:  ldstr      "10"
-      IL_0009:  call       instance void JitTest.VT::.ctor(int32,
+      IL_0009:  call       instance void JitTest_aa_il.VT::.ctor(int32,
                                                            class System.String)
       IL_000e:  ldloca.s   V_0
       IL_0010:  ldc.i4.0
       IL_0011:  ldstr      "-"
-      IL_0016:  newobj     instance void JitTest.VT::.ctor(int32,
+      IL_0016:  newobj     instance void JitTest_aa_il.VT::.ctor(int32,
                                                            class System.String)
       IL_001b:  ldloca.s   V_0
-      IL_001d:  call       instance void JitTest.VT::_DoSomething(value class JitTest.VT,
-                                                                  value class JitTest.VT&)
+      IL_001d:  call       instance void JitTest_aa_il.VT::_DoSomething(value class JitTest_aa_il.VT,
+                                                                  value class JitTest_aa_il.VT&)
       IL_0022:  ldloca.s   V_0
       IL_0024:  ldloc.0
-      IL_0025:  call       instance value class JitTest.VT JitTest.VT::_RetSomething(value class JitTest.VT)
+      IL_0025:  call       instance value class JitTest_aa_il.VT JitTest_aa_il.VT::_RetSomething(value class JitTest_aa_il.VT)
       IL_002a:  stloc.0
       IL_002b:  ldstr      "Got : "
       IL_0030:  ldloca.s   V_0
-      IL_0032:  call       instance class System.String JitTest.VT::ToString()
+      IL_0032:  call       instance class System.String JitTest_aa_il.VT::ToString()
       IL_0037:  call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String)
       IL_003c:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_0041:  ldloca.s   V_0
-      IL_0043:  ldfld      int32 JitTest.VT::m_vn
+      IL_0043:  ldfld      int32 JitTest_aa_il.VT::m_vn
       IL_0048:  ldc.i4.s   10
       IL_004a:  bne.un.s   IL_005f
 
       IL_004c:  ldloca.s   V_0
-      IL_004e:  ldfld      class System.String JitTest.VT::m_vs
+      IL_004e:  ldfld      class System.String JitTest_aa_il.VT::m_vs
       IL_0053:  ldstr      "10"
       IL_0058:  call       bool [mscorlib]System.String::Equals(class System.String,
                                                                 class System.String)
@@ -299,28 +299,28 @@
       IL_006c:  ldloca.s   V_0
       IL_006e:  ldc.i4.0
       IL_006f:  ldstr      "-"
-      IL_0074:  newobj     instance void JitTest.VT::.ctor(int32,
+      IL_0074:  newobj     instance void JitTest_aa_il.VT::.ctor(int32,
                                                            class System.String)
       IL_0079:  ldloca.s   V_0
-      IL_007b:  call       instance void JitTest.VT::DoSomething(value class JitTest.VT,
-                                                                 value class JitTest.VT&)
+      IL_007b:  call       instance void JitTest_aa_il.VT::DoSomething(value class JitTest_aa_il.VT,
+                                                                 value class JitTest_aa_il.VT&)
       IL_0080:  ldloca.s   V_0
       IL_0082:  ldloc.0
-      IL_0083:  call       instance value class JitTest.VT JitTest.VT::RetSomething(value class JitTest.VT)
+      IL_0083:  call       instance value class JitTest_aa_il.VT JitTest_aa_il.VT::RetSomething(value class JitTest_aa_il.VT)
       IL_0088:  stloc.0
       IL_0089:  ldstr      "Got : "
       IL_008e:  ldloca.s   V_0
-      IL_0090:  call       instance class System.String JitTest.VT::ToString()
+      IL_0090:  call       instance class System.String JitTest_aa_il.VT::ToString()
       IL_0095:  call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String)
       IL_009a:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_009f:  ldloca.s   V_0
-      IL_00a1:  ldfld      int32 JitTest.VT::m_vn
+      IL_00a1:  ldfld      int32 JitTest_aa_il.VT::m_vn
       IL_00a6:  ldc.i4.s   10
       IL_00a8:  bne.un.s   IL_00bd
 
       IL_00aa:  ldloca.s   V_0
-      IL_00ac:  ldfld      class System.String JitTest.VT::m_vs
+      IL_00ac:  ldfld      class System.String JitTest_aa_il.VT::m_vs
       IL_00b1:  ldstr      "10"
       IL_00b6:  call       bool [mscorlib]System.String::Equals(class System.String,
                                                                 class System.String)
@@ -332,8 +332,8 @@
       IL_00c9:  ret
 
       IL_00ca:  ldloc.s   V_0
-      IL_00cc:  box        JitTest.VT
-      IL_00d1:  call       void JitTest.VT::TryInterface(class JitTest.ISomething)
+      IL_00cc:  box        JitTest_aa_il.VT
+      IL_00d1:  call       void JitTest_aa_il.VT::TryInterface(class JitTest_aa_il.ISomething)
       IL_00d6:  ldstr      "Passed"
       IL_00db:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_00e0:  ldc.i4.s   100
@@ -342,6 +342,6 @@
 
   } // end of class VT
 
-} // end of namespace JitTest
+} // end of namespace JitTest_aa_il
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/VT/callconv/aa_il_d.ilproj b/src/tests/JIT/Methodical/VT/callconv/aa_il_d.ilproj
index 07d9f4dc0d1676..15dda50797e8ba 100644
--- a/src/tests/JIT/Methodical/VT/callconv/aa_il_d.ilproj
+++ b/src/tests/JIT/Methodical/VT/callconv/aa_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/callconv/aa_il_r.ilproj b/src/tests/JIT/Methodical/VT/callconv/aa_il_r.ilproj
index 7133d2a1434dc9..d0e2d4d4424596 100644
--- a/src/tests/JIT/Methodical/VT/callconv/aa_il_r.ilproj
+++ b/src/tests/JIT/Methodical/VT/callconv/aa_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/callconv/call.cs b/src/tests/JIT/Methodical/VT/callconv/call.cs
index a832399328f36d..81a50e54b17bfb 100644
--- a/src/tests/JIT/Methodical/VT/callconv/call.cs
+++ b/src/tests/JIT/Methodical/VT/callconv/call.cs
@@ -2,8 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_call_cs
 {
     internal interface ISomething
     {
@@ -11,7 +12,7 @@ internal interface ISomething
         VT RetSomething(VT vt);
     }
 
-    internal struct VT : ISomething
+    public struct VT : ISomething
     {
         private int _m_vn;
         private String _m_vs;
@@ -61,7 +62,8 @@ private static void TryInterface(ISomething smth)
             Console.WriteLine("Got : " + vt.ToString());
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             VT vt = new VT(10, "10");
             vt._DoSomething(new VT(0, "-"), ref vt);
diff --git a/src/tests/JIT/Methodical/VT/callconv/call_d.csproj b/src/tests/JIT/Methodical/VT/callconv/call_d.csproj
index 5fe9be3786addf..783e0cc5493014 100644
--- a/src/tests/JIT/Methodical/VT/callconv/call_d.csproj
+++ b/src/tests/JIT/Methodical/VT/callconv/call_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/callconv/call_do.csproj b/src/tests/JIT/Methodical/VT/callconv/call_do.csproj
index 82073910b7fc6c..d8e074eb4c8250 100644
--- a/src/tests/JIT/Methodical/VT/callconv/call_do.csproj
+++ b/src/tests/JIT/Methodical/VT/callconv/call_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/callconv/call_r.csproj b/src/tests/JIT/Methodical/VT/callconv/call_r.csproj
index b4640bed20c9b3..a78f5ed8a43118 100644
--- a/src/tests/JIT/Methodical/VT/callconv/call_r.csproj
+++ b/src/tests/JIT/Methodical/VT/callconv/call_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/callconv/call_ro.csproj b/src/tests/JIT/Methodical/VT/callconv/call_ro.csproj
index 0bb786a1dc070f..3610bd29efe978 100644
--- a/src/tests/JIT/Methodical/VT/callconv/call_ro.csproj
+++ b/src/tests/JIT/Methodical/VT/callconv/call_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/callconv/calli.il b/src/tests/JIT/Methodical/VT/callconv/calli.il
index c2c5ac6adec18f..4ddade7ae13998 100644
--- a/src/tests/JIT/Methodical/VT/callconv/calli.il
+++ b/src/tests/JIT/Methodical/VT/callconv/calli.il
@@ -17,27 +17,27 @@
                         }
 .assembly extern xunit.core {}
 // MVID: {CF1D567F-C985-45B8-8028-219BDC43D791}
-.namespace JitTest
+.namespace JitTest_calli_il
 {
   .class interface private abstract auto ansi ISomething
   {
     .method public hidebysig newslot virtual abstract 
-            instance void  DoSomething(value class JitTest.VT vt1,
-                                       value class JitTest.VT& vt2) il managed
+            instance void  DoSomething(value class JitTest_calli_il.VT vt1,
+                                       value class JitTest_calli_il.VT& vt2) il managed
     {
     } // end of method ISomething::DoSomething
 
     .method public hidebysig newslot virtual abstract 
-            instance value class JitTest.VT 
-            RetSomething(value class JitTest.VT vt) il managed
+            instance value class JitTest_calli_il.VT 
+            RetSomething(value class JitTest_calli_il.VT vt) il managed
     {
     } // end of method ISomething::RetSomething
 
   } // end of class ISomething
 
-  .class value private auto ansi sealed VT
+  .class value public auto ansi sealed VT
          extends [mscorlib]System.ValueType
-         implements JitTest.ISomething
+         implements JitTest_calli_il.ISomething
   {
     .field private int32 m_vn
     .field private class System.String m_vs
@@ -49,16 +49,16 @@
       .maxstack  8
       IL_0000:  ldarg.0
       IL_0001:  ldarg.1
-      IL_0002:  stfld      int32 JitTest.VT::m_vn
+      IL_0002:  stfld      int32 JitTest_calli_il.VT::m_vn
       IL_0007:  ldarg.0
       IL_0008:  ldarg.2
-      IL_0009:  stfld      class System.String JitTest.VT::m_vs
+      IL_0009:  stfld      class System.String JitTest_calli_il.VT::m_vs
       IL_000e:  ret
     } // end of method VT::.ctor
 
     .method public hidebysig newslot final virtual 
-            instance void  DoSomething(value class JitTest.VT vt1,
-                                       value class JitTest.VT& vt2) il managed
+            instance void  DoSomething(value class JitTest_calli_il.VT vt1,
+                                       value class JitTest_calli_il.VT& vt2) il managed
     {
       // Code size       80 (0x50)
       .maxstack  8
@@ -73,7 +73,7 @@
       IL_000f:  ldloc.0
       IL_0010:  ldc.i4.1
       IL_0011:  ldarga.s   vt1
-      IL_0013:  ldftn 		instance class System.String JitTest.VT::ToString()
+      IL_0013:  ldftn 		instance class System.String JitTest_calli_il.VT::ToString()
       			calli instance class System.String()
       IL_0018:  stelem.ref
       IL_0019:  ldloc.0
@@ -83,7 +83,7 @@
       IL_0021:  ldloc.0
       IL_0022:  ldc.i4.3
       IL_0023:  ldarg.2
-      IL_0024:  ldftn 		instance class System.String JitTest.VT::ToString()
+      IL_0024:  ldftn 		instance class System.String JitTest_calli_il.VT::ToString()
       			calli 		instance class System.String()
       IL_0029:  stelem.ref
       IL_002a:  ldloc.0
@@ -91,7 +91,7 @@
       IL_0030:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_0035:  ldstr      "this is {"
       IL_003a:  ldarg.0
-      IL_003b:  call       instance class System.String JitTest.VT::ToString()
+      IL_003b:  call       instance class System.String JitTest_calli_il.VT::ToString()
       IL_0040:  ldstr      "}"
       IL_0045:  call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String,
@@ -101,38 +101,38 @@
     } // end of method VT::DoSomething
 
     .method public hidebysig newslot final virtual 
-            instance value class JitTest.VT 
-            RetSomething(value class JitTest.VT vt) il managed
+            instance value class JitTest_calli_il.VT 
+            RetSomething(value class JitTest_calli_il.VT vt) il managed
     {
       // Code size       68 (0x44)
       .maxstack  3
       IL_0000:  ldstr      "ISomething::RetSomething - "
       IL_0005:  ldarga.s   vt
-      IL_0007:  ldftn       instance class System.String JitTest.VT::ToString()
+      IL_0007:  ldftn       instance class System.String JitTest_calli_il.VT::ToString()
       			calli		instance class System.String()
       IL_000c:  call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String)
       IL_0011:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_0016:  ldstr      "this is {"
       IL_001b:  ldarg.0
-      IL_001c:  call       instance class System.String JitTest.VT::ToString()
+      IL_001c:  call       instance class System.String JitTest_calli_il.VT::ToString()
       IL_0021:  ldstr      "}"
       IL_0026:  call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String,
                                                                                class System.String)
       IL_002b:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_0030:  ldarga.s   vt
-      IL_0032:  ldfld      int32 JitTest.VT::m_vn
+      IL_0032:  ldfld      int32 JitTest_calli_il.VT::m_vn
       IL_0037:  ldarga.s   vt
-      IL_0039:  ldfld      class System.String JitTest.VT::m_vs
-      IL_003e:  newobj     instance void JitTest.VT::.ctor(int32,
+      IL_0039:  ldfld      class System.String JitTest_calli_il.VT::m_vs
+      IL_003e:  newobj     instance void JitTest_calli_il.VT::.ctor(int32,
                                                            class System.String)
       IL_0043:  ret
     } // end of method VT::RetSomething
 
     .method public hidebysig instance void 
-            _DoSomething(value class JitTest.VT vt1,
-                         value class JitTest.VT& vt2) il managed
+            _DoSomething(value class JitTest_calli_il.VT vt1,
+                         value class JitTest_calli_il.VT& vt2) il managed
     {
       // Code size       80 (0x50)
       .maxstack  8
@@ -147,7 +147,7 @@
       IL_000f:  ldloc.0
       IL_0010:  ldc.i4.1
       IL_0011:  ldarga.s   vt1
-      IL_0013:  ldftn       instance class System.String JitTest.VT::ToString()
+      IL_0013:  ldftn       instance class System.String JitTest_calli_il.VT::ToString()
       			calli		instance class System.String()
       IL_0018:  stelem.ref
       IL_0019:  ldloc.0
@@ -157,7 +157,7 @@
       IL_0021:  ldloc.0
       IL_0022:  ldc.i4.3
       IL_0023:  ldarg.2
-      			ldftn       instance class System.String JitTest.VT::ToString()
+      			ldftn       instance class System.String JitTest_calli_il.VT::ToString()
       			calli		instance class System.String()
       IL_0029:  stelem.ref
       IL_002a:  ldloc.0
@@ -165,7 +165,7 @@
       IL_0030:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_0035:  ldstr      "this is {"
       IL_003a:  ldarg.0
-      			ldftn       instance class System.String JitTest.VT::ToString()
+      			ldftn       instance class System.String JitTest_calli_il.VT::ToString()
       			calli		instance class System.String()
       IL_0040:  ldstr      "}"
       IL_0045:  call       class System.String [mscorlib]System.String::Concat(class System.String,
@@ -175,30 +175,30 @@
       IL_004f:  ret
     } // end of method VT::_DoSomething
 
-    .method public hidebysig instance value class JitTest.VT 
-            _RetSomething(value class JitTest.VT vt) il managed
+    .method public hidebysig instance value class JitTest_calli_il.VT 
+            _RetSomething(value class JitTest_calli_il.VT vt) il managed
     {
       // Code size       68 (0x44)
       .maxstack  8
       IL_0000:  ldstr      "ISomething::RetSomething - "
       IL_0005:  ldarga.s   vt
-      IL_0007:  call       instance class System.String JitTest.VT::ToString()
+      IL_0007:  call       instance class System.String JitTest_calli_il.VT::ToString()
       IL_000c:  call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String)
       IL_0011:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_0016:  ldstr      "this is {"
       IL_001b:  ldarg.0
-      IL_001c:  call       instance class System.String JitTest.VT::ToString()
+      IL_001c:  call       instance class System.String JitTest_calli_il.VT::ToString()
       IL_0021:  ldstr      "}"
       IL_0026:  call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String,
                                                                                class System.String)
       IL_002b:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_0030:  ldarga.s   vt
-      IL_0032:  ldfld      int32 JitTest.VT::m_vn
+      IL_0032:  ldfld      int32 JitTest_calli_il.VT::m_vn
       IL_0037:  ldarga.s   vt
-      IL_0039:  ldfld      class System.String JitTest.VT::m_vs
-      IL_003e:  newobj     instance void JitTest.VT::.ctor(int32,
+      IL_0039:  ldfld      class System.String JitTest_calli_il.VT::m_vs
+      IL_003e:  newobj     instance void JitTest_calli_il.VT::.ctor(int32,
                                                            class System.String)
       IL_0043:  ret
     } // end of method VT::_RetSomething
@@ -209,11 +209,11 @@
       // Code size       28 (0x1c)
       .maxstack  8
       IL_0000:  ldarg.0
-      IL_0001:  ldflda     int32 JitTest.VT::m_vn
+      IL_0001:  ldflda     int32 JitTest_calli_il.VT::m_vn
       IL_0006:  call       instance class System.String [mscorlib]System.Int32::ToString()
       IL_000b:  ldstr      "/"
       IL_0010:  ldarg.0
-      IL_0011:  ldfld      class System.String JitTest.VT::m_vs
+      IL_0011:  ldfld      class System.String JitTest_calli_il.VT::m_vs
       IL_0016:  call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String,
                                                                                class System.String)
@@ -221,42 +221,42 @@
     } // end of method VT::ToString
 
     .method private hidebysig static void 
-            TryInterface(class JitTest.ISomething smth) il managed
+            TryInterface(class JitTest_calli_il.ISomething smth) il managed
     {
       // Code size       64 (0x40)
       .maxstack  8
-      .locals (value class JitTest.VT V_0)
+      .locals (value class JitTest_calli_il.VT V_0)
       IL_0000:  ldloca.s   V_0
       IL_0002:  ldc.i4.s   11
       IL_0004:  ldstr      "11"
-      IL_0009:  call       instance void JitTest.VT::.ctor(int32,
+      IL_0009:  call       instance void JitTest_calli_il.VT::.ctor(int32,
                                                            class System.String)
       IL_000e:  ldarg.0
       IL_000f:  ldc.i4.0
       IL_0010:  ldstr      "-"
-      IL_0015:  newobj     instance void JitTest.VT::.ctor(int32,
+      IL_0015:  newobj     instance void JitTest_calli_il.VT::.ctor(int32,
                                                            class System.String)
       IL_001a:  ldloca.s   V_0
       			ldarg.0
-      			ldvirtftn instance void JitTest.ISomething::DoSomething(value class JitTest.VT,
-                                                                         value class JitTest.VT&)
-      			calli     instance void (value class JitTest.VT, value class JitTest.VT&)
+      			ldvirtftn instance void JitTest_calli_il.ISomething::DoSomething(value class JitTest_calli_il.VT,
+                                                                         value class JitTest_calli_il.VT&)
+      			calli     instance void (value class JitTest_calli_il.VT, value class JitTest_calli_il.VT&)
       IL_0021:  ldarg.0
       IL_0022:  ldloc.0
       			ldarg.0
-      			ldvirtftn instance value class JitTest.VT JitTest.ISomething::RetSomething(value class JitTest.VT)
-      			calli instance value class JitTest.VT(value class JitTest.VT)
+      			ldvirtftn instance value class JitTest_calli_il.VT JitTest_calli_il.ISomething::RetSomething(value class JitTest_calli_il.VT)
+      			calli instance value class JitTest_calli_il.VT(value class JitTest_calli_il.VT)
       IL_0028:  stloc.0
       IL_0029:  ldstr      "Got : "
       IL_002e:  ldloca.s   V_0
-      IL_0030:  call       instance class System.String JitTest.VT::ToString()
+      IL_0030:  call       instance class System.String JitTest_calli_il.VT::ToString()
       IL_0035:  call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String)
       IL_003a:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_003f:  ret
     } // end of method VT::TryInterface
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -265,41 +265,41 @@
       .entrypoint
       // Code size       227 (0xe3)
       .maxstack  8
-      .locals (value class JitTest.VT V_0)
+      .locals (value class JitTest_calli_il.VT V_0)
       IL_0000:  ldloca.s   V_0
       IL_0002:  ldc.i4.s   10
       IL_0004:  ldstr      "10"
-      IL_0009:  call       instance void JitTest.VT::.ctor(int32,
+      IL_0009:  call       instance void JitTest_calli_il.VT::.ctor(int32,
                                                            class System.String)
       IL_000e:  ldloca.s   V_0
       IL_0010:  ldc.i4.0
       IL_0011:  ldstr      "-"
-      IL_0016:  newobj     instance void JitTest.VT::.ctor(int32,
+      IL_0016:  newobj     instance void JitTest_calli_il.VT::.ctor(int32,
                                                            class System.String)
       IL_001b:  ldloca.s   V_0
-      IL_001d:  ldftn      instance void JitTest.VT::_DoSomething(value class JitTest.VT,
-                                                                  value class JitTest.VT&)
-                calli      instance void(value class JitTest.VT, value class JitTest.VT&)
+      IL_001d:  ldftn      instance void JitTest_calli_il.VT::_DoSomething(value class JitTest_calli_il.VT,
+                                                                  value class JitTest_calli_il.VT&)
+                calli      instance void(value class JitTest_calli_il.VT, value class JitTest_calli_il.VT&)
                 
       IL_0022:  ldloca.s   V_0
       IL_0024:  ldloc.0
-      IL_0025:  ldftn     instance value class JitTest.VT JitTest.VT::_RetSomething(value class JitTest.VT)
-      			calli      instance value class JitTest.VT(value class JitTest.VT)
+      IL_0025:  ldftn     instance value class JitTest_calli_il.VT JitTest_calli_il.VT::_RetSomething(value class JitTest_calli_il.VT)
+      			calli      instance value class JitTest_calli_il.VT(value class JitTest_calli_il.VT)
 
       IL_002a:  stloc.0
       IL_002b:  ldstr      "Got : "
       IL_0030:  ldloca.s   V_0
-      IL_0032:  call       instance class System.String JitTest.VT::ToString()
+      IL_0032:  call       instance class System.String JitTest_calli_il.VT::ToString()
       IL_0037:  call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String)
       IL_003c:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_0041:  ldloca.s   V_0
-      IL_0043:  ldfld      int32 JitTest.VT::m_vn
+      IL_0043:  ldfld      int32 JitTest_calli_il.VT::m_vn
       IL_0048:  ldc.i4.s   10
       IL_004a:  bne.un.s   IL_005f
 
       IL_004c:  ldloca.s   V_0
-      IL_004e:  ldfld      class System.String JitTest.VT::m_vs
+      IL_004e:  ldfld      class System.String JitTest_calli_il.VT::m_vs
       IL_0053:  ldstr      "10"
       IL_0058:  call       bool [mscorlib]System.String::Equals(class System.String,
                                                                 class System.String)
@@ -313,30 +313,30 @@
       IL_006c:  ldloca.s   V_0
       IL_006e:  ldc.i4.0
       IL_006f:  ldstr      "-"
-      IL_0074:  newobj     instance void JitTest.VT::.ctor(int32,
+      IL_0074:  newobj     instance void JitTest_calli_il.VT::.ctor(int32,
                                                            class System.String)
       IL_0079:  ldloca.s   V_0
-      IL_007b:  ldftn       instance void JitTest.VT::DoSomething(value class JitTest.VT,
-                                                                 value class JitTest.VT&)
-				calli		instance void(value class JitTest.VT, value class JitTest.VT&)
+      IL_007b:  ldftn       instance void JitTest_calli_il.VT::DoSomething(value class JitTest_calli_il.VT,
+                                                                 value class JitTest_calli_il.VT&)
+				calli		instance void(value class JitTest_calli_il.VT, value class JitTest_calli_il.VT&)
       IL_0080:  ldloca.s   V_0
       IL_0082:  ldloc.0
-      IL_0083:  ldftn       instance value class JitTest.VT JitTest.VT::RetSomething(value class JitTest.VT)
-      			calli 		instance value class JitTest.VT(value class JitTest.VT)
+      IL_0083:  ldftn       instance value class JitTest_calli_il.VT JitTest_calli_il.VT::RetSomething(value class JitTest_calli_il.VT)
+      			calli 		instance value class JitTest_calli_il.VT(value class JitTest_calli_il.VT)
       IL_0088:  stloc.0
       IL_0089:  ldstr      "Got : "
       IL_008e:  ldloca.s   V_0
-      IL_0090:  call       instance class System.String JitTest.VT::ToString()
+      IL_0090:  call       instance class System.String JitTest_calli_il.VT::ToString()
       IL_0095:  call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String)
       IL_009a:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_009f:  ldloca.s   V_0
-      IL_00a1:  ldfld      int32 JitTest.VT::m_vn
+      IL_00a1:  ldfld      int32 JitTest_calli_il.VT::m_vn
       IL_00a6:  ldc.i4.s   10
       IL_00a8:  bne.un.s   IL_00bd
 
       IL_00aa:  ldloca.s   V_0
-      IL_00ac:  ldfld      class System.String JitTest.VT::m_vs
+      IL_00ac:  ldfld      class System.String JitTest_calli_il.VT::m_vs
       IL_00b1:  ldstr      "10"
       IL_00b6:  call       bool [mscorlib]System.String::Equals(class System.String,
                                                                 class System.String)
@@ -348,8 +348,8 @@
       IL_00c9:  ret
 
       IL_00ca:  ldloc.s   V_0
-      IL_00cc:  box        JitTest.VT
-      IL_00d1:  call       void JitTest.VT::TryInterface(class JitTest.ISomething)
+      IL_00cc:  box        JitTest_calli_il.VT
+      IL_00d1:  call       void JitTest_calli_il.VT::TryInterface(class JitTest_calli_il.ISomething)
       IL_00d6:  ldstr      "Passed"
       IL_00db:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_00e0:  ldc.i4.s   100
@@ -358,6 +358,6 @@
 
   } // end of class VT
 
-} // end of namespace JitTest
+} // end of namespace JitTest_calli_il
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/VT/callconv/calli_il_d.ilproj b/src/tests/JIT/Methodical/VT/callconv/calli_il_d.ilproj
index a84d7f8c67ddc4..ef0ee85003be37 100644
--- a/src/tests/JIT/Methodical/VT/callconv/calli_il_d.ilproj
+++ b/src/tests/JIT/Methodical/VT/callconv/calli_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/callconv/calli_il_r.ilproj b/src/tests/JIT/Methodical/VT/callconv/calli_il_r.ilproj
index bbc54e52549e59..6e0e1cc8e4cba9 100644
--- a/src/tests/JIT/Methodical/VT/callconv/calli_il_r.ilproj
+++ b/src/tests/JIT/Methodical/VT/callconv/calli_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/callconv/dd.il b/src/tests/JIT/Methodical/VT/callconv/dd.il
index 056b1c462fde46..d0b0515e485bb6 100644
--- a/src/tests/JIT/Methodical/VT/callconv/dd.il
+++ b/src/tests/JIT/Methodical/VT/callconv/dd.il
@@ -17,27 +17,27 @@
 }
 .assembly extern xunit.core {}
 // MVID: {CF1D567F-C985-45B8-8028-219BDC43D791}
-.namespace JitTest
+.namespace JitTest_dd_il
 {
   .class interface private abstract auto ansi ISomething
   {
     .method public hidebysig newslot virtual abstract 
-            instance void  DoSomething(value class JitTest.VT vt1,
-                                       value class JitTest.VT& vt2) il managed
+            instance void  DoSomething(value class JitTest_dd_il.VT vt1,
+                                       value class JitTest_dd_il.VT& vt2) il managed
     {
     } // end of method ISomething::DoSomething
 
     .method public hidebysig newslot virtual abstract 
-            instance value class JitTest.VT 
-            RetSomething(value class JitTest.VT vt) il managed
+            instance value class JitTest_dd_il.VT 
+            RetSomething(value class JitTest_dd_il.VT vt) il managed
     {
     } // end of method ISomething::RetSomething
 
   } // end of class ISomething
 
-  .class value private auto ansi sealed VT
+  .class value public auto ansi sealed VT
          extends [mscorlib]System.ValueType
-         implements JitTest.ISomething
+         implements JitTest_dd_il.ISomething
   {
     .field private int32 m_vn
     .field private class [mscorlib]System.String m_vs
@@ -49,16 +49,16 @@
       .maxstack  8
       IL_0000:  ldarg.0
       IL_0001:  ldarg.1
-      IL_0002:  stfld      int32 JitTest.VT::m_vn
+      IL_0002:  stfld      int32 JitTest_dd_il.VT::m_vn
       IL_0007:  ldarg.0
       IL_0008:  ldarg.2
-      IL_0009:  stfld      class [mscorlib]System.String JitTest.VT::m_vs
+      IL_0009:  stfld      class [mscorlib]System.String JitTest_dd_il.VT::m_vs
       IL_000e:  ret
     } // end of method VT::.ctor
 
     .method public hidebysig newslot final virtual 
-            instance void  DoSomething(value class JitTest.VT vt1,
-                                       value class JitTest.VT& vt2) il managed
+            instance void  DoSomething(value class JitTest_dd_il.VT vt1,
+                                       value class JitTest_dd_il.VT& vt2) il managed
     {
       // Code size       80 (0x50)
       .maxstack  3
@@ -73,7 +73,7 @@
       IL_000f:  ldloc.0
       IL_0010:  ldc.i4.1
       IL_0011:  ldarga.s   vt1
-      IL_0013:  call       instance class [mscorlib]System.String JitTest.VT::ToString()
+      IL_0013:  call       instance class [mscorlib]System.String JitTest_dd_il.VT::ToString()
       IL_0018:  stelem.ref
       IL_0019:  ldloc.0
       IL_001a:  ldc.i4.2
@@ -82,14 +82,14 @@
       IL_0021:  ldloc.0
       IL_0022:  ldc.i4.3
       IL_0023:  ldarg.2
-      IL_0024:  call       instance class [mscorlib]System.String JitTest.VT::ToString()
+      IL_0024:  call       instance class [mscorlib]System.String JitTest_dd_il.VT::ToString()
       IL_0029:  stelem.ref
       IL_002a:  ldloc.0
       IL_002b:  call       class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String[])
       IL_0030:  call       void [System.Console]System.Console::WriteLine(class [mscorlib]System.String)
       IL_0035:  ldstr      "this is {"
       IL_003a:  ldarg.0
-      IL_003b:  call       instance class [mscorlib]System.String JitTest.VT::ToString()
+      IL_003b:  call       instance class [mscorlib]System.String JitTest_dd_il.VT::ToString()
       IL_0040:  ldstr      "}"
       IL_0045:  call       class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String,
                                                                                class [mscorlib]System.String,
@@ -99,37 +99,37 @@
     } // end of method VT::DoSomething
 
     .method public hidebysig newslot final virtual 
-            instance value class JitTest.VT 
-            RetSomething(value class JitTest.VT vt) il managed
+            instance value class JitTest_dd_il.VT 
+            RetSomething(value class JitTest_dd_il.VT vt) il managed
     {
       // Code size       68 (0x44)
       .maxstack  3
       IL_0000:  ldstr      "ISomething::RetSomething - "
       IL_0005:  ldarga.s   vt
-      IL_0007:  call       instance class [mscorlib]System.String JitTest.VT::ToString()
+      IL_0007:  call       instance class [mscorlib]System.String JitTest_dd_il.VT::ToString()
       IL_000c:  call       class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String,
                                                                                class [mscorlib]System.String)
       IL_0011:  call       void [System.Console]System.Console::WriteLine(class [mscorlib]System.String)
       IL_0016:  ldstr      "this is {"
       IL_001b:  ldarg.0
-      IL_001c:  call       instance class [mscorlib]System.String JitTest.VT::ToString()
+      IL_001c:  call       instance class [mscorlib]System.String JitTest_dd_il.VT::ToString()
       IL_0021:  ldstr      "}"
       IL_0026:  call       class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String,
                                                                                class [mscorlib]System.String,
                                                                                class [mscorlib]System.String)
       IL_002b:  call       void [System.Console]System.Console::WriteLine(class [mscorlib]System.String)
       IL_0030:  ldarga.s   vt
-      IL_0032:  ldfld      int32 JitTest.VT::m_vn
+      IL_0032:  ldfld      int32 JitTest_dd_il.VT::m_vn
       IL_0037:  ldarga.s   vt
-      IL_0039:  ldfld      class [mscorlib]System.String JitTest.VT::m_vs
-      IL_003e:  newobj     instance void JitTest.VT::.ctor(int32,
+      IL_0039:  ldfld      class [mscorlib]System.String JitTest_dd_il.VT::m_vs
+      IL_003e:  newobj     instance void JitTest_dd_il.VT::.ctor(int32,
                                                            class [mscorlib]System.String)
       IL_0043:  ret
     } // end of method VT::RetSomething
 
     .method public hidebysig instance void 
-            _DoSomething(value class JitTest.VT vt1,
-                         value class JitTest.VT& vt2) il managed
+            _DoSomething(value class JitTest_dd_il.VT vt1,
+                         value class JitTest_dd_il.VT& vt2) il managed
     {
       // Code size       80 (0x50)
       .maxstack  3
@@ -144,7 +144,7 @@
       IL_000f:  ldloc.0
       IL_0010:  ldc.i4.1
       IL_0011:  ldarga.s   vt1
-      IL_0013:  call       instance class [mscorlib]System.String JitTest.VT::ToString()
+      IL_0013:  call       instance class [mscorlib]System.String JitTest_dd_il.VT::ToString()
       IL_0018:  stelem.ref
       IL_0019:  ldloc.0
       IL_001a:  ldc.i4.2
@@ -153,14 +153,14 @@
       IL_0021:  ldloc.0
       IL_0022:  ldc.i4.3
       IL_0023:  ldarg.2
-      IL_0024:  call       instance class [mscorlib]System.String JitTest.VT::ToString()
+      IL_0024:  call       instance class [mscorlib]System.String JitTest_dd_il.VT::ToString()
       IL_0029:  stelem.ref
       IL_002a:  ldloc.0
       IL_002b:  call       class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String[])
       IL_0030:  call       void [System.Console]System.Console::WriteLine(class [mscorlib]System.String)
       IL_0035:  ldstr      "this is {"
       IL_003a:  ldarg.0
-      IL_003b:  call       instance class [mscorlib]System.String JitTest.VT::ToString()
+      IL_003b:  call       instance class [mscorlib]System.String JitTest_dd_il.VT::ToString()
       IL_0040:  ldstr      "}"
       IL_0045:  call       class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String,
                                                                                class [mscorlib]System.String,
@@ -169,30 +169,30 @@
       IL_004f:  ret
     } // end of method VT::_DoSomething
 
-    .method public hidebysig instance value class JitTest.VT 
-            _RetSomething(value class JitTest.VT vt) il managed
+    .method public hidebysig instance value class JitTest_dd_il.VT 
+            _RetSomething(value class JitTest_dd_il.VT vt) il managed
     {
       // Code size       68 (0x44)
       .maxstack  3
       IL_0000:  ldstr      "ISomething::RetSomething - "
       IL_0005:  ldarga.s   vt
-      IL_0007:  call       instance class [mscorlib]System.String JitTest.VT::ToString()
+      IL_0007:  call       instance class [mscorlib]System.String JitTest_dd_il.VT::ToString()
       IL_000c:  call       class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String,
                                                                                class [mscorlib]System.String)
       IL_0011:  call       void [System.Console]System.Console::WriteLine(class [mscorlib]System.String)
       IL_0016:  ldstr      "this is {"
       IL_001b:  ldarg.0
-      IL_001c:  call       instance class [mscorlib]System.String JitTest.VT::ToString()
+      IL_001c:  call       instance class [mscorlib]System.String JitTest_dd_il.VT::ToString()
       IL_0021:  ldstr      "}"
       IL_0026:  call       class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String,
                                                                                class [mscorlib]System.String,
                                                                                class [mscorlib]System.String)
       IL_002b:  call       void [System.Console]System.Console::WriteLine(class [mscorlib]System.String)
       IL_0030:  ldarga.s   vt
-      IL_0032:  ldfld      int32 JitTest.VT::m_vn
+      IL_0032:  ldfld      int32 JitTest_dd_il.VT::m_vn
       IL_0037:  ldarga.s   vt
-      IL_0039:  ldfld      class [mscorlib]System.String JitTest.VT::m_vs
-      IL_003e:  newobj     instance void JitTest.VT::.ctor(int32,
+      IL_0039:  ldfld      class [mscorlib]System.String JitTest_dd_il.VT::m_vs
+      IL_003e:  newobj     instance void JitTest_dd_il.VT::.ctor(int32,
                                                            class [mscorlib]System.String)
       IL_0043:  ret
     } // end of method VT::_RetSomething
@@ -203,11 +203,11 @@
       // Code size       28 (0x1c)
       .maxstack  8
       IL_0000:  ldarg.0
-      IL_0001:  ldflda     int32 JitTest.VT::m_vn
+      IL_0001:  ldflda     int32 JitTest_dd_il.VT::m_vn
       IL_0006:  call       instance class [mscorlib]System.String [mscorlib]System.Int32::ToString()
       IL_000b:  ldstr      "/"
       IL_0010:  ldarg.0
-      IL_0011:  ldfld      class [mscorlib]System.String JitTest.VT::m_vs
+      IL_0011:  ldfld      class [mscorlib]System.String JitTest_dd_il.VT::m_vs
       IL_0016:  call       class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String,
                                                                                class [mscorlib]System.String,
                                                                                class [mscorlib]System.String)
@@ -215,38 +215,38 @@
     } // end of method VT::ToString
 
     .method private hidebysig static void 
-            TryInterface(class JitTest.ISomething smth) il managed
+            TryInterface(class JitTest_dd_il.ISomething smth) il managed
     {
       // Code size       64 (0x40)
       .maxstack  4
-      .locals (value class JitTest.VT V_0)
+      .locals (value class JitTest_dd_il.VT V_0)
       IL_0000:  ldloca.s   V_0
       IL_0002:  ldc.i4.s   11
       IL_0004:  ldstr      "11"
-      IL_0009:  call       instance void JitTest.VT::.ctor(int32,
+      IL_0009:  call       instance void JitTest_dd_il.VT::.ctor(int32,
                                                            class [mscorlib]System.String)
       IL_000e:  ldarg.0
       IL_000f:  ldc.i4.0
       IL_0010:  ldstr      "-"
-      IL_0015:  newobj     instance void JitTest.VT::.ctor(int32,
+      IL_0015:  newobj     instance void JitTest_dd_il.VT::.ctor(int32,
                                                            class [mscorlib]System.String)
       IL_001a:  ldloca.s   V_0
-      IL_001c:  callvirt   instance void JitTest.ISomething::DoSomething(value class JitTest.VT,
-                                                                         value class JitTest.VT&)
+      IL_001c:  callvirt   instance void JitTest_dd_il.ISomething::DoSomething(value class JitTest_dd_il.VT,
+                                                                         value class JitTest_dd_il.VT&)
       IL_0021:  ldarg.0
       IL_0022:  ldloc.0
-      IL_0023:  callvirt   instance value class JitTest.VT JitTest.ISomething::RetSomething(value class JitTest.VT)
+      IL_0023:  callvirt   instance value class JitTest_dd_il.VT JitTest_dd_il.ISomething::RetSomething(value class JitTest_dd_il.VT)
       IL_0028:  stloc.0
       IL_0029:  ldstr      "Got : "
       IL_002e:  ldloca.s   V_0
-      IL_0030:  call       instance class [mscorlib]System.String JitTest.VT::ToString()
+      IL_0030:  call       instance class [mscorlib]System.String JitTest_dd_il.VT::ToString()
       IL_0035:  call       class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String,
                                                                                class [mscorlib]System.String)
       IL_003a:  call       void [System.Console]System.Console::WriteLine(class [mscorlib]System.String)
       IL_003f:  ret
     } // end of method VT::TryInterface
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -255,38 +255,38 @@
       .entrypoint
       // Code size       227 (0xe3)
       .maxstack  4
-      .locals (value class JitTest.VT V_0)
+      .locals (value class JitTest_dd_il.VT V_0)
       IL_0000:  ldloca.s   V_0
       IL_0002:  ldc.i4.s   10
       IL_0004:  ldstr      "10"
-      IL_0009:  call       instance void JitTest.VT::.ctor(int32,
+      IL_0009:  call       instance void JitTest_dd_il.VT::.ctor(int32,
                                                            class [mscorlib]System.String)
       IL_000e:  ldloca.s   V_0
       IL_0010:  ldc.i4.0
       IL_0011:  ldstr      "-"
-      IL_0016:  newobj     instance void JitTest.VT::.ctor(int32,
+      IL_0016:  newobj     instance void JitTest_dd_il.VT::.ctor(int32,
                                                            class [mscorlib]System.String)
       IL_001b:  ldloca.s   V_0
-      IL_001d:  call       instance void JitTest.VT::_DoSomething(value class JitTest.VT,
-                                                                  value class JitTest.VT&)
+      IL_001d:  call       instance void JitTest_dd_il.VT::_DoSomething(value class JitTest_dd_il.VT,
+                                                                  value class JitTest_dd_il.VT&)
       IL_0022:  ldloca.s   V_0
       IL_0024:  ldloc.0
-      IL_0025:  call       instance value class JitTest.VT JitTest.VT::_RetSomething(value class JitTest.VT)
+      IL_0025:  call       instance value class JitTest_dd_il.VT JitTest_dd_il.VT::_RetSomething(value class JitTest_dd_il.VT)
       IL_002a:  stloc.0
       IL_002b:  ldstr      "Got : "
       IL_0030:  ldloc.s   V_0
-      			box   JitTest.VT
+      			box   JitTest_dd_il.VT
       IL_0032:  callvirt   instance class [mscorlib]System.String [mscorlib]System.Object::ToString()
       IL_0037:  call       class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String,
                                                                                class [mscorlib]System.String)
       IL_003c:  call       void [System.Console]System.Console::WriteLine(class [mscorlib]System.String)
       IL_0041:  ldloca.s   V_0
-      IL_0043:  ldfld      int32 JitTest.VT::m_vn
+      IL_0043:  ldfld      int32 JitTest_dd_il.VT::m_vn
       IL_0048:  ldc.i4.s   10
       IL_004a:  bne.un.s   IL_005f
 
       IL_004c:  ldloca.s   V_0
-      IL_004e:  ldfld      class [mscorlib]System.String JitTest.VT::m_vs
+      IL_004e:  ldfld      class [mscorlib]System.String JitTest_dd_il.VT::m_vs
       IL_0053:  ldstr      "10"
       IL_0058:  call       bool [mscorlib]System.String::Equals(class [mscorlib]System.String,
                                                                 class [mscorlib]System.String)
@@ -298,36 +298,36 @@
       IL_006b:  ret
 
       IL_006c:  ldloc.s   V_0
-      			box   JitTest.VT
-      			//castclass JitTest.ISomething
+      			box   JitTest_dd_il.VT
+      			//castclass JitTest_dd_il.ISomething
       
       IL_006e:  ldc.i4.0
       IL_006f:  ldstr      "-"
-      IL_0074:  newobj     instance void JitTest.VT::.ctor(int32,
+      IL_0074:  newobj     instance void JitTest_dd_il.VT::.ctor(int32,
                                                            class [mscorlib]System.String)
       IL_0079:  ldloca.s   V_0
-      IL_007b:  callvirt       instance void JitTest.ISomething::DoSomething(value class JitTest.VT,
-                                                                 value class JitTest.VT&)
+      IL_007b:  callvirt       instance void JitTest_dd_il.ISomething::DoSomething(value class JitTest_dd_il.VT,
+                                                                 value class JitTest_dd_il.VT&)
       IL_0080:  ldloc.s   V_0
-      			box   JitTest.VT
-      			//castclass JitTest.ISomething
+      			box   JitTest_dd_il.VT
+      			//castclass JitTest_dd_il.ISomething
       IL_0082:  ldloc.0
-      IL_0083:  callvirt       instance value class JitTest.VT JitTest.ISomething::RetSomething(value class JitTest.VT)
+      IL_0083:  callvirt       instance value class JitTest_dd_il.VT JitTest_dd_il.ISomething::RetSomething(value class JitTest_dd_il.VT)
       IL_0088:  stloc.0
       IL_0089:  ldstr      "Got : "
       IL_008e:  ldloc.s   V_0
-      			box   JitTest.VT
+      			box   JitTest_dd_il.VT
       IL_0090:  callvirt       instance class [mscorlib]System.String [mscorlib]System.Object::ToString()
       IL_0095:  call       class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String,
                                                                                class [mscorlib]System.String)
       IL_009a:  call       void [System.Console]System.Console::WriteLine(class [mscorlib]System.String)
       IL_009f:  ldloca.s   V_0
-      IL_00a1:  ldfld      int32 JitTest.VT::m_vn
+      IL_00a1:  ldfld      int32 JitTest_dd_il.VT::m_vn
       IL_00a6:  ldc.i4.s   10
       IL_00a8:  bne.un.s   IL_00bd
 
       IL_00aa:  ldloca.s   V_0
-      IL_00ac:  ldfld      class [mscorlib]System.String JitTest.VT::m_vs
+      IL_00ac:  ldfld      class [mscorlib]System.String JitTest_dd_il.VT::m_vs
       IL_00b1:  ldstr      "10"
       IL_00b6:  call       bool [mscorlib]System.String::Equals(class [mscorlib]System.String,
                                                                 class [mscorlib]System.String)
@@ -339,8 +339,8 @@
       IL_00c9:  ret
 
       IL_00ca:  ldloc.s   V_0
-      IL_00cc:  box        JitTest.VT
-      IL_00d1:  call       void JitTest.VT::TryInterface(class JitTest.ISomething)
+      IL_00cc:  box        JitTest_dd_il.VT
+      IL_00d1:  call       void JitTest_dd_il.VT::TryInterface(class JitTest_dd_il.ISomething)
       IL_00d6:  ldstr      "Passed"
       IL_00db:  call       void [System.Console]System.Console::WriteLine(class [mscorlib]System.String)
       IL_00e0:  ldc.i4.s   100
@@ -349,6 +349,6 @@
 
   } // end of class VT
 
-} // end of namespace JitTest
+} // end of namespace JitTest_dd_il
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/VT/callconv/dd_il_d.ilproj b/src/tests/JIT/Methodical/VT/callconv/dd_il_d.ilproj
index 1b184240c2ce47..ecc44205c2e73a 100644
--- a/src/tests/JIT/Methodical/VT/callconv/dd_il_d.ilproj
+++ b/src/tests/JIT/Methodical/VT/callconv/dd_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/callconv/dd_il_r.ilproj b/src/tests/JIT/Methodical/VT/callconv/dd_il_r.ilproj
index 0b0e3cc6720b16..34d953eb496ef1 100644
--- a/src/tests/JIT/Methodical/VT/callconv/dd_il_r.ilproj
+++ b/src/tests/JIT/Methodical/VT/callconv/dd_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/callconv/ee.il b/src/tests/JIT/Methodical/VT/callconv/ee.il
index 69e9772ff9994b..4320997b5aa416 100644
--- a/src/tests/JIT/Methodical/VT/callconv/ee.il
+++ b/src/tests/JIT/Methodical/VT/callconv/ee.il
@@ -17,27 +17,27 @@
 }
 .assembly extern xunit.core {}
 // MVID: {CF1D567F-C985-45B8-8028-219BDC43D791}
-.namespace JitTest
+.namespace JitTest_ee_il
 {
   .class interface private abstract auto ansi ISomething
   {
     .method public hidebysig newslot virtual abstract 
-            instance void  DoSomething(value class JitTest.VT vt1,
-                                       value class JitTest.VT& vt2) il managed
+            instance void  DoSomething(value class JitTest_ee_il.VT vt1,
+                                       value class JitTest_ee_il.VT& vt2) il managed
     {
     } // end of method ISomething::DoSomething
 
     .method public hidebysig newslot virtual abstract 
-            instance value class JitTest.VT 
-            RetSomething(value class JitTest.VT vt) il managed
+            instance value class JitTest_ee_il.VT 
+            RetSomething(value class JitTest_ee_il.VT vt) il managed
     {
     } // end of method ISomething::RetSomething
 
   } // end of class ISomething
 
-  .class value private auto ansi sealed VT
+  .class value public auto ansi sealed VT
          extends [mscorlib]System.ValueType
-         implements JitTest.ISomething
+         implements JitTest_ee_il.ISomething
   {
     .field private int32 m_vn
     .field private class [mscorlib]System.String m_vs
@@ -49,16 +49,16 @@
       .maxstack  8
       IL_0000:  ldarg.0
       IL_0001:  ldarg.1
-      IL_0002:  stfld      int32 JitTest.VT::m_vn
+      IL_0002:  stfld      int32 JitTest_ee_il.VT::m_vn
       IL_0007:  ldarg.0
       IL_0008:  ldarg.2
-      IL_0009:  stfld      class [mscorlib]System.String JitTest.VT::m_vs
+      IL_0009:  stfld      class [mscorlib]System.String JitTest_ee_il.VT::m_vs
       IL_000e:  ret
     } // end of method VT::.ctor
 
     .method public hidebysig newslot final virtual 
-            instance void  DoSomething(value class JitTest.VT vt1,
-                                       value class JitTest.VT& vt2) il managed
+            instance void  DoSomething(value class JitTest_ee_il.VT vt1,
+                                       value class JitTest_ee_il.VT& vt2) il managed
     {
       // Code size       80 (0x50)
       .maxstack  3
@@ -73,7 +73,7 @@
       IL_000f:  ldloc.0
       IL_0010:  ldc.i4.1
       IL_0011:  ldarga.s   vt1
-      IL_0013:  call       instance class [mscorlib]System.String JitTest.VT::ToString()
+      IL_0013:  call       instance class [mscorlib]System.String JitTest_ee_il.VT::ToString()
       IL_0018:  stelem.ref
       IL_0019:  ldloc.0
       IL_001a:  ldc.i4.2
@@ -82,14 +82,14 @@
       IL_0021:  ldloc.0
       IL_0022:  ldc.i4.3
       IL_0023:  ldarg.2
-      IL_0024:  call       instance class [mscorlib]System.String JitTest.VT::ToString()
+      IL_0024:  call       instance class [mscorlib]System.String JitTest_ee_il.VT::ToString()
       IL_0029:  stelem.ref
       IL_002a:  ldloc.0
       IL_002b:  call       class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String[])
       IL_0030:  call       void [System.Console]System.Console::WriteLine(class [mscorlib]System.String)
       IL_0035:  ldstr      "this is {"
       IL_003a:  ldarg.0
-      IL_003b:  call       instance class [mscorlib]System.String JitTest.VT::ToString()
+      IL_003b:  call       instance class [mscorlib]System.String JitTest_ee_il.VT::ToString()
       IL_0040:  ldstr      "}"
       IL_0045:  call       class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String,
                                                                                class [mscorlib]System.String,
@@ -99,37 +99,37 @@
     } // end of method VT::DoSomething
 
     .method public hidebysig newslot final virtual 
-            instance value class JitTest.VT 
-            RetSomething(value class JitTest.VT vt) il managed
+            instance value class JitTest_ee_il.VT 
+            RetSomething(value class JitTest_ee_il.VT vt) il managed
     {
       // Code size       68 (0x44)
       .maxstack  3
       IL_0000:  ldstr      "ISomething::RetSomething - "
       IL_0005:  ldarga.s   vt
-      IL_0007:  call       instance class [mscorlib]System.String JitTest.VT::ToString()
+      IL_0007:  call       instance class [mscorlib]System.String JitTest_ee_il.VT::ToString()
       IL_000c:  call       class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String,
                                                                                class [mscorlib]System.String)
       IL_0011:  call       void [System.Console]System.Console::WriteLine(class [mscorlib]System.String)
       IL_0016:  ldstr      "this is {"
       IL_001b:  ldarg.0
-      IL_001c:  call       instance class [mscorlib]System.String JitTest.VT::ToString()
+      IL_001c:  call       instance class [mscorlib]System.String JitTest_ee_il.VT::ToString()
       IL_0021:  ldstr      "}"
       IL_0026:  call       class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String,
                                                                                class [mscorlib]System.String,
                                                                                class [mscorlib]System.String)
       IL_002b:  call       void [System.Console]System.Console::WriteLine(class [mscorlib]System.String)
       IL_0030:  ldarga.s   vt
-      IL_0032:  ldfld      int32 JitTest.VT::m_vn
+      IL_0032:  ldfld      int32 JitTest_ee_il.VT::m_vn
       IL_0037:  ldarga.s   vt
-      IL_0039:  ldfld      class [mscorlib]System.String JitTest.VT::m_vs
-      IL_003e:  newobj     instance void JitTest.VT::.ctor(int32,
+      IL_0039:  ldfld      class [mscorlib]System.String JitTest_ee_il.VT::m_vs
+      IL_003e:  newobj     instance void JitTest_ee_il.VT::.ctor(int32,
                                                            class [mscorlib]System.String)
       IL_0043:  ret
     } // end of method VT::RetSomething
 
     .method public hidebysig instance void 
-            _DoSomething(value class JitTest.VT vt1,
-                         value class JitTest.VT& vt2) il managed
+            _DoSomething(value class JitTest_ee_il.VT vt1,
+                         value class JitTest_ee_il.VT& vt2) il managed
     {
       // Code size       80 (0x50)
       .maxstack  3
@@ -144,7 +144,7 @@
       IL_000f:  ldloc.0
       IL_0010:  ldc.i4.1
       IL_0011:  ldarga.s   vt1
-      IL_0013:  call       instance class [mscorlib]System.String JitTest.VT::ToString()
+      IL_0013:  call       instance class [mscorlib]System.String JitTest_ee_il.VT::ToString()
       IL_0018:  stelem.ref
       IL_0019:  ldloc.0
       IL_001a:  ldc.i4.2
@@ -153,14 +153,14 @@
       IL_0021:  ldloc.0
       IL_0022:  ldc.i4.3
       IL_0023:  ldarg.2
-      IL_0024:  call       instance class [mscorlib]System.String JitTest.VT::ToString()
+      IL_0024:  call       instance class [mscorlib]System.String JitTest_ee_il.VT::ToString()
       IL_0029:  stelem.ref
       IL_002a:  ldloc.0
       IL_002b:  call       class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String[])
       IL_0030:  call       void [System.Console]System.Console::WriteLine(class [mscorlib]System.String)
       IL_0035:  ldstr      "this is {"
       IL_003a:  ldarg.0
-      IL_003b:  call       instance class [mscorlib]System.String JitTest.VT::ToString()
+      IL_003b:  call       instance class [mscorlib]System.String JitTest_ee_il.VT::ToString()
       IL_0040:  ldstr      "}"
       IL_0045:  call       class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String,
                                                                                class [mscorlib]System.String,
@@ -169,30 +169,30 @@
       IL_004f:  ret
     } // end of method VT::_DoSomething
 
-    .method public hidebysig instance value class JitTest.VT 
-            _RetSomething(value class JitTest.VT vt) il managed
+    .method public hidebysig instance value class JitTest_ee_il.VT 
+            _RetSomething(value class JitTest_ee_il.VT vt) il managed
     {
       // Code size       68 (0x44)
       .maxstack  3
       IL_0000:  ldstr      "ISomething::RetSomething - "
       IL_0005:  ldarga.s   vt
-      IL_0007:  call       instance class [mscorlib]System.String JitTest.VT::ToString()
+      IL_0007:  call       instance class [mscorlib]System.String JitTest_ee_il.VT::ToString()
       IL_000c:  call       class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String,
                                                                                class [mscorlib]System.String)
       IL_0011:  call       void [System.Console]System.Console::WriteLine(class [mscorlib]System.String)
       IL_0016:  ldstr      "this is {"
       IL_001b:  ldarg.0
-      IL_001c:  call       instance class [mscorlib]System.String JitTest.VT::ToString()
+      IL_001c:  call       instance class [mscorlib]System.String JitTest_ee_il.VT::ToString()
       IL_0021:  ldstr      "}"
       IL_0026:  call       class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String,
                                                                                class [mscorlib]System.String,
                                                                                class [mscorlib]System.String)
       IL_002b:  call       void [System.Console]System.Console::WriteLine(class [mscorlib]System.String)
       IL_0030:  ldarga.s   vt
-      IL_0032:  ldfld      int32 JitTest.VT::m_vn
+      IL_0032:  ldfld      int32 JitTest_ee_il.VT::m_vn
       IL_0037:  ldarga.s   vt
-      IL_0039:  ldfld      class [mscorlib]System.String JitTest.VT::m_vs
-      IL_003e:  newobj     instance void JitTest.VT::.ctor(int32,
+      IL_0039:  ldfld      class [mscorlib]System.String JitTest_ee_il.VT::m_vs
+      IL_003e:  newobj     instance void JitTest_ee_il.VT::.ctor(int32,
                                                            class [mscorlib]System.String)
       IL_0043:  ret
     } // end of method VT::_RetSomething
@@ -203,11 +203,11 @@
       // Code size       28 (0x1c)
       .maxstack  8
       IL_0000:  ldarg.0
-      IL_0001:  ldflda     int32 JitTest.VT::m_vn
+      IL_0001:  ldflda     int32 JitTest_ee_il.VT::m_vn
       IL_0006:  call       instance class [mscorlib]System.String [mscorlib]System.Int32::ToString()
       IL_000b:  ldstr      "/"
       IL_0010:  ldarg.0
-      IL_0011:  ldfld      class [mscorlib]System.String JitTest.VT::m_vs
+      IL_0011:  ldfld      class [mscorlib]System.String JitTest_ee_il.VT::m_vs
       IL_0016:  call       class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String,
                                                                                class [mscorlib]System.String,
                                                                                class [mscorlib]System.String)
@@ -215,38 +215,38 @@
     } // end of method VT::ToString
 
     .method private hidebysig static void 
-            TryInterface(class JitTest.ISomething smth) il managed
+            TryInterface(class JitTest_ee_il.ISomething smth) il managed
     {
       // Code size       64 (0x40)
       .maxstack  4
-      .locals (value class JitTest.VT V_0)
+      .locals (value class JitTest_ee_il.VT V_0)
       IL_0000:  ldloca.s   V_0
       IL_0002:  ldc.i4.s   11
       IL_0004:  ldstr      "11"
-      IL_0009:  call       instance void JitTest.VT::.ctor(int32,
+      IL_0009:  call       instance void JitTest_ee_il.VT::.ctor(int32,
                                                            class [mscorlib]System.String)
       IL_000e:  ldarg.0
       IL_000f:  ldc.i4.0
       IL_0010:  ldstr      "-"
-      IL_0015:  newobj     instance void JitTest.VT::.ctor(int32,
+      IL_0015:  newobj     instance void JitTest_ee_il.VT::.ctor(int32,
                                                            class [mscorlib]System.String)
       IL_001a:  ldloca.s   V_0
-      IL_001c:  callvirt   instance void JitTest.ISomething::DoSomething(value class JitTest.VT,
-                                                                         value class JitTest.VT&)
+      IL_001c:  callvirt   instance void JitTest_ee_il.ISomething::DoSomething(value class JitTest_ee_il.VT,
+                                                                         value class JitTest_ee_il.VT&)
       IL_0021:  ldarg.0
       IL_0022:  ldloc.0
-      IL_0023:  callvirt   instance value class JitTest.VT JitTest.ISomething::RetSomething(value class JitTest.VT)
+      IL_0023:  callvirt   instance value class JitTest_ee_il.VT JitTest_ee_il.ISomething::RetSomething(value class JitTest_ee_il.VT)
       IL_0028:  stloc.0
       IL_0029:  ldstr      "Got : "
       IL_002e:  ldloca.s   V_0
-      IL_0030:  call       instance class [mscorlib]System.String JitTest.VT::ToString()
+      IL_0030:  call       instance class [mscorlib]System.String JitTest_ee_il.VT::ToString()
       IL_0035:  call       class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String,
                                                                                class [mscorlib]System.String)
       IL_003a:  call       void [System.Console]System.Console::WriteLine(class [mscorlib]System.String)
       IL_003f:  ret
     } // end of method VT::TryInterface
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -255,38 +255,38 @@
       .entrypoint
       // Code size       227 (0xe3)
       .maxstack  4
-      .locals (value class JitTest.VT V_0)
+      .locals (value class JitTest_ee_il.VT V_0)
       IL_0000:  ldloca.s   V_0
       IL_0002:  ldc.i4.s   10
       IL_0004:  ldstr      "10"
-      IL_0009:  call       instance void JitTest.VT::.ctor(int32,
+      IL_0009:  call       instance void JitTest_ee_il.VT::.ctor(int32,
                                                            class [mscorlib]System.String)
       IL_000e:  ldloca.s   V_0
       IL_0010:  ldc.i4.0
       IL_0011:  ldstr      "-"
-      IL_0016:  newobj     instance void JitTest.VT::.ctor(int32,
+      IL_0016:  newobj     instance void JitTest_ee_il.VT::.ctor(int32,
                                                            class [mscorlib]System.String)
       IL_001b:  ldloca.s   V_0
-      IL_001d:  call       instance void JitTest.VT::_DoSomething(value class JitTest.VT,
-                                                                  value class JitTest.VT&)
+      IL_001d:  call       instance void JitTest_ee_il.VT::_DoSomething(value class JitTest_ee_il.VT,
+                                                                  value class JitTest_ee_il.VT&)
       IL_0022:  ldloca.s   V_0
       IL_0024:  ldloc.0
-      IL_0025:  call       instance value class JitTest.VT JitTest.VT::_RetSomething(value class JitTest.VT)
+      IL_0025:  call       instance value class JitTest_ee_il.VT JitTest_ee_il.VT::_RetSomething(value class JitTest_ee_il.VT)
       IL_002a:  stloc.0
       IL_002b:  ldstr      "Got : "
       IL_0030:  ldloc.s   V_0
-      			box   JitTest.VT
+      			box   JitTest_ee_il.VT
       IL_0032:  callvirt   instance class [mscorlib]System.String [mscorlib]System.Object::ToString()
       IL_0037:  call       class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String,
                                                                                class [mscorlib]System.String)
       IL_003c:  call       void [System.Console]System.Console::WriteLine(class [mscorlib]System.String)
       IL_0041:  ldloca.s   V_0
-      IL_0043:  ldfld      int32 JitTest.VT::m_vn
+      IL_0043:  ldfld      int32 JitTest_ee_il.VT::m_vn
       IL_0048:  ldc.i4.s   10
       IL_004a:  bne.un.s   IL_005f
 
       IL_004c:  ldloca.s   V_0
-      IL_004e:  ldfld      class [mscorlib]System.String JitTest.VT::m_vs
+      IL_004e:  ldfld      class [mscorlib]System.String JitTest_ee_il.VT::m_vs
       IL_0053:  ldstr      "10"
       IL_0058:  call       bool [mscorlib]System.String::Equals(class [mscorlib]System.String,
                                                                 class [mscorlib]System.String)
@@ -298,37 +298,37 @@
       IL_006b:  ret
 
       IL_006c:  ldloc.s   V_0
-      			box   JitTest.VT
-      			castclass JitTest.ISomething
+      			box   JitTest_ee_il.VT
+      			castclass JitTest_ee_il.ISomething
       
       IL_006e:  ldc.i4.0
       IL_006f:  ldstr      "-"
-      IL_0074:  newobj     instance void JitTest.VT::.ctor(int32,
+      IL_0074:  newobj     instance void JitTest_ee_il.VT::.ctor(int32,
                                                            class [mscorlib]System.String)
       IL_0079:  ldloca.s   V_0
-      IL_007b:  callvirt       instance void JitTest.ISomething::DoSomething(value class JitTest.VT,
-                                                                 value class JitTest.VT&)
+      IL_007b:  callvirt       instance void JitTest_ee_il.ISomething::DoSomething(value class JitTest_ee_il.VT,
+                                                                 value class JitTest_ee_il.VT&)
       IL_0080:  ldloc.s   V_0
-      			box   JitTest.VT
-      			castclass JitTest.ISomething
+      			box   JitTest_ee_il.VT
+      			castclass JitTest_ee_il.ISomething
       			
       IL_0082:  ldloc.0
-      IL_0083:  callvirt       instance value class JitTest.VT JitTest.ISomething::RetSomething(value class JitTest.VT)
+      IL_0083:  callvirt       instance value class JitTest_ee_il.VT JitTest_ee_il.ISomething::RetSomething(value class JitTest_ee_il.VT)
       IL_0088:  stloc.0
       IL_0089:  ldstr      "Got : "
       IL_008e:  ldloc.s   V_0
-      			box   JitTest.VT
+      			box   JitTest_ee_il.VT
       IL_0090:  callvirt       instance class [mscorlib]System.String [mscorlib]System.Object::ToString()
       IL_0095:  call       class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String,
                                                                                class [mscorlib]System.String)
       IL_009a:  call       void [System.Console]System.Console::WriteLine(class [mscorlib]System.String)
       IL_009f:  ldloca.s   V_0
-      IL_00a1:  ldfld      int32 JitTest.VT::m_vn
+      IL_00a1:  ldfld      int32 JitTest_ee_il.VT::m_vn
       IL_00a6:  ldc.i4.s   10
       IL_00a8:  bne.un.s   IL_00bd
 
       IL_00aa:  ldloca.s   V_0
-      IL_00ac:  ldfld      class [mscorlib]System.String JitTest.VT::m_vs
+      IL_00ac:  ldfld      class [mscorlib]System.String JitTest_ee_il.VT::m_vs
       IL_00b1:  ldstr      "10"
       IL_00b6:  call       bool [mscorlib]System.String::Equals(class [mscorlib]System.String,
                                                                 class [mscorlib]System.String)
@@ -340,8 +340,8 @@
       IL_00c9:  ret
 
       IL_00ca:  ldloc.s   V_0
-      IL_00cc:  box        JitTest.VT
-      IL_00d1:  call       void JitTest.VT::TryInterface(class JitTest.ISomething)
+      IL_00cc:  box        JitTest_ee_il.VT
+      IL_00d1:  call       void JitTest_ee_il.VT::TryInterface(class JitTest_ee_il.ISomething)
       IL_00d6:  ldstr      "Passed"
       IL_00db:  call       void [System.Console]System.Console::WriteLine(class [mscorlib]System.String)
       IL_00e0:  ldc.i4.s   100
@@ -350,6 +350,6 @@
 
   } // end of class VT
 
-} // end of namespace JitTest
+} // end of namespace JitTest_ee_il
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/VT/callconv/ee_il_d.ilproj b/src/tests/JIT/Methodical/VT/callconv/ee_il_d.ilproj
index 2623bd2556e2e2..668c7e5573dd9d 100644
--- a/src/tests/JIT/Methodical/VT/callconv/ee_il_d.ilproj
+++ b/src/tests/JIT/Methodical/VT/callconv/ee_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/callconv/ee_il_r.ilproj b/src/tests/JIT/Methodical/VT/callconv/ee_il_r.ilproj
index 9fe5406cdaa396..fe94e802cfe29e 100644
--- a/src/tests/JIT/Methodical/VT/callconv/ee_il_r.ilproj
+++ b/src/tests/JIT/Methodical/VT/callconv/ee_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper.cs b/src/tests/JIT/Methodical/VT/callconv/jumper.cs
index 04ec7bc3368911..d87be0ec09e22a 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumper.cs
+++ b/src/tests/JIT/Methodical/VT/callconv/jumper.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace MS
+namespace MS_jumper_cs
 {
-    internal struct VT
+    public struct VT
     {
         private int _m_n;
         private VT[] _m_dummyGCRef;
@@ -14,7 +15,8 @@ internal struct VT
         private VT add(VT what) { _m_n += what._m_n; return this; }
         private VT sub(VT what) { _m_n -= what._m_n; return this; }   //this will be implemented via NEG+JMP in IL
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             VT vt = new VT(100);
             VT what = new VT(99);
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper1.il b/src/tests/JIT/Methodical/VT/callconv/jumper1.il
index ab0600df928725..1503dbfe930b09 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumper1.il
+++ b/src/tests/JIT/Methodical/VT/callconv/jumper1.il
@@ -17,13 +17,13 @@
 }
 .assembly extern xunit.core {}
 // MVID: {2E4A2D77-5614-4325-A9DC-CBB90842669E}
-.namespace MS
+.namespace MS_jumper1_il
 {
-  .class value private auto ansi sealed VT
+  .class value public auto ansi sealed VT
          extends [mscorlib]System.ValueType
   {
     .field private int32 m_n
-    .field private value class MS.VT[] m_dummyGCRef
+    .field private value class MS_jumper1_il.VT[] m_dummyGCRef
     .method private hidebysig specialname rtspecialname 
             instance void  .ctor(int32 n) il managed
     {
@@ -31,49 +31,49 @@
       .maxstack  8
       IL_0000:  ldarg.0
       IL_0001:  ldarg.1
-      IL_0002:  stfld      int32 MS.VT::m_n
+      IL_0002:  stfld      int32 MS_jumper1_il.VT::m_n
       IL_0007:  ldarg.0
       IL_0008:  ldc.i4.s   10
-      IL_000a:  newarr     MS.VT
-      IL_000f:  stfld      value class MS.VT[] MS.VT::m_dummyGCRef
+      IL_000a:  newarr     MS_jumper1_il.VT
+      IL_000f:  stfld      value class MS_jumper1_il.VT[] MS_jumper1_il.VT::m_dummyGCRef
       IL_0014:  ret
     } // end of method VT::.ctor
 
-    .method private hidebysig instance value class MS.VT 
-            'add'(value class MS.VT what) il managed
+    .method private hidebysig instance value class MS_jumper1_il.VT 
+            'add'(value class MS_jumper1_il.VT what) il managed
     {
 		.maxstack  8
-		.locals (value class MS.VT V_0)
+		.locals (value class MS_jumper1_il.VT V_0)
 		ldarg.0
 		dup
-		ldfld      int32 MS.VT::m_n
+		ldfld      int32 MS_jumper1_il.VT::m_n
 		ldarga.s   what
-		ldfld      int32 MS.VT::m_n
+		ldfld      int32 MS_jumper1_il.VT::m_n
 		add
-		stfld      int32 MS.VT::m_n
+		stfld      int32 MS_jumper1_il.VT::m_n
 		ldarg.0
-		ldobj      MS.VT
+		ldobj      MS_jumper1_il.VT
 		ret
     } // end of method VT::'add'
 
-    .method private hidebysig instance value class MS.VT 
-            'sub'(value class MS.VT what) il managed
+    .method private hidebysig instance value class MS_jumper1_il.VT 
+            'sub'(value class MS_jumper1_il.VT what) il managed
     {
 		.maxstack  8
-		.locals (value class MS.VT V_0)
+		.locals (value class MS_jumper1_il.VT V_0)
 		ldarg.0
 		dup
-		ldfld      int32 MS.VT::m_n
+		ldfld      int32 MS_jumper1_il.VT::m_n
 		ldarga.s   what
-		ldfld      int32 MS.VT::m_n
+		ldfld      int32 MS_jumper1_il.VT::m_n
 		sub
-		stfld      int32 MS.VT::m_n
+		stfld      int32 MS_jumper1_il.VT::m_n
 		ldarg.0
-		ldobj      MS.VT
+		ldobj      MS_jumper1_il.VT
 		ret
     } // end of method VT::'sub'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -82,47 +82,47 @@
       .entrypoint
       // Code size       96 (0x60)
       .maxstack  2
-      .locals (value class MS.VT V_0,
-               value class MS.VT V_1,
-               value class MS.VT V_2,
+      .locals (value class MS_jumper1_il.VT V_0,
+               value class MS_jumper1_il.VT V_1,
+               value class MS_jumper1_il.VT V_2,
                int32 V_3)
       IL_0000:  ldloca.s   V_0
       IL_0002:  ldc.i4.s   100
-      IL_0004:  call       instance void MS.VT::.ctor(int32)
+      IL_0004:  call       instance void MS_jumper1_il.VT::.ctor(int32)
       IL_0009:  ldloca.s   V_1
       IL_000b:  ldc.i4.s   99
-      IL_000d:  call       instance void MS.VT::.ctor(int32)
+      IL_000d:  call       instance void MS_jumper1_il.VT::.ctor(int32)
       IL_0012:  ldloca.s   V_0
       IL_0014:  ldloc.1
-      IL_0015:  call       instance value class MS.VT MS.VT::'add'(value class MS.VT)
+      IL_0015:  call       instance value class MS_jumper1_il.VT MS_jumper1_il.VT::'add'(value class MS_jumper1_il.VT)
       IL_001a:  stloc.0
       IL_001b:  ldloca.s   V_0
       IL_001d:  ldloc.1
-      IL_001e:  call       instance value class MS.VT MS.VT::'sub'(value class MS.VT)
+      IL_001e:  call       instance value class MS_jumper1_il.VT MS_jumper1_il.VT::'sub'(value class MS_jumper1_il.VT)
       IL_0023:  stloc.0
       IL_0024:  ldloca.s   V_0
-      IL_0026:  ldfld      int32 MS.VT::m_n
+      IL_0026:  ldfld      int32 MS_jumper1_il.VT::m_n
       IL_002b:  ldc.i4.s   100
       IL_002d:  beq.s      IL_0039
 
       IL_002f:  ldloca.s   V_0
-      IL_0031:  ldfld      int32 MS.VT::m_n
+      IL_0031:  ldfld      int32 MS_jumper1_il.VT::m_n
       IL_0036:  stloc.3
       IL_0037:  br.s       IL_005e
 
       IL_0039:  ldloca.s   V_2
       IL_003b:  ldc.i4.s   96
-      IL_003d:  call       instance void MS.VT::.ctor(int32)
+      IL_003d:  call       instance void MS_jumper1_il.VT::.ctor(int32)
       IL_0042:  ldloca.s   V_0
       IL_0044:  ldloc.2
-      IL_0045:  call       instance value class MS.VT MS.VT::'add'(value class MS.VT)
+      IL_0045:  call       instance value class MS_jumper1_il.VT MS_jumper1_il.VT::'add'(value class MS_jumper1_il.VT)
       IL_004a:  pop
       IL_004b:  ldloca.s   V_0
       IL_004d:  ldloc.2
-      IL_004e:  call       instance value class MS.VT MS.VT::'sub'(value class MS.VT)
+      IL_004e:  call       instance value class MS_jumper1_il.VT MS_jumper1_il.VT::'sub'(value class MS_jumper1_il.VT)
       IL_0053:  pop
       IL_0054:  ldloca.s   V_0
-      IL_0056:  ldfld      int32 MS.VT::m_n
+      IL_0056:  ldfld      int32 MS_jumper1_il.VT::m_n
       IL_005b:  stloc.3
       IL_005c:  br.s       IL_005e
 
@@ -132,6 +132,6 @@
 
   } // end of class VT
 
-} // end of namespace MS
+} // end of namespace MS_jumper1_il
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper1_il_d.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumper1_il_d.ilproj
index e60a7cd8d3f09f..4f2ff6e8923da9 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumper1_il_d.ilproj
+++ b/src/tests/JIT/Methodical/VT/callconv/jumper1_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper1_il_r.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumper1_il_r.ilproj
index 95ec99d92909ca..11a1d099dc8579 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumper1_il_r.ilproj
+++ b/src/tests/JIT/Methodical/VT/callconv/jumper1_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper2.il b/src/tests/JIT/Methodical/VT/callconv/jumper2.il
index 597f10226ed472..08676cf06cecde 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumper2.il
+++ b/src/tests/JIT/Methodical/VT/callconv/jumper2.il
@@ -17,13 +17,13 @@
 }
 .assembly extern xunit.core {}
 // MVID: {2E4A2D77-5614-4325-A9DC-CBB90842669E}
-.namespace MS
+.namespace MS_jumper2_il
 {
-  .class value private auto ansi sealed VT
+  .class value public auto ansi sealed VT
          extends [mscorlib]System.ValueType
   {
     .field private int32 m_n
-    .field private value class MS.VT[] m_dummyGCRef
+    .field private value class MS_jumper2_il.VT[] m_dummyGCRef
     .method private hidebysig specialname rtspecialname 
             instance void  .ctor(int32 n) il managed
     {
@@ -31,48 +31,48 @@
       .maxstack  8
       IL_0000:  ldarg.0
       IL_0001:  ldarg.1
-      IL_0002:  stfld      int32 MS.VT::m_n
+      IL_0002:  stfld      int32 MS_jumper2_il.VT::m_n
       IL_0007:  ldarg.0
       IL_0008:  ldc.i4.s   10
-      IL_000a:  newarr     MS.VT
-      IL_000f:  stfld      value class MS.VT[] MS.VT::m_dummyGCRef
+      IL_000a:  newarr     MS_jumper2_il.VT
+      IL_000f:  stfld      value class MS_jumper2_il.VT[] MS_jumper2_il.VT::m_dummyGCRef
       IL_0014:  ret
     } // end of method VT::.ctor
 
-    .method private hidebysig instance value class MS.VT 
-            'add'(value class MS.VT what) il managed
+    .method private hidebysig instance value class MS_jumper2_il.VT 
+            'add'(value class MS_jumper2_il.VT what) il managed
     {
 		.maxstack  8
-		.locals (value class MS.VT V_0)
+		.locals (value class MS_jumper2_il.VT V_0)
 		ldarg.0
 		dup
-		ldfld      int32 MS.VT::m_n
+		ldfld      int32 MS_jumper2_il.VT::m_n
 		ldarga.s   what
-		ldfld      int32 MS.VT::m_n
+		ldfld      int32 MS_jumper2_il.VT::m_n
 		add
-		stfld      int32 MS.VT::m_n
+		stfld      int32 MS_jumper2_il.VT::m_n
 		ldarg.0
-		ldobj      MS.VT
+		ldobj      MS_jumper2_il.VT
 		ret
     } // end of method VT::'add'
 
-    .method private hidebysig instance value class MS.VT 
-            'sub'(value class MS.VT what) il managed
+    .method private hidebysig instance value class MS_jumper2_il.VT 
+            'sub'(value class MS_jumper2_il.VT what) il managed
     {
 		.maxstack  8
-		.locals (value class MS.VT V_0)
+		.locals (value class MS_jumper2_il.VT V_0)
 		ldarga.s   what
 		dup
-		ldfld      int32 MS.VT::m_n
+		ldfld      int32 MS_jumper2_il.VT::m_n
 		neg
-		stfld      int32 MS.VT::m_n
+		stfld      int32 MS_jumper2_il.VT::m_n
 		ldarg.0
 		ldarg.1
-		call instance value class MS.VT MS.VT::'add'(value class MS.VT)
+		call instance value class MS_jumper2_il.VT MS_jumper2_il.VT::'add'(value class MS_jumper2_il.VT)
 		ret
     } // end of method VT::'sub'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -81,47 +81,47 @@
       .entrypoint
       // Code size       96 (0x60)
       .maxstack  2
-      .locals (value class MS.VT V_0,
-               value class MS.VT V_1,
-               value class MS.VT V_2,
+      .locals (value class MS_jumper2_il.VT V_0,
+               value class MS_jumper2_il.VT V_1,
+               value class MS_jumper2_il.VT V_2,
                int32 V_3)
       IL_0000:  ldloca.s   V_0
       IL_0002:  ldc.i4.s   100
-      IL_0004:  call       instance void MS.VT::.ctor(int32)
+      IL_0004:  call       instance void MS_jumper2_il.VT::.ctor(int32)
       IL_0009:  ldloca.s   V_1
       IL_000b:  ldc.i4.s   99
-      IL_000d:  call       instance void MS.VT::.ctor(int32)
+      IL_000d:  call       instance void MS_jumper2_il.VT::.ctor(int32)
       IL_0012:  ldloca.s   V_0
       IL_0014:  ldloc.1
-      IL_0015:  call       instance value class MS.VT MS.VT::'add'(value class MS.VT)
+      IL_0015:  call       instance value class MS_jumper2_il.VT MS_jumper2_il.VT::'add'(value class MS_jumper2_il.VT)
       IL_001a:  stloc.0
       IL_001b:  ldloca.s   V_0
       IL_001d:  ldloc.1
-      IL_001e:  call       instance value class MS.VT MS.VT::'sub'(value class MS.VT)
+      IL_001e:  call       instance value class MS_jumper2_il.VT MS_jumper2_il.VT::'sub'(value class MS_jumper2_il.VT)
       IL_0023:  stloc.0
       IL_0024:  ldloca.s   V_0
-      IL_0026:  ldfld      int32 MS.VT::m_n
+      IL_0026:  ldfld      int32 MS_jumper2_il.VT::m_n
       IL_002b:  ldc.i4.s   100
       IL_002d:  beq.s      IL_0039
 
       IL_002f:  ldloca.s   V_0
-      IL_0031:  ldfld      int32 MS.VT::m_n
+      IL_0031:  ldfld      int32 MS_jumper2_il.VT::m_n
       IL_0036:  stloc.3
       IL_0037:  br.s       IL_005e
 
       IL_0039:  ldloca.s   V_2
       IL_003b:  ldc.i4.s   96
-      IL_003d:  call       instance void MS.VT::.ctor(int32)
+      IL_003d:  call       instance void MS_jumper2_il.VT::.ctor(int32)
       IL_0042:  ldloca.s   V_0
       IL_0044:  ldloc.2
-      IL_0045:  call       instance value class MS.VT MS.VT::'add'(value class MS.VT)
+      IL_0045:  call       instance value class MS_jumper2_il.VT MS_jumper2_il.VT::'add'(value class MS_jumper2_il.VT)
       IL_004a:  pop
       IL_004b:  ldloca.s   V_0
       IL_004d:  ldloc.2
-      IL_004e:  call       instance value class MS.VT MS.VT::'sub'(value class MS.VT)
+      IL_004e:  call       instance value class MS_jumper2_il.VT MS_jumper2_il.VT::'sub'(value class MS_jumper2_il.VT)
       IL_0053:  pop
       IL_0054:  ldloca.s   V_0
-      IL_0056:  ldfld      int32 MS.VT::m_n
+      IL_0056:  ldfld      int32 MS_jumper2_il.VT::m_n
       IL_005b:  stloc.3
       IL_005c:  br.s       IL_005e
 
@@ -131,6 +131,6 @@
 
   } // end of class VT
 
-} // end of namespace MS
+} // end of namespace MS_jumper2_il
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper2_il_d.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumper2_il_d.ilproj
index 2bcf9cebfc6038..6c79d35f05f2ee 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumper2_il_d.ilproj
+++ b/src/tests/JIT/Methodical/VT/callconv/jumper2_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper2_il_r.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumper2_il_r.ilproj
index 9b5678d07f39da..1905d9ae0e78f1 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumper2_il_r.ilproj
+++ b/src/tests/JIT/Methodical/VT/callconv/jumper2_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper3.il b/src/tests/JIT/Methodical/VT/callconv/jumper3.il
index eb30e713134831..457fc296aba4d1 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumper3.il
+++ b/src/tests/JIT/Methodical/VT/callconv/jumper3.il
@@ -22,13 +22,13 @@
 }
 .assembly extern xunit.core {}
 // MVID: {2E4A2D77-5614-4325-A9DC-CBB90842669E}
-.namespace MS
+.namespace MS_jumper3_il
 {
-  .class value private auto ansi sealed VT
+  .class value public auto ansi sealed VT
          extends [mscorlib]System.ValueType
   {
     .field private int32 m_n
-    .field private value class MS.VT[] m_dummyGCRef
+    .field private value class MS_jumper3_il.VT[] m_dummyGCRef
     .method private hidebysig specialname rtspecialname 
             instance void  .ctor(int32 n) il managed
     {
@@ -36,49 +36,49 @@
       .maxstack  8
       IL_0000:  ldarg.0
       IL_0001:  ldarg.1
-      IL_0002:  stfld      int32 MS.VT::m_n
+      IL_0002:  stfld      int32 MS_jumper3_il.VT::m_n
       IL_0007:  ldarg.0
       IL_0008:  ldc.i4.s   10
-      IL_000a:  newarr     MS.VT
-      IL_000f:  stfld      value class MS.VT[] MS.VT::m_dummyGCRef
+      IL_000a:  newarr     MS_jumper3_il.VT
+      IL_000f:  stfld      value class MS_jumper3_il.VT[] MS_jumper3_il.VT::m_dummyGCRef
       IL_0014:  ret
     } // end of method VT::.ctor
 
-    .method private hidebysig instance value class MS.VT 
-            'add'(value class MS.VT what) il managed
+    .method private hidebysig instance value class MS_jumper3_il.VT 
+            'add'(value class MS_jumper3_il.VT what) il managed
     {
 		.maxstack  8
-		.locals (value class MS.VT V_0)
+		.locals (value class MS_jumper3_il.VT V_0)
 		ldarg.0
 		dup
-		ldfld      int32 MS.VT::m_n
+		ldfld      int32 MS_jumper3_il.VT::m_n
 		ldarga.s   what
-		ldfld      int32 MS.VT::m_n
+		ldfld      int32 MS_jumper3_il.VT::m_n
 		add
-		stfld      int32 MS.VT::m_n
+		stfld      int32 MS_jumper3_il.VT::m_n
 		ldarg.0
-		ldobj      MS.VT
+		ldobj      MS_jumper3_il.VT
 		ret
     } // end of method VT::'add'
 
-    .method private hidebysig instance value class MS.VT 
-            'sub'(value class MS.VT what) il managed
+    .method private hidebysig instance value class MS_jumper3_il.VT 
+            'sub'(value class MS_jumper3_il.VT what) il managed
     {
 		.maxstack  8
-		.locals (value class MS.VT V_0)
+		.locals (value class MS_jumper3_il.VT V_0)
 		ldarga.s   what
 		dup
-		ldfld      int32 MS.VT::m_n
+		ldfld      int32 MS_jumper3_il.VT::m_n
 		neg
-		stfld      int32 MS.VT::m_n
+		stfld      int32 MS_jumper3_il.VT::m_n
 		ldarg.0
 		ldarg.1
-		ldftn instance value class MS.VT MS.VT::'add'(value class MS.VT)
-		calli instance value class MS.VT(value class MS.VT)
+		ldftn instance value class MS_jumper3_il.VT MS_jumper3_il.VT::'add'(value class MS_jumper3_il.VT)
+		calli instance value class MS_jumper3_il.VT(value class MS_jumper3_il.VT)
 		ret
     } // end of method VT::'sub'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -87,47 +87,47 @@
       .entrypoint
       // Code size       96 (0x60)
       .maxstack  2
-      .locals (value class MS.VT V_0,
-               value class MS.VT V_1,
-               value class MS.VT V_2,
+      .locals (value class MS_jumper3_il.VT V_0,
+               value class MS_jumper3_il.VT V_1,
+               value class MS_jumper3_il.VT V_2,
                int32 V_3)
       IL_0000:  ldloca.s   V_0
       IL_0002:  ldc.i4.s   100
-      IL_0004:  call       instance void MS.VT::.ctor(int32)
+      IL_0004:  call       instance void MS_jumper3_il.VT::.ctor(int32)
       IL_0009:  ldloca.s   V_1
       IL_000b:  ldc.i4.s   99
-      IL_000d:  call       instance void MS.VT::.ctor(int32)
+      IL_000d:  call       instance void MS_jumper3_il.VT::.ctor(int32)
       IL_0012:  ldloca.s   V_0
       IL_0014:  ldloc.1
-      IL_0015:  call       instance value class MS.VT MS.VT::'add'(value class MS.VT)
+      IL_0015:  call       instance value class MS_jumper3_il.VT MS_jumper3_il.VT::'add'(value class MS_jumper3_il.VT)
       IL_001a:  stloc.0
       IL_001b:  ldloca.s   V_0
       IL_001d:  ldloc.1
-      IL_001e:  call       instance value class MS.VT MS.VT::'sub'(value class MS.VT)
+      IL_001e:  call       instance value class MS_jumper3_il.VT MS_jumper3_il.VT::'sub'(value class MS_jumper3_il.VT)
       IL_0023:  stloc.0
       IL_0024:  ldloca.s   V_0
-      IL_0026:  ldfld      int32 MS.VT::m_n
+      IL_0026:  ldfld      int32 MS_jumper3_il.VT::m_n
       IL_002b:  ldc.i4.s   100
       IL_002d:  beq.s      IL_0039
 
       IL_002f:  ldloca.s   V_0
-      IL_0031:  ldfld      int32 MS.VT::m_n
+      IL_0031:  ldfld      int32 MS_jumper3_il.VT::m_n
       IL_0036:  stloc.3
       IL_0037:  br.s       IL_005e
 
       IL_0039:  ldloca.s   V_2
       IL_003b:  ldc.i4.s   96
-      IL_003d:  call       instance void MS.VT::.ctor(int32)
+      IL_003d:  call       instance void MS_jumper3_il.VT::.ctor(int32)
       IL_0042:  ldloca.s   V_0
       IL_0044:  ldloc.2
-      IL_0045:  call       instance value class MS.VT MS.VT::'add'(value class MS.VT)
+      IL_0045:  call       instance value class MS_jumper3_il.VT MS_jumper3_il.VT::'add'(value class MS_jumper3_il.VT)
       IL_004a:  pop
       IL_004b:  ldloca.s   V_0
       IL_004d:  ldloc.2
-      IL_004e:  call       instance value class MS.VT MS.VT::'sub'(value class MS.VT)
+      IL_004e:  call       instance value class MS_jumper3_il.VT MS_jumper3_il.VT::'sub'(value class MS_jumper3_il.VT)
       IL_0053:  pop
       IL_0054:  ldloca.s   V_0
-      IL_0056:  ldfld      int32 MS.VT::m_n
+      IL_0056:  ldfld      int32 MS_jumper3_il.VT::m_n
       IL_005b:  stloc.3
       IL_005c:  br.s       IL_005e
 
@@ -137,6 +137,6 @@
 
   } // end of class VT
 
-} // end of namespace MS
+} // end of namespace MS_jumper3_il
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper3_il_d.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumper3_il_d.ilproj
index 58c23c88375d2f..2d20752a9fd847 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumper3_il_d.ilproj
+++ b/src/tests/JIT/Methodical/VT/callconv/jumper3_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper3_il_r.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumper3_il_r.ilproj
index 80c3f2512faa65..3f300649e67bee 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumper3_il_r.ilproj
+++ b/src/tests/JIT/Methodical/VT/callconv/jumper3_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper4.il b/src/tests/JIT/Methodical/VT/callconv/jumper4.il
index 0366b3db89a786..46fc0a5ae7f30a 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumper4.il
+++ b/src/tests/JIT/Methodical/VT/callconv/jumper4.il
@@ -19,13 +19,13 @@
                         }
 .assembly extern xunit.core {}
 // MVID: {2E4A2D77-5614-4325-A9DC-CBB90842669E}
-.namespace MS
+.namespace MS_jumper4_il
 {
-  .class value private auto ansi sealed VT
+  .class value public auto ansi sealed VT
          extends [mscorlib]System.ValueType
   {
     .field private int32 m_n
-    .field private value class MS.VT[] m_dummyGCRef
+    .field private value class MS_jumper4_il.VT[] m_dummyGCRef
     .method private hidebysig specialname rtspecialname 
             instance void  .ctor(int32 n) il managed
     {
@@ -33,45 +33,45 @@
       .maxstack  8
       IL_0000:  ldarg.0
       IL_0001:  ldarg.1
-      IL_0002:  stfld      int32 MS.VT::m_n
+      IL_0002:  stfld      int32 MS_jumper4_il.VT::m_n
       IL_0007:  ldarg.0
       IL_0008:  ldc.i4.s   10
-      IL_000a:  newarr     MS.VT
-      IL_000f:  stfld      value class MS.VT[] MS.VT::m_dummyGCRef
+      IL_000a:  newarr     MS_jumper4_il.VT
+      IL_000f:  stfld      value class MS_jumper4_il.VT[] MS_jumper4_il.VT::m_dummyGCRef
       IL_0014:  ret
     } // end of method VT::.ctor
 
-    .method private hidebysig instance value class MS.VT 
-            'add'(value class MS.VT what) il managed
+    .method private hidebysig instance value class MS_jumper4_il.VT 
+            'add'(value class MS_jumper4_il.VT what) il managed
     {
 		.maxstack  8
-		.locals (value class MS.VT V_0)
+		.locals (value class MS_jumper4_il.VT V_0)
 		ldarg.0
 		dup
-		ldfld      int32 MS.VT::m_n
+		ldfld      int32 MS_jumper4_il.VT::m_n
 		ldarga.s   what
-		ldfld      int32 MS.VT::m_n
+		ldfld      int32 MS_jumper4_il.VT::m_n
 		add
-		stfld      int32 MS.VT::m_n
+		stfld      int32 MS_jumper4_il.VT::m_n
 		ldarg.0
-		ldobj      MS.VT
+		ldobj      MS_jumper4_il.VT
 		ret
     } // end of method VT::'add'
 
-    .method private hidebysig instance value class MS.VT 
-            'sub'(value class MS.VT what) il managed
+    .method private hidebysig instance value class MS_jumper4_il.VT 
+            'sub'(value class MS_jumper4_il.VT what) il managed
     {
 		.maxstack  8
-		.locals (value class MS.VT V_0)
+		.locals (value class MS_jumper4_il.VT V_0)
 		ldarga.s   what
 		dup
-		ldfld      int32 MS.VT::m_n
+		ldfld      int32 MS_jumper4_il.VT::m_n
 		neg
-		stfld      int32 MS.VT::m_n
-		jmp instance value class MS.VT MS.VT::'add'(value class MS.VT)
+		stfld      int32 MS_jumper4_il.VT::m_n
+		jmp instance value class MS_jumper4_il.VT MS_jumper4_il.VT::'add'(value class MS_jumper4_il.VT)
     } // end of method VT::'sub'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -80,47 +80,47 @@
       .entrypoint
       // Code size       96 (0x60)
       .maxstack  2
-      .locals (value class MS.VT V_0,
-               value class MS.VT V_1,
-               value class MS.VT V_2,
+      .locals (value class MS_jumper4_il.VT V_0,
+               value class MS_jumper4_il.VT V_1,
+               value class MS_jumper4_il.VT V_2,
                int32 V_3)
       IL_0000:  ldloca.s   V_0
       IL_0002:  ldc.i4.s   100
-      IL_0004:  call       instance void MS.VT::.ctor(int32)
+      IL_0004:  call       instance void MS_jumper4_il.VT::.ctor(int32)
       IL_0009:  ldloca.s   V_1
       IL_000b:  ldc.i4.s   99
-      IL_000d:  call       instance void MS.VT::.ctor(int32)
+      IL_000d:  call       instance void MS_jumper4_il.VT::.ctor(int32)
       IL_0012:  ldloca.s   V_0
       IL_0014:  ldloc.1
-      IL_0015:  call       instance value class MS.VT MS.VT::'add'(value class MS.VT)
+      IL_0015:  call       instance value class MS_jumper4_il.VT MS_jumper4_il.VT::'add'(value class MS_jumper4_il.VT)
       IL_001a:  stloc.0
       IL_001b:  ldloca.s   V_0
       IL_001d:  ldloc.1
-      IL_001e:  call       instance value class MS.VT MS.VT::'sub'(value class MS.VT)
+      IL_001e:  call       instance value class MS_jumper4_il.VT MS_jumper4_il.VT::'sub'(value class MS_jumper4_il.VT)
       IL_0023:  stloc.0
       IL_0024:  ldloca.s   V_0
-      IL_0026:  ldfld      int32 MS.VT::m_n
+      IL_0026:  ldfld      int32 MS_jumper4_il.VT::m_n
       IL_002b:  ldc.i4.s   100
       IL_002d:  beq.s      IL_0039
 
       IL_002f:  ldloca.s   V_0
-      IL_0031:  ldfld      int32 MS.VT::m_n
+      IL_0031:  ldfld      int32 MS_jumper4_il.VT::m_n
       IL_0036:  stloc.3
       IL_0037:  br.s       IL_005e
 
       IL_0039:  ldloca.s   V_2
       IL_003b:  ldc.i4.s   96
-      IL_003d:  call       instance void MS.VT::.ctor(int32)
+      IL_003d:  call       instance void MS_jumper4_il.VT::.ctor(int32)
       IL_0042:  ldloca.s   V_0
       IL_0044:  ldloc.2
-      IL_0045:  call       instance value class MS.VT MS.VT::'add'(value class MS.VT)
+      IL_0045:  call       instance value class MS_jumper4_il.VT MS_jumper4_il.VT::'add'(value class MS_jumper4_il.VT)
       IL_004a:  pop
       IL_004b:  ldloca.s   V_0
       IL_004d:  ldloc.2
-      IL_004e:  call       instance value class MS.VT MS.VT::'sub'(value class MS.VT)
+      IL_004e:  call       instance value class MS_jumper4_il.VT MS_jumper4_il.VT::'sub'(value class MS_jumper4_il.VT)
       IL_0053:  pop
       IL_0054:  ldloca.s   V_0
-      IL_0056:  ldfld      int32 MS.VT::m_n
+      IL_0056:  ldfld      int32 MS_jumper4_il.VT::m_n
       IL_005b:  stloc.3
       IL_005c:  br.s       IL_005e
 
@@ -130,6 +130,6 @@
 
   } // end of class VT
 
-} // end of namespace MS
+} // end of namespace MS_jumper4_il
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper4_il_d.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumper4_il_d.ilproj
index 795dfa7346b11e..9483c80f9e811f 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumper4_il_d.ilproj
+++ b/src/tests/JIT/Methodical/VT/callconv/jumper4_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper4_il_r.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumper4_il_r.ilproj
index fe018484e36b3b..252995ab83f4ea 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumper4_il_r.ilproj
+++ b/src/tests/JIT/Methodical/VT/callconv/jumper4_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper5.il b/src/tests/JIT/Methodical/VT/callconv/jumper5.il
index 48f041d95f13d9..49f39058846245 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumper5.il
+++ b/src/tests/JIT/Methodical/VT/callconv/jumper5.il
@@ -19,13 +19,13 @@
                         }
 .assembly extern xunit.core {}
 // MVID: {2E4A2D77-5614-4325-A9DC-CBB90842669E}
-.namespace MS
+.namespace MS_jumper5_il
 {
-  .class value private auto ansi sealed VT
+  .class value public auto ansi sealed VT
          extends [mscorlib]System.ValueType
   {
     .field private int32 m_n
-    .field private value class MS.VT[] m_dummyGCRef
+    .field private value class MS_jumper5_il.VT[] m_dummyGCRef
     .method private hidebysig specialname rtspecialname 
             instance void  .ctor(int32 n) il managed
     {
@@ -33,50 +33,50 @@
       .maxstack  8
       IL_0000:  ldarg.0
       IL_0001:  ldarg.1
-      IL_0002:  stfld      int32 MS.VT::m_n
+      IL_0002:  stfld      int32 MS_jumper5_il.VT::m_n
       IL_0007:  ldarg.0
       IL_0008:  ldc.i4.s   10
-      IL_000a:  newarr     MS.VT
-      IL_000f:  stfld      value class MS.VT[] MS.VT::m_dummyGCRef
+      IL_000a:  newarr     MS_jumper5_il.VT
+      IL_000f:  stfld      value class MS_jumper5_il.VT[] MS_jumper5_il.VT::m_dummyGCRef
       IL_0014:  ret
     } // end of method VT::.ctor
 
-    .method private hidebysig instance value class MS.VT 
-            'add'(value class MS.VT what) il managed
+    .method private hidebysig instance value class MS_jumper5_il.VT 
+            'add'(value class MS_jumper5_il.VT what) il managed
     {
 		.maxstack  8
-		.locals (value class MS.VT V_0)
+		.locals (value class MS_jumper5_il.VT V_0)
 		ldarg.0
 		dup
-		ldfld      int32 MS.VT::m_n
+		ldfld      int32 MS_jumper5_il.VT::m_n
 		ldarga.s   what
-		ldfld      int32 MS.VT::m_n
+		ldfld      int32 MS_jumper5_il.VT::m_n
 		add
-		stfld      int32 MS.VT::m_n
+		stfld      int32 MS_jumper5_il.VT::m_n
 		ldarg.0
-		ldobj      MS.VT
+		ldobj      MS_jumper5_il.VT
 		ret
     } // end of method VT::'add'
 
-    .method private hidebysig instance value class MS.VT 
-            'sub'(value class MS.VT what) il managed
+    .method private hidebysig instance value class MS_jumper5_il.VT 
+            'sub'(value class MS_jumper5_il.VT what) il managed
     {
 		.maxstack  8
-		.locals (value class MS.VT V_0)
+		.locals (value class MS_jumper5_il.VT V_0)
 		ldarga.s   what
 		dup
-		ldfld      int32 MS.VT::m_n
+		ldfld      int32 MS_jumper5_il.VT::m_n
 		br.s prikol_end
 	prikol:
 		
 	prikol_end:
 		neg
-		stfld      int32 MS.VT::m_n
-		jmp		instance value class MS.VT MS.VT::'add'(value class MS.VT)
+		stfld      int32 MS_jumper5_il.VT::m_n
+		jmp		instance value class MS_jumper5_il.VT MS_jumper5_il.VT::'add'(value class MS_jumper5_il.VT)
 		br.s prikol
     } // end of method VT::'sub'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -85,47 +85,47 @@
       .entrypoint
       // Code size       96 (0x60)
       .maxstack  2
-      .locals (value class MS.VT V_0,
-               value class MS.VT V_1,
-               value class MS.VT V_2,
+      .locals (value class MS_jumper5_il.VT V_0,
+               value class MS_jumper5_il.VT V_1,
+               value class MS_jumper5_il.VT V_2,
                int32 V_3)
       IL_0000:  ldloca.s   V_0
       IL_0002:  ldc.i4.s   100
-      IL_0004:  call       instance void MS.VT::.ctor(int32)
+      IL_0004:  call       instance void MS_jumper5_il.VT::.ctor(int32)
       IL_0009:  ldloca.s   V_1
       IL_000b:  ldc.i4.s   99
-      IL_000d:  call       instance void MS.VT::.ctor(int32)
+      IL_000d:  call       instance void MS_jumper5_il.VT::.ctor(int32)
       IL_0012:  ldloca.s   V_0
       IL_0014:  ldloc.1
-      IL_0015:  call       instance value class MS.VT MS.VT::'add'(value class MS.VT)
+      IL_0015:  call       instance value class MS_jumper5_il.VT MS_jumper5_il.VT::'add'(value class MS_jumper5_il.VT)
       IL_001a:  stloc.0
       IL_001b:  ldloca.s   V_0
       IL_001d:  ldloc.1
-      IL_001e:  call       instance value class MS.VT MS.VT::'sub'(value class MS.VT)
+      IL_001e:  call       instance value class MS_jumper5_il.VT MS_jumper5_il.VT::'sub'(value class MS_jumper5_il.VT)
       IL_0023:  stloc.0
       IL_0024:  ldloca.s   V_0
-      IL_0026:  ldfld      int32 MS.VT::m_n
+      IL_0026:  ldfld      int32 MS_jumper5_il.VT::m_n
       IL_002b:  ldc.i4.s   100
       IL_002d:  beq.s      IL_0039
 
       IL_002f:  ldloca.s   V_0
-      IL_0031:  ldfld      int32 MS.VT::m_n
+      IL_0031:  ldfld      int32 MS_jumper5_il.VT::m_n
       IL_0036:  stloc.3
       IL_0037:  br.s       IL_005e
 
       IL_0039:  ldloca.s   V_2
       IL_003b:  ldc.i4.s   96
-      IL_003d:  call       instance void MS.VT::.ctor(int32)
+      IL_003d:  call       instance void MS_jumper5_il.VT::.ctor(int32)
       IL_0042:  ldloca.s   V_0
       IL_0044:  ldloc.2
-      IL_0045:  call       instance value class MS.VT MS.VT::'add'(value class MS.VT)
+      IL_0045:  call       instance value class MS_jumper5_il.VT MS_jumper5_il.VT::'add'(value class MS_jumper5_il.VT)
       IL_004a:  pop
       IL_004b:  ldloca.s   V_0
       IL_004d:  ldloc.2
-      IL_004e:  call       instance value class MS.VT MS.VT::'sub'(value class MS.VT)
+      IL_004e:  call       instance value class MS_jumper5_il.VT MS_jumper5_il.VT::'sub'(value class MS_jumper5_il.VT)
       IL_0053:  pop
       IL_0054:  ldloca.s   V_0
-      IL_0056:  ldfld      int32 MS.VT::m_n
+      IL_0056:  ldfld      int32 MS_jumper5_il.VT::m_n
       IL_005b:  stloc.3
       IL_005c:  br.s       IL_005e
 
@@ -135,6 +135,6 @@
 
   } // end of class VT
 
-} // end of namespace MS
+} // end of namespace MS_jumper5_il
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper5_il_d.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumper5_il_d.ilproj
index 04ec971c4c39b0..4055e4da0f5f96 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumper5_il_d.ilproj
+++ b/src/tests/JIT/Methodical/VT/callconv/jumper5_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper5_il_r.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumper5_il_r.ilproj
index 6d014e24fab18d..3f98a3af46f632 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumper5_il_r.ilproj
+++ b/src/tests/JIT/Methodical/VT/callconv/jumper5_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper_d.csproj b/src/tests/JIT/Methodical/VT/callconv/jumper_d.csproj
index 8e137083dd0232..cdcf248ea31e42 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumper_d.csproj
+++ b/src/tests/JIT/Methodical/VT/callconv/jumper_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper_do.csproj b/src/tests/JIT/Methodical/VT/callconv/jumper_do.csproj
index c164d74adb2621..2d1838a9046bce 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumper_do.csproj
+++ b/src/tests/JIT/Methodical/VT/callconv/jumper_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper_r.csproj b/src/tests/JIT/Methodical/VT/callconv/jumper_r.csproj
index 9d6b03242cc219..c1ac8f76415404 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumper_r.csproj
+++ b/src/tests/JIT/Methodical/VT/callconv/jumper_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper_ro.csproj b/src/tests/JIT/Methodical/VT/callconv/jumper_ro.csproj
index 2aed42c0f3cfa3..c9a4ab141efa90 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumper_ro.csproj
+++ b/src/tests/JIT/Methodical/VT/callconv/jumper_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps.cs b/src/tests/JIT/Methodical/VT/callconv/jumps.cs
index 2a4a79ce1d44ed..22fea84250e479 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumps.cs
+++ b/src/tests/JIT/Methodical/VT/callconv/jumps.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace MS
+namespace MS_jumps_cs
 {
-    internal struct VT
+    public struct VT
     {
         private String _path;
         private int _target;
@@ -81,7 +82,8 @@ private bool RunTests()
             return true;
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             if (new VT().RunTests())
             {
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps1.il b/src/tests/JIT/Methodical/VT/callconv/jumps1.il
index 2630a9fb573a52..2478c4b5d850cd 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumps1.il
+++ b/src/tests/JIT/Methodical/VT/callconv/jumps1.il
@@ -19,9 +19,9 @@
 {
                         }
 .assembly extern xunit.core {}
-.namespace MS
+.namespace MS_jumps1_il
 {
-  .class value private auto ansi sealed VT
+  .class value public auto ansi sealed VT
          extends [mscorlib]System.ValueType
   {
     .field private class System.String path
@@ -33,14 +33,14 @@
 		.maxstack  8
 				ldarg.0
 				dup
-				ldfld      class System.String MS.VT::path
+				ldfld      class System.String MS_jumps1_il.VT::path
 				ldstr      "->ToString"
 				call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String)
-				stfld      class System.String MS.VT::path
+				stfld      class System.String MS_jumps1_il.VT::path
       
       			ldarg.0
-      			ldfld      int32 MS.VT::target
+      			ldfld      int32 MS_jumps1_il.VT::target
       			switch     (case0, case1, case2)
       			newobj     instance void [mscorlib]System.Exception::.ctor()
       			throw
@@ -50,13 +50,13 @@
 
       case1:	ldarg.0
       			ldc.i4.0
-      			stfld      int32 MS.VT::target
-      			jmp 		instance class System.String MS.VT::ToStringHelper()
+      			stfld      int32 MS_jumps1_il.VT::target
+      			jmp 		instance class System.String MS_jumps1_il.VT::ToStringHelper()
 
       case2:	ldarg.0
       			ldc.i4.0
-      			stfld      int32 MS.VT::target
-            	jmp 		instance class System.String MS.VT::ToString()
+      			stfld      int32 MS_jumps1_il.VT::target
+            	jmp 		instance class System.String MS_jumps1_il.VT::ToString()
     } // end of method VT::ToString
 
     .method public hidebysig instance class System.String
@@ -67,14 +67,14 @@
                int32 V_1)
 				ldarg.0
 				dup
-				ldfld      class System.String MS.VT::path
+				ldfld      class System.String MS_jumps1_il.VT::path
 				ldstr      "->ToStringHelper"
 				call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String)
-				stfld      class System.String MS.VT::path
+				stfld      class System.String MS_jumps1_il.VT::path
       
       			ldarg.0
-      			ldfld      int32 MS.VT::target
+      			ldfld      int32 MS_jumps1_il.VT::target
       			switch     (case0, case1, case2)
       			newobj     instance void [mscorlib]System.Exception::.ctor()
       			throw
@@ -84,13 +84,13 @@
 
       case1:	ldarg.0
       			ldc.i4.0
-      			stfld      int32 MS.VT::target
-      			jmp 		instance class System.String MS.VT::ToStringHelper()
+      			stfld      int32 MS_jumps1_il.VT::target
+      			jmp 		instance class System.String MS_jumps1_il.VT::ToStringHelper()
 
       case2:	ldarg.0
       			ldc.i4.0
-      			stfld      int32 MS.VT::target
-            	jmp 		instance class System.String MS.VT::ToString()
+      			stfld      int32 MS_jumps1_il.VT::target
+            	jmp 		instance class System.String MS_jumps1_il.VT::ToString()
     } // end of method VT::ToStringHelper
 
     .method private hidebysig instance bool
@@ -100,21 +100,21 @@
       .locals (bool V_0)
       IL_0000:  ldarg.0
       IL_0001:  ldc.i4.0
-      IL_0002:  stfld      int32 MS.VT::target
+      IL_0002:  stfld      int32 MS_jumps1_il.VT::target
       IL_0007:  ldarg.0
       IL_0008:  ldnull
-      IL_0009:  stfld      class System.String MS.VT::path
+      IL_0009:  stfld      class System.String MS_jumps1_il.VT::path
       IL_000e:  ldarg.0
-      IL_000f:  call       instance class System.String MS.VT::ToStringHelper()
+      IL_000f:  call       instance class System.String MS_jumps1_il.VT::ToStringHelper()
       IL_0014:  ldstr      " : "
       IL_0019:  ldarg.0
-      IL_001a:  ldfld      class System.String MS.VT::path
+      IL_001a:  ldfld      class System.String MS_jumps1_il.VT::path
       IL_001f:  call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String,
                                                                                class System.String)
       IL_0024:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_0029:  ldarg.0
-      IL_002a:  ldfld      class System.String MS.VT::path
+      IL_002a:  ldfld      class System.String MS_jumps1_il.VT::path
       IL_002f:  ldstr      "->ToStringHelper"
       IL_0034:  call       bool [mscorlib]System.String::Equals(class System.String,
                                                                 class System.String)
@@ -126,21 +126,21 @@
 
       IL_0042:  ldarg.0
       IL_0043:  ldc.i4.1
-      IL_0044:  stfld      int32 MS.VT::target
+      IL_0044:  stfld      int32 MS_jumps1_il.VT::target
       IL_0049:  ldarg.0
       IL_004a:  ldnull
-      IL_004b:  stfld      class System.String MS.VT::path
+      IL_004b:  stfld      class System.String MS_jumps1_il.VT::path
       IL_0050:  ldarg.0
-      IL_0051:  call       instance class System.String MS.VT::ToStringHelper()
+      IL_0051:  call       instance class System.String MS_jumps1_il.VT::ToStringHelper()
       IL_0056:  ldstr      " : "
       IL_005b:  ldarg.0
-      IL_005c:  ldfld      class System.String MS.VT::path
+      IL_005c:  ldfld      class System.String MS_jumps1_il.VT::path
       IL_0061:  call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String,
                                                                                class System.String)
       IL_0066:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_006b:  ldarg.0
-      IL_006c:  ldfld      class System.String MS.VT::path
+      IL_006c:  ldfld      class System.String MS_jumps1_il.VT::path
       IL_0071:  ldstr      "->ToStringHelper->ToStringHelper"
       IL_0076:  call       bool [mscorlib]System.String::Equals(class System.String,
                                                                 class System.String)
@@ -152,21 +152,21 @@
 
       IL_0084:  ldarg.0
       IL_0085:  ldc.i4.2
-      IL_0086:  stfld      int32 MS.VT::target
+      IL_0086:  stfld      int32 MS_jumps1_il.VT::target
       IL_008b:  ldarg.0
       IL_008c:  ldnull
-      IL_008d:  stfld      class System.String MS.VT::path
+      IL_008d:  stfld      class System.String MS_jumps1_il.VT::path
       IL_0092:  ldarg.0
-      IL_0093:  call       instance class System.String MS.VT::ToStringHelper()
+      IL_0093:  call       instance class System.String MS_jumps1_il.VT::ToStringHelper()
       IL_0098:  ldstr      " : "
       IL_009d:  ldarg.0
-      IL_009e:  ldfld      class System.String MS.VT::path
+      IL_009e:  ldfld      class System.String MS_jumps1_il.VT::path
       IL_00a3:  call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String,
                                                                                class System.String)
       IL_00a8:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_00ad:  ldarg.0
-      IL_00ae:  ldfld      class System.String MS.VT::path
+      IL_00ae:  ldfld      class System.String MS_jumps1_il.VT::path
       IL_00b3:  ldstr      "->ToStringHelper->ToString"
       IL_00b8:  call       bool [mscorlib]System.String::Equals(class System.String,
                                                                 class System.String)
@@ -178,21 +178,21 @@
 
       IL_00c6:  ldarg.0
       IL_00c7:  ldc.i4.0
-      IL_00c8:  stfld      int32 MS.VT::target
+      IL_00c8:  stfld      int32 MS_jumps1_il.VT::target
       IL_00cd:  ldarg.0
       IL_00ce:  ldnull
-      IL_00cf:  stfld      class System.String MS.VT::path
+      IL_00cf:  stfld      class System.String MS_jumps1_il.VT::path
       IL_00d4:  ldarg.0
-      IL_00d5:  call       instance class System.String MS.VT::ToString()
+      IL_00d5:  call       instance class System.String MS_jumps1_il.VT::ToString()
       IL_00da:  ldstr      " : "
       IL_00df:  ldarg.0
-      IL_00e0:  ldfld      class System.String MS.VT::path
+      IL_00e0:  ldfld      class System.String MS_jumps1_il.VT::path
       IL_00e5:  call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String,
                                                                                class System.String)
       IL_00ea:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_00ef:  ldarg.0
-      IL_00f0:  ldfld      class System.String MS.VT::path
+      IL_00f0:  ldfld      class System.String MS_jumps1_il.VT::path
       IL_00f5:  ldstr      "->ToString"
       IL_00fa:  call       bool [mscorlib]System.String::Equals(class System.String,
                                                                 class System.String)
@@ -204,21 +204,21 @@
 
       IL_0108:  ldarg.0
       IL_0109:  ldc.i4.1
-      IL_010a:  stfld      int32 MS.VT::target
+      IL_010a:  stfld      int32 MS_jumps1_il.VT::target
       IL_010f:  ldarg.0
       IL_0110:  ldnull
-      IL_0111:  stfld      class System.String MS.VT::path
+      IL_0111:  stfld      class System.String MS_jumps1_il.VT::path
       IL_0116:  ldarg.0
-      IL_0117:  call       instance class System.String MS.VT::ToString()
+      IL_0117:  call       instance class System.String MS_jumps1_il.VT::ToString()
       IL_011c:  ldstr      " : "
       IL_0121:  ldarg.0
-      IL_0122:  ldfld      class System.String MS.VT::path
+      IL_0122:  ldfld      class System.String MS_jumps1_il.VT::path
       IL_0127:  call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String,
                                                                                class System.String)
       IL_012c:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_0131:  ldarg.0
-      IL_0132:  ldfld      class System.String MS.VT::path
+      IL_0132:  ldfld      class System.String MS_jumps1_il.VT::path
       IL_0137:  ldstr      "->ToString->ToStringHelper"
       IL_013c:  call       bool [mscorlib]System.String::Equals(class System.String,
                                                                 class System.String)
@@ -230,21 +230,21 @@
 
       IL_0147:  ldarg.0
       IL_0148:  ldc.i4.2
-      IL_0149:  stfld      int32 MS.VT::target
+      IL_0149:  stfld      int32 MS_jumps1_il.VT::target
       IL_014e:  ldarg.0
       IL_014f:  ldnull
-      IL_0150:  stfld      class System.String MS.VT::path
+      IL_0150:  stfld      class System.String MS_jumps1_il.VT::path
       IL_0155:  ldarg.0
-      IL_0156:  call       instance class System.String MS.VT::ToString()
+      IL_0156:  call       instance class System.String MS_jumps1_il.VT::ToString()
       IL_015b:  ldstr      " : "
       IL_0160:  ldarg.0
-      IL_0161:  ldfld      class System.String MS.VT::path
+      IL_0161:  ldfld      class System.String MS_jumps1_il.VT::path
       IL_0166:  call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String,
                                                                                class System.String)
       IL_016b:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_0170:  ldarg.0
-      IL_0171:  ldfld      class System.String MS.VT::path
+      IL_0171:  ldfld      class System.String MS_jumps1_il.VT::path
       IL_0176:  ldstr      "->ToString->ToString"
       IL_017b:  call       bool [mscorlib]System.String::Equals(class System.String,
                                                                 class System.String)
@@ -262,7 +262,7 @@
       IL_018b:  ret
     } // end of method VT::RunTests
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -271,13 +271,13 @@
       .entrypoint
       .maxstack  1
       .locals (int32 V_0,
-               value class MS.VT V_1)
+               value class MS_jumps1_il.VT V_1)
       IL_0000:  ldloca.s   V_1
-      IL_0002:  initobj    MS.VT
+      IL_0002:  initobj    MS_jumps1_il.VT
       IL_0008:  ldloc.1
       IL_0009:  stloc.1
       IL_000a:  ldloca.s   V_1
-      IL_000c:  call       instance bool MS.VT::RunTests()
+      IL_000c:  call       instance bool MS_jumps1_il.VT::RunTests()
       IL_0011:  brfalse.s  IL_0022
 
       IL_0013:  ldstr      "PASSED."
@@ -298,5 +298,5 @@
 
   } // end of class VT
 
-} // end of namespace MS
+} // end of namespace MS_jumps1_il
 
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps1_il_d.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumps1_il_d.ilproj
index 7375712c272b76..1c30d58ec8a3ac 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumps1_il_d.ilproj
+++ b/src/tests/JIT/Methodical/VT/callconv/jumps1_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps1_il_r.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumps1_il_r.ilproj
index 2c13db5778af33..a6c0bf55d720b3 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumps1_il_r.ilproj
+++ b/src/tests/JIT/Methodical/VT/callconv/jumps1_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps2.il b/src/tests/JIT/Methodical/VT/callconv/jumps2.il
index 98c14cef0a8255..897e8fe153b0e6 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumps2.il
+++ b/src/tests/JIT/Methodical/VT/callconv/jumps2.il
@@ -20,9 +20,9 @@
 {
                         }
 .assembly extern xunit.core {}
-.namespace MS
+.namespace MS_jumps2_il
 {
-  .class value private auto ansi sealed VT
+  .class value public auto ansi sealed VT
          extends [mscorlib]System.ValueType
   {
     .field private class System.String path
@@ -34,14 +34,14 @@
 		.maxstack  8
 				ldarg.0
 				dup
-				ldfld      class System.String MS.VT::path
+				ldfld      class System.String MS_jumps2_il.VT::path
 				ldstr      "->ToString"
 				call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String)
-				stfld      class System.String MS.VT::path
+				stfld      class System.String MS_jumps2_il.VT::path
       
       			ldarg.0
-      			ldfld      int32 MS.VT::target
+      			ldfld      int32 MS_jumps2_il.VT::target
       			switch     (case0, case1, case2)
       			newobj     instance void [mscorlib]System.Exception::.ctor()
       			throw
@@ -51,13 +51,13 @@
 
       case1:	ldarg.0
       			ldc.i4.0
-      			stfld      int32 MS.VT::target
-      			jmp 		instance class System.String MS.VT::ToStringHelper()
+      			stfld      int32 MS_jumps2_il.VT::target
+      			jmp 		instance class System.String MS_jumps2_il.VT::ToStringHelper()
 
       case2:	ldarg.0
       			ldc.i4.0
-      			stfld      int32 MS.VT::target
-            	jmp 		instance class System.String MS.VT::ToString()
+      			stfld      int32 MS_jumps2_il.VT::target
+            	jmp 		instance class System.String MS_jumps2_il.VT::ToString()
     } // end of method VT::ToString
 
     .method public hidebysig instance class System.String
@@ -68,14 +68,14 @@
                int32 V_1)
 				ldarg.0
 				dup
-				ldfld      class System.String MS.VT::path
+				ldfld      class System.String MS_jumps2_il.VT::path
 				ldstr      "->ToStringHelper"
 				call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String)
-				stfld      class System.String MS.VT::path
+				stfld      class System.String MS_jumps2_il.VT::path
       
       			ldarg.0
-      			ldfld      int32 MS.VT::target
+      			ldfld      int32 MS_jumps2_il.VT::target
       			switch     (case0, case1, case2)
       			newobj     instance void [mscorlib]System.Exception::.ctor()
       			throw
@@ -85,16 +85,16 @@
 
       case1:	ldarg.0
       			ldc.i4.0
-      			stfld      int32 MS.VT::target
+      			stfld      int32 MS_jumps2_il.VT::target
       			ldarg.0
-      			tail. call instance class System.String MS.VT::ToStringHelper()
+      			tail. call instance class System.String MS_jumps2_il.VT::ToStringHelper()
       			ret
 
       case2:	ldarg.0
       			ldc.i4.0
-      			stfld      int32 MS.VT::target
+      			stfld      int32 MS_jumps2_il.VT::target
       			ldarg.0
-            	tail. call	instance class System.String MS.VT::ToString()
+            	tail. call	instance class System.String MS_jumps2_il.VT::ToString()
             	ret
     } // end of method VT::ToStringHelper
 
@@ -105,21 +105,21 @@
       .locals (bool V_0)
       IL_0000:  ldarg.0
       IL_0001:  ldc.i4.0
-      IL_0002:  stfld      int32 MS.VT::target
+      IL_0002:  stfld      int32 MS_jumps2_il.VT::target
       IL_0007:  ldarg.0
       IL_0008:  ldnull
-      IL_0009:  stfld      class System.String MS.VT::path
+      IL_0009:  stfld      class System.String MS_jumps2_il.VT::path
       IL_000e:  ldarg.0
-      IL_000f:  call       instance class System.String MS.VT::ToStringHelper()
+      IL_000f:  call       instance class System.String MS_jumps2_il.VT::ToStringHelper()
       IL_0014:  ldstr      " : "
       IL_0019:  ldarg.0
-      IL_001a:  ldfld      class System.String MS.VT::path
+      IL_001a:  ldfld      class System.String MS_jumps2_il.VT::path
       IL_001f:  call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String,
                                                                                class System.String)
       IL_0024:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_0029:  ldarg.0
-      IL_002a:  ldfld      class System.String MS.VT::path
+      IL_002a:  ldfld      class System.String MS_jumps2_il.VT::path
       IL_002f:  ldstr      "->ToStringHelper"
       IL_0034:  call       bool [mscorlib]System.String::Equals(class System.String,
                                                                 class System.String)
@@ -131,21 +131,21 @@
 
       IL_0042:  ldarg.0
       IL_0043:  ldc.i4.1
-      IL_0044:  stfld      int32 MS.VT::target
+      IL_0044:  stfld      int32 MS_jumps2_il.VT::target
       IL_0049:  ldarg.0
       IL_004a:  ldnull
-      IL_004b:  stfld      class System.String MS.VT::path
+      IL_004b:  stfld      class System.String MS_jumps2_il.VT::path
       IL_0050:  ldarg.0
-      IL_0051:  call       instance class System.String MS.VT::ToStringHelper()
+      IL_0051:  call       instance class System.String MS_jumps2_il.VT::ToStringHelper()
       IL_0056:  ldstr      " : "
       IL_005b:  ldarg.0
-      IL_005c:  ldfld      class System.String MS.VT::path
+      IL_005c:  ldfld      class System.String MS_jumps2_il.VT::path
       IL_0061:  call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String,
                                                                                class System.String)
       IL_0066:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_006b:  ldarg.0
-      IL_006c:  ldfld      class System.String MS.VT::path
+      IL_006c:  ldfld      class System.String MS_jumps2_il.VT::path
       IL_0071:  ldstr      "->ToStringHelper->ToStringHelper"
       IL_0076:  call       bool [mscorlib]System.String::Equals(class System.String,
                                                                 class System.String)
@@ -157,21 +157,21 @@
 
       IL_0084:  ldarg.0
       IL_0085:  ldc.i4.2
-      IL_0086:  stfld      int32 MS.VT::target
+      IL_0086:  stfld      int32 MS_jumps2_il.VT::target
       IL_008b:  ldarg.0
       IL_008c:  ldnull
-      IL_008d:  stfld      class System.String MS.VT::path
+      IL_008d:  stfld      class System.String MS_jumps2_il.VT::path
       IL_0092:  ldarg.0
-      IL_0093:  call       instance class System.String MS.VT::ToStringHelper()
+      IL_0093:  call       instance class System.String MS_jumps2_il.VT::ToStringHelper()
       IL_0098:  ldstr      " : "
       IL_009d:  ldarg.0
-      IL_009e:  ldfld      class System.String MS.VT::path
+      IL_009e:  ldfld      class System.String MS_jumps2_il.VT::path
       IL_00a3:  call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String,
                                                                                class System.String)
       IL_00a8:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_00ad:  ldarg.0
-      IL_00ae:  ldfld      class System.String MS.VT::path
+      IL_00ae:  ldfld      class System.String MS_jumps2_il.VT::path
       IL_00b3:  ldstr      "->ToStringHelper->ToString"
       IL_00b8:  call       bool [mscorlib]System.String::Equals(class System.String,
                                                                 class System.String)
@@ -183,21 +183,21 @@
 
       IL_00c6:  ldarg.0
       IL_00c7:  ldc.i4.0
-      IL_00c8:  stfld      int32 MS.VT::target
+      IL_00c8:  stfld      int32 MS_jumps2_il.VT::target
       IL_00cd:  ldarg.0
       IL_00ce:  ldnull
-      IL_00cf:  stfld      class System.String MS.VT::path
+      IL_00cf:  stfld      class System.String MS_jumps2_il.VT::path
       IL_00d4:  ldarg.0
-      IL_00d5:  call       instance class System.String MS.VT::ToString()
+      IL_00d5:  call       instance class System.String MS_jumps2_il.VT::ToString()
       IL_00da:  ldstr      " : "
       IL_00df:  ldarg.0
-      IL_00e0:  ldfld      class System.String MS.VT::path
+      IL_00e0:  ldfld      class System.String MS_jumps2_il.VT::path
       IL_00e5:  call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String,
                                                                                class System.String)
       IL_00ea:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_00ef:  ldarg.0
-      IL_00f0:  ldfld      class System.String MS.VT::path
+      IL_00f0:  ldfld      class System.String MS_jumps2_il.VT::path
       IL_00f5:  ldstr      "->ToString"
       IL_00fa:  call       bool [mscorlib]System.String::Equals(class System.String,
                                                                 class System.String)
@@ -209,21 +209,21 @@
 
       IL_0108:  ldarg.0
       IL_0109:  ldc.i4.1
-      IL_010a:  stfld      int32 MS.VT::target
+      IL_010a:  stfld      int32 MS_jumps2_il.VT::target
       IL_010f:  ldarg.0
       IL_0110:  ldnull
-      IL_0111:  stfld      class System.String MS.VT::path
+      IL_0111:  stfld      class System.String MS_jumps2_il.VT::path
       IL_0116:  ldarg.0
-      IL_0117:  call       instance class System.String MS.VT::ToString()
+      IL_0117:  call       instance class System.String MS_jumps2_il.VT::ToString()
       IL_011c:  ldstr      " : "
       IL_0121:  ldarg.0
-      IL_0122:  ldfld      class System.String MS.VT::path
+      IL_0122:  ldfld      class System.String MS_jumps2_il.VT::path
       IL_0127:  call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String,
                                                                                class System.String)
       IL_012c:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_0131:  ldarg.0
-      IL_0132:  ldfld      class System.String MS.VT::path
+      IL_0132:  ldfld      class System.String MS_jumps2_il.VT::path
       IL_0137:  ldstr      "->ToString->ToStringHelper"
       IL_013c:  call       bool [mscorlib]System.String::Equals(class System.String,
                                                                 class System.String)
@@ -235,21 +235,21 @@
 
       IL_0147:  ldarg.0
       IL_0148:  ldc.i4.2
-      IL_0149:  stfld      int32 MS.VT::target
+      IL_0149:  stfld      int32 MS_jumps2_il.VT::target
       IL_014e:  ldarg.0
       IL_014f:  ldnull
-      IL_0150:  stfld      class System.String MS.VT::path
+      IL_0150:  stfld      class System.String MS_jumps2_il.VT::path
       IL_0155:  ldarg.0
-      IL_0156:  call       instance class System.String MS.VT::ToString()
+      IL_0156:  call       instance class System.String MS_jumps2_il.VT::ToString()
       IL_015b:  ldstr      " : "
       IL_0160:  ldarg.0
-      IL_0161:  ldfld      class System.String MS.VT::path
+      IL_0161:  ldfld      class System.String MS_jumps2_il.VT::path
       IL_0166:  call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String,
                                                                                class System.String)
       IL_016b:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_0170:  ldarg.0
-      IL_0171:  ldfld      class System.String MS.VT::path
+      IL_0171:  ldfld      class System.String MS_jumps2_il.VT::path
       IL_0176:  ldstr      "->ToString->ToString"
       IL_017b:  call       bool [mscorlib]System.String::Equals(class System.String,
                                                                 class System.String)
@@ -267,7 +267,7 @@
       IL_018b:  ret
     } // end of method VT::RunTests
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -276,13 +276,13 @@
       .entrypoint
       .maxstack  1
       .locals (int32 V_0,
-               value class MS.VT V_1)
+               value class MS_jumps2_il.VT V_1)
       IL_0000:  ldloca.s   V_1
-      IL_0002:  initobj    MS.VT
+      IL_0002:  initobj    MS_jumps2_il.VT
       IL_0008:  ldloc.1
       IL_0009:  stloc.1
       IL_000a:  ldloca.s   V_1
-      IL_000c:  call       instance bool MS.VT::RunTests()
+      IL_000c:  call       instance bool MS_jumps2_il.VT::RunTests()
       IL_0011:  brfalse.s  IL_0022
 
       IL_0013:  ldstr      "PASSED."
@@ -303,5 +303,5 @@
 
   } // end of class VT
 
-} // end of namespace MS
+} // end of namespace MS_jumps2_il
 
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps2_il_d.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumps2_il_d.ilproj
index 510495576eff1f..46f9e078f7cd67 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumps2_il_d.ilproj
+++ b/src/tests/JIT/Methodical/VT/callconv/jumps2_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps2_il_r.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumps2_il_r.ilproj
index b38a0e503942dd..c5dad2b426914a 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumps2_il_r.ilproj
+++ b/src/tests/JIT/Methodical/VT/callconv/jumps2_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps3.il b/src/tests/JIT/Methodical/VT/callconv/jumps3.il
index 5748950993d610..d8b55659af526f 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumps3.il
+++ b/src/tests/JIT/Methodical/VT/callconv/jumps3.il
@@ -19,9 +19,9 @@
 {
                         }
 .assembly extern xunit.core {}
-.namespace MS
+.namespace MS_jumps3_il
 {
-  .class value private auto ansi sealed VT
+  .class value public auto ansi sealed VT
          extends [mscorlib]System.ValueType
   {
     .field private class System.String path
@@ -33,14 +33,14 @@
 		.maxstack  8
 				ldarg.0
 				dup
-				ldfld      class System.String MS.VT::path
+				ldfld      class System.String MS_jumps3_il.VT::path
 				ldstr      "->ToString"
 				call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String)
-				stfld      class System.String MS.VT::path
+				stfld      class System.String MS_jumps3_il.VT::path
       
       			ldarg.0
-      			ldfld      int32 MS.VT::target
+      			ldfld      int32 MS_jumps3_il.VT::target
       			switch     (case0, case1, case2)
       			newobj     instance void [mscorlib]System.Exception::.ctor()
       			throw
@@ -50,16 +50,16 @@
 
       case1:	ldarg.0
       			ldc.i4.0
-      			stfld      int32 MS.VT::target
+      			stfld      int32 MS_jumps3_il.VT::target
       			ldarg.0
-      			tail. call instance class System.String MS.VT::ToStringHelper()
+      			tail. call instance class System.String MS_jumps3_il.VT::ToStringHelper()
       			ret
 
       case2:	ldarg.0
       			ldc.i4.0
-      			stfld      int32 MS.VT::target
+      			stfld      int32 MS_jumps3_il.VT::target
       			ldarg.0
-            	tail. call instance class System.String MS.VT::ToString()
+            	tail. call instance class System.String MS_jumps3_il.VT::ToString()
             	ret
     } // end of method VT::ToString
 
@@ -71,14 +71,14 @@
                int32 V_1)
 				ldarg.0
 				dup
-				ldfld      class System.String MS.VT::path
+				ldfld      class System.String MS_jumps3_il.VT::path
 				ldstr      "->ToStringHelper"
 				call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String)
-				stfld      class System.String MS.VT::path
+				stfld      class System.String MS_jumps3_il.VT::path
       
       			ldarg.0
-      			ldfld      int32 MS.VT::target
+      			ldfld      int32 MS_jumps3_il.VT::target
       			switch     (case0, case1, case2)
       			newobj     instance void [mscorlib]System.Exception::.ctor()
       			throw
@@ -88,16 +88,16 @@
 
       case1:	ldarg.0
       			ldc.i4.0
-      			stfld      int32 MS.VT::target
+      			stfld      int32 MS_jumps3_il.VT::target
       			ldarg.0
-      			tail. call instance class System.String MS.VT::ToStringHelper()
+      			tail. call instance class System.String MS_jumps3_il.VT::ToStringHelper()
       			ret
 
       case2:	ldarg.0
       			ldc.i4.0
-      			stfld      int32 MS.VT::target
+      			stfld      int32 MS_jumps3_il.VT::target
       			ldarg.0
-            	tail. call	instance class System.String MS.VT::ToString()
+            	tail. call	instance class System.String MS_jumps3_il.VT::ToString()
             	ret
     } // end of method VT::ToStringHelper
 
@@ -108,21 +108,21 @@
       .locals (bool V_0)
       IL_0000:  ldarg.0
       IL_0001:  ldc.i4.0
-      IL_0002:  stfld      int32 MS.VT::target
+      IL_0002:  stfld      int32 MS_jumps3_il.VT::target
       IL_0007:  ldarg.0
       IL_0008:  ldnull
-      IL_0009:  stfld      class System.String MS.VT::path
+      IL_0009:  stfld      class System.String MS_jumps3_il.VT::path
       IL_000e:  ldarg.0
-      IL_000f:  call       instance class System.String MS.VT::ToStringHelper()
+      IL_000f:  call       instance class System.String MS_jumps3_il.VT::ToStringHelper()
       IL_0014:  ldstr      " : "
       IL_0019:  ldarg.0
-      IL_001a:  ldfld      class System.String MS.VT::path
+      IL_001a:  ldfld      class System.String MS_jumps3_il.VT::path
       IL_001f:  call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String,
                                                                                class System.String)
       IL_0024:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_0029:  ldarg.0
-      IL_002a:  ldfld      class System.String MS.VT::path
+      IL_002a:  ldfld      class System.String MS_jumps3_il.VT::path
       IL_002f:  ldstr      "->ToStringHelper"
       IL_0034:  call       bool [mscorlib]System.String::Equals(class System.String,
                                                                 class System.String)
@@ -134,21 +134,21 @@
 
       IL_0042:  ldarg.0
       IL_0043:  ldc.i4.1
-      IL_0044:  stfld      int32 MS.VT::target
+      IL_0044:  stfld      int32 MS_jumps3_il.VT::target
       IL_0049:  ldarg.0
       IL_004a:  ldnull
-      IL_004b:  stfld      class System.String MS.VT::path
+      IL_004b:  stfld      class System.String MS_jumps3_il.VT::path
       IL_0050:  ldarg.0
-      IL_0051:  call       instance class System.String MS.VT::ToStringHelper()
+      IL_0051:  call       instance class System.String MS_jumps3_il.VT::ToStringHelper()
       IL_0056:  ldstr      " : "
       IL_005b:  ldarg.0
-      IL_005c:  ldfld      class System.String MS.VT::path
+      IL_005c:  ldfld      class System.String MS_jumps3_il.VT::path
       IL_0061:  call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String,
                                                                                class System.String)
       IL_0066:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_006b:  ldarg.0
-      IL_006c:  ldfld      class System.String MS.VT::path
+      IL_006c:  ldfld      class System.String MS_jumps3_il.VT::path
       IL_0071:  ldstr      "->ToStringHelper->ToStringHelper"
       IL_0076:  call       bool [mscorlib]System.String::Equals(class System.String,
                                                                 class System.String)
@@ -160,21 +160,21 @@
 
       IL_0084:  ldarg.0
       IL_0085:  ldc.i4.2
-      IL_0086:  stfld      int32 MS.VT::target
+      IL_0086:  stfld      int32 MS_jumps3_il.VT::target
       IL_008b:  ldarg.0
       IL_008c:  ldnull
-      IL_008d:  stfld      class System.String MS.VT::path
+      IL_008d:  stfld      class System.String MS_jumps3_il.VT::path
       IL_0092:  ldarg.0
-      IL_0093:  call       instance class System.String MS.VT::ToStringHelper()
+      IL_0093:  call       instance class System.String MS_jumps3_il.VT::ToStringHelper()
       IL_0098:  ldstr      " : "
       IL_009d:  ldarg.0
-      IL_009e:  ldfld      class System.String MS.VT::path
+      IL_009e:  ldfld      class System.String MS_jumps3_il.VT::path
       IL_00a3:  call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String,
                                                                                class System.String)
       IL_00a8:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_00ad:  ldarg.0
-      IL_00ae:  ldfld      class System.String MS.VT::path
+      IL_00ae:  ldfld      class System.String MS_jumps3_il.VT::path
       IL_00b3:  ldstr      "->ToStringHelper->ToString"
       IL_00b8:  call       bool [mscorlib]System.String::Equals(class System.String,
                                                                 class System.String)
@@ -186,21 +186,21 @@
 
       IL_00c6:  ldarg.0
       IL_00c7:  ldc.i4.0
-      IL_00c8:  stfld      int32 MS.VT::target
+      IL_00c8:  stfld      int32 MS_jumps3_il.VT::target
       IL_00cd:  ldarg.0
       IL_00ce:  ldnull
-      IL_00cf:  stfld      class System.String MS.VT::path
+      IL_00cf:  stfld      class System.String MS_jumps3_il.VT::path
       IL_00d4:  ldarg.0
-      IL_00d5:  call       instance class System.String MS.VT::ToString()
+      IL_00d5:  call       instance class System.String MS_jumps3_il.VT::ToString()
       IL_00da:  ldstr      " : "
       IL_00df:  ldarg.0
-      IL_00e0:  ldfld      class System.String MS.VT::path
+      IL_00e0:  ldfld      class System.String MS_jumps3_il.VT::path
       IL_00e5:  call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String,
                                                                                class System.String)
       IL_00ea:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_00ef:  ldarg.0
-      IL_00f0:  ldfld      class System.String MS.VT::path
+      IL_00f0:  ldfld      class System.String MS_jumps3_il.VT::path
       IL_00f5:  ldstr      "->ToString"
       IL_00fa:  call       bool [mscorlib]System.String::Equals(class System.String,
                                                                 class System.String)
@@ -212,21 +212,21 @@
 
       IL_0108:  ldarg.0
       IL_0109:  ldc.i4.1
-      IL_010a:  stfld      int32 MS.VT::target
+      IL_010a:  stfld      int32 MS_jumps3_il.VT::target
       IL_010f:  ldarg.0
       IL_0110:  ldnull
-      IL_0111:  stfld      class System.String MS.VT::path
+      IL_0111:  stfld      class System.String MS_jumps3_il.VT::path
       IL_0116:  ldarg.0
-      IL_0117:  call       instance class System.String MS.VT::ToString()
+      IL_0117:  call       instance class System.String MS_jumps3_il.VT::ToString()
       IL_011c:  ldstr      " : "
       IL_0121:  ldarg.0
-      IL_0122:  ldfld      class System.String MS.VT::path
+      IL_0122:  ldfld      class System.String MS_jumps3_il.VT::path
       IL_0127:  call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String,
                                                                                class System.String)
       IL_012c:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_0131:  ldarg.0
-      IL_0132:  ldfld      class System.String MS.VT::path
+      IL_0132:  ldfld      class System.String MS_jumps3_il.VT::path
       IL_0137:  ldstr      "->ToString->ToStringHelper"
       IL_013c:  call       bool [mscorlib]System.String::Equals(class System.String,
                                                                 class System.String)
@@ -238,21 +238,21 @@
 
       IL_0147:  ldarg.0
       IL_0148:  ldc.i4.2
-      IL_0149:  stfld      int32 MS.VT::target
+      IL_0149:  stfld      int32 MS_jumps3_il.VT::target
       IL_014e:  ldarg.0
       IL_014f:  ldnull
-      IL_0150:  stfld      class System.String MS.VT::path
+      IL_0150:  stfld      class System.String MS_jumps3_il.VT::path
       IL_0155:  ldarg.0
-      IL_0156:  call       instance class System.String MS.VT::ToString()
+      IL_0156:  call       instance class System.String MS_jumps3_il.VT::ToString()
       IL_015b:  ldstr      " : "
       IL_0160:  ldarg.0
-      IL_0161:  ldfld      class System.String MS.VT::path
+      IL_0161:  ldfld      class System.String MS_jumps3_il.VT::path
       IL_0166:  call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String,
                                                                                class System.String)
       IL_016b:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_0170:  ldarg.0
-      IL_0171:  ldfld      class System.String MS.VT::path
+      IL_0171:  ldfld      class System.String MS_jumps3_il.VT::path
       IL_0176:  ldstr      "->ToString->ToString"
       IL_017b:  call       bool [mscorlib]System.String::Equals(class System.String,
                                                                 class System.String)
@@ -270,7 +270,7 @@
       IL_018b:  ret
     } // end of method VT::RunTests
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -279,13 +279,13 @@
       .entrypoint
       .maxstack  1
       .locals (int32 V_0,
-               value class MS.VT V_1)
+               value class MS_jumps3_il.VT V_1)
       IL_0000:  ldloca.s   V_1
-      IL_0002:  initobj    MS.VT
+      IL_0002:  initobj    MS_jumps3_il.VT
       IL_0008:  ldloc.1
       IL_0009:  stloc.1
       IL_000a:  ldloca.s   V_1
-      IL_000c:  call       instance bool MS.VT::RunTests()
+      IL_000c:  call       instance bool MS_jumps3_il.VT::RunTests()
       IL_0011:  brfalse.s  IL_0022
 
       IL_0013:  ldstr      "PASSED."
@@ -306,5 +306,5 @@
 
   } // end of class VT
 
-} // end of namespace MS
+} // end of namespace MS_jumps3_il
 
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps3_il_d.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumps3_il_d.ilproj
index 0b5f857bfc63da..fd72449c3b4c3e 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumps3_il_d.ilproj
+++ b/src/tests/JIT/Methodical/VT/callconv/jumps3_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps3_il_r.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumps3_il_r.ilproj
index 0b5cdf5c9f3b3c..5bd981c0c84989 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumps3_il_r.ilproj
+++ b/src/tests/JIT/Methodical/VT/callconv/jumps3_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps4.il b/src/tests/JIT/Methodical/VT/callconv/jumps4.il
index 4e08b53a8048b9..e3684b3da08760 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumps4.il
+++ b/src/tests/JIT/Methodical/VT/callconv/jumps4.il
@@ -14,9 +14,9 @@
 {
                         }
 .assembly extern xunit.core {}
-.namespace MS
+.namespace MS_jumps4_il
 {
-  .class value private auto ansi sealed VT
+  .class value public auto ansi sealed VT
          extends [mscorlib]System.ValueType
   {
     .field private class System.String path
@@ -28,14 +28,14 @@
 		.maxstack  8
 				ldarg.0
 				dup
-				ldfld      class System.String MS.VT::path
+				ldfld      class System.String MS_jumps4_il.VT::path
 				ldstr      "->ToString"
 				call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String)
-				stfld      class System.String MS.VT::path
+				stfld      class System.String MS_jumps4_il.VT::path
       
       			ldarg.0
-      			ldfld      int32 MS.VT::target
+      			ldfld      int32 MS_jumps4_il.VT::target
       			switch     (case0, case1, case2)
       			newobj     instance void [mscorlib]System.Exception::.ctor()
       			throw
@@ -45,16 +45,16 @@
 
       case1:	ldarg.0
       			ldc.i4.0
-      			stfld      int32 MS.VT::target
+      			stfld      int32 MS_jumps4_il.VT::target
       			ldarg.0
-      			ldftn instance class System.String MS.VT::ToStringHelper()
+      			ldftn instance class System.String MS_jumps4_il.VT::ToStringHelper()
       			br merge
 
       case2:	ldarg.0
       			ldc.i4.0
-      			stfld      int32 MS.VT::target
+      			stfld      int32 MS_jumps4_il.VT::target
       			ldarg.0
-      			ldftn instance class System.String MS.VT::ToString()
+      			ldftn instance class System.String MS_jumps4_il.VT::ToString()
       merge:
             	tail. calli instance class System.String()
             	ret
@@ -69,14 +69,14 @@
                
 				ldarg.0
 				dup
-				ldfld      class System.String MS.VT::path
+				ldfld      class System.String MS_jumps4_il.VT::path
 				ldstr      "->ToStringHelper"
 				call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String)
-				stfld      class System.String MS.VT::path
+				stfld      class System.String MS_jumps4_il.VT::path
       
       			ldarg.0
-      			ldfld      int32 MS.VT::target
+      			ldfld      int32 MS_jumps4_il.VT::target
       			switch     (case0, case1, case2)
       			newobj     instance void [mscorlib]System.Exception::.ctor()
       			throw
@@ -86,26 +86,26 @@
 
       case1:	ldarg.0
       			ldc.i4.0
-      			stfld      int32 MS.VT::target
+      			stfld      int32 MS_jumps4_il.VT::target
       			ldarg.0
-      			ldftn instance class System.String MS.VT::ToStringHelper()
+      			ldftn instance class System.String MS_jumps4_il.VT::ToStringHelper()
       			tail. calli instance class System.String()
       			ret
 
       case2:	ldarg.0
       			ldc.i4.0
-      			stfld      int32 MS.VT::target
+      			stfld      int32 MS_jumps4_il.VT::target
       			ldarg.0
       			dup
-      			ldobj MS.VT
-      			box MS.VT
+      			ldobj MS_jumps4_il.VT
+      			box MS_jumps4_il.VT
       			dup
       			dup
       			ldvirtftn instance class System.String [mscorlib]System.Object::ToString()
             	calli	instance class System.String()
             	pop
-            	unbox MS.VT
-            	cpobj MS.VT
+            	unbox MS_jumps4_il.VT
+            	cpobj MS_jumps4_il.VT
             	ldstr "HACK"
             	ret
     } // end of method VT::ToStringHelper
@@ -117,21 +117,21 @@
       .locals (bool V_0)
       IL_0000:  ldarg.0
       IL_0001:  ldc.i4.0
-      IL_0002:  stfld      int32 MS.VT::target
+      IL_0002:  stfld      int32 MS_jumps4_il.VT::target
       IL_0007:  ldarg.0
       IL_0008:  ldnull
-      IL_0009:  stfld      class System.String MS.VT::path
+      IL_0009:  stfld      class System.String MS_jumps4_il.VT::path
       IL_000e:  ldarg.0
-      IL_000f:  call       instance class System.String MS.VT::ToStringHelper()
+      IL_000f:  call       instance class System.String MS_jumps4_il.VT::ToStringHelper()
       IL_0014:  ldstr      " : "
       IL_0019:  ldarg.0
-      IL_001a:  ldfld      class System.String MS.VT::path
+      IL_001a:  ldfld      class System.String MS_jumps4_il.VT::path
       IL_001f:  call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String,
                                                                                class System.String)
       IL_0024:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_0029:  ldarg.0
-      IL_002a:  ldfld      class System.String MS.VT::path
+      IL_002a:  ldfld      class System.String MS_jumps4_il.VT::path
       IL_002f:  ldstr      "->ToStringHelper"
       IL_0034:  call       bool [mscorlib]System.String::Equals(class System.String,
                                                                 class System.String)
@@ -143,21 +143,21 @@
 
       IL_0042:  ldarg.0
       IL_0043:  ldc.i4.1
-      IL_0044:  stfld      int32 MS.VT::target
+      IL_0044:  stfld      int32 MS_jumps4_il.VT::target
       IL_0049:  ldarg.0
       IL_004a:  ldnull
-      IL_004b:  stfld      class System.String MS.VT::path
+      IL_004b:  stfld      class System.String MS_jumps4_il.VT::path
       IL_0050:  ldarg.0
-      IL_0051:  call       instance class System.String MS.VT::ToStringHelper()
+      IL_0051:  call       instance class System.String MS_jumps4_il.VT::ToStringHelper()
       IL_0056:  ldstr      " : "
       IL_005b:  ldarg.0
-      IL_005c:  ldfld      class System.String MS.VT::path
+      IL_005c:  ldfld      class System.String MS_jumps4_il.VT::path
       IL_0061:  call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String,
                                                                                class System.String)
       IL_0066:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_006b:  ldarg.0
-      IL_006c:  ldfld      class System.String MS.VT::path
+      IL_006c:  ldfld      class System.String MS_jumps4_il.VT::path
       IL_0071:  ldstr      "->ToStringHelper->ToStringHelper"
       IL_0076:  call       bool [mscorlib]System.String::Equals(class System.String,
                                                                 class System.String)
@@ -169,21 +169,21 @@
 
       IL_0084:  ldarg.0
       IL_0085:  ldc.i4.2
-      IL_0086:  stfld      int32 MS.VT::target
+      IL_0086:  stfld      int32 MS_jumps4_il.VT::target
       IL_008b:  ldarg.0
       IL_008c:  ldnull
-      IL_008d:  stfld      class System.String MS.VT::path
+      IL_008d:  stfld      class System.String MS_jumps4_il.VT::path
       IL_0092:  ldarg.0
-      IL_0093:  call       instance class System.String MS.VT::ToStringHelper()
+      IL_0093:  call       instance class System.String MS_jumps4_il.VT::ToStringHelper()
       IL_0098:  ldstr      " : "
       IL_009d:  ldarg.0
-      IL_009e:  ldfld      class System.String MS.VT::path
+      IL_009e:  ldfld      class System.String MS_jumps4_il.VT::path
       IL_00a3:  call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String,
                                                                                class System.String)
       IL_00a8:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_00ad:  ldarg.0
-      IL_00ae:  ldfld      class System.String MS.VT::path
+      IL_00ae:  ldfld      class System.String MS_jumps4_il.VT::path
       IL_00b3:  ldstr      "->ToStringHelper->ToString"
       IL_00b8:  call       bool [mscorlib]System.String::Equals(class System.String,
                                                                 class System.String)
@@ -195,21 +195,21 @@
 
       IL_00c6:  ldarg.0
       IL_00c7:  ldc.i4.0
-      IL_00c8:  stfld      int32 MS.VT::target
+      IL_00c8:  stfld      int32 MS_jumps4_il.VT::target
       IL_00cd:  ldarg.0
       IL_00ce:  ldnull
-      IL_00cf:  stfld      class System.String MS.VT::path
+      IL_00cf:  stfld      class System.String MS_jumps4_il.VT::path
       IL_00d4:  ldarg.0
-      IL_00d5:  call       instance class System.String MS.VT::ToString()
+      IL_00d5:  call       instance class System.String MS_jumps4_il.VT::ToString()
       IL_00da:  ldstr      " : "
       IL_00df:  ldarg.0
-      IL_00e0:  ldfld      class System.String MS.VT::path
+      IL_00e0:  ldfld      class System.String MS_jumps4_il.VT::path
       IL_00e5:  call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String,
                                                                                class System.String)
       IL_00ea:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_00ef:  ldarg.0
-      IL_00f0:  ldfld      class System.String MS.VT::path
+      IL_00f0:  ldfld      class System.String MS_jumps4_il.VT::path
       IL_00f5:  ldstr      "->ToString"
       IL_00fa:  call       bool [mscorlib]System.String::Equals(class System.String,
                                                                 class System.String)
@@ -221,21 +221,21 @@
 
       IL_0108:  ldarg.0
       IL_0109:  ldc.i4.1
-      IL_010a:  stfld      int32 MS.VT::target
+      IL_010a:  stfld      int32 MS_jumps4_il.VT::target
       IL_010f:  ldarg.0
       IL_0110:  ldnull
-      IL_0111:  stfld      class System.String MS.VT::path
+      IL_0111:  stfld      class System.String MS_jumps4_il.VT::path
       IL_0116:  ldarg.0
-      IL_0117:  call       instance class System.String MS.VT::ToString()
+      IL_0117:  call       instance class System.String MS_jumps4_il.VT::ToString()
       IL_011c:  ldstr      " : "
       IL_0121:  ldarg.0
-      IL_0122:  ldfld      class System.String MS.VT::path
+      IL_0122:  ldfld      class System.String MS_jumps4_il.VT::path
       IL_0127:  call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String,
                                                                                class System.String)
       IL_012c:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_0131:  ldarg.0
-      IL_0132:  ldfld      class System.String MS.VT::path
+      IL_0132:  ldfld      class System.String MS_jumps4_il.VT::path
       IL_0137:  ldstr      "->ToString->ToStringHelper"
       IL_013c:  call       bool [mscorlib]System.String::Equals(class System.String,
                                                                 class System.String)
@@ -247,21 +247,21 @@
 
       IL_0147:  ldarg.0
       IL_0148:  ldc.i4.2
-      IL_0149:  stfld      int32 MS.VT::target
+      IL_0149:  stfld      int32 MS_jumps4_il.VT::target
       IL_014e:  ldarg.0
       IL_014f:  ldnull
-      IL_0150:  stfld      class System.String MS.VT::path
+      IL_0150:  stfld      class System.String MS_jumps4_il.VT::path
       IL_0155:  ldarg.0
-      IL_0156:  call       instance class System.String MS.VT::ToString()
+      IL_0156:  call       instance class System.String MS_jumps4_il.VT::ToString()
       IL_015b:  ldstr      " : "
       IL_0160:  ldarg.0
-      IL_0161:  ldfld      class System.String MS.VT::path
+      IL_0161:  ldfld      class System.String MS_jumps4_il.VT::path
       IL_0166:  call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String,
                                                                                class System.String)
       IL_016b:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_0170:  ldarg.0
-      IL_0171:  ldfld      class System.String MS.VT::path
+      IL_0171:  ldfld      class System.String MS_jumps4_il.VT::path
       IL_0176:  ldstr      "->ToString->ToString"
       IL_017b:  call       bool [mscorlib]System.String::Equals(class System.String,
                                                                 class System.String)
@@ -279,7 +279,7 @@
       IL_018b:  ret
     } // end of method VT::RunTests
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -288,13 +288,13 @@
       .entrypoint
       .maxstack  1
       .locals (int32 V_0,
-               value class MS.VT V_1)
+               value class MS_jumps4_il.VT V_1)
       IL_0000:  ldloca.s   V_1
-      IL_0002:  initobj    MS.VT
+      IL_0002:  initobj    MS_jumps4_il.VT
       IL_0008:  ldloc.1
       IL_0009:  stloc.1
       IL_000a:  ldloca.s   V_1
-      IL_000c:  call       instance bool MS.VT::RunTests()
+      IL_000c:  call       instance bool MS_jumps4_il.VT::RunTests()
       IL_0011:  brfalse.s  IL_0022
 
       IL_0013:  ldstr      "PASSED."
@@ -315,5 +315,5 @@
 
   } // end of class VT
 
-} // end of namespace MS
+} // end of namespace MS_jumps4_il
 
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps4_il_d.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumps4_il_d.ilproj
index 7d328ef70e8645..ebfa7fef8e74fe 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumps4_il_d.ilproj
+++ b/src/tests/JIT/Methodical/VT/callconv/jumps4_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps4_il_r.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumps4_il_r.ilproj
index 939376a79c6cbd..43479a96f16e8c 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumps4_il_r.ilproj
+++ b/src/tests/JIT/Methodical/VT/callconv/jumps4_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps5.il b/src/tests/JIT/Methodical/VT/callconv/jumps5.il
index 0eb96858546d71..04f559e5ce10da 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumps5.il
+++ b/src/tests/JIT/Methodical/VT/callconv/jumps5.il
@@ -20,9 +20,9 @@
                         
 }
 .assembly extern xunit.core {}
-.namespace MS
+.namespace MS_jumps5_il
 {
-  .class value private auto ansi sealed VT
+  .class value public auto ansi sealed VT
          extends [mscorlib]System.ValueType
   {
     .field private class System.String path
@@ -34,14 +34,14 @@
 		.maxstack  8
 				ldarg.0
 				dup
-				ldfld      class System.String MS.VT::path
+				ldfld      class System.String MS_jumps5_il.VT::path
 				ldstr      "->ToString"
 				call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String)
-				stfld      class System.String MS.VT::path
+				stfld      class System.String MS_jumps5_il.VT::path
       
       			ldarg.0
-      			ldfld      int32 MS.VT::target
+      			ldfld      int32 MS_jumps5_il.VT::target
       			switch     (case0, case1, case2)
       			newobj     instance void [mscorlib]System.Exception::.ctor()
       			throw
@@ -51,13 +51,13 @@
 
       case1:	ldarg.0
       			ldc.i4.0
-      			stfld      int32 MS.VT::target
-      			jmp 		instance class System.String MS.VT::ToStringHelper()
+      			stfld      int32 MS_jumps5_il.VT::target
+      			jmp 		instance class System.String MS_jumps5_il.VT::ToStringHelper()
 
       case2:	ldarg.0
       			ldc.i4.0
-      			stfld      int32 MS.VT::target
-      			jmp		instance class System.String MS.VT::ToString()
+      			stfld      int32 MS_jumps5_il.VT::target
+      			jmp		instance class System.String MS_jumps5_il.VT::ToString()
     } // end of method VT::ToString
 
     .method public hidebysig instance class System.String
@@ -68,14 +68,14 @@
                int32 V_1)
 				ldarg.0
 				dup
-				ldfld      class System.String MS.VT::path
+				ldfld      class System.String MS_jumps5_il.VT::path
 				ldstr      "->ToStringHelper"
 				call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String)
-				stfld      class System.String MS.VT::path
+				stfld      class System.String MS_jumps5_il.VT::path
       
       			ldarg.0
-      			ldfld      int32 MS.VT::target
+      			ldfld      int32 MS_jumps5_il.VT::target
       			switch     (case0, case1, case2)
       			newobj     instance void [mscorlib]System.Exception::.ctor()
       			throw
@@ -85,13 +85,13 @@
 
       case1:	ldarg.0
       			ldc.i4.0
-      			stfld      int32 MS.VT::target
-      			jmp		instance class System.String MS.VT::ToStringHelper()
+      			stfld      int32 MS_jumps5_il.VT::target
+      			jmp		instance class System.String MS_jumps5_il.VT::ToStringHelper()
 
       case2:	ldarg.0
       			ldc.i4.0
-      			stfld      int32 MS.VT::target
-            	jmp		instance class System.String MS.VT::ToString()
+      			stfld      int32 MS_jumps5_il.VT::target
+            	jmp		instance class System.String MS_jumps5_il.VT::ToString()
             	
     } // end of method VT::ToStringHelper
 
@@ -102,21 +102,21 @@
       .locals (bool V_0)
       IL_0000:  ldarg.0
       IL_0001:  ldc.i4.0
-      IL_0002:  stfld      int32 MS.VT::target
+      IL_0002:  stfld      int32 MS_jumps5_il.VT::target
       IL_0007:  ldarg.0
       IL_0008:  ldnull
-      IL_0009:  stfld      class System.String MS.VT::path
+      IL_0009:  stfld      class System.String MS_jumps5_il.VT::path
       IL_000e:  ldarg.0
-      IL_000f:  call       instance class System.String MS.VT::ToStringHelper()
+      IL_000f:  call       instance class System.String MS_jumps5_il.VT::ToStringHelper()
       IL_0014:  ldstr      " : "
       IL_0019:  ldarg.0
-      IL_001a:  ldfld      class System.String MS.VT::path
+      IL_001a:  ldfld      class System.String MS_jumps5_il.VT::path
       IL_001f:  call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String,
                                                                                class System.String)
       IL_0024:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_0029:  ldarg.0
-      IL_002a:  ldfld      class System.String MS.VT::path
+      IL_002a:  ldfld      class System.String MS_jumps5_il.VT::path
       IL_002f:  ldstr      "->ToStringHelper"
       IL_0034:  call       bool [mscorlib]System.String::Equals(class System.String,
                                                                 class System.String)
@@ -128,21 +128,21 @@
 
       IL_0042:  ldarg.0
       IL_0043:  ldc.i4.1
-      IL_0044:  stfld      int32 MS.VT::target
+      IL_0044:  stfld      int32 MS_jumps5_il.VT::target
       IL_0049:  ldarg.0
       IL_004a:  ldnull
-      IL_004b:  stfld      class System.String MS.VT::path
+      IL_004b:  stfld      class System.String MS_jumps5_il.VT::path
       IL_0050:  ldarg.0
-      IL_0051:  call       instance class System.String MS.VT::ToStringHelper()
+      IL_0051:  call       instance class System.String MS_jumps5_il.VT::ToStringHelper()
       IL_0056:  ldstr      " : "
       IL_005b:  ldarg.0
-      IL_005c:  ldfld      class System.String MS.VT::path
+      IL_005c:  ldfld      class System.String MS_jumps5_il.VT::path
       IL_0061:  call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String,
                                                                                class System.String)
       IL_0066:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_006b:  ldarg.0
-      IL_006c:  ldfld      class System.String MS.VT::path
+      IL_006c:  ldfld      class System.String MS_jumps5_il.VT::path
       IL_0071:  ldstr      "->ToStringHelper->ToStringHelper"
       IL_0076:  call       bool [mscorlib]System.String::Equals(class System.String,
                                                                 class System.String)
@@ -154,21 +154,21 @@
 
       IL_0084:  ldarg.0
       IL_0085:  ldc.i4.2
-      IL_0086:  stfld      int32 MS.VT::target
+      IL_0086:  stfld      int32 MS_jumps5_il.VT::target
       IL_008b:  ldarg.0
       IL_008c:  ldnull
-      IL_008d:  stfld      class System.String MS.VT::path
+      IL_008d:  stfld      class System.String MS_jumps5_il.VT::path
       IL_0092:  ldarg.0
-      IL_0093:  call       instance class System.String MS.VT::ToStringHelper()
+      IL_0093:  call       instance class System.String MS_jumps5_il.VT::ToStringHelper()
       IL_0098:  ldstr      " : "
       IL_009d:  ldarg.0
-      IL_009e:  ldfld      class System.String MS.VT::path
+      IL_009e:  ldfld      class System.String MS_jumps5_il.VT::path
       IL_00a3:  call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String,
                                                                                class System.String)
       IL_00a8:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_00ad:  ldarg.0
-      IL_00ae:  ldfld      class System.String MS.VT::path
+      IL_00ae:  ldfld      class System.String MS_jumps5_il.VT::path
       IL_00b3:  ldstr      "->ToStringHelper->ToString"
       IL_00b8:  call       bool [mscorlib]System.String::Equals(class System.String,
                                                                 class System.String)
@@ -180,21 +180,21 @@
 
       IL_00c6:  ldarg.0
       IL_00c7:  ldc.i4.0
-      IL_00c8:  stfld      int32 MS.VT::target
+      IL_00c8:  stfld      int32 MS_jumps5_il.VT::target
       IL_00cd:  ldarg.0
       IL_00ce:  ldnull
-      IL_00cf:  stfld      class System.String MS.VT::path
+      IL_00cf:  stfld      class System.String MS_jumps5_il.VT::path
       IL_00d4:  ldarg.0
-      IL_00d5:  call       instance class System.String MS.VT::ToString()
+      IL_00d5:  call       instance class System.String MS_jumps5_il.VT::ToString()
       IL_00da:  ldstr      " : "
       IL_00df:  ldarg.0
-      IL_00e0:  ldfld      class System.String MS.VT::path
+      IL_00e0:  ldfld      class System.String MS_jumps5_il.VT::path
       IL_00e5:  call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String,
                                                                                class System.String)
       IL_00ea:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_00ef:  ldarg.0
-      IL_00f0:  ldfld      class System.String MS.VT::path
+      IL_00f0:  ldfld      class System.String MS_jumps5_il.VT::path
       IL_00f5:  ldstr      "->ToString"
       IL_00fa:  call       bool [mscorlib]System.String::Equals(class System.String,
                                                                 class System.String)
@@ -206,21 +206,21 @@
 
       IL_0108:  ldarg.0
       IL_0109:  ldc.i4.1
-      IL_010a:  stfld      int32 MS.VT::target
+      IL_010a:  stfld      int32 MS_jumps5_il.VT::target
       IL_010f:  ldarg.0
       IL_0110:  ldnull
-      IL_0111:  stfld      class System.String MS.VT::path
+      IL_0111:  stfld      class System.String MS_jumps5_il.VT::path
       IL_0116:  ldarg.0
-      IL_0117:  call       instance class System.String MS.VT::ToString()
+      IL_0117:  call       instance class System.String MS_jumps5_il.VT::ToString()
       IL_011c:  ldstr      " : "
       IL_0121:  ldarg.0
-      IL_0122:  ldfld      class System.String MS.VT::path
+      IL_0122:  ldfld      class System.String MS_jumps5_il.VT::path
       IL_0127:  call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String,
                                                                                class System.String)
       IL_012c:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_0131:  ldarg.0
-      IL_0132:  ldfld      class System.String MS.VT::path
+      IL_0132:  ldfld      class System.String MS_jumps5_il.VT::path
       IL_0137:  ldstr      "->ToString->ToStringHelper"
       IL_013c:  call       bool [mscorlib]System.String::Equals(class System.String,
                                                                 class System.String)
@@ -232,21 +232,21 @@
 
       IL_0147:  ldarg.0
       IL_0148:  ldc.i4.2
-      IL_0149:  stfld      int32 MS.VT::target
+      IL_0149:  stfld      int32 MS_jumps5_il.VT::target
       IL_014e:  ldarg.0
       IL_014f:  ldnull
-      IL_0150:  stfld      class System.String MS.VT::path
+      IL_0150:  stfld      class System.String MS_jumps5_il.VT::path
       IL_0155:  ldarg.0
-      IL_0156:  call       instance class System.String MS.VT::ToString()
+      IL_0156:  call       instance class System.String MS_jumps5_il.VT::ToString()
       IL_015b:  ldstr      " : "
       IL_0160:  ldarg.0
-      IL_0161:  ldfld      class System.String MS.VT::path
+      IL_0161:  ldfld      class System.String MS_jumps5_il.VT::path
       IL_0166:  call       class System.String [mscorlib]System.String::Concat(class System.String,
                                                                                class System.String,
                                                                                class System.String)
       IL_016b:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_0170:  ldarg.0
-      IL_0171:  ldfld      class System.String MS.VT::path
+      IL_0171:  ldfld      class System.String MS_jumps5_il.VT::path
       IL_0176:  ldstr      "->ToString->ToString"
       IL_017b:  call       bool [mscorlib]System.String::Equals(class System.String,
                                                                 class System.String)
@@ -264,7 +264,7 @@
       IL_018b:  ret
     } // end of method VT::RunTests
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -273,13 +273,13 @@
       .entrypoint
       .maxstack  1
       .locals (int32 V_0,
-               value class MS.VT V_1)
+               value class MS_jumps5_il.VT V_1)
       IL_0000:  ldloca.s   V_1
-      IL_0002:  initobj    MS.VT
+      IL_0002:  initobj    MS_jumps5_il.VT
       IL_0008:  ldloc.1
       IL_0009:  stloc.1
       IL_000a:  ldloca.s   V_1
-      IL_000c:  call       instance bool MS.VT::RunTests()
+      IL_000c:  call       instance bool MS_jumps5_il.VT::RunTests()
       IL_0011:  brfalse.s  IL_0022
 
       IL_0013:  ldstr      "PASSED."
@@ -300,5 +300,5 @@
 
   } // end of class VT
 
-} // end of namespace MS
+} // end of namespace MS_jumps5_il
 
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps5_il_d.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumps5_il_d.ilproj
index 4588323b3c13ce..a02fde9597d253 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumps5_il_d.ilproj
+++ b/src/tests/JIT/Methodical/VT/callconv/jumps5_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps5_il_r.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumps5_il_r.ilproj
index e73b85f64c2fe4..0ec9f07ee9cab7 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumps5_il_r.ilproj
+++ b/src/tests/JIT/Methodical/VT/callconv/jumps5_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps_d.csproj b/src/tests/JIT/Methodical/VT/callconv/jumps_d.csproj
index e8f1af93d45c54..a90081b549328a 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumps_d.csproj
+++ b/src/tests/JIT/Methodical/VT/callconv/jumps_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps_do.csproj b/src/tests/JIT/Methodical/VT/callconv/jumps_do.csproj
index 08c567a6245df1..b2aa3c37b49d95 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumps_do.csproj
+++ b/src/tests/JIT/Methodical/VT/callconv/jumps_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps_r.csproj b/src/tests/JIT/Methodical/VT/callconv/jumps_r.csproj
index 52ee719ef861bb..51b80695c8c651 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumps_r.csproj
+++ b/src/tests/JIT/Methodical/VT/callconv/jumps_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps_ro.csproj b/src/tests/JIT/Methodical/VT/callconv/jumps_ro.csproj
index 7cd750d21b5e20..86eb6bd19d5016 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumps_ro.csproj
+++ b/src/tests/JIT/Methodical/VT/callconv/jumps_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/callconv/vtret.cs b/src/tests/JIT/Methodical/VT/callconv/vtret.cs
index 31f28f3be2336a..336a5c101d55e7 100644
--- a/src/tests/JIT/Methodical/VT/callconv/vtret.cs
+++ b/src/tests/JIT/Methodical/VT/callconv/vtret.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace MS
+namespace MS_vtret_cs
 {
-    internal struct VT
+    public struct VT
     {
         private int _m_n;
         private VT[] _m_dummyGCRef;
@@ -14,7 +15,8 @@ internal struct VT
         private static VT add(VT me, VT what) { me._m_n += what._m_n; return me; }
         private static VT sub(VT me, VT what) { me._m_n -= what._m_n; return me; }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             VT vt = new VT(100);
             VT what = new VT(99);
diff --git a/src/tests/JIT/Methodical/VT/callconv/vtret.il b/src/tests/JIT/Methodical/VT/callconv/vtret.il
index a9ced08223de92..29ac2a856d09a9 100644
--- a/src/tests/JIT/Methodical/VT/callconv/vtret.il
+++ b/src/tests/JIT/Methodical/VT/callconv/vtret.il
@@ -17,13 +17,13 @@
 }
 .assembly extern xunit.core {}
 // MVID: {DAD31C3D-EF49-47EA-945E-72055ACE0D58}
-.namespace MS
+.namespace MS_vtret_il
 {
-  .class value private auto ansi sealed VT
+  .class value public auto ansi sealed VT
          extends [mscorlib]System.ValueType
   {
     .field private int32 m_n
-    .field private value class MS.VT[] m_dummyGCRef
+    .field private value class MS_vtret_il.VT[] m_dummyGCRef
     .method private hidebysig specialname rtspecialname 
             instance void  .ctor(int32 n) il managed
     {
@@ -31,49 +31,49 @@
       .maxstack  8
       IL_0000:  ldarg.0
       IL_0001:  ldarg.1
-      IL_0002:  stfld      int32 MS.VT::m_n
+      IL_0002:  stfld      int32 MS_vtret_il.VT::m_n
       IL_0007:  ldarg.0
       IL_0008:  ldc.i4.s   10
-      IL_000a:  newarr     MS.VT
-      IL_000f:  stfld      value class MS.VT[] MS.VT::m_dummyGCRef
+      IL_000a:  newarr     MS_vtret_il.VT
+      IL_000f:  stfld      value class MS_vtret_il.VT[] MS_vtret_il.VT::m_dummyGCRef
       IL_0014:  ret
     } // end of method VT::.ctor
 
-    .method private hidebysig static value class MS.VT 
-            'add'(value class MS.VT me,
-                  value class MS.VT what) il managed
+    .method private hidebysig static value class MS_vtret_il.VT 
+            'add'(value class MS_vtret_il.VT me,
+                  value class MS_vtret_il.VT what) il managed
     {
       // Code size       27 (0x1b)
       .maxstack  8
       IL_0000:  ldarga.s   me
       IL_0002:  dup
-      IL_0003:  ldfld      int32 MS.VT::m_n
+      IL_0003:  ldfld      int32 MS_vtret_il.VT::m_n
       IL_0008:  ldarga.s   what
-      IL_000a:  ldfld      int32 MS.VT::m_n
+      IL_000a:  ldfld      int32 MS_vtret_il.VT::m_n
       IL_000f:  add
-      IL_0010:  stfld      int32 MS.VT::m_n
+      IL_0010:  stfld      int32 MS_vtret_il.VT::m_n
       IL_0019:  ldarg.0
       IL_001a:  ret
     } // end of method VT::'add'
 
-    .method private hidebysig static value class MS.VT 
-            'sub'(value class MS.VT me,
-                  value class MS.VT what) il managed
+    .method private hidebysig static value class MS_vtret_il.VT 
+            'sub'(value class MS_vtret_il.VT me,
+                  value class MS_vtret_il.VT what) il managed
     {
       // Code size       27 (0x1b)
       			.maxstack  8
       			ldarga.s what
       			dup
-      			ldfld int32 MS.VT::m_n
+      			ldfld int32 MS_vtret_il.VT::m_n
       			neg
-      			stfld int32 MS.VT::m_n
+      			stfld int32 MS_vtret_il.VT::m_n
       			ldarg.0
       			ldarg.1
-      			tail. call value class MS.VT MS.VT::'add'(value class MS.VT me, value class MS.VT what)
+      			tail. call value class MS_vtret_il.VT MS_vtret_il.VT::'add'(value class MS_vtret_il.VT me, value class MS_vtret_il.VT what)
       			ret
     } // end of method VT::'sub'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -82,27 +82,27 @@
       .entrypoint
       // Code size       46 (0x2e)
       .maxstack  2
-      .locals (value class MS.VT V_0,
-               value class MS.VT V_1,
+      .locals (value class MS_vtret_il.VT V_0,
+               value class MS_vtret_il.VT V_1,
                int32 V_2)
       IL_0000:  ldloca.s   V_0
       IL_0002:  ldc.i4.s   100
-      IL_0004:  call       instance void MS.VT::.ctor(int32)
+      IL_0004:  call       instance void MS_vtret_il.VT::.ctor(int32)
       IL_0009:  ldloca.s   V_1
       IL_000b:  ldc.i4.s   99
-      IL_000d:  call       instance void MS.VT::.ctor(int32)
+      IL_000d:  call       instance void MS_vtret_il.VT::.ctor(int32)
       IL_0012:  ldloc.0
       IL_0013:  ldloc.1
-      IL_0014:  call       value class MS.VT MS.VT::'add'(value class MS.VT,
-                                                          value class MS.VT)
+      IL_0014:  call       value class MS_vtret_il.VT MS_vtret_il.VT::'add'(value class MS_vtret_il.VT,
+                                                          value class MS_vtret_il.VT)
       IL_0019:  stloc.0
       IL_001a:  ldloc.0
       IL_001b:  ldloc.1
-      IL_001c:  call       value class MS.VT MS.VT::'sub'(value class MS.VT,
-                                                          value class MS.VT)
+      IL_001c:  call       value class MS_vtret_il.VT MS_vtret_il.VT::'sub'(value class MS_vtret_il.VT,
+                                                          value class MS_vtret_il.VT)
       IL_0021:  stloc.0
       IL_0022:  ldloca.s   V_0
-      IL_0024:  ldfld      int32 MS.VT::m_n
+      IL_0024:  ldfld      int32 MS_vtret_il.VT::m_n
       IL_0029:  stloc.2
       IL_002a:  br.s       IL_002c
 
@@ -112,6 +112,6 @@
 
   } // end of class VT
 
-} // end of namespace MS
+} // end of namespace MS_vtret_il
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/VT/callconv/vtret2.il b/src/tests/JIT/Methodical/VT/callconv/vtret2.il
index 288bf7a219b207..1048deefd54554 100644
--- a/src/tests/JIT/Methodical/VT/callconv/vtret2.il
+++ b/src/tests/JIT/Methodical/VT/callconv/vtret2.il
@@ -17,13 +17,13 @@
 }
 .assembly extern xunit.core {}
 // MVID: {DAD31C3D-EF49-47EA-945E-72055ACE0D58}
-.namespace MS
+.namespace MS_vtret2_il
 {
-  .class value private auto ansi sealed VT
+  .class value public auto ansi sealed VT
          extends [mscorlib]System.ValueType
   {
     .field private int32 m_n
-    .field private value class MS.VT[] m_dummyGCRef
+    .field private value class MS_vtret2_il.VT[] m_dummyGCRef
     .method private hidebysig specialname rtspecialname 
             instance void  .ctor(int32 n) il managed
     {
@@ -31,50 +31,50 @@
       .maxstack  8
       IL_0000:  ldarg.0
       IL_0001:  ldarg.1
-      IL_0002:  stfld      int32 MS.VT::m_n
+      IL_0002:  stfld      int32 MS_vtret2_il.VT::m_n
       IL_0007:  ldarg.0
       IL_0008:  ldc.i4.s   10
-      IL_000a:  newarr     MS.VT
-      IL_000f:  stfld      value class MS.VT[] MS.VT::m_dummyGCRef
+      IL_000a:  newarr     MS_vtret2_il.VT
+      IL_000f:  stfld      value class MS_vtret2_il.VT[] MS_vtret2_il.VT::m_dummyGCRef
       IL_0014:  ret
     } // end of method VT::.ctor
 
-    .method private hidebysig static value class MS.VT 
-            'add'(value class MS.VT me,
-                  value class MS.VT what) il managed
+    .method private hidebysig static value class MS_vtret2_il.VT 
+            'add'(value class MS_vtret2_il.VT me,
+                  value class MS_vtret2_il.VT what) il managed
     {
       // Code size       27 (0x1b)
       .maxstack  8
       IL_0000:  ldarga.s   me
       IL_0002:  dup
-      IL_0003:  ldfld      int32 MS.VT::m_n
+      IL_0003:  ldfld      int32 MS_vtret2_il.VT::m_n
       IL_0008:  ldarga.s   what
-      IL_000a:  ldfld      int32 MS.VT::m_n
+      IL_000a:  ldfld      int32 MS_vtret2_il.VT::m_n
       IL_000f:  add
-      IL_0010:  stfld      int32 MS.VT::m_n
+      IL_0010:  stfld      int32 MS_vtret2_il.VT::m_n
       IL_0019:  ldarg.0
       IL_001a:  ret
     } // end of method VT::'add'
 
-    .method private hidebysig static value class MS.VT 
-            'sub'(value class MS.VT me,
-                  value class MS.VT what) il managed
+    .method private hidebysig static value class MS_vtret2_il.VT 
+            'sub'(value class MS_vtret2_il.VT me,
+                  value class MS_vtret2_il.VT what) il managed
     {
       // Code size       27 (0x1b)
       			.maxstack  8
       			ldarg.0
       			ldarga.s what
       			dup
-      			ldfld int32 MS.VT::m_n
+      			ldfld int32 MS_vtret2_il.VT::m_n
       			neg
-      			stfld int32 MS.VT::m_n
+      			stfld int32 MS_vtret2_il.VT::m_n
       			ldarg.1
-      			ldftn value class MS.VT MS.VT::'add'(value class MS.VT me, value class MS.VT what)
-      			tail. calli value class MS.VT(value class MS.VT me, value class MS.VT what)
+      			ldftn value class MS_vtret2_il.VT MS_vtret2_il.VT::'add'(value class MS_vtret2_il.VT me, value class MS_vtret2_il.VT what)
+      			tail. calli value class MS_vtret2_il.VT(value class MS_vtret2_il.VT me, value class MS_vtret2_il.VT what)
       			ret
     } // end of method VT::'sub'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -83,27 +83,27 @@
       .entrypoint
       // Code size       46 (0x2e)
       .maxstack  2
-      .locals (value class MS.VT V_0,
-               value class MS.VT V_1,
+      .locals (value class MS_vtret2_il.VT V_0,
+               value class MS_vtret2_il.VT V_1,
                int32 V_2)
       IL_0000:  ldloca.s   V_0
       IL_0002:  ldc.i4.s   100
-      IL_0004:  call       instance void MS.VT::.ctor(int32)
+      IL_0004:  call       instance void MS_vtret2_il.VT::.ctor(int32)
       IL_0009:  ldloca.s   V_1
       IL_000b:  ldc.i4.s   99
-      IL_000d:  call       instance void MS.VT::.ctor(int32)
+      IL_000d:  call       instance void MS_vtret2_il.VT::.ctor(int32)
       IL_0012:  ldloc.0
       IL_0013:  ldloc.1
-      IL_0014:  call       value class MS.VT MS.VT::'add'(value class MS.VT,
-                                                          value class MS.VT)
+      IL_0014:  call       value class MS_vtret2_il.VT MS_vtret2_il.VT::'add'(value class MS_vtret2_il.VT,
+                                                          value class MS_vtret2_il.VT)
       IL_0019:  stloc.0
       IL_001a:  ldloc.0
       IL_001b:  ldloc.1
-      IL_001c:  call       value class MS.VT MS.VT::'sub'(value class MS.VT,
-                                                          value class MS.VT)
+      IL_001c:  call       value class MS_vtret2_il.VT MS_vtret2_il.VT::'sub'(value class MS_vtret2_il.VT,
+                                                          value class MS_vtret2_il.VT)
       IL_0021:  stloc.0
       IL_0022:  ldloca.s   V_0
-      IL_0024:  ldfld      int32 MS.VT::m_n
+      IL_0024:  ldfld      int32 MS_vtret2_il.VT::m_n
       IL_0029:  stloc.2
       IL_002a:  br.s       IL_002c
 
@@ -113,6 +113,6 @@
 
   } // end of class VT
 
-} // end of namespace MS
+} // end of namespace MS_vtret2_il
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/VT/callconv/vtret2_il_d.ilproj b/src/tests/JIT/Methodical/VT/callconv/vtret2_il_d.ilproj
index 4fb8ae785118aa..25c4593fa94874 100644
--- a/src/tests/JIT/Methodical/VT/callconv/vtret2_il_d.ilproj
+++ b/src/tests/JIT/Methodical/VT/callconv/vtret2_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/VT/callconv/vtret2_il_r.ilproj b/src/tests/JIT/Methodical/VT/callconv/vtret2_il_r.ilproj
index 5ed32f88fa1056..ec1f9a25c1890e 100644
--- a/src/tests/JIT/Methodical/VT/callconv/vtret2_il_r.ilproj
+++ b/src/tests/JIT/Methodical/VT/callconv/vtret2_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/callconv/vtret_d.csproj b/src/tests/JIT/Methodical/VT/callconv/vtret_d.csproj
index dfeecaef0b12a4..998ef01e8bd8ce 100644
--- a/src/tests/JIT/Methodical/VT/callconv/vtret_d.csproj
+++ b/src/tests/JIT/Methodical/VT/callconv/vtret_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/callconv/vtret_do.csproj b/src/tests/JIT/Methodical/VT/callconv/vtret_do.csproj
index e59695c28eb332..1265a39a4976e7 100644
--- a/src/tests/JIT/Methodical/VT/callconv/vtret_do.csproj
+++ b/src/tests/JIT/Methodical/VT/callconv/vtret_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/callconv/vtret_il_d.ilproj b/src/tests/JIT/Methodical/VT/callconv/vtret_il_d.ilproj
index aac2c63344bd26..64192876c112cb 100644
--- a/src/tests/JIT/Methodical/VT/callconv/vtret_il_d.ilproj
+++ b/src/tests/JIT/Methodical/VT/callconv/vtret_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/VT/callconv/vtret_il_r.ilproj b/src/tests/JIT/Methodical/VT/callconv/vtret_il_r.ilproj
index 496cceede89b01..969614b0522f5b 100644
--- a/src/tests/JIT/Methodical/VT/callconv/vtret_il_r.ilproj
+++ b/src/tests/JIT/Methodical/VT/callconv/vtret_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/VT/callconv/vtret_r.csproj b/src/tests/JIT/Methodical/VT/callconv/vtret_r.csproj
index 911ef5ec21f547..5e471fda33262c 100644
--- a/src/tests/JIT/Methodical/VT/callconv/vtret_r.csproj
+++ b/src/tests/JIT/Methodical/VT/callconv/vtret_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/callconv/vtret_ro.csproj b/src/tests/JIT/Methodical/VT/callconv/vtret_ro.csproj
index 9be68f2e4bce8a..c6ea34a1bdc596 100644
--- a/src/tests/JIT/Methodical/VT/callconv/vtret_ro.csproj
+++ b/src/tests/JIT/Methodical/VT/callconv/vtret_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/etc/ctor_recurse_d.csproj b/src/tests/JIT/Methodical/VT/etc/ctor_recurse_d.csproj
index c4a9dc19dfa483..80cf61341b6a71 100644
--- a/src/tests/JIT/Methodical/VT/etc/ctor_recurse_d.csproj
+++ b/src/tests/JIT/Methodical/VT/etc/ctor_recurse_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/etc/ctor_recurse_do.csproj b/src/tests/JIT/Methodical/VT/etc/ctor_recurse_do.csproj
index 45bfe16a3fe6b8..8b12341eb1e296 100644
--- a/src/tests/JIT/Methodical/VT/etc/ctor_recurse_do.csproj
+++ b/src/tests/JIT/Methodical/VT/etc/ctor_recurse_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/etc/ctor_recurse_r.csproj b/src/tests/JIT/Methodical/VT/etc/ctor_recurse_r.csproj
index a8a7eb8a8c9d47..5fce53b67fde1b 100644
--- a/src/tests/JIT/Methodical/VT/etc/ctor_recurse_r.csproj
+++ b/src/tests/JIT/Methodical/VT/etc/ctor_recurse_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/etc/ctor_recurse_ro.csproj b/src/tests/JIT/Methodical/VT/etc/ctor_recurse_ro.csproj
index 1b6bb4825b011a..721f72e455bd14 100644
--- a/src/tests/JIT/Methodical/VT/etc/ctor_recurse_ro.csproj
+++ b/src/tests/JIT/Methodical/VT/etc/ctor_recurse_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/etc/gc_nested.cs b/src/tests/JIT/Methodical/VT/etc/gc_nested.cs
index 69fded790980e6..bd38ff44ef41c6 100644
--- a/src/tests/JIT/Methodical/VT/etc/gc_nested.cs
+++ b/src/tests/JIT/Methodical/VT/etc/gc_nested.cs
@@ -2,8 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_gc_nested_etc_cs
 {
     internal class Struct1
     {
@@ -26,9 +27,10 @@ public void Verify()
         }
     }
 
-    internal class Test
+    public class Test
     {
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             Struct1 str1 = new Struct1();
             TypedReference _ref = __makeref(str1);
diff --git a/src/tests/JIT/Methodical/VT/etc/gc_nested_d.csproj b/src/tests/JIT/Methodical/VT/etc/gc_nested_d.csproj
index 8ef90b9d52e328..e58b54ee1eed0b 100644
--- a/src/tests/JIT/Methodical/VT/etc/gc_nested_d.csproj
+++ b/src/tests/JIT/Methodical/VT/etc/gc_nested_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/etc/gc_nested_do.csproj b/src/tests/JIT/Methodical/VT/etc/gc_nested_do.csproj
index 83889c9894e896..b766dd459d66c9 100644
--- a/src/tests/JIT/Methodical/VT/etc/gc_nested_do.csproj
+++ b/src/tests/JIT/Methodical/VT/etc/gc_nested_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/etc/gc_nested_r.csproj b/src/tests/JIT/Methodical/VT/etc/gc_nested_r.csproj
index 10cdd0966e7c7d..00658c8054996f 100644
--- a/src/tests/JIT/Methodical/VT/etc/gc_nested_r.csproj
+++ b/src/tests/JIT/Methodical/VT/etc/gc_nested_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/etc/gc_nested_ro.csproj b/src/tests/JIT/Methodical/VT/etc/gc_nested_ro.csproj
index e2b220b63877a2..a0da270972ce14 100644
--- a/src/tests/JIT/Methodical/VT/etc/gc_nested_ro.csproj
+++ b/src/tests/JIT/Methodical/VT/etc/gc_nested_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/etc/han2.cs b/src/tests/JIT/Methodical/VT/etc/han2.cs
index db1da0906a3539..83b43dfc5495c8 100644
--- a/src/tests/JIT/Methodical/VT/etc/han2.cs
+++ b/src/tests/JIT/Methodical/VT/etc/han2.cs
@@ -4,7 +4,7 @@
 using System;
 using Xunit;
 
-namespace JitTest
+namespace JitTest_han2_cs
 {
     public struct Ring
     {
diff --git a/src/tests/JIT/Methodical/VT/etc/han2_d.csproj b/src/tests/JIT/Methodical/VT/etc/han2_d.csproj
index a30da30010b4df..d953f3c66bbbee 100644
--- a/src/tests/JIT/Methodical/VT/etc/han2_d.csproj
+++ b/src/tests/JIT/Methodical/VT/etc/han2_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/etc/han2_do.csproj b/src/tests/JIT/Methodical/VT/etc/han2_do.csproj
index 350b90358f9e38..b68f0766a2b53d 100644
--- a/src/tests/JIT/Methodical/VT/etc/han2_do.csproj
+++ b/src/tests/JIT/Methodical/VT/etc/han2_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/etc/han2_r.csproj b/src/tests/JIT/Methodical/VT/etc/han2_r.csproj
index a4dc8deb880842..6c26092aa5b3e0 100644
--- a/src/tests/JIT/Methodical/VT/etc/han2_r.csproj
+++ b/src/tests/JIT/Methodical/VT/etc/han2_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/etc/han2_ro.csproj b/src/tests/JIT/Methodical/VT/etc/han2_ro.csproj
index 18100f6b182266..90015c6f7ad5d9 100644
--- a/src/tests/JIT/Methodical/VT/etc/han2_ro.csproj
+++ b/src/tests/JIT/Methodical/VT/etc/han2_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/etc/han3.cs b/src/tests/JIT/Methodical/VT/etc/han3.cs
index bb17a40d3ef04a..0e1597460b2ee4 100644
--- a/src/tests/JIT/Methodical/VT/etc/han3.cs
+++ b/src/tests/JIT/Methodical/VT/etc/han3.cs
@@ -4,7 +4,7 @@
 using System;
 using Xunit;
 
-namespace JitTest
+namespace JitTest_han3_cs
 {
     public struct Ring
     {
diff --git a/src/tests/JIT/Methodical/VT/etc/han3.il b/src/tests/JIT/Methodical/VT/etc/han3.il
index f5ac5c7f0e2a00..404ba028dd151b 100644
--- a/src/tests/JIT/Methodical/VT/etc/han3.il
+++ b/src/tests/JIT/Methodical/VT/etc/han3.il
@@ -13,7 +13,7 @@
 {
 }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_han3_il
 {
   .class value private auto ansi sealed Ring
          extends [mscorlib]System.ValueType
@@ -21,10 +21,10 @@
     .field public int32 size
   } // end of class Ring
 
-  .class value private auto ansi sealed Column
+  .class value public auto ansi sealed Column
          extends [mscorlib]System.ValueType
   {
-    .field public value class JitTest.Ring[] rings
+    .field public value class JitTest_han3_il.Ring[] rings
     .field private int32[] heightPtr
     .method public hidebysig specialname 
             instance int32 get_height() il managed
@@ -32,7 +32,7 @@
       .maxstack  2
       .locals (int32 V_0)
       IL_0000:  ldarg.0
-      IL_0001:  ldfld      int32[] JitTest.Column::heightPtr
+      IL_0001:  ldfld      int32[] JitTest_han3_il.Column::heightPtr
       IL_0006:  ldc.i4.0
       IL_0007:  ldelem.i4
       IL_0008:  stloc.0
@@ -47,7 +47,7 @@
     {
       .maxstack  8
       IL_0000:  ldarg.0
-      IL_0001:  ldfld      int32[] JitTest.Column::heightPtr
+      IL_0001:  ldfld      int32[] JitTest_han3_il.Column::heightPtr
       IL_0006:  ldc.i4.0
       IL_0007:  ldarg.1
       IL_0008:  stelem.i4
@@ -63,20 +63,20 @@
                int32[] V_1)
       IL_0000:  ldarg.0
       IL_0001:  ldarg.1
-      IL_0002:  newarr     JitTest.Ring
-      IL_0007:  stfld      value class JitTest.Ring[] JitTest.Column::rings
+      IL_0002:  newarr     JitTest_han3_il.Ring
+      IL_0007:  stfld      value class JitTest_han3_il.Ring[] JitTest_han3_il.Column::rings
       IL_000c:  ldc.i4.0
       IL_000d:  stloc.0
       IL_000e:  br.s       IL_0028
 
       IL_0010:  ldarg.0
-      IL_0011:  ldfld      value class JitTest.Ring[] JitTest.Column::rings
+      IL_0011:  ldfld      value class JitTest_han3_il.Ring[] JitTest_han3_il.Column::rings
       IL_0016:  ldloc.0
-      IL_0017:  ldelema    JitTest.Ring
+      IL_0017:  ldelema    JitTest_han3_il.Ring
       IL_001c:  ldarg.1
       IL_001d:  ldloc.0
       IL_001e:  sub
-      IL_001f:  stfld      int32 JitTest.Ring::size
+      IL_001f:  stfld      int32 JitTest_han3_il.Ring::size
       IL_0024:  ldloc.0
       IL_0025:  ldc.i4.1
       IL_0026:  add
@@ -94,7 +94,7 @@
       IL_0036:  ldarg.2
       IL_0037:  stelem.i4
       IL_0038:  ldloc.1
-      IL_0039:  stfld      int32[] JitTest.Column::heightPtr
+      IL_0039:  stfld      int32[] JitTest_han3_il.Column::heightPtr
       IL_003e:  ret
     } // end of method Column::Init
 
@@ -108,17 +108,17 @@
       IL_0002:  br.s       IL_0034
 
       IL_0004:  ldarg.0
-      IL_0005:  ldfld      value class JitTest.Ring[] JitTest.Column::rings
+      IL_0005:  ldfld      value class JitTest_han3_il.Ring[] JitTest_han3_il.Column::rings
       IL_000a:  ldloc.0
       IL_000b:  ldc.i4.1
       IL_000c:  sub
-      IL_000d:  ldelema    JitTest.Ring
-      IL_0012:  ldfld      int32 JitTest.Ring::size
+      IL_000d:  ldelema    JitTest_han3_il.Ring
+      IL_0012:  ldfld      int32 JitTest_han3_il.Ring::size
       IL_0017:  ldarg.0
-      IL_0018:  ldfld      value class JitTest.Ring[] JitTest.Column::rings
+      IL_0018:  ldfld      value class JitTest_han3_il.Ring[] JitTest_han3_il.Column::rings
       IL_001d:  ldloc.0
-      IL_001e:  ldelema    JitTest.Ring
-      IL_0023:  ldfld      int32 JitTest.Ring::size
+      IL_001e:  ldelema    JitTest_han3_il.Ring
+      IL_0023:  ldfld      int32 JitTest_han3_il.Ring::size
       IL_0028:  bgt.s      IL_0030
 
       IL_002a:  newobj     instance void [mscorlib]System.Exception::.ctor()
@@ -130,7 +130,7 @@
       IL_0033:  stloc.0
       IL_0034:  ldloc.0
       IL_0035:  ldarg.0
-      IL_0036:  ldfld      int32[] JitTest.Column::heightPtr
+      IL_0036:  ldfld      int32[] JitTest_han3_il.Column::heightPtr
       IL_003b:  ldc.i4.0
       IL_003c:  ldelem.i4
       IL_003d:  blt.s      IL_0004
@@ -139,47 +139,47 @@
     } // end of method Column::Validate
 
     .method private hidebysig static void 
-            move1(value class JitTest.Column from,
-                  value class JitTest.Column 'to') il managed
+            move1(value class JitTest_han3_il.Column from,
+                  value class JitTest_han3_il.Column 'to') il managed
     {
       .maxstack  4
       IL_0000:  ldarga.s   'to'
-      IL_0002:  ldfld      value class JitTest.Ring[] JitTest.Column::rings
+      IL_0002:  ldfld      value class JitTest_han3_il.Ring[] JitTest_han3_il.Column::rings
       IL_0007:  ldarga.s   'to'
-      IL_0009:  call       instance int32 JitTest.Column::get_height()
-      IL_000e:  ldelema    JitTest.Ring
+      IL_0009:  call       instance int32 JitTest_han3_il.Column::get_height()
+      IL_000e:  ldelema    JitTest_han3_il.Ring
       IL_0013:  ldarga.s   from
-      IL_0015:  ldfld      value class JitTest.Ring[] JitTest.Column::rings
+      IL_0015:  ldfld      value class JitTest_han3_il.Ring[] JitTest_han3_il.Column::rings
       IL_001a:  ldarga.s   from
-      IL_001c:  call       instance int32 JitTest.Column::get_height()
+      IL_001c:  call       instance int32 JitTest_han3_il.Column::get_height()
       IL_0021:  ldc.i4.1
       IL_0022:  sub
-      IL_0023:  ldelema    JitTest.Ring
-      IL_0028:  ldobj      JitTest.Ring
-      IL_002d:  stobj      JitTest.Ring
+      IL_0023:  ldelema    JitTest_han3_il.Ring
+      IL_0028:  ldobj      JitTest_han3_il.Ring
+      IL_002d:  stobj      JitTest_han3_il.Ring
       IL_0032:  ldarga.s   'to'
       IL_0034:  ldarga.s   'to'
-      IL_0036:  call       instance int32 JitTest.Column::get_height()
+      IL_0036:  call       instance int32 JitTest_han3_il.Column::get_height()
       IL_003b:  ldc.i4.1
       IL_003c:  add
-      IL_003d:  call       instance void JitTest.Column::set_height(int32)
+      IL_003d:  call       instance void JitTest_han3_il.Column::set_height(int32)
       IL_0042:  ldarga.s   from
       IL_0044:  ldarga.s   from
-      IL_0046:  call       instance int32 JitTest.Column::get_height()
+      IL_0046:  call       instance int32 JitTest_han3_il.Column::get_height()
       IL_004b:  ldc.i4.1
       IL_004c:  sub
-      IL_004d:  call       instance void JitTest.Column::set_height(int32)
+      IL_004d:  call       instance void JitTest_han3_il.Column::set_height(int32)
       IL_0052:  ldarga.s   'to'
-      IL_0054:  call       instance void JitTest.Column::Validate()
+      IL_0054:  call       instance void JitTest_han3_il.Column::Validate()
       IL_0059:  ldarga.s   from
-      IL_005b:  call       instance void JitTest.Column::Validate()
+      IL_005b:  call       instance void JitTest_han3_il.Column::Validate()
       IL_0060:  ret
     } // end of method Column::move1
 
     .method private hidebysig static int32 
-            move(value class JitTest.Column from,
-                 value class JitTest.Column 'to',
-                 value class JitTest.Column temp,
+            move(value class JitTest_han3_il.Column from,
+                 value class JitTest_han3_il.Column 'to',
+                 value class JitTest_han3_il.Column temp,
                  int32 num) il managed
     {
       .maxstack  6
@@ -193,8 +193,8 @@
 
       IL_0006:  ldarg.0
       IL_0007:  ldarg.1
-      IL_0008:  call       void JitTest.Column::move1(value class JitTest.Column,
-                                                      value class JitTest.Column)
+      IL_0008:  call       void JitTest_han3_il.Column::move1(value class JitTest_han3_il.Column,
+                                                      value class JitTest_han3_il.Column)
       IL_000d:  br.s       IL_0032
 
       IL_000f:  ldloc.0
@@ -204,16 +204,16 @@
       IL_0013:  ldarg.3
       IL_0014:  ldc.i4.1
       IL_0015:  sub
-      IL_0016:  call       int32 JitTest.Column::move(value class JitTest.Column,
-                                                      value class JitTest.Column,
-                                                      value class JitTest.Column,
+      IL_0016:  call       int32 JitTest_han3_il.Column::move(value class JitTest_han3_il.Column,
+                                                      value class JitTest_han3_il.Column,
+                                                      value class JitTest_han3_il.Column,
                                                       int32)
       IL_001b:  add
       IL_001c:  stloc.0
       IL_001d:  ldarg.0
       IL_001e:  ldarg.1
-      IL_001f:  call       void JitTest.Column::move1(value class JitTest.Column,
-                                                      value class JitTest.Column)
+      IL_001f:  call       void JitTest_han3_il.Column::move1(value class JitTest_han3_il.Column,
+                                                      value class JitTest_han3_il.Column)
       IL_0024:  ldloc.0
       IL_0025:  ldarg.2
       IL_0026:  ldarg.1
@@ -221,9 +221,9 @@
       IL_0028:  ldarg.3
       IL_0029:  ldc.i4.1
       IL_002a:  sub
-      IL_002b:  call       int32 JitTest.Column::move(value class JitTest.Column,
-                                                      value class JitTest.Column,
-                                                      value class JitTest.Column,
+      IL_002b:  call       int32 JitTest_han3_il.Column::move(value class JitTest_han3_il.Column,
+                                                      value class JitTest_han3_il.Column,
+                                                      value class JitTest_han3_il.Column,
                                                       int32)
       IL_0030:  add
       IL_0031:  stloc.0
@@ -235,7 +235,7 @@
       IL_0037:  ret
     } // end of method Column::move
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -243,32 +243,32 @@
       )
       .entrypoint
       .maxstack  8
-      .locals (value class JitTest.Column V_X)
+      .locals (value class JitTest_han3_il.Column V_X)
 			ldloca.s   V_X
-			initobj    JitTest.Column
+			initobj    JitTest_han3_il.Column
 			
 			ldloca.s   V_X
 			ldc.i4.s   17
 			dup
-			call	instance void JitTest.Column::Init(int32, int32)
+			call	instance void JitTest_han3_il.Column::Init(int32, int32)
 			ldloc.0
 
 			ldloca.s   V_X
 			ldc.i4.s   17
 			ldc.i4.0
-			call	instance void JitTest.Column::Init(int32, int32)
+			call	instance void JitTest_han3_il.Column::Init(int32, int32)
 			ldloc.0
 
 			ldloca.s   V_X
 			ldc.i4.s   17
 			ldc.i4.0
-			call	instance void JitTest.Column::Init(int32, int32)
+			call	instance void JitTest_han3_il.Column::Init(int32, int32)
 			ldloc.0
 			
 			ldc.i4.s   17
-			call       int32 JitTest.Column::move(value class JitTest.Column,
-                                                      value class JitTest.Column,
-                                                      value class JitTest.Column,
+			call       int32 JitTest_han3_il.Column::move(value class JitTest_han3_il.Column,
+                                                      value class JitTest_han3_il.Column,
+                                                      value class JitTest_han3_il.Column,
                                                       int32)
             ldc.i4		130971
             sub
@@ -277,10 +277,10 @@
 
     .property instance int32 height()
     {
-      .get instance int32 JitTest.Column::get_height()
-      .set instance void JitTest.Column::set_height(int32)
+      .get instance int32 JitTest_han3_il.Column::get_height()
+      .set instance void JitTest_han3_il.Column::set_height(int32)
     } // end of property Column::height
   } // end of class Column
 
-} // end of namespace JitTest
+} // end of namespace JitTest_han3_il
 
diff --git a/src/tests/JIT/Methodical/VT/etc/han3_ctor.cs b/src/tests/JIT/Methodical/VT/etc/han3_ctor.cs
index 8a4137bc73fdb5..5a7121d3cf8d1f 100644
--- a/src/tests/JIT/Methodical/VT/etc/han3_ctor.cs
+++ b/src/tests/JIT/Methodical/VT/etc/han3_ctor.cs
@@ -4,7 +4,7 @@
 using System;
 using Xunit;
 
-namespace JitTest
+namespace JitTest_han3_ctor_cs
 {
     public struct Ring
     {
diff --git a/src/tests/JIT/Methodical/VT/etc/han3_ctor.il b/src/tests/JIT/Methodical/VT/etc/han3_ctor.il
index 0765a24dbf79f7..8ca8d518da84f1 100644
--- a/src/tests/JIT/Methodical/VT/etc/han3_ctor.il
+++ b/src/tests/JIT/Methodical/VT/etc/han3_ctor.il
@@ -13,7 +13,7 @@
 {
 }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_han3_ctor_il
 {
   .class value private auto ansi sealed Ring
          extends [mscorlib]System.ValueType
@@ -21,10 +21,10 @@
     .field public int32 size
   } // end of class Ring
 
-  .class value private auto ansi sealed Column
+  .class value public auto ansi sealed Column
          extends [mscorlib]System.ValueType
   {
-    .field public value class JitTest.Ring[] rings
+    .field public value class JitTest_han3_ctor_il.Ring[] rings
     .field private int32[] heightPtr
     .method public hidebysig specialname 
             instance int32 get_height() il managed
@@ -32,7 +32,7 @@
       .maxstack  2
       .locals (int32 V_0)
       IL_0000:  ldarg.0
-      IL_0001:  ldfld      int32[] JitTest.Column::heightPtr
+      IL_0001:  ldfld      int32[] JitTest_han3_ctor_il.Column::heightPtr
       IL_0006:  ldc.i4.0
       IL_0007:  ldelem.i4
       IL_0008:  stloc.0
@@ -47,7 +47,7 @@
     {
       .maxstack  8
       IL_0000:  ldarg.0
-      IL_0001:  ldfld      int32[] JitTest.Column::heightPtr
+      IL_0001:  ldfld      int32[] JitTest_han3_ctor_il.Column::heightPtr
       IL_0006:  ldc.i4.0
       IL_0007:  ldarg.1
       IL_0008:  stelem.i4
@@ -63,20 +63,20 @@
                int32[] V_1)
       IL_0000:  ldarg.0
       IL_0001:  ldarg.1
-      IL_0002:  newarr     JitTest.Ring
-      IL_0007:  stfld      value class JitTest.Ring[] JitTest.Column::rings
+      IL_0002:  newarr     JitTest_han3_ctor_il.Ring
+      IL_0007:  stfld      value class JitTest_han3_ctor_il.Ring[] JitTest_han3_ctor_il.Column::rings
       IL_000c:  ldc.i4.0
       IL_000d:  stloc.0
       IL_000e:  br.s       IL_0028
 
       IL_0010:  ldarg.0
-      IL_0011:  ldfld      value class JitTest.Ring[] JitTest.Column::rings
+      IL_0011:  ldfld      value class JitTest_han3_ctor_il.Ring[] JitTest_han3_ctor_il.Column::rings
       IL_0016:  ldloc.0
-      IL_0017:  ldelema    JitTest.Ring
+      IL_0017:  ldelema    JitTest_han3_ctor_il.Ring
       IL_001c:  ldarg.1
       IL_001d:  ldloc.0
       IL_001e:  sub
-      IL_001f:  stfld      int32 JitTest.Ring::size
+      IL_001f:  stfld      int32 JitTest_han3_ctor_il.Ring::size
       IL_0024:  ldloc.0
       IL_0025:  ldc.i4.1
       IL_0026:  add
@@ -94,7 +94,7 @@
       IL_0036:  ldarg.2
       IL_0037:  stelem.i4
       IL_0038:  ldloc.1
-      IL_0039:  stfld      int32[] JitTest.Column::heightPtr
+      IL_0039:  stfld      int32[] JitTest_han3_ctor_il.Column::heightPtr
       IL_003e:  ret
     } // end of method Column::.ctor
 
@@ -108,17 +108,17 @@
       IL_0002:  br.s       IL_0034
 
       IL_0004:  ldarg.0
-      IL_0005:  ldfld      value class JitTest.Ring[] JitTest.Column::rings
+      IL_0005:  ldfld      value class JitTest_han3_ctor_il.Ring[] JitTest_han3_ctor_il.Column::rings
       IL_000a:  ldloc.0
       IL_000b:  ldc.i4.1
       IL_000c:  sub
-      IL_000d:  ldelema    JitTest.Ring
-      IL_0012:  ldfld      int32 JitTest.Ring::size
+      IL_000d:  ldelema    JitTest_han3_ctor_il.Ring
+      IL_0012:  ldfld      int32 JitTest_han3_ctor_il.Ring::size
       IL_0017:  ldarg.0
-      IL_0018:  ldfld      value class JitTest.Ring[] JitTest.Column::rings
+      IL_0018:  ldfld      value class JitTest_han3_ctor_il.Ring[] JitTest_han3_ctor_il.Column::rings
       IL_001d:  ldloc.0
-      IL_001e:  ldelema    JitTest.Ring
-      IL_0023:  ldfld      int32 JitTest.Ring::size
+      IL_001e:  ldelema    JitTest_han3_ctor_il.Ring
+      IL_0023:  ldfld      int32 JitTest_han3_ctor_il.Ring::size
       IL_0028:  bgt.s      IL_0030
 
       IL_002a:  newobj     instance void [mscorlib]System.Exception::.ctor()
@@ -130,7 +130,7 @@
       IL_0033:  stloc.0
       IL_0034:  ldloc.0
       IL_0035:  ldarg.0
-      IL_0036:  ldfld      int32[] JitTest.Column::heightPtr
+      IL_0036:  ldfld      int32[] JitTest_han3_ctor_il.Column::heightPtr
       IL_003b:  ldc.i4.0
       IL_003c:  ldelem.i4
       IL_003d:  blt.s      IL_0004
@@ -139,57 +139,57 @@
     } // end of method Column::Validate
 
     .method private hidebysig static void 
-            move1(value class JitTest.Column from,
-                  value class JitTest.Column 'to') il managed
+            move1(value class JitTest_han3_ctor_il.Column from,
+                  value class JitTest_han3_ctor_il.Column 'to') il managed
     {
       .maxstack  4
       IL_0000:  ldarga.s   'to'
-      IL_0002:  ldfld      value class JitTest.Ring[] JitTest.Column::rings
+      IL_0002:  ldfld      value class JitTest_han3_ctor_il.Ring[] JitTest_han3_ctor_il.Column::rings
       IL_0007:  ldarga.s   'to'
-      IL_0009:  call       instance int32 JitTest.Column::get_height()
-      IL_000e:  ldelema    JitTest.Ring
+      IL_0009:  call       instance int32 JitTest_han3_ctor_il.Column::get_height()
+      IL_000e:  ldelema    JitTest_han3_ctor_il.Ring
       IL_0013:  ldarga.s   from
-      IL_0015:  ldfld      value class JitTest.Ring[] JitTest.Column::rings
+      IL_0015:  ldfld      value class JitTest_han3_ctor_il.Ring[] JitTest_han3_ctor_il.Column::rings
       IL_001a:  ldarga.s   from
-      IL_001c:  call       instance int32 JitTest.Column::get_height()
+      IL_001c:  call       instance int32 JitTest_han3_ctor_il.Column::get_height()
       IL_0021:  ldc.i4.1
       IL_0022:  sub
-      IL_0023:  ldelema    JitTest.Ring
-      IL_0028:  ldobj      JitTest.Ring
-      IL_002d:  stobj      JitTest.Ring
+      IL_0023:  ldelema    JitTest_han3_ctor_il.Ring
+      IL_0028:  ldobj      JitTest_han3_ctor_il.Ring
+      IL_002d:  stobj      JitTest_han3_ctor_il.Ring
       IL_0032:  ldarga.s   'to'
       IL_0034:  ldarga.s   'to'
-      IL_0036:  call       instance int32 JitTest.Column::get_height()
+      IL_0036:  call       instance int32 JitTest_han3_ctor_il.Column::get_height()
       IL_003b:  ldc.i4.1
       IL_003c:  add
-      IL_003d:  call       instance void JitTest.Column::set_height(int32)
+      IL_003d:  call       instance void JitTest_han3_ctor_il.Column::set_height(int32)
       IL_0042:  ldarga.s   from
       IL_0044:  ldarga.s   from
-      IL_0046:  call       instance int32 JitTest.Column::get_height()
+      IL_0046:  call       instance int32 JitTest_han3_ctor_il.Column::get_height()
       IL_004b:  ldc.i4.1
       IL_004c:  sub
-      IL_004d:  call       instance void JitTest.Column::set_height(int32)
+      IL_004d:  call       instance void JitTest_han3_ctor_il.Column::set_height(int32)
       IL_0052:  ldarga.s   'to'
-      IL_0054:  call       instance void JitTest.Column::Validate()
+      IL_0054:  call       instance void JitTest_han3_ctor_il.Column::Validate()
       IL_0059:  ldarga.s   from
-      IL_005b:  call       instance void JitTest.Column::Validate()
+      IL_005b:  call       instance void JitTest_han3_ctor_il.Column::Validate()
       IL_0060:  ret
     } // end of method Column::move1
 
     .method private hidebysig static int32 
-            move(value class JitTest.Column from,
-                 value class JitTest.Column 'to',
-                 value class JitTest.Column temp,
+            move(value class JitTest_han3_ctor_il.Column from,
+                 value class JitTest_han3_ctor_il.Column 'to',
+                 value class JitTest_han3_ctor_il.Column temp,
                  int32 num) il managed
     {
       .maxstack  6
       .locals (int32 V_0, int32 V_1)
       IL_0000:  ldarga.s   'to'
-      IL_0002:  call       instance void JitTest.Column::Validate()
+      IL_0002:  call       instance void JitTest_han3_ctor_il.Column::Validate()
       IL_0007:  ldarga.s   from
-      IL_0009:  call       instance void JitTest.Column::Validate()
+      IL_0009:  call       instance void JitTest_han3_ctor_il.Column::Validate()
       IL_000e:  ldarga.s   temp
-      IL_0010:  call       instance void JitTest.Column::Validate()
+      IL_0010:  call       instance void JitTest_han3_ctor_il.Column::Validate()
       
       IL_0015:  ldc.i4.1
 
@@ -199,8 +199,8 @@
 
       IL_001b:  ldarg.0
       IL_001c:  ldarg.1
-      IL_001d:  call       void JitTest.Column::move1(value class JitTest.Column,
-                                                      value class JitTest.Column)
+      IL_001d:  call       void JitTest_han3_ctor_il.Column::move1(value class JitTest_han3_ctor_il.Column,
+                                                      value class JitTest_han3_ctor_il.Column)
       IL_0022:  br.s       IL_004c
 
 	IL_0024:
@@ -211,16 +211,16 @@
       IL_0028:  ldarg.3
       IL_0029:  ldc.i4.1
       IL_002a:  sub
-      IL_002b:  call       int32 JitTest.Column::move(value class JitTest.Column,
-                                                      value class JitTest.Column,
-                                                      value class JitTest.Column,
+      IL_002b:  call       int32 JitTest_han3_ctor_il.Column::move(value class JitTest_han3_ctor_il.Column,
+                                                      value class JitTest_han3_ctor_il.Column,
+                                                      value class JitTest_han3_ctor_il.Column,
                                                       int32)
       IL_0030:  add
       
       IL_0032:  ldarg.0
       IL_0033:  ldarg.1
-      IL_0034:  call       void JitTest.Column::move1(value class JitTest.Column,
-                                                      value class JitTest.Column)
+      IL_0034:  call       void JitTest_han3_ctor_il.Column::move1(value class JitTest_han3_ctor_il.Column,
+                                                      value class JitTest_han3_ctor_il.Column)
                                                       
       IL_003a:  ldarg.2
       IL_003b:  ldarg.1
@@ -228,16 +228,16 @@
       IL_003d:  ldarg.3
       IL_003e:  ldc.i4.1
       IL_003f:  sub
-      IL_0040:  call       int32 JitTest.Column::move(value class JitTest.Column,
-                                                      value class JitTest.Column,
-                                                      value class JitTest.Column,
+      IL_0040:  call       int32 JitTest_han3_ctor_il.Column::move(value class JitTest_han3_ctor_il.Column,
+                                                      value class JitTest_han3_ctor_il.Column,
+                                                      value class JitTest_han3_ctor_il.Column,
                                                       int32)
       IL_0045:  add
       
       IL_004c:  ret
     } // end of method Column::move
 
-    .method private hidebysig static int32 Main() il managed
+    .method public hidebysig static int32 Main() il managed
     {
 		.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
 		    01 00 00 00
@@ -246,17 +246,17 @@
 		.maxstack  8
 		ldc.i4.s   17
 		dup
-		newobj     instance void JitTest.Column::.ctor(int32, int32)
+		newobj     instance void JitTest_han3_ctor_il.Column::.ctor(int32, int32)
 		ldc.i4.s   17
 		ldc.i4.0
-		newobj     instance void JitTest.Column::.ctor(int32, int32)
+		newobj     instance void JitTest_han3_ctor_il.Column::.ctor(int32, int32)
 		ldc.i4.s   17
 		ldc.i4.0
-		newobj     instance void JitTest.Column::.ctor(int32, int32)
+		newobj     instance void JitTest_han3_ctor_il.Column::.ctor(int32, int32)
 		ldc.i4.s   17
-		call       int32 JitTest.Column::move( value class JitTest.Column,
-                                               value class JitTest.Column,
-                                               value class JitTest.Column,
+		call       int32 JitTest_han3_ctor_il.Column::move( value class JitTest_han3_ctor_il.Column,
+                                               value class JitTest_han3_ctor_il.Column,
+                                               value class JitTest_han3_ctor_il.Column,
                                                int32)
 		ldc.i4     0x1ff9b
 		sub
@@ -265,10 +265,10 @@
 
     .property instance int32 height()
     {
-      .get instance int32 JitTest.Column::get_height()
-      .set instance void JitTest.Column::set_height(int32)
+      .get instance int32 JitTest_han3_ctor_il.Column::get_height()
+      .set instance void JitTest_han3_ctor_il.Column::set_height(int32)
     } // end of property Column::height
   } // end of class Column
 
-} // end of namespace JitTest
+} // end of namespace JitTest_han3_ctor_il
 
diff --git a/src/tests/JIT/Methodical/VT/etc/han3_ctor_d.csproj b/src/tests/JIT/Methodical/VT/etc/han3_ctor_d.csproj
index 402558504cc8d4..ec10b1cc5ba68d 100644
--- a/src/tests/JIT/Methodical/VT/etc/han3_ctor_d.csproj
+++ b/src/tests/JIT/Methodical/VT/etc/han3_ctor_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/etc/han3_ctor_do.csproj b/src/tests/JIT/Methodical/VT/etc/han3_ctor_do.csproj
index 8d3daf8375e56e..8c257be25c8139 100644
--- a/src/tests/JIT/Methodical/VT/etc/han3_ctor_do.csproj
+++ b/src/tests/JIT/Methodical/VT/etc/han3_ctor_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/etc/han3_ctor_il_d.ilproj b/src/tests/JIT/Methodical/VT/etc/han3_ctor_il_d.ilproj
index 91a6f0e45b876f..5e1f0397a3d65c 100644
--- a/src/tests/JIT/Methodical/VT/etc/han3_ctor_il_d.ilproj
+++ b/src/tests/JIT/Methodical/VT/etc/han3_ctor_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/etc/han3_ctor_il_r.ilproj b/src/tests/JIT/Methodical/VT/etc/han3_ctor_il_r.ilproj
index 093a8723face95..962018010817a8 100644
--- a/src/tests/JIT/Methodical/VT/etc/han3_ctor_il_r.ilproj
+++ b/src/tests/JIT/Methodical/VT/etc/han3_ctor_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/etc/han3_ctor_r.csproj b/src/tests/JIT/Methodical/VT/etc/han3_ctor_r.csproj
index 6468008e5d4423..25e09168a5a91c 100644
--- a/src/tests/JIT/Methodical/VT/etc/han3_ctor_r.csproj
+++ b/src/tests/JIT/Methodical/VT/etc/han3_ctor_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/etc/han3_ctor_ro.csproj b/src/tests/JIT/Methodical/VT/etc/han3_ctor_ro.csproj
index ff2ccb47874084..c1643f675843bb 100644
--- a/src/tests/JIT/Methodical/VT/etc/han3_ctor_ro.csproj
+++ b/src/tests/JIT/Methodical/VT/etc/han3_ctor_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/etc/han3_d.csproj b/src/tests/JIT/Methodical/VT/etc/han3_d.csproj
index e0d29ce4a7e73c..7d0d69ee3aa303 100644
--- a/src/tests/JIT/Methodical/VT/etc/han3_d.csproj
+++ b/src/tests/JIT/Methodical/VT/etc/han3_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/etc/han3_do.csproj b/src/tests/JIT/Methodical/VT/etc/han3_do.csproj
index b0317e2a7e9fad..dcbe3720d026ab 100644
--- a/src/tests/JIT/Methodical/VT/etc/han3_do.csproj
+++ b/src/tests/JIT/Methodical/VT/etc/han3_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/etc/han3_il_d.ilproj b/src/tests/JIT/Methodical/VT/etc/han3_il_d.ilproj
index 25778201544cb5..c62219c70c211d 100644
--- a/src/tests/JIT/Methodical/VT/etc/han3_il_d.ilproj
+++ b/src/tests/JIT/Methodical/VT/etc/han3_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/etc/han3_il_r.ilproj b/src/tests/JIT/Methodical/VT/etc/han3_il_r.ilproj
index 789e42bece9169..a1ae04145b5d62 100644
--- a/src/tests/JIT/Methodical/VT/etc/han3_il_r.ilproj
+++ b/src/tests/JIT/Methodical/VT/etc/han3_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/etc/han3_r.csproj b/src/tests/JIT/Methodical/VT/etc/han3_r.csproj
index 4b8235c94cde55..a624c728b7a66f 100644
--- a/src/tests/JIT/Methodical/VT/etc/han3_r.csproj
+++ b/src/tests/JIT/Methodical/VT/etc/han3_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/etc/han3_ref.cs b/src/tests/JIT/Methodical/VT/etc/han3_ref.cs
index 02aa54f4048de5..4255c8ecb382aa 100644
--- a/src/tests/JIT/Methodical/VT/etc/han3_ref.cs
+++ b/src/tests/JIT/Methodical/VT/etc/han3_ref.cs
@@ -4,7 +4,7 @@
 using System;
 using Xunit;
 
-namespace JitTest
+namespace JitTest_han3_ref_cs
 {
     public struct Ring
     {
diff --git a/src/tests/JIT/Methodical/VT/etc/han3_ref.il b/src/tests/JIT/Methodical/VT/etc/han3_ref.il
index 725dd5b0610a88..89bb495f729612 100644
--- a/src/tests/JIT/Methodical/VT/etc/han3_ref.il
+++ b/src/tests/JIT/Methodical/VT/etc/han3_ref.il
@@ -13,7 +13,7 @@
 {
 }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_han3_ref_il
 {
   .class value private auto ansi sealed Ring
          extends [mscorlib]System.ValueType
@@ -21,10 +21,10 @@
     .field public int32 size
   } // end of class Ring
 
-  .class value private auto ansi sealed Column
+  .class value public auto ansi sealed Column
          extends [mscorlib]System.ValueType
   {
-    .field public value class JitTest.Ring[] rings
+    .field public value class JitTest_han3_ref_il.Ring[] rings
     .field private int32[] heightPtr
     .method public hidebysig specialname 
             instance int32 get_height() il managed
@@ -32,7 +32,7 @@
       .maxstack  2
       .locals (int32 V_0)
       IL_0000:  ldarg.0
-      IL_0001:  ldfld      int32[] JitTest.Column::heightPtr
+      IL_0001:  ldfld      int32[] JitTest_han3_ref_il.Column::heightPtr
       IL_0006:  ldc.i4.0
       IL_0007:  ldelem.i4
       IL_0008:  stloc.0
@@ -47,7 +47,7 @@
     {
       .maxstack  8
       IL_0000:  ldarg.0
-      IL_0001:  ldfld      int32[] JitTest.Column::heightPtr
+      IL_0001:  ldfld      int32[] JitTest_han3_ref_il.Column::heightPtr
       IL_0006:  ldc.i4.0
       IL_0007:  ldarg.1
       IL_0008:  stelem.i4
@@ -63,20 +63,20 @@
                int32[] V_1)
       IL_0000:  ldarg.0
       IL_0001:  ldarg.1
-      IL_0002:  newarr     JitTest.Ring
-      IL_0007:  stfld      value class JitTest.Ring[] JitTest.Column::rings
+      IL_0002:  newarr     JitTest_han3_ref_il.Ring
+      IL_0007:  stfld      value class JitTest_han3_ref_il.Ring[] JitTest_han3_ref_il.Column::rings
       IL_000c:  ldc.i4.0
       IL_000d:  stloc.0
       IL_000e:  br.s       IL_0028
 
       IL_0010:  ldarg.0
-      IL_0011:  ldfld      value class JitTest.Ring[] JitTest.Column::rings
+      IL_0011:  ldfld      value class JitTest_han3_ref_il.Ring[] JitTest_han3_ref_il.Column::rings
       IL_0016:  ldloc.0
-      IL_0017:  ldelema    JitTest.Ring
+      IL_0017:  ldelema    JitTest_han3_ref_il.Ring
       IL_001c:  ldarg.1
       IL_001d:  ldloc.0
       IL_001e:  sub
-      IL_001f:  stfld      int32 JitTest.Ring::size
+      IL_001f:  stfld      int32 JitTest_han3_ref_il.Ring::size
       IL_0024:  ldloc.0
       IL_0025:  ldc.i4.1
       IL_0026:  add
@@ -94,7 +94,7 @@
       IL_0036:  ldarg.2
       IL_0037:  stelem.i4
       IL_0038:  ldloc.1
-      IL_0039:  stfld      int32[] JitTest.Column::heightPtr
+      IL_0039:  stfld      int32[] JitTest_han3_ref_il.Column::heightPtr
       IL_003e:  ret
     } // end of method Column::.ctor
 
@@ -108,17 +108,17 @@
       IL_0002:  br.s       IL_0034
 
       IL_0004:  ldarg.0
-      IL_0005:  ldfld      value class JitTest.Ring[] JitTest.Column::rings
+      IL_0005:  ldfld      value class JitTest_han3_ref_il.Ring[] JitTest_han3_ref_il.Column::rings
       IL_000a:  ldloc.0
       IL_000b:  ldc.i4.1
       IL_000c:  sub
-      IL_000d:  ldelema    JitTest.Ring
-      IL_0012:  ldfld      int32 JitTest.Ring::size
+      IL_000d:  ldelema    JitTest_han3_ref_il.Ring
+      IL_0012:  ldfld      int32 JitTest_han3_ref_il.Ring::size
       IL_0017:  ldarg.0
-      IL_0018:  ldfld      value class JitTest.Ring[] JitTest.Column::rings
+      IL_0018:  ldfld      value class JitTest_han3_ref_il.Ring[] JitTest_han3_ref_il.Column::rings
       IL_001d:  ldloc.0
-      IL_001e:  ldelema    JitTest.Ring
-      IL_0023:  ldfld      int32 JitTest.Ring::size
+      IL_001e:  ldelema    JitTest_han3_ref_il.Ring
+      IL_0023:  ldfld      int32 JitTest_han3_ref_il.Ring::size
       IL_0028:  bgt.s      IL_0030
 
       IL_002a:  newobj     instance void [mscorlib]System.Exception::.ctor()
@@ -130,7 +130,7 @@
       IL_0033:  stloc.0
       IL_0034:  ldloc.0
       IL_0035:  ldarg.0
-      IL_0036:  ldfld      int32[] JitTest.Column::heightPtr
+      IL_0036:  ldfld      int32[] JitTest_han3_ref_il.Column::heightPtr
       IL_003b:  ldc.i4.0
       IL_003c:  ldelem.i4
       IL_003d:  blt.s      IL_0004
@@ -139,58 +139,58 @@
     } // end of method Column::Validate
 
     .method private hidebysig static void 
-            move1(value class JitTest.Column& from,
-                  value class JitTest.Column& 'to') il managed
+            move1(value class JitTest_han3_ref_il.Column& from,
+                  value class JitTest_han3_ref_il.Column& 'to') il managed
     {
       .maxstack  4
       IL_0000:  ldarg.1
-      IL_0001:  ldfld      value class JitTest.Ring[] JitTest.Column::rings
+      IL_0001:  ldfld      value class JitTest_han3_ref_il.Ring[] JitTest_han3_ref_il.Column::rings
       IL_0006:  ldarg.1
-      IL_0007:  call       instance int32 JitTest.Column::get_height()
-      IL_000c:  ldelema    JitTest.Ring
+      IL_0007:  call       instance int32 JitTest_han3_ref_il.Column::get_height()
+      IL_000c:  ldelema    JitTest_han3_ref_il.Ring
       IL_0011:  ldarg.0
-      IL_0012:  ldfld      value class JitTest.Ring[] JitTest.Column::rings
+      IL_0012:  ldfld      value class JitTest_han3_ref_il.Ring[] JitTest_han3_ref_il.Column::rings
       IL_0017:  ldarg.0
-      IL_0018:  call       instance int32 JitTest.Column::get_height()
+      IL_0018:  call       instance int32 JitTest_han3_ref_il.Column::get_height()
       IL_001d:  ldc.i4.1
       IL_001e:  sub
-      IL_001f:  ldelema    JitTest.Ring
-      IL_0024:  ldobj      JitTest.Ring
-      IL_0029:  stobj      JitTest.Ring
+      IL_001f:  ldelema    JitTest_han3_ref_il.Ring
+      IL_0024:  ldobj      JitTest_han3_ref_il.Ring
+      IL_0029:  stobj      JitTest_han3_ref_il.Ring
       IL_002e:  ldarg.1
       IL_002f:  ldarg.1
-      IL_0030:  call       instance int32 JitTest.Column::get_height()
+      IL_0030:  call       instance int32 JitTest_han3_ref_il.Column::get_height()
       IL_0035:  ldc.i4.1
       IL_0036:  add
-      IL_0037:  call       instance void JitTest.Column::set_height(int32)
+      IL_0037:  call       instance void JitTest_han3_ref_il.Column::set_height(int32)
       IL_003c:  ldarg.0
       IL_003d:  ldarg.0
-      IL_003e:  call       instance int32 JitTest.Column::get_height()
+      IL_003e:  call       instance int32 JitTest_han3_ref_il.Column::get_height()
       IL_0043:  ldc.i4.1
       IL_0044:  sub
-      IL_0045:  call       instance void JitTest.Column::set_height(int32)
+      IL_0045:  call       instance void JitTest_han3_ref_il.Column::set_height(int32)
       IL_004a:  ldarg.1
-      IL_004b:  call       instance void JitTest.Column::Validate()
+      IL_004b:  call       instance void JitTest_han3_ref_il.Column::Validate()
       IL_0050:  ldarg.0
-      IL_0051:  call       instance void JitTest.Column::Validate()
+      IL_0051:  call       instance void JitTest_han3_ref_il.Column::Validate()
       IL_0056:  ret
     } // end of method Column::move1
 
     .method private hidebysig static int32 
-            move(value class JitTest.Column& from,
-                 value class JitTest.Column& 'to',
-                 value class JitTest.Column& temp,
+            move(value class JitTest_han3_ref_il.Column& from,
+                 value class JitTest_han3_ref_il.Column& 'to',
+                 value class JitTest_han3_ref_il.Column& temp,
                  int32 num) il managed
     {
       .maxstack  6
       .locals (int32 V_0,
                int32 V_1)
       IL_0000:  ldarg.1
-      IL_0001:  call       instance void JitTest.Column::Validate()
+      IL_0001:  call       instance void JitTest_han3_ref_il.Column::Validate()
       IL_0006:  ldarg.0
-      IL_0007:  call       instance void JitTest.Column::Validate()
+      IL_0007:  call       instance void JitTest_han3_ref_il.Column::Validate()
       IL_000c:  ldarg.2
-      IL_000d:  call       instance void JitTest.Column::Validate()
+      IL_000d:  call       instance void JitTest_han3_ref_il.Column::Validate()
       IL_0012:  ldc.i4.1
       IL_0013:  stloc.0
       IL_0014:  ldarg.3
@@ -199,8 +199,8 @@
 
       IL_0018:  ldarg.0
       IL_0019:  ldarg.1
-      IL_001a:  call       void JitTest.Column::move1(value class JitTest.Column&,
-                                                      value class JitTest.Column&)
+      IL_001a:  call       void JitTest_han3_ref_il.Column::move1(value class JitTest_han3_ref_il.Column&,
+                                                      value class JitTest_han3_ref_il.Column&)
       IL_001f:  br.s       IL_0044
 
       IL_0021:  ldloc.0
@@ -210,16 +210,16 @@
       IL_0025:  ldarg.3
       IL_0026:  ldc.i4.1
       IL_0027:  sub
-      IL_0028:  call       int32 JitTest.Column::move(value class JitTest.Column&,
-                                                      value class JitTest.Column&,
-                                                      value class JitTest.Column&,
+      IL_0028:  call       int32 JitTest_han3_ref_il.Column::move(value class JitTest_han3_ref_il.Column&,
+                                                      value class JitTest_han3_ref_il.Column&,
+                                                      value class JitTest_han3_ref_il.Column&,
                                                       int32)
       IL_002d:  add
       IL_002e:  stloc.0
       IL_002f:  ldarg.0
       IL_0030:  ldarg.1
-      IL_0031:  call       void JitTest.Column::move1(value class JitTest.Column&,
-                                                      value class JitTest.Column&)
+      IL_0031:  call       void JitTest_han3_ref_il.Column::move1(value class JitTest_han3_ref_il.Column&,
+                                                      value class JitTest_han3_ref_il.Column&)
       IL_0036:  ldloc.0
       IL_0037:  ldarg.2
       IL_0038:  ldarg.1
@@ -227,9 +227,9 @@
       IL_003a:  ldarg.3
       IL_003b:  ldc.i4.1
       IL_003c:  sub
-      IL_003d:  call       int32 JitTest.Column::move(value class JitTest.Column&,
-                                                      value class JitTest.Column&,
-                                                      value class JitTest.Column&,
+      IL_003d:  call       int32 JitTest_han3_ref_il.Column::move(value class JitTest_han3_ref_il.Column&,
+                                                      value class JitTest_han3_ref_il.Column&,
+                                                      value class JitTest_han3_ref_il.Column&,
                                                       int32)
       IL_0042:  add
       IL_0043:  stloc.0
@@ -241,7 +241,7 @@
       IL_0049:  ret
     } // end of method Column::move
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -249,43 +249,43 @@
       )
       .entrypoint
       .maxstack  4
-      .locals (value class JitTest.Column V_0,
-               value class JitTest.Column V_1,
-               value class JitTest.Column V_2,
+      .locals (value class JitTest_han3_ref_il.Column V_0,
+               value class JitTest_han3_ref_il.Column V_1,
+               value class JitTest_han3_ref_il.Column V_2,
                int32 V_3,
                int32 V_4)
       IL_0000:  ldloca.s   V_0
       IL_0002:  ldc.i4.s   17
       IL_0004:  ldc.i4.s   17
-      IL_0006:  call       instance void JitTest.Column::.ctor(int32,
+      IL_0006:  call       instance void JitTest_han3_ref_il.Column::.ctor(int32,
                                                                int32)
       IL_000b:  ldloca.s   V_1
       IL_000d:  ldc.i4.s   17
       IL_000f:  ldc.i4.0
-      IL_0010:  call       instance void JitTest.Column::.ctor(int32,
+      IL_0010:  call       instance void JitTest_han3_ref_il.Column::.ctor(int32,
                                                                int32)
       IL_0015:  ldloca.s   V_2
       IL_0017:  ldc.i4.s   17
       IL_0019:  ldc.i4.0
-      IL_001a:  call       instance void JitTest.Column::.ctor(int32,
+      IL_001a:  call       instance void JitTest_han3_ref_il.Column::.ctor(int32,
                                                                int32)
       IL_001f:  ldloca.s   V_0
       IL_0021:  ldloca.s   V_1
       IL_0023:  ldloca.s   V_2
       IL_0025:  ldc.i4.s   17
-      IL_0027:  call       int32 JitTest.Column::move(value class JitTest.Column&,
-                                                      value class JitTest.Column&,
-                                                      value class JitTest.Column&,
+      IL_0027:  call       int32 JitTest_han3_ref_il.Column::move(value class JitTest_han3_ref_il.Column&,
+                                                      value class JitTest_han3_ref_il.Column&,
+                                                      value class JitTest_han3_ref_il.Column&,
                                                       int32)
       IL_002c:  ldc.i4     0x1ff9b
       IL_0031:  sub
       IL_0032:  stloc.3
       IL_0033:  ldloca.s   V_0
-      IL_0035:  call       instance void JitTest.Column::Validate()
+      IL_0035:  call       instance void JitTest_han3_ref_il.Column::Validate()
       IL_003a:  ldloca.s   V_1
-      IL_003c:  call       instance void JitTest.Column::Validate()
+      IL_003c:  call       instance void JitTest_han3_ref_il.Column::Validate()
       IL_0041:  ldloca.s   V_2
-      IL_0043:  call       instance void JitTest.Column::Validate()
+      IL_0043:  call       instance void JitTest_han3_ref_il.Column::Validate()
       IL_0048:  ldloc.3
       IL_0049:  stloc.s    V_4
       IL_004b:  br.s       IL_004d
@@ -296,10 +296,10 @@
 
     .property instance int32 height()
     {
-      .get instance int32 JitTest.Column::get_height()
-      .set instance void JitTest.Column::set_height(int32)
+      .get instance int32 JitTest_han3_ref_il.Column::get_height()
+      .set instance void JitTest_han3_ref_il.Column::set_height(int32)
     } // end of property Column::height
   } // end of class Column
 
-} // end of namespace JitTest
+} // end of namespace JitTest_han3_ref_il
 
diff --git a/src/tests/JIT/Methodical/VT/etc/han3_ref_d.csproj b/src/tests/JIT/Methodical/VT/etc/han3_ref_d.csproj
index de79b279fc67d3..4a90deae722982 100644
--- a/src/tests/JIT/Methodical/VT/etc/han3_ref_d.csproj
+++ b/src/tests/JIT/Methodical/VT/etc/han3_ref_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/etc/han3_ref_do.csproj b/src/tests/JIT/Methodical/VT/etc/han3_ref_do.csproj
index 438acdfb49baaf..8c80c1fb00a216 100644
--- a/src/tests/JIT/Methodical/VT/etc/han3_ref_do.csproj
+++ b/src/tests/JIT/Methodical/VT/etc/han3_ref_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/etc/han3_ref_il_d.ilproj b/src/tests/JIT/Methodical/VT/etc/han3_ref_il_d.ilproj
index fa9a1289955254..f4fd0fce85d5f0 100644
--- a/src/tests/JIT/Methodical/VT/etc/han3_ref_il_d.ilproj
+++ b/src/tests/JIT/Methodical/VT/etc/han3_ref_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/etc/han3_ref_il_r.ilproj b/src/tests/JIT/Methodical/VT/etc/han3_ref_il_r.ilproj
index c7e0ccd5a4ea44..6a2f862cad977d 100644
--- a/src/tests/JIT/Methodical/VT/etc/han3_ref_il_r.ilproj
+++ b/src/tests/JIT/Methodical/VT/etc/han3_ref_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/etc/han3_ref_r.csproj b/src/tests/JIT/Methodical/VT/etc/han3_ref_r.csproj
index 4da0822095974f..4c2d1071ab811c 100644
--- a/src/tests/JIT/Methodical/VT/etc/han3_ref_r.csproj
+++ b/src/tests/JIT/Methodical/VT/etc/han3_ref_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/etc/han3_ref_ro.csproj b/src/tests/JIT/Methodical/VT/etc/han3_ref_ro.csproj
index 3e28dbd584af5d..18816ae553da42 100644
--- a/src/tests/JIT/Methodical/VT/etc/han3_ref_ro.csproj
+++ b/src/tests/JIT/Methodical/VT/etc/han3_ref_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/etc/han3_ro.csproj b/src/tests/JIT/Methodical/VT/etc/han3_ro.csproj
index bfb3b6090afd57..e6c5b1ee9cc910 100644
--- a/src/tests/JIT/Methodical/VT/etc/han3_ro.csproj
+++ b/src/tests/JIT/Methodical/VT/etc/han3_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/etc/hanoi.cs b/src/tests/JIT/Methodical/VT/etc/hanoi.cs
index 9d1510012f76b0..c6da0b43f42ff2 100644
--- a/src/tests/JIT/Methodical/VT/etc/hanoi.cs
+++ b/src/tests/JIT/Methodical/VT/etc/hanoi.cs
@@ -2,15 +2,16 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_hanoi_etc_cs
 {
     internal struct CI
     {
         public int index;
     }
 
-    internal class Test
+    public class Test
     {
         private static int[][] s_cols;
         private static int[] s_heights;
@@ -52,7 +53,8 @@ private static int move(CI from, CI to, int num)
             }
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             int NUM = 17;
             s_cols = new int[3][];
diff --git a/src/tests/JIT/Methodical/VT/etc/hanoi.il b/src/tests/JIT/Methodical/VT/etc/hanoi.il
index 38eff152926fdb..891f02b2a1ba20 100644
--- a/src/tests/JIT/Methodical/VT/etc/hanoi.il
+++ b/src/tests/JIT/Methodical/VT/etc/hanoi.il
@@ -13,7 +13,7 @@
 {
 }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_hanoi_etc_il
 {
   .class value private auto ansi sealed CI
          extends [mscorlib]System.ValueType
@@ -21,7 +21,7 @@
     .field public int32 index
   } // end of class CI
 
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends [mscorlib]System.Object
   {
     .field private static int32[][] cols
@@ -40,14 +40,14 @@
       IL_0005:  stloc.1
       IL_0006:  br.s       IL_0028
 
-      IL_0008:  ldsfld     int32[][] JitTest.Test::cols
+      IL_0008:  ldsfld     int32[][] JitTest_hanoi_etc_il.Test::cols
       IL_000d:  ldloc.0
       IL_000e:  ldelem.ref
       IL_000f:  ldloc.1
       IL_0010:  ldc.i4.1
       IL_0011:  sub
       IL_0012:  ldelem.i4
-      IL_0013:  ldsfld     int32[][] JitTest.Test::cols
+      IL_0013:  ldsfld     int32[][] JitTest_hanoi_etc_il.Test::cols
       IL_0018:  ldloc.0
       IL_0019:  ldelem.ref
       IL_001a:  ldloc.1
@@ -62,7 +62,7 @@
       IL_0026:  add
       IL_0027:  stloc.1
       IL_0028:  ldloc.1
-      IL_0029:  ldsfld     int32[] JitTest.Test::heights
+      IL_0029:  ldsfld     int32[] JitTest_hanoi_etc_il.Test::heights
       IL_002e:  ldloc.0
       IL_002f:  ldelem.i4
       IL_0030:  blt.s      IL_0008
@@ -79,22 +79,22 @@
     } // end of method Test::test
 
     .method private hidebysig static void 
-            move1(value class JitTest.CI from,
-                  value class JitTest.CI 'to') il managed
+            move1(value class JitTest_hanoi_etc_il.CI from,
+                  value class JitTest_hanoi_etc_il.CI 'to') il managed
     {
       .maxstack  7
       .locals (int32[] V_0,
                int32 V_1,
                int32 V_2)
-      IL_0000:  ldsfld     int32[][] JitTest.Test::cols
+      IL_0000:  ldsfld     int32[][] JitTest_hanoi_etc_il.Test::cols
       IL_0005:  ldarga.s   'to'
-      IL_0007:  ldfld      int32 JitTest.CI::index
+      IL_0007:  ldfld      int32 JitTest_hanoi_etc_il.CI::index
       IL_000c:  ldelem.ref
-      IL_000d:  ldsfld     int32[] JitTest.Test::heights
+      IL_000d:  ldsfld     int32[] JitTest_hanoi_etc_il.Test::heights
       IL_0012:  dup
       IL_0013:  stloc.0
       IL_0014:  ldarga.s   'to'
-      IL_0016:  ldfld      int32 JitTest.CI::index
+      IL_0016:  ldfld      int32 JitTest_hanoi_etc_il.CI::index
       IL_001b:  dup
       IL_001c:  stloc.1
       IL_001d:  ldloc.0
@@ -106,15 +106,15 @@
       IL_0023:  add
       IL_0024:  stelem.i4
       IL_0025:  ldloc.2
-      IL_0026:  ldsfld     int32[][] JitTest.Test::cols
+      IL_0026:  ldsfld     int32[][] JitTest_hanoi_etc_il.Test::cols
       IL_002b:  ldarga.s   from
-      IL_002d:  ldfld      int32 JitTest.CI::index
+      IL_002d:  ldfld      int32 JitTest_hanoi_etc_il.CI::index
       IL_0032:  ldelem.ref
-      IL_0033:  ldsfld     int32[] JitTest.Test::heights
+      IL_0033:  ldsfld     int32[] JitTest_hanoi_etc_il.Test::heights
       IL_0038:  dup
       IL_0039:  stloc.0
       IL_003a:  ldarga.s   from
-      IL_003c:  ldfld      int32 JitTest.CI::index
+      IL_003c:  ldfld      int32 JitTest_hanoi_etc_il.CI::index
       IL_0041:  dup
       IL_0042:  stloc.1
       IL_0043:  ldloc.0
@@ -128,82 +128,82 @@
       IL_004b:  ldloc.2
       IL_004c:  ldelem.i4
       IL_004d:  stelem.i4
-      IL_004e:  call       void JitTest.Test::test()
+      IL_004e:  call       void JitTest_hanoi_etc_il.Test::test()
       IL_0053:  ret
     } // end of method Test::move1
 
     .method private hidebysig static void 
-            move(value class JitTest.CI from,
-                 value class JitTest.CI 'to',
+            move(value class JitTest_hanoi_etc_il.CI from,
+                 value class JitTest_hanoi_etc_il.CI 'to',
                  int32 num) il managed
     {
       .maxstack  4
-      .locals (value class JitTest.CI V_0,
-               value class JitTest.CI V_1)
+      .locals (value class JitTest_hanoi_etc_il.CI V_0,
+               value class JitTest_hanoi_etc_il.CI V_1)
       IL_0000:  ldloca.s   V_0
-      IL_0002:  initobj    JitTest.CI
+      IL_0002:  initobj    JitTest_hanoi_etc_il.CI
       IL_0008:  ldloca.s   V_1
-      IL_000a:  initobj    JitTest.CI
+      IL_000a:  initobj    JitTest_hanoi_etc_il.CI
       IL_0010:  ldarg.2
       IL_0011:  ldc.i4.1
       IL_0012:  bne.un.s   IL_001d
 
       IL_0014:  ldarg.0
       IL_0015:  ldarg.1
-      IL_0016:  call       void JitTest.Test::move1(value class JitTest.CI,
-                                                    value class JitTest.CI)
+      IL_0016:  call       void JitTest_hanoi_etc_il.Test::move1(value class JitTest_hanoi_etc_il.CI,
+                                                    value class JitTest_hanoi_etc_il.CI)
       IL_001b:  br.s       IL_0084
 
       IL_001d:  ldloca.s   V_0
       IL_001f:  ldarga.s   from
-      IL_0021:  ldfld      int32 JitTest.CI::index
-      IL_0026:  stfld      int32 JitTest.CI::index
+      IL_0021:  ldfld      int32 JitTest_hanoi_etc_il.CI::index
+      IL_0026:  stfld      int32 JitTest_hanoi_etc_il.CI::index
       IL_002b:  ldloca.s   V_1
       IL_002d:  ldc.i4.3
       IL_002e:  ldarga.s   from
-      IL_0030:  ldfld      int32 JitTest.CI::index
+      IL_0030:  ldfld      int32 JitTest_hanoi_etc_il.CI::index
       IL_0035:  sub
       IL_0036:  ldarga.s   'to'
-      IL_0038:  ldfld      int32 JitTest.CI::index
+      IL_0038:  ldfld      int32 JitTest_hanoi_etc_il.CI::index
       IL_003d:  sub
-      IL_003e:  stfld      int32 JitTest.CI::index
+      IL_003e:  stfld      int32 JitTest_hanoi_etc_il.CI::index
       IL_0043:  ldloc.0
       IL_0044:  ldloc.1
       IL_0045:  ldarg.2
       IL_0046:  ldc.i4.1
       IL_0047:  sub
-      IL_0048:  call       void JitTest.Test::move(value class JitTest.CI,
-                                                   value class JitTest.CI,
+      IL_0048:  call       void JitTest_hanoi_etc_il.Test::move(value class JitTest_hanoi_etc_il.CI,
+                                                   value class JitTest_hanoi_etc_il.CI,
                                                    int32)
       IL_004d:  ldarg.0
       IL_004e:  ldarg.1
-      IL_004f:  call       void JitTest.Test::move1(value class JitTest.CI,
-                                                    value class JitTest.CI)
+      IL_004f:  call       void JitTest_hanoi_etc_il.Test::move1(value class JitTest_hanoi_etc_il.CI,
+                                                    value class JitTest_hanoi_etc_il.CI)
       IL_0054:  ldloca.s   V_0
       IL_0056:  ldc.i4.3
       IL_0057:  ldarga.s   from
-      IL_0059:  ldfld      int32 JitTest.CI::index
+      IL_0059:  ldfld      int32 JitTest_hanoi_etc_il.CI::index
       IL_005e:  sub
       IL_005f:  ldarga.s   'to'
-      IL_0061:  ldfld      int32 JitTest.CI::index
+      IL_0061:  ldfld      int32 JitTest_hanoi_etc_il.CI::index
       IL_0066:  sub
-      IL_0067:  stfld      int32 JitTest.CI::index
+      IL_0067:  stfld      int32 JitTest_hanoi_etc_il.CI::index
       IL_006c:  ldloca.s   V_1
       IL_006e:  ldarga.s   'to'
-      IL_0070:  ldfld      int32 JitTest.CI::index
-      IL_0075:  stfld      int32 JitTest.CI::index
+      IL_0070:  ldfld      int32 JitTest_hanoi_etc_il.CI::index
+      IL_0075:  stfld      int32 JitTest_hanoi_etc_il.CI::index
       IL_007a:  ldloc.0
       IL_007b:  ldloc.1
       IL_007c:  ldarg.2
       IL_007d:  ldc.i4.1
       IL_007e:  sub
-      IL_007f:  call       void JitTest.Test::move(value class JitTest.CI,
-                                                   value class JitTest.CI,
+      IL_007f:  call       void JitTest_hanoi_etc_il.Test::move(value class JitTest_hanoi_etc_il.CI,
+                                                   value class JitTest_hanoi_etc_il.CI,
                                                    int32)
       IL_0084:  ret
     } // end of method Test::move
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -214,8 +214,8 @@
       .zeroinit
       .locals (int32 V_0,
                int32 V_1,
-               value class JitTest.CI V_2,
-               value class JitTest.CI V_3,
+               value class JitTest_hanoi_etc_il.CI V_2,
+               value class JitTest_hanoi_etc_il.CI V_3,
                int32 V_4,
                int32[] V_5)
      
@@ -223,18 +223,18 @@
       IL_0011:  stloc.0
       IL_0012:  ldc.i4.3
       IL_0013:  newarr     int32[]
-      IL_0018:  stsfld     int32[][] JitTest.Test::cols
-      IL_001d:  ldsfld     int32[][] JitTest.Test::cols
+      IL_0018:  stsfld     int32[][] JitTest_hanoi_etc_il.Test::cols
+      IL_001d:  ldsfld     int32[][] JitTest_hanoi_etc_il.Test::cols
       IL_0022:  ldc.i4.0
       IL_0023:  ldloc.0
       IL_0024:  newarr     [mscorlib]System.Int32
       IL_0029:  stelem.ref
-      IL_002a:  ldsfld     int32[][] JitTest.Test::cols
+      IL_002a:  ldsfld     int32[][] JitTest_hanoi_etc_il.Test::cols
       IL_002f:  ldc.i4.1
       IL_0030:  ldloc.0
       IL_0031:  newarr     [mscorlib]System.Int32
       IL_0036:  stelem.ref
-      IL_0037:  ldsfld     int32[][] JitTest.Test::cols
+      IL_0037:  ldsfld     int32[][] JitTest_hanoi_etc_il.Test::cols
       IL_003c:  ldc.i4.2
       IL_003d:  ldloc.0
       IL_003e:  newarr     [mscorlib]System.Int32
@@ -247,12 +247,12 @@
       IL_004f:  ldloc.0
       IL_0050:  stelem.i4
       IL_0051:  ldloc.s    V_5
-      IL_0053:  stsfld     int32[] JitTest.Test::heights
+      IL_0053:  stsfld     int32[] JitTest_hanoi_etc_il.Test::heights
       IL_0058:  ldc.i4.0
       IL_0059:  stloc.1
       IL_005a:  br.s       IL_006c
 
-      IL_005c:  ldsfld     int32[][] JitTest.Test::cols
+      IL_005c:  ldsfld     int32[][] JitTest_hanoi_etc_il.Test::cols
       IL_0061:  ldc.i4.0
       IL_0062:  ldelem.ref
       IL_0063:  ldloc.1
@@ -268,18 +268,18 @@
       IL_006d:  ldloc.0
       IL_006e:  blt.s      IL_005c
 
-      IL_0070:  call       void JitTest.Test::test()
+      IL_0070:  call       void JitTest_hanoi_etc_il.Test::test()
       IL_0075:  ldloca.s   V_2
       IL_0077:  ldc.i4.0
-      IL_0078:  stfld      int32 JitTest.CI::index
+      IL_0078:  stfld      int32 JitTest_hanoi_etc_il.CI::index
       IL_007d:  ldloca.s   V_3
       IL_007f:  ldc.i4.1
-      IL_0080:  stfld      int32 JitTest.CI::index
+      IL_0080:  stfld      int32 JitTest_hanoi_etc_il.CI::index
       IL_0085:  ldloc.2
       IL_0086:  ldloc.3
       IL_0087:  ldloc.0
-      IL_0088:  call       void JitTest.Test::move(value class JitTest.CI,
-                                                   value class JitTest.CI,
+      IL_0088:  call       void JitTest_hanoi_etc_il.Test::move(value class JitTest_hanoi_etc_il.CI,
+                                                   value class JitTest_hanoi_etc_il.CI,
                                                    int32)
       ldc.i4 100
       ret
@@ -296,5 +296,5 @@
 
   } // end of class Test
 
-} // end of namespace JitTest
+} // end of namespace JitTest_hanoi_etc_il
 
diff --git a/src/tests/JIT/Methodical/VT/etc/hanoi2.il b/src/tests/JIT/Methodical/VT/etc/hanoi2.il
index ed0e38d700c02d..49bd6eacf53b2b 100644
--- a/src/tests/JIT/Methodical/VT/etc/hanoi2.il
+++ b/src/tests/JIT/Methodical/VT/etc/hanoi2.il
@@ -13,7 +13,7 @@
 {
 }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_hanoi2_etc_il
 {
   .class value private auto ansi sealed CI
          extends [mscorlib]System.ValueType
@@ -21,7 +21,7 @@
     .field public int32 index
   } // end of class CI
 
-  .class private auto ansi Test extends [mscorlib]System.Object
+  .class public auto ansi Test extends [mscorlib]System.Object
   {
     .field private static int32[][] cols
     .field private static int32[] heights
@@ -38,14 +38,14 @@
       IL_0005:  stloc.1
       IL_0006:  br.s       IL_0028
 
-      IL_0008:  ldsfld     int32[][] JitTest.Test::cols
+      IL_0008:  ldsfld     int32[][] JitTest_hanoi2_etc_il.Test::cols
       IL_000d:  ldloc.0
       IL_000e:  ldelem.ref
       IL_000f:  ldloc.1
       IL_0010:  ldc.i4.1
       IL_0011:  sub
       IL_0012:  ldelem.i4
-      IL_0013:  ldsfld     int32[][] JitTest.Test::cols
+      IL_0013:  ldsfld     int32[][] JitTest_hanoi2_etc_il.Test::cols
       IL_0018:  ldloc.0
       IL_0019:  ldelem.ref
       IL_001a:  ldloc.1
@@ -60,7 +60,7 @@
       IL_0026:  add
       IL_0027:  stloc.1
       IL_0028:  ldloc.1
-      IL_0029:  ldsfld     int32[] JitTest.Test::heights
+      IL_0029:  ldsfld     int32[] JitTest_hanoi2_etc_il.Test::heights
       IL_002e:  ldloc.0
       IL_002f:  ldelem.i4
       IL_0030:  blt.s      IL_0008
@@ -77,22 +77,22 @@
     } // end of method Test::test
 
     .method private hidebysig static void 
-            move1(value class JitTest.CI from,
-                  value class JitTest.CI 'to') il managed
+            move1(value class JitTest_hanoi2_etc_il.CI from,
+                  value class JitTest_hanoi2_etc_il.CI 'to') il managed
     {
       .maxstack  7
       .locals (int32[] V_0,
                int32 V_1,
                int32 V_2)
-      IL_0000:  ldsfld     int32[][] JitTest.Test::cols
+      IL_0000:  ldsfld     int32[][] JitTest_hanoi2_etc_il.Test::cols
       IL_0005:  ldarga.s   'to'
-      IL_0007:  ldfld      int32 JitTest.CI::index
+      IL_0007:  ldfld      int32 JitTest_hanoi2_etc_il.CI::index
       IL_000c:  ldelem.ref
-      IL_000d:  ldsfld     int32[] JitTest.Test::heights
+      IL_000d:  ldsfld     int32[] JitTest_hanoi2_etc_il.Test::heights
       IL_0012:  dup
       IL_0013:  stloc.0
       IL_0014:  ldarga.s   'to'
-      IL_0016:  ldfld      int32 JitTest.CI::index
+      IL_0016:  ldfld      int32 JitTest_hanoi2_etc_il.CI::index
       IL_001b:  dup
       IL_001c:  stloc.1
       IL_001d:  ldloc.0
@@ -104,15 +104,15 @@
       IL_0023:  add
       IL_0024:  stelem.i4
       IL_0025:  ldloc.2
-      IL_0026:  ldsfld     int32[][] JitTest.Test::cols
+      IL_0026:  ldsfld     int32[][] JitTest_hanoi2_etc_il.Test::cols
       IL_002b:  ldarga.s   from
-      IL_002d:  ldfld      int32 JitTest.CI::index
+      IL_002d:  ldfld      int32 JitTest_hanoi2_etc_il.CI::index
       IL_0032:  ldelem.ref
-      IL_0033:  ldsfld     int32[] JitTest.Test::heights
+      IL_0033:  ldsfld     int32[] JitTest_hanoi2_etc_il.Test::heights
       IL_0038:  dup
       IL_0039:  stloc.0
       IL_003a:  ldarga.s   from
-      IL_003c:  ldfld      int32 JitTest.CI::index
+      IL_003c:  ldfld      int32 JitTest_hanoi2_etc_il.CI::index
       IL_0041:  dup
       IL_0042:  stloc.1
       IL_0043:  ldloc.0
@@ -126,19 +126,19 @@
       IL_004b:  ldloc.2
       IL_004c:  ldelem.i4
       IL_004d:  stelem.i4
-      IL_004e:  call       void JitTest.Test::test()
+      IL_004e:  call       void JitTest_hanoi2_etc_il.Test::test()
       IL_0053:  ret
     } // end of method Test::move1
 
     .method private hidebysig static void 
-            move(value class JitTest.CI from,
-                 value class JitTest.CI 'to',
+            move(value class JitTest_hanoi2_etc_il.CI from,
+                 value class JitTest_hanoi2_etc_il.CI 'to',
                  int32 num) il managed
     {
 		.maxstack  8
-		.locals (value class JitTest.CI V)
+		.locals (value class JitTest_hanoi2_etc_il.CI V)
 		ldloca.s   V
-		initobj    JitTest.CI
+		initobj    JitTest_hanoi2_etc_il.CI
 
 		ldarg.2
 		ldc.i4.1
@@ -146,54 +146,54 @@
 
 		ldarg.0
 		ldarg.1
-		call       void JitTest.Test::move1(value class JitTest.CI, value class JitTest.CI)
+		call       void JitTest_hanoi2_etc_il.Test::move1(value class JitTest_hanoi2_etc_il.CI, value class JitTest_hanoi2_etc_il.CI)
 		ret
 
 IL_001d:
       	ldloca.s   V
 		ldarga.s   from
-		ldfld      int32 JitTest.CI::index
-		stfld      int32 JitTest.CI::index
+		ldfld      int32 JitTest_hanoi2_etc_il.CI::index
+		stfld      int32 JitTest_hanoi2_etc_il.CI::index
 		ldloc.0
 
 		ldloca.s   V
 		ldc.i4.3
 		ldarga.s   from
-		ldfld      int32 JitTest.CI::index
+		ldfld      int32 JitTest_hanoi2_etc_il.CI::index
 		sub
 		ldarga.s   'to'
-		ldfld      int32 JitTest.CI::index
+		ldfld      int32 JitTest_hanoi2_etc_il.CI::index
 		sub
-		stfld      int32 JitTest.CI::index
+		stfld      int32 JitTest_hanoi2_etc_il.CI::index
 		ldloc.0
 
 		ldarg.2
 		ldc.i4.1
 		sub
-		call       void JitTest.Test::move(value class JitTest.CI, value class JitTest.CI, int32)
+		call       void JitTest_hanoi2_etc_il.Test::move(value class JitTest_hanoi2_etc_il.CI, value class JitTest_hanoi2_etc_il.CI, int32)
 
 		ldarg.0
 		ldarg.1
-		call       void JitTest.Test::move1(value class JitTest.CI, value class JitTest.CI)
+		call       void JitTest_hanoi2_etc_il.Test::move1(value class JitTest_hanoi2_etc_il.CI, value class JitTest_hanoi2_etc_il.CI)
 
 		ldloc.0
                 
 		ldloca.s   V
 		ldarga.s   'to'
-		ldfld      int32 JitTest.CI::index
-		stfld      int32 JitTest.CI::index
+		ldfld      int32 JitTest_hanoi2_etc_il.CI::index
+		stfld      int32 JitTest_hanoi2_etc_il.CI::index
 		ldloc.0
 		                                    
 		ldarg.2
 		ldc.i4.1
 		sub
-		call       void JitTest.Test::move(value class JitTest.CI,
-                                                   value class JitTest.CI,
+		call       void JitTest_hanoi2_etc_il.Test::move(value class JitTest_hanoi2_etc_il.CI,
+                                                   value class JitTest_hanoi2_etc_il.CI,
                                                    int32)
 		ret
     } // end of method Test::move
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -203,30 +203,30 @@ IL_001d:
       .maxstack  4
       .locals (int32 V_0,
                int32 V_1,
-               value class JitTest.CI V_2,
-               value class JitTest.CI V_3,
+               value class JitTest_hanoi2_etc_il.CI V_2,
+               value class JitTest_hanoi2_etc_il.CI V_3,
                int32 V_4,
                int32[] V_5)
       IL_0000:  ldloca.s   V_2
-      IL_0002:  initobj    JitTest.CI
+      IL_0002:  initobj    JitTest_hanoi2_etc_il.CI
       IL_0008:  ldloca.s   V_3
-      IL_000a:  initobj    JitTest.CI
+      IL_000a:  initobj    JitTest_hanoi2_etc_il.CI
       IL_0010:  ldc.i4.4
       IL_0011:  stloc.0
       IL_0012:  ldc.i4.3
       IL_0013:  newarr     int32[]
-      IL_0018:  stsfld     int32[][] JitTest.Test::cols
-      IL_001d:  ldsfld     int32[][] JitTest.Test::cols
+      IL_0018:  stsfld     int32[][] JitTest_hanoi2_etc_il.Test::cols
+      IL_001d:  ldsfld     int32[][] JitTest_hanoi2_etc_il.Test::cols
       IL_0022:  ldc.i4.0
       IL_0023:  ldloc.0
       IL_0024:  newarr     [mscorlib]System.Int32
       IL_0029:  stelem.ref
-      IL_002a:  ldsfld     int32[][] JitTest.Test::cols
+      IL_002a:  ldsfld     int32[][] JitTest_hanoi2_etc_il.Test::cols
       IL_002f:  ldc.i4.1
       IL_0030:  ldloc.0
       IL_0031:  newarr     [mscorlib]System.Int32
       IL_0036:  stelem.ref
-      IL_0037:  ldsfld     int32[][] JitTest.Test::cols
+      IL_0037:  ldsfld     int32[][] JitTest_hanoi2_etc_il.Test::cols
       IL_003c:  ldc.i4.2
       IL_003d:  ldloc.0
       IL_003e:  newarr     [mscorlib]System.Int32
@@ -239,12 +239,12 @@ IL_001d:
       IL_004f:  ldloc.0
       IL_0050:  stelem.i4
       IL_0051:  ldloc.s    V_5
-      IL_0053:  stsfld     int32[] JitTest.Test::heights
+      IL_0053:  stsfld     int32[] JitTest_hanoi2_etc_il.Test::heights
       IL_0058:  ldc.i4.0
       IL_0059:  stloc.1
       IL_005a:  br.s       IL_006c
 
-      IL_005c:  ldsfld     int32[][] JitTest.Test::cols
+      IL_005c:  ldsfld     int32[][] JitTest_hanoi2_etc_il.Test::cols
       IL_0061:  ldc.i4.0
       IL_0062:  ldelem.ref
       IL_0063:  ldloc.1
@@ -260,18 +260,18 @@ IL_001d:
       IL_006d:  ldloc.0
       IL_006e:  blt.s      IL_005c
 
-      IL_0070:  call       void JitTest.Test::test()
+      IL_0070:  call       void JitTest_hanoi2_etc_il.Test::test()
       IL_0075:  ldloca.s   V_2
       IL_0077:  ldc.i4.0
-      IL_0078:  stfld      int32 JitTest.CI::index
+      IL_0078:  stfld      int32 JitTest_hanoi2_etc_il.CI::index
       IL_007d:  ldloca.s   V_3
       IL_007f:  ldc.i4.1
-      IL_0080:  stfld      int32 JitTest.CI::index
+      IL_0080:  stfld      int32 JitTest_hanoi2_etc_il.CI::index
       IL_0085:  ldloc.2
       IL_0086:  ldloc.3
       IL_0087:  ldloc.0
-      IL_0088:  call       void JitTest.Test::move(value class JitTest.CI,
-                                                   value class JitTest.CI,
+      IL_0088:  call       void JitTest_hanoi2_etc_il.Test::move(value class JitTest_hanoi2_etc_il.CI,
+                                                   value class JitTest_hanoi2_etc_il.CI,
                                                    int32)
 
       			ldc.i4 100
@@ -289,5 +289,5 @@ IL_001d:
 
   } // end of class Test
 
-} // end of namespace JitTest
+} // end of namespace JitTest_hanoi2_etc_il
 
diff --git a/src/tests/JIT/Methodical/VT/etc/hanoi2_il_d.ilproj b/src/tests/JIT/Methodical/VT/etc/hanoi2_il_d.ilproj
index c190bd0f616425..18cbb1ca9be0c9 100644
--- a/src/tests/JIT/Methodical/VT/etc/hanoi2_il_d.ilproj
+++ b/src/tests/JIT/Methodical/VT/etc/hanoi2_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/etc/hanoi2_il_r.ilproj b/src/tests/JIT/Methodical/VT/etc/hanoi2_il_r.ilproj
index 568748908e1edf..7d8a15903c6f41 100644
--- a/src/tests/JIT/Methodical/VT/etc/hanoi2_il_r.ilproj
+++ b/src/tests/JIT/Methodical/VT/etc/hanoi2_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/etc/hanoi_d.csproj b/src/tests/JIT/Methodical/VT/etc/hanoi_d.csproj
index 2ebb051e1486c8..c2bd380aa0eb9f 100644
--- a/src/tests/JIT/Methodical/VT/etc/hanoi_d.csproj
+++ b/src/tests/JIT/Methodical/VT/etc/hanoi_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/etc/hanoi_do.csproj b/src/tests/JIT/Methodical/VT/etc/hanoi_do.csproj
index 1bc25befa1df24..10e7c15e3dc63e 100644
--- a/src/tests/JIT/Methodical/VT/etc/hanoi_do.csproj
+++ b/src/tests/JIT/Methodical/VT/etc/hanoi_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/etc/hanoi_il_d.ilproj b/src/tests/JIT/Methodical/VT/etc/hanoi_il_d.ilproj
index c5250b297b920c..55cff3e634dc44 100644
--- a/src/tests/JIT/Methodical/VT/etc/hanoi_il_d.ilproj
+++ b/src/tests/JIT/Methodical/VT/etc/hanoi_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/etc/hanoi_il_r.ilproj b/src/tests/JIT/Methodical/VT/etc/hanoi_il_r.ilproj
index 7606fbcd0871fe..c3342b771fbcfc 100644
--- a/src/tests/JIT/Methodical/VT/etc/hanoi_il_r.ilproj
+++ b/src/tests/JIT/Methodical/VT/etc/hanoi_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/etc/hanoi_r.csproj b/src/tests/JIT/Methodical/VT/etc/hanoi_r.csproj
index 4ddd0f254abca8..1b5e30b28342b4 100644
--- a/src/tests/JIT/Methodical/VT/etc/hanoi_r.csproj
+++ b/src/tests/JIT/Methodical/VT/etc/hanoi_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/etc/hanoi_ro.csproj b/src/tests/JIT/Methodical/VT/etc/hanoi_ro.csproj
index 302e88b43b0f7f..321b98d9b55614 100644
--- a/src/tests/JIT/Methodical/VT/etc/hanoi_ro.csproj
+++ b/src/tests/JIT/Methodical/VT/etc/hanoi_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/etc/knight.cs b/src/tests/JIT/Methodical/VT/etc/knight.cs
index a94288717c1221..e474b3e5d8d93d 100644
--- a/src/tests/JIT/Methodical/VT/etc/knight.cs
+++ b/src/tests/JIT/Methodical/VT/etc/knight.cs
@@ -2,19 +2,21 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace KnightMove
+namespace KnightMove_knight_cs
 {
     internal struct MV
     {
         public int x, y;
         public int v;
     }
-    internal struct SQ
+    public struct SQ
     {
         public int visited;
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             const int SIZE = 5;
             const int VARNUM = 8;
diff --git a/src/tests/JIT/Methodical/VT/etc/knight.il b/src/tests/JIT/Methodical/VT/etc/knight.il
index 17331c7cee7475..cc14b49deb9497 100644
--- a/src/tests/JIT/Methodical/VT/etc/knight.il
+++ b/src/tests/JIT/Methodical/VT/etc/knight.il
@@ -19,7 +19,7 @@
 
 .file alignment 512
 
-.namespace KnightMove
+.namespace KnightMove_knight_il
 {
   .class private sequential ansi sealed beforefieldinit MV
          extends [mscorlib]System.ValueType
@@ -29,11 +29,11 @@
     .field public int32 v
   } // end of class MV
 
-  .class private sequential ansi sealed beforefieldinit SQ
+  .class public sequential ansi sealed beforefieldinit SQ
          extends [mscorlib]System.ValueType
   {
     .field public int32 visited
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() cil managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -41,10 +41,10 @@
       )
       .entrypoint
       .maxstack  4
-      .locals (valuetype KnightMove.SQ[0...,0...] V_0,
+      .locals (valuetype KnightMove_knight_il.SQ[0...,0...] V_0,
                int32[] V_1,
                int32[] V_2,
-               valuetype KnightMove.MV[] V_3,
+               valuetype KnightMove_knight_il.MV[] V_3,
                int32 V_4,
                int32 V_5,
                int32 V_6,
@@ -54,7 +54,7 @@
                int32 V_10)
       IL_0000:  ldc.i4.5
       IL_0001:  ldc.i4.5
-      IL_0002:  newobj     instance void valuetype KnightMove.SQ[0...,0...]::.ctor(int32,
+      IL_0002:  newobj     instance void valuetype KnightMove_knight_il.SQ[0...,0...]::.ctor(int32,
                                                                                    int32)
       IL_0007:  stloc.0
       IL_0008:  ldc.i4.8
@@ -72,33 +72,33 @@
                                                                                                           valuetype [mscorlib]System.RuntimeFieldHandle)
       IL_002b:  stloc.2
       IL_002c:  ldc.i4.s   25
-      IL_002e:  newarr     KnightMove.MV
+      IL_002e:  newarr     KnightMove_knight_il.MV
       IL_0033:  stloc.3
       IL_0034:  ldloc.0
       IL_0035:  ldc.i4.0
       IL_0036:  ldc.i4.0
-      IL_0037:  call       instance valuetype KnightMove.SQ& valuetype KnightMove.SQ[0...,0...]::Address(int32,
+      IL_0037:  call       instance valuetype KnightMove_knight_il.SQ& valuetype KnightMove_knight_il.SQ[0...,0...]::Address(int32,
                                                                                                          int32)
       IL_003c:  ldc.i4.1
-      IL_003d:  stfld      int32 KnightMove.SQ::visited
+      IL_003d:  stfld      int32 KnightMove_knight_il.SQ::visited
       IL_0042:  ldloc.3
       IL_0043:  ldc.i4.0
-      IL_0044:  ldelema    KnightMove.MV
+      IL_0044:  ldelema    KnightMove_knight_il.MV
       IL_0049:  ldc.i4.0
-      IL_004a:  stfld      int32 KnightMove.MV::x
+      IL_004a:  stfld      int32 KnightMove_knight_il.MV::x
       IL_004f:  ldloc.3
       IL_0050:  ldc.i4.0
-      IL_0051:  ldelema    KnightMove.MV
+      IL_0051:  ldelema    KnightMove_knight_il.MV
       IL_0056:  ldc.i4.0
-      IL_0057:  stfld      int32 KnightMove.MV::y
+      IL_0057:  stfld      int32 KnightMove_knight_il.MV::y
       IL_005c:  ldc.i4.1
       IL_005d:  stloc.s    V_4
       IL_005f:  br         IL_023e
 
       IL_0064:  ldloc.3
       IL_0065:  ldloc.s    V_4
-      IL_0067:  ldelema    KnightMove.MV
-      IL_006c:  ldfld      int32 KnightMove.MV::v
+      IL_0067:  ldelema    KnightMove_knight_il.MV
+      IL_006c:  ldfld      int32 KnightMove_knight_il.MV::v
       IL_0071:  ldc.i4.8
       IL_0072:  blt        IL_0104
 
@@ -118,15 +118,15 @@
       IL_0093:  ldloc.0
       IL_0094:  ldloc.3
       IL_0095:  ldloc.s    V_4
-      IL_0097:  ldelema    KnightMove.MV
-      IL_009c:  ldfld      int32 KnightMove.MV::x
+      IL_0097:  ldelema    KnightMove_knight_il.MV
+      IL_009c:  ldfld      int32 KnightMove_knight_il.MV::x
       IL_00a1:  ldloc.3
       IL_00a2:  ldloc.s    V_4
-      IL_00a4:  ldelema    KnightMove.MV
-      IL_00a9:  ldfld      int32 KnightMove.MV::y
-      IL_00ae:  call       instance valuetype KnightMove.SQ& valuetype KnightMove.SQ[0...,0...]::Address(int32,
+      IL_00a4:  ldelema    KnightMove_knight_il.MV
+      IL_00a9:  ldfld      int32 KnightMove_knight_il.MV::y
+      IL_00ae:  call       instance valuetype KnightMove_knight_il.SQ& valuetype KnightMove_knight_il.SQ[0...,0...]::Address(int32,
                                                                                                          int32)
-      IL_00b3:  ldfld      int32 KnightMove.SQ::visited
+      IL_00b3:  ldfld      int32 KnightMove_knight_il.SQ::visited
       IL_00b8:  ldloc.s    V_4
       IL_00ba:  ldc.i4.1
       IL_00bb:  add
@@ -138,37 +138,37 @@
       IL_00c4:  ldloc.0
       IL_00c5:  ldloc.3
       IL_00c6:  ldloc.s    V_4
-      IL_00c8:  ldelema    KnightMove.MV
-      IL_00cd:  ldfld      int32 KnightMove.MV::x
+      IL_00c8:  ldelema    KnightMove_knight_il.MV
+      IL_00cd:  ldfld      int32 KnightMove_knight_il.MV::x
       IL_00d2:  ldloc.3
       IL_00d3:  ldloc.s    V_4
-      IL_00d5:  ldelema    KnightMove.MV
-      IL_00da:  ldfld      int32 KnightMove.MV::y
-      IL_00df:  call       instance valuetype KnightMove.SQ& valuetype KnightMove.SQ[0...,0...]::Address(int32,
+      IL_00d5:  ldelema    KnightMove_knight_il.MV
+      IL_00da:  ldfld      int32 KnightMove_knight_il.MV::y
+      IL_00df:  call       instance valuetype KnightMove_knight_il.SQ& valuetype KnightMove_knight_il.SQ[0...,0...]::Address(int32,
                                                                                                          int32)
       IL_00e4:  ldc.i4.0
-      IL_00e5:  stfld      int32 KnightMove.SQ::visited
+      IL_00e5:  stfld      int32 KnightMove_knight_il.SQ::visited
       IL_00ea:  ldloc.3
       IL_00eb:  ldloc.s    V_4
-      IL_00ed:  ldelema    KnightMove.MV
+      IL_00ed:  ldelema    KnightMove_knight_il.MV
       IL_00f2:  dup
-      IL_00f3:  ldfld      int32 KnightMove.MV::v
+      IL_00f3:  ldfld      int32 KnightMove_knight_il.MV::v
       IL_00f8:  ldc.i4.1
       IL_00f9:  add
-      IL_00fa:  stfld      int32 KnightMove.MV::v
+      IL_00fa:  stfld      int32 KnightMove_knight_il.MV::v
       IL_00ff:  br         IL_023e
 
       IL_0104:  ldloc.3
       IL_0105:  ldloc.s    V_4
       IL_0107:  ldc.i4.1
       IL_0108:  sub
-      IL_0109:  ldelema    KnightMove.MV
-      IL_010e:  ldfld      int32 KnightMove.MV::x
+      IL_0109:  ldelema    KnightMove_knight_il.MV
+      IL_010e:  ldfld      int32 KnightMove_knight_il.MV::x
       IL_0113:  ldloc.1
       IL_0114:  ldloc.3
       IL_0115:  ldloc.s    V_4
-      IL_0117:  ldelema    KnightMove.MV
-      IL_011c:  ldfld      int32 KnightMove.MV::v
+      IL_0117:  ldelema    KnightMove_knight_il.MV
+      IL_011c:  ldfld      int32 KnightMove_knight_il.MV::v
       IL_0121:  ldelem.i4
       IL_0122:  add
       IL_0123:  stloc.s    V_5
@@ -176,13 +176,13 @@
       IL_0126:  ldloc.s    V_4
       IL_0128:  ldc.i4.1
       IL_0129:  sub
-      IL_012a:  ldelema    KnightMove.MV
-      IL_012f:  ldfld      int32 KnightMove.MV::y
+      IL_012a:  ldelema    KnightMove_knight_il.MV
+      IL_012f:  ldfld      int32 KnightMove_knight_il.MV::y
       IL_0134:  ldloc.2
       IL_0135:  ldloc.3
       IL_0136:  ldloc.s    V_4
-      IL_0138:  ldelema    KnightMove.MV
-      IL_013d:  ldfld      int32 KnightMove.MV::v
+      IL_0138:  ldelema    KnightMove_knight_il.MV
+      IL_013d:  ldfld      int32 KnightMove_knight_il.MV::v
       IL_0142:  ldelem.i4
       IL_0143:  add
       IL_0144:  stloc.s    V_6
@@ -205,42 +205,42 @@
       IL_015a:  ldloc.0
       IL_015b:  ldloc.s    V_5
       IL_015d:  ldloc.s    V_6
-      IL_015f:  call       instance valuetype KnightMove.SQ& valuetype KnightMove.SQ[0...,0...]::Address(int32,
+      IL_015f:  call       instance valuetype KnightMove_knight_il.SQ& valuetype KnightMove_knight_il.SQ[0...,0...]::Address(int32,
                                                                                                          int32)
-      IL_0164:  ldfld      int32 KnightMove.SQ::visited
+      IL_0164:  ldfld      int32 KnightMove_knight_il.SQ::visited
       IL_0169:  brfalse.s  IL_0185
 
       IL_016b:  ldloc.3
       IL_016c:  ldloc.s    V_4
-      IL_016e:  ldelema    KnightMove.MV
+      IL_016e:  ldelema    KnightMove_knight_il.MV
       IL_0173:  dup
-      IL_0174:  ldfld      int32 KnightMove.MV::v
+      IL_0174:  ldfld      int32 KnightMove_knight_il.MV::v
       IL_0179:  ldc.i4.1
       IL_017a:  add
-      IL_017b:  stfld      int32 KnightMove.MV::v
+      IL_017b:  stfld      int32 KnightMove_knight_il.MV::v
       IL_0180:  br         IL_023e
 
       IL_0185:  ldloc.3
       IL_0186:  ldloc.s    V_4
-      IL_0188:  ldelema    KnightMove.MV
+      IL_0188:  ldelema    KnightMove_knight_il.MV
       IL_018d:  ldloc.s    V_5
-      IL_018f:  stfld      int32 KnightMove.MV::x
+      IL_018f:  stfld      int32 KnightMove_knight_il.MV::x
       IL_0194:  ldloc.3
       IL_0195:  ldloc.s    V_4
       IL_0197:  dup
       IL_0198:  ldc.i4.1
       IL_0199:  add
       IL_019a:  stloc.s    V_4
-      IL_019c:  ldelema    KnightMove.MV
+      IL_019c:  ldelema    KnightMove_knight_il.MV
       IL_01a1:  ldloc.s    V_6
-      IL_01a3:  stfld      int32 KnightMove.MV::y
+      IL_01a3:  stfld      int32 KnightMove_knight_il.MV::y
       IL_01a8:  ldloc.0
       IL_01a9:  ldloc.s    V_5
       IL_01ab:  ldloc.s    V_6
-      IL_01ad:  call       instance valuetype KnightMove.SQ& valuetype KnightMove.SQ[0...,0...]::Address(int32,
+      IL_01ad:  call       instance valuetype KnightMove_knight_il.SQ& valuetype KnightMove_knight_il.SQ[0...,0...]::Address(int32,
                                                                                                          int32)
       IL_01b2:  ldloc.s    V_4
-      IL_01b4:  stfld      int32 KnightMove.SQ::visited
+      IL_01b4:  stfld      int32 KnightMove_knight_il.SQ::visited
       IL_01b9:  ldloc.s    V_4
       IL_01bb:  ldc.i4.s   25
       IL_01bd:  bne.un.s   IL_0230
@@ -258,9 +258,9 @@
       IL_01d3:  ldloc.0
       IL_01d4:  ldloc.s    V_7
       IL_01d6:  ldloc.s    V_8
-      IL_01d8:  call       instance valuetype KnightMove.SQ& valuetype KnightMove.SQ[0...,0...]::Address(int32,
+      IL_01d8:  call       instance valuetype KnightMove_knight_il.SQ& valuetype KnightMove_knight_il.SQ[0...,0...]::Address(int32,
                                                                                                          int32)
-      IL_01dd:  ldflda     int32 KnightMove.SQ::visited
+      IL_01dd:  ldflda     int32 KnightMove_knight_il.SQ::visited
       IL_01e2:  call       instance string [mscorlib]System.Int32::ToString()
       IL_01e7:  stloc.s    V_9
       IL_01e9:  ldloc.s    V_9
@@ -301,9 +301,9 @@
 
       IL_0230:  ldloc.3
       IL_0231:  ldloc.s    V_4
-      IL_0233:  ldelema    KnightMove.MV
+      IL_0233:  ldelema    KnightMove_knight_il.MV
       IL_0238:  ldc.i4.0
-      IL_0239:  stfld      int32 KnightMove.MV::v
+      IL_0239:  stfld      int32 KnightMove_knight_il.MV::v
       IL_023e:  br         IL_0064
 
       IL_0243:  ldloc.s    V_10
@@ -312,7 +312,7 @@
 
   } // end of class SQ
 
-} // end of namespace KnightMove
+} // end of namespace KnightMove_knight_il
 
 .class private auto ansi '<PrivateImplementationDetails>'
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Methodical/VT/etc/knight_d.csproj b/src/tests/JIT/Methodical/VT/etc/knight_d.csproj
index 083291ab8b515f..05e0e7966e760c 100644
--- a/src/tests/JIT/Methodical/VT/etc/knight_d.csproj
+++ b/src/tests/JIT/Methodical/VT/etc/knight_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/etc/knight_do.csproj b/src/tests/JIT/Methodical/VT/etc/knight_do.csproj
index f79c0307cee4a5..31f54077db103c 100644
--- a/src/tests/JIT/Methodical/VT/etc/knight_do.csproj
+++ b/src/tests/JIT/Methodical/VT/etc/knight_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/etc/knight_il_d.ilproj b/src/tests/JIT/Methodical/VT/etc/knight_il_d.ilproj
index 6c1d3609daccbd..6f8fb916c092d3 100644
--- a/src/tests/JIT/Methodical/VT/etc/knight_il_d.ilproj
+++ b/src/tests/JIT/Methodical/VT/etc/knight_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/etc/knight_il_r.ilproj b/src/tests/JIT/Methodical/VT/etc/knight_il_r.ilproj
index 3d6dc1a92ebe66..90dac0de038ee9 100644
--- a/src/tests/JIT/Methodical/VT/etc/knight_il_r.ilproj
+++ b/src/tests/JIT/Methodical/VT/etc/knight_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/etc/knight_r.csproj b/src/tests/JIT/Methodical/VT/etc/knight_r.csproj
index bd8a63f0d76bac..b72aeeee2b0ee3 100644
--- a/src/tests/JIT/Methodical/VT/etc/knight_r.csproj
+++ b/src/tests/JIT/Methodical/VT/etc/knight_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/etc/knight_ro.csproj b/src/tests/JIT/Methodical/VT/etc/knight_ro.csproj
index 611ba127a98d30..bde2fd075ff25f 100644
--- a/src/tests/JIT/Methodical/VT/etc/knight_ro.csproj
+++ b/src/tests/JIT/Methodical/VT/etc/knight_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/etc/nested.cs b/src/tests/JIT/Methodical/VT/etc/nested.cs
index 31ec394f13b5f7..39a718d0283da8 100644
--- a/src/tests/JIT/Methodical/VT/etc/nested.cs
+++ b/src/tests/JIT/Methodical/VT/etc/nested.cs
@@ -2,8 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_nested_etc_cs
 {
     internal struct Struct1
     {
@@ -26,9 +27,10 @@ public void Verify()
         }
     }
 
-    internal class Test
+    public class Test
     {
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             Struct1 str1 = new Struct1();
             TypedReference _ref = __makeref(str1);
diff --git a/src/tests/JIT/Methodical/VT/etc/nested.il b/src/tests/JIT/Methodical/VT/etc/nested.il
index de7b4934f10f4c..a5874ccca658d8 100644
--- a/src/tests/JIT/Methodical/VT/etc/nested.il
+++ b/src/tests/JIT/Methodical/VT/etc/nested.il
@@ -12,7 +12,7 @@
 {
 }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_nested_etc_il
 {
   .class value private auto ansi sealed Struct1
          extends [mscorlib]System.ValueType
@@ -27,11 +27,11 @@
       {
         .maxstack  8
         IL_0000:  ldarg.0
-        IL_0001:  ldfld      int32 JitTest.Struct1/Struct1$Struct2::m_i2
+        IL_0001:  ldfld      int32 JitTest_nested_etc_il.Struct1/Struct1$Struct2::m_i2
         IL_0006:  brtrue.s   IL_0012
 
         IL_0008:  ldarg.0
-        IL_0009:  ldfld      int64 JitTest.Struct1/Struct1$Struct2::m_l2
+        IL_0009:  ldfld      int64 JitTest_nested_etc_il.Struct1/Struct1$Struct2::m_l2
         IL_000e:  ldc.i4.0
         IL_000f:  conv.i8
         IL_0010:  beq.s      IL_0018
@@ -46,17 +46,17 @@
 
     .field private int32 m_i1
     .field private int64 m_l1
-    .field public value class JitTest.Struct1/Struct1$Struct2 m_str2
+    .field public value class JitTest_nested_etc_il.Struct1/Struct1$Struct2 m_str2
     .method public hidebysig instance void
             Verify() il managed
     {
       .maxstack  8
       IL_0000:  ldarg.0
-      IL_0001:  ldfld      int32 JitTest.Struct1::m_i1
+      IL_0001:  ldfld      int32 JitTest_nested_etc_il.Struct1::m_i1
       IL_0006:  brtrue.s   IL_0012
 
       IL_0008:  ldarg.0
-      IL_0009:  ldfld      int64 JitTest.Struct1::m_l1
+      IL_0009:  ldfld      int64 JitTest_nested_etc_il.Struct1::m_l1
       IL_000e:  ldc.i4.0
       IL_000f:  conv.i8
       IL_0010:  beq.s      IL_0018
@@ -65,17 +65,17 @@
       IL_0017:  throw
 
       IL_0018:  ldarg.0
-      IL_0019:  ldflda     value class JitTest.Struct1/Struct1$Struct2 JitTest.Struct1::m_str2
-      IL_001e:  call       instance void JitTest.Struct1/Struct1$Struct2::Verify()
+      IL_0019:  ldflda     value class JitTest_nested_etc_il.Struct1/Struct1$Struct2 JitTest_nested_etc_il.Struct1::m_str2
+      IL_001e:  call       instance void JitTest_nested_etc_il.Struct1/Struct1$Struct2::Verify()
       IL_0023:  ret
     } // end of method Struct1::Verify
 
   } // end of class Struct1
 
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends [mscorlib]System.Object
   {
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -83,26 +83,26 @@
       )
       .entrypoint
       .maxstack  1
-      .locals (value class JitTest.Struct1 V_0,
+      .locals (value class JitTest_nested_etc_il.Struct1 V_0,
                typedref V_1,
-               value class JitTest.Struct1/Struct1$Struct2 V_2)
+               value class JitTest_nested_etc_il.Struct1/Struct1$Struct2 V_2)
       IL_0000:  ldloca.s   V_0
-      IL_0002:  initobj    JitTest.Struct1
+      IL_0002:  initobj    JitTest_nested_etc_il.Struct1
       IL_0008:  ldloca.s   V_0
-      IL_000a:  mkrefany   JitTest.Struct1
-      IL_0011:  refanyval  JitTest.Struct1
-      IL_0016:  ldobj      JitTest.Struct1
+      IL_000a:  mkrefany   JitTest_nested_etc_il.Struct1
+      IL_0011:  refanyval  JitTest_nested_etc_il.Struct1
+      IL_0016:  ldobj      JitTest_nested_etc_il.Struct1
       IL_001b:  stloc.0
       IL_001c:  ldloca.s   V_0
-      IL_001e:  call       instance void JitTest.Struct1::Verify()
+      IL_001e:  call       instance void JitTest_nested_etc_il.Struct1::Verify()
       IL_0023:  ldloca.s   V_0
-      IL_0025:  ldflda     value class JitTest.Struct1/Struct1$Struct2 JitTest.Struct1::m_str2
-      IL_002a:  mkrefany   JitTest.Struct1/Struct1$Struct2
-      IL_0031:  refanyval  JitTest.Struct1/Struct1$Struct2
-      IL_0036:  ldobj      JitTest.Struct1/Struct1$Struct2
+      IL_0025:  ldflda     value class JitTest_nested_etc_il.Struct1/Struct1$Struct2 JitTest_nested_etc_il.Struct1::m_str2
+      IL_002a:  mkrefany   JitTest_nested_etc_il.Struct1/Struct1$Struct2
+      IL_0031:  refanyval  JitTest_nested_etc_il.Struct1/Struct1$Struct2
+      IL_0036:  ldobj      JitTest_nested_etc_il.Struct1/Struct1$Struct2
       IL_003b:  stloc.2
       IL_003c:  ldloca.s   V_2
-      IL_003e:  call       instance void JitTest.Struct1/Struct1$Struct2::Verify()
+      IL_003e:  call       instance void JitTest_nested_etc_il.Struct1/Struct1$Struct2::Verify()
       			ldc.i4 100
       IL_0043:  ret
     } // end of method Test::Main
@@ -118,5 +118,5 @@
 
   } // end of class Test
 
-} // end of namespace JitTest
+} // end of namespace JitTest_nested_etc_il
 
diff --git a/src/tests/JIT/Methodical/VT/etc/nested_d.csproj b/src/tests/JIT/Methodical/VT/etc/nested_d.csproj
index f4b005d52a8a23..77815ce743f0a8 100644
--- a/src/tests/JIT/Methodical/VT/etc/nested_d.csproj
+++ b/src/tests/JIT/Methodical/VT/etc/nested_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/etc/nested_do.csproj b/src/tests/JIT/Methodical/VT/etc/nested_do.csproj
index ab1a08f664ab39..40c2ad576daaac 100644
--- a/src/tests/JIT/Methodical/VT/etc/nested_do.csproj
+++ b/src/tests/JIT/Methodical/VT/etc/nested_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/etc/nested_il_d.ilproj b/src/tests/JIT/Methodical/VT/etc/nested_il_d.ilproj
index bcece79a16a8c3..6cb01649686ba0 100644
--- a/src/tests/JIT/Methodical/VT/etc/nested_il_d.ilproj
+++ b/src/tests/JIT/Methodical/VT/etc/nested_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/etc/nested_il_r.ilproj b/src/tests/JIT/Methodical/VT/etc/nested_il_r.ilproj
index 3f004be14de756..6bac7017a0fd7e 100644
--- a/src/tests/JIT/Methodical/VT/etc/nested_il_r.ilproj
+++ b/src/tests/JIT/Methodical/VT/etc/nested_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/etc/nested_r.csproj b/src/tests/JIT/Methodical/VT/etc/nested_r.csproj
index d9de37e01f304a..fdc17935b00f1e 100644
--- a/src/tests/JIT/Methodical/VT/etc/nested_r.csproj
+++ b/src/tests/JIT/Methodical/VT/etc/nested_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/etc/nested_ro.csproj b/src/tests/JIT/Methodical/VT/etc/nested_ro.csproj
index a8fadf95a1cb58..fe4a0d1e957be3 100644
--- a/src/tests/JIT/Methodical/VT/etc/nested_ro.csproj
+++ b/src/tests/JIT/Methodical/VT/etc/nested_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/identity/accum.cs b/src/tests/JIT/Methodical/VT/identity/accum.cs
index 4e04590b14eb3d..32b24fef345e05 100644
--- a/src/tests/JIT/Methodical/VT/identity/accum.cs
+++ b/src/tests/JIT/Methodical/VT/identity/accum.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_accum_cs
 {
-    internal struct CI
+    public struct CI
     {
         private int _m_v;
 
@@ -16,7 +17,8 @@ private static int test(CI c1, CI c2, CI c3, int dummy, CI c4, CI c5)
             return c1._m_v + c2._m_v + c3._m_v + c4._m_v + c5._m_v;
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             CI c = new CI();
             return 100 + test(c, c, c, 0, c, c);
diff --git a/src/tests/JIT/Methodical/VT/identity/accum.il b/src/tests/JIT/Methodical/VT/identity/accum.il
index 3a97c663216364..428bae38560613 100644
--- a/src/tests/JIT/Methodical/VT/identity/accum.il
+++ b/src/tests/JIT/Methodical/VT/identity/accum.il
@@ -17,31 +17,31 @@
 }
 .assembly extern xunit.core {}
 // MVID: {2D7E75FB-9B3C-4E6C-BB98-C8ADCFF67713}
-.namespace JitTest
+.namespace JitTest_accum_il
 {
-  .class value private auto ansi sealed CI extends [mscorlib]System.ValueType
+  .class value public auto ansi sealed CI extends [mscorlib]System.ValueType
   {
     .field private int32 m_v
     .method private hidebysig static int32 
-            test(value class JitTest.CI c1,
-                 value class JitTest.CI c2,
-                 value class JitTest.CI c3,
+            test(value class JitTest_accum_il.CI c1,
+                 value class JitTest_accum_il.CI c2,
+                 value class JitTest_accum_il.CI c3,
                  int32 dummy,
-                 value class JitTest.CI c4,
-                 value class JitTest.CI c5) il managed
+                 value class JitTest_accum_il.CI c4,
+                 value class JitTest_accum_il.CI c5) il managed
     {
       // Code size       44 (0x2c)
       .maxstack  5
       IL_0000:  ldarga.s   c1
-      IL_0002:  ldfld      int32 JitTest.CI::m_v
+      IL_0002:  ldfld      int32 JitTest_accum_il.CI::m_v
       IL_0007:  ldarga.s   c2
-      IL_0009:  ldfld      int32 JitTest.CI::m_v
+      IL_0009:  ldfld      int32 JitTest_accum_il.CI::m_v
       IL_000f:  ldarga.s   c3
-      IL_0011:  ldfld      int32 JitTest.CI::m_v
+      IL_0011:  ldfld      int32 JitTest_accum_il.CI::m_v
       IL_0017:  ldarga.s   c4
-      IL_0019:  ldfld      int32 JitTest.CI::m_v
+      IL_0019:  ldfld      int32 JitTest_accum_il.CI::m_v
       IL_001f:  ldarga.s   c5
-      IL_0021:  ldfld      int32 JitTest.CI::m_v
+      IL_0021:  ldfld      int32 JitTest_accum_il.CI::m_v
       IL_0026:  add
       IL_001e:  add
       IL_000e:  add
@@ -49,7 +49,7 @@
       IL_002b:  ret
     } // end of method CI::test
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -58,51 +58,51 @@
       .entrypoint
       // Code size       27 (0x1b)
       .maxstack  8
-      .locals (value class JitTest.CI V)
+      .locals (value class JitTest_accum_il.CI V)
       			ldloca.s   V
-      			initobj    JitTest.CI
+      			initobj    JitTest_accum_il.CI
       			
       			ldc.i4.s   100
       	
       			ldloca.s   V
       			ldc.i4.1
-      			stfld		int32 JitTest.CI::m_v
+      			stfld		int32 JitTest_accum_il.CI::m_v
 				ldloc.0
       
       			ldloca.s   V
       			ldc.i4.2
-      			stfld		int32 JitTest.CI::m_v
+      			stfld		int32 JitTest_accum_il.CI::m_v
       			ldloc.0
             
       			ldloca.s   V
       			ldc.i4.3
-      			stfld		int32 JitTest.CI::m_v
+      			stfld		int32 JitTest_accum_il.CI::m_v
       			ldloc.0
       
       			ldc.i4.0
       
       			ldloca.s   V
       			ldc.i4.4
-      			stfld		int32 JitTest.CI::m_v
+      			stfld		int32 JitTest_accum_il.CI::m_v
       			ldloc.0
       
       			ldloca.s   V
       			ldc.i4 -10
-      			stfld		int32 JitTest.CI::m_v
+      			stfld		int32 JitTest_accum_il.CI::m_v
       			ldloc.0
       			
-      			call       int32 JitTest.CI::test(value class JitTest.CI,
-                                                  value class JitTest.CI,
-                                                  value class JitTest.CI,
+      			call       int32 JitTest_accum_il.CI::test(value class JitTest_accum_il.CI,
+                                                  value class JitTest_accum_il.CI,
+                                                  value class JitTest_accum_il.CI,
                                                   int32,
-                                                  value class JitTest.CI,
-                                                  value class JitTest.CI)
+                                                  value class JitTest_accum_il.CI,
+                                                  value class JitTest_accum_il.CI)
       IL_0015:  add
       IL_001a:  ret
     } // end of method CI::Main
 
   } // end of class CI
 
-} // end of namespace JitTest
+} // end of namespace JitTest_accum_il
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/VT/identity/accum_d.csproj b/src/tests/JIT/Methodical/VT/identity/accum_d.csproj
index 36316256f99cd5..de0ec314d449e5 100644
--- a/src/tests/JIT/Methodical/VT/identity/accum_d.csproj
+++ b/src/tests/JIT/Methodical/VT/identity/accum_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/identity/accum_do.csproj b/src/tests/JIT/Methodical/VT/identity/accum_do.csproj
index 730d192d9c4321..a958230147e7b3 100644
--- a/src/tests/JIT/Methodical/VT/identity/accum_do.csproj
+++ b/src/tests/JIT/Methodical/VT/identity/accum_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/identity/accum_il_d.ilproj b/src/tests/JIT/Methodical/VT/identity/accum_il_d.ilproj
index ba0d500916b8d3..d29cc0bb7978cf 100644
--- a/src/tests/JIT/Methodical/VT/identity/accum_il_d.ilproj
+++ b/src/tests/JIT/Methodical/VT/identity/accum_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/identity/accum_il_r.ilproj b/src/tests/JIT/Methodical/VT/identity/accum_il_r.ilproj
index 3bbdfeb7ba3f9d..60fbff21914749 100644
--- a/src/tests/JIT/Methodical/VT/identity/accum_il_r.ilproj
+++ b/src/tests/JIT/Methodical/VT/identity/accum_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/identity/accum_r.csproj b/src/tests/JIT/Methodical/VT/identity/accum_r.csproj
index e8d0307dbea566..26613268f5c3ea 100644
--- a/src/tests/JIT/Methodical/VT/identity/accum_r.csproj
+++ b/src/tests/JIT/Methodical/VT/identity/accum_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/identity/accum_ro.csproj b/src/tests/JIT/Methodical/VT/identity/accum_ro.csproj
index ff0176ae271f90..92609f43678b92 100644
--- a/src/tests/JIT/Methodical/VT/identity/accum_ro.csproj
+++ b/src/tests/JIT/Methodical/VT/identity/accum_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/identity/livecall.il b/src/tests/JIT/Methodical/VT/identity/livecall.il
index e6589dc48ab9be..0abe4382ebb5db 100644
--- a/src/tests/JIT/Methodical/VT/identity/livecall.il
+++ b/src/tests/JIT/Methodical/VT/identity/livecall.il
@@ -17,24 +17,24 @@
 }
 .assembly extern xunit.core {}
 // MVID: {6300FB9B-B24E-45DA-9A61-2556746FEEEF}
-.namespace MS
+.namespace MS_livecall_il
 {
-  .class value private auto ansi sealed VT
+  .class value public auto ansi sealed VT
          extends [mscorlib]System.ValueType
   {
     .field private float64 v
     .method private hidebysig static void 
-            DoAnything(value class MS.VT& vt) il managed
+            DoAnything(value class MS_livecall_il.VT& vt) il managed
     {
       // Code size       16 (0x10)
       .maxstack  8
       IL_0000:  ldarg.0
       IL_0001:  ldc.r8     20.
-      IL_000a:  stfld      float64 MS.VT::v
+      IL_000a:  stfld      float64 MS_livecall_il.VT::v
       IL_000f:  ret
     } // end of method VT::DoAnything
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -43,19 +43,19 @@
       .entrypoint
       // Code size       74 (0x4a)
       .maxstack  2
-      .locals (value class MS.VT V_0, value class MS.VT V_1)
+      .locals (value class MS_livecall_il.VT V_0, value class MS_livecall_il.VT V_1)
       IL_0000:  ldloca.s   V_0
-      IL_0002:  initobj    MS.VT
+      IL_0002:  initobj    MS_livecall_il.VT
       IL_0008:  ldloca.s   V_0
       IL_000a:  ldc.r8     1.
-      IL_0013:  stfld      float64 MS.VT::v
+      IL_0013:  stfld      float64 MS_livecall_il.VT::v
       			ldloc.0
       IL_0018:  ldloca.s   V_0
-      IL_001a:  call       void MS.VT::DoAnything(value class MS.VT&)
+      IL_001a:  call       void MS_livecall_il.VT::DoAnything(value class MS_livecall_il.VT&)
       
       			stloc.1
       IL_001f:  ldloca.s   V_1
-      IL_0021:  ldfld      float64 MS.VT::v
+      IL_0021:  ldfld      float64 MS_livecall_il.VT::v
       IL_0026:  ldc.r8     1.
       IL_002f:  bne.un.s   IL_003e
 
@@ -72,6 +72,6 @@
 
   } // end of class VT
 
-} // end of namespace MS
+} // end of namespace MS_livecall_il
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/VT/identity/livecall_il_d.ilproj b/src/tests/JIT/Methodical/VT/identity/livecall_il_d.ilproj
index 52216a5719208e..cdbd250c853cc2 100644
--- a/src/tests/JIT/Methodical/VT/identity/livecall_il_d.ilproj
+++ b/src/tests/JIT/Methodical/VT/identity/livecall_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/identity/livecall_il_r.ilproj b/src/tests/JIT/Methodical/VT/identity/livecall_il_r.ilproj
index 88067e51922d19..f2aaa6d46b79eb 100644
--- a/src/tests/JIT/Methodical/VT/identity/livecall_il_r.ilproj
+++ b/src/tests/JIT/Methodical/VT/identity/livecall_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/identity/vcall.cs b/src/tests/JIT/Methodical/VT/identity/vcall.cs
index c3bea41cf9dd2e..f726df64c3f6f1 100644
--- a/src/tests/JIT/Methodical/VT/identity/vcall.cs
+++ b/src/tests/JIT/Methodical/VT/identity/vcall.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace MS
+namespace MS_vcall_cs
 {
-    internal struct VT
+    public struct VT
     {
         private int _v;
 
@@ -15,7 +16,8 @@ private static void Test(VT arg1, ref VT arg2)
             arg1._v = 10;
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             VT vt;
             vt._v = 99;
diff --git a/src/tests/JIT/Methodical/VT/identity/vcall_d.csproj b/src/tests/JIT/Methodical/VT/identity/vcall_d.csproj
index 05a15fe3942f51..b81a3dccd2cc1c 100644
--- a/src/tests/JIT/Methodical/VT/identity/vcall_d.csproj
+++ b/src/tests/JIT/Methodical/VT/identity/vcall_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/identity/vcall_do.csproj b/src/tests/JIT/Methodical/VT/identity/vcall_do.csproj
index b67ca946f185ab..bb381e5619268b 100644
--- a/src/tests/JIT/Methodical/VT/identity/vcall_do.csproj
+++ b/src/tests/JIT/Methodical/VT/identity/vcall_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/identity/vcall_r.csproj b/src/tests/JIT/Methodical/VT/identity/vcall_r.csproj
index 6494cbb1cea2a3..14b060119f4ec4 100644
--- a/src/tests/JIT/Methodical/VT/identity/vcall_r.csproj
+++ b/src/tests/JIT/Methodical/VT/identity/vcall_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/identity/vcall_ro.csproj b/src/tests/JIT/Methodical/VT/identity/vcall_ro.csproj
index 023a9c4f3cd79c..ed2bca4062315c 100644
--- a/src/tests/JIT/Methodical/VT/identity/vcall_ro.csproj
+++ b/src/tests/JIT/Methodical/VT/identity/vcall_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/identity/volatile.il b/src/tests/JIT/Methodical/VT/identity/volatile.il
index 433b9819ecb2c5..063b95388227ad 100644
--- a/src/tests/JIT/Methodical/VT/identity/volatile.il
+++ b/src/tests/JIT/Methodical/VT/identity/volatile.il
@@ -16,28 +16,28 @@
 }
 .assembly extern xunit.core {}
 // MVID: {A29CDE84-6701-43B3-B56A-DE8480CE7421}
-.namespace JitTest
+.namespace JitTest_volatile_il
 {
-  .class value private auto ansi sealed VT extends [mscorlib]System.ValueType
+  .class value public auto ansi sealed VT extends [mscorlib]System.ValueType
   {
   	.field public int32 m_n
-    .method private hidebysig static int32 Main() il managed
+    .method public hidebysig static int32 Main() il managed
     {
 		.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
 		    01 00 00 00
 		)
 		.entrypoint
 		.maxstack  8
-		.locals (value class JitTest.VT src, value class JitTest.VT dst)
+		.locals (value class JitTest_volatile_il.VT src, value class JitTest_volatile_il.VT dst)
 		ldloca src
-		initobj JitTest.VT
+		initobj JitTest_volatile_il.VT
 		ldloc src
 		ldloca src
 		ldc.i4 1000
-		stfld int32 JitTest.VT::m_n
+		stfld int32 JitTest_volatile_il.VT::m_n
 		stloc dst
 		ldloca dst
-		ldfld int32 JitTest.VT::m_n
+		ldfld int32 JitTest_volatile_il.VT::m_n
 		dup
 		call void [System.Console]System.Console::WriteLine(int32)
 		ldc.i4 100
@@ -47,6 +47,6 @@
 
   } // end of class VT
 
-} // end of namespace JitTest
+} // end of namespace JitTest_volatile_il
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/VT/identity/volatile_il_d.ilproj b/src/tests/JIT/Methodical/VT/identity/volatile_il_d.ilproj
index b3a17905404ad4..aa9355fb3e6d01 100644
--- a/src/tests/JIT/Methodical/VT/identity/volatile_il_d.ilproj
+++ b/src/tests/JIT/Methodical/VT/identity/volatile_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/identity/volatile_il_r.ilproj b/src/tests/JIT/Methodical/VT/identity/volatile_il_r.ilproj
index 3eb99e556b1129..c23f8a72cb65ef 100644
--- a/src/tests/JIT/Methodical/VT/identity/volatile_il_r.ilproj
+++ b/src/tests/JIT/Methodical/VT/identity/volatile_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/port/huge_gcref.il b/src/tests/JIT/Methodical/VT/port/huge_gcref.il
index ad197e2d734ff5..649ac0d0fec5f5 100644
--- a/src/tests/JIT/Methodical/VT/port/huge_gcref.il
+++ b/src/tests/JIT/Methodical/VT/port/huge_gcref.il
@@ -25,7 +25,7 @@
   
 }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_huge_gcref_port_il
 {
   .class value private auto ansi sealed TestStruct extends [mscorlib]System.ValueType
   {
@@ -36,10 +36,10 @@
     
   } // end of class 'TestStruct'
   
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends [mscorlib]System.Object
   {
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -47,11 +47,11 @@
       )
       .entrypoint
       .maxstack  70
-      .locals (value class JitTest.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,] matrix,
+      .locals (value class JitTest_huge_gcref_port_il.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,] matrix,
                int32 count,
 			   int32[] dim,
-			   value class JitTest.TestStruct t,
-			   value class JitTest.TestStruct r)
+			   value class JitTest_huge_gcref_port_il.TestStruct t,
+			   value class JitTest_huge_gcref_port_il.TestStruct r)
 
       			ldstr     "Creating 32-dimension array"
       			call       void [System.Console]System.Console::WriteLine(string)
@@ -177,7 +177,7 @@
 				ldloc dim ldc.i4 61 ldelem.i4
 				ldloc dim ldc.i4 62 ldelem.i4
 				ldloc dim ldc.i4 63 ldelem.i4
-				newobj		instance void value class JitTest.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::.ctor(
+				newobj		instance void value class JitTest_huge_gcref_port_il.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::.ctor(
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
@@ -231,7 +231,7 @@
 				ldloc dim ldc.i4 62 ldelem.i4
 				
       			ldloca	t
-				initobj		JitTest.TestStruct
+				initobj		JitTest_huge_gcref_port_il.TestStruct
       			ldloca	t
       			dup
 				ldc.i4	99
@@ -240,14 +240,14 @@
 				ldc.i4  98
 				ldc.r8	8.0
 				stelem.r8
-				stfld	float64[] JitTest.TestStruct::dbl_ptr
+				stfld	float64[] JitTest_huge_gcref_port_il.TestStruct::dbl_ptr
 				ldc.i4	0x05071975
-				stfld	int32 JitTest.TestStruct::magic
+				stfld	int32 JitTest_huge_gcref_port_il.TestStruct::magic
 
 				call    void [mscorlib]System.GC::Collect()
 
 				ldloc	t
-      			callvirt 	instance void value class JitTest.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Set(
+      			callvirt 	instance void value class JitTest_huge_gcref_port_il.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Set(
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
@@ -256,7 +256,7 @@
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
-      					value class JitTest.TestStruct)
+      					value class JitTest_huge_gcref_port_il.TestStruct)
 
 				ldloc matrix
 				ldloc dim ldc.i4.0 ldelem.i4
@@ -291,7 +291,7 @@
 				ldloc dim ldc.i4 58 ldelem.i4
 				ldloc dim ldc.i4 60 ldelem.i4
 				ldloc dim ldc.i4 62 ldelem.i4
-      			callvirt 	instance value class JitTest.TestStruct value class JitTest.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Get(
+      			callvirt 	instance value class JitTest_huge_gcref_port_il.TestStruct value class JitTest_huge_gcref_port_il.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Get(
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
@@ -304,7 +304,7 @@
       			stloc r
       			ldloca r
       			dup
-      			ldfld   float64[] JitTest.TestStruct::dbl_ptr
+      			ldfld   float64[] JitTest_huge_gcref_port_il.TestStruct::dbl_ptr
       			ldc.i4 98
       			ldelem.r8
       			ldc.r8 8.0
@@ -313,7 +313,7 @@
       			pop
       			br  throw0
 			next0_0:
-      			ldfld   int32 JitTest.TestStruct::magic
+      			ldfld   int32 JitTest_huge_gcref_port_il.TestStruct::magic
       			ldc.i4  0x05071975
       			ceq
       			brfalse throw0
@@ -359,7 +359,7 @@
       			br cont3
       			
       		go1:
-      			callvirt instance value class JitTest.TestStruct value class JitTest.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Get(
+      			callvirt instance value class JitTest_huge_gcref_port_il.TestStruct value class JitTest_huge_gcref_port_il.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Get(
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
@@ -371,7 +371,7 @@
       			stloc r
       			ldloca r
       			dup
-      			ldfld   float64[] JitTest.TestStruct::dbl_ptr
+      			ldfld   float64[] JitTest_huge_gcref_port_il.TestStruct::dbl_ptr
       			ldc.i4 98
       			ldelem.r8
       			ldc.r8 8.0
@@ -380,7 +380,7 @@
       			pop
       			br  throw0
 			next0_1:
-      			ldfld   int32 JitTest.TestStruct::magic
+      			ldfld   int32 JitTest_huge_gcref_port_il.TestStruct::magic
       			ldc.i4  0x05071975
       			ceq
       			brfalse throw0
@@ -429,7 +429,7 @@
 				ldloc dim ldc.i4 60 ldelem.i4
 				ldloc dim ldc.i4 62 ldelem.i4
 				ldloc	t
-      			callvirt 	instance void value class JitTest.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Set(
+      			callvirt 	instance void value class JitTest_huge_gcref_port_il.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Set(
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
@@ -438,7 +438,7 @@
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
-      					value class JitTest.TestStruct)
+      					value class JitTest_huge_gcref_port_il.TestStruct)
       			ldnull
       			stloc matrix
       			call void [mscorlib]System.GC::Collect()
@@ -488,7 +488,7 @@
 				ldloc dim ldc.i4 58 ldelem.i4
 				ldloc dim ldc.i4 60 ldelem.i4
 				ldloc dim ldc.i4 62 ldelem.i4
-      			callvirt instance value class JitTest.TestStruct& value class JitTest.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Address(
+      			callvirt instance value class JitTest_huge_gcref_port_il.TestStruct& value class JitTest_huge_gcref_port_il.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Address(
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
       					int32, int32, int32, int32,
@@ -498,7 +498,7 @@
       					int32, int32, int32, int32,
       					int32, int32, int32, int32)
       			dup
-      			ldfld   float64[] JitTest.TestStruct::dbl_ptr
+      			ldfld   float64[] JitTest_huge_gcref_port_il.TestStruct::dbl_ptr
       			ldc.i4 98
       			ldelem.r8
       			ldc.r8 8.0
@@ -507,7 +507,7 @@
       			pop
       			br  throw0
 			next0_2:
-      			ldfld   int32 JitTest.TestStruct::magic
+      			ldfld   int32 JitTest_huge_gcref_port_il.TestStruct::magic
       			ldc.i4  0x05071975
       			ceq
       			brfalse throw0
@@ -528,4 +528,4 @@
     
   } // end of class 'Test'
   
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_huge_gcref_port_il'
diff --git a/src/tests/JIT/Methodical/VT/port/huge_gcref_il_d.ilproj b/src/tests/JIT/Methodical/VT/port/huge_gcref_il_d.ilproj
index cff2b276126399..2940abade93a82 100644
--- a/src/tests/JIT/Methodical/VT/port/huge_gcref_il_d.ilproj
+++ b/src/tests/JIT/Methodical/VT/port/huge_gcref_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/port/huge_gcref_il_r.ilproj b/src/tests/JIT/Methodical/VT/port/huge_gcref_il_r.ilproj
index 1d5d48bacd3eda..99a394f7fb9895 100644
--- a/src/tests/JIT/Methodical/VT/port/huge_gcref_il_r.ilproj
+++ b/src/tests/JIT/Methodical/VT/port/huge_gcref_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/port/lcs.cs b/src/tests/JIT/Methodical/VT/port/lcs.cs
index 6bef5a1b3a3d5c..541c3f103c73bc 100644
--- a/src/tests/JIT/Methodical/VT/port/lcs.cs
+++ b/src/tests/JIT/Methodical/VT/port/lcs.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_lcs_port
 {
-    internal struct LCSV
+    public struct LCSV
     {
         private int _v;
         private const int RANK = 4;
@@ -88,7 +89,8 @@ private static void findLCS(LCSV[,,,] c, LCSV[,,,] b, char[][] seq, LCSV[] len)
             }
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             Console.WriteLine("Test searches for longest common subsequence of 4 strings\n\n");
             String[] str = new String[RANK] {
diff --git a/src/tests/JIT/Methodical/VT/port/lcs_gcref.cs b/src/tests/JIT/Methodical/VT/port/lcs_gcref.cs
index 678dbb1bc72a18..5b6f2a132569f3 100644
--- a/src/tests/JIT/Methodical/VT/port/lcs_gcref.cs
+++ b/src/tests/JIT/Methodical/VT/port/lcs_gcref.cs
@@ -2,8 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_lcs_gcref_port
 {
     internal class LCSO
     {
@@ -11,7 +12,7 @@ internal class LCSO
         public LCSO(LCSO child) { _m_child = child; }
     }
 
-    internal struct LCSV
+    public struct LCSV
     {
         private int _v;
         private LCSO[] _gcref;
@@ -98,7 +99,8 @@ private static void findLCS(LCSV[,,,] c, LCSV[,,,] b, char[][] seq, LCSV[] len)
             }
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             Console.WriteLine("Test searches for longest common subsequence of 4 strings\n\n");
             String[] str = new String[RANK] {
diff --git a/src/tests/JIT/Methodical/VT/port/lcs_gcref_d.csproj b/src/tests/JIT/Methodical/VT/port/lcs_gcref_d.csproj
index ffe120f0e9630a..ec6ad3e29d226d 100644
--- a/src/tests/JIT/Methodical/VT/port/lcs_gcref_d.csproj
+++ b/src/tests/JIT/Methodical/VT/port/lcs_gcref_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/port/lcs_gcref_do.csproj b/src/tests/JIT/Methodical/VT/port/lcs_gcref_do.csproj
index 1ade25a0e043fd..22cb2172e5c1e4 100644
--- a/src/tests/JIT/Methodical/VT/port/lcs_gcref_do.csproj
+++ b/src/tests/JIT/Methodical/VT/port/lcs_gcref_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/port/lcs_gcref_r.csproj b/src/tests/JIT/Methodical/VT/port/lcs_gcref_r.csproj
index 7f3b9ca6f8203b..6939c7c9deb0ac 100644
--- a/src/tests/JIT/Methodical/VT/port/lcs_gcref_r.csproj
+++ b/src/tests/JIT/Methodical/VT/port/lcs_gcref_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/port/lcs_gcref_ro.csproj b/src/tests/JIT/Methodical/VT/port/lcs_gcref_ro.csproj
index 8d8c3e22c1cd75..8ce26f72468ce8 100644
--- a/src/tests/JIT/Methodical/VT/port/lcs_gcref_ro.csproj
+++ b/src/tests/JIT/Methodical/VT/port/lcs_gcref_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/port/lcs_port_d.csproj b/src/tests/JIT/Methodical/VT/port/lcs_port_d.csproj
index 5bbd9d21654ea7..1cf5fa05ed4e81 100644
--- a/src/tests/JIT/Methodical/VT/port/lcs_port_d.csproj
+++ b/src/tests/JIT/Methodical/VT/port/lcs_port_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/port/lcs_port_do.csproj b/src/tests/JIT/Methodical/VT/port/lcs_port_do.csproj
index 97bd56490dc6f0..f750def602a47b 100644
--- a/src/tests/JIT/Methodical/VT/port/lcs_port_do.csproj
+++ b/src/tests/JIT/Methodical/VT/port/lcs_port_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/port/lcs_port_r.csproj b/src/tests/JIT/Methodical/VT/port/lcs_port_r.csproj
index 08822aaa374d90..421d1332087229 100644
--- a/src/tests/JIT/Methodical/VT/port/lcs_port_r.csproj
+++ b/src/tests/JIT/Methodical/VT/port/lcs_port_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/VT/port/lcs_port_ro.csproj b/src/tests/JIT/Methodical/VT/port/lcs_port_ro.csproj
index f134085b1d3956..6cb7027fd19678 100644
--- a/src/tests/JIT/Methodical/VT/port/lcs_port_ro.csproj
+++ b/src/tests/JIT/Methodical/VT/port/lcs_port_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/acceptance/Boxing/boxing001.ilproj b/src/tests/JIT/Methodical/acceptance/Boxing/boxing001.ilproj
index 8741e582e6ed41..aeed4c851432f0 100644
--- a/src/tests/JIT/Methodical/acceptance/Boxing/boxing001.ilproj
+++ b/src/tests/JIT/Methodical/acceptance/Boxing/boxing001.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/casts/SEH/cast_throw.cs b/src/tests/JIT/Methodical/casts/SEH/cast_throw.cs
index 41740f12ce9e90..50b858c83f28d3 100644
--- a/src/tests/JIT/Methodical/casts/SEH/cast_throw.cs
+++ b/src/tests/JIT/Methodical/casts/SEH/cast_throw.cs
@@ -2,13 +2,15 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
 internal class BaseException : Exception { }
 internal class DerivedException : BaseException { }
 
-internal class Test_cast_throw
+public class Test_cast_throw
 {
-    private static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         BaseException ex = new DerivedException();
         try
diff --git a/src/tests/JIT/Methodical/casts/SEH/cast_throw_d.csproj b/src/tests/JIT/Methodical/casts/SEH/cast_throw_d.csproj
index 01a4a399538100..3ff53e6bd1b486 100644
--- a/src/tests/JIT/Methodical/casts/SEH/cast_throw_d.csproj
+++ b/src/tests/JIT/Methodical/casts/SEH/cast_throw_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/casts/SEH/cast_throw_do.csproj b/src/tests/JIT/Methodical/casts/SEH/cast_throw_do.csproj
index ab024172f18070..2332813a16ccdb 100644
--- a/src/tests/JIT/Methodical/casts/SEH/cast_throw_do.csproj
+++ b/src/tests/JIT/Methodical/casts/SEH/cast_throw_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/casts/SEH/cast_throw_r.csproj b/src/tests/JIT/Methodical/casts/SEH/cast_throw_r.csproj
index 8a620a9099cd49..a0b3d6f9215b46 100644
--- a/src/tests/JIT/Methodical/casts/SEH/cast_throw_r.csproj
+++ b/src/tests/JIT/Methodical/casts/SEH/cast_throw_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/casts/SEH/cast_throw_ro.csproj b/src/tests/JIT/Methodical/casts/SEH/cast_throw_ro.csproj
index 0990ee29399bc8..998481bb17430a 100644
--- a/src/tests/JIT/Methodical/casts/SEH/cast_throw_ro.csproj
+++ b/src/tests/JIT/Methodical/casts/SEH/cast_throw_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/casts/SEH/castclass_catch.il b/src/tests/JIT/Methodical/casts/SEH/castclass_catch.il
index 6b0430c73f3c11..82ade1ee5a6c6f 100644
--- a/src/tests/JIT/Methodical/casts/SEH/castclass_catch.il
+++ b/src/tests/JIT/Methodical/casts/SEH/castclass_catch.il
@@ -9,12 +9,12 @@
 }
 .assembly castclass_catch { }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_castclass_catch_SEH_il
 {
-  .class private auto ansi beforefieldinit Test
+  .class public auto ansi beforefieldinit Test
          extends [mscorlib]System.Object
   {
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() cil managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
diff --git a/src/tests/JIT/Methodical/casts/SEH/castclass_catch_il_d.ilproj b/src/tests/JIT/Methodical/casts/SEH/castclass_catch_il_d.ilproj
index bc018f349c51e3..6872ac81768d05 100644
--- a/src/tests/JIT/Methodical/casts/SEH/castclass_catch_il_d.ilproj
+++ b/src/tests/JIT/Methodical/casts/SEH/castclass_catch_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/casts/SEH/castclass_catch_il_r.ilproj b/src/tests/JIT/Methodical/casts/SEH/castclass_catch_il_r.ilproj
index 36e750044d59af..152891a2d26c02 100644
--- a/src/tests/JIT/Methodical/casts/SEH/castclass_catch_il_r.ilproj
+++ b/src/tests/JIT/Methodical/casts/SEH/castclass_catch_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/casts/SEH/castclass_catch_neg.il b/src/tests/JIT/Methodical/casts/SEH/castclass_catch_neg.il
index 250242d3fb351a..eaa31c19ca1482 100644
--- a/src/tests/JIT/Methodical/casts/SEH/castclass_catch_neg.il
+++ b/src/tests/JIT/Methodical/casts/SEH/castclass_catch_neg.il
@@ -10,12 +10,12 @@
 }
 .assembly castclass_catch_neg { }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_castclass_catch_neg_SEH_il
 {
-  .class private auto ansi beforefieldinit Test
+  .class public auto ansi beforefieldinit Test
          extends [mscorlib]System.Object
   {
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() cil managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
diff --git a/src/tests/JIT/Methodical/casts/SEH/castclass_catch_neg_il_d.ilproj b/src/tests/JIT/Methodical/casts/SEH/castclass_catch_neg_il_d.ilproj
index 435f70ab33b13e..2582ab9b670227 100644
--- a/src/tests/JIT/Methodical/casts/SEH/castclass_catch_neg_il_d.ilproj
+++ b/src/tests/JIT/Methodical/casts/SEH/castclass_catch_neg_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/casts/SEH/castclass_catch_neg_il_r.ilproj b/src/tests/JIT/Methodical/casts/SEH/castclass_catch_neg_il_r.ilproj
index 6f282a3946c5a4..a9b3fd0a74071b 100644
--- a/src/tests/JIT/Methodical/casts/SEH/castclass_catch_neg_il_r.ilproj
+++ b/src/tests/JIT/Methodical/casts/SEH/castclass_catch_neg_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/casts/SEH/filter.il b/src/tests/JIT/Methodical/casts/SEH/filter.il
index 5d9ff0487826af..5ff20f6e10b5b6 100644
--- a/src/tests/JIT/Methodical/casts/SEH/filter.il
+++ b/src/tests/JIT/Methodical/casts/SEH/filter.il
@@ -2,14 +2,19 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 .assembly extern mscorlib { }
+.assembly extern xunit.core {}
 .assembly extern System.Console
 {
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
 .assembly 'filter_SEH_casts' { }
+.class public auto ansi Test_filter extends [mscorlib] System.Object {
 .method public static int32 main() cil managed
 {
+	.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+	    01 00 00 00
+	)
 	.maxstack  8
 	.entrypoint
 
@@ -46,3 +51,4 @@ End_2:
 	ldc.i4.s	100
 	ret
 }
+}
diff --git a/src/tests/JIT/Methodical/casts/SEH/filter_SEH_casts_il_d.ilproj b/src/tests/JIT/Methodical/casts/SEH/filter_SEH_casts_il_d.ilproj
index 96edcac7557d3d..106241a19ea4a1 100644
--- a/src/tests/JIT/Methodical/casts/SEH/filter_SEH_casts_il_d.ilproj
+++ b/src/tests/JIT/Methodical/casts/SEH/filter_SEH_casts_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/casts/SEH/filter_SEH_casts_il_r.ilproj b/src/tests/JIT/Methodical/casts/SEH/filter_SEH_casts_il_r.ilproj
index 32f078e0e8932c..d0db87d5a04f0f 100644
--- a/src/tests/JIT/Methodical/casts/SEH/filter_SEH_casts_il_r.ilproj
+++ b/src/tests/JIT/Methodical/casts/SEH/filter_SEH_casts_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/casts/SEH/isinst_catch.il b/src/tests/JIT/Methodical/casts/SEH/isinst_catch.il
index 78952e9bd8a319..6d39e23c93a1b0 100644
--- a/src/tests/JIT/Methodical/casts/SEH/isinst_catch.il
+++ b/src/tests/JIT/Methodical/casts/SEH/isinst_catch.il
@@ -9,12 +9,12 @@
 }
 .assembly isinst_catch { }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_isinst_catch_SEH_il
 {
-  .class private auto ansi beforefieldinit Test
+  .class public auto ansi beforefieldinit Test
          extends [mscorlib]System.Object
   {
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() cil managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
diff --git a/src/tests/JIT/Methodical/casts/SEH/isinst_catch_il_d.ilproj b/src/tests/JIT/Methodical/casts/SEH/isinst_catch_il_d.ilproj
index 61b167d0630900..d1947bf5a4da5c 100644
--- a/src/tests/JIT/Methodical/casts/SEH/isinst_catch_il_d.ilproj
+++ b/src/tests/JIT/Methodical/casts/SEH/isinst_catch_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/casts/SEH/isinst_catch_il_r.ilproj b/src/tests/JIT/Methodical/casts/SEH/isinst_catch_il_r.ilproj
index 2a8a8056f1208c..c549fe0f28694d 100644
--- a/src/tests/JIT/Methodical/casts/SEH/isinst_catch_il_r.ilproj
+++ b/src/tests/JIT/Methodical/casts/SEH/isinst_catch_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/casts/SEH/isinst_catch_neg.il b/src/tests/JIT/Methodical/casts/SEH/isinst_catch_neg.il
index dc73c21fe561f7..80c4dec03a704c 100644
--- a/src/tests/JIT/Methodical/casts/SEH/isinst_catch_neg.il
+++ b/src/tests/JIT/Methodical/casts/SEH/isinst_catch_neg.il
@@ -10,12 +10,12 @@
 }
 .assembly isinst_catch_neg { }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_isinst_catch_neg_SEH_il
 {
-  .class private auto ansi beforefieldinit Test
+  .class public auto ansi beforefieldinit Test
          extends [mscorlib]System.Object
   {
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() cil managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
diff --git a/src/tests/JIT/Methodical/casts/SEH/isinst_catch_neg_il_d.ilproj b/src/tests/JIT/Methodical/casts/SEH/isinst_catch_neg_il_d.ilproj
index 6c39185317cf5f..231a697322572b 100644
--- a/src/tests/JIT/Methodical/casts/SEH/isinst_catch_neg_il_d.ilproj
+++ b/src/tests/JIT/Methodical/casts/SEH/isinst_catch_neg_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/casts/SEH/isinst_catch_neg_il_r.ilproj b/src/tests/JIT/Methodical/casts/SEH/isinst_catch_neg_il_r.ilproj
index 61e67c7590f25b..e2b0d76e33bf0f 100644
--- a/src/tests/JIT/Methodical/casts/SEH/isinst_catch_neg_il_r.ilproj
+++ b/src/tests/JIT/Methodical/casts/SEH/isinst_catch_neg_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/casts/SEH/throw.cs b/src/tests/JIT/Methodical/casts/SEH/throw.cs
index 36b587d07f206b..d4a2a7c0b207ab 100644
--- a/src/tests/JIT/Methodical/casts/SEH/throw.cs
+++ b/src/tests/JIT/Methodical/casts/SEH/throw.cs
@@ -2,8 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_throw_SEH_cs
 {
     internal class Exception1 : Exception
     {
@@ -15,9 +16,10 @@ internal class Exception2 : Exception
         override public String ToString() { return "Exception2"; }
     }
 
-    internal class Test
+    public class Test
     {
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             object excep = new Exception1();
 
diff --git a/src/tests/JIT/Methodical/casts/SEH/throw_d.csproj b/src/tests/JIT/Methodical/casts/SEH/throw_d.csproj
index 50e5c6df15b6a1..d0422f126ad4f1 100644
--- a/src/tests/JIT/Methodical/casts/SEH/throw_d.csproj
+++ b/src/tests/JIT/Methodical/casts/SEH/throw_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/casts/SEH/throw_do.csproj b/src/tests/JIT/Methodical/casts/SEH/throw_do.csproj
index 338d33089aa12b..8a9baf1d90eebf 100644
--- a/src/tests/JIT/Methodical/casts/SEH/throw_do.csproj
+++ b/src/tests/JIT/Methodical/casts/SEH/throw_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/casts/SEH/throw_r.csproj b/src/tests/JIT/Methodical/casts/SEH/throw_r.csproj
index 0f620830389d68..cf3e1f1bcecf48 100644
--- a/src/tests/JIT/Methodical/casts/SEH/throw_r.csproj
+++ b/src/tests/JIT/Methodical/casts/SEH/throw_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/casts/SEH/throw_ro.csproj b/src/tests/JIT/Methodical/casts/SEH/throw_ro.csproj
index 1f8ec132a4c25c..51221089f4fcbd 100644
--- a/src/tests/JIT/Methodical/casts/SEH/throw_ro.csproj
+++ b/src/tests/JIT/Methodical/casts/SEH/throw_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/casts/array/arrays.il b/src/tests/JIT/Methodical/casts/array/arrays.il
index 6e7f9b0d0d52ab..03a97ca1947bcc 100644
--- a/src/tests/JIT/Methodical/casts/array/arrays.il
+++ b/src/tests/JIT/Methodical/casts/array/arrays.il
@@ -3,14 +3,19 @@
 
 // arrays.il
 .assembly extern mscorlib { }
+.assembly extern xunit.core {}
 .assembly extern System.Console
 {
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
 .assembly arrays { }
+.class public auto ansi Test_arrays extends [mscorlib] System.Object {
 .method public static int32 main() cil managed
 {
+  .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+      01 00 00 00
+  )
   .entrypoint
   .maxstack  8
   .locals (float64[] V_0,
@@ -116,3 +121,4 @@
   IL_0118:  ldloc.3
   IL_0119:  ret
 }
+}
diff --git a/src/tests/JIT/Methodical/casts/array/arrays_il_d.ilproj b/src/tests/JIT/Methodical/casts/array/arrays_il_d.ilproj
index 5a67239609d0a4..05b64c71741d31 100644
--- a/src/tests/JIT/Methodical/casts/array/arrays_il_d.ilproj
+++ b/src/tests/JIT/Methodical/casts/array/arrays_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/casts/array/arrays_il_r.ilproj b/src/tests/JIT/Methodical/casts/array/arrays_il_r.ilproj
index 6f8e760bde5c6f..1998d60304d47c 100644
--- a/src/tests/JIT/Methodical/casts/array/arrays_il_r.ilproj
+++ b/src/tests/JIT/Methodical/casts/array/arrays_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/casts/array/castclass_ldlen.il b/src/tests/JIT/Methodical/casts/array/castclass_ldlen.il
index 365ca19c0a87a9..1c51ac2925ab22 100644
--- a/src/tests/JIT/Methodical/casts/array/castclass_ldlen.il
+++ b/src/tests/JIT/Methodical/casts/array/castclass_ldlen.il
@@ -14,12 +14,12 @@
   
 }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_castclass_ldlen_array_il
 {
-  .class private auto ansi beforefieldinit Test
+  .class public auto ansi beforefieldinit Test
          extends [mscorlib]System.Object
   {
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() cil managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
diff --git a/src/tests/JIT/Methodical/casts/array/castclass_ldlen_il_d.ilproj b/src/tests/JIT/Methodical/casts/array/castclass_ldlen_il_d.ilproj
index 112c17afd45784..189fd15761612e 100644
--- a/src/tests/JIT/Methodical/casts/array/castclass_ldlen_il_d.ilproj
+++ b/src/tests/JIT/Methodical/casts/array/castclass_ldlen_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/casts/array/castclass_ldlen_il_r.ilproj b/src/tests/JIT/Methodical/casts/array/castclass_ldlen_il_r.ilproj
index 9b71464cc225cb..7df86d952f71ad 100644
--- a/src/tests/JIT/Methodical/casts/array/castclass_ldlen_il_r.ilproj
+++ b/src/tests/JIT/Methodical/casts/array/castclass_ldlen_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/casts/array/isinst_ldlen.il b/src/tests/JIT/Methodical/casts/array/isinst_ldlen.il
index 0f543dc1b23bc3..4d361d123beace 100644
--- a/src/tests/JIT/Methodical/casts/array/isinst_ldlen.il
+++ b/src/tests/JIT/Methodical/casts/array/isinst_ldlen.il
@@ -14,12 +14,12 @@
   
 }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_isinst_ldlen_array_il
 {
-  .class private auto ansi beforefieldinit Test
+  .class public auto ansi beforefieldinit Test
          extends [mscorlib]System.Object
   {
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() cil managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
diff --git a/src/tests/JIT/Methodical/casts/array/isinst_ldlen_il_d.ilproj b/src/tests/JIT/Methodical/casts/array/isinst_ldlen_il_d.ilproj
index 57aa10f12b4d8b..b4703cb4860793 100644
--- a/src/tests/JIT/Methodical/casts/array/isinst_ldlen_il_d.ilproj
+++ b/src/tests/JIT/Methodical/casts/array/isinst_ldlen_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/casts/array/isinst_ldlen_il_r.ilproj b/src/tests/JIT/Methodical/casts/array/isinst_ldlen_il_r.ilproj
index 20d2ff99d4db12..823c8bb69bed1c 100644
--- a/src/tests/JIT/Methodical/casts/array/isinst_ldlen_il_r.ilproj
+++ b/src/tests/JIT/Methodical/casts/array/isinst_ldlen_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/casts/coverage/castclass_call.cs b/src/tests/JIT/Methodical/casts/coverage/castclass_call.cs
index 1a712e680a8057..ae6afb00aa5d0d 100644
--- a/src/tests/JIT/Methodical/casts/coverage/castclass_call.cs
+++ b/src/tests/JIT/Methodical/casts/coverage/castclass_call.cs
@@ -2,12 +2,13 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_castclass_call_cs
 {
-    internal class BaseClass { }
+    public class BaseClass { }
 
-    internal class TestClass : BaseClass
+    public class TestClass : BaseClass
     {
         private object Method_To_Call(int cookie)
         {
@@ -48,7 +49,8 @@ private static bool Test_CALL(TestClass _this, int cookie, bool flag)
             }
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             TestClass _this = new TestClass();
             if (!Test_CALL(_this, 0, true))
diff --git a/src/tests/JIT/Methodical/casts/coverage/castclass_call.il b/src/tests/JIT/Methodical/casts/coverage/castclass_call.il
index d93ece5536ed51..87c20649afe533 100644
--- a/src/tests/JIT/Methodical/casts/coverage/castclass_call.il
+++ b/src/tests/JIT/Methodical/casts/coverage/castclass_call.il
@@ -11,7 +11,7 @@
 {
 }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_castclass_call_il
 {
   .class private auto ansi beforefieldinit BaseClass
          extends [mscorlib]System.Object
@@ -28,10 +28,10 @@
 
   } // end of class BaseClass
 
-  .class private auto ansi beforefieldinit TestClass
-         extends JitTest.BaseClass
+  .class public auto ansi beforefieldinit TestClass
+         extends JitTest_castclass_call_il.BaseClass
   {
-    .method private hidebysig instance class JitTest.BaseClass 
+    .method private hidebysig instance class JitTest_castclass_call_il.BaseClass 
             Method_To_Call(int32 cookie) cil managed
     {
       // Code size       52 (0x34)
@@ -47,16 +47,16 @@
                             IL_002c)
       IL_0018:  br.s       IL_0032
 
-      IL_001a:  newobj     instance void JitTest.TestClass::.ctor()
+      IL_001a:  newobj     instance void JitTest_castclass_call_il.TestClass::.ctor()
       IL_001f:  ret
 
-      IL_0020:  newobj     instance void JitTest.DerivedClass::.ctor()
+      IL_0020:  newobj     instance void JitTest_castclass_call_il.DerivedClass::.ctor()
       IL_0025:  ret
 
-      IL_0026:  newobj     instance void JitTest.BaseClass::.ctor()
+      IL_0026:  newobj     instance void JitTest_castclass_call_il.BaseClass::.ctor()
       IL_002b:  ret
 
-      IL_002c:  newobj     instance void JitTest.OtherClass::.ctor()
+      IL_002c:  newobj     instance void JitTest_castclass_call_il.OtherClass::.ctor()
       IL_0031:  ret
 
       IL_0032:  ldnull
@@ -64,13 +64,13 @@
     } // end of method TestClass::Method_To_Call
 
     .method private hidebysig static bool 
-            Test_CALL(class JitTest.TestClass _this,
+            Test_CALL(class JitTest_castclass_call_il.TestClass _this,
                       int32 cookie,
                       bool flag) cil managed
     {
       // Code size       73 (0x49)
       .maxstack  2
-      .locals (class JitTest.TestClass V_0,
+      .locals (class JitTest_castclass_call_il.TestClass V_0,
                class [mscorlib]System.Exception V_1,
                bool V_2)
       .try
@@ -80,8 +80,8 @@
 
         IL_0003:  ldarg.0
         IL_0004:  ldarg.1
-        IL_0005:  callvirt   instance class JitTest.BaseClass JitTest.TestClass::Method_To_Call(int32)
-        IL_000a:  castclass  JitTest.TestClass
+        IL_0005:  callvirt   instance class JitTest_castclass_call_il.BaseClass JitTest_castclass_call_il.TestClass::Method_To_Call(int32)
+        IL_000a:  castclass  JitTest_castclass_call_il.TestClass
         IL_000f:  stloc.0
         IL_0010:  ldloc.0
         IL_0011:  ldnull
@@ -93,12 +93,12 @@
 
         IL_001a:  ldarg.0
         IL_001b:  ldarg.1
-        IL_001c:  callvirt   instance class JitTest.BaseClass JitTest.TestClass::Method_To_Call(int32)
-        IL_0021:  castclass  JitTest.TestClass
+        IL_001c:  callvirt   instance class JitTest_castclass_call_il.BaseClass JitTest_castclass_call_il.TestClass::Method_To_Call(int32)
+        IL_0021:  castclass  JitTest_castclass_call_il.TestClass
         IL_0026:  stloc.0
         IL_0027:  ldarg.0
         IL_0028:  ldarg.1
-        IL_0029:  callvirt   instance class JitTest.BaseClass JitTest.TestClass::Method_To_Call(int32)
+        IL_0029:  callvirt   instance class JitTest_castclass_call_il.BaseClass JitTest_castclass_call_il.TestClass::Method_To_Call(int32)
         IL_002e:  ldnull
         IL_002f:  ceq
         IL_0031:  stloc.2
@@ -126,7 +126,7 @@
       IL_0048:  ret
     } // end of method TestClass::Test_CALL
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() cil managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -135,13 +135,13 @@
       .entrypoint
       // Code size       134 (0x86)
       .maxstack  3
-      .locals (class JitTest.TestClass V_0)
-      IL_0000:  newobj     instance void JitTest.TestClass::.ctor()
+      .locals (class JitTest_castclass_call_il.TestClass V_0)
+      IL_0000:  newobj     instance void JitTest_castclass_call_il.TestClass::.ctor()
       IL_0005:  stloc.0
       IL_0006:  ldloc.0
       IL_0007:  ldc.i4.0
       IL_0008:  ldc.i4.1
-      IL_0009:  call       bool JitTest.TestClass::Test_CALL(class JitTest.TestClass,
+      IL_0009:  call       bool JitTest_castclass_call_il.TestClass::Test_CALL(class JitTest_castclass_call_il.TestClass,
                                                              int32,
                                                              bool)
       IL_000e:  brtrue.s   IL_001d
@@ -154,7 +154,7 @@
       IL_001d:  ldloc.0
       IL_001e:  ldc.i4.1
       IL_001f:  ldc.i4.1
-      IL_0020:  call       bool JitTest.TestClass::Test_CALL(class JitTest.TestClass,
+      IL_0020:  call       bool JitTest_castclass_call_il.TestClass::Test_CALL(class JitTest_castclass_call_il.TestClass,
                                                              int32,
                                                              bool)
       IL_0025:  brtrue.s   IL_0034
@@ -167,7 +167,7 @@
       IL_0034:  ldloc.0
       IL_0035:  ldc.i4.2
       IL_0036:  ldc.i4.0
-      IL_0037:  call       bool JitTest.TestClass::Test_CALL(class JitTest.TestClass,
+      IL_0037:  call       bool JitTest_castclass_call_il.TestClass::Test_CALL(class JitTest_castclass_call_il.TestClass,
                                                              int32,
                                                              bool)
       IL_003c:  brtrue.s   IL_004b
@@ -180,7 +180,7 @@
       IL_004b:  ldloc.0
       IL_004c:  ldc.i4.3
       IL_004d:  ldc.i4.0
-      IL_004e:  call       bool JitTest.TestClass::Test_CALL(class JitTest.TestClass,
+      IL_004e:  call       bool JitTest_castclass_call_il.TestClass::Test_CALL(class JitTest_castclass_call_il.TestClass,
                                                              int32,
                                                              bool)
       IL_0053:  brtrue.s   IL_0062
@@ -193,7 +193,7 @@
       IL_0062:  ldloc.0
       IL_0063:  ldc.i4.4
       IL_0064:  ldc.i4.0
-      IL_0065:  call       bool JitTest.TestClass::Test_CALL(class JitTest.TestClass,
+      IL_0065:  call       bool JitTest_castclass_call_il.TestClass::Test_CALL(class JitTest_castclass_call_il.TestClass,
                                                              int32,
                                                              bool)
       IL_006a:  brtrue.s   IL_0079
@@ -215,14 +215,14 @@
       // Code size       7 (0x7)
       .maxstack  8
       IL_0000:  ldarg.0
-      IL_0001:  call       instance void JitTest.BaseClass::.ctor()
+      IL_0001:  call       instance void JitTest_castclass_call_il.BaseClass::.ctor()
       IL_0006:  ret
     } // end of method TestClass::.ctor
 
   } // end of class TestClass
 
   .class private auto ansi beforefieldinit DerivedClass
-         extends JitTest.TestClass
+         extends JitTest_castclass_call_il.TestClass
   {
     .method public hidebysig specialname rtspecialname 
             instance void .ctor() cil managed
@@ -230,7 +230,7 @@
       // Code size       7 (0x7)
       .maxstack  8
       IL_0000:  ldarg.0
-      IL_0001:  call       instance void JitTest.TestClass::.ctor()
+      IL_0001:  call       instance void JitTest_castclass_call_il.TestClass::.ctor()
       IL_0006:  ret
     } // end of method DerivedClass::.ctor
 
@@ -251,7 +251,7 @@
 
   } // end of class OtherClass
 
-} // end of namespace JitTest
+} // end of namespace JitTest_castclass_call_il
 
 //*********** DISASSEMBLY COMPLETE ***********************
 // WARNING: Created Win32 resource file castclass_call.res
diff --git a/src/tests/JIT/Methodical/casts/coverage/castclass_call_d.csproj b/src/tests/JIT/Methodical/casts/coverage/castclass_call_d.csproj
index 3082d7488e9cc0..9ccb94b8246a64 100644
--- a/src/tests/JIT/Methodical/casts/coverage/castclass_call_d.csproj
+++ b/src/tests/JIT/Methodical/casts/coverage/castclass_call_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/casts/coverage/castclass_call_do.csproj b/src/tests/JIT/Methodical/casts/coverage/castclass_call_do.csproj
index f84ecad2dfb0ab..f8d0fedcea08bc 100644
--- a/src/tests/JIT/Methodical/casts/coverage/castclass_call_do.csproj
+++ b/src/tests/JIT/Methodical/casts/coverage/castclass_call_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/casts/coverage/castclass_call_il_d.ilproj b/src/tests/JIT/Methodical/casts/coverage/castclass_call_il_d.ilproj
index 259ea304225706..5d1b4e7ea6244d 100644
--- a/src/tests/JIT/Methodical/casts/coverage/castclass_call_il_d.ilproj
+++ b/src/tests/JIT/Methodical/casts/coverage/castclass_call_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/casts/coverage/castclass_call_il_r.ilproj b/src/tests/JIT/Methodical/casts/coverage/castclass_call_il_r.ilproj
index 13de10401b94fa..d8d9d9fb53ad26 100644
--- a/src/tests/JIT/Methodical/casts/coverage/castclass_call_il_r.ilproj
+++ b/src/tests/JIT/Methodical/casts/coverage/castclass_call_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/casts/coverage/castclass_call_r.csproj b/src/tests/JIT/Methodical/casts/coverage/castclass_call_r.csproj
index 19420e00af706b..77b6b3b8fe8a07 100644
--- a/src/tests/JIT/Methodical/casts/coverage/castclass_call_r.csproj
+++ b/src/tests/JIT/Methodical/casts/coverage/castclass_call_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/casts/coverage/castclass_call_ro.csproj b/src/tests/JIT/Methodical/casts/coverage/castclass_call_ro.csproj
index befe947004c464..bffd6f7c635865 100644
--- a/src/tests/JIT/Methodical/casts/coverage/castclass_call_ro.csproj
+++ b/src/tests/JIT/Methodical/casts/coverage/castclass_call_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/casts/coverage/castclass_calli.il b/src/tests/JIT/Methodical/casts/coverage/castclass_calli.il
index 6609d22c4763e7..05b286374d4a36 100644
--- a/src/tests/JIT/Methodical/casts/coverage/castclass_calli.il
+++ b/src/tests/JIT/Methodical/casts/coverage/castclass_calli.il
@@ -11,7 +11,7 @@
 {
 }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_castclass_calli_il
 {
   .class private auto ansi beforefieldinit BaseClass
          extends [mscorlib]System.Object
@@ -28,10 +28,10 @@
 
   } // end of class BaseClass
 
-  .class private auto ansi beforefieldinit TestClass
-         extends JitTest.BaseClass
+  .class public auto ansi beforefieldinit TestClass
+         extends JitTest_castclass_calli_il.BaseClass
   {
-    .method private hidebysig instance class JitTest.BaseClass 
+    .method private hidebysig instance class JitTest_castclass_calli_il.BaseClass 
             Method_To_Call(int32 cookie) cil managed
     {
       // Code size       52 (0x34)
@@ -47,16 +47,16 @@
                             IL_002c)
       IL_0018:  br.s       IL_0032
 
-      IL_001a:  newobj     instance void JitTest.TestClass::.ctor()
+      IL_001a:  newobj     instance void JitTest_castclass_calli_il.TestClass::.ctor()
       IL_001f:  ret
 
-      IL_0020:  newobj     instance void JitTest.DerivedClass::.ctor()
+      IL_0020:  newobj     instance void JitTest_castclass_calli_il.DerivedClass::.ctor()
       IL_0025:  ret
 
-      IL_0026:  newobj     instance void JitTest.BaseClass::.ctor()
+      IL_0026:  newobj     instance void JitTest_castclass_calli_il.BaseClass::.ctor()
       IL_002b:  ret
 
-      IL_002c:  newobj     instance void JitTest.OtherClass::.ctor()
+      IL_002c:  newobj     instance void JitTest_castclass_calli_il.OtherClass::.ctor()
       IL_0031:  ret
 
       IL_0032:  ldnull
@@ -64,19 +64,19 @@
     } // end of method TestClass::Method_To_Call
 
     .method private hidebysig static bool 
-            Test_CALL(class JitTest.TestClass _this,
+            Test_CALL(class JitTest_castclass_calli_il.TestClass _this,
                       int32 cookie,
                       bool flag) cil managed
     {
       // Code size       73 (0x49)
       .maxstack  4
-      .locals (class JitTest.TestClass V_0,
+      .locals (class JitTest_castclass_calli_il.TestClass V_0,
                class [mscorlib]System.Exception V_1,
                bool V_2,
-               method instance class JitTest.BaseClass*(int32)
+               method instance class JitTest_castclass_calli_il.BaseClass*(int32)
                )
       ldarg.0
-      ldvirtftn instance class JitTest.BaseClass JitTest.TestClass::Method_To_Call(int32)
+      ldvirtftn instance class JitTest_castclass_calli_il.BaseClass JitTest_castclass_calli_il.TestClass::Method_To_Call(int32)
       stloc.3
       .try
       {
@@ -85,8 +85,8 @@
 
         IL_0003:  ldarg.0
         IL_0004:  ldarg.1
-        IL_0005:  ldloc.3   calli instance class JitTest.BaseClass(int32)
-        IL_000a:  castclass  JitTest.TestClass
+        IL_0005:  ldloc.3   calli instance class JitTest_castclass_calli_il.BaseClass(int32)
+        IL_000a:  castclass  JitTest_castclass_calli_il.TestClass
         IL_000f:  stloc.0
         IL_0010:  ldloc.0
         IL_0011:  ldnull
@@ -98,12 +98,12 @@
 
         IL_001a:  ldarg.0
         IL_001b:  ldarg.1
-        IL_001c:  ldloc.3   calli instance class JitTest.BaseClass(int32)
-        IL_0021:  castclass  JitTest.TestClass
+        IL_001c:  ldloc.3   calli instance class JitTest_castclass_calli_il.BaseClass(int32)
+        IL_0021:  castclass  JitTest_castclass_calli_il.TestClass
         IL_0026:  stloc.0
         IL_0027:  ldarg.0
         IL_0028:  ldarg.1
-        IL_0029:  ldloc.3   calli instance class JitTest.BaseClass(int32)
+        IL_0029:  ldloc.3   calli instance class JitTest_castclass_calli_il.BaseClass(int32)
         IL_002e:  ldnull
         IL_002f:  ceq
         IL_0031:  stloc.2
@@ -131,7 +131,7 @@
       IL_0048:  ret
     } // end of method TestClass::Test_CALL
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() cil managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -140,13 +140,13 @@
       .entrypoint
       // Code size       134 (0x86)
       .maxstack  3
-      .locals (class JitTest.TestClass V_0)
-      IL_0000:  newobj     instance void JitTest.TestClass::.ctor()
+      .locals (class JitTest_castclass_calli_il.TestClass V_0)
+      IL_0000:  newobj     instance void JitTest_castclass_calli_il.TestClass::.ctor()
       IL_0005:  stloc.0
       IL_0006:  ldloc.0
       IL_0007:  ldc.i4.0
       IL_0008:  ldc.i4.1
-      IL_0009:  call       bool JitTest.TestClass::Test_CALL(class JitTest.TestClass,
+      IL_0009:  call       bool JitTest_castclass_calli_il.TestClass::Test_CALL(class JitTest_castclass_calli_il.TestClass,
                                                              int32,
                                                              bool)
       IL_000e:  brtrue.s   IL_001d
@@ -159,7 +159,7 @@
       IL_001d:  ldloc.0
       IL_001e:  ldc.i4.1
       IL_001f:  ldc.i4.1
-      IL_0020:  call       bool JitTest.TestClass::Test_CALL(class JitTest.TestClass,
+      IL_0020:  call       bool JitTest_castclass_calli_il.TestClass::Test_CALL(class JitTest_castclass_calli_il.TestClass,
                                                              int32,
                                                              bool)
       IL_0025:  brtrue.s   IL_0034
@@ -172,7 +172,7 @@
       IL_0034:  ldloc.0
       IL_0035:  ldc.i4.2
       IL_0036:  ldc.i4.0
-      IL_0037:  call       bool JitTest.TestClass::Test_CALL(class JitTest.TestClass,
+      IL_0037:  call       bool JitTest_castclass_calli_il.TestClass::Test_CALL(class JitTest_castclass_calli_il.TestClass,
                                                              int32,
                                                              bool)
       IL_003c:  brtrue.s   IL_004b
@@ -185,7 +185,7 @@
       IL_004b:  ldloc.0
       IL_004c:  ldc.i4.3
       IL_004d:  ldc.i4.0
-      IL_004e:  call       bool JitTest.TestClass::Test_CALL(class JitTest.TestClass,
+      IL_004e:  call       bool JitTest_castclass_calli_il.TestClass::Test_CALL(class JitTest_castclass_calli_il.TestClass,
                                                              int32,
                                                              bool)
       IL_0053:  brtrue.s   IL_0062
@@ -198,7 +198,7 @@
       IL_0062:  ldloc.0
       IL_0063:  ldc.i4.4
       IL_0064:  ldc.i4.0
-      IL_0065:  call       bool JitTest.TestClass::Test_CALL(class JitTest.TestClass,
+      IL_0065:  call       bool JitTest_castclass_calli_il.TestClass::Test_CALL(class JitTest_castclass_calli_il.TestClass,
                                                              int32,
                                                              bool)
       IL_006a:  brtrue.s   IL_0079
@@ -220,14 +220,14 @@
       // Code size       7 (0x7)
       .maxstack  8
       IL_0000:  ldarg.0
-      IL_0001:  call       instance void JitTest.BaseClass::.ctor()
+      IL_0001:  call       instance void JitTest_castclass_calli_il.BaseClass::.ctor()
       IL_0006:  ret
     } // end of method TestClass::.ctor
 
   } // end of class TestClass
 
   .class private auto ansi beforefieldinit DerivedClass
-         extends JitTest.TestClass
+         extends JitTest_castclass_calli_il.TestClass
   {
     .method public hidebysig specialname rtspecialname 
             instance void .ctor() cil managed
@@ -235,7 +235,7 @@
       // Code size       7 (0x7)
       .maxstack  8
       IL_0000:  ldarg.0
-      IL_0001:  call       instance void JitTest.TestClass::.ctor()
+      IL_0001:  call       instance void JitTest_castclass_calli_il.TestClass::.ctor()
       IL_0006:  ret
     } // end of method DerivedClass::.ctor
 
@@ -256,7 +256,7 @@
 
   } // end of class OtherClass
 
-} // end of namespace JitTest
+} // end of namespace JitTest_castclass_calli_il
 
 //*********** DISASSEMBLY COMPLETE ***********************
 // WARNING: Created Win32 resource file castclass_call.res
diff --git a/src/tests/JIT/Methodical/casts/coverage/castclass_calli_il_d.ilproj b/src/tests/JIT/Methodical/casts/coverage/castclass_calli_il_d.ilproj
index 5a899c2e6384b4..503098c2c8caec 100644
--- a/src/tests/JIT/Methodical/casts/coverage/castclass_calli_il_d.ilproj
+++ b/src/tests/JIT/Methodical/casts/coverage/castclass_calli_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/casts/coverage/castclass_calli_il_r.ilproj b/src/tests/JIT/Methodical/casts/coverage/castclass_calli_il_r.ilproj
index d0bb24289b2a4d..a1820a206bc197 100644
--- a/src/tests/JIT/Methodical/casts/coverage/castclass_calli_il_r.ilproj
+++ b/src/tests/JIT/Methodical/casts/coverage/castclass_calli_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/casts/coverage/castclass_ldarg.cs b/src/tests/JIT/Methodical/casts/coverage/castclass_ldarg.cs
index 9c089b42caaf1f..ebbf568fee19aa 100644
--- a/src/tests/JIT/Methodical/casts/coverage/castclass_ldarg.cs
+++ b/src/tests/JIT/Methodical/casts/coverage/castclass_ldarg.cs
@@ -2,12 +2,13 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_castclass_ldarg_cs
 {
-    internal class BaseClass { }
+    public class BaseClass { }
 
-    internal class TestClass : BaseClass
+    public class TestClass : BaseClass
     {
         private static bool Test_LDARG(object obj, bool flag)
         {
@@ -31,7 +32,8 @@ private static bool Test_LDARG(object obj, bool flag)
             }
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             if (!Test_LDARG(new TestClass(), true))
             {
diff --git a/src/tests/JIT/Methodical/casts/coverage/castclass_ldarg.il b/src/tests/JIT/Methodical/casts/coverage/castclass_ldarg.il
index 4f4ec337aa3ce5..d8423656907c82 100644
--- a/src/tests/JIT/Methodical/casts/coverage/castclass_ldarg.il
+++ b/src/tests/JIT/Methodical/casts/coverage/castclass_ldarg.il
@@ -11,7 +11,7 @@
 {
 }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_castclass_ldarg_il
 {
   .class private auto ansi beforefieldinit BaseClass
          extends [mscorlib]System.Object
@@ -28,8 +28,8 @@
 
   } // end of class BaseClass
 
-  .class private auto ansi beforefieldinit TestClass
-         extends JitTest.BaseClass
+  .class public auto ansi beforefieldinit TestClass
+         extends JitTest_castclass_ldarg_il.BaseClass
   {
     .method private hidebysig static bool 
             Test_LDARG(object obj,
@@ -37,7 +37,7 @@
     {
       // Code size       55 (0x37)
       .maxstack  2
-      .locals (class JitTest.TestClass V_0,
+      .locals (class JitTest_castclass_ldarg_il.TestClass V_0,
                class [mscorlib]System.Exception V_1,
                bool V_2)
       .try
@@ -46,7 +46,7 @@
         IL_0001:  brfalse.s  IL_0014
 
         IL_0003:  ldarg 0
-        IL_0004:  castclass  JitTest.TestClass
+        IL_0004:  castclass  JitTest_castclass_ldarg_il.TestClass
         IL_0009:  stloc.0
         IL_000a:  ldloc.0
         IL_000b:  ldnull
@@ -57,7 +57,7 @@
         IL_0012:  leave.s    IL_0035
 
         IL_0014:  ldarg 0
-        IL_0015:  castclass  JitTest.TestClass
+        IL_0015:  castclass  JitTest_castclass_ldarg_il.TestClass
         IL_001a:  stloc.0
         IL_001b:  ldarg.0
         IL_001c:  ldnull
@@ -87,7 +87,7 @@
       IL_0036:  ret
     } // end of method TestClass::Test_LDARG
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() cil managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -96,9 +96,9 @@
       .entrypoint
       // Code size       139 (0x8b)
       .maxstack  2
-      IL_0000:  newobj     instance void JitTest.TestClass::.ctor()
+      IL_0000:  newobj     instance void JitTest_castclass_ldarg_il.TestClass::.ctor()
       IL_0005:  ldc.i4.1
-      IL_0006:  call       bool JitTest.TestClass::Test_LDARG(object,
+      IL_0006:  call       bool JitTest_castclass_ldarg_il.TestClass::Test_LDARG(object,
                                                               bool)
       IL_000b:  brtrue.s   IL_001a
 
@@ -107,9 +107,9 @@
       IL_0017:  ldc.i4.s   101
       IL_0019:  ret
 
-      IL_001a:  newobj     instance void JitTest.DerivedClass::.ctor()
+      IL_001a:  newobj     instance void JitTest_castclass_ldarg_il.DerivedClass::.ctor()
       IL_001f:  ldc.i4.1
-      IL_0020:  call       bool JitTest.TestClass::Test_LDARG(object,
+      IL_0020:  call       bool JitTest_castclass_ldarg_il.TestClass::Test_LDARG(object,
                                                               bool)
       IL_0025:  brtrue.s   IL_0034
 
@@ -118,9 +118,9 @@
       IL_0031:  ldc.i4.s   102
       IL_0033:  ret
 
-      IL_0034:  newobj     instance void JitTest.BaseClass::.ctor()
+      IL_0034:  newobj     instance void JitTest_castclass_ldarg_il.BaseClass::.ctor()
       IL_0039:  ldc.i4.0
-      IL_003a:  call       bool JitTest.TestClass::Test_LDARG(object,
+      IL_003a:  call       bool JitTest_castclass_ldarg_il.TestClass::Test_LDARG(object,
                                                               bool)
       IL_003f:  brtrue.s   IL_004e
 
@@ -129,9 +129,9 @@
       IL_004b:  ldc.i4.s   103
       IL_004d:  ret
 
-      IL_004e:  newobj     instance void JitTest.OtherClass::.ctor()
+      IL_004e:  newobj     instance void JitTest_castclass_ldarg_il.OtherClass::.ctor()
       IL_0053:  ldc.i4.0
-      IL_0054:  call       bool JitTest.TestClass::Test_LDARG(object,
+      IL_0054:  call       bool JitTest_castclass_ldarg_il.TestClass::Test_LDARG(object,
                                                               bool)
       IL_0059:  brtrue.s   IL_0068
 
@@ -142,7 +142,7 @@
 
       IL_0068:  ldnull
       IL_0069:  ldc.i4.0
-      IL_006a:  call       bool JitTest.TestClass::Test_LDARG(object,
+      IL_006a:  call       bool JitTest_castclass_ldarg_il.TestClass::Test_LDARG(object,
                                                               bool)
       IL_006f:  brtrue.s   IL_007e
 
@@ -163,14 +163,14 @@
       // Code size       7 (0x7)
       .maxstack  8
       IL_0000:  ldarg.0
-      IL_0001:  call       instance void JitTest.BaseClass::.ctor()
+      IL_0001:  call       instance void JitTest_castclass_ldarg_il.BaseClass::.ctor()
       IL_0006:  ret
     } // end of method TestClass::.ctor
 
   } // end of class TestClass
 
   .class private auto ansi beforefieldinit DerivedClass
-         extends JitTest.TestClass
+         extends JitTest_castclass_ldarg_il.TestClass
   {
     .method public hidebysig specialname rtspecialname 
             instance void .ctor() cil managed
@@ -178,7 +178,7 @@
       // Code size       7 (0x7)
       .maxstack  8
       IL_0000:  ldarg.0
-      IL_0001:  call       instance void JitTest.TestClass::.ctor()
+      IL_0001:  call       instance void JitTest_castclass_ldarg_il.TestClass::.ctor()
       IL_0006:  ret
     } // end of method DerivedClass::.ctor
 
@@ -199,7 +199,7 @@
 
   } // end of class OtherClass
 
-} // end of namespace JitTest
+} // end of namespace JitTest_castclass_ldarg_il
 
 //*********** DISASSEMBLY COMPLETE ***********************
 // WARNING: Created Win32 resource file castclass_ldarg.res
diff --git a/src/tests/JIT/Methodical/casts/coverage/castclass_ldarg_d.csproj b/src/tests/JIT/Methodical/casts/coverage/castclass_ldarg_d.csproj
index 9809c0be945c4b..abeed829a1f09a 100644
--- a/src/tests/JIT/Methodical/casts/coverage/castclass_ldarg_d.csproj
+++ b/src/tests/JIT/Methodical/casts/coverage/castclass_ldarg_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/casts/coverage/castclass_ldarg_do.csproj b/src/tests/JIT/Methodical/casts/coverage/castclass_ldarg_do.csproj
index 27bcd4f0a2e57c..8fec721c42efa3 100644
--- a/src/tests/JIT/Methodical/casts/coverage/castclass_ldarg_do.csproj
+++ b/src/tests/JIT/Methodical/casts/coverage/castclass_ldarg_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/casts/coverage/castclass_ldarg_il_d.ilproj b/src/tests/JIT/Methodical/casts/coverage/castclass_ldarg_il_d.ilproj
index 98c2cd037a23a3..a5b57f23c87a8e 100644
--- a/src/tests/JIT/Methodical/casts/coverage/castclass_ldarg_il_d.ilproj
+++ b/src/tests/JIT/Methodical/casts/coverage/castclass_ldarg_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/casts/coverage/castclass_ldarg_il_r.ilproj b/src/tests/JIT/Methodical/casts/coverage/castclass_ldarg_il_r.ilproj
index 0bfd76556310e1..d56ec05d8b5843 100644
--- a/src/tests/JIT/Methodical/casts/coverage/castclass_ldarg_il_r.ilproj
+++ b/src/tests/JIT/Methodical/casts/coverage/castclass_ldarg_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/casts/coverage/castclass_ldarg_r.csproj b/src/tests/JIT/Methodical/casts/coverage/castclass_ldarg_r.csproj
index 4641ce0229f981..6aa5aa46e9405c 100644
--- a/src/tests/JIT/Methodical/casts/coverage/castclass_ldarg_r.csproj
+++ b/src/tests/JIT/Methodical/casts/coverage/castclass_ldarg_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/casts/coverage/castclass_ldarg_ro.csproj b/src/tests/JIT/Methodical/casts/coverage/castclass_ldarg_ro.csproj
index b1db7943e44025..ef44fdfae5a05a 100644
--- a/src/tests/JIT/Methodical/casts/coverage/castclass_ldarg_ro.csproj
+++ b/src/tests/JIT/Methodical/casts/coverage/castclass_ldarg_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/casts/coverage/castclass_ldloc.cs b/src/tests/JIT/Methodical/casts/coverage/castclass_ldloc.cs
index a07e8d5020975e..b968d1c0b58a65 100644
--- a/src/tests/JIT/Methodical/casts/coverage/castclass_ldloc.cs
+++ b/src/tests/JIT/Methodical/casts/coverage/castclass_ldloc.cs
@@ -2,12 +2,13 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_castclass_ldloc_cs
 {
-    internal class BaseClass { }
+    public class BaseClass { }
 
-    internal class TestClass : BaseClass
+    public class TestClass : BaseClass
     {
         private static bool Test_LDLOC(object _obj, bool flag)
         {
@@ -32,7 +33,8 @@ private static bool Test_LDLOC(object _obj, bool flag)
             }
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             if (!Test_LDLOC(new TestClass(), true))
             {
diff --git a/src/tests/JIT/Methodical/casts/coverage/castclass_ldloc.il b/src/tests/JIT/Methodical/casts/coverage/castclass_ldloc.il
index 3da9e4d7edde5f..ee36f84fdfda30 100644
--- a/src/tests/JIT/Methodical/casts/coverage/castclass_ldloc.il
+++ b/src/tests/JIT/Methodical/casts/coverage/castclass_ldloc.il
@@ -11,7 +11,7 @@
 {
 }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_castclass_ldloc_il
 {
   .class private auto ansi beforefieldinit BaseClass
          extends [mscorlib]System.Object
@@ -28,8 +28,8 @@
 
   } // end of class BaseClass
 
-  .class private auto ansi beforefieldinit TestClass
-         extends JitTest.BaseClass
+  .class public auto ansi beforefieldinit TestClass
+         extends JitTest_castclass_ldloc_il.BaseClass
   {
     .method private hidebysig static bool 
             Test_LDLOC(object _obj,
@@ -38,7 +38,7 @@
       // Code size       57 (0x39)
       .maxstack  2
       .locals (object V_0,
-               class JitTest.TestClass V_1,
+               class JitTest_castclass_ldloc_il.TestClass V_1,
                class [mscorlib]System.Exception V_2,
                bool V_3)
       IL_0000:  ldarg.0
@@ -49,7 +49,7 @@
         IL_0003:  brfalse.s  IL_0016
 
         IL_0005:  ldloc 0
-        IL_0006:  castclass  JitTest.TestClass
+        IL_0006:  castclass  JitTest_castclass_ldloc_il.TestClass
         IL_000b:  stloc.1
         IL_000c:  ldloc.1
         IL_000d:  ldnull
@@ -60,7 +60,7 @@
         IL_0014:  leave.s    IL_0037
 
         IL_0016:  ldloc 0
-        IL_0017:  castclass  JitTest.TestClass
+        IL_0017:  castclass  JitTest_castclass_ldloc_il.TestClass
         IL_001c:  stloc.1
         IL_001d:  ldloc.0
         IL_001e:  ldnull
@@ -90,7 +90,7 @@
       IL_0038:  ret
     } // end of method TestClass::Test_LDLOC
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() cil managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -99,9 +99,9 @@
       .entrypoint
       // Code size       139 (0x8b)
       .maxstack  2
-      IL_0000:  newobj     instance void JitTest.TestClass::.ctor()
+      IL_0000:  newobj     instance void JitTest_castclass_ldloc_il.TestClass::.ctor()
       IL_0005:  ldc.i4.1
-      IL_0006:  call       bool JitTest.TestClass::Test_LDLOC(object,
+      IL_0006:  call       bool JitTest_castclass_ldloc_il.TestClass::Test_LDLOC(object,
                                                               bool)
       IL_000b:  brtrue.s   IL_001a
 
@@ -110,9 +110,9 @@
       IL_0017:  ldc.i4.s   101
       IL_0019:  ret
 
-      IL_001a:  newobj     instance void JitTest.DerivedClass::.ctor()
+      IL_001a:  newobj     instance void JitTest_castclass_ldloc_il.DerivedClass::.ctor()
       IL_001f:  ldc.i4.1
-      IL_0020:  call       bool JitTest.TestClass::Test_LDLOC(object,
+      IL_0020:  call       bool JitTest_castclass_ldloc_il.TestClass::Test_LDLOC(object,
                                                               bool)
       IL_0025:  brtrue.s   IL_0034
 
@@ -121,9 +121,9 @@
       IL_0031:  ldc.i4.s   102
       IL_0033:  ret
 
-      IL_0034:  newobj     instance void JitTest.BaseClass::.ctor()
+      IL_0034:  newobj     instance void JitTest_castclass_ldloc_il.BaseClass::.ctor()
       IL_0039:  ldc.i4.0
-      IL_003a:  call       bool JitTest.TestClass::Test_LDLOC(object,
+      IL_003a:  call       bool JitTest_castclass_ldloc_il.TestClass::Test_LDLOC(object,
                                                               bool)
       IL_003f:  brtrue.s   IL_004e
 
@@ -132,9 +132,9 @@
       IL_004b:  ldc.i4.s   103
       IL_004d:  ret
 
-      IL_004e:  newobj     instance void JitTest.OtherClass::.ctor()
+      IL_004e:  newobj     instance void JitTest_castclass_ldloc_il.OtherClass::.ctor()
       IL_0053:  ldc.i4.0
-      IL_0054:  call       bool JitTest.TestClass::Test_LDLOC(object,
+      IL_0054:  call       bool JitTest_castclass_ldloc_il.TestClass::Test_LDLOC(object,
                                                               bool)
       IL_0059:  brtrue.s   IL_0068
 
@@ -145,7 +145,7 @@
 
       IL_0068:  ldnull
       IL_0069:  ldc.i4.0
-      IL_006a:  call       bool JitTest.TestClass::Test_LDLOC(object,
+      IL_006a:  call       bool JitTest_castclass_ldloc_il.TestClass::Test_LDLOC(object,
                                                               bool)
       IL_006f:  brtrue.s   IL_007e
 
@@ -166,14 +166,14 @@
       // Code size       7 (0x7)
       .maxstack  8
       IL_0000:  ldarg.0
-      IL_0001:  call       instance void JitTest.BaseClass::.ctor()
+      IL_0001:  call       instance void JitTest_castclass_ldloc_il.BaseClass::.ctor()
       IL_0006:  ret
     } // end of method TestClass::.ctor
 
   } // end of class TestClass
 
   .class private auto ansi beforefieldinit DerivedClass
-         extends JitTest.TestClass
+         extends JitTest_castclass_ldloc_il.TestClass
   {
     .method public hidebysig specialname rtspecialname 
             instance void .ctor() cil managed
@@ -181,7 +181,7 @@
       // Code size       7 (0x7)
       .maxstack  8
       IL_0000:  ldarg.0
-      IL_0001:  call       instance void JitTest.TestClass::.ctor()
+      IL_0001:  call       instance void JitTest_castclass_ldloc_il.TestClass::.ctor()
       IL_0006:  ret
     } // end of method DerivedClass::.ctor
 
@@ -202,7 +202,7 @@
 
   } // end of class OtherClass
 
-} // end of namespace JitTest
+} // end of namespace JitTest_castclass_ldloc_il
 
 //*********** DISASSEMBLY COMPLETE ***********************
 // WARNING: Created Win32 resource file castclass_ldloc.res
diff --git a/src/tests/JIT/Methodical/casts/coverage/castclass_ldloc_d.csproj b/src/tests/JIT/Methodical/casts/coverage/castclass_ldloc_d.csproj
index db950ac62256f8..4cb35825029c8f 100644
--- a/src/tests/JIT/Methodical/casts/coverage/castclass_ldloc_d.csproj
+++ b/src/tests/JIT/Methodical/casts/coverage/castclass_ldloc_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/casts/coverage/castclass_ldloc_do.csproj b/src/tests/JIT/Methodical/casts/coverage/castclass_ldloc_do.csproj
index 6d6bd6c26fa419..caeaddb532fe99 100644
--- a/src/tests/JIT/Methodical/casts/coverage/castclass_ldloc_do.csproj
+++ b/src/tests/JIT/Methodical/casts/coverage/castclass_ldloc_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/casts/coverage/castclass_ldloc_il_d.ilproj b/src/tests/JIT/Methodical/casts/coverage/castclass_ldloc_il_d.ilproj
index 95e9743f62698c..46a5d6c4dc71e6 100644
--- a/src/tests/JIT/Methodical/casts/coverage/castclass_ldloc_il_d.ilproj
+++ b/src/tests/JIT/Methodical/casts/coverage/castclass_ldloc_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/casts/coverage/castclass_ldloc_il_r.ilproj b/src/tests/JIT/Methodical/casts/coverage/castclass_ldloc_il_r.ilproj
index 8a8da8284910e4..a671bc601ccd5c 100644
--- a/src/tests/JIT/Methodical/casts/coverage/castclass_ldloc_il_r.ilproj
+++ b/src/tests/JIT/Methodical/casts/coverage/castclass_ldloc_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/casts/coverage/castclass_ldloc_r.csproj b/src/tests/JIT/Methodical/casts/coverage/castclass_ldloc_r.csproj
index 33d0933cbe0015..37131729b28c59 100644
--- a/src/tests/JIT/Methodical/casts/coverage/castclass_ldloc_r.csproj
+++ b/src/tests/JIT/Methodical/casts/coverage/castclass_ldloc_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/casts/coverage/castclass_ldloc_ro.csproj b/src/tests/JIT/Methodical/casts/coverage/castclass_ldloc_ro.csproj
index c45cd7f54bc543..b89f1a6a0888ae 100644
--- a/src/tests/JIT/Methodical/casts/coverage/castclass_ldloc_ro.csproj
+++ b/src/tests/JIT/Methodical/casts/coverage/castclass_ldloc_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/casts/coverage/castclass_newobj.cs b/src/tests/JIT/Methodical/casts/coverage/castclass_newobj.cs
index af96f530913c21..c351b522e2a51f 100644
--- a/src/tests/JIT/Methodical/casts/coverage/castclass_newobj.cs
+++ b/src/tests/JIT/Methodical/casts/coverage/castclass_newobj.cs
@@ -2,12 +2,13 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_castclass_newobj_cs
 {
-    internal class BaseClass { }
+    public class BaseClass { }
 
-    internal class TestClass : BaseClass
+    public class TestClass : BaseClass
     {
         private static bool Test_NEWOBJ(TestClass _this, int cookie, bool flag)
         {
@@ -47,7 +48,8 @@ private static bool Test_NEWOBJ(TestClass _this, int cookie, bool flag)
             }
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             TestClass _this = new TestClass();
             if (!Test_NEWOBJ(_this, 0, true))
diff --git a/src/tests/JIT/Methodical/casts/coverage/castclass_newobj_d.csproj b/src/tests/JIT/Methodical/casts/coverage/castclass_newobj_d.csproj
index fe68e767e369f5..133fc3b3dc826d 100644
--- a/src/tests/JIT/Methodical/casts/coverage/castclass_newobj_d.csproj
+++ b/src/tests/JIT/Methodical/casts/coverage/castclass_newobj_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/casts/coverage/castclass_newobj_do.csproj b/src/tests/JIT/Methodical/casts/coverage/castclass_newobj_do.csproj
index 565278fc732fcc..9134b3d7c3a98d 100644
--- a/src/tests/JIT/Methodical/casts/coverage/castclass_newobj_do.csproj
+++ b/src/tests/JIT/Methodical/casts/coverage/castclass_newobj_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/casts/coverage/castclass_newobj_r.csproj b/src/tests/JIT/Methodical/casts/coverage/castclass_newobj_r.csproj
index 9acbe91fecb526..2dd96314b0730e 100644
--- a/src/tests/JIT/Methodical/casts/coverage/castclass_newobj_r.csproj
+++ b/src/tests/JIT/Methodical/casts/coverage/castclass_newobj_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/casts/coverage/castclass_newobj_ro.csproj b/src/tests/JIT/Methodical/casts/coverage/castclass_newobj_ro.csproj
index 285cc84018bfa6..4d27f7e352c313 100644
--- a/src/tests/JIT/Methodical/casts/coverage/castclass_newobj_ro.csproj
+++ b/src/tests/JIT/Methodical/casts/coverage/castclass_newobj_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/casts/coverage/isinst_call.cs b/src/tests/JIT/Methodical/casts/coverage/isinst_call.cs
index 8b8d571aef5abb..e8d9dbd040c005 100644
--- a/src/tests/JIT/Methodical/casts/coverage/isinst_call.cs
+++ b/src/tests/JIT/Methodical/casts/coverage/isinst_call.cs
@@ -2,12 +2,13 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_isinst_call_cs
 {
-    internal class BaseClass { }
+    public class BaseClass { }
 
-    internal class TestClass : BaseClass
+    public class TestClass : BaseClass
     {
         private static object Method_To_Call(int cookie)
         {
@@ -48,7 +49,8 @@ private static bool Test_CALL(int cookie, bool flag)
             }
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             if (!Test_CALL(0, true))
             {
diff --git a/src/tests/JIT/Methodical/casts/coverage/isinst_call.il b/src/tests/JIT/Methodical/casts/coverage/isinst_call.il
index ccb1b7c7ea8b85..4a04c667c057ec 100644
--- a/src/tests/JIT/Methodical/casts/coverage/isinst_call.il
+++ b/src/tests/JIT/Methodical/casts/coverage/isinst_call.il
@@ -11,7 +11,7 @@
 {
 }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_isinst_call_il
 {
   .class private auto ansi beforefieldinit BaseClass
          extends [mscorlib]System.Object
@@ -28,10 +28,10 @@
 
   } // end of class BaseClass
 
-  .class private auto ansi beforefieldinit TestClass
-         extends JitTest.BaseClass
+  .class public auto ansi beforefieldinit TestClass
+         extends JitTest_isinst_call_il.BaseClass
   {
-    .method private hidebysig static class JitTest.BaseClass 
+    .method private hidebysig static class JitTest_isinst_call_il.BaseClass 
             Method_To_Call(int32 cookie) cil managed
     {
       // Code size       52 (0x34)
@@ -47,16 +47,16 @@
                             IL_002c)
       IL_0018:  br.s       IL_0032
 
-      IL_001a:  newobj     instance void JitTest.TestClass::.ctor()
+      IL_001a:  newobj     instance void JitTest_isinst_call_il.TestClass::.ctor()
       IL_001f:  ret
 
-      IL_0020:  newobj     instance void JitTest.DerivedClass::.ctor()
+      IL_0020:  newobj     instance void JitTest_isinst_call_il.DerivedClass::.ctor()
       IL_0025:  ret
 
-      IL_0026:  newobj     instance void JitTest.BaseClass::.ctor()
+      IL_0026:  newobj     instance void JitTest_isinst_call_il.BaseClass::.ctor()
       IL_002b:  ret
 
-      IL_002c:  newobj     instance void JitTest.OtherClass::.ctor()
+      IL_002c:  newobj     instance void JitTest_isinst_call_il.OtherClass::.ctor()
       IL_0031:  ret
 
       IL_0032:  ldnull
@@ -69,7 +69,7 @@
     {
       // Code size       51 (0x33)
       .maxstack  2
-      .locals (class JitTest.TestClass V_0,
+      .locals (class JitTest_isinst_call_il.TestClass V_0,
                bool V_1)
       .try
       {
@@ -77,8 +77,8 @@
         IL_0001:  brfalse.s  IL_0019
 
         IL_0003:  ldarg.0
-        IL_0004:  call       class JitTest.BaseClass JitTest.TestClass::Method_To_Call(int32)
-        IL_0009:  isinst     JitTest.TestClass
+        IL_0004:  call       class JitTest_isinst_call_il.BaseClass JitTest_isinst_call_il.TestClass::Method_To_Call(int32)
+        IL_0009:  isinst     JitTest_isinst_call_il.TestClass
         IL_000e:  stloc.0
         IL_000f:  ldloc.0
         IL_0010:  ldnull
@@ -89,8 +89,8 @@
         IL_0017:  leave.s    IL_0031
 
         IL_0019:  ldarg.0
-        IL_001a:  call       class JitTest.BaseClass JitTest.TestClass::Method_To_Call(int32)
-        IL_001f:  isinst     JitTest.TestClass
+        IL_001a:  call       class JitTest_isinst_call_il.BaseClass JitTest_isinst_call_il.TestClass::Method_To_Call(int32)
+        IL_001f:  isinst     JitTest_isinst_call_il.TestClass
         IL_0024:  stloc.0
         IL_0025:  ldloc.0
         IL_0026:  ldnull
@@ -111,7 +111,7 @@
       IL_0032:  ret
     } // end of method TestClass::Test_CALL
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() cil managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -122,7 +122,7 @@
       .maxstack  2
       IL_0000:  ldc.i4.0
       IL_0001:  ldc.i4.1
-      IL_0002:  call       bool JitTest.TestClass::Test_CALL(int32,
+      IL_0002:  call       bool JitTest_isinst_call_il.TestClass::Test_CALL(int32,
                                                              bool)
       IL_0007:  brtrue.s   IL_0016
 
@@ -133,7 +133,7 @@
 
       IL_0016:  ldc.i4.1
       IL_0017:  ldc.i4.1
-      IL_0018:  call       bool JitTest.TestClass::Test_CALL(int32,
+      IL_0018:  call       bool JitTest_isinst_call_il.TestClass::Test_CALL(int32,
                                                              bool)
       IL_001d:  brtrue.s   IL_002c
 
@@ -144,7 +144,7 @@
 
       IL_002c:  ldc.i4.2
       IL_002d:  ldc.i4.0
-      IL_002e:  call       bool JitTest.TestClass::Test_CALL(int32,
+      IL_002e:  call       bool JitTest_isinst_call_il.TestClass::Test_CALL(int32,
                                                              bool)
       IL_0033:  brtrue.s   IL_0042
 
@@ -155,7 +155,7 @@
 
       IL_0042:  ldc.i4.3
       IL_0043:  ldc.i4.0
-      IL_0044:  call       bool JitTest.TestClass::Test_CALL(int32,
+      IL_0044:  call       bool JitTest_isinst_call_il.TestClass::Test_CALL(int32,
                                                              bool)
       IL_0049:  brtrue.s   IL_0058
 
@@ -166,7 +166,7 @@
 
       IL_0058:  ldc.i4.4
       IL_0059:  ldc.i4.0
-      IL_005a:  call       bool JitTest.TestClass::Test_CALL(int32,
+      IL_005a:  call       bool JitTest_isinst_call_il.TestClass::Test_CALL(int32,
                                                              bool)
       IL_005f:  brtrue.s   IL_006e
 
@@ -187,14 +187,14 @@
       // Code size       7 (0x7)
       .maxstack  8
       IL_0000:  ldarg.0
-      IL_0001:  call       instance void JitTest.BaseClass::.ctor()
+      IL_0001:  call       instance void JitTest_isinst_call_il.BaseClass::.ctor()
       IL_0006:  ret
     } // end of method TestClass::.ctor
 
   } // end of class TestClass
 
   .class private auto ansi beforefieldinit DerivedClass
-         extends JitTest.TestClass
+         extends JitTest_isinst_call_il.TestClass
   {
     .method public hidebysig specialname rtspecialname 
             instance void .ctor() cil managed
@@ -202,7 +202,7 @@
       // Code size       7 (0x7)
       .maxstack  8
       IL_0000:  ldarg.0
-      IL_0001:  call       instance void JitTest.TestClass::.ctor()
+      IL_0001:  call       instance void JitTest_isinst_call_il.TestClass::.ctor()
       IL_0006:  ret
     } // end of method DerivedClass::.ctor
 
@@ -223,7 +223,7 @@
 
   } // end of class OtherClass
 
-} // end of namespace JitTest
+} // end of namespace JitTest_isinst_call_il
 
 //*********** DISASSEMBLY COMPLETE ***********************
 // WARNING: Created Win32 resource file isinst_call.res
diff --git a/src/tests/JIT/Methodical/casts/coverage/isinst_call_d.csproj b/src/tests/JIT/Methodical/casts/coverage/isinst_call_d.csproj
index 6febad9619087b..438144cc3b4b59 100644
--- a/src/tests/JIT/Methodical/casts/coverage/isinst_call_d.csproj
+++ b/src/tests/JIT/Methodical/casts/coverage/isinst_call_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/casts/coverage/isinst_call_do.csproj b/src/tests/JIT/Methodical/casts/coverage/isinst_call_do.csproj
index 2285758318340f..d5be37c01cd4a0 100644
--- a/src/tests/JIT/Methodical/casts/coverage/isinst_call_do.csproj
+++ b/src/tests/JIT/Methodical/casts/coverage/isinst_call_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/casts/coverage/isinst_call_il_d.ilproj b/src/tests/JIT/Methodical/casts/coverage/isinst_call_il_d.ilproj
index 1647d78b9b4e6f..f77f030ff17478 100644
--- a/src/tests/JIT/Methodical/casts/coverage/isinst_call_il_d.ilproj
+++ b/src/tests/JIT/Methodical/casts/coverage/isinst_call_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/casts/coverage/isinst_call_il_r.ilproj b/src/tests/JIT/Methodical/casts/coverage/isinst_call_il_r.ilproj
index c88d7210fbaa5d..2d2790f6ae8018 100644
--- a/src/tests/JIT/Methodical/casts/coverage/isinst_call_il_r.ilproj
+++ b/src/tests/JIT/Methodical/casts/coverage/isinst_call_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/casts/coverage/isinst_call_r.csproj b/src/tests/JIT/Methodical/casts/coverage/isinst_call_r.csproj
index e31ce8c661c9fc..96d27c1d52ba9b 100644
--- a/src/tests/JIT/Methodical/casts/coverage/isinst_call_r.csproj
+++ b/src/tests/JIT/Methodical/casts/coverage/isinst_call_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/casts/coverage/isinst_call_ro.csproj b/src/tests/JIT/Methodical/casts/coverage/isinst_call_ro.csproj
index 350d2de23af73c..421f0bfec31b60 100644
--- a/src/tests/JIT/Methodical/casts/coverage/isinst_call_ro.csproj
+++ b/src/tests/JIT/Methodical/casts/coverage/isinst_call_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/casts/coverage/isinst_calli.il b/src/tests/JIT/Methodical/casts/coverage/isinst_calli.il
index 18e56ffae9d554..2c16c5ada9d58b 100644
--- a/src/tests/JIT/Methodical/casts/coverage/isinst_calli.il
+++ b/src/tests/JIT/Methodical/casts/coverage/isinst_calli.il
@@ -11,7 +11,7 @@
 {
 }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_isinst_calli_il
 {
   .class private auto ansi beforefieldinit BaseClass
          extends [mscorlib]System.Object
@@ -28,10 +28,10 @@
 
   } // end of class BaseClass
 
-  .class private auto ansi beforefieldinit TestClass
-         extends JitTest.BaseClass
+  .class public auto ansi beforefieldinit TestClass
+         extends JitTest_isinst_calli_il.BaseClass
   {
-    .method private hidebysig static class JitTest.BaseClass 
+    .method private hidebysig static class JitTest_isinst_calli_il.BaseClass 
             Method_To_Call(int32 cookie) cil managed
     {
       // Code size       52 (0x34)
@@ -47,16 +47,16 @@
                             IL_002c)
       IL_0018:  br.s       IL_0032
 
-      IL_001a:  newobj     instance void JitTest.TestClass::.ctor()
+      IL_001a:  newobj     instance void JitTest_isinst_calli_il.TestClass::.ctor()
       IL_001f:  ret
 
-      IL_0020:  newobj     instance void JitTest.DerivedClass::.ctor()
+      IL_0020:  newobj     instance void JitTest_isinst_calli_il.DerivedClass::.ctor()
       IL_0025:  ret
 
-      IL_0026:  newobj     instance void JitTest.BaseClass::.ctor()
+      IL_0026:  newobj     instance void JitTest_isinst_calli_il.BaseClass::.ctor()
       IL_002b:  ret
 
-      IL_002c:  newobj     instance void JitTest.OtherClass::.ctor()
+      IL_002c:  newobj     instance void JitTest_isinst_calli_il.OtherClass::.ctor()
       IL_0031:  ret
 
       IL_0032:  ldnull
@@ -69,10 +69,10 @@
     {
       // Code size       51 (0x33)
       .maxstack  2
-      .locals (class JitTest.TestClass V_0,
+      .locals (class JitTest_isinst_calli_il.TestClass V_0,
                bool V_1,
-               method class JitTest.BaseClass*(int32))
-      ldftn class JitTest.BaseClass JitTest.TestClass::Method_To_Call(int32)
+               method class JitTest_isinst_calli_il.BaseClass*(int32))
+      ldftn class JitTest_isinst_calli_il.BaseClass JitTest_isinst_calli_il.TestClass::Method_To_Call(int32)
       stloc.2
       .try
       {
@@ -81,8 +81,8 @@
 
         IL_0003:  ldarg.0
         		  
-        IL_0004:  ldloc.2   calli       class JitTest.BaseClass(int32)
-        IL_0009:  isinst     JitTest.TestClass
+        IL_0004:  ldloc.2   calli       class JitTest_isinst_calli_il.BaseClass(int32)
+        IL_0009:  isinst     JitTest_isinst_calli_il.TestClass
         IL_000e:  stloc.0
         IL_000f:  ldloc.0
         IL_0010:  ldnull
@@ -93,8 +93,8 @@
         IL_0017:  leave.s    IL_0031
 
         IL_0019:  ldarg.0
-        IL_001a:  ldloc.2   calli       class JitTest.BaseClass(int32)
-        IL_001f:  isinst     JitTest.TestClass
+        IL_001a:  ldloc.2   calli       class JitTest_isinst_calli_il.BaseClass(int32)
+        IL_001f:  isinst     JitTest_isinst_calli_il.TestClass
         IL_0024:  stloc.0
         IL_0025:  ldloc.0
         IL_0026:  ldnull
@@ -115,7 +115,7 @@
       IL_0032:  ret
     } // end of method TestClass::Test_CALL
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() cil managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -126,7 +126,7 @@
       .maxstack  2
       IL_0000:  ldc.i4.0
       IL_0001:  ldc.i4.1
-      IL_0002:  call       bool JitTest.TestClass::Test_CALL(int32,
+      IL_0002:  call       bool JitTest_isinst_calli_il.TestClass::Test_CALL(int32,
                                                              bool)
       IL_0007:  brtrue.s   IL_0016
 
@@ -137,7 +137,7 @@
 
       IL_0016:  ldc.i4.1
       IL_0017:  ldc.i4.1
-      IL_0018:  call       bool JitTest.TestClass::Test_CALL(int32,
+      IL_0018:  call       bool JitTest_isinst_calli_il.TestClass::Test_CALL(int32,
                                                              bool)
       IL_001d:  brtrue.s   IL_002c
 
@@ -148,7 +148,7 @@
 
       IL_002c:  ldc.i4.2
       IL_002d:  ldc.i4.0
-      IL_002e:  call       bool JitTest.TestClass::Test_CALL(int32,
+      IL_002e:  call       bool JitTest_isinst_calli_il.TestClass::Test_CALL(int32,
                                                              bool)
       IL_0033:  brtrue.s   IL_0042
 
@@ -159,7 +159,7 @@
 
       IL_0042:  ldc.i4.3
       IL_0043:  ldc.i4.0
-      IL_0044:  call       bool JitTest.TestClass::Test_CALL(int32,
+      IL_0044:  call       bool JitTest_isinst_calli_il.TestClass::Test_CALL(int32,
                                                              bool)
       IL_0049:  brtrue.s   IL_0058
 
@@ -170,7 +170,7 @@
 
       IL_0058:  ldc.i4.4
       IL_0059:  ldc.i4.0
-      IL_005a:  call       bool JitTest.TestClass::Test_CALL(int32,
+      IL_005a:  call       bool JitTest_isinst_calli_il.TestClass::Test_CALL(int32,
                                                              bool)
       IL_005f:  brtrue.s   IL_006e
 
@@ -191,14 +191,14 @@
       // Code size       7 (0x7)
       .maxstack  8
       IL_0000:  ldarg.0
-      IL_0001:  call       instance void JitTest.BaseClass::.ctor()
+      IL_0001:  call       instance void JitTest_isinst_calli_il.BaseClass::.ctor()
       IL_0006:  ret
     } // end of method TestClass::.ctor
 
   } // end of class TestClass
 
   .class private auto ansi beforefieldinit DerivedClass
-         extends JitTest.TestClass
+         extends JitTest_isinst_calli_il.TestClass
   {
     .method public hidebysig specialname rtspecialname 
             instance void .ctor() cil managed
@@ -206,7 +206,7 @@
       // Code size       7 (0x7)
       .maxstack  8
       IL_0000:  ldarg.0
-      IL_0001:  call       instance void JitTest.TestClass::.ctor()
+      IL_0001:  call       instance void JitTest_isinst_calli_il.TestClass::.ctor()
       IL_0006:  ret
     } // end of method DerivedClass::.ctor
 
@@ -227,7 +227,7 @@
 
   } // end of class OtherClass
 
-} // end of namespace JitTest
+} // end of namespace JitTest_isinst_calli_il
 
 //*********** DISASSEMBLY COMPLETE ***********************
 // WARNING: Created Win32 resource file isinst_call.res
diff --git a/src/tests/JIT/Methodical/casts/coverage/isinst_calli_il_d.ilproj b/src/tests/JIT/Methodical/casts/coverage/isinst_calli_il_d.ilproj
index 02af62fa45b16a..f50ecb08226032 100644
--- a/src/tests/JIT/Methodical/casts/coverage/isinst_calli_il_d.ilproj
+++ b/src/tests/JIT/Methodical/casts/coverage/isinst_calli_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/casts/coverage/isinst_calli_il_r.ilproj b/src/tests/JIT/Methodical/casts/coverage/isinst_calli_il_r.ilproj
index bbb9aa52cd0cc0..233abacc6a0425 100644
--- a/src/tests/JIT/Methodical/casts/coverage/isinst_calli_il_r.ilproj
+++ b/src/tests/JIT/Methodical/casts/coverage/isinst_calli_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/casts/coverage/isinst_ldarg.cs b/src/tests/JIT/Methodical/casts/coverage/isinst_ldarg.cs
index afaf636c728f7e..fb3be6455d3931 100644
--- a/src/tests/JIT/Methodical/casts/coverage/isinst_ldarg.cs
+++ b/src/tests/JIT/Methodical/casts/coverage/isinst_ldarg.cs
@@ -2,12 +2,13 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_isinst_ldarg_cs
 {
-    internal class BaseClass { }
+    public class BaseClass { }
 
-    internal class TestClass : BaseClass
+    public class TestClass : BaseClass
     {
         private static bool Test_LDARG(object obj, bool flag)
         {
@@ -31,7 +32,8 @@ private static bool Test_LDARG(object obj, bool flag)
             }
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             if (!Test_LDARG(new TestClass(), true))
             {
diff --git a/src/tests/JIT/Methodical/casts/coverage/isinst_ldarg.il b/src/tests/JIT/Methodical/casts/coverage/isinst_ldarg.il
index 4d9f98d65814d1..81bbcded4e9434 100644
--- a/src/tests/JIT/Methodical/casts/coverage/isinst_ldarg.il
+++ b/src/tests/JIT/Methodical/casts/coverage/isinst_ldarg.il
@@ -11,7 +11,7 @@
 {
 }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_isinst_ldarg_il
 {
   .class private auto ansi beforefieldinit BaseClass
          extends [mscorlib]System.Object
@@ -28,8 +28,8 @@
 
   } // end of class BaseClass
 
-  .class private auto ansi beforefieldinit TestClass
-         extends JitTest.BaseClass
+  .class public auto ansi beforefieldinit TestClass
+         extends JitTest_isinst_ldarg_il.BaseClass
   {
     .method private hidebysig static bool 
             Test_LDARG(object obj,
@@ -37,7 +37,7 @@
     {
       // Code size       41 (0x29)
       .maxstack  2
-      .locals (class JitTest.TestClass V_0,
+      .locals (class JitTest_isinst_ldarg_il.TestClass V_0,
                bool V_1)
       .try
       {
@@ -45,7 +45,7 @@
         IL_0001:  brfalse.s  IL_0014
 
         IL_0003:  ldarg 0
-        IL_0004:  isinst     JitTest.TestClass
+        IL_0004:  isinst     JitTest_isinst_ldarg_il.TestClass
         IL_0009:  stloc.0
         IL_000a:  ldloc.0
         IL_000b:  ldnull
@@ -56,7 +56,7 @@
         IL_0012:  leave.s    IL_0027
 
         IL_0014:  ldarg 0
-        IL_0015:  isinst     JitTest.TestClass
+        IL_0015:  isinst     JitTest_isinst_ldarg_il.TestClass
         IL_001a:  stloc.0
         IL_001b:  ldloc.0
         IL_001c:  ldnull
@@ -77,7 +77,7 @@
       IL_0028:  ret
     } // end of method TestClass::Test_LDARG
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() cil managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -86,9 +86,9 @@
       .entrypoint
       // Code size       139 (0x8b)
       .maxstack  2
-      IL_0000:  newobj     instance void JitTest.TestClass::.ctor()
+      IL_0000:  newobj     instance void JitTest_isinst_ldarg_il.TestClass::.ctor()
       IL_0005:  ldc.i4.1
-      IL_0006:  call       bool JitTest.TestClass::Test_LDARG(object,
+      IL_0006:  call       bool JitTest_isinst_ldarg_il.TestClass::Test_LDARG(object,
                                                               bool)
       IL_000b:  brtrue.s   IL_001a
 
@@ -97,9 +97,9 @@
       IL_0017:  ldc.i4.s   101
       IL_0019:  ret
 
-      IL_001a:  newobj     instance void JitTest.DerivedClass::.ctor()
+      IL_001a:  newobj     instance void JitTest_isinst_ldarg_il.DerivedClass::.ctor()
       IL_001f:  ldc.i4.1
-      IL_0020:  call       bool JitTest.TestClass::Test_LDARG(object,
+      IL_0020:  call       bool JitTest_isinst_ldarg_il.TestClass::Test_LDARG(object,
                                                               bool)
       IL_0025:  brtrue.s   IL_0034
 
@@ -108,9 +108,9 @@
       IL_0031:  ldc.i4.s   102
       IL_0033:  ret
 
-      IL_0034:  newobj     instance void JitTest.BaseClass::.ctor()
+      IL_0034:  newobj     instance void JitTest_isinst_ldarg_il.BaseClass::.ctor()
       IL_0039:  ldc.i4.0
-      IL_003a:  call       bool JitTest.TestClass::Test_LDARG(object,
+      IL_003a:  call       bool JitTest_isinst_ldarg_il.TestClass::Test_LDARG(object,
                                                               bool)
       IL_003f:  brtrue.s   IL_004e
 
@@ -119,9 +119,9 @@
       IL_004b:  ldc.i4.s   103
       IL_004d:  ret
 
-      IL_004e:  newobj     instance void JitTest.OtherClass::.ctor()
+      IL_004e:  newobj     instance void JitTest_isinst_ldarg_il.OtherClass::.ctor()
       IL_0053:  ldc.i4.0
-      IL_0054:  call       bool JitTest.TestClass::Test_LDARG(object,
+      IL_0054:  call       bool JitTest_isinst_ldarg_il.TestClass::Test_LDARG(object,
                                                               bool)
       IL_0059:  brtrue.s   IL_0068
 
@@ -132,7 +132,7 @@
 
       IL_0068:  ldnull
       IL_0069:  ldc.i4.0
-      IL_006a:  call       bool JitTest.TestClass::Test_LDARG(object,
+      IL_006a:  call       bool JitTest_isinst_ldarg_il.TestClass::Test_LDARG(object,
                                                               bool)
       IL_006f:  brtrue.s   IL_007e
 
@@ -153,14 +153,14 @@
       // Code size       7 (0x7)
       .maxstack  8
       IL_0000:  ldarg.0
-      IL_0001:  call       instance void JitTest.BaseClass::.ctor()
+      IL_0001:  call       instance void JitTest_isinst_ldarg_il.BaseClass::.ctor()
       IL_0006:  ret
     } // end of method TestClass::.ctor
 
   } // end of class TestClass
 
   .class private auto ansi beforefieldinit DerivedClass
-         extends JitTest.TestClass
+         extends JitTest_isinst_ldarg_il.TestClass
   {
     .method public hidebysig specialname rtspecialname 
             instance void .ctor() cil managed
@@ -168,7 +168,7 @@
       // Code size       7 (0x7)
       .maxstack  8
       IL_0000:  ldarg.0
-      IL_0001:  call       instance void JitTest.TestClass::.ctor()
+      IL_0001:  call       instance void JitTest_isinst_ldarg_il.TestClass::.ctor()
       IL_0006:  ret
     } // end of method DerivedClass::.ctor
 
@@ -189,7 +189,7 @@
 
   } // end of class OtherClass
 
-} // end of namespace JitTest
+} // end of namespace JitTest_isinst_ldarg_il
 
 //*********** DISASSEMBLY COMPLETE ***********************
 // WARNING: Created Win32 resource file isinst_ldarg.res
diff --git a/src/tests/JIT/Methodical/casts/coverage/isinst_ldarg_d.csproj b/src/tests/JIT/Methodical/casts/coverage/isinst_ldarg_d.csproj
index 6f76e91dd0aac7..09556e49f06e3c 100644
--- a/src/tests/JIT/Methodical/casts/coverage/isinst_ldarg_d.csproj
+++ b/src/tests/JIT/Methodical/casts/coverage/isinst_ldarg_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/casts/coverage/isinst_ldarg_do.csproj b/src/tests/JIT/Methodical/casts/coverage/isinst_ldarg_do.csproj
index 6b4a11c5e95174..f4a1c3f8d88cb5 100644
--- a/src/tests/JIT/Methodical/casts/coverage/isinst_ldarg_do.csproj
+++ b/src/tests/JIT/Methodical/casts/coverage/isinst_ldarg_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/casts/coverage/isinst_ldarg_il_d.ilproj b/src/tests/JIT/Methodical/casts/coverage/isinst_ldarg_il_d.ilproj
index 0988c04c384306..85d4b6bf0eab3c 100644
--- a/src/tests/JIT/Methodical/casts/coverage/isinst_ldarg_il_d.ilproj
+++ b/src/tests/JIT/Methodical/casts/coverage/isinst_ldarg_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/casts/coverage/isinst_ldarg_il_r.ilproj b/src/tests/JIT/Methodical/casts/coverage/isinst_ldarg_il_r.ilproj
index ad9689c0aa4217..1070b21d9fe7b4 100644
--- a/src/tests/JIT/Methodical/casts/coverage/isinst_ldarg_il_r.ilproj
+++ b/src/tests/JIT/Methodical/casts/coverage/isinst_ldarg_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/casts/coverage/isinst_ldarg_r.csproj b/src/tests/JIT/Methodical/casts/coverage/isinst_ldarg_r.csproj
index 0ffb8d1369fce5..af3a549ee75321 100644
--- a/src/tests/JIT/Methodical/casts/coverage/isinst_ldarg_r.csproj
+++ b/src/tests/JIT/Methodical/casts/coverage/isinst_ldarg_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/casts/coverage/isinst_ldarg_ro.csproj b/src/tests/JIT/Methodical/casts/coverage/isinst_ldarg_ro.csproj
index 10a15e53c16218..232f43da676233 100644
--- a/src/tests/JIT/Methodical/casts/coverage/isinst_ldarg_ro.csproj
+++ b/src/tests/JIT/Methodical/casts/coverage/isinst_ldarg_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/casts/coverage/isinst_ldloc.cs b/src/tests/JIT/Methodical/casts/coverage/isinst_ldloc.cs
index a408c9a496189b..39881e50fdc9c8 100644
--- a/src/tests/JIT/Methodical/casts/coverage/isinst_ldloc.cs
+++ b/src/tests/JIT/Methodical/casts/coverage/isinst_ldloc.cs
@@ -2,12 +2,13 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_isinst_ldloc_cs
 {
-    internal class BaseClass { }
+    public class BaseClass { }
 
-    internal class TestClass : BaseClass
+    public class TestClass : BaseClass
     {
         private static bool Test_LDLOC(object _obj, bool flag)
         {
@@ -32,7 +33,8 @@ private static bool Test_LDLOC(object _obj, bool flag)
             }
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             if (!Test_LDLOC(new TestClass(), true))
             {
diff --git a/src/tests/JIT/Methodical/casts/coverage/isinst_ldloc.il b/src/tests/JIT/Methodical/casts/coverage/isinst_ldloc.il
index d9f9338f77aa2c..e5470351ccdbb6 100644
--- a/src/tests/JIT/Methodical/casts/coverage/isinst_ldloc.il
+++ b/src/tests/JIT/Methodical/casts/coverage/isinst_ldloc.il
@@ -11,7 +11,7 @@
 {
 }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_isinst_ldloc_il
 {
   .class private auto ansi beforefieldinit BaseClass
          extends [mscorlib]System.Object
@@ -28,8 +28,8 @@
 
   } // end of class BaseClass
 
-  .class private auto ansi beforefieldinit TestClass
-         extends JitTest.BaseClass
+  .class public auto ansi beforefieldinit TestClass
+         extends JitTest_isinst_ldloc_il.BaseClass
   {
     .method private hidebysig static bool 
             Test_LDLOC(object _obj,
@@ -38,7 +38,7 @@
       // Code size       43 (0x2b)
       .maxstack  2
       .locals (object V_0,
-               class JitTest.TestClass V_1,
+               class JitTest_isinst_ldloc_il.TestClass V_1,
                bool V_2)
       IL_0000:  ldarg.0
       IL_0001:  stloc.0
@@ -48,7 +48,7 @@
         IL_0003:  brfalse.s  IL_0016
 
         IL_0005:  ldloc 0
-        IL_0006:  isinst     JitTest.TestClass
+        IL_0006:  isinst     JitTest_isinst_ldloc_il.TestClass
         IL_000b:  stloc.1
         IL_000c:  ldloc.1
         IL_000d:  ldnull
@@ -59,7 +59,7 @@
         IL_0014:  leave.s    IL_0029
 
         IL_0016:  ldloc 0
-        IL_0017:  isinst     JitTest.TestClass
+        IL_0017:  isinst     JitTest_isinst_ldloc_il.TestClass
         IL_001c:  stloc.1
         IL_001d:  ldloc.1
         IL_001e:  ldnull
@@ -80,7 +80,7 @@
       IL_002a:  ret
     } // end of method TestClass::Test_LDLOC
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() cil managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -89,9 +89,9 @@
       .entrypoint
       // Code size       139 (0x8b)
       .maxstack  2
-      IL_0000:  newobj     instance void JitTest.TestClass::.ctor()
+      IL_0000:  newobj     instance void JitTest_isinst_ldloc_il.TestClass::.ctor()
       IL_0005:  ldc.i4.1
-      IL_0006:  call       bool JitTest.TestClass::Test_LDLOC(object,
+      IL_0006:  call       bool JitTest_isinst_ldloc_il.TestClass::Test_LDLOC(object,
                                                               bool)
       IL_000b:  brtrue.s   IL_001a
 
@@ -100,9 +100,9 @@
       IL_0017:  ldc.i4.s   101
       IL_0019:  ret
 
-      IL_001a:  newobj     instance void JitTest.DerivedClass::.ctor()
+      IL_001a:  newobj     instance void JitTest_isinst_ldloc_il.DerivedClass::.ctor()
       IL_001f:  ldc.i4.1
-      IL_0020:  call       bool JitTest.TestClass::Test_LDLOC(object,
+      IL_0020:  call       bool JitTest_isinst_ldloc_il.TestClass::Test_LDLOC(object,
                                                               bool)
       IL_0025:  brtrue.s   IL_0034
 
@@ -111,9 +111,9 @@
       IL_0031:  ldc.i4.s   102
       IL_0033:  ret
 
-      IL_0034:  newobj     instance void JitTest.BaseClass::.ctor()
+      IL_0034:  newobj     instance void JitTest_isinst_ldloc_il.BaseClass::.ctor()
       IL_0039:  ldc.i4.0
-      IL_003a:  call       bool JitTest.TestClass::Test_LDLOC(object,
+      IL_003a:  call       bool JitTest_isinst_ldloc_il.TestClass::Test_LDLOC(object,
                                                               bool)
       IL_003f:  brtrue.s   IL_004e
 
@@ -122,9 +122,9 @@
       IL_004b:  ldc.i4.s   103
       IL_004d:  ret
 
-      IL_004e:  newobj     instance void JitTest.OtherClass::.ctor()
+      IL_004e:  newobj     instance void JitTest_isinst_ldloc_il.OtherClass::.ctor()
       IL_0053:  ldc.i4.0
-      IL_0054:  call       bool JitTest.TestClass::Test_LDLOC(object,
+      IL_0054:  call       bool JitTest_isinst_ldloc_il.TestClass::Test_LDLOC(object,
                                                               bool)
       IL_0059:  brtrue.s   IL_0068
 
@@ -135,7 +135,7 @@
 
       IL_0068:  ldnull
       IL_0069:  ldc.i4.0
-      IL_006a:  call       bool JitTest.TestClass::Test_LDLOC(object,
+      IL_006a:  call       bool JitTest_isinst_ldloc_il.TestClass::Test_LDLOC(object,
                                                               bool)
       IL_006f:  brtrue.s   IL_007e
 
@@ -156,14 +156,14 @@
       // Code size       7 (0x7)
       .maxstack  8
       IL_0000:  ldarg.0
-      IL_0001:  call       instance void JitTest.BaseClass::.ctor()
+      IL_0001:  call       instance void JitTest_isinst_ldloc_il.BaseClass::.ctor()
       IL_0006:  ret
     } // end of method TestClass::.ctor
 
   } // end of class TestClass
 
   .class private auto ansi beforefieldinit DerivedClass
-         extends JitTest.TestClass
+         extends JitTest_isinst_ldloc_il.TestClass
   {
     .method public hidebysig specialname rtspecialname 
             instance void .ctor() cil managed
@@ -171,7 +171,7 @@
       // Code size       7 (0x7)
       .maxstack  8
       IL_0000:  ldarg.0
-      IL_0001:  call       instance void JitTest.TestClass::.ctor()
+      IL_0001:  call       instance void JitTest_isinst_ldloc_il.TestClass::.ctor()
       IL_0006:  ret
     } // end of method DerivedClass::.ctor
 
@@ -192,7 +192,7 @@
 
   } // end of class OtherClass
 
-} // end of namespace JitTest
+} // end of namespace JitTest_isinst_ldloc_il
 
 //*********** DISASSEMBLY COMPLETE ***********************
 // WARNING: Created Win32 resource file isinst_ldloc.res
diff --git a/src/tests/JIT/Methodical/casts/coverage/isinst_ldloc_d.csproj b/src/tests/JIT/Methodical/casts/coverage/isinst_ldloc_d.csproj
index edad6b3bf48be6..1d4336deda383c 100644
--- a/src/tests/JIT/Methodical/casts/coverage/isinst_ldloc_d.csproj
+++ b/src/tests/JIT/Methodical/casts/coverage/isinst_ldloc_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/casts/coverage/isinst_ldloc_do.csproj b/src/tests/JIT/Methodical/casts/coverage/isinst_ldloc_do.csproj
index a70f9df8571575..a506d8d3ac8430 100644
--- a/src/tests/JIT/Methodical/casts/coverage/isinst_ldloc_do.csproj
+++ b/src/tests/JIT/Methodical/casts/coverage/isinst_ldloc_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/casts/coverage/isinst_ldloc_il_d.ilproj b/src/tests/JIT/Methodical/casts/coverage/isinst_ldloc_il_d.ilproj
index fc8b6d9cce5b75..c597ec2b3a1910 100644
--- a/src/tests/JIT/Methodical/casts/coverage/isinst_ldloc_il_d.ilproj
+++ b/src/tests/JIT/Methodical/casts/coverage/isinst_ldloc_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/casts/coverage/isinst_ldloc_il_r.ilproj b/src/tests/JIT/Methodical/casts/coverage/isinst_ldloc_il_r.ilproj
index 14fab7a328c744..e5b489681b09bc 100644
--- a/src/tests/JIT/Methodical/casts/coverage/isinst_ldloc_il_r.ilproj
+++ b/src/tests/JIT/Methodical/casts/coverage/isinst_ldloc_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/casts/coverage/isinst_ldloc_r.csproj b/src/tests/JIT/Methodical/casts/coverage/isinst_ldloc_r.csproj
index 3fd5be8c2086d0..ecc73fc3c2ceba 100644
--- a/src/tests/JIT/Methodical/casts/coverage/isinst_ldloc_r.csproj
+++ b/src/tests/JIT/Methodical/casts/coverage/isinst_ldloc_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/casts/coverage/isinst_ldloc_ro.csproj b/src/tests/JIT/Methodical/casts/coverage/isinst_ldloc_ro.csproj
index 24d15a4fb42a67..df508d31d0e6b9 100644
--- a/src/tests/JIT/Methodical/casts/coverage/isinst_ldloc_ro.csproj
+++ b/src/tests/JIT/Methodical/casts/coverage/isinst_ldloc_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/casts/coverage/isinst_newobj.cs b/src/tests/JIT/Methodical/casts/coverage/isinst_newobj.cs
index 2d83da470165ab..4e7563dceb5c91 100644
--- a/src/tests/JIT/Methodical/casts/coverage/isinst_newobj.cs
+++ b/src/tests/JIT/Methodical/casts/coverage/isinst_newobj.cs
@@ -2,12 +2,13 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_isinst_newobj_cs
 {
-    internal class BaseClass { }
+    public class BaseClass { }
 
-    internal class TestClass : BaseClass
+    public class TestClass : BaseClass
     {
         private static bool Test_NEWOBJ(TestClass _this, int cookie, bool flag)
         {
@@ -47,7 +48,8 @@ private static bool Test_NEWOBJ(TestClass _this, int cookie, bool flag)
             }
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             TestClass _this = new TestClass();
             if (!Test_NEWOBJ(_this, 0, true))
diff --git a/src/tests/JIT/Methodical/casts/coverage/isinst_newobj_d.csproj b/src/tests/JIT/Methodical/casts/coverage/isinst_newobj_d.csproj
index a5b260d093688b..7706b734b03e06 100644
--- a/src/tests/JIT/Methodical/casts/coverage/isinst_newobj_d.csproj
+++ b/src/tests/JIT/Methodical/casts/coverage/isinst_newobj_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/casts/coverage/isinst_newobj_do.csproj b/src/tests/JIT/Methodical/casts/coverage/isinst_newobj_do.csproj
index b20aa07b75bffd..5cff27368e1951 100644
--- a/src/tests/JIT/Methodical/casts/coverage/isinst_newobj_do.csproj
+++ b/src/tests/JIT/Methodical/casts/coverage/isinst_newobj_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/casts/coverage/isinst_newobj_r.csproj b/src/tests/JIT/Methodical/casts/coverage/isinst_newobj_r.csproj
index b735b149e94d7d..bfa18c5cb47516 100644
--- a/src/tests/JIT/Methodical/casts/coverage/isinst_newobj_r.csproj
+++ b/src/tests/JIT/Methodical/casts/coverage/isinst_newobj_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/casts/coverage/isinst_newobj_ro.csproj b/src/tests/JIT/Methodical/casts/coverage/isinst_newobj_ro.csproj
index 8eb6f5955a6525..b7c2dfff76eb61 100644
--- a/src/tests/JIT/Methodical/casts/coverage/isinst_newobj_ro.csproj
+++ b/src/tests/JIT/Methodical/casts/coverage/isinst_newobj_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/casts/coverage/ldnull.il b/src/tests/JIT/Methodical/casts/coverage/ldnull.il
index 930858a953909e..fa535acc672cbc 100644
--- a/src/tests/JIT/Methodical/casts/coverage/ldnull.il
+++ b/src/tests/JIT/Methodical/casts/coverage/ldnull.il
@@ -11,12 +11,12 @@
 {
 }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_ldnull_il
 {
-  .class private auto ansi beforefieldinit TestClass
+  .class public auto ansi beforefieldinit TestClass
          extends [mscorlib]System.Object
   {
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() cil managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -25,14 +25,14 @@
       .entrypoint
       // Code size       36 (0x24)
       .maxstack  2
-      .locals (class JitTest.TestClass V_0,
-               class JitTest.TestClass V_1)
+      .locals (class JitTest_ldnull_il.TestClass V_0,
+               class JitTest_ldnull_il.TestClass V_1)
       ldnull
-      isinst JitTest.TestClass
+      isinst JitTest_ldnull_il.TestClass
       stloc.0
       
       ldnull
-      castclass JitTest.TestClass
+      castclass JitTest_ldnull_il.TestClass
       stloc.1
       
       IL_0004:  ldloc.0
@@ -64,7 +64,7 @@
 
   } // end of class TestClass
 
-} // end of namespace JitTest
+} // end of namespace JitTest_ldnull_il
 
 //*********** DISASSEMBLY COMPLETE ***********************
 // WARNING: Created Win32 resource file ldnull.res
diff --git a/src/tests/JIT/Methodical/casts/coverage/ldnull_il_d.ilproj b/src/tests/JIT/Methodical/casts/coverage/ldnull_il_d.ilproj
index 622bb12b2c9c36..176d35eacd400b 100644
--- a/src/tests/JIT/Methodical/casts/coverage/ldnull_il_d.ilproj
+++ b/src/tests/JIT/Methodical/casts/coverage/ldnull_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/casts/coverage/ldnull_il_r.ilproj b/src/tests/JIT/Methodical/casts/coverage/ldnull_il_r.ilproj
index 2e9e72d0f7c4b7..57fe3e6a7ee815 100644
--- a/src/tests/JIT/Methodical/casts/coverage/ldnull_il_r.ilproj
+++ b/src/tests/JIT/Methodical/casts/coverage/ldnull_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/casts/iface/iface1.cs b/src/tests/JIT/Methodical/casts/iface/iface1.cs
index 4403aa65a7315e..3110c8a5a1123a 100644
--- a/src/tests/JIT/Methodical/casts/iface/iface1.cs
+++ b/src/tests/JIT/Methodical/casts/iface/iface1.cs
@@ -2,8 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_iface1_cs
 {
     internal interface Iface1
     {
@@ -20,13 +21,13 @@ internal interface Iface3 : Iface1
         int Method3a();
     }
 
-    internal class BaseClass : Iface2
+    public class BaseClass : Iface2
     {
         public int Method1a() { return 1; }
         public int Method2a() { return 10; }
     }
 
-    internal class CoClass : BaseClass, Iface3
+    public class CoClass : BaseClass, Iface3
     {
         public int Method3a() { return 100; }
 
@@ -94,7 +95,8 @@ private static int Static5(Iface2 i)
                 ;
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             CoClass co = new CoClass();
             if (Static1(co) != 444)
diff --git a/src/tests/JIT/Methodical/casts/iface/iface1_d.csproj b/src/tests/JIT/Methodical/casts/iface/iface1_d.csproj
index 42bcc767a81fa2..95cf71986f5609 100644
--- a/src/tests/JIT/Methodical/casts/iface/iface1_d.csproj
+++ b/src/tests/JIT/Methodical/casts/iface/iface1_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/casts/iface/iface1_do.csproj b/src/tests/JIT/Methodical/casts/iface/iface1_do.csproj
index ad7035d966f5d3..27e353c81cb255 100644
--- a/src/tests/JIT/Methodical/casts/iface/iface1_do.csproj
+++ b/src/tests/JIT/Methodical/casts/iface/iface1_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/casts/iface/iface1_r.csproj b/src/tests/JIT/Methodical/casts/iface/iface1_r.csproj
index 4c3db61c53e5cd..dd51799d80bdb5 100644
--- a/src/tests/JIT/Methodical/casts/iface/iface1_r.csproj
+++ b/src/tests/JIT/Methodical/casts/iface/iface1_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/casts/iface/iface1_ro.csproj b/src/tests/JIT/Methodical/casts/iface/iface1_ro.csproj
index 2969aff28f0f40..59f6378b41e3ca 100644
--- a/src/tests/JIT/Methodical/casts/iface/iface1_ro.csproj
+++ b/src/tests/JIT/Methodical/casts/iface/iface1_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/casts/iface/iface2.il b/src/tests/JIT/Methodical/casts/iface/iface2.il
index 8cac136a5335e6..65f0e6918395df 100644
--- a/src/tests/JIT/Methodical/casts/iface/iface2.il
+++ b/src/tests/JIT/Methodical/casts/iface/iface2.il
@@ -10,7 +10,7 @@
 }
 .assembly iface2 { }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_iface2_il
 {
   .class interface private abstract auto ansi Iface1
   {
@@ -18,21 +18,21 @@
             instance int32 Method1a() cil managed { }
   }
   .class interface private abstract auto ansi Iface2
-         implements JitTest.Iface1
+         implements JitTest_iface2_il.Iface1
   {
     .method public hidebysig newslot virtual abstract 
             instance int32 Method2a() cil managed { }
   }
   .class interface private abstract auto ansi Iface3
-         implements JitTest.Iface1
+         implements JitTest_iface2_il.Iface1
   {
     .method public hidebysig newslot virtual abstract 
             instance int32 Method3a() cil managed { }
   }
   .class private auto ansi beforefieldinit BaseClass
          extends [mscorlib]System.Object
-         implements JitTest.Iface2,
-                    JitTest.Iface1
+         implements JitTest_iface2_il.Iface2,
+                    JitTest_iface2_il.Iface1
   {
     .method public hidebysig newslot final virtual 
             instance int32 Method1a() cil managed
@@ -57,10 +57,10 @@
       ret
     }
   }
-  .class private auto ansi beforefieldinit CoClass
-         extends JitTest.BaseClass
-         implements JitTest.Iface3,
-                    JitTest.Iface1
+  .class public auto ansi beforefieldinit CoClass
+         extends JitTest_iface2_il.BaseClass
+         implements JitTest_iface2_il.Iface3,
+                    JitTest_iface2_il.Iface1
   {
     .method public hidebysig newslot final virtual 
             instance int32 Method3a() cil managed
@@ -70,43 +70,43 @@
       ret
     }
     .method private hidebysig static int32 
-            Static0(class JitTest.BaseClass co) cil managed
+            Static0(class JitTest_iface2_il.BaseClass co) cil managed
     {
       .maxstack  2
       .locals (int32)
       ldc.i4.0
       ldarg.0
-      castclass  JitTest.Iface1
-      callvirt   instance int32 JitTest.Iface1::Method1a()
+      castclass  JitTest_iface2_il.Iface1
+      callvirt   instance int32 JitTest_iface2_il.Iface1::Method1a()
       add
       
       ldarg.0
-      castclass  JitTest.Iface1
-      callvirt   instance int32 JitTest.Iface1::Method1a()
+      castclass  JitTest_iface2_il.Iface1
+      callvirt   instance int32 JitTest_iface2_il.Iface1::Method1a()
       add
 
       ldarg.0
-      castclass  JitTest.Iface2
-      callvirt   instance int32 JitTest.Iface2::Method2a()
+      castclass  JitTest_iface2_il.Iface2
+      callvirt   instance int32 JitTest_iface2_il.Iface2::Method2a()
       add
       
       ldarg.0
-      castclass  JitTest.Iface2
-      callvirt   instance int32 JitTest.Iface2::Method2a()
+      castclass  JitTest_iface2_il.Iface2
+      callvirt   instance int32 JitTest_iface2_il.Iface2::Method2a()
       add
 
       ldarg.0
-      isinst     JitTest.Iface3
+      isinst     JitTest_iface2_il.Iface3
       brfalse.s  IL_004c
 
       ldarg.0
-      castclass  JitTest.Iface3
-      callvirt   instance int32 JitTest.Iface3::Method3a()
+      castclass  JitTest_iface2_il.Iface3
+      callvirt   instance int32 JitTest_iface2_il.Iface3::Method3a()
       add
       
       ldarg.0
-      isinst     JitTest.Iface3
-      callvirt   instance int32 JitTest.Iface3::Method3a()
+      isinst     JitTest_iface2_il.Iface3
+      callvirt   instance int32 JitTest_iface2_il.Iface3::Method3a()
       add
       
       br.s       IL_0071
@@ -116,11 +116,11 @@
       .try
       {
         ldarg.0
-        castclass  JitTest.Iface3
-        callvirt   instance int32 JitTest.Iface3::Method3a()
+        castclass  JitTest_iface2_il.Iface3
+        callvirt   instance int32 JitTest_iface2_il.Iface3::Method3a()
         ldarg.0
-        isinst     JitTest.Iface3
-        callvirt   instance int32 JitTest.Iface3::Method3a()
+        isinst     JitTest_iface2_il.Iface3
+        callvirt   instance int32 JitTest_iface2_il.Iface3::Method3a()
         add
         ldloc.0
         add
@@ -142,71 +142,71 @@
       ret
     }
     .method private hidebysig static int32 
-            Static1(class JitTest.Iface1 i) cil managed
+            Static1(class JitTest_iface2_il.Iface1 i) cil managed
     {
       .maxstack  2
       ldarg.0
-      castclass  JitTest.CoClass
-      call       int32 JitTest.CoClass::Static0(class JitTest.BaseClass)
+      castclass  JitTest_iface2_il.CoClass
+      call       int32 JitTest_iface2_il.CoClass::Static0(class JitTest_iface2_il.BaseClass)
       ldarg.0
-      isinst     JitTest.CoClass
-      call       int32 JitTest.CoClass::Static0(class JitTest.BaseClass)
+      isinst     JitTest_iface2_il.CoClass
+      call       int32 JitTest_iface2_il.CoClass::Static0(class JitTest_iface2_il.BaseClass)
       add
       ret
     }
     .method private hidebysig static int32 
-            Static2(class JitTest.Iface2 i) cil managed
+            Static2(class JitTest_iface2_il.Iface2 i) cil managed
     {
       .maxstack  2
       ldarg.0
-      castclass  JitTest.CoClass
-      call       int32 JitTest.CoClass::Static0(class JitTest.BaseClass)
+      castclass  JitTest_iface2_il.CoClass
+      call       int32 JitTest_iface2_il.CoClass::Static0(class JitTest_iface2_il.BaseClass)
       ldarg.0
-      isinst     JitTest.CoClass
-      call       int32 JitTest.CoClass::Static0(class JitTest.BaseClass)
+      isinst     JitTest_iface2_il.CoClass
+      call       int32 JitTest_iface2_il.CoClass::Static0(class JitTest_iface2_il.BaseClass)
       add
       ret
     }
     .method private hidebysig static int32 
-            Static3(class JitTest.Iface3 i) cil managed
+            Static3(class JitTest_iface2_il.Iface3 i) cil managed
     {
       .maxstack  2
       ldarg.0
-      castclass  JitTest.CoClass
-      call       int32 JitTest.CoClass::Static0(class JitTest.BaseClass)
+      castclass  JitTest_iface2_il.CoClass
+      call       int32 JitTest_iface2_il.CoClass::Static0(class JitTest_iface2_il.BaseClass)
       ldarg.0
-      isinst     JitTest.CoClass
-      call       int32 JitTest.CoClass::Static0(class JitTest.BaseClass)
+      isinst     JitTest_iface2_il.CoClass
+      call       int32 JitTest_iface2_il.CoClass::Static0(class JitTest_iface2_il.BaseClass)
       add
       ret
     }
     .method private hidebysig static int32 
-            Static4(class JitTest.Iface1 i) cil managed
+            Static4(class JitTest_iface2_il.Iface1 i) cil managed
     {
       .maxstack  2
       ldarg.0
-      castclass  JitTest.BaseClass
-      call       int32 JitTest.CoClass::Static0(class JitTest.BaseClass)
+      castclass  JitTest_iface2_il.BaseClass
+      call       int32 JitTest_iface2_il.CoClass::Static0(class JitTest_iface2_il.BaseClass)
       ldarg.0
-      isinst     JitTest.BaseClass
-      call       int32 JitTest.CoClass::Static0(class JitTest.BaseClass)
+      isinst     JitTest_iface2_il.BaseClass
+      call       int32 JitTest_iface2_il.CoClass::Static0(class JitTest_iface2_il.BaseClass)
       add
       ret
     }
     .method private hidebysig static int32 
-            Static5(class JitTest.Iface2 i) cil managed
+            Static5(class JitTest_iface2_il.Iface2 i) cil managed
     {
       .maxstack  2
       ldarg.0
-      castclass  JitTest.BaseClass
-      call       int32 JitTest.CoClass::Static0(class JitTest.BaseClass)
+      castclass  JitTest_iface2_il.BaseClass
+      call       int32 JitTest_iface2_il.CoClass::Static0(class JitTest_iface2_il.BaseClass)
       ldarg.0
-      isinst     JitTest.BaseClass
-      call       int32 JitTest.CoClass::Static0(class JitTest.BaseClass)
+      isinst     JitTest_iface2_il.BaseClass
+      call       int32 JitTest_iface2_il.CoClass::Static0(class JitTest_iface2_il.BaseClass)
       add
       ret
     }
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() cil managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -214,13 +214,13 @@
       )
       .entrypoint
       .maxstack  2
-      .locals ([0] class JitTest.CoClass co,
-               [1] class JitTest.BaseClass bs,
+      .locals ([0] class JitTest_iface2_il.CoClass co,
+               [1] class JitTest_iface2_il.BaseClass bs,
                [2] int32 _Vb_t_$00000003$00000000)
-      IL_0000:  newobj     instance void JitTest.CoClass::.ctor()
+      IL_0000:  newobj     instance void JitTest_iface2_il.CoClass::.ctor()
       IL_0005:  stloc.0
       IL_0006:  ldloc.0
-      IL_0007:  call       int32 JitTest.CoClass::Static1(class JitTest.Iface1)
+      IL_0007:  call       int32 JitTest_iface2_il.CoClass::Static1(class JitTest_iface2_il.Iface1)
       IL_000c:  ldc.i4     0x1bc
       IL_0011:  beq.s      IL_0025
       IL_0013:  ldstr      "Test 1 failed."
@@ -228,7 +228,7 @@
       IL_001d:  ldc.i4.s   101
       IL_001f:  ret
       IL_0025:  ldloc.0
-      IL_0026:  call       int32 JitTest.CoClass::Static2(class JitTest.Iface2)
+      IL_0026:  call       int32 JitTest_iface2_il.CoClass::Static2(class JitTest_iface2_il.Iface2)
       IL_002b:  ldc.i4     0x1bc
       IL_0030:  beq.s      IL_0041
       IL_0032:  ldstr      "Test 2 failed."
@@ -236,17 +236,17 @@
       IL_003c:  ldc.i4.s   102
       IL_003e:  ret
       IL_0041:  ldloc.0
-      IL_0042:  call       int32 JitTest.CoClass::Static3(class JitTest.Iface3)
+      IL_0042:  call       int32 JitTest_iface2_il.CoClass::Static3(class JitTest_iface2_il.Iface3)
       IL_0047:  ldc.i4     0x1bc
       IL_004c:  beq.s      IL_005d
       IL_004e:  ldstr      "Test 3 failed."
       IL_0053:  call       void [System.Console]System.Console::WriteLine(string)
       IL_0058:  ldc.i4.s   103
       IL_005a:  ret
-      IL_005d:  newobj     instance void JitTest.BaseClass::.ctor()
+      IL_005d:  newobj     instance void JitTest_iface2_il.BaseClass::.ctor()
       IL_0062:  stloc.1
       IL_0063:  ldloc.1
-      IL_0064:  call       int32 JitTest.CoClass::Static4(class JitTest.Iface1)
+      IL_0064:  call       int32 JitTest_iface2_il.CoClass::Static4(class JitTest_iface2_il.Iface1)
       IL_0069:  ldc.i4     0x7fc
       IL_006e:  beq.s      IL_007f
       IL_0070:  ldstr      "Test 4 failed."
@@ -254,7 +254,7 @@
       IL_007a:  ldc.i4.s   104
       IL_007c:  ret
       IL_007f:  ldloc.1
-      IL_0080:  call       int32 JitTest.CoClass::Static5(class JitTest.Iface2)
+      IL_0080:  call       int32 JitTest_iface2_il.CoClass::Static5(class JitTest_iface2_il.Iface2)
       IL_0085:  ldc.i4     0x7fc
       IL_008a:  beq.s      IL_009b
       IL_008c:  ldstr      "Test 5 failed."
@@ -271,7 +271,7 @@
     {
       .maxstack  8
       IL_0000:  ldarg.0
-      IL_0001:  call       instance void JitTest.BaseClass::.ctor()
+      IL_0001:  call       instance void JitTest_iface2_il.BaseClass::.ctor()
       IL_0006:  ret
     }
   }
diff --git a/src/tests/JIT/Methodical/casts/iface/iface2_il_d.ilproj b/src/tests/JIT/Methodical/casts/iface/iface2_il_d.ilproj
index db972c7eebe0ff..1fa162d784524c 100644
--- a/src/tests/JIT/Methodical/casts/iface/iface2_il_d.ilproj
+++ b/src/tests/JIT/Methodical/casts/iface/iface2_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/casts/iface/iface2_il_r.ilproj b/src/tests/JIT/Methodical/casts/iface/iface2_il_r.ilproj
index 11d39b6e527f62..31bc9b8332a68a 100644
--- a/src/tests/JIT/Methodical/casts/iface/iface2_il_r.ilproj
+++ b/src/tests/JIT/Methodical/casts/iface/iface2_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/casts/ilseq/CommonBase_il_r.csproj b/src/tests/JIT/Methodical/casts/ilseq/CommonBase_il_r.csproj
index 67efa2676958b0..93f737397ab5c2 100644
--- a/src/tests/JIT/Methodical/casts/ilseq/CommonBase_il_r.csproj
+++ b/src/tests/JIT/Methodical/casts/ilseq/CommonBase_il_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/casts/ilseq/commonBase.cs b/src/tests/JIT/Methodical/casts/ilseq/commonBase.cs
index ac5d4f6a217f9c..36b24511d2347a 100644
--- a/src/tests/JIT/Methodical/casts/ilseq/commonBase.cs
+++ b/src/tests/JIT/Methodical/casts/ilseq/commonBase.cs
@@ -2,12 +2,15 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
+namespace Test_commonBase_cs
+{
 internal class Base { };
 internal class Sibling1 : Base { };
 internal class Sibling2 : Base { };
 
-internal static class Repro
+public static class Repro
 {
     private static int Bug(object o)
     {
@@ -39,8 +42,10 @@ private static int Bug(object o)
         return 0;
     }
 
-    private static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         return Bug(new Sibling2());
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/cctor/misc/Desktop/throw.cs b/src/tests/JIT/Methodical/cctor/misc/Desktop/throw.cs
index afba9f7118231c..af6712c621784c 100644
--- a/src/tests/JIT/Methodical/cctor/misc/Desktop/throw.cs
+++ b/src/tests/JIT/Methodical/cctor/misc/Desktop/throw.cs
@@ -3,6 +3,9 @@
 
 
 using System;
+using Xunit;
+namespace Test_throw_Desktop_cs
+{
 internal class measure
 {
     public static int a = 0xCC;
@@ -31,9 +34,10 @@ static test()
     }
 }
 
-internal class Driver
+public class Driver
 {
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         try
         {
@@ -65,3 +69,4 @@ public static int Main()
         return -1;
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/cctor/misc/Desktop/throw_Desktop_cs_d.csproj b/src/tests/JIT/Methodical/cctor/misc/Desktop/throw_Desktop_cs_d.csproj
index 50e5c6df15b6a1..d0422f126ad4f1 100644
--- a/src/tests/JIT/Methodical/cctor/misc/Desktop/throw_Desktop_cs_d.csproj
+++ b/src/tests/JIT/Methodical/cctor/misc/Desktop/throw_Desktop_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/cctor/misc/Desktop/throw_Desktop_cs_do.csproj b/src/tests/JIT/Methodical/cctor/misc/Desktop/throw_Desktop_cs_do.csproj
index 338d33089aa12b..8a9baf1d90eebf 100644
--- a/src/tests/JIT/Methodical/cctor/misc/Desktop/throw_Desktop_cs_do.csproj
+++ b/src/tests/JIT/Methodical/cctor/misc/Desktop/throw_Desktop_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/cctor/misc/Desktop/throw_Desktop_cs_r.csproj b/src/tests/JIT/Methodical/cctor/misc/Desktop/throw_Desktop_cs_r.csproj
index 0f620830389d68..cf3e1f1bcecf48 100644
--- a/src/tests/JIT/Methodical/cctor/misc/Desktop/throw_Desktop_cs_r.csproj
+++ b/src/tests/JIT/Methodical/cctor/misc/Desktop/throw_Desktop_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/cctor/misc/Desktop/throw_Desktop_cs_ro.csproj b/src/tests/JIT/Methodical/cctor/misc/Desktop/throw_Desktop_cs_ro.csproj
index 1f8ec132a4c25c..51221089f4fcbd 100644
--- a/src/tests/JIT/Methodical/cctor/misc/Desktop/throw_Desktop_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/cctor/misc/Desktop/throw_Desktop_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/cctor/misc/assemname.cs b/src/tests/JIT/Methodical/cctor/misc/assemname.cs
index 0bd4d577514d8f..3f8d0be75201ba 100644
--- a/src/tests/JIT/Methodical/cctor/misc/assemname.cs
+++ b/src/tests/JIT/Methodical/cctor/misc/assemname.cs
@@ -4,12 +4,14 @@
 // static field
 
 using System;
+using Xunit;
 
 namespace Precise
 {
-    internal class Driver_assemname
+    public class Driver_assemname
     {
-        public static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             try
             {
diff --git a/src/tests/JIT/Methodical/cctor/misc/assemname_cs_d.csproj b/src/tests/JIT/Methodical/cctor/misc/assemname_cs_d.csproj
index 817cd186f94187..ae32f910d88070 100644
--- a/src/tests/JIT/Methodical/cctor/misc/assemname_cs_d.csproj
+++ b/src/tests/JIT/Methodical/cctor/misc/assemname_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/cctor/misc/assemname_cs_do.csproj b/src/tests/JIT/Methodical/cctor/misc/assemname_cs_do.csproj
index b578dc11c22498..6f7dbf4092996d 100644
--- a/src/tests/JIT/Methodical/cctor/misc/assemname_cs_do.csproj
+++ b/src/tests/JIT/Methodical/cctor/misc/assemname_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/cctor/misc/assemname_cs_r.csproj b/src/tests/JIT/Methodical/cctor/misc/assemname_cs_r.csproj
index bbd9a7d9597d6f..937996abc9bb09 100644
--- a/src/tests/JIT/Methodical/cctor/misc/assemname_cs_r.csproj
+++ b/src/tests/JIT/Methodical/cctor/misc/assemname_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/cctor/misc/assemname_cs_ro.csproj b/src/tests/JIT/Methodical/cctor/misc/assemname_cs_ro.csproj
index e3fa775c15942d..844560f626cec8 100644
--- a/src/tests/JIT/Methodical/cctor/misc/assemname_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/cctor/misc/assemname_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/cctor/misc/deadlock_il_d.ilproj b/src/tests/JIT/Methodical/cctor/misc/deadlock_il_d.ilproj
index 56e2a31aa12ce6..fe175449c1d468 100644
--- a/src/tests/JIT/Methodical/cctor/misc/deadlock_il_d.ilproj
+++ b/src/tests/JIT/Methodical/cctor/misc/deadlock_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/cctor/misc/deadlock_il_r.ilproj b/src/tests/JIT/Methodical/cctor/misc/deadlock_il_r.ilproj
index b736e37b66759b..d6ac237d2d54cd 100644
--- a/src/tests/JIT/Methodical/cctor/misc/deadlock_il_r.ilproj
+++ b/src/tests/JIT/Methodical/cctor/misc/deadlock_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/cctor/misc/global.il b/src/tests/JIT/Methodical/cctor/misc/global.il
index 8408bbb2299b24..fdd40f57fb2fe8 100644
--- a/src/tests/JIT/Methodical/cctor/misc/global.il
+++ b/src/tests/JIT/Methodical/cctor/misc/global.il
@@ -1,4 +1,5 @@
 .assembly extern legacy library mscorlib {}
+.assembly extern xunit.core {}
 .assembly global {}
 .field static public int32 a at D_00
 
@@ -9,11 +10,16 @@ stsfld int32 a
 ret
 }
 
+.class public auto ansi Test_global extends [mscorlib] System.Object {
 .method public static int32 Main()
 {
+.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+    01 00 00 00
+)
 .entrypoint
 ldsfld int32 a
 ret
 }
 
 .data D_00 = int32(1)
+}
diff --git a/src/tests/JIT/Methodical/cctor/misc/global_il_d.ilproj b/src/tests/JIT/Methodical/cctor/misc/global_il_d.ilproj
index b6ab73876cf9c2..8d78370a923c61 100644
--- a/src/tests/JIT/Methodical/cctor/misc/global_il_d.ilproj
+++ b/src/tests/JIT/Methodical/cctor/misc/global_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
     <!-- Test relies on rva_statics support see #2451 -->
     <DisableProjectBuild>true</DisableProjectBuild>
diff --git a/src/tests/JIT/Methodical/cctor/misc/global_il_r.ilproj b/src/tests/JIT/Methodical/cctor/misc/global_il_r.ilproj
index 71875ec9e8b2a2..2ae304e1fd3f27 100644
--- a/src/tests/JIT/Methodical/cctor/misc/global_il_r.ilproj
+++ b/src/tests/JIT/Methodical/cctor/misc/global_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
     <!-- Test relies on rva_statics support see #2451 -->
     <DisableProjectBuild>true</DisableProjectBuild>
diff --git a/src/tests/JIT/Methodical/cctor/misc/threads1.cs b/src/tests/JIT/Methodical/cctor/misc/threads1.cs
index 1f026536a73200..0a3aed1dc76783 100644
--- a/src/tests/JIT/Methodical/cctor/misc/threads1.cs
+++ b/src/tests/JIT/Methodical/cctor/misc/threads1.cs
@@ -5,16 +5,18 @@
 
 using System;
 using System.Threading;
+using Xunit;
 
 namespace Precise
 {
-    internal class Driver_threads1
+    public class Driver_threads1
     {
         public static void f()
         {
             test.b = 0xF;
         }
-        public static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             try
             {
diff --git a/src/tests/JIT/Methodical/cctor/misc/threads1_cs_d.csproj b/src/tests/JIT/Methodical/cctor/misc/threads1_cs_d.csproj
index ffe0c4acc835b1..309891b38bc381 100644
--- a/src/tests/JIT/Methodical/cctor/misc/threads1_cs_d.csproj
+++ b/src/tests/JIT/Methodical/cctor/misc/threads1_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
     <RequiresProcessIsolation>true</RequiresProcessIsolation>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/cctor/misc/threads1_cs_do.csproj b/src/tests/JIT/Methodical/cctor/misc/threads1_cs_do.csproj
index c2bfbcd68bb6d7..f75a5dda540eac 100644
--- a/src/tests/JIT/Methodical/cctor/misc/threads1_cs_do.csproj
+++ b/src/tests/JIT/Methodical/cctor/misc/threads1_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RequiresProcessIsolation>true</RequiresProcessIsolation>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/cctor/misc/threads1_cs_r.csproj b/src/tests/JIT/Methodical/cctor/misc/threads1_cs_r.csproj
index 8d4b8aba86b9ec..11ebaf8c943502 100644
--- a/src/tests/JIT/Methodical/cctor/misc/threads1_cs_r.csproj
+++ b/src/tests/JIT/Methodical/cctor/misc/threads1_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
     <RequiresProcessIsolation>true</RequiresProcessIsolation>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/cctor/misc/threads1_cs_ro.csproj b/src/tests/JIT/Methodical/cctor/misc/threads1_cs_ro.csproj
index 0d64038e29630e..1f8bf1bcdf6f96 100644
--- a/src/tests/JIT/Methodical/cctor/misc/threads1_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/cctor/misc/threads1_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
     <RequiresProcessIsolation>true</RequiresProcessIsolation>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/cctor/misc/threads2.cs b/src/tests/JIT/Methodical/cctor/misc/threads2.cs
index ef08f2d708119c..ccd4f38fdb3d2a 100644
--- a/src/tests/JIT/Methodical/cctor/misc/threads2.cs
+++ b/src/tests/JIT/Methodical/cctor/misc/threads2.cs
@@ -6,16 +6,18 @@
 using System;
 using System.Threading;
 using System.Runtime.CompilerServices;
+using Xunit;
 
 namespace Precise
 {
-    internal class Driver_threads2
+    public class Driver_threads2
     {
         public static void f()
         {
             RuntimeHelpers.RunClassConstructor(typeof(test).TypeHandle);
         }
-        public static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             try
             {
diff --git a/src/tests/JIT/Methodical/cctor/misc/threads2_cs_d.csproj b/src/tests/JIT/Methodical/cctor/misc/threads2_cs_d.csproj
index 8723b772de0cbb..9d915a5d808627 100644
--- a/src/tests/JIT/Methodical/cctor/misc/threads2_cs_d.csproj
+++ b/src/tests/JIT/Methodical/cctor/misc/threads2_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
     <RequiresProcessIsolation>true</RequiresProcessIsolation>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/cctor/misc/threads2_cs_do.csproj b/src/tests/JIT/Methodical/cctor/misc/threads2_cs_do.csproj
index 2f8bcd03eeaae8..c7f4c2f5f35af7 100644
--- a/src/tests/JIT/Methodical/cctor/misc/threads2_cs_do.csproj
+++ b/src/tests/JIT/Methodical/cctor/misc/threads2_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
     <CLRTestPriority>1</CLRTestPriority>
     <RequiresProcessIsolation>true</RequiresProcessIsolation>
diff --git a/src/tests/JIT/Methodical/cctor/misc/threads2_cs_r.csproj b/src/tests/JIT/Methodical/cctor/misc/threads2_cs_r.csproj
index 8a2eb7e7f661ec..fc3b9fe80417c4 100644
--- a/src/tests/JIT/Methodical/cctor/misc/threads2_cs_r.csproj
+++ b/src/tests/JIT/Methodical/cctor/misc/threads2_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
     <RequiresProcessIsolation>true</RequiresProcessIsolation>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/cctor/misc/threads2_cs_ro.csproj b/src/tests/JIT/Methodical/cctor/misc/threads2_cs_ro.csproj
index d68c6f318063b2..49a2e2243a19e8 100644
--- a/src/tests/JIT/Methodical/cctor/misc/threads2_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/cctor/misc/threads2_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
     <RequiresProcessIsolation>true</RequiresProcessIsolation>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/cctor/misc/throw.cs b/src/tests/JIT/Methodical/cctor/misc/throw.cs
index 3e5d3e8dd02a49..419084091cf1cf 100644
--- a/src/tests/JIT/Methodical/cctor/misc/throw.cs
+++ b/src/tests/JIT/Methodical/cctor/misc/throw.cs
@@ -2,6 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
+namespace Test_throw_misc_cs
+{
 internal class measure
 {
     public static int a = 0xCC;
@@ -30,9 +33,10 @@ static test()
     }
 }
 
-internal class Driver
+public class Driver
 {
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         try
         {
@@ -64,3 +68,4 @@ public static int Main()
         return -1;
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/cctor/misc/throw_misc_cs_d.csproj b/src/tests/JIT/Methodical/cctor/misc/throw_misc_cs_d.csproj
index 09e048ef17efd5..6e8e315a8b3e55 100644
--- a/src/tests/JIT/Methodical/cctor/misc/throw_misc_cs_d.csproj
+++ b/src/tests/JIT/Methodical/cctor/misc/throw_misc_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
diff --git a/src/tests/JIT/Methodical/cctor/misc/throw_misc_cs_do.csproj b/src/tests/JIT/Methodical/cctor/misc/throw_misc_cs_do.csproj
index d22f37bc8ce1ec..ea7d25ec30a149 100644
--- a/src/tests/JIT/Methodical/cctor/misc/throw_misc_cs_do.csproj
+++ b/src/tests/JIT/Methodical/cctor/misc/throw_misc_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
diff --git a/src/tests/JIT/Methodical/cctor/misc/throw_misc_cs_r.csproj b/src/tests/JIT/Methodical/cctor/misc/throw_misc_cs_r.csproj
index 19e69e3815dabb..be27205ee9feaf 100644
--- a/src/tests/JIT/Methodical/cctor/misc/throw_misc_cs_r.csproj
+++ b/src/tests/JIT/Methodical/cctor/misc/throw_misc_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
diff --git a/src/tests/JIT/Methodical/cctor/misc/throw_misc_cs_ro.csproj b/src/tests/JIT/Methodical/cctor/misc/throw_misc_cs_ro.csproj
index 1b99a315dfca36..6b4e4fe404f415 100644
--- a/src/tests/JIT/Methodical/cctor/misc/throw_misc_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/cctor/misc/throw_misc_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
diff --git a/src/tests/JIT/Methodical/cctor/simple/Desktop/prefldinit3.il b/src/tests/JIT/Methodical/cctor/simple/Desktop/prefldinit3.il
index d6c3df89892758..7b5f8582468c62 100644
--- a/src/tests/JIT/Methodical/cctor/simple/Desktop/prefldinit3.il
+++ b/src/tests/JIT/Methodical/cctor/simple/Desktop/prefldinit3.il
@@ -9,6 +9,8 @@
 }
 .assembly 'prefldinit3' {}
 .assembly extern xunit.core {}
+.namespace Test_prefldinit3_Desktop_il
+{
 .class private auto ansi beforefieldinit measure
        extends [mscorlib]System.Object
 {
@@ -19,9 +21,9 @@
     // Code size       7 (0x7)
     .maxstack  1
     IL_0000:  ldc.i4.0
-    IL_0001:  stsfld     int32 measure::a
+    IL_0001:  stsfld     int32 Test_prefldinit3_Desktop_il.measure::a
     IL_0006:  ret
-  } // end of method measure::.cctor
+  } // end of method Test_prefldinit3_Desktop_il.measure::.cctor
 
   .method public hidebysig specialname rtspecialname 
           instance void  .ctor() cil managed
@@ -31,9 +33,9 @@
     IL_0000:  ldarg.0
     IL_0001:  call       instance void [mscorlib]System.Object::.ctor()
     IL_0006:  ret
-  } // end of method measure::.ctor
+  } // end of method Test_prefldinit3_Desktop_il.measure::.ctor
 
-} // end of class measure
+} // end of class Test_prefldinit3_Desktop_il.measure
 
 .class private auto ansi beforefieldinit test
        extends [mscorlib]System.Object
@@ -46,18 +48,18 @@
     IL_0000:  br.s       IL_0002
 
     IL_0002:  ret
-  } // end of method test::f
+  } // end of method Test_prefldinit3_Desktop_il.test::f
 
   .method private hidebysig specialname rtspecialname static 
           void  .cctor() cil managed
   {
     // Code size       140 (0x8c)
     .maxstack  2
-    IL_0000:  ldsfld     int32 measure::a
+    IL_0000:  ldsfld     int32 Test_prefldinit3_Desktop_il.measure::a
     IL_0005:  brfalse.s  IL_002b
 
-    IL_0007:  ldstr      "in .cctor(), measure.a is {0}"
-    IL_000c:  ldsfld     int32 measure::a
+    IL_0007:  ldstr      "in .cctor(), Test_prefldinit3_Desktop_il.measure.a is {0}"
+    IL_000c:  ldsfld     int32 Test_prefldinit3_Desktop_il.measure::a
     IL_0011:  box        [mscorlib]System.Int32
     IL_0016:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
@@ -66,21 +68,21 @@
     IL_0025:  newobj     instance void [mscorlib]System.Exception::.ctor()
     IL_002a:  throw
 
-    IL_002b:  ldstr      "in .cctor(), measure.a is {0}"
-    IL_0030:  ldsfld     int32 measure::a
+    IL_002b:  ldstr      "in .cctor(), Test_prefldinit3_Desktop_il.measure.a is {0}"
+    IL_0030:  ldsfld     int32 Test_prefldinit3_Desktop_il.measure::a
     IL_0035:  box        [mscorlib]System.Int32
     IL_003a:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
-    IL_003f:  ldsfld     int32 measure::a
+    IL_003f:  ldsfld     int32 Test_prefldinit3_Desktop_il.measure::a
     IL_0044:  ldc.i4.8
     IL_0045:  add
-    IL_0046:  stsfld     int32 measure::a
-    IL_004b:  ldsfld     int32 measure::a
+    IL_0046:  stsfld     int32 Test_prefldinit3_Desktop_il.measure::a
+    IL_004b:  ldsfld     int32 Test_prefldinit3_Desktop_il.measure::a
     IL_0050:  ldc.i4.8
     IL_0051:  beq.s      IL_0077
 
-    IL_0053:  ldstr      "in .cctor() after measure.a=8, measure.a is {0}"
-    IL_0058:  ldsfld     int32 measure::a
+    IL_0053:  ldstr      "in .cctor() after Test_prefldinit3_Desktop_il.measure.a=8, Test_prefldinit3_Desktop_il.measure.a is {0}"
+    IL_0058:  ldsfld     int32 Test_prefldinit3_Desktop_il.measure::a
     IL_005d:  box        [mscorlib]System.Int32
     IL_0062:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
@@ -89,13 +91,13 @@
     IL_0071:  newobj     instance void [mscorlib]System.Exception::.ctor()
     IL_0076:  throw
 
-    IL_0077:  ldstr      "in .cctor() after measure.a=8, measure.a is {0}"
-    IL_007c:  ldsfld     int32 measure::a
+    IL_0077:  ldstr      "in .cctor() after Test_prefldinit3_Desktop_il.measure.a=8, Test_prefldinit3_Desktop_il.measure.a is {0}"
+    IL_007c:  ldsfld     int32 Test_prefldinit3_Desktop_il.measure::a
     IL_0081:  box        [mscorlib]System.Int32
     IL_0086:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
     IL_008b:  ret
-  } // end of method test::.cctor
+  } // end of method Test_prefldinit3_Desktop_il.test::.cctor
 
   .method public hidebysig specialname rtspecialname 
           instance void  .ctor() cil managed
@@ -105,12 +107,12 @@
     IL_0000:  ldarg.0
     IL_0001:  call       instance void [mscorlib]System.Object::.ctor()
     IL_0006:  ret
-  } // end of method test::.ctor
+  } // end of method Test_prefldinit3_Desktop_il.test::.ctor
 
-} // end of class test
+} // end of class Test_prefldinit3_Desktop_il.test
 
 .class private auto ansi beforefieldinit test2
-       extends test
+       extends Test_prefldinit3_Desktop_il.test
 {
   .method public hidebysig specialname rtspecialname 
           instance void  .ctor() cil managed
@@ -119,42 +121,45 @@
     .maxstack  1
     IL_0000:  ldarg.0
     // Hand modified - binl
-    //IL_0001:  call       instance void test::.ctor()
+    //IL_0001:  call       instance void Test_prefldinit3_Desktop_il.test::.ctor()
     IL_0001:  call       instance void [mscorlib]System.Object::.ctor()
     IL_0006:  ret
-  } // end of method test2::.ctor
+  } // end of method Test_prefldinit3_Desktop_il.test2::.ctor
 
-} // end of class test2
+} // end of class Test_prefldinit3_Desktop_il.test2
 
-.class private auto ansi beforefieldinit Driver
+.class public auto ansi beforefieldinit Driver
        extends [mscorlib]System.Object
 {
   .method public hidebysig static int32  Main() cil managed
   {
+    .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+        01 00 00 00
+    )
     .entrypoint
     // Code size       160 (0xa0)
     .maxstack  2
     .locals init (unsigned int8 V_0,
-             class test2 V_1,
+             class Test_prefldinit3_Desktop_il.test2 V_1,
              class [mscorlib]System.Exception V_2,
              int32 V_3)
     .try
     {
       ldstr      "Testing .cctor() invocation by calling virtual method"
       call       void [System.Console]System.Console::WriteLine(string)
-      ldstr "We have beforefieldinit set and we are accessing virtual method rather than static method or static field, test may fail by design?"
+      ldstr "We have beforefieldinit set and we are accessing virtual method rather than static method or static field, Test_prefldinit3_Desktop_il.test may fail by design?"
       call       void [System.Console]System.Console::WriteLine(string)
       ldnull
       call       void [System.Console]System.Console::WriteLine(string)
       IL_0000:  ldc.i4.s   15
       IL_0002:  stloc.0
-      IL_0003:  newobj     instance void test2::.ctor()
+      IL_0003:  newobj     instance void Test_prefldinit3_Desktop_il.test2::.ctor()
       IL_0008:  stloc.1
-      IL_0009:  ldsfld     int32 measure::a
+      IL_0009:  ldsfld     int32 Test_prefldinit3_Desktop_il.measure::a
       IL_000e:  brfalse.s  IL_0032
 
-      IL_0010:  ldstr      "in Main(), measure.a is {0}"
-      IL_0015:  ldsfld     int32 measure::a
+      IL_0010:  ldstr      "in Main(), Test_prefldinit3_Desktop_il.measure.a is {0}"
+      IL_0015:  ldsfld     int32 Test_prefldinit3_Desktop_il.measure::a
       IL_001a:  box        [mscorlib]System.Int32
       IL_001f:  call       void [System.Console]System.Console::WriteLine(string,
                                                                     object)
@@ -168,18 +173,18 @@
       IL_0037:  call       void [System.Console]System.Console::WriteLine(string)
       IL_003c:  ldloc.1
       IL_003d:  ldloca.s   V_0
-      IL_003f:  callvirt   instance void test::f(unsigned int8&)
+      IL_003f:  callvirt   instance void Test_prefldinit3_Desktop_il.test::f(unsigned int8&)
       IL_0044:  ldstr      "After running virtual method"
       IL_0049:  call       void [System.Console]System.Console::WriteLine(string)
-      IL_004e:  ldsfld     int32 measure::a
+      IL_004e:  ldsfld     int32 Test_prefldinit3_Desktop_il.measure::a
       IL_0053:  ldc.i4.0
       IL_0054:  beq.s      IL_0078
 
-      IL_0056:  ldstr      "in Main() after f(ref b), measure.a is {0}"
+      IL_0056:  ldstr      "in Main() after f(ref b), Test_prefldinit3_Desktop_il.measure.a is {0}"
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
           01 00 00 00
       )
-      IL_005b:  ldsfld     int32 measure::a
+      IL_005b:  ldsfld     int32 Test_prefldinit3_Desktop_il.measure::a
       IL_0060:  box        [mscorlib]System.Int32
       IL_0065:  call       void [System.Console]System.Console::WriteLine(string,
                                                                     object)
@@ -212,7 +217,7 @@
 
     IL_009e:  ldloc.3
     IL_009f:  ret
-  } // end of method Driver::Main
+  } // end of method Test_prefldinit3_Desktop_il.Driver::Main
 
   .method public hidebysig specialname rtspecialname 
           instance void  .ctor() cil managed
@@ -222,6 +227,7 @@
     IL_0000:  ldarg.0
     IL_0001:  call       instance void [mscorlib]System.Object::.ctor()
     IL_0006:  ret
-  } // end of method Driver::.ctor
+  } // end of method Test_prefldinit3_Desktop_il.Driver::.ctor
 
 }
+}
diff --git a/src/tests/JIT/Methodical/cctor/simple/Desktop/prefldinit3_il_r.ilproj b/src/tests/JIT/Methodical/cctor/simple/Desktop/prefldinit3_il_r.ilproj
index f1d65cfe0c5f2d..c29901076d032a 100644
--- a/src/tests/JIT/Methodical/cctor/simple/Desktop/prefldinit3_il_r.ilproj
+++ b/src/tests/JIT/Methodical/cctor/simple/Desktop/prefldinit3_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/cctor/simple/precise1.cs b/src/tests/JIT/Methodical/cctor/simple/precise1.cs
index c3addfe0fe2c31..38cd689fd3c439 100644
--- a/src/tests/JIT/Methodical/cctor/simple/precise1.cs
+++ b/src/tests/JIT/Methodical/cctor/simple/precise1.cs
@@ -4,6 +4,9 @@
 // static method
 
 using System;
+using Xunit;
+namespace Test_precise1_simple_cs
+{
 internal class measure
 {
     public static int a = 0xCC;
@@ -35,9 +38,10 @@ static test()
     }
 }
 
-internal class Driver
+public class Driver
 {
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         try
         {
@@ -72,3 +76,4 @@ public static int Main()
         return 100;
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/cctor/simple/precise1_cs_d.csproj b/src/tests/JIT/Methodical/cctor/simple/precise1_cs_d.csproj
index 0c71efb9a9b3b5..ef9efba18c1c82 100644
--- a/src/tests/JIT/Methodical/cctor/simple/precise1_cs_d.csproj
+++ b/src/tests/JIT/Methodical/cctor/simple/precise1_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/cctor/simple/precise1_cs_do.csproj b/src/tests/JIT/Methodical/cctor/simple/precise1_cs_do.csproj
index cc98058bd93b45..397ad702903d83 100644
--- a/src/tests/JIT/Methodical/cctor/simple/precise1_cs_do.csproj
+++ b/src/tests/JIT/Methodical/cctor/simple/precise1_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/cctor/simple/precise1_cs_r.csproj b/src/tests/JIT/Methodical/cctor/simple/precise1_cs_r.csproj
index fbc29b273bc0b8..fd523ae3c2a429 100644
--- a/src/tests/JIT/Methodical/cctor/simple/precise1_cs_r.csproj
+++ b/src/tests/JIT/Methodical/cctor/simple/precise1_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/cctor/simple/precise1_cs_ro.csproj b/src/tests/JIT/Methodical/cctor/simple/precise1_cs_ro.csproj
index 60a4d4d0f43ad9..9dc8577cde73e6 100644
--- a/src/tests/JIT/Methodical/cctor/simple/precise1_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/cctor/simple/precise1_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/cctor/simple/precise1b.cs b/src/tests/JIT/Methodical/cctor/simple/precise1b.cs
index 37b17048c2a291..17c044332774eb 100644
--- a/src/tests/JIT/Methodical/cctor/simple/precise1b.cs
+++ b/src/tests/JIT/Methodical/cctor/simple/precise1b.cs
@@ -4,6 +4,9 @@
 // static method - inlineable
 
 using System;
+using Xunit;
+namespace Test_precise1b_simple_cs
+{
 internal class measure
 {
     public static int a = 0xCC;
@@ -34,9 +37,10 @@ static test()
     }
 }
 
-internal class Driver
+public class Driver
 {
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         try
         {
@@ -70,3 +74,4 @@ public static int Main()
         return 100;
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/cctor/simple/precise1b_cs_d.csproj b/src/tests/JIT/Methodical/cctor/simple/precise1b_cs_d.csproj
index 7c984f6ebd7385..6487e1857aa44d 100644
--- a/src/tests/JIT/Methodical/cctor/simple/precise1b_cs_d.csproj
+++ b/src/tests/JIT/Methodical/cctor/simple/precise1b_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/cctor/simple/precise1b_cs_do.csproj b/src/tests/JIT/Methodical/cctor/simple/precise1b_cs_do.csproj
index 941d46091523b0..43a35f7724b198 100644
--- a/src/tests/JIT/Methodical/cctor/simple/precise1b_cs_do.csproj
+++ b/src/tests/JIT/Methodical/cctor/simple/precise1b_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/cctor/simple/precise1b_cs_r.csproj b/src/tests/JIT/Methodical/cctor/simple/precise1b_cs_r.csproj
index f6440775054d6f..b70e4d4fcda34e 100644
--- a/src/tests/JIT/Methodical/cctor/simple/precise1b_cs_r.csproj
+++ b/src/tests/JIT/Methodical/cctor/simple/precise1b_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/cctor/simple/precise1b_cs_ro.csproj b/src/tests/JIT/Methodical/cctor/simple/precise1b_cs_ro.csproj
index c7845c282bc8ce..0c2eee8413400a 100644
--- a/src/tests/JIT/Methodical/cctor/simple/precise1b_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/cctor/simple/precise1b_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/cctor/simple/precise2.cs b/src/tests/JIT/Methodical/cctor/simple/precise2.cs
index 2828830087551c..b5610243558d4d 100644
--- a/src/tests/JIT/Methodical/cctor/simple/precise2.cs
+++ b/src/tests/JIT/Methodical/cctor/simple/precise2.cs
@@ -4,6 +4,9 @@
 // instance method
 
 using System;
+using Xunit;
+namespace Test_precise2_simple_cs
+{
 internal class measure
 {
     public static int a = 0xCC;
@@ -30,9 +33,10 @@ static test()
     }
 }
 
-internal class Driver
+public class Driver
 {
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         try
         {
@@ -66,3 +70,4 @@ public static int Main()
         return 100;
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/cctor/simple/precise2_cs_d.csproj b/src/tests/JIT/Methodical/cctor/simple/precise2_cs_d.csproj
index 6fc01a65a92bd4..dc646f78b4661e 100644
--- a/src/tests/JIT/Methodical/cctor/simple/precise2_cs_d.csproj
+++ b/src/tests/JIT/Methodical/cctor/simple/precise2_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/cctor/simple/precise2_cs_do.csproj b/src/tests/JIT/Methodical/cctor/simple/precise2_cs_do.csproj
index 951d70dfa9d8ce..28eed0ae562b30 100644
--- a/src/tests/JIT/Methodical/cctor/simple/precise2_cs_do.csproj
+++ b/src/tests/JIT/Methodical/cctor/simple/precise2_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/cctor/simple/precise2_cs_r.csproj b/src/tests/JIT/Methodical/cctor/simple/precise2_cs_r.csproj
index 9cba7b8ba0e331..9d971c962ee21d 100644
--- a/src/tests/JIT/Methodical/cctor/simple/precise2_cs_r.csproj
+++ b/src/tests/JIT/Methodical/cctor/simple/precise2_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/cctor/simple/precise2_cs_ro.csproj b/src/tests/JIT/Methodical/cctor/simple/precise2_cs_ro.csproj
index 50a58b69517088..84c053e1900277 100644
--- a/src/tests/JIT/Methodical/cctor/simple/precise2_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/cctor/simple/precise2_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/cctor/simple/precise4.cs b/src/tests/JIT/Methodical/cctor/simple/precise4.cs
index 7f04645a1b3363..5130c2531ecb68 100644
--- a/src/tests/JIT/Methodical/cctor/simple/precise4.cs
+++ b/src/tests/JIT/Methodical/cctor/simple/precise4.cs
@@ -4,6 +4,9 @@
 // static field
 
 using System;
+using Xunit;
+namespace Test_precise4_simple_cs
+{
 internal class measure
 {
     public static int a = 0xCC;
@@ -32,9 +35,10 @@ static test()
     }
 }
 
-internal class Driver
+public class Driver
 {
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         try
         {
@@ -68,3 +72,4 @@ public static int Main()
         return 100;
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/cctor/simple/precise4_cs_d.csproj b/src/tests/JIT/Methodical/cctor/simple/precise4_cs_d.csproj
index 4ed528ec163906..df75c52d018748 100644
--- a/src/tests/JIT/Methodical/cctor/simple/precise4_cs_d.csproj
+++ b/src/tests/JIT/Methodical/cctor/simple/precise4_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/cctor/simple/precise4_cs_do.csproj b/src/tests/JIT/Methodical/cctor/simple/precise4_cs_do.csproj
index b665bcfdf54540..906752375945e1 100644
--- a/src/tests/JIT/Methodical/cctor/simple/precise4_cs_do.csproj
+++ b/src/tests/JIT/Methodical/cctor/simple/precise4_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/cctor/simple/precise4_cs_r.csproj b/src/tests/JIT/Methodical/cctor/simple/precise4_cs_r.csproj
index 80d7ca054df86c..fa645090c76e32 100644
--- a/src/tests/JIT/Methodical/cctor/simple/precise4_cs_r.csproj
+++ b/src/tests/JIT/Methodical/cctor/simple/precise4_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/cctor/simple/precise4_cs_ro.csproj b/src/tests/JIT/Methodical/cctor/simple/precise4_cs_ro.csproj
index 1b6a0fd8f05d35..2ea50434c051f7 100644
--- a/src/tests/JIT/Methodical/cctor/simple/precise4_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/cctor/simple/precise4_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/cctor/simple/prefldinit1.il b/src/tests/JIT/Methodical/cctor/simple/prefldinit1.il
index ee6d0cfe362e92..6260e0fbd6c1ae 100644
--- a/src/tests/JIT/Methodical/cctor/simple/prefldinit1.il
+++ b/src/tests/JIT/Methodical/cctor/simple/prefldinit1.il
@@ -22,6 +22,8 @@
 }
 .assembly extern xunit.core {}
 
+.namespace Test_prefldinit1_simple_il
+{
 .class private auto ansi beforefieldinit measure
        extends [mscorlib]System.Object
 {
@@ -32,9 +34,9 @@
     // Code size       11 (0xb)
     .maxstack  1
     IL_0000:  ldc.i4     0xcc
-    IL_0005:  stsfld     int32 measure::a
+    IL_0005:  stsfld     int32 Test_prefldinit1_simple_il.measure::a
     IL_000a:  ret
-  } // end of method measure::.cctor
+  } // end of method Test_prefldinit1_simple_il.measure::.cctor
 
   .method public hidebysig specialname rtspecialname 
           instance void  .ctor() cil managed
@@ -44,9 +46,9 @@
     IL_0000:  ldarg.0
     IL_0001:  call       instance void [mscorlib]System.Object::.ctor()
     IL_0006:  ret
-  } // end of method measure::.ctor
+  } // end of method Test_prefldinit1_simple_il.measure::.ctor
 
-} // end of class measure
+} // end of class Test_prefldinit1_simple_il.measure
 
 .class private auto ansi test
        extends [mscorlib]System.Object
@@ -58,19 +60,19 @@
     IL_0000:  br.s       IL_0002
 
     IL_0002:  ret
-  } // end of method test::f
+  } // end of method Test_prefldinit1_simple_il.test::f
 
   .method private hidebysig specialname rtspecialname static 
           void  .cctor() cil managed
   {
     // Code size       139 (0x8b)
     .maxstack  2
-    IL_0000:  ldsfld     int32 measure::a
+    IL_0000:  ldsfld     int32 Test_prefldinit1_simple_il.measure::a
     IL_0005:  ldc.i4     0xcc
     IL_000a:  beq.s      IL_0030
 
-    IL_000c:  ldstr      "in .cctor(), measure.a is {0}"
-    IL_0011:  ldsfld     int32 measure::a
+    IL_000c:  ldstr      "in .cctor(), Test_prefldinit1_simple_il.measure.a is {0}"
+    IL_0011:  ldsfld     int32 Test_prefldinit1_simple_il.measure::a
     IL_0016:  box        [mscorlib]System.Int32
     IL_001b:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
@@ -79,19 +81,19 @@
     IL_002a:  newobj     instance void [mscorlib]System.Exception::.ctor()
     IL_002f:  throw
 
-    IL_0030:  ldstr      "in .cctor(), measure.a is {0}"
-    IL_0035:  ldsfld     int32 measure::a
+    IL_0030:  ldstr      "in .cctor(), Test_prefldinit1_simple_il.measure.a is {0}"
+    IL_0035:  ldsfld     int32 Test_prefldinit1_simple_il.measure::a
     IL_003a:  box        [mscorlib]System.Int32
     IL_003f:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
     IL_0044:  ldc.i4.8
-    IL_0045:  stsfld     int32 measure::a
-    IL_004a:  ldsfld     int32 measure::a
+    IL_0045:  stsfld     int32 Test_prefldinit1_simple_il.measure::a
+    IL_004a:  ldsfld     int32 Test_prefldinit1_simple_il.measure::a
     IL_004f:  ldc.i4.8
     IL_0050:  beq.s      IL_0076
 
-    IL_0052:  ldstr      "in .cctor() after measure.a=8, measure.a is {0}"
-    IL_0057:  ldsfld     int32 measure::a
+    IL_0052:  ldstr      "in .cctor() after Test_prefldinit1_simple_il.measure.a=8, Test_prefldinit1_simple_il.measure.a is {0}"
+    IL_0057:  ldsfld     int32 Test_prefldinit1_simple_il.measure::a
     IL_005c:  box        [mscorlib]System.Int32
     IL_0061:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
@@ -100,13 +102,13 @@
     IL_0070:  newobj     instance void [mscorlib]System.Exception::.ctor()
     IL_0075:  throw
 
-    IL_0076:  ldstr      "in .cctor() after measure.a=8, measure.a is {0}"
-    IL_007b:  ldsfld     int32 measure::a
+    IL_0076:  ldstr      "in .cctor() after Test_prefldinit1_simple_il.measure.a=8, Test_prefldinit1_simple_il.measure.a is {0}"
+    IL_007b:  ldsfld     int32 Test_prefldinit1_simple_il.measure::a
     IL_0080:  box        [mscorlib]System.Int32
     IL_0085:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
     IL_008a:  ret
-  } // end of method test::.cctor
+  } // end of method Test_prefldinit1_simple_il.test::.cctor
 
   .method public hidebysig specialname rtspecialname 
           instance void  .ctor() cil managed
@@ -116,15 +118,18 @@
     IL_0000:  ldarg.0
     IL_0001:  call       instance void [mscorlib]System.Object::.ctor()
     IL_0006:  ret
-  } // end of method test::.ctor
+  } // end of method Test_prefldinit1_simple_il.test::.ctor
 
-} // end of class test
+} // end of class Test_prefldinit1_simple_il.test
 
-.class private auto ansi beforefieldinit Driver
+.class public auto ansi beforefieldinit Driver
        extends [mscorlib]System.Object
 {
   .method public hidebysig static int32  Main() cil managed
   {
+    .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+        01 00 00 00
+    )
     .entrypoint
     // Code size       173 (0xad)
     .maxstack  2
@@ -140,12 +145,12 @@
       IL_000d:  call       void [System.Console]System.Console::WriteLine()
       IL_0012:  ldstr      "Before calling static method"
       IL_0017:  call       void [System.Console]System.Console::WriteLine(string)
-      IL_001c:  ldsfld     int32 measure::a
+      IL_001c:  ldsfld     int32 Test_prefldinit1_simple_il.measure::a
       IL_0021:  ldc.i4     0xcc
       IL_0026:  beq.s      IL_004a
 
-      IL_0028:  ldstr      "in Main(), measure.a is {0}"
-      IL_002d:  ldsfld     int32 measure::a
+      IL_0028:  ldstr      "in Main(), Test_prefldinit1_simple_il.measure.a is {0}"
+      IL_002d:  ldsfld     int32 Test_prefldinit1_simple_il.measure::a
       IL_0032:  box        [mscorlib]System.Int32
       IL_0037:  call       void [System.Console]System.Console::WriteLine(string,
                                                                     object)
@@ -156,18 +161,18 @@
       IL_0048:  leave.s    IL_00ab
 
       IL_004a:  ldloca.s   V_0
-      IL_004c:  call       void test::f(unsigned int8&)
+      IL_004c:  call       void Test_prefldinit1_simple_il.test::f(unsigned int8&)
       IL_0051:  ldstr      "After calling static method"
       IL_0056:  call       void [System.Console]System.Console::WriteLine(string)
-      IL_005b:  ldsfld     int32 measure::a
+      IL_005b:  ldsfld     int32 Test_prefldinit1_simple_il.measure::a
       IL_0060:  ldc.i4.8
       IL_0061:  beq.s      IL_0085
 
-      IL_0063:  ldstr      "in Main() after f(ref b), measure.a is {0}"
+      IL_0063:  ldstr      "in Main() after f(ref b), Test_prefldinit1_simple_il.measure.a is {0}"
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
           01 00 00 00
       )
-      IL_0068:  ldsfld     int32 measure::a
+      IL_0068:  ldsfld     int32 Test_prefldinit1_simple_il.measure::a
       IL_006d:  box        [mscorlib]System.Int32
       IL_0072:  call       void [System.Console]System.Console::WriteLine(string,
                                                                     object)
@@ -200,7 +205,7 @@
 
     IL_00ab:  ldloc.2
     IL_00ac:  ret
-  } // end of method Driver::Main
+  } // end of method Test_prefldinit1_simple_il.Driver::Main
 
   .method public hidebysig specialname rtspecialname 
           instance void  .ctor() cil managed
@@ -210,12 +215,13 @@
     IL_0000:  ldarg.0
     IL_0001:  call       instance void [mscorlib]System.Object::.ctor()
     IL_0006:  ret
-  } // end of method Driver::.ctor
+  } // end of method Test_prefldinit1_simple_il.Driver::.ctor
 
-} // end of class Driver
+} // end of class Test_prefldinit1_simple_il.Driver
 
 
 // =============================================================
 
 //*********** DISASSEMBLY COMPLETE ***********************
 // WARNING: Created Win32 resource file prefldinit1.res
+}
diff --git a/src/tests/JIT/Methodical/cctor/simple/prefldinit1_il_d.ilproj b/src/tests/JIT/Methodical/cctor/simple/prefldinit1_il_d.ilproj
index f0ef5dcd1239c9..10fed70025c4f1 100644
--- a/src/tests/JIT/Methodical/cctor/simple/prefldinit1_il_d.ilproj
+++ b/src/tests/JIT/Methodical/cctor/simple/prefldinit1_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/cctor/simple/prefldinit1_il_r.ilproj b/src/tests/JIT/Methodical/cctor/simple/prefldinit1_il_r.ilproj
index d1ed15a8f39e9c..960c7c0b891e9e 100644
--- a/src/tests/JIT/Methodical/cctor/simple/prefldinit1_il_r.ilproj
+++ b/src/tests/JIT/Methodical/cctor/simple/prefldinit1_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/cctor/simple/prefldinit2.il b/src/tests/JIT/Methodical/cctor/simple/prefldinit2.il
index a34ec7c0037155..cf4aac32d515d7 100644
--- a/src/tests/JIT/Methodical/cctor/simple/prefldinit2.il
+++ b/src/tests/JIT/Methodical/cctor/simple/prefldinit2.il
@@ -22,6 +22,8 @@
 }
 .assembly extern xunit.core {}
 
+.namespace Test_prefldinit2_simple_il
+{
 .class private auto ansi beforefieldinit measure
        extends [mscorlib]System.Object
 {
@@ -32,9 +34,9 @@
     // Code size       11 (0xb)
     .maxstack  1
     IL_0000:  ldc.i4     0xcc
-    IL_0005:  stsfld     int32 measure::a
+    IL_0005:  stsfld     int32 Test_prefldinit2_simple_il.measure::a
     IL_000a:  ret
-  } // end of method measure::.cctor
+  } // end of method Test_prefldinit2_simple_il.measure::.cctor
 
   .method public hidebysig specialname rtspecialname 
           instance void  .ctor() cil managed
@@ -44,9 +46,9 @@
     IL_0000:  ldarg.0
     IL_0001:  call       instance void [mscorlib]System.Object::.ctor()
     IL_0006:  ret
-  } // end of method measure::.ctor
+  } // end of method Test_prefldinit2_simple_il.measure::.ctor
 
-} // end of class measure
+} // end of class Test_prefldinit2_simple_il.measure
 
 .class private auto ansi test
        extends [mscorlib]System.Object
@@ -56,12 +58,12 @@
   {
     // Code size       139 (0x8b)
     .maxstack  2
-    IL_0000:  ldsfld     int32 measure::a
+    IL_0000:  ldsfld     int32 Test_prefldinit2_simple_il.measure::a
     IL_0005:  ldc.i4     0xcc
     IL_000a:  beq.s      IL_0030
 
-    IL_000c:  ldstr      "in .cctor(), measure.a is {0}"
-    IL_0011:  ldsfld     int32 measure::a
+    IL_000c:  ldstr      "in .cctor(), Test_prefldinit2_simple_il.measure.a is {0}"
+    IL_0011:  ldsfld     int32 Test_prefldinit2_simple_il.measure::a
     IL_0016:  box        [mscorlib]System.Int32
     IL_001b:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
@@ -70,19 +72,19 @@
     IL_002a:  newobj     instance void [mscorlib]System.Exception::.ctor()
     IL_002f:  throw
 
-    IL_0030:  ldstr      "in .cctor(), measure.a is {0}"
-    IL_0035:  ldsfld     int32 measure::a
+    IL_0030:  ldstr      "in .cctor(), Test_prefldinit2_simple_il.measure.a is {0}"
+    IL_0035:  ldsfld     int32 Test_prefldinit2_simple_il.measure::a
     IL_003a:  box        [mscorlib]System.Int32
     IL_003f:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
     IL_0044:  ldc.i4.8
-    IL_0045:  stsfld     int32 measure::a
-    IL_004a:  ldsfld     int32 measure::a
+    IL_0045:  stsfld     int32 Test_prefldinit2_simple_il.measure::a
+    IL_004a:  ldsfld     int32 Test_prefldinit2_simple_il.measure::a
     IL_004f:  ldc.i4.8
     IL_0050:  beq.s      IL_0076
 
-    IL_0052:  ldstr      "in .cctor() after measure.a=8, measure.a is {0}"
-    IL_0057:  ldsfld     int32 measure::a
+    IL_0052:  ldstr      "in .cctor() after Test_prefldinit2_simple_il.measure.a=8, Test_prefldinit2_simple_il.measure.a is {0}"
+    IL_0057:  ldsfld     int32 Test_prefldinit2_simple_il.measure::a
     IL_005c:  box        [mscorlib]System.Int32
     IL_0061:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
@@ -91,13 +93,13 @@
     IL_0070:  newobj     instance void [mscorlib]System.Exception::.ctor()
     IL_0075:  throw
 
-    IL_0076:  ldstr      "in .cctor() after measure.a=8, measure.a is {0}"
-    IL_007b:  ldsfld     int32 measure::a
+    IL_0076:  ldstr      "in .cctor() after Test_prefldinit2_simple_il.measure.a=8, Test_prefldinit2_simple_il.measure.a is {0}"
+    IL_007b:  ldsfld     int32 Test_prefldinit2_simple_il.measure::a
     IL_0080:  box        [mscorlib]System.Int32
     IL_0085:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
     IL_008a:  ret
-  } // end of method test::.cctor
+  } // end of method Test_prefldinit2_simple_il.test::.cctor
 
   .method public hidebysig specialname rtspecialname 
           instance void  .ctor() cil managed
@@ -107,36 +109,39 @@
     IL_0000:  ldarg.0
     IL_0001:  call       instance void [mscorlib]System.Object::.ctor()
     IL_0006:  ret
-  } // end of method test::.ctor
+  } // end of method Test_prefldinit2_simple_il.test::.ctor
 
-} // end of class test
+} // end of class Test_prefldinit2_simple_il.test
 
-.class private auto ansi beforefieldinit Driver
+.class public auto ansi beforefieldinit Driver
        extends [mscorlib]System.Object
 {
   .method public hidebysig static int32  Main() cil managed
   {
+    .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+        01 00 00 00
+    )
     .entrypoint
     // Code size       169 (0xa9)
     .maxstack  2
-    .locals init (class test V_0,
+    .locals init (class Test_prefldinit2_simple_il.test V_0,
              class [mscorlib]System.Exception V_1,
              int32 V_2)
     .try
     {
       IL_0000:  ldstr      "Testing .cctor() invocation by calling instance method"
       IL_0005:  call       void [System.Console]System.Console::WriteLine(string)
-      ldstr "We have beforefieldinit set and we are accessing instance method rather than static method or static field, test may fail by design?"
+      ldstr "We have beforefieldinit set and we are accessing instance method rather than static method or static field, Test_prefldinit2_simple_il.test may fail by design?"
       call       void [System.Console]System.Console::WriteLine(string)
       IL_000a:  call       void [System.Console]System.Console::WriteLine()
       IL_000f:  ldstr      "Before calling instance method"
       IL_0014:  call       void [System.Console]System.Console::WriteLine(string)
-      IL_0019:  ldsfld     int32 measure::a
+      IL_0019:  ldsfld     int32 Test_prefldinit2_simple_il.measure::a
       IL_001e:  ldc.i4     0xcc
       IL_0023:  beq.s      IL_0047
 
-      IL_0025:  ldstr      "in Main(), measure.a is {0}"
-      IL_002a:  ldsfld     int32 measure::a
+      IL_0025:  ldstr      "in Main(), Test_prefldinit2_simple_il.measure.a is {0}"
+      IL_002a:  ldsfld     int32 Test_prefldinit2_simple_il.measure::a
       IL_002f:  box        [mscorlib]System.Int32
       IL_0034:  call       void [System.Console]System.Console::WriteLine(string,
                                                                     object)
@@ -146,19 +151,19 @@
       IL_0044:  stloc.2
       IL_0045:  leave.s    IL_00a7
 
-      IL_0047:  newobj     instance void test::.ctor()
+      IL_0047:  newobj     instance void Test_prefldinit2_simple_il.test::.ctor()
       IL_004c:  stloc.0
       IL_004d:  ldstr      "After calling instance method"
       IL_0052:  call       void [System.Console]System.Console::WriteLine(string)
-      IL_0057:  ldsfld     int32 measure::a
+      IL_0057:  ldsfld     int32 Test_prefldinit2_simple_il.measure::a
       IL_005c:  ldc.i4.8
       IL_005d:  beq.s      IL_0081
 
-      IL_005f:  ldstr      "in Main() after new test(), measure.a is {0}"
+      IL_005f:  ldstr      "in Main() after new Test_prefldinit2_simple_il.test(), Test_prefldinit2_simple_il.measure.a is {0}"
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
           01 00 00 00
       )
-      IL_0064:  ldsfld     int32 measure::a
+      IL_0064:  ldsfld     int32 Test_prefldinit2_simple_il.measure::a
       IL_0069:  box        [mscorlib]System.Int32
       IL_006e:  call       void [System.Console]System.Console::WriteLine(string,
                                                                     object)
@@ -191,7 +196,7 @@
 
     IL_00a7:  ldloc.2
     IL_00a8:  ret
-  } // end of method Driver::Main
+  } // end of method Test_prefldinit2_simple_il.Driver::Main
 
   .method public hidebysig specialname rtspecialname 
           instance void  .ctor() cil managed
@@ -201,12 +206,13 @@
     IL_0000:  ldarg.0
     IL_0001:  call       instance void [mscorlib]System.Object::.ctor()
     IL_0006:  ret
-  } // end of method Driver::.ctor
+  } // end of method Test_prefldinit2_simple_il.Driver::.ctor
 
-} // end of class Driver
+} // end of class Test_prefldinit2_simple_il.Driver
 
 
 // =============================================================
 
 //*********** DISASSEMBLY COMPLETE ***********************
 // WARNING: Created Win32 resource file prefldinit2.res
+}
diff --git a/src/tests/JIT/Methodical/cctor/simple/prefldinit2_il_d.ilproj b/src/tests/JIT/Methodical/cctor/simple/prefldinit2_il_d.ilproj
index eae9498e40c34c..2b00c4e856b277 100644
--- a/src/tests/JIT/Methodical/cctor/simple/prefldinit2_il_d.ilproj
+++ b/src/tests/JIT/Methodical/cctor/simple/prefldinit2_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/cctor/simple/prefldinit2_il_r.ilproj b/src/tests/JIT/Methodical/cctor/simple/prefldinit2_il_r.ilproj
index a0b5b09fabef42..f1542bc48a6c7f 100644
--- a/src/tests/JIT/Methodical/cctor/simple/prefldinit2_il_r.ilproj
+++ b/src/tests/JIT/Methodical/cctor/simple/prefldinit2_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/cctor/simple/prefldinit4.il b/src/tests/JIT/Methodical/cctor/simple/prefldinit4.il
index 00337900746cf3..d86f58fa0d2776 100644
--- a/src/tests/JIT/Methodical/cctor/simple/prefldinit4.il
+++ b/src/tests/JIT/Methodical/cctor/simple/prefldinit4.il
@@ -22,6 +22,8 @@
 }
 .assembly extern xunit.core {}
 
+.namespace Test_prefldinit4_simple_il
+{
 .class private auto ansi beforefieldinit measure
        extends [mscorlib]System.Object
 {
@@ -32,9 +34,9 @@
     // Code size       11 (0xb)
     .maxstack  1
     IL_0000:  ldc.i4     0xcc
-    IL_0005:  stsfld     int32 measure::a
+    IL_0005:  stsfld     int32 Test_prefldinit4_simple_il.measure::a
     IL_000a:  ret
-  } // end of method measure::.cctor
+  } // end of method Test_prefldinit4_simple_il.measure::.cctor
 
   .method public hidebysig specialname rtspecialname 
           instance void  .ctor() cil managed
@@ -44,9 +46,9 @@
     IL_0000:  ldarg.0
     IL_0001:  call       instance void [mscorlib]System.Object::.ctor()
     IL_0006:  ret
-  } // end of method measure::.ctor
+  } // end of method Test_prefldinit4_simple_il.measure::.ctor
 
-} // end of class measure
+} // end of class Test_prefldinit4_simple_il.measure
 
 .class private auto ansi test
        extends [mscorlib]System.Object
@@ -58,13 +60,13 @@
     // Code size       160 (0xa0)
     .maxstack  2
     IL_0000:  ldc.i4.s   12
-    IL_0002:  stsfld     unsigned int8 test::b
-    IL_0007:  ldsfld     int32 measure::a
+    IL_0002:  stsfld     unsigned int8 Test_prefldinit4_simple_il.test::b
+    IL_0007:  ldsfld     int32 Test_prefldinit4_simple_il.measure::a
     IL_000c:  ldc.i4     0xcc
     IL_0011:  beq.s      IL_0037
 
-    IL_0013:  ldstr      "in .cctor(), measure.a is {0}"
-    IL_0018:  ldsfld     int32 measure::a
+    IL_0013:  ldstr      "in .cctor(), Test_prefldinit4_simple_il.measure.a is {0}"
+    IL_0018:  ldsfld     int32 Test_prefldinit4_simple_il.measure::a
     IL_001d:  box        [mscorlib]System.Int32
     IL_0022:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
@@ -73,21 +75,21 @@
     IL_0031:  newobj     instance void [mscorlib]System.Exception::.ctor()
     IL_0036:  throw
 
-    IL_0037:  ldstr      "in .cctor(), measure.a is {0}"
-    IL_003c:  ldsfld     int32 measure::a
+    IL_0037:  ldstr      "in .cctor(), Test_prefldinit4_simple_il.measure.a is {0}"
+    IL_003c:  ldsfld     int32 Test_prefldinit4_simple_il.measure::a
     IL_0041:  box        [mscorlib]System.Int32
     IL_0046:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
-    IL_004b:  ldsfld     int32 measure::a
-    IL_0050:  ldsfld     unsigned int8 test::b
+    IL_004b:  ldsfld     int32 Test_prefldinit4_simple_il.measure::a
+    IL_0050:  ldsfld     unsigned int8 Test_prefldinit4_simple_il.test::b
     IL_0055:  add
-    IL_0056:  stsfld     int32 measure::a
-    IL_005b:  ldsfld     int32 measure::a
+    IL_0056:  stsfld     int32 Test_prefldinit4_simple_il.measure::a
+    IL_005b:  ldsfld     int32 Test_prefldinit4_simple_il.measure::a
     IL_0060:  ldc.i4     0xd8
     IL_0065:  beq.s      IL_008b
 
-    IL_0067:  ldstr      "in .cctor() after measure.a+=b, measure.a is {0}"
-    IL_006c:  ldsfld     int32 measure::a
+    IL_0067:  ldstr      "in .cctor() after Test_prefldinit4_simple_il.measure.a+=b, Test_prefldinit4_simple_il.measure.a is {0}"
+    IL_006c:  ldsfld     int32 Test_prefldinit4_simple_il.measure::a
     IL_0071:  box        [mscorlib]System.Int32
     IL_0076:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
@@ -96,13 +98,13 @@
     IL_0085:  newobj     instance void [mscorlib]System.Exception::.ctor()
     IL_008a:  throw
 
-    IL_008b:  ldstr      "in .cctor() after measure.a=8, measure.a is {0}"
-    IL_0090:  ldsfld     int32 measure::a
+    IL_008b:  ldstr      "in .cctor() after Test_prefldinit4_simple_il.measure.a=8, Test_prefldinit4_simple_il.measure.a is {0}"
+    IL_0090:  ldsfld     int32 Test_prefldinit4_simple_il.measure::a
     IL_0095:  box        [mscorlib]System.Int32
     IL_009a:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
     IL_009f:  ret
-  } // end of method test::.cctor
+  } // end of method Test_prefldinit4_simple_il.test::.cctor
 
   .method public hidebysig specialname rtspecialname 
           instance void  .ctor() cil managed
@@ -112,15 +114,18 @@
     IL_0000:  ldarg.0
     IL_0001:  call       instance void [mscorlib]System.Object::.ctor()
     IL_0006:  ret
-  } // end of method test::.ctor
+  } // end of method Test_prefldinit4_simple_il.test::.ctor
 
-} // end of class test
+} // end of class Test_prefldinit4_simple_il.test
 
-.class private auto ansi beforefieldinit Driver
+.class public auto ansi beforefieldinit Driver
        extends [mscorlib]System.Object
 {
   .method public hidebysig static int32  Main() cil managed
   {
+    .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+        01 00 00 00
+    )
     .entrypoint
     // Code size       174 (0xae)
     .maxstack  2
@@ -133,12 +138,12 @@
       IL_000a:  call       void [System.Console]System.Console::WriteLine()
       IL_000f:  ldstr      "Before calling static field"
       IL_0014:  call       void [System.Console]System.Console::WriteLine(string)
-      IL_0019:  ldsfld     int32 measure::a
+      IL_0019:  ldsfld     int32 Test_prefldinit4_simple_il.measure::a
       IL_001e:  ldc.i4     0xcc
       IL_0023:  beq.s      IL_0047
 
-      IL_0025:  ldstr      "in Main(), measure.a is {0}"
-      IL_002a:  ldsfld     int32 measure::a
+      IL_0025:  ldstr      "in Main(), Test_prefldinit4_simple_il.measure.a is {0}"
+      IL_002a:  ldsfld     int32 Test_prefldinit4_simple_il.measure::a
       IL_002f:  box        [mscorlib]System.Int32
       IL_0034:  call       void [System.Console]System.Console::WriteLine(string,
                                                                     object)
@@ -149,18 +154,18 @@
       IL_0045:  leave.s    IL_00ac
 
       IL_0047:  ldc.i4.s   15
-      IL_0049:  stsfld     unsigned int8 test::b
+      IL_0049:  stsfld     unsigned int8 Test_prefldinit4_simple_il.test::b
       IL_004e:  ldstr      "After calling static field"
       IL_0053:  call       void [System.Console]System.Console::WriteLine(string)
-      IL_0058:  ldsfld     int32 measure::a
+      IL_0058:  ldsfld     int32 Test_prefldinit4_simple_il.measure::a
       IL_005d:  ldc.i4     0xd8
       IL_0062:  beq.s      IL_0086
 
-      IL_0064:  ldstr      "in Main() after f(ref b), measure.a is {0}"
+      IL_0064:  ldstr      "in Main() after f(ref b), Test_prefldinit4_simple_il.measure.a is {0}"
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
           01 00 00 00
       )
-      IL_0069:  ldsfld     int32 measure::a
+      IL_0069:  ldsfld     int32 Test_prefldinit4_simple_il.measure::a
       IL_006e:  box        [mscorlib]System.Int32
       IL_0073:  call       void [System.Console]System.Console::WriteLine(string,
                                                                     object)
@@ -193,7 +198,7 @@
 
     IL_00ac:  ldloc.1
     IL_00ad:  ret
-  } // end of method Driver::Main
+  } // end of method Test_prefldinit4_simple_il.Driver::Main
 
   .method public hidebysig specialname rtspecialname 
           instance void  .ctor() cil managed
@@ -203,12 +208,13 @@
     IL_0000:  ldarg.0
     IL_0001:  call       instance void [mscorlib]System.Object::.ctor()
     IL_0006:  ret
-  } // end of method Driver::.ctor
+  } // end of method Test_prefldinit4_simple_il.Driver::.ctor
 
-} // end of class Driver
+} // end of class Test_prefldinit4_simple_il.Driver
 
 
 // =============================================================
 
 //*********** DISASSEMBLY COMPLETE ***********************
 // WARNING: Created Win32 resource file prefldinit4.res
+}
diff --git a/src/tests/JIT/Methodical/cctor/simple/prefldinit4_il_d.ilproj b/src/tests/JIT/Methodical/cctor/simple/prefldinit4_il_d.ilproj
index 878562702d73f3..7812ef4f820a18 100644
--- a/src/tests/JIT/Methodical/cctor/simple/prefldinit4_il_d.ilproj
+++ b/src/tests/JIT/Methodical/cctor/simple/prefldinit4_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/cctor/simple/prefldinit4_il_r.ilproj b/src/tests/JIT/Methodical/cctor/simple/prefldinit4_il_r.ilproj
index cd1bac01624027..c6628872b3ea09 100644
--- a/src/tests/JIT/Methodical/cctor/simple/prefldinit4_il_r.ilproj
+++ b/src/tests/JIT/Methodical/cctor/simple/prefldinit4_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/cctor/xassem/xprecise1.cs b/src/tests/JIT/Methodical/cctor/xassem/xprecise1.cs
index 4ce195164d317c..9268f619451369 100644
--- a/src/tests/JIT/Methodical/cctor/xassem/xprecise1.cs
+++ b/src/tests/JIT/Methodical/cctor/xassem/xprecise1.cs
@@ -2,10 +2,12 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // static method
 using System;
+using Xunit;
 namespace Precise {
-class Driver_xprecise1
+public class Driver_xprecise1
 {
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		try {
 			byte b = 0xF;
diff --git a/src/tests/JIT/Methodical/cctor/xassem/xprecise1_cs_d.csproj b/src/tests/JIT/Methodical/cctor/xassem/xprecise1_cs_d.csproj
index e3d2d0620b1ccd..afc65d62e5fa1d 100644
--- a/src/tests/JIT/Methodical/cctor/xassem/xprecise1_cs_d.csproj
+++ b/src/tests/JIT/Methodical/cctor/xassem/xprecise1_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
     <RequiresProcessIsolation>true</RequiresProcessIsolation>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/cctor/xassem/xprecise1_cs_do.csproj b/src/tests/JIT/Methodical/cctor/xassem/xprecise1_cs_do.csproj
index 12ca8ee503bd6a..1d488e70ca1c29 100644
--- a/src/tests/JIT/Methodical/cctor/xassem/xprecise1_cs_do.csproj
+++ b/src/tests/JIT/Methodical/cctor/xassem/xprecise1_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
     <RequiresProcessIsolation>true</RequiresProcessIsolation>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/cctor/xassem/xprecise1_cs_r.csproj b/src/tests/JIT/Methodical/cctor/xassem/xprecise1_cs_r.csproj
index f4ff2643f75d18..b5036648c2105b 100644
--- a/src/tests/JIT/Methodical/cctor/xassem/xprecise1_cs_r.csproj
+++ b/src/tests/JIT/Methodical/cctor/xassem/xprecise1_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
     <RequiresProcessIsolation>true</RequiresProcessIsolation>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/cctor/xassem/xprecise1_cs_ro.csproj b/src/tests/JIT/Methodical/cctor/xassem/xprecise1_cs_ro.csproj
index 008fe8e76f6e9b..640edfcfa6814a 100644
--- a/src/tests/JIT/Methodical/cctor/xassem/xprecise1_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/cctor/xassem/xprecise1_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
     <RequiresProcessIsolation>true</RequiresProcessIsolation>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/cctor/xassem/xprecise1b.cs b/src/tests/JIT/Methodical/cctor/xassem/xprecise1b.cs
index b684fcf87135b4..7ed312ae6803ce 100644
--- a/src/tests/JIT/Methodical/cctor/xassem/xprecise1b.cs
+++ b/src/tests/JIT/Methodical/cctor/xassem/xprecise1b.cs
@@ -3,11 +3,13 @@
 
 // static method
 using System;
+using Xunit;
 namespace Precise
 {
-    class Driver_xprecise1b
+    public class Driver_xprecise1b
     {
-        public static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             try
             {
diff --git a/src/tests/JIT/Methodical/cctor/xassem/xprecise1b_cs_d.csproj b/src/tests/JIT/Methodical/cctor/xassem/xprecise1b_cs_d.csproj
index dd4367706d169b..7769c5aef13070 100644
--- a/src/tests/JIT/Methodical/cctor/xassem/xprecise1b_cs_d.csproj
+++ b/src/tests/JIT/Methodical/cctor/xassem/xprecise1b_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
     <RequiresProcessIsolation>true</RequiresProcessIsolation>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/cctor/xassem/xprecise1b_cs_do.csproj b/src/tests/JIT/Methodical/cctor/xassem/xprecise1b_cs_do.csproj
index 97c8a9dd52d65b..c0a0ebe93f8d09 100644
--- a/src/tests/JIT/Methodical/cctor/xassem/xprecise1b_cs_do.csproj
+++ b/src/tests/JIT/Methodical/cctor/xassem/xprecise1b_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
     <RequiresProcessIsolation>true</RequiresProcessIsolation>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/cctor/xassem/xprecise1b_cs_r.csproj b/src/tests/JIT/Methodical/cctor/xassem/xprecise1b_cs_r.csproj
index a41026a40471cf..1b64daa2acc576 100644
--- a/src/tests/JIT/Methodical/cctor/xassem/xprecise1b_cs_r.csproj
+++ b/src/tests/JIT/Methodical/cctor/xassem/xprecise1b_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
     <RequiresProcessIsolation>true</RequiresProcessIsolation>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/cctor/xassem/xprecise1b_cs_ro.csproj b/src/tests/JIT/Methodical/cctor/xassem/xprecise1b_cs_ro.csproj
index e880075f81b5a3..6dc4cd1836ae4d 100644
--- a/src/tests/JIT/Methodical/cctor/xassem/xprecise1b_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/cctor/xassem/xprecise1b_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
     <RequiresProcessIsolation>true</RequiresProcessIsolation>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/cctor/xassem/xprecise2.cs b/src/tests/JIT/Methodical/cctor/xassem/xprecise2.cs
index 9d3f13ad0e020b..4b8f1623321a60 100644
--- a/src/tests/JIT/Methodical/cctor/xassem/xprecise2.cs
+++ b/src/tests/JIT/Methodical/cctor/xassem/xprecise2.cs
@@ -3,11 +3,13 @@
 
 // instance method
 using System;
+using Xunit;
 namespace Precise
 {
-    class Driver_xprecise2
+    public class Driver_xprecise2
     {
-        public static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             try
             {
diff --git a/src/tests/JIT/Methodical/cctor/xassem/xprecise2_cs_d.csproj b/src/tests/JIT/Methodical/cctor/xassem/xprecise2_cs_d.csproj
index 9c2fbcc5a5214d..c7c525c37cf6a6 100644
--- a/src/tests/JIT/Methodical/cctor/xassem/xprecise2_cs_d.csproj
+++ b/src/tests/JIT/Methodical/cctor/xassem/xprecise2_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
     <RequiresProcessIsolation>true</RequiresProcessIsolation>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/cctor/xassem/xprecise2_cs_do.csproj b/src/tests/JIT/Methodical/cctor/xassem/xprecise2_cs_do.csproj
index d35a2b39f55185..a2a12c11a730ff 100644
--- a/src/tests/JIT/Methodical/cctor/xassem/xprecise2_cs_do.csproj
+++ b/src/tests/JIT/Methodical/cctor/xassem/xprecise2_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
     <RequiresProcessIsolation>true</RequiresProcessIsolation>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/cctor/xassem/xprecise2_cs_r.csproj b/src/tests/JIT/Methodical/cctor/xassem/xprecise2_cs_r.csproj
index 4fb02962499b38..ee6c9ff1828201 100644
--- a/src/tests/JIT/Methodical/cctor/xassem/xprecise2_cs_r.csproj
+++ b/src/tests/JIT/Methodical/cctor/xassem/xprecise2_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
     <RequiresProcessIsolation>true</RequiresProcessIsolation>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/cctor/xassem/xprecise2_cs_ro.csproj b/src/tests/JIT/Methodical/cctor/xassem/xprecise2_cs_ro.csproj
index 95afdfb50b879b..0d267f26690e1f 100644
--- a/src/tests/JIT/Methodical/cctor/xassem/xprecise2_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/cctor/xassem/xprecise2_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
     <RequiresProcessIsolation>true</RequiresProcessIsolation>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/cctor/xassem/xprecise4.cs b/src/tests/JIT/Methodical/cctor/xassem/xprecise4.cs
index 70d08bd2dfd0ab..b732a4266e831b 100644
--- a/src/tests/JIT/Methodical/cctor/xassem/xprecise4.cs
+++ b/src/tests/JIT/Methodical/cctor/xassem/xprecise4.cs
@@ -3,11 +3,13 @@
 
 // static field
 using System;
+using Xunit;
 namespace Precise
 {
-    class Driver_xprecise4
+    public class Driver_xprecise4
     {
-        public static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             try
             {
diff --git a/src/tests/JIT/Methodical/cctor/xassem/xprecise4_cs_d.csproj b/src/tests/JIT/Methodical/cctor/xassem/xprecise4_cs_d.csproj
index 7bfc540d20f9bb..64ccc66fddf306 100644
--- a/src/tests/JIT/Methodical/cctor/xassem/xprecise4_cs_d.csproj
+++ b/src/tests/JIT/Methodical/cctor/xassem/xprecise4_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
     <RequiresProcessIsolation>true</RequiresProcessIsolation>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/cctor/xassem/xprecise4_cs_do.csproj b/src/tests/JIT/Methodical/cctor/xassem/xprecise4_cs_do.csproj
index 8a59eb2e31ca9d..d789bd2328d80b 100644
--- a/src/tests/JIT/Methodical/cctor/xassem/xprecise4_cs_do.csproj
+++ b/src/tests/JIT/Methodical/cctor/xassem/xprecise4_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
     <RequiresProcessIsolation>true</RequiresProcessIsolation>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/cctor/xassem/xprecise4_cs_r.csproj b/src/tests/JIT/Methodical/cctor/xassem/xprecise4_cs_r.csproj
index b54516a28cdd21..65bd223ba0ed08 100644
--- a/src/tests/JIT/Methodical/cctor/xassem/xprecise4_cs_r.csproj
+++ b/src/tests/JIT/Methodical/cctor/xassem/xprecise4_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
     <RequiresProcessIsolation>true</RequiresProcessIsolation>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/cctor/xassem/xprecise4_cs_ro.csproj b/src/tests/JIT/Methodical/cctor/xassem/xprecise4_cs_ro.csproj
index 9e8268f0d05dd8..66f99eff824ab8 100644
--- a/src/tests/JIT/Methodical/cctor/xassem/xprecise4_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/cctor/xassem/xprecise4_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
     <RequiresProcessIsolation>true</RequiresProcessIsolation>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/delegate/_simpleoddpower.il b/src/tests/JIT/Methodical/delegate/_simpleoddpower.il
index dbfa752bab7209..8ae36dcddcc0d3 100644
--- a/src/tests/JIT/Methodical/delegate/_simpleoddpower.il
+++ b/src/tests/JIT/Methodical/delegate/_simpleoddpower.il
@@ -49,7 +49,7 @@
 
 } 
 
-.class private auto ansi OddPower
+.class public auto ansi OddPower
        extends [mscorlib]System.Object
        implements Power
 {
diff --git a/src/tests/JIT/Methodical/delegate/_simpleoddpower_il_d.ilproj b/src/tests/JIT/Methodical/delegate/_simpleoddpower_il_d.ilproj
index 0a57e832d57663..0e067e654f9985 100644
--- a/src/tests/JIT/Methodical/delegate/_simpleoddpower_il_d.ilproj
+++ b/src/tests/JIT/Methodical/delegate/_simpleoddpower_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/delegate/_simpleoddpower_il_r.ilproj b/src/tests/JIT/Methodical/delegate/_simpleoddpower_il_r.ilproj
index e772be192c56d0..bf4766676354db 100644
--- a/src/tests/JIT/Methodical/delegate/_simpleoddpower_il_r.ilproj
+++ b/src/tests/JIT/Methodical/delegate/_simpleoddpower_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/divrem/div/decimaldiv.cs b/src/tests/JIT/Methodical/divrem/div/decimaldiv.cs
index 120210982f2d10..a566d67062049f 100644
--- a/src/tests/JIT/Methodical/divrem/div/decimaldiv.cs
+++ b/src/tests/JIT/Methodical/divrem/div/decimaldiv.cs
@@ -7,7 +7,8 @@
 *****************************************************************************/
 
 using System;
-internal class decimaldiv
+using Xunit;
+public class decimaldiv
 {
     private static decimal s_m_s_op1 = 50;
     private static int s_i_s_op2 = 2;
@@ -91,7 +92,8 @@ private struct VT
         public decimal m_vt_op2;
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         bool passed = true;
         //initialize class
diff --git a/src/tests/JIT/Methodical/divrem/div/decimaldiv_cs_d.csproj b/src/tests/JIT/Methodical/divrem/div/decimaldiv_cs_d.csproj
index d2bffb8636ec54..e7d5f6780496b8 100644
--- a/src/tests/JIT/Methodical/divrem/div/decimaldiv_cs_d.csproj
+++ b/src/tests/JIT/Methodical/divrem/div/decimaldiv_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/divrem/div/decimaldiv_cs_do.csproj b/src/tests/JIT/Methodical/divrem/div/decimaldiv_cs_do.csproj
index d3e037cd0b8e91..16c066a490fda1 100644
--- a/src/tests/JIT/Methodical/divrem/div/decimaldiv_cs_do.csproj
+++ b/src/tests/JIT/Methodical/divrem/div/decimaldiv_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/divrem/div/decimaldiv_cs_r.csproj b/src/tests/JIT/Methodical/divrem/div/decimaldiv_cs_r.csproj
index 5eefb8e719a25a..dc0104be1b1b85 100644
--- a/src/tests/JIT/Methodical/divrem/div/decimaldiv_cs_r.csproj
+++ b/src/tests/JIT/Methodical/divrem/div/decimaldiv_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/divrem/div/decimaldiv_cs_ro.csproj b/src/tests/JIT/Methodical/divrem/div/decimaldiv_cs_ro.csproj
index 9e9bc2c22ddb2c..188f9cd383f94d 100644
--- a/src/tests/JIT/Methodical/divrem/div/decimaldiv_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/divrem/div/decimaldiv_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/divrem/div/i4div.cs b/src/tests/JIT/Methodical/divrem/div/i4div.cs
index 1009e849adadee..171f049e125a85 100644
--- a/src/tests/JIT/Methodical/divrem/div/i4div.cs
+++ b/src/tests/JIT/Methodical/divrem/div/i4div.cs
@@ -7,7 +7,8 @@
 *****************************************************************************/
 
 using System;
-internal class i4div
+using Xunit;
+public class i4div
 {
     private static int s_i_s_op1 = 6;
     private static int s_i_s_op2 = 3;
@@ -91,7 +92,8 @@ private struct VT
         public decimal m_vt_op2;
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         bool passed = true;
         //initialize class
diff --git a/src/tests/JIT/Methodical/divrem/div/i4div_cs_d.csproj b/src/tests/JIT/Methodical/divrem/div/i4div_cs_d.csproj
index d8624fc5d33640..80b4210be927a4 100644
--- a/src/tests/JIT/Methodical/divrem/div/i4div_cs_d.csproj
+++ b/src/tests/JIT/Methodical/divrem/div/i4div_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/divrem/div/i4div_cs_do.csproj b/src/tests/JIT/Methodical/divrem/div/i4div_cs_do.csproj
index 963e7582bae27d..5d84a6d5a680dd 100644
--- a/src/tests/JIT/Methodical/divrem/div/i4div_cs_do.csproj
+++ b/src/tests/JIT/Methodical/divrem/div/i4div_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/divrem/div/i4div_cs_r.csproj b/src/tests/JIT/Methodical/divrem/div/i4div_cs_r.csproj
index cd985eee1e59b7..a1a5b6948f7c3f 100644
--- a/src/tests/JIT/Methodical/divrem/div/i4div_cs_r.csproj
+++ b/src/tests/JIT/Methodical/divrem/div/i4div_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/divrem/div/i4div_cs_ro.csproj b/src/tests/JIT/Methodical/divrem/div/i4div_cs_ro.csproj
index 80e76d151f84a7..905ac005c73fde 100644
--- a/src/tests/JIT/Methodical/divrem/div/i4div_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/divrem/div/i4div_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/divrem/div/i8div.cs b/src/tests/JIT/Methodical/divrem/div/i8div.cs
index f549000f4f6b2b..0e1d39889f63e3 100644
--- a/src/tests/JIT/Methodical/divrem/div/i8div.cs
+++ b/src/tests/JIT/Methodical/divrem/div/i8div.cs
@@ -7,7 +7,8 @@
 *****************************************************************************/
 
 using System;
-internal class i8div
+using Xunit;
+public class i8div
 {
     private static long s_l_s_op1 = 12;
     private static int s_i_s_op2 = 3;
@@ -91,7 +92,8 @@ private struct VT
         public decimal m_vt_op2;
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         bool passed = true;
         //initialize class
diff --git a/src/tests/JIT/Methodical/divrem/div/i8div_cs_d.csproj b/src/tests/JIT/Methodical/divrem/div/i8div_cs_d.csproj
index 6c7d9e8b836665..a2b4e17b2a4e29 100644
--- a/src/tests/JIT/Methodical/divrem/div/i8div_cs_d.csproj
+++ b/src/tests/JIT/Methodical/divrem/div/i8div_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/divrem/div/i8div_cs_do.csproj b/src/tests/JIT/Methodical/divrem/div/i8div_cs_do.csproj
index 9a8fa94f8497a0..3c3dbb5ff31b7c 100644
--- a/src/tests/JIT/Methodical/divrem/div/i8div_cs_do.csproj
+++ b/src/tests/JIT/Methodical/divrem/div/i8div_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/divrem/div/i8div_cs_r.csproj b/src/tests/JIT/Methodical/divrem/div/i8div_cs_r.csproj
index 470670218320e9..d6132bdf407831 100644
--- a/src/tests/JIT/Methodical/divrem/div/i8div_cs_r.csproj
+++ b/src/tests/JIT/Methodical/divrem/div/i8div_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/divrem/div/i8div_cs_ro.csproj b/src/tests/JIT/Methodical/divrem/div/i8div_cs_ro.csproj
index 66edf07ddcf235..80050f658c0fe1 100644
--- a/src/tests/JIT/Methodical/divrem/div/i8div_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/divrem/div/i8div_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/divrem/div/negSignedMod.cs b/src/tests/JIT/Methodical/divrem/div/negSignedMod.cs
index a0f4438e7d2211..22774c27a8a097 100644
--- a/src/tests/JIT/Methodical/divrem/div/negSignedMod.cs
+++ b/src/tests/JIT/Methodical/divrem/div/negSignedMod.cs
@@ -3,10 +3,12 @@
 
 using System;
 using System.IO;
+using Xunit;
 
-internal class Test_negSignedMod
+public class Test_negSignedMod
 {
-    private static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         Console.WriteLine(TimeSpan.FromTicks(-2567240321185713219).Seconds);
         if (TimeSpan.FromTicks(-2567240321185713219).Seconds != -38)
diff --git a/src/tests/JIT/Methodical/divrem/div/negSignedMod.csproj b/src/tests/JIT/Methodical/divrem/div/negSignedMod.csproj
index 6e29d23e1d66e5..b932a3821ec7f2 100644
--- a/src/tests/JIT/Methodical/divrem/div/negSignedMod.csproj
+++ b/src/tests/JIT/Methodical/divrem/div/negSignedMod.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/divrem/div/overlddiv.cs b/src/tests/JIT/Methodical/divrem/div/overlddiv.cs
index fd250cbde10784..7849b57745bf40 100644
--- a/src/tests/JIT/Methodical/divrem/div/overlddiv.cs
+++ b/src/tests/JIT/Methodical/divrem/div/overlddiv.cs
@@ -9,7 +9,8 @@ op1 is of a user-defined class numHolder that overloads operator /
 *****************************************************************************/
 
 using System;
-internal class overlddiv
+using Xunit;
+public class overlddiv
 {
     //user-defined class that overloads operator /
     public class numHolder
@@ -234,7 +235,8 @@ private struct VT
         public numHolder nHldr_vt_op2;
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         bool passed = true;
         //initialize class
diff --git a/src/tests/JIT/Methodical/divrem/div/overlddiv_cs_d.csproj b/src/tests/JIT/Methodical/divrem/div/overlddiv_cs_d.csproj
index e7dc24382fed97..c581a2f764b577 100644
--- a/src/tests/JIT/Methodical/divrem/div/overlddiv_cs_d.csproj
+++ b/src/tests/JIT/Methodical/divrem/div/overlddiv_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/divrem/div/overlddiv_cs_do.csproj b/src/tests/JIT/Methodical/divrem/div/overlddiv_cs_do.csproj
index 6f9111b1568397..366fe5e892ebfa 100644
--- a/src/tests/JIT/Methodical/divrem/div/overlddiv_cs_do.csproj
+++ b/src/tests/JIT/Methodical/divrem/div/overlddiv_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/divrem/div/overlddiv_cs_r.csproj b/src/tests/JIT/Methodical/divrem/div/overlddiv_cs_r.csproj
index 7413582121b229..934923af98ce7e 100644
--- a/src/tests/JIT/Methodical/divrem/div/overlddiv_cs_r.csproj
+++ b/src/tests/JIT/Methodical/divrem/div/overlddiv_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/divrem/div/overlddiv_cs_ro.csproj b/src/tests/JIT/Methodical/divrem/div/overlddiv_cs_ro.csproj
index c24d3682babbf1..cbe4a38f4311c9 100644
--- a/src/tests/JIT/Methodical/divrem/div/overlddiv_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/divrem/div/overlddiv_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/divrem/div/r4div.cs b/src/tests/JIT/Methodical/divrem/div/r4div.cs
index 768b076f30582d..17e30020619d22 100644
--- a/src/tests/JIT/Methodical/divrem/div/r4div.cs
+++ b/src/tests/JIT/Methodical/divrem/div/r4div.cs
@@ -7,7 +7,8 @@
 *****************************************************************************/
 
 using System;
-internal class r4div
+using Xunit;
+public class r4div
 {
     private static float s_f_s_op1 = 10;
     private static int s_i_s_op2 = 2;
@@ -91,7 +92,8 @@ private struct VT
         public decimal m_vt_op2;
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         bool passed = true;
         //initialize class
diff --git a/src/tests/JIT/Methodical/divrem/div/r4div_cs_d.csproj b/src/tests/JIT/Methodical/divrem/div/r4div_cs_d.csproj
index b051ebac8d3bfb..2150688a88fd99 100644
--- a/src/tests/JIT/Methodical/divrem/div/r4div_cs_d.csproj
+++ b/src/tests/JIT/Methodical/divrem/div/r4div_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/divrem/div/r4div_cs_do.csproj b/src/tests/JIT/Methodical/divrem/div/r4div_cs_do.csproj
index 076cbc86d19894..cd402c7d8629c8 100644
--- a/src/tests/JIT/Methodical/divrem/div/r4div_cs_do.csproj
+++ b/src/tests/JIT/Methodical/divrem/div/r4div_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/divrem/div/r4div_cs_r.csproj b/src/tests/JIT/Methodical/divrem/div/r4div_cs_r.csproj
index 052b761a8b6799..4d3fc5155081d5 100644
--- a/src/tests/JIT/Methodical/divrem/div/r4div_cs_r.csproj
+++ b/src/tests/JIT/Methodical/divrem/div/r4div_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/divrem/div/r4div_cs_ro.csproj b/src/tests/JIT/Methodical/divrem/div/r4div_cs_ro.csproj
index aa70a1f6369f98..c9e79110597819 100644
--- a/src/tests/JIT/Methodical/divrem/div/r4div_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/divrem/div/r4div_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/divrem/div/r8div.cs b/src/tests/JIT/Methodical/divrem/div/r8div.cs
index a67f4a626b3fc4..ca7da8e8e3eb1e 100644
--- a/src/tests/JIT/Methodical/divrem/div/r8div.cs
+++ b/src/tests/JIT/Methodical/divrem/div/r8div.cs
@@ -7,7 +7,8 @@
 *****************************************************************************/
 
 using System;
-internal class r8div
+using Xunit;
+public class r8div
 {
     private static double s_d_s_op1 = 15;
     private static int s_i_s_op2 = 3;
@@ -91,7 +92,8 @@ private struct VT
         public decimal m_vt_op2;
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         bool passed = true;
         //initialize class
diff --git a/src/tests/JIT/Methodical/divrem/div/r8div_cs_d.csproj b/src/tests/JIT/Methodical/divrem/div/r8div_cs_d.csproj
index 81f4284d73b4b9..2ff71c44910a98 100644
--- a/src/tests/JIT/Methodical/divrem/div/r8div_cs_d.csproj
+++ b/src/tests/JIT/Methodical/divrem/div/r8div_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/divrem/div/r8div_cs_do.csproj b/src/tests/JIT/Methodical/divrem/div/r8div_cs_do.csproj
index a405040a1e0028..36e49877d444c2 100644
--- a/src/tests/JIT/Methodical/divrem/div/r8div_cs_do.csproj
+++ b/src/tests/JIT/Methodical/divrem/div/r8div_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/divrem/div/r8div_cs_r.csproj b/src/tests/JIT/Methodical/divrem/div/r8div_cs_r.csproj
index 077a4e438cadf9..a664334bb9f0ad 100644
--- a/src/tests/JIT/Methodical/divrem/div/r8div_cs_r.csproj
+++ b/src/tests/JIT/Methodical/divrem/div/r8div_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/divrem/div/r8div_cs_ro.csproj b/src/tests/JIT/Methodical/divrem/div/r8div_cs_ro.csproj
index 329a8c957d5943..9af0e23785cde9 100644
--- a/src/tests/JIT/Methodical/divrem/div/r8div_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/divrem/div/r8div_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/divrem/div/u4div.cs b/src/tests/JIT/Methodical/divrem/div/u4div.cs
index 627b7f2943114c..d24bd93b091cea 100644
--- a/src/tests/JIT/Methodical/divrem/div/u4div.cs
+++ b/src/tests/JIT/Methodical/divrem/div/u4div.cs
@@ -7,7 +7,8 @@
 *****************************************************************************/
 
 using System;
-internal class u4div
+using Xunit;
+public class u4div
 {
     private static uint s_ui_s_op1 = 9;
     private static int s_i_s_op2 = 3;
@@ -91,7 +92,8 @@ private struct VT
         public decimal m_vt_op2;
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         bool passed = true;
         //initialize class
diff --git a/src/tests/JIT/Methodical/divrem/div/u4div_cs_d.csproj b/src/tests/JIT/Methodical/divrem/div/u4div_cs_d.csproj
index 75ca4c5db6621c..d31531241895e1 100644
--- a/src/tests/JIT/Methodical/divrem/div/u4div_cs_d.csproj
+++ b/src/tests/JIT/Methodical/divrem/div/u4div_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/divrem/div/u4div_cs_do.csproj b/src/tests/JIT/Methodical/divrem/div/u4div_cs_do.csproj
index fde3cb889e51c3..6a7c486f0e299b 100644
--- a/src/tests/JIT/Methodical/divrem/div/u4div_cs_do.csproj
+++ b/src/tests/JIT/Methodical/divrem/div/u4div_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/divrem/div/u4div_cs_r.csproj b/src/tests/JIT/Methodical/divrem/div/u4div_cs_r.csproj
index 1bec75c172d53d..6f779b02e5165e 100644
--- a/src/tests/JIT/Methodical/divrem/div/u4div_cs_r.csproj
+++ b/src/tests/JIT/Methodical/divrem/div/u4div_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/divrem/div/u4div_cs_ro.csproj b/src/tests/JIT/Methodical/divrem/div/u4div_cs_ro.csproj
index e7139049533533..73e0ea525fd139 100644
--- a/src/tests/JIT/Methodical/divrem/div/u4div_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/divrem/div/u4div_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/divrem/div/u8div.cs b/src/tests/JIT/Methodical/divrem/div/u8div.cs
index 208a6209b160ae..37850335f31976 100644
--- a/src/tests/JIT/Methodical/divrem/div/u8div.cs
+++ b/src/tests/JIT/Methodical/divrem/div/u8div.cs
@@ -7,7 +7,8 @@
 *****************************************************************************/
 
 using System;
-internal class u8div
+using Xunit;
+public class u8div
 {
     private static ulong s_ul_s_op1 = 12;
     private static int s_i_s_op2 = 2;
@@ -91,7 +92,8 @@ private struct VT
         public decimal m_vt_op2;
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         bool passed = true;
         //initialize class
diff --git a/src/tests/JIT/Methodical/divrem/div/u8div_cs_d.csproj b/src/tests/JIT/Methodical/divrem/div/u8div_cs_d.csproj
index 7b2570612dca34..5f3ee52820aca6 100644
--- a/src/tests/JIT/Methodical/divrem/div/u8div_cs_d.csproj
+++ b/src/tests/JIT/Methodical/divrem/div/u8div_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/divrem/div/u8div_cs_do.csproj b/src/tests/JIT/Methodical/divrem/div/u8div_cs_do.csproj
index 42590154fadc94..bc322682e355e0 100644
--- a/src/tests/JIT/Methodical/divrem/div/u8div_cs_do.csproj
+++ b/src/tests/JIT/Methodical/divrem/div/u8div_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/divrem/div/u8div_cs_r.csproj b/src/tests/JIT/Methodical/divrem/div/u8div_cs_r.csproj
index abbfd7110beb07..98e0795884c099 100644
--- a/src/tests/JIT/Methodical/divrem/div/u8div_cs_r.csproj
+++ b/src/tests/JIT/Methodical/divrem/div/u8div_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/divrem/div/u8div_cs_ro.csproj b/src/tests/JIT/Methodical/divrem/div/u8div_cs_ro.csproj
index 1c80fd47e5ccaf..1563b7ddd16179 100644
--- a/src/tests/JIT/Methodical/divrem/div/u8div_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/divrem/div/u8div_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/divrem/rem/decimalrem.cs b/src/tests/JIT/Methodical/divrem/rem/decimalrem.cs
index 809dd07f206694..babb86b05cfc1f 100644
--- a/src/tests/JIT/Methodical/divrem/rem/decimalrem.cs
+++ b/src/tests/JIT/Methodical/divrem/rem/decimalrem.cs
@@ -7,7 +7,8 @@
 *****************************************************************************/
 
 using System;
-internal class decimalrem
+using Xunit;
+public class decimalrem
 {
     private static decimal s_m_s_op1 = 50;
     private static int s_i_s_op2 = 3;
@@ -91,7 +92,8 @@ private struct VT
         public decimal m_vt_op2;
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         bool passed = true;
         //initialize class
diff --git a/src/tests/JIT/Methodical/divrem/rem/decimalrem_cs_d.csproj b/src/tests/JIT/Methodical/divrem/rem/decimalrem_cs_d.csproj
index 9dfce7b3c07326..f71247342b217e 100644
--- a/src/tests/JIT/Methodical/divrem/rem/decimalrem_cs_d.csproj
+++ b/src/tests/JIT/Methodical/divrem/rem/decimalrem_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/divrem/rem/decimalrem_cs_do.csproj b/src/tests/JIT/Methodical/divrem/rem/decimalrem_cs_do.csproj
index d1ba7f62494539..bb16299f963e10 100644
--- a/src/tests/JIT/Methodical/divrem/rem/decimalrem_cs_do.csproj
+++ b/src/tests/JIT/Methodical/divrem/rem/decimalrem_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/divrem/rem/decimalrem_cs_r.csproj b/src/tests/JIT/Methodical/divrem/rem/decimalrem_cs_r.csproj
index 42f07ee59b4851..db2b3d086c230c 100644
--- a/src/tests/JIT/Methodical/divrem/rem/decimalrem_cs_r.csproj
+++ b/src/tests/JIT/Methodical/divrem/rem/decimalrem_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/divrem/rem/decimalrem_cs_ro.csproj b/src/tests/JIT/Methodical/divrem/rem/decimalrem_cs_ro.csproj
index 1ae453f401a4d3..663b28851a6b7b 100644
--- a/src/tests/JIT/Methodical/divrem/rem/decimalrem_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/divrem/rem/decimalrem_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/divrem/rem/i4rem.cs b/src/tests/JIT/Methodical/divrem/rem/i4rem.cs
index f104c0215ca055..94fd4c0312e745 100644
--- a/src/tests/JIT/Methodical/divrem/rem/i4rem.cs
+++ b/src/tests/JIT/Methodical/divrem/rem/i4rem.cs
@@ -7,7 +7,8 @@
 *****************************************************************************/
 
 using System;
-internal class i4rem
+using Xunit;
+public class i4rem
 {
     private static int s_i_s_op1 = 7;
     private static int s_i_s_op2 = 3;
@@ -91,7 +92,8 @@ private struct VT
         public decimal m_vt_op2;
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         bool passed = true;
         //initialize class
diff --git a/src/tests/JIT/Methodical/divrem/rem/i4rem_cs_d.csproj b/src/tests/JIT/Methodical/divrem/rem/i4rem_cs_d.csproj
index 093833dcee6abe..b09639d67e8de1 100644
--- a/src/tests/JIT/Methodical/divrem/rem/i4rem_cs_d.csproj
+++ b/src/tests/JIT/Methodical/divrem/rem/i4rem_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/divrem/rem/i4rem_cs_do.csproj b/src/tests/JIT/Methodical/divrem/rem/i4rem_cs_do.csproj
index 697007fa9abd33..a9df57e9e11ed0 100644
--- a/src/tests/JIT/Methodical/divrem/rem/i4rem_cs_do.csproj
+++ b/src/tests/JIT/Methodical/divrem/rem/i4rem_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/divrem/rem/i4rem_cs_r.csproj b/src/tests/JIT/Methodical/divrem/rem/i4rem_cs_r.csproj
index 184536873552a0..20bd5f165a6106 100644
--- a/src/tests/JIT/Methodical/divrem/rem/i4rem_cs_r.csproj
+++ b/src/tests/JIT/Methodical/divrem/rem/i4rem_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/divrem/rem/i4rem_cs_ro.csproj b/src/tests/JIT/Methodical/divrem/rem/i4rem_cs_ro.csproj
index 129849a2ea6191..19f0dbf3c5ef5f 100644
--- a/src/tests/JIT/Methodical/divrem/rem/i4rem_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/divrem/rem/i4rem_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/divrem/rem/i8rem.cs b/src/tests/JIT/Methodical/divrem/rem/i8rem.cs
index 4b68ca26db462b..b1b12ec1ffcbe2 100644
--- a/src/tests/JIT/Methodical/divrem/rem/i8rem.cs
+++ b/src/tests/JIT/Methodical/divrem/rem/i8rem.cs
@@ -7,7 +7,8 @@
 *****************************************************************************/
 
 using System;
-internal class i8rem
+using Xunit;
+public class i8rem
 {
     private static long s_l_s_op1 = 7;
     private static int s_i_s_op2 = 4;
@@ -91,7 +92,8 @@ private struct VT
         public decimal m_vt_op2;
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         bool passed = true;
         //initialize class
diff --git a/src/tests/JIT/Methodical/divrem/rem/i8rem_cs_d.csproj b/src/tests/JIT/Methodical/divrem/rem/i8rem_cs_d.csproj
index f132348d69d9aa..317fa3f7ba0b5b 100644
--- a/src/tests/JIT/Methodical/divrem/rem/i8rem_cs_d.csproj
+++ b/src/tests/JIT/Methodical/divrem/rem/i8rem_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/divrem/rem/i8rem_cs_do.csproj b/src/tests/JIT/Methodical/divrem/rem/i8rem_cs_do.csproj
index 5ecd9a105bbcf7..6dae82c2c0774c 100644
--- a/src/tests/JIT/Methodical/divrem/rem/i8rem_cs_do.csproj
+++ b/src/tests/JIT/Methodical/divrem/rem/i8rem_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/divrem/rem/i8rem_cs_r.csproj b/src/tests/JIT/Methodical/divrem/rem/i8rem_cs_r.csproj
index c64e041cc7349e..4e8ad282f2d1ba 100644
--- a/src/tests/JIT/Methodical/divrem/rem/i8rem_cs_r.csproj
+++ b/src/tests/JIT/Methodical/divrem/rem/i8rem_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/divrem/rem/i8rem_cs_ro.csproj b/src/tests/JIT/Methodical/divrem/rem/i8rem_cs_ro.csproj
index c9fc874173e708..4090f7183a91ce 100644
--- a/src/tests/JIT/Methodical/divrem/rem/i8rem_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/divrem/rem/i8rem_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/divrem/rem/overldrem.cs b/src/tests/JIT/Methodical/divrem/rem/overldrem.cs
index 9d2f125b875a8d..9418ca4ed2f77a 100644
--- a/src/tests/JIT/Methodical/divrem/rem/overldrem.cs
+++ b/src/tests/JIT/Methodical/divrem/rem/overldrem.cs
@@ -9,7 +9,8 @@ op1 is of a user-defined class numHolder that overloads operator %
 *****************************************************************************/
 
 using System;
-internal class overldrem
+using Xunit;
+public class overldrem
 {
     //user-defined class that overloads operator %
     public class numHolder
@@ -234,7 +235,8 @@ private struct VT
         public numHolder nHldr_vt_op2;
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         bool passed = true;
         //initialize class
diff --git a/src/tests/JIT/Methodical/divrem/rem/overldrem_cs_d.csproj b/src/tests/JIT/Methodical/divrem/rem/overldrem_cs_d.csproj
index 3a4678b7f51d77..11922d537b75bb 100644
--- a/src/tests/JIT/Methodical/divrem/rem/overldrem_cs_d.csproj
+++ b/src/tests/JIT/Methodical/divrem/rem/overldrem_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/divrem/rem/overldrem_cs_do.csproj b/src/tests/JIT/Methodical/divrem/rem/overldrem_cs_do.csproj
index e7cc06bfa9d147..c93685cddbc828 100644
--- a/src/tests/JIT/Methodical/divrem/rem/overldrem_cs_do.csproj
+++ b/src/tests/JIT/Methodical/divrem/rem/overldrem_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/divrem/rem/overldrem_cs_r.csproj b/src/tests/JIT/Methodical/divrem/rem/overldrem_cs_r.csproj
index 73def29de97291..0d22f1c4568811 100644
--- a/src/tests/JIT/Methodical/divrem/rem/overldrem_cs_r.csproj
+++ b/src/tests/JIT/Methodical/divrem/rem/overldrem_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/divrem/rem/overldrem_cs_ro.csproj b/src/tests/JIT/Methodical/divrem/rem/overldrem_cs_ro.csproj
index 18727a629e5a38..8f958a24a29180 100644
--- a/src/tests/JIT/Methodical/divrem/rem/overldrem_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/divrem/rem/overldrem_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/divrem/rem/r4rem.cs b/src/tests/JIT/Methodical/divrem/rem/r4rem.cs
index ff015480af1493..00d17a23a443aa 100644
--- a/src/tests/JIT/Methodical/divrem/rem/r4rem.cs
+++ b/src/tests/JIT/Methodical/divrem/rem/r4rem.cs
@@ -7,7 +7,8 @@
 *****************************************************************************/
 
 using System;
-internal class r4rem
+using Xunit;
+public class r4rem
 {
     private static float s_f_s_op1 = 9;
     private static int s_i_s_op2 = 6;
@@ -91,7 +92,8 @@ private struct VT
         public decimal m_vt_op2;
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         bool passed = true;
         //initialize class
diff --git a/src/tests/JIT/Methodical/divrem/rem/r4rem_cs_d.csproj b/src/tests/JIT/Methodical/divrem/rem/r4rem_cs_d.csproj
index 60edb56ec55e5b..336fda92e732e2 100644
--- a/src/tests/JIT/Methodical/divrem/rem/r4rem_cs_d.csproj
+++ b/src/tests/JIT/Methodical/divrem/rem/r4rem_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/divrem/rem/r4rem_cs_do.csproj b/src/tests/JIT/Methodical/divrem/rem/r4rem_cs_do.csproj
index 42447ca4cc091f..a4bfb2af83ff83 100644
--- a/src/tests/JIT/Methodical/divrem/rem/r4rem_cs_do.csproj
+++ b/src/tests/JIT/Methodical/divrem/rem/r4rem_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/divrem/rem/r4rem_cs_r.csproj b/src/tests/JIT/Methodical/divrem/rem/r4rem_cs_r.csproj
index a3fb878543a7e4..f65dc9ecb8f6a6 100644
--- a/src/tests/JIT/Methodical/divrem/rem/r4rem_cs_r.csproj
+++ b/src/tests/JIT/Methodical/divrem/rem/r4rem_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/divrem/rem/r4rem_cs_ro.csproj b/src/tests/JIT/Methodical/divrem/rem/r4rem_cs_ro.csproj
index 2219b4ea31d6df..c62d2739d445d1 100644
--- a/src/tests/JIT/Methodical/divrem/rem/r4rem_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/divrem/rem/r4rem_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/divrem/rem/r8rem.cs b/src/tests/JIT/Methodical/divrem/rem/r8rem.cs
index 68a9c207e49a6c..f7d6e215507a83 100644
--- a/src/tests/JIT/Methodical/divrem/rem/r8rem.cs
+++ b/src/tests/JIT/Methodical/divrem/rem/r8rem.cs
@@ -7,7 +7,8 @@
 *****************************************************************************/
 
 using System;
-internal class r8rem
+using Xunit;
+public class r8rem
 {
     private static double s_d_s_op1 = 8;
     private static int s_i_s_op2 = 7;
@@ -91,7 +92,8 @@ private struct VT
         public decimal m_vt_op2;
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         bool passed = true;
         //initialize class
diff --git a/src/tests/JIT/Methodical/divrem/rem/r8rem_cs_d.csproj b/src/tests/JIT/Methodical/divrem/rem/r8rem_cs_d.csproj
index f3d620f58a4e73..d28cdb3fd7fa9b 100644
--- a/src/tests/JIT/Methodical/divrem/rem/r8rem_cs_d.csproj
+++ b/src/tests/JIT/Methodical/divrem/rem/r8rem_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/divrem/rem/r8rem_cs_do.csproj b/src/tests/JIT/Methodical/divrem/rem/r8rem_cs_do.csproj
index d8de413da8e176..5dbaf83c672dc7 100644
--- a/src/tests/JIT/Methodical/divrem/rem/r8rem_cs_do.csproj
+++ b/src/tests/JIT/Methodical/divrem/rem/r8rem_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/divrem/rem/r8rem_cs_r.csproj b/src/tests/JIT/Methodical/divrem/rem/r8rem_cs_r.csproj
index b1ffcf3232b4f9..93c05a2b0b8a45 100644
--- a/src/tests/JIT/Methodical/divrem/rem/r8rem_cs_r.csproj
+++ b/src/tests/JIT/Methodical/divrem/rem/r8rem_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/divrem/rem/r8rem_cs_ro.csproj b/src/tests/JIT/Methodical/divrem/rem/r8rem_cs_ro.csproj
index 57fe7a2ad75e79..aecfdee3f208b4 100644
--- a/src/tests/JIT/Methodical/divrem/rem/r8rem_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/divrem/rem/r8rem_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/divrem/rem/u4rem.cs b/src/tests/JIT/Methodical/divrem/rem/u4rem.cs
index ddce3eadbf90c9..4afb4bda0fd355 100644
--- a/src/tests/JIT/Methodical/divrem/rem/u4rem.cs
+++ b/src/tests/JIT/Methodical/divrem/rem/u4rem.cs
@@ -7,7 +7,8 @@
 *****************************************************************************/
 
 using System;
-internal class u4rem
+using Xunit;
+public class u4rem
 {
     private static uint s_ui_s_op1 = 11;
     private static int s_i_s_op2 = 3;
@@ -91,7 +92,8 @@ private struct VT
         public decimal m_vt_op2;
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         bool passed = true;
         //initialize class
diff --git a/src/tests/JIT/Methodical/divrem/rem/u4rem_cs_d.csproj b/src/tests/JIT/Methodical/divrem/rem/u4rem_cs_d.csproj
index e1778854022cc3..1bf1f301c2b2f8 100644
--- a/src/tests/JIT/Methodical/divrem/rem/u4rem_cs_d.csproj
+++ b/src/tests/JIT/Methodical/divrem/rem/u4rem_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/divrem/rem/u4rem_cs_do.csproj b/src/tests/JIT/Methodical/divrem/rem/u4rem_cs_do.csproj
index 41253af0ac3566..c296887073b019 100644
--- a/src/tests/JIT/Methodical/divrem/rem/u4rem_cs_do.csproj
+++ b/src/tests/JIT/Methodical/divrem/rem/u4rem_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/divrem/rem/u4rem_cs_r.csproj b/src/tests/JIT/Methodical/divrem/rem/u4rem_cs_r.csproj
index d0decf1bd17848..49e8831224943f 100644
--- a/src/tests/JIT/Methodical/divrem/rem/u4rem_cs_r.csproj
+++ b/src/tests/JIT/Methodical/divrem/rem/u4rem_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/divrem/rem/u4rem_cs_ro.csproj b/src/tests/JIT/Methodical/divrem/rem/u4rem_cs_ro.csproj
index 9784805bb88e10..edc2cf299c67d4 100644
--- a/src/tests/JIT/Methodical/divrem/rem/u4rem_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/divrem/rem/u4rem_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/divrem/rem/u8rem.cs b/src/tests/JIT/Methodical/divrem/rem/u8rem.cs
index 31c52d0a2601a8..e24afd0b7f3637 100644
--- a/src/tests/JIT/Methodical/divrem/rem/u8rem.cs
+++ b/src/tests/JIT/Methodical/divrem/rem/u8rem.cs
@@ -7,7 +7,8 @@
 *****************************************************************************/
 
 using System;
-internal class u8rem
+using Xunit;
+public class u8rem
 {
     private static ulong s_ul_s_op1 = 27;
     private static int s_i_s_op2 = 5;
@@ -91,7 +92,8 @@ private struct VT
         public decimal m_vt_op2;
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         bool passed = true;
         //initialize class
diff --git a/src/tests/JIT/Methodical/divrem/rem/u8rem_cs_d.csproj b/src/tests/JIT/Methodical/divrem/rem/u8rem_cs_d.csproj
index 9cd4920d02aad6..a894e6a12a7ee2 100644
--- a/src/tests/JIT/Methodical/divrem/rem/u8rem_cs_d.csproj
+++ b/src/tests/JIT/Methodical/divrem/rem/u8rem_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/divrem/rem/u8rem_cs_do.csproj b/src/tests/JIT/Methodical/divrem/rem/u8rem_cs_do.csproj
index 34246a25b4b838..66563f60ed3cb1 100644
--- a/src/tests/JIT/Methodical/divrem/rem/u8rem_cs_do.csproj
+++ b/src/tests/JIT/Methodical/divrem/rem/u8rem_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/divrem/rem/u8rem_cs_r.csproj b/src/tests/JIT/Methodical/divrem/rem/u8rem_cs_r.csproj
index 0d9a65c01d0f37..4e7efb9a9eed20 100644
--- a/src/tests/JIT/Methodical/divrem/rem/u8rem_cs_r.csproj
+++ b/src/tests/JIT/Methodical/divrem/rem/u8rem_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/divrem/rem/u8rem_cs_ro.csproj b/src/tests/JIT/Methodical/divrem/rem/u8rem_cs_ro.csproj
index e57a6ee3c3f93a..0be3d9c7aebef1 100644
--- a/src/tests/JIT/Methodical/divrem/rem/u8rem_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/divrem/rem/u8rem_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/doublearray/dblarray1.cs b/src/tests/JIT/Methodical/doublearray/dblarray1.cs
index 7b4fab9eb4ad95..726e5d2a55dcd6 100644
--- a/src/tests/JIT/Methodical/doublearray/dblarray1.cs
+++ b/src/tests/JIT/Methodical/doublearray/dblarray1.cs
@@ -14,7 +14,8 @@
 
 using System.Runtime.InteropServices;
 using System;
-internal class DblArray1
+using Xunit;
+public class DblArray1
 {
     private static int s_LOH_GEN = 0;
     public static void f0()
@@ -90,7 +91,8 @@ public static void Run(Action f)
         }
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         if (RuntimeInformation.ProcessArchitecture == Architecture.X86)
         {
diff --git a/src/tests/JIT/Methodical/doublearray/dblarray1_cs_d.csproj b/src/tests/JIT/Methodical/doublearray/dblarray1_cs_d.csproj
index b6edebbbe1253d..de0f8387c03072 100644
--- a/src/tests/JIT/Methodical/doublearray/dblarray1_cs_d.csproj
+++ b/src/tests/JIT/Methodical/doublearray/dblarray1_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/doublearray/dblarray1_cs_do.csproj b/src/tests/JIT/Methodical/doublearray/dblarray1_cs_do.csproj
index 612819361c9fc5..c6aaa879f54dbe 100644
--- a/src/tests/JIT/Methodical/doublearray/dblarray1_cs_do.csproj
+++ b/src/tests/JIT/Methodical/doublearray/dblarray1_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/doublearray/dblarray1_cs_r.csproj b/src/tests/JIT/Methodical/doublearray/dblarray1_cs_r.csproj
index ccf13400948d52..6d5bd1db7160fb 100644
--- a/src/tests/JIT/Methodical/doublearray/dblarray1_cs_r.csproj
+++ b/src/tests/JIT/Methodical/doublearray/dblarray1_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/doublearray/dblarray1_cs_ro.csproj b/src/tests/JIT/Methodical/doublearray/dblarray1_cs_ro.csproj
index 2cd50edb2df118..b6b9f010f0d751 100644
--- a/src/tests/JIT/Methodical/doublearray/dblarray1_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/doublearray/dblarray1_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/doublearray/dblarray2.cs b/src/tests/JIT/Methodical/doublearray/dblarray2.cs
index dfaa305051938b..64e2e8d00ee3de 100644
--- a/src/tests/JIT/Methodical/doublearray/dblarray2.cs
+++ b/src/tests/JIT/Methodical/doublearray/dblarray2.cs
@@ -13,7 +13,8 @@
 
 using System.Runtime.InteropServices;
 using System;
-internal class DblArray
+using Xunit;
+public class DblArray
 {
     private static int s_LOH_GEN = 0;
     public static void f0()
@@ -279,7 +280,8 @@ public static void Run(Action f)
         }
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         if (RuntimeInformation.ProcessArchitecture == Architecture.X86)
         {
diff --git a/src/tests/JIT/Methodical/doublearray/dblarray2_cs_d.csproj b/src/tests/JIT/Methodical/doublearray/dblarray2_cs_d.csproj
index 1fbe4db35aa8bd..76f9924f432395 100644
--- a/src/tests/JIT/Methodical/doublearray/dblarray2_cs_d.csproj
+++ b/src/tests/JIT/Methodical/doublearray/dblarray2_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/doublearray/dblarray2_cs_do.csproj b/src/tests/JIT/Methodical/doublearray/dblarray2_cs_do.csproj
index 873dfccc7ed70e..8dc0e4260315a6 100644
--- a/src/tests/JIT/Methodical/doublearray/dblarray2_cs_do.csproj
+++ b/src/tests/JIT/Methodical/doublearray/dblarray2_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/doublearray/dblarray2_cs_r.csproj b/src/tests/JIT/Methodical/doublearray/dblarray2_cs_r.csproj
index 9e7f6122a9e573..5ee6baa4e682e7 100644
--- a/src/tests/JIT/Methodical/doublearray/dblarray2_cs_r.csproj
+++ b/src/tests/JIT/Methodical/doublearray/dblarray2_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/doublearray/dblarray2_cs_ro.csproj b/src/tests/JIT/Methodical/doublearray/dblarray2_cs_ro.csproj
index 6f8b6739153a82..3b7c507e38a9ab 100644
--- a/src/tests/JIT/Methodical/doublearray/dblarray2_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/doublearray/dblarray2_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/doublearray/dblarray3.cs b/src/tests/JIT/Methodical/doublearray/dblarray3.cs
index 1c59e6b0f5af51..03f521d6baf0cb 100644
--- a/src/tests/JIT/Methodical/doublearray/dblarray3.cs
+++ b/src/tests/JIT/Methodical/doublearray/dblarray3.cs
@@ -5,6 +5,7 @@
 
 using System;
 using System.Runtime.InteropServices;
+using Xunit;
 
 internal struct VT
 {
@@ -16,7 +17,7 @@ internal class CL
     public double[] cl_arr = new double[1000];
 }
 
-internal class DblArray3
+public class DblArray3
 {
     private static int s_LOH_GEN = 0;
     public static double[] s_arr;
@@ -139,7 +140,8 @@ public static void Run(Action f)
         }
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         Console.WriteLine(RuntimeInformation.ProcessArchitecture);
         if (RuntimeInformation.ProcessArchitecture == Architecture.X86)
diff --git a/src/tests/JIT/Methodical/doublearray/dblarray3_cs_d.csproj b/src/tests/JIT/Methodical/doublearray/dblarray3_cs_d.csproj
index eeb6dfc37d0f77..ace490d967a3df 100644
--- a/src/tests/JIT/Methodical/doublearray/dblarray3_cs_d.csproj
+++ b/src/tests/JIT/Methodical/doublearray/dblarray3_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/doublearray/dblarray3_cs_do.csproj b/src/tests/JIT/Methodical/doublearray/dblarray3_cs_do.csproj
index 13631f4e868ba7..d9122166b18245 100644
--- a/src/tests/JIT/Methodical/doublearray/dblarray3_cs_do.csproj
+++ b/src/tests/JIT/Methodical/doublearray/dblarray3_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/doublearray/dblarray3_cs_r.csproj b/src/tests/JIT/Methodical/doublearray/dblarray3_cs_r.csproj
index 30a0cc66a98f90..9e5f58fea3ed72 100644
--- a/src/tests/JIT/Methodical/doublearray/dblarray3_cs_r.csproj
+++ b/src/tests/JIT/Methodical/doublearray/dblarray3_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/doublearray/dblarray3_cs_ro.csproj b/src/tests/JIT/Methodical/doublearray/dblarray3_cs_ro.csproj
index 82360363951250..68268e906e9cec 100644
--- a/src/tests/JIT/Methodical/doublearray/dblarray3_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/doublearray/dblarray3_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/doublearray/dblarray4.cs b/src/tests/JIT/Methodical/doublearray/dblarray4.cs
index 5c33f9a789d9c1..076a001a17e1f0 100644
--- a/src/tests/JIT/Methodical/doublearray/dblarray4.cs
+++ b/src/tests/JIT/Methodical/doublearray/dblarray4.cs
@@ -14,11 +14,13 @@
 
 using System;
 using System.Runtime.InteropServices;
+using Xunit;
 
-internal class DblArray4
+public class DblArray4
 {
     private static int s_LOH_GEN = 0;
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         if (RuntimeInformation.ProcessArchitecture == Architecture.X86)
         {
diff --git a/src/tests/JIT/Methodical/doublearray/dblarray4_cs_d.csproj b/src/tests/JIT/Methodical/doublearray/dblarray4_cs_d.csproj
index 260b9d8416095b..d6e8c335bd58a9 100644
--- a/src/tests/JIT/Methodical/doublearray/dblarray4_cs_d.csproj
+++ b/src/tests/JIT/Methodical/doublearray/dblarray4_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/doublearray/dblarray4_cs_do.csproj b/src/tests/JIT/Methodical/doublearray/dblarray4_cs_do.csproj
index 20755c263865f2..0f7521589e7248 100644
--- a/src/tests/JIT/Methodical/doublearray/dblarray4_cs_do.csproj
+++ b/src/tests/JIT/Methodical/doublearray/dblarray4_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/doublearray/dblarray4_cs_r.csproj b/src/tests/JIT/Methodical/doublearray/dblarray4_cs_r.csproj
index a2f33c465faaa3..15c2f48ab7df21 100644
--- a/src/tests/JIT/Methodical/doublearray/dblarray4_cs_r.csproj
+++ b/src/tests/JIT/Methodical/doublearray/dblarray4_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/doublearray/dblarray4_cs_ro.csproj b/src/tests/JIT/Methodical/doublearray/dblarray4_cs_ro.csproj
index 5de192b13e1538..50e25f75d3dce3 100644
--- a/src/tests/JIT/Methodical/doublearray/dblarray4_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/doublearray/dblarray4_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/dynamic_methods/bug_445388.cs b/src/tests/JIT/Methodical/dynamic_methods/bug_445388.cs
index 22e1b54841d1b2..7026dc50fa264a 100644
--- a/src/tests/JIT/Methodical/dynamic_methods/bug_445388.cs
+++ b/src/tests/JIT/Methodical/dynamic_methods/bug_445388.cs
@@ -4,17 +4,21 @@
 using System;
 using System.Reflection;
 using System.Reflection.Emit;
+using Xunit;
 
+namespace Test_bug_445388_cs
+{
 internal class Host
 {
     private static string s_field = "somefield";
 }
 
-internal class Program
+public class Program
 {
     private delegate string Getter();
 
-    private static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         DynamicMethod method = new DynamicMethod("GetField",
             typeof(string), new Type[0], typeof(Host));
@@ -43,3 +47,4 @@ private static int Assert(bool condition, string message)
         return 101;
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/dynamic_methods/bug_445388.csproj b/src/tests/JIT/Methodical/dynamic_methods/bug_445388.csproj
index 26c09b4914547b..77d95a6ca1b694 100644
--- a/src/tests/JIT/Methodical/dynamic_methods/bug_445388.csproj
+++ b/src/tests/JIT/Methodical/dynamic_methods/bug_445388.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/emptyfinally.il b/src/tests/JIT/Methodical/eh/basics/emptyfinally.il
index 4e2f8081fa6b0f..f893b5ad09710a 100644
--- a/src/tests/JIT/Methodical/eh/basics/emptyfinally.il
+++ b/src/tests/JIT/Methodical/eh/basics/emptyfinally.il
@@ -13,9 +13,9 @@
 .assembly 'emptyfinally' {}
 .assembly extern xunit.core {}
 
-.namespace hello
+.namespace hello_emptyfinally_basics_il
 {
-  .class private auto ansi beforefieldinit Class1
+  .class public auto ansi beforefieldinit Class1
          extends [mscorlib]System.Object
   {
     .field private static class [eh_common]TestUtil.TestLog testLog
@@ -33,7 +33,7 @@
       callvirt   instance void [mscorlib]System.IO.TextWriter::WriteLine(string)
       ldloc.s    expectedOut
       newobj     instance void [eh_common]TestUtil.TestLog::.ctor(object)
-      stsfld     class [eh_common]TestUtil.TestLog hello.Class1::testLog
+      stsfld     class [eh_common]TestUtil.TestLog hello_emptyfinally_basics_il.Class1::testLog
       ret
     } 
 
@@ -56,12 +56,12 @@
       .entrypoint
       .maxstack  1
       
-      ldsfld     class [eh_common]TestUtil.TestLog hello.Class1::testLog
+      ldsfld     class [eh_common]TestUtil.TestLog hello_emptyfinally_basics_il.Class1::testLog
       callvirt   instance void [eh_common]TestUtil.TestLog::StartRecording()
       
       .try
       {
-        call       void hello.Class1::inTry()
+        call       void hello_emptyfinally_basics_il.Class1::inTry()
         leave.s    done
 
       } finally {
@@ -71,10 +71,10 @@
       ldstr      "Done"
       call       void [System.Console]System.Console::WriteLine(string)
 
-      ldsfld     class [eh_common]TestUtil.TestLog hello.Class1::testLog
+      ldsfld     class [eh_common]TestUtil.TestLog hello_emptyfinally_basics_il.Class1::testLog
       callvirt   instance void [eh_common]TestUtil.TestLog::StopRecording()
       
-      ldsfld     class [eh_common]TestUtil.TestLog hello.Class1::testLog
+      ldsfld     class [eh_common]TestUtil.TestLog hello_emptyfinally_basics_il.Class1::testLog
       callvirt   instance int32 [eh_common]TestUtil.TestLog::VerifyOutput()
 
       ret
diff --git a/src/tests/JIT/Methodical/eh/basics/emptyfinally_il_d.ilproj b/src/tests/JIT/Methodical/eh/basics/emptyfinally_il_d.ilproj
index a5f22331d15f4c..f6a722c9bb293b 100644
--- a/src/tests/JIT/Methodical/eh/basics/emptyfinally_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/basics/emptyfinally_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/basics/emptyfinally_il_r.ilproj b/src/tests/JIT/Methodical/eh/basics/emptyfinally_il_r.ilproj
index b89f79a19ffb3f..fb44ada925b888 100644
--- a/src/tests/JIT/Methodical/eh/basics/emptyfinally_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/basics/emptyfinally_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/multihandler.cs b/src/tests/JIT/Methodical/eh/basics/multihandler.cs
index 48a3eba1c9b390..42a0dd0344def4 100644
--- a/src/tests/JIT/Methodical/eh/basics/multihandler.cs
+++ b/src/tests/JIT/Methodical/eh/basics/multihandler.cs
@@ -4,10 +4,11 @@
 // Typed catches, multiple handler
 
 using System;
+using Xunit;
 
-namespace hello
+namespace hello_multihandler_basics_cs
 {
-    class Class1
+    public class Class1
     {
         private static TestUtil.TestLog testLog;
 
@@ -24,7 +25,8 @@ static Class1()
             testLog = new TestUtil.TestLog(expectedOut);
         }
 
-        static public int Main()
+        [Fact]
+        static public int TestEntryPoint()
         {
             //Start recording
             testLog.StartRecording();
diff --git a/src/tests/JIT/Methodical/eh/basics/multihandler_d.csproj b/src/tests/JIT/Methodical/eh/basics/multihandler_d.csproj
index ea117ddfc2d34a..92d5abd9559260 100644
--- a/src/tests/JIT/Methodical/eh/basics/multihandler_d.csproj
+++ b/src/tests/JIT/Methodical/eh/basics/multihandler_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/multihandler_do.csproj b/src/tests/JIT/Methodical/eh/basics/multihandler_do.csproj
index 9b0912aca9f3d0..4a9abf2e94e454 100644
--- a/src/tests/JIT/Methodical/eh/basics/multihandler_do.csproj
+++ b/src/tests/JIT/Methodical/eh/basics/multihandler_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/multihandler_r.csproj b/src/tests/JIT/Methodical/eh/basics/multihandler_r.csproj
index 9d4fbf256fadf6..b79d84baa6e5c2 100644
--- a/src/tests/JIT/Methodical/eh/basics/multihandler_r.csproj
+++ b/src/tests/JIT/Methodical/eh/basics/multihandler_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/multihandler_ro.csproj b/src/tests/JIT/Methodical/eh/basics/multihandler_ro.csproj
index 207f9745da473f..b87be1128fe58a 100644
--- a/src/tests/JIT/Methodical/eh/basics/multihandler_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/basics/multihandler_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/throwincatch.cs b/src/tests/JIT/Methodical/eh/basics/throwincatch.cs
index 9fdcbf8af9abd4..8f891ec470cc59 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwincatch.cs
+++ b/src/tests/JIT/Methodical/eh/basics/throwincatch.cs
@@ -4,10 +4,11 @@
 // Throw in catch handler
 
 using System;
+using Xunit;
 
-namespace hello
+namespace hello_throwincatch_basics_cs
 {
-    class Class1
+    public class Class1
     {
         private static TestUtil.TestLog testLog;
 
@@ -27,7 +28,8 @@ static Class1()
             testLog = new TestUtil.TestLog(expectedOut);
         }
 
-        static public int Main()
+        [Fact]
+        static public int TestEntryPoint()
         {
             //Start recording
             testLog.StartRecording();
diff --git a/src/tests/JIT/Methodical/eh/basics/throwincatch_basics_d.csproj b/src/tests/JIT/Methodical/eh/basics/throwincatch_basics_d.csproj
index 1084dbd56a142c..5edb8c855532d9 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwincatch_basics_d.csproj
+++ b/src/tests/JIT/Methodical/eh/basics/throwincatch_basics_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/throwincatch_basics_do.csproj b/src/tests/JIT/Methodical/eh/basics/throwincatch_basics_do.csproj
index b49e317d151818..49c009510798d2 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwincatch_basics_do.csproj
+++ b/src/tests/JIT/Methodical/eh/basics/throwincatch_basics_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/throwincatch_basics_r.csproj b/src/tests/JIT/Methodical/eh/basics/throwincatch_basics_r.csproj
index b7ed81d575090d..0ad8ca5698b0ec 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwincatch_basics_r.csproj
+++ b/src/tests/JIT/Methodical/eh/basics/throwincatch_basics_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/throwincatch_basics_ro.csproj b/src/tests/JIT/Methodical/eh/basics/throwincatch_basics_ro.csproj
index 01623ae8e604bc..d2692a5e5e3330 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwincatch_basics_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/basics/throwincatch_basics_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinclassconstructor.cs b/src/tests/JIT/Methodical/eh/basics/throwinclassconstructor.cs
index 261d3be7bb1b6a..59f1352038ace8 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwinclassconstructor.cs
+++ b/src/tests/JIT/Methodical/eh/basics/throwinclassconstructor.cs
@@ -5,6 +5,7 @@
 // NDPWhidbey 10958
 
 using System;
+using Xunit;
 
 public class Foo
 {
@@ -36,7 +37,8 @@ static Test_throwinclassconstructor()
         testLog = new TestUtil.TestLog(expectedOut);
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         //Start recording
         testLog.StartRecording();
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinclassconstructor_d.csproj b/src/tests/JIT/Methodical/eh/basics/throwinclassconstructor_d.csproj
index 03ea036b040f18..2fff9d90e658e4 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwinclassconstructor_d.csproj
+++ b/src/tests/JIT/Methodical/eh/basics/throwinclassconstructor_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinclassconstructor_do.csproj b/src/tests/JIT/Methodical/eh/basics/throwinclassconstructor_do.csproj
index 1844f95550243c..7a292a44ceb93f 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwinclassconstructor_do.csproj
+++ b/src/tests/JIT/Methodical/eh/basics/throwinclassconstructor_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinclassconstructor_r.csproj b/src/tests/JIT/Methodical/eh/basics/throwinclassconstructor_r.csproj
index bd9826a842d0c9..066dec682d7b03 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwinclassconstructor_r.csproj
+++ b/src/tests/JIT/Methodical/eh/basics/throwinclassconstructor_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinclassconstructor_ro.csproj b/src/tests/JIT/Methodical/eh/basics/throwinclassconstructor_ro.csproj
index b6515036cba432..9f5112c5cd61df 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwinclassconstructor_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/basics/throwinclassconstructor_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinexcept.il b/src/tests/JIT/Methodical/eh/basics/throwinexcept.il
index d8eedf62122df2..7d9baf0586dadb 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwinexcept.il
+++ b/src/tests/JIT/Methodical/eh/basics/throwinexcept.il
@@ -8,12 +8,16 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
+.assembly extern xunit.core {}
 .assembly extern mscorlib {}
 .assembly extern eh_common {}
 .assembly 'throwinexcept' {}
 
 .class public auto ansi Test_throwinexcept extends [mscorlib] System.Object {
 .method public static int32 main() {
+    .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+        01 00 00 00
+    )
     .entrypoint
     .maxstack  2
     .locals init (
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinexcept_il_d.ilproj b/src/tests/JIT/Methodical/eh/basics/throwinexcept_il_d.ilproj
index 63ed90bac74126..4baebc353fddd6 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwinexcept_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/basics/throwinexcept_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinexcept_il_r.ilproj b/src/tests/JIT/Methodical/eh/basics/throwinexcept_il_r.ilproj
index 487783f8ca2be2..5a48fe8873b46c 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwinexcept_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/basics/throwinexcept_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfault.il b/src/tests/JIT/Methodical/eh/basics/throwinfault.il
index b5a1a3134f03f2..8eb828d30300af 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwinfault.il
+++ b/src/tests/JIT/Methodical/eh/basics/throwinfault.il
@@ -8,12 +8,16 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
+.assembly extern xunit.core {}
 .assembly extern mscorlib {}
 .assembly extern eh_common {}
 .assembly 'throwinfault' {}
 
 .class public auto ansi Test_throwinfault extends [mscorlib] System.Object {
 .method public static int32 main() {
+    .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+        01 00 00 00
+    )
     .entrypoint
     .maxstack  2
     .locals init (
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfault_il_d.ilproj b/src/tests/JIT/Methodical/eh/basics/throwinfault_il_d.ilproj
index 79225bdb8b7a5d..c2ba344c1243e6 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwinfault_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/basics/throwinfault_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfault_il_r.ilproj b/src/tests/JIT/Methodical/eh/basics/throwinfault_il_r.ilproj
index f6f05bf5a1538e..ba44898d2bf2c1 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwinfault_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/basics/throwinfault_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfilter.il b/src/tests/JIT/Methodical/eh/basics/throwinfilter.il
index 1b84f3a82715d0..1775779aa0a0dc 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwinfilter.il
+++ b/src/tests/JIT/Methodical/eh/basics/throwinfilter.il
@@ -8,12 +8,16 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
+.assembly extern xunit.core {}
 .assembly extern mscorlib {}
 .assembly extern eh_common {}
 .assembly 'throwinfilter' {}
 
 .class public auto ansi Test_throwinfilter extends [mscorlib] System.Object {
 .method public static int32 main() {
+    .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+        01 00 00 00
+    )
     .entrypoint
     .maxstack  2
     .locals init (
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfilter_il_d.ilproj b/src/tests/JIT/Methodical/eh/basics/throwinfilter_il_d.ilproj
index c7baa28426aaf1..2acaf6423c6670 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwinfilter_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/basics/throwinfilter_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfilter_il_r.ilproj b/src/tests/JIT/Methodical/eh/basics/throwinfilter_il_r.ilproj
index 7d464d3b2d4e20..201eea997eeaae 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwinfilter_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/basics/throwinfilter_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfinally.cs b/src/tests/JIT/Methodical/eh/basics/throwinfinally.cs
index 506699c33d5275..39aa310252cf38 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwinfinally.cs
+++ b/src/tests/JIT/Methodical/eh/basics/throwinfinally.cs
@@ -4,7 +4,10 @@
 // Throw from a finally block
 
 using System;
+using Xunit;
 
+namespace Test_throwinfinally_basics
+{
 public class a
 {
     private static TestUtil.TestLog testLog;
@@ -38,7 +41,8 @@ public static void MiddleMethod()
         }
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         //Start recording
         testLog.StartRecording();
@@ -59,3 +63,4 @@ public static int Main()
         return testLog.VerifyOutput();
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfinally_basics_d.csproj b/src/tests/JIT/Methodical/eh/basics/throwinfinally_basics_d.csproj
index 7661f7246bc0ab..b01250febfa40b 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwinfinally_basics_d.csproj
+++ b/src/tests/JIT/Methodical/eh/basics/throwinfinally_basics_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfinally_basics_do.csproj b/src/tests/JIT/Methodical/eh/basics/throwinfinally_basics_do.csproj
index 385d5ea51c9c3e..16e16d80b694f7 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwinfinally_basics_do.csproj
+++ b/src/tests/JIT/Methodical/eh/basics/throwinfinally_basics_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfinally_basics_r.csproj b/src/tests/JIT/Methodical/eh/basics/throwinfinally_basics_r.csproj
index f3d180376e04d3..8f7da9c003bb0f 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwinfinally_basics_r.csproj
+++ b/src/tests/JIT/Methodical/eh/basics/throwinfinally_basics_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfinally_basics_ro.csproj b/src/tests/JIT/Methodical/eh/basics/throwinfinally_basics_ro.csproj
index bd292cf3e716c2..cb0d78021d12db 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwinfinally_basics_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/basics/throwinfinally_basics_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfinallyerrpath.cs b/src/tests/JIT/Methodical/eh/basics/throwinfinallyerrpath.cs
index 6fb587e0efd2eb..d0669711304cd0 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwinfinallyerrpath.cs
+++ b/src/tests/JIT/Methodical/eh/basics/throwinfinallyerrpath.cs
@@ -3,11 +3,12 @@
 
 // Try/finally error case, one function
 using System;
+using Xunit;
 
-namespace hello
+namespace hello_throwinfinallyerrpath_basics_cs
 {
 
-    class Class1
+    public class Class1
     {
         private static TestUtil.TestLog testLog;
 
@@ -44,7 +45,8 @@ static public void inFinally()
         {
             Console.WriteLine("in Finally");
         }
-        static public int Main()
+        [Fact]
+        static public int TestEntryPoint()
         {
             //Start recording
             testLog.StartRecording();
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfinallyerrpath_d.csproj b/src/tests/JIT/Methodical/eh/basics/throwinfinallyerrpath_d.csproj
index 6a3b01f88b689b..d56428fd35d7e8 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwinfinallyerrpath_d.csproj
+++ b/src/tests/JIT/Methodical/eh/basics/throwinfinallyerrpath_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfinallyerrpath_do.csproj b/src/tests/JIT/Methodical/eh/basics/throwinfinallyerrpath_do.csproj
index 87c7955c7d195d..c6b88bc7c8578d 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwinfinallyerrpath_do.csproj
+++ b/src/tests/JIT/Methodical/eh/basics/throwinfinallyerrpath_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfinallyerrpath_r.csproj b/src/tests/JIT/Methodical/eh/basics/throwinfinallyerrpath_r.csproj
index f0fbb0b7f27e3f..7a06cb492ed158 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwinfinallyerrpath_r.csproj
+++ b/src/tests/JIT/Methodical/eh/basics/throwinfinallyerrpath_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfinallyerrpath_ro.csproj b/src/tests/JIT/Methodical/eh/basics/throwinfinallyerrpath_ro.csproj
index 9c6e3d115e4235..68034fac3f82f9 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwinfinallyerrpath_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/basics/throwinfinallyerrpath_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfinallyerrpathfn.cs b/src/tests/JIT/Methodical/eh/basics/throwinfinallyerrpathfn.cs
index 2246dc8d0fa894..98aced2284fc85 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwinfinallyerrpathfn.cs
+++ b/src/tests/JIT/Methodical/eh/basics/throwinfinallyerrpathfn.cs
@@ -4,7 +4,10 @@
 // Throw from a finally,  error case
 
 using System;
+using Xunit;
 
+namespace Test_throwinfinallyerrpathfn_basics
+{
 public class a
 {
     private static TestUtil.TestLog testLog;
@@ -39,7 +42,8 @@ public static void MiddleMethod()
         Console.WriteLine("Unreached...");
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         //Start recording
         testLog.StartRecording();
@@ -59,3 +63,4 @@ public static int Main()
         return testLog.VerifyOutput();
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfinallyerrpathfn_d.csproj b/src/tests/JIT/Methodical/eh/basics/throwinfinallyerrpathfn_d.csproj
index eb534bd095d86e..9b8a34e0b61b9a 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwinfinallyerrpathfn_d.csproj
+++ b/src/tests/JIT/Methodical/eh/basics/throwinfinallyerrpathfn_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfinallyerrpathfn_do.csproj b/src/tests/JIT/Methodical/eh/basics/throwinfinallyerrpathfn_do.csproj
index 79f6912f59ba23..eb305983a9518c 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwinfinallyerrpathfn_do.csproj
+++ b/src/tests/JIT/Methodical/eh/basics/throwinfinallyerrpathfn_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfinallyerrpathfn_r.csproj b/src/tests/JIT/Methodical/eh/basics/throwinfinallyerrpathfn_r.csproj
index 4717f7aa5f734e..0fb49468c33061 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwinfinallyerrpathfn_r.csproj
+++ b/src/tests/JIT/Methodical/eh/basics/throwinfinallyerrpathfn_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfinallyerrpathfn_ro.csproj b/src/tests/JIT/Methodical/eh/basics/throwinfinallyerrpathfn_ro.csproj
index f25971135c9e4a..0d014f2f5688da 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwinfinallyerrpathfn_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/basics/throwinfinallyerrpathfn_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter1.il b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter1.il
index 474a5bc633802f..a2bb2011ec4b5c 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter1.il
+++ b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter1.il
@@ -8,6 +8,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
+.assembly extern xunit.core {}
 .assembly extern mscorlib {}
 .assembly extern eh_common {}
 .assembly 'throwinfinallyintryfilter1' {}
@@ -16,6 +17,9 @@
 .class public auto ansi Test_throwinfinallyintryfilter1 extends [mscorlib] System.Object {
 .method public static int32 Main()
 {
+  .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+      01 00 00 00
+  )
   .entrypoint
   .maxstack  2
   .locals init (
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter1_il_d.ilproj b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter1_il_d.ilproj
index e3ffa0b97ab416..89b699c021d5cb 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter1_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter1_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter1_il_r.ilproj b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter1_il_r.ilproj
index 0f6c8c29006037..83bd5fd5ecdc92 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter1_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter1_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter2.il b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter2.il
index ce625c9dc70b5c..fcfa10cf18bb70 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter2.il
+++ b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter2.il
@@ -8,6 +8,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
+.assembly extern xunit.core {}
 .assembly extern mscorlib {}
 .assembly extern eh_common {}
 .assembly 'throwinfinallyintryfilter2' {}
@@ -16,6 +17,9 @@
 .class public auto ansi Test_throwinfinallyintryfilter2 extends [mscorlib] System.Object {
 .method public static int32 Main()
 {
+  .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+      01 00 00 00
+  )
   .entrypoint
   .maxstack  2
   .locals init (
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter2_il_d.ilproj b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter2_il_d.ilproj
index c5e39c6f4e1aff..12de6a202b0579 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter2_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter2_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter2_il_r.ilproj b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter2_il_r.ilproj
index dc3336aba36cb9..de463ab467c759 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter2_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter2_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter3.il b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter3.il
index 7cbe44cb2474dd..f16c58be4d4c4b 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter3.il
+++ b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter3.il
@@ -8,6 +8,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
+.assembly extern xunit.core {}
 .assembly extern mscorlib {}
 .assembly extern eh_common {}
 .assembly 'throwinfinallyintryfilter3' {}
@@ -16,6 +17,9 @@
 .class public auto ansi Test_throwinfinallyintryfilter3 extends [mscorlib] System.Object {
 .method public static int32 Main()
 {
+  .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+      01 00 00 00
+  )
   .entrypoint
   .maxstack  2
   .locals init (
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter3_il_d.ilproj b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter3_il_d.ilproj
index e543ef4d5b18ad..7d139f713c459a 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter3_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter3_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter3_il_r.ilproj b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter3_il_r.ilproj
index ee0c84b52cb63e..da35be0d3f92ce 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter3_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter3_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/throwisfirstinstruction.il b/src/tests/JIT/Methodical/eh/basics/throwisfirstinstruction.il
index 73b52860711132..dc902ccc124924 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwisfirstinstruction.il
+++ b/src/tests/JIT/Methodical/eh/basics/throwisfirstinstruction.il
@@ -13,7 +13,9 @@
 .assembly 'throwisfirstinstruction' {}
 .assembly extern xunit.core {}
 
-.class private auto ansi beforefieldinit test
+.namespace Test_throwisfirstinstruction_il
+{
+.class public auto ansi beforefieldinit test
        extends [mscorlib]System.Object
 {
   .field private static class [eh_common]TestUtil.TestLog testLog
@@ -33,7 +35,7 @@
     callvirt   instance void [mscorlib]System.IO.TextWriter::WriteLine(string)
     ldloc.s    expectedOut
     newobj     instance void [eh_common]TestUtil.TestLog::.ctor(object)
-    stsfld     class [eh_common]TestUtil.TestLog test::testLog
+    stsfld     class [eh_common]TestUtil.TestLog Test_throwisfirstinstruction_il.test::testLog
     ret
   } 
 
@@ -44,7 +46,7 @@
     )
     .entrypoint
 
-      ldsfld     class [eh_common]TestUtil.TestLog test::testLog
+      ldsfld     class [eh_common]TestUtil.TestLog Test_throwisfirstinstruction_il.test::testLog
       callvirt   instance void [eh_common]TestUtil.TestLog::StartRecording()
 
       .try
@@ -64,13 +66,14 @@
       ldstr      "after try"
       call       void [System.Console]System.Console::WriteLine(string)
 
-      ldsfld     class [eh_common]TestUtil.TestLog test::testLog
+      ldsfld     class [eh_common]TestUtil.TestLog Test_throwisfirstinstruction_il.test::testLog
       callvirt   instance void [eh_common]TestUtil.TestLog::StopRecording()
   
-      ldsfld     class [eh_common]TestUtil.TestLog test::testLog
+      ldsfld     class [eh_common]TestUtil.TestLog Test_throwisfirstinstruction_il.test::testLog
       callvirt   instance int32 [eh_common]TestUtil.TestLog::VerifyOutput()
       
       ret
   }
 
 }
+}
diff --git a/src/tests/JIT/Methodical/eh/basics/throwisfirstinstruction_il_d.ilproj b/src/tests/JIT/Methodical/eh/basics/throwisfirstinstruction_il_d.ilproj
index 5c2f98aad68415..8ef8874ccd4d1c 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwisfirstinstruction_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/basics/throwisfirstinstruction_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/throwisfirstinstruction_il_r.ilproj b/src/tests/JIT/Methodical/eh/basics/throwisfirstinstruction_il_r.ilproj
index 56c39c6188258e..e08b149aff19e7 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwisfirstinstruction_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/basics/throwisfirstinstruction_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/throwoutside.cs b/src/tests/JIT/Methodical/eh/basics/throwoutside.cs
index b1a0b162e91a5a..7fcb442e52defd 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwoutside.cs
+++ b/src/tests/JIT/Methodical/eh/basics/throwoutside.cs
@@ -4,7 +4,10 @@
 // Throw from outside of an EH region
 
 using System;
+using Xunit;
 
+namespace Test_throwoutside_basics
+{
 public class a
 {
     private static TestUtil.TestLog testLog;
@@ -29,7 +32,8 @@ public static void MiddleMethod()
         throw new Exception();
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         //Start recording
         testLog.StartRecording();
@@ -50,3 +54,4 @@ public static int Main()
         return testLog.VerifyOutput();
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/eh/basics/throwoutside_d.csproj b/src/tests/JIT/Methodical/eh/basics/throwoutside_d.csproj
index d9a24b6cab9944..fff08fd76be266 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwoutside_d.csproj
+++ b/src/tests/JIT/Methodical/eh/basics/throwoutside_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/throwoutside_do.csproj b/src/tests/JIT/Methodical/eh/basics/throwoutside_do.csproj
index ffc0b4c2b86aed..5bd522e865e307 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwoutside_do.csproj
+++ b/src/tests/JIT/Methodical/eh/basics/throwoutside_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/throwoutside_r.csproj b/src/tests/JIT/Methodical/eh/basics/throwoutside_r.csproj
index 42d7d744e89779..0531f21265543f 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwoutside_r.csproj
+++ b/src/tests/JIT/Methodical/eh/basics/throwoutside_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/throwoutside_ro.csproj b/src/tests/JIT/Methodical/eh/basics/throwoutside_ro.csproj
index 5d0a3ce5df26ea..fc0149147df879 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwoutside_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/basics/throwoutside_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/trycatch.cs b/src/tests/JIT/Methodical/eh/basics/trycatch.cs
index 3f139cba53f5ef..f99cd6bbacdfc2 100644
--- a/src/tests/JIT/Methodical/eh/basics/trycatch.cs
+++ b/src/tests/JIT/Methodical/eh/basics/trycatch.cs
@@ -3,10 +3,11 @@
 
 // Try catch, non error case, the code in catch should not be executed
 using System;
+using Xunit;
 
-namespace hello
+namespace hello_trycatch_basics_cs
 {
-    class Class1
+    public class Class1
     {
         private static TestUtil.TestLog testLog;
 
@@ -34,7 +35,8 @@ static public void inCatch()
 
         static public void inFinally() { }
 
-        static public int Main()
+        [Fact]
+        static public int TestEntryPoint()
         {
             //Start recording
             testLog.StartRecording();
diff --git a/src/tests/JIT/Methodical/eh/basics/trycatch_d.csproj b/src/tests/JIT/Methodical/eh/basics/trycatch_d.csproj
index 8e08e2572284a9..6ee9059b3299bb 100644
--- a/src/tests/JIT/Methodical/eh/basics/trycatch_d.csproj
+++ b/src/tests/JIT/Methodical/eh/basics/trycatch_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/trycatch_do.csproj b/src/tests/JIT/Methodical/eh/basics/trycatch_do.csproj
index de3f1ab3eb99a3..d7ccca19bece36 100644
--- a/src/tests/JIT/Methodical/eh/basics/trycatch_do.csproj
+++ b/src/tests/JIT/Methodical/eh/basics/trycatch_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/trycatch_r.csproj b/src/tests/JIT/Methodical/eh/basics/trycatch_r.csproj
index ab453cfcea5ba2..31a691141ab301 100644
--- a/src/tests/JIT/Methodical/eh/basics/trycatch_r.csproj
+++ b/src/tests/JIT/Methodical/eh/basics/trycatch_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/trycatch_ro.csproj b/src/tests/JIT/Methodical/eh/basics/trycatch_ro.csproj
index 2c592e74eccb81..e830b38bb6b31f 100644
--- a/src/tests/JIT/Methodical/eh/basics/trycatch_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/basics/trycatch_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/trycatchtrycatch.cs b/src/tests/JIT/Methodical/eh/basics/trycatchtrycatch.cs
index af59a53644ffeb..8248bd78e297b1 100644
--- a/src/tests/JIT/Methodical/eh/basics/trycatchtrycatch.cs
+++ b/src/tests/JIT/Methodical/eh/basics/trycatchtrycatch.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace hello
+namespace hello_trycatchtrycatch_basics_cs
 {
-    class Class1
+    public class Class1
     {
         private static TestUtil.TestLog testLog;
 
@@ -37,7 +38,8 @@ static public void inFinally()
             Console.WriteLine("In finally");
         }
 
-        static public int Main()
+        [Fact]
+        static public int TestEntryPoint()
         {
             //Start recording
             testLog.StartRecording();
diff --git a/src/tests/JIT/Methodical/eh/basics/trycatchtrycatch_d.csproj b/src/tests/JIT/Methodical/eh/basics/trycatchtrycatch_d.csproj
index efe77cea1f99f7..baeb8a40174c10 100644
--- a/src/tests/JIT/Methodical/eh/basics/trycatchtrycatch_d.csproj
+++ b/src/tests/JIT/Methodical/eh/basics/trycatchtrycatch_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/trycatchtrycatch_do.csproj b/src/tests/JIT/Methodical/eh/basics/trycatchtrycatch_do.csproj
index 4db328c45f8e92..d8097835ea729f 100644
--- a/src/tests/JIT/Methodical/eh/basics/trycatchtrycatch_do.csproj
+++ b/src/tests/JIT/Methodical/eh/basics/trycatchtrycatch_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/trycatchtrycatch_r.csproj b/src/tests/JIT/Methodical/eh/basics/trycatchtrycatch_r.csproj
index dba339f1076d7c..dc8726f5d67b9f 100644
--- a/src/tests/JIT/Methodical/eh/basics/trycatchtrycatch_r.csproj
+++ b/src/tests/JIT/Methodical/eh/basics/trycatchtrycatch_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/trycatchtrycatch_ro.csproj b/src/tests/JIT/Methodical/eh/basics/trycatchtrycatch_ro.csproj
index 44c799b1c900f5..511ddc836c8b87 100644
--- a/src/tests/JIT/Methodical/eh/basics/trycatchtrycatch_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/basics/trycatchtrycatch_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/tryexcept.il b/src/tests/JIT/Methodical/eh/basics/tryexcept.il
index cba5d6f34e0b63..05e85c9b5e78b9 100644
--- a/src/tests/JIT/Methodical/eh/basics/tryexcept.il
+++ b/src/tests/JIT/Methodical/eh/basics/tryexcept.il
@@ -8,12 +8,16 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
+.assembly extern xunit.core {}
 .assembly extern mscorlib {}
 .assembly extern eh_common {}
 .assembly 'tryexcept' {}
 
 .class public auto ansi Test_tryexcept extends [mscorlib] System.Object {
 .method public static int32 main() {
+    .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+        01 00 00 00
+    )
     .entrypoint
     .maxstack  2
     .locals init (
diff --git a/src/tests/JIT/Methodical/eh/basics/tryexcept_il_d.ilproj b/src/tests/JIT/Methodical/eh/basics/tryexcept_il_d.ilproj
index 97c8301299faaf..15eb9e33ca4795 100644
--- a/src/tests/JIT/Methodical/eh/basics/tryexcept_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/basics/tryexcept_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/tryexcept_il_r.ilproj b/src/tests/JIT/Methodical/eh/basics/tryexcept_il_r.ilproj
index eb4c88ada4baec..ef7a50e7b336ef 100644
--- a/src/tests/JIT/Methodical/eh/basics/tryexcept_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/basics/tryexcept_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfault.il b/src/tests/JIT/Methodical/eh/basics/tryfault.il
index 6135b17a5960bb..b4638f4ea91b6a 100644
--- a/src/tests/JIT/Methodical/eh/basics/tryfault.il
+++ b/src/tests/JIT/Methodical/eh/basics/tryfault.il
@@ -8,12 +8,16 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
+.assembly extern xunit.core {}
 .assembly extern mscorlib {}
 .assembly extern eh_common {}
 .assembly 'tryfault' {}
 
 .class public auto ansi Test_tryfault extends [mscorlib] System.Object {
 .method public static int32 main() {
+    .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+        01 00 00 00
+    )
     .entrypoint
     .maxstack  2
     .locals init (
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfault_il_d.ilproj b/src/tests/JIT/Methodical/eh/basics/tryfault_il_d.ilproj
index e1188c0bfc7c77..0ece467f0c8737 100644
--- a/src/tests/JIT/Methodical/eh/basics/tryfault_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/basics/tryfault_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfault_il_r.ilproj b/src/tests/JIT/Methodical/eh/basics/tryfault_il_r.ilproj
index d1e77be846febf..f584b0194846c5 100644
--- a/src/tests/JIT/Methodical/eh/basics/tryfault_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/basics/tryfault_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatch.il b/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatch.il
index db1e5585935297..c466e67cc48313 100644
--- a/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatch.il
+++ b/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatch.il
@@ -8,12 +8,16 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
+.assembly extern xunit.core {}
 .assembly extern mscorlib {}
 .assembly extern eh_common {}
 .assembly 'tryfaulttrycatch' {}
 
 .class public auto ansi Test_tryfaulttrycatch extends [mscorlib] System.Object {
 .method public static int32 main() {
+    .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+        01 00 00 00
+    )
     .entrypoint
     .maxstack  2
     .locals init (
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatch_il_d.ilproj b/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatch_il_d.ilproj
index a9bffb8fcae953..0f1c60eef739ee 100644
--- a/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatch_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatch_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatch_il_r.ilproj b/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatch_il_r.ilproj
index 184701327224b3..8f5c5caf8df3df 100644
--- a/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatch_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatch_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatchfn.il b/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatchfn.il
index f894a0bc0903cb..1ba5da69e28e92 100644
--- a/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatchfn.il
+++ b/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatchfn.il
@@ -8,6 +8,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
+.assembly extern xunit.core {}
 .assembly extern mscorlib {}
 .assembly extern eh_common {}
 .assembly 'tryfaulttrycatchfn' {}
@@ -39,6 +40,9 @@ done:
 
 .class public auto ansi Test_tryfaulttrycatchfn extends [mscorlib] System.Object {
 .method public static int32 main() {
+    .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+        01 00 00 00
+    )
     .entrypoint
     .maxstack  2
     .locals init (
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatchfn_il_d.ilproj b/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatchfn_il_d.ilproj
index 1f92b86c478462..9d10edd085d1d2 100644
--- a/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatchfn_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatchfn_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatchfn_il_r.ilproj b/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatchfn_il_r.ilproj
index 91d6012304525d..a51d9912644f20 100644
--- a/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatchfn_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatchfn_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfinally.cs b/src/tests/JIT/Methodical/eh/basics/tryfinally.cs
index 875be52dbf1634..68e22057d305f9 100644
--- a/src/tests/JIT/Methodical/eh/basics/tryfinally.cs
+++ b/src/tests/JIT/Methodical/eh/basics/tryfinally.cs
@@ -3,10 +3,11 @@
 
 // Try finally, non error case
 using System;
+using Xunit;
 
-namespace hello
+namespace hello_tryfinally_basics_cs
 {
-    class Class1
+    public class Class1
     {
         private static TestUtil.TestLog testLog;
 
@@ -34,7 +35,8 @@ static public void inFinally()
             Console.WriteLine("in Finally");
         }
 
-        static public int Main()
+        [Fact]
+        static public int TestEntryPoint()
         {
             //Start recording
             testLog.StartRecording();
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfinally_d.csproj b/src/tests/JIT/Methodical/eh/basics/tryfinally_d.csproj
index d7273e9983123b..6bfeb7dfd26226 100644
--- a/src/tests/JIT/Methodical/eh/basics/tryfinally_d.csproj
+++ b/src/tests/JIT/Methodical/eh/basics/tryfinally_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfinally_do.csproj b/src/tests/JIT/Methodical/eh/basics/tryfinally_do.csproj
index 115ef6726676eb..af4c79e6cd1b39 100644
--- a/src/tests/JIT/Methodical/eh/basics/tryfinally_do.csproj
+++ b/src/tests/JIT/Methodical/eh/basics/tryfinally_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfinally_r.csproj b/src/tests/JIT/Methodical/eh/basics/tryfinally_r.csproj
index 9f8691bd62b812..79cd614e8f5ee6 100644
--- a/src/tests/JIT/Methodical/eh/basics/tryfinally_r.csproj
+++ b/src/tests/JIT/Methodical/eh/basics/tryfinally_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfinally_ro.csproj b/src/tests/JIT/Methodical/eh/basics/tryfinally_ro.csproj
index e51f805693733b..b1ba1496ea41be 100644
--- a/src/tests/JIT/Methodical/eh/basics/tryfinally_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/basics/tryfinally_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfinallytrycatch.cs b/src/tests/JIT/Methodical/eh/basics/tryfinallytrycatch.cs
index f559764fcd1df1..5b6f03d68afd19 100644
--- a/src/tests/JIT/Methodical/eh/basics/tryfinallytrycatch.cs
+++ b/src/tests/JIT/Methodical/eh/basics/tryfinallytrycatch.cs
@@ -3,10 +3,11 @@
 
 // Try/finally error case
 using System;
+using Xunit;
 
-namespace hello
+namespace hello_tryfinallytrycatch_basics_cs
 {
-    class Class1
+    public class Class1
     {
         private static TestUtil.TestLog testLog;
 
@@ -44,7 +45,8 @@ static public void inFinally()
             Console.WriteLine("in Finally");
         }
 
-        static public int Main()
+        [Fact]
+        static public int TestEntryPoint()
         {
             //Start recording
             testLog.StartRecording();
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfinallytrycatch_d.csproj b/src/tests/JIT/Methodical/eh/basics/tryfinallytrycatch_d.csproj
index 50033f113e225e..46e5a7311f2843 100644
--- a/src/tests/JIT/Methodical/eh/basics/tryfinallytrycatch_d.csproj
+++ b/src/tests/JIT/Methodical/eh/basics/tryfinallytrycatch_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfinallytrycatch_do.csproj b/src/tests/JIT/Methodical/eh/basics/tryfinallytrycatch_do.csproj
index 445251dddc6fb3..7b0f083b24aed4 100644
--- a/src/tests/JIT/Methodical/eh/basics/tryfinallytrycatch_do.csproj
+++ b/src/tests/JIT/Methodical/eh/basics/tryfinallytrycatch_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfinallytrycatch_r.csproj b/src/tests/JIT/Methodical/eh/basics/tryfinallytrycatch_r.csproj
index d01390c61837b0..9527f45c75b723 100644
--- a/src/tests/JIT/Methodical/eh/basics/tryfinallytrycatch_r.csproj
+++ b/src/tests/JIT/Methodical/eh/basics/tryfinallytrycatch_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfinallytrycatch_ro.csproj b/src/tests/JIT/Methodical/eh/basics/tryfinallytrycatch_ro.csproj
index d957431a85916e..0ce466c479d6a4 100644
--- a/src/tests/JIT/Methodical/eh/basics/tryfinallytrycatch_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/basics/tryfinallytrycatch_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfinallytryfinally.cs b/src/tests/JIT/Methodical/eh/basics/tryfinallytryfinally.cs
index 8573beb9c96df6..482b53291067ae 100644
--- a/src/tests/JIT/Methodical/eh/basics/tryfinallytryfinally.cs
+++ b/src/tests/JIT/Methodical/eh/basics/tryfinallytryfinally.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace hello
+namespace hello_tryfinallytryfinally_basics_cs
 {
-    class Class1
+    public class Class1
     {
         private static TestUtil.TestLog testLog;
 
@@ -24,7 +25,8 @@ static Class1()
             testLog = new TestUtil.TestLog(expectedOut);
         }
 
-        static public int Main()
+        [Fact]
+        static public int TestEntryPoint()
         {
             //Start recording
             testLog.StartRecording();
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfinallytryfinally_d.csproj b/src/tests/JIT/Methodical/eh/basics/tryfinallytryfinally_d.csproj
index 0cb9b20dac799a..8994b5332fbc93 100644
--- a/src/tests/JIT/Methodical/eh/basics/tryfinallytryfinally_d.csproj
+++ b/src/tests/JIT/Methodical/eh/basics/tryfinallytryfinally_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfinallytryfinally_do.csproj b/src/tests/JIT/Methodical/eh/basics/tryfinallytryfinally_do.csproj
index c43a915ccda360..cc693144c63427 100644
--- a/src/tests/JIT/Methodical/eh/basics/tryfinallytryfinally_do.csproj
+++ b/src/tests/JIT/Methodical/eh/basics/tryfinallytryfinally_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfinallytryfinally_r.csproj b/src/tests/JIT/Methodical/eh/basics/tryfinallytryfinally_r.csproj
index 7590c57b87d676..45b7f1648eb645 100644
--- a/src/tests/JIT/Methodical/eh/basics/tryfinallytryfinally_r.csproj
+++ b/src/tests/JIT/Methodical/eh/basics/tryfinallytryfinally_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfinallytryfinally_ro.csproj b/src/tests/JIT/Methodical/eh/basics/tryfinallytryfinally_ro.csproj
index 664eca9cdf5acb..f9c0a4db33c62b 100644
--- a/src/tests/JIT/Methodical/eh/basics/tryfinallytryfinally_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/basics/tryfinallytryfinally_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfinallywith2endfinally.il b/src/tests/JIT/Methodical/eh/basics/tryfinallywith2endfinally.il
index d1131b696ded08..7a33713fb33c0e 100644
--- a/src/tests/JIT/Methodical/eh/basics/tryfinallywith2endfinally.il
+++ b/src/tests/JIT/Methodical/eh/basics/tryfinallywith2endfinally.il
@@ -13,9 +13,9 @@
 .assembly 'tryfinallywith2endfinally' {}
 .assembly extern xunit.core {}
 
-.namespace hello
+.namespace hello_tryfinallywith2endfinally_basics_il
 {
-  .class private auto ansi beforefieldinit Class1
+  .class public auto ansi beforefieldinit Class1
          extends [mscorlib]System.Object
   {
     .field private static class [eh_common]TestUtil.TestLog testLog
@@ -33,7 +33,7 @@
       callvirt   instance void [mscorlib]System.IO.TextWriter::WriteLine(string)
       ldloc.s    expectedOut
       newobj     instance void [eh_common]TestUtil.TestLog::.ctor(object)
-      stsfld     class [eh_common]TestUtil.TestLog hello.Class1::testLog
+      stsfld     class [eh_common]TestUtil.TestLog hello_tryfinallywith2endfinally_basics_il.Class1::testLog
       ret
     } 
 
@@ -46,7 +46,7 @@
       .entrypoint
       .maxstack  1
 
-      ldsfld     class [eh_common]TestUtil.TestLog hello.Class1::testLog
+      ldsfld     class [eh_common]TestUtil.TestLog hello_tryfinallywith2endfinally_basics_il.Class1::testLog
       callvirt   instance void [eh_common]TestUtil.TestLog::StartRecording()
 
       .try
@@ -67,10 +67,10 @@
       }  
 
       IL_0017:  
-      ldsfld     class [eh_common]TestUtil.TestLog hello.Class1::testLog
+      ldsfld     class [eh_common]TestUtil.TestLog hello_tryfinallywith2endfinally_basics_il.Class1::testLog
       callvirt   instance void [eh_common]TestUtil.TestLog::StopRecording()
       
-      ldsfld     class [eh_common]TestUtil.TestLog hello.Class1::testLog
+      ldsfld     class [eh_common]TestUtil.TestLog hello_tryfinallywith2endfinally_basics_il.Class1::testLog
       callvirt   instance int32 [eh_common]TestUtil.TestLog::VerifyOutput()
 
       ret
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfinallywith2endfinally_il_d.ilproj b/src/tests/JIT/Methodical/eh/basics/tryfinallywith2endfinally_il_d.ilproj
index 3fbe1add1fba95..45d980c11b61d0 100644
--- a/src/tests/JIT/Methodical/eh/basics/tryfinallywith2endfinally_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/basics/tryfinallywith2endfinally_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfinallywith2endfinally_il_r.ilproj b/src/tests/JIT/Methodical/eh/basics/tryfinallywith2endfinally_il_r.ilproj
index a501993664ac0e..b846adc397d9d3 100644
--- a/src/tests/JIT/Methodical/eh/basics/tryfinallywith2endfinally_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/basics/tryfinallywith2endfinally_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally.il b/src/tests/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally.il
index 99322c0371165b..019fd6e055de92 100644
--- a/src/tests/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally.il
+++ b/src/tests/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally.il
@@ -13,9 +13,9 @@
 .assembly 'tryfinallywith2reachableendfinally' {}
 .assembly extern xunit.core {}
 
-.namespace hello
+.namespace hello_tryfinallywith2reachableendfinally_basics_il
 {
-  .class private auto ansi beforefieldinit Class1
+  .class public auto ansi beforefieldinit Class1
          extends [mscorlib]System.Object
   {
     .field private static class [eh_common]TestUtil.TestLog testLog
@@ -39,7 +39,7 @@
       callvirt   instance void [mscorlib]System.IO.TextWriter::WriteLine(string)
       ldloc.s    expectedOut
       newobj     instance void [eh_common]TestUtil.TestLog::.ctor(object)
-      stsfld     class [eh_common]TestUtil.TestLog hello.Class1::testLog
+      stsfld     class [eh_common]TestUtil.TestLog hello_tryfinallywith2reachableendfinally_basics_il.Class1::testLog
       ret
     } 
 
@@ -53,7 +53,7 @@
       .maxstack  1
       .locals init (int32 V_0)
 
-      ldsfld     class [eh_common]TestUtil.TestLog hello.Class1::testLog
+      ldsfld     class [eh_common]TestUtil.TestLog hello_tryfinallywith2reachableendfinally_basics_il.Class1::testLog
       callvirt   instance void [eh_common]TestUtil.TestLog::StartRecording()
 
       ldc.i4.0
@@ -88,10 +88,10 @@ again:
       br.s again
 
     done:  
-      ldsfld     class [eh_common]TestUtil.TestLog hello.Class1::testLog
+      ldsfld     class [eh_common]TestUtil.TestLog hello_tryfinallywith2reachableendfinally_basics_il.Class1::testLog
       callvirt   instance void [eh_common]TestUtil.TestLog::StopRecording()
       
-      ldsfld     class [eh_common]TestUtil.TestLog hello.Class1::testLog
+      ldsfld     class [eh_common]TestUtil.TestLog hello_tryfinallywith2reachableendfinally_basics_il.Class1::testLog
       callvirt   instance int32 [eh_common]TestUtil.TestLog::VerifyOutput()
 
       ret
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally_il_d.ilproj b/src/tests/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally_il_d.ilproj
index 4ced3967cc4faf..150004d0994f34 100644
--- a/src/tests/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally_il_r.ilproj b/src/tests/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally_il_r.ilproj
index dab4847b04964e..eab9c72e05a124 100644
--- a/src/tests/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/trythrowcatch.cs b/src/tests/JIT/Methodical/eh/basics/trythrowcatch.cs
index 48944bb182e7be..a8d4f8c3998ddf 100644
--- a/src/tests/JIT/Methodical/eh/basics/trythrowcatch.cs
+++ b/src/tests/JIT/Methodical/eh/basics/trythrowcatch.cs
@@ -3,10 +3,11 @@
 
 // Try catch error case
 using System;
+using Xunit;
 
-namespace hello
+namespace hello_trythrowcatch_basics_cs
 {
-    class Class1
+    public class Class1
     {
         private static TestUtil.TestLog testLog;
 
@@ -35,7 +36,8 @@ static public void inCatch()
         }
         static public void inFinally() { }
 
-        static public int Main()
+        [Fact]
+        static public int TestEntryPoint()
         {
             //Start recording
             testLog.StartRecording();
diff --git a/src/tests/JIT/Methodical/eh/basics/trythrowcatch_d.csproj b/src/tests/JIT/Methodical/eh/basics/trythrowcatch_d.csproj
index 99b2e7f7329963..2fad2a5e1509ad 100644
--- a/src/tests/JIT/Methodical/eh/basics/trythrowcatch_d.csproj
+++ b/src/tests/JIT/Methodical/eh/basics/trythrowcatch_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/trythrowcatch_do.csproj b/src/tests/JIT/Methodical/eh/basics/trythrowcatch_do.csproj
index c3bed6623aa7cd..914b66d65d5c8c 100644
--- a/src/tests/JIT/Methodical/eh/basics/trythrowcatch_do.csproj
+++ b/src/tests/JIT/Methodical/eh/basics/trythrowcatch_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/trythrowcatch_r.csproj b/src/tests/JIT/Methodical/eh/basics/trythrowcatch_r.csproj
index ef3031a296068c..8a871d8789d5c7 100644
--- a/src/tests/JIT/Methodical/eh/basics/trythrowcatch_r.csproj
+++ b/src/tests/JIT/Methodical/eh/basics/trythrowcatch_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/trythrowcatch_ro.csproj b/src/tests/JIT/Methodical/eh/basics/trythrowcatch_ro.csproj
index d9cce920c86706..2c6a0831228f3f 100644
--- a/src/tests/JIT/Methodical/eh/basics/trythrowcatch_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/basics/trythrowcatch_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/trythrowcatchfinally.cs b/src/tests/JIT/Methodical/eh/basics/trythrowcatchfinally.cs
index a6156aef932d4b..edf9f0b67c423a 100644
--- a/src/tests/JIT/Methodical/eh/basics/trythrowcatchfinally.cs
+++ b/src/tests/JIT/Methodical/eh/basics/trythrowcatchfinally.cs
@@ -3,8 +3,11 @@
 
 // try { throw } catch {} finally {}
 using System;
+using Xunit;
 
-class test
+namespace Test_trythrowcatchfinally_cs
+{
+public class test
 {
     private static TestUtil.TestLog testLog;
 
@@ -23,7 +26,8 @@ static test()
         testLog = new TestUtil.TestLog(expectedOut);
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         //Start recording
         testLog.StartRecording();
@@ -52,3 +56,4 @@ public static int Main()
         return testLog.VerifyOutput();
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/eh/basics/trythrowcatchfinally_d.csproj b/src/tests/JIT/Methodical/eh/basics/trythrowcatchfinally_d.csproj
index 11e86db2b6415c..d549831d794f3f 100644
--- a/src/tests/JIT/Methodical/eh/basics/trythrowcatchfinally_d.csproj
+++ b/src/tests/JIT/Methodical/eh/basics/trythrowcatchfinally_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/trythrowcatchfinally_do.csproj b/src/tests/JIT/Methodical/eh/basics/trythrowcatchfinally_do.csproj
index f1c2edb048d003..9a3f6b2363216e 100644
--- a/src/tests/JIT/Methodical/eh/basics/trythrowcatchfinally_do.csproj
+++ b/src/tests/JIT/Methodical/eh/basics/trythrowcatchfinally_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/trythrowcatchfinally_r.csproj b/src/tests/JIT/Methodical/eh/basics/trythrowcatchfinally_r.csproj
index 60b00fb2b1cbda..d4c9b23cdafd50 100644
--- a/src/tests/JIT/Methodical/eh/basics/trythrowcatchfinally_r.csproj
+++ b/src/tests/JIT/Methodical/eh/basics/trythrowcatchfinally_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/trythrowcatchfinally_ro.csproj b/src/tests/JIT/Methodical/eh/basics/trythrowcatchfinally_ro.csproj
index 2201119cdea9df..6209006c18f001 100644
--- a/src/tests/JIT/Methodical/eh/basics/trythrowcatchfinally_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/basics/trythrowcatchfinally_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/basics/trythrowexcept.il b/src/tests/JIT/Methodical/eh/basics/trythrowexcept.il
index b2677021d61f93..e911d0fc4a130e 100644
--- a/src/tests/JIT/Methodical/eh/basics/trythrowexcept.il
+++ b/src/tests/JIT/Methodical/eh/basics/trythrowexcept.il
@@ -8,12 +8,16 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
+.assembly extern xunit.core {}
 .assembly extern mscorlib {}
 .assembly extern eh_common {}
 .assembly 'trythrowexcept' {}
 
 .class public auto ansi Test_trythrowexcept extends [mscorlib] System.Object {
 .method public static int32 main() {
+    .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+        01 00 00 00
+    )
     .entrypoint
     .maxstack  2
     .locals init (
diff --git a/src/tests/JIT/Methodical/eh/basics/trythrowexcept_il_d.ilproj b/src/tests/JIT/Methodical/eh/basics/trythrowexcept_il_d.ilproj
index f90ba0ef73a218..a4d1ba26bd3a75 100644
--- a/src/tests/JIT/Methodical/eh/basics/trythrowexcept_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/basics/trythrowexcept_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/basics/trythrowexcept_il_r.ilproj b/src/tests/JIT/Methodical/eh/basics/trythrowexcept_il_r.ilproj
index aec113f7825867..48a7828869d256 100644
--- a/src/tests/JIT/Methodical/eh/basics/trythrowexcept_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/basics/trythrowexcept_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/cs/unsafe.cs b/src/tests/JIT/Methodical/eh/cs/unsafe.cs
index 0c1bee75c51276..a8a617e10ff520 100644
--- a/src/tests/JIT/Methodical/eh/cs/unsafe.cs
+++ b/src/tests/JIT/Methodical/eh/cs/unsafe.cs
@@ -4,8 +4,11 @@
 // unsafe memory access in a funclet
 
 using System;
+using Xunit;
 
-class Test
+namespace Test_unsafe
+{
+public class Test
 {
 
     private static TestUtil.TestLog testLog;
@@ -50,7 +53,8 @@ unsafe static void WriteLocations(byte[] arr)
         }
     }
 
-    static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         //Start recording
         testLog.StartRecording();
@@ -74,3 +78,4 @@ static int Main()
         return testLog.VerifyOutput();
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/eh/cs/unsafe_d.csproj b/src/tests/JIT/Methodical/eh/cs/unsafe_d.csproj
index a0548c96b74aa8..20a012cc9cee8d 100644
--- a/src/tests/JIT/Methodical/eh/cs/unsafe_d.csproj
+++ b/src/tests/JIT/Methodical/eh/cs/unsafe_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/cs/unsafe_do.csproj b/src/tests/JIT/Methodical/eh/cs/unsafe_do.csproj
index 17b5ab70b2f50b..8314c743595547 100644
--- a/src/tests/JIT/Methodical/eh/cs/unsafe_do.csproj
+++ b/src/tests/JIT/Methodical/eh/cs/unsafe_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/cs/unsafe_r.csproj b/src/tests/JIT/Methodical/eh/cs/unsafe_r.csproj
index 995b81dee54133..d37104ec3ca807 100644
--- a/src/tests/JIT/Methodical/eh/cs/unsafe_r.csproj
+++ b/src/tests/JIT/Methodical/eh/cs/unsafe_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/cs/unsafe_ro.csproj b/src/tests/JIT/Methodical/eh/cs/unsafe_ro.csproj
index 560e05ae72ef3f..f2da963662aa1f 100644
--- a/src/tests/JIT/Methodical/eh/cs/unsafe_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/cs/unsafe_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeaftercatch_il_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/badcodeaftercatch_il_d.ilproj
index bedb336015c715..60d7183ff40c23 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/badcodeaftercatch_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/deadcode/badcodeaftercatch_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeaftercatch_il_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/badcodeaftercatch_il_r.ilproj
index 5b6ca0d1ab4136..fb94274d5880dc 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/badcodeaftercatch_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/deadcode/badcodeaftercatch_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfault_il_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfault_il_d.ilproj
index 7257e1bae6300d..ded0f39685da0c 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfault_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfault_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfault_il_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfault_il_r.ilproj
index 8e23cb2c0fbce1..5ff3e725f38fdf 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfault_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfault_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfilter_il_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfilter_il_d.ilproj
index 8c5c869c1f20fa..6b9302fdfaf2be 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfilter_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfilter_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfilter_il_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfilter_il_r.ilproj
index 08b0cb8adb7262..21ddcec745ebca 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfilter_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfilter_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfinally_il_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfinally_il_d.ilproj
index 98c03d9ecebbf4..ba525265e4c138 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfinally_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfinally_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
     <!-- #2444 -->
     <DisableProjectBuild>true</DisableProjectBuild>
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfinally_il_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfinally_il_r.ilproj
index 2a17af6b48382f..8c8ce0bca04fbc 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfinally_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfinally_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
     <!-- #2444 -->
     <DisableProjectBuild>true</DisableProjectBuild>
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeaftertry_il_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/badcodeaftertry_il_d.ilproj
index 7c48a7a054ef67..f89a21edaa3204 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/badcodeaftertry_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/deadcode/badcodeaftertry_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeaftertry_il_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/badcodeaftertry_il_r.ilproj
index 6f92f0fe02ad30..37359da764f7b6 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/badcodeaftertry_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/deadcode/badcodeaftertry_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeinsidefinally_il_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/badcodeinsidefinally_il_d.ilproj
index 32eab59e3cacea..139b30458e8d74 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/badcodeinsidefinally_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/deadcode/badcodeinsidefinally_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeinsidefinally_il_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/badcodeinsidefinally_il_r.ilproj
index 53bb7408fcd611..f1cd638fb49ebe 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/badcodeinsidefinally_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/deadcode/badcodeinsidefinally_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/deadcode/branchoverendfinally.il b/src/tests/JIT/Methodical/eh/deadcode/branchoverendfinally.il
index a83fb59395a65d..09a0265052c580 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/branchoverendfinally.il
+++ b/src/tests/JIT/Methodical/eh/deadcode/branchoverendfinally.il
@@ -11,7 +11,9 @@
 .assembly 'branchoverendfinally' {}
 .assembly extern xunit.core {}
 
-.class private auto ansi beforefieldinit foo
+.namespace Test_branchoverendfinally_il
+{
+.class public auto ansi beforefieldinit foo
        extends [mscorlib]System.Object
 {
   .field private static class [eh_common]TestUtil.TestLog testLog
@@ -37,7 +39,7 @@
 
     ldloc.s    expectedOut
     newobj     instance void [eh_common]TestUtil.TestLog::.ctor(object)
-    stsfld     class [eh_common]TestUtil.TestLog foo::testLog
+    stsfld     class [eh_common]TestUtil.TestLog Test_branchoverendfinally_il.foo::testLog
     ret
   } 
 
@@ -49,7 +51,7 @@
     .entrypoint
     .maxstack  1
 
-    ldsfld     class [eh_common]TestUtil.TestLog foo::testLog
+    ldsfld     class [eh_common]TestUtil.TestLog Test_branchoverendfinally_il.foo::testLog
     callvirt   instance void [eh_common]TestUtil.TestLog::StartRecording()
     
     .try
@@ -79,10 +81,10 @@
     IL_0036:  call       void [System.Console]System.Console::WriteLine(string)
     IL_0039:
       
-    ldsfld     class [eh_common]TestUtil.TestLog foo::testLog
+    ldsfld     class [eh_common]TestUtil.TestLog Test_branchoverendfinally_il.foo::testLog
     callvirt   instance void [eh_common]TestUtil.TestLog::StopRecording()
   
-    ldsfld     class [eh_common]TestUtil.TestLog foo::testLog
+    ldsfld     class [eh_common]TestUtil.TestLog Test_branchoverendfinally_il.foo::testLog
     callvirt   instance int32 [eh_common]TestUtil.TestLog::VerifyOutput()
     
     IL_003b:  ret
@@ -98,3 +100,4 @@
   } 
 
 } 
+}
diff --git a/src/tests/JIT/Methodical/eh/deadcode/branchoverendfinally_il_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/branchoverendfinally_il_d.ilproj
index 7df28f3888d633..7608a8331358d9 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/branchoverendfinally_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/deadcode/branchoverendfinally_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/deadcode/branchoverendfinally_il_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/branchoverendfinally_il_r.ilproj
index 96f2cb11bc942e..435e42ef926dbd 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/branchoverendfinally_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/deadcode/branchoverendfinally_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadEHregionacrossBB.il b/src/tests/JIT/Methodical/eh/deadcode/deadEHregionacrossBB.il
index 8b7d11304d556a..9fcf1137283465 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/deadEHregionacrossBB.il
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadEHregionacrossBB.il
@@ -23,7 +23,9 @@
 .subsystem 0x00000003
 .file alignment 512
 .corflags 0x00000001
-.class private auto ansi beforefieldinit test
+.namespace Test_deadEHregionacrossBB_il
+{
+.class public auto ansi beforefieldinit test
        extends [mscorlib]System.Object
 {
   .field private static class [eh_common]TestUtil.TestLog testLog
@@ -31,9 +33,9 @@
   {
     .maxstack  2
     newobj     instance void [eh_common]TestUtil.TestLog::.ctor()
-    stsfld     class [eh_common]TestUtil.TestLog test::testLog
+    stsfld     class [eh_common]TestUtil.TestLog Test_deadEHregionacrossBB_il.test::testLog
     ret
-  } // end of method test::.cctor
+  } // end of method Test_deadEHregionacrossBB_il.test::.cctor
 
   .method public hidebysig static int32  Main() cil managed
   {
@@ -43,7 +45,7 @@
     .entrypoint
     .maxstack  1
     .locals init (int32 V_0)
-    ldsfld     class [eh_common]TestUtil.TestLog test::testLog
+    ldsfld     class [eh_common]TestUtil.TestLog Test_deadEHregionacrossBB_il.test::testLog
     callvirt   instance void [eh_common]TestUtil.TestLog::StartRecording()
 
     L:
@@ -72,14 +74,14 @@
 
     }  // end handler
     IL_0019:
-        ldsfld     class [eh_common]TestUtil.TestLog test::testLog
+        ldsfld     class [eh_common]TestUtil.TestLog Test_deadEHregionacrossBB_il.test::testLog
         callvirt   instance void [eh_common]TestUtil.TestLog::StopRecording()
 
-        ldsfld     class [eh_common]TestUtil.TestLog test::testLog
+        ldsfld     class [eh_common]TestUtil.TestLog Test_deadEHregionacrossBB_il.test::testLog
         callvirt   instance int32 [eh_common]TestUtil.TestLog::VerifyOutput()
 
     IL_0022:  ret
-  } // end of method test::Main
+  } // end of method Test_deadEHregionacrossBB_il.test::Main
 
   .method public hidebysig specialname rtspecialname
           instance void  .ctor() cil managed
@@ -88,5 +90,6 @@
     IL_0000:  ldarg.0
     IL_0001:  call       instance void [mscorlib]System.Object::.ctor()
     IL_0006:  ret
-  } // end of method test::.ctor
-} // end of class test
+  } // end of method Test_deadEHregionacrossBB_il.test::.ctor
+} // end of class Test_deadEHregionacrossBB_il.test
+}
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadEHregionacrossBB_il_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadEHregionacrossBB_il_d.ilproj
index 1f7815f4f3cf95..c59d1cd94d5de4 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/deadEHregionacrossBB_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadEHregionacrossBB_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadEHregionacrossBB_il_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadEHregionacrossBB_il_r.ilproj
index af2d3123184c34..bca863db43ddcd 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/deadEHregionacrossBB_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadEHregionacrossBB_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadcodeincatch.il b/src/tests/JIT/Methodical/eh/deadcode/deadcodeincatch.il
index 74c6dfd6977fed..a317e5c9ec6310 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/deadcodeincatch.il
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadcodeincatch.il
@@ -20,9 +20,9 @@
 }
 .assembly extern xunit.core {}
 
-.namespace hello
+.namespace hello_deadcodeincatch_deadcode_il
 {
-  .class private auto ansi beforefieldinit Class1
+  .class public auto ansi beforefieldinit Class1
          extends [mscorlib]System.Object
   {
     .field private static class [eh_common]TestUtil.TestLog testLog
@@ -39,7 +39,7 @@
             ldstr      "In catch"
             callvirt   instance void [mscorlib]System.IO.TextWriter::WriteLine(string)
             ldloc.s    expectedOut
-            ldstr      "hello"
+            ldstr      "hello_deadcodeincatch_deadcode_il"
             callvirt   instance void [mscorlib]System.IO.TextWriter::WriteLine(string)
             ldloc.s    expectedOut
             ldstr      "In finally"
@@ -49,7 +49,7 @@
             callvirt   instance void [mscorlib]System.IO.TextWriter::WriteLine(string)
             ldloc.s    expectedOut
             newobj     instance void [eh_common]TestUtil.TestLog::.ctor(object)
-            stsfld     class [eh_common]TestUtil.TestLog hello.Class1::testLog
+            stsfld     class [eh_common]TestUtil.TestLog hello_deadcodeincatch_deadcode_il.Class1::testLog
             ret
     } // end of method Class1::.cctor
 
@@ -89,8 +89,8 @@
       )
       .entrypoint
       .maxstack  1
-      ldstr   "hello"
-      call    int32 hello.Class1::Run(string)
+      ldstr   "hello_deadcodeincatch_deadcode_il"
+      call    int32 hello_deadcodeincatch_deadcode_il.Class1::Run(string)
       ret
     }
     
@@ -106,13 +106,13 @@
              
     starttest:
       // Start recording
-      ldsfld     class [eh_common]TestUtil.TestLog hello.Class1::testLog
+      ldsfld     class [eh_common]TestUtil.TestLog hello_deadcodeincatch_deadcode_il.Class1::testLog
       callvirt   instance void [eh_common]TestUtil.TestLog::StartRecording()
       ldarg.0
       stloc.0
       .try
       {
-        call       void hello.Class1::inTry()
+        call       void hello_deadcodeincatch_deadcode_il.Class1::inTry()
         newobj     instance void [mscorlib]System.Exception::.ctor()
         throw
         leave.s    done
@@ -129,7 +129,7 @@
           call       string [mscorlib]System.String::Concat(string,
                                                                     string)
           stloc.2
-          call       void hello.Class1::inCatch()
+          call       void hello_deadcodeincatch_deadcode_il.Class1::inCatch()
           ldloc.0
           call       void [System.Console]System.Console::WriteLine(string)
 
@@ -158,11 +158,11 @@
         call       void [System.Console]System.Console::WriteLine(string)
         
         // stop recoding
-        ldsfld     class [eh_common]TestUtil.TestLog hello.Class1::testLog
+        ldsfld     class [eh_common]TestUtil.TestLog hello_deadcodeincatch_deadcode_il.Class1::testLog
         callvirt   instance void [eh_common]TestUtil.TestLog::StopRecording()
       
         // verify output
-        ldsfld     class [eh_common]TestUtil.TestLog hello.Class1::testLog
+        ldsfld     class [eh_common]TestUtil.TestLog hello_deadcodeincatch_deadcode_il.Class1::testLog
         callvirt   instance int32 [eh_common]TestUtil.TestLog::VerifyOutput()
         stloc.3
        done:
@@ -181,4 +181,4 @@
     } // end of method Class1::.ctor
 
   } // end of class Class1
-} // end of namespace hello
+} // end of namespace hello_deadcodeincatch_deadcode_il
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadcodeincatch_il_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadcodeincatch_il_d.ilproj
index 85131cbe439bf4..2d8b339d775c9b 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/deadcodeincatch_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadcodeincatch_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadcodeincatch_il_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadcodeincatch_il_r.ilproj
index 94bade77e29fcc..f9a88f8f93b052 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/deadcodeincatch_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadcodeincatch_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadnonlocalexit.il b/src/tests/JIT/Methodical/eh/deadcode/deadnonlocalexit.il
index fa1f9d67adf317..0ce2d9d47b7d5b 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/deadnonlocalexit.il
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadnonlocalexit.il
@@ -7,6 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
+.assembly extern xunit.core {}
 .assembly extern mscorlib
 {
   .ver 0:0:0:0
@@ -23,6 +24,9 @@
 
 .class public auto ansi Test_deadnonlocalexit extends [mscorlib] System.Object {
 .method public static int32 main() {
+    .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+        01 00 00 00
+    )
     .entrypoint
     .maxstack  400
     .locals init (int32 V_0,
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadnonlocalexit_il_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadnonlocalexit_il_d.ilproj
index 9240a8cf3b61b0..3536124ad0bd92 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/deadnonlocalexit_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadnonlocalexit_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadnonlocalexit_il_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadnonlocalexit_il_r.ilproj
index 6e1fcbdb0b972e..6e10a162af4336 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/deadnonlocalexit_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadnonlocalexit_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadoponerror.il b/src/tests/JIT/Methodical/eh/deadcode/deadoponerror.il
index d027c0ccd92b57..f1ee49f7055bc5 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/deadoponerror.il
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadoponerror.il
@@ -8,9 +8,9 @@
 .assembly 'deadoponerror'
 { }
 .assembly extern xunit.core {}
-.class private auto ansi Test_deadoponerror extends [mscorlib]System.Object
+.class public auto ansi Test_deadoponerror extends [mscorlib]System.Object
 {
-.method private hidebysig static int32 Main() il managed
+.method public hidebysig static int32 Main() il managed
 {
 	.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
 	    01 00 00 00
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadoponerror_il_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadoponerror_il_d.ilproj
index 40ecb2f553efe5..392eb9e7315e18 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/deadoponerror_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadoponerror_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadoponerror_il_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadoponerror_il_r.ilproj
index ecf0935b785820..9ba74a477a8c40 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/deadoponerror_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadoponerror_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet.il b/src/tests/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet.il
index e9280a1b9542f2..030e0ca0f72bae 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet.il
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet.il
@@ -19,9 +19,9 @@
 }
 .assembly extern xunit.core {}
 
-.namespace hello
+.namespace hello_deadoponerrorinfunclet_deadcode_il
 {
-  .class private auto ansi beforefieldinit Class1
+  .class public auto ansi beforefieldinit Class1
          extends [mscorlib]System.Object
   {
     .field private static class [eh_common]TestUtil.TestLog testLog
@@ -42,7 +42,7 @@
         callvirt   instance void [mscorlib]System.IO.TextWriter::WriteLine(string)
         ldloc.s    expectedOut
         newobj     instance void [eh_common]TestUtil.TestLog::.ctor(object)
-        stsfld     class [eh_common]TestUtil.TestLog hello.Class1::testLog
+        stsfld     class [eh_common]TestUtil.TestLog hello_deadoponerrorinfunclet_deadcode_il.Class1::testLog
         ret
     }
 
@@ -58,7 +58,7 @@
                string V_1,
                int32 V_2)
 
-                ldsfld     class [eh_common]TestUtil.TestLog hello.Class1::testLog
+                ldsfld     class [eh_common]TestUtil.TestLog hello_deadoponerrorinfunclet_deadcode_il.Class1::testLog
                 callvirt   instance void [eh_common]TestUtil.TestLog::StartRecording()
       IL_0000:  ldc.i4   1234
       IL_0002:  stloc.0
@@ -135,10 +135,10 @@
 
       IL_006a:  ldloc.2
                 call  void [System.Console]System.Console::WriteLine(int32)
-                ldsfld     class [eh_common]TestUtil.TestLog hello.Class1::testLog
+                ldsfld     class [eh_common]TestUtil.TestLog hello_deadoponerrorinfunclet_deadcode_il.Class1::testLog
                 callvirt   instance void [eh_common]TestUtil.TestLog::StopRecording()
 
-                ldsfld     class [eh_common]TestUtil.TestLog hello.Class1::testLog
+                ldsfld     class [eh_common]TestUtil.TestLog hello_deadoponerrorinfunclet_deadcode_il.Class1::testLog
                 callvirt   instance int32 [eh_common]TestUtil.TestLog::VerifyOutput()
 
       IL_006b:  ret
@@ -153,4 +153,4 @@
       IL_0006:  ret
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadrgninfunclet.il b/src/tests/JIT/Methodical/eh/deadcode/deadrgninfunclet.il
index 50ae427185312a..85e79759cfb9ae 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/deadrgninfunclet.il
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadrgninfunclet.il
@@ -8,6 +8,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
+.assembly extern xunit.core {}
 .assembly extern mscorlib
 {
   .ver 0:0:0:0
@@ -24,6 +25,9 @@
 
 .class public auto ansi Test_deadrgninfunclet extends [mscorlib] System.Object {
 .method public static int32 main() {
+    .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+        01 00 00 00
+    )
     .entrypoint
     .maxstack  400
     .locals init (int32 V_0,
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadrgninfunclet_il_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadrgninfunclet_il_d.ilproj
index 9c2edef5c6602a..87849348cd8eb4 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/deadrgninfunclet_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadrgninfunclet_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadrgninfunclet_il_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadrgninfunclet_il_r.ilproj
index 9bb1dd736f4124..91db6617db0302 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/deadrgninfunclet_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadrgninfunclet_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadtrycatch.il b/src/tests/JIT/Methodical/eh/deadcode/deadtrycatch.il
index ecd0a61840ed76..0c82715d807a83 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/deadtrycatch.il
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadtrycatch.il
@@ -8,6 +8,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
+.assembly extern xunit.core {}
 .assembly extern mscorlib
 {
   .ver 0:0:0:0
@@ -24,6 +25,9 @@
 
 .class public auto ansi Test_deadtrycatch extends [mscorlib] System.Object {
 .method public static int32 main() {
+    .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+        01 00 00 00
+    )
     .entrypoint
       .maxstack  2
       .locals init (
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadtrycatch_il_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadtrycatch_il_d.ilproj
index 95abd20cc2b7c1..7a844f143cae44 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/deadtrycatch_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadtrycatch_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadtrycatch_il_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadtrycatch_il_r.ilproj
index 13aec1c4fc4321..0ff109fc23cff0 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/deadtrycatch_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadtrycatch_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadtryfinally.il b/src/tests/JIT/Methodical/eh/deadcode/deadtryfinally.il
index e06ea1ed999203..21ef6cdfb90b4f 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/deadtryfinally.il
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadtryfinally.il
@@ -8,6 +8,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
+.assembly extern xunit.core {}
 .assembly extern mscorlib
 {
   .ver 0:0:0:0
@@ -24,6 +25,9 @@
 
 .class public auto ansi Test_deadtryfinally extends [mscorlib] System.Object {
 .method public static int32 main() {
+    .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+        01 00 00 00
+    )
     .entrypoint
       .maxstack  2
            .locals init (
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadtryfinally_il_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadtryfinally_il_d.ilproj
index 31ff1e8d4ee40c..12f484b37bcac6 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/deadtryfinally_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadtryfinally_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadtryfinally_il_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadtryfinally_il_r.ilproj
index ac1aa9164563e7..432f042f91f717 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/deadtryfinally_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadtryfinally_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadtryfinallythrow.il b/src/tests/JIT/Methodical/eh/deadcode/deadtryfinallythrow.il
index d06c23e10d1982..0ecc73400404dc 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/deadtryfinallythrow.il
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadtryfinallythrow.il
@@ -8,6 +8,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
+.assembly extern xunit.core {}
 .assembly extern mscorlib
 {
   .ver 0:0:0:0
@@ -24,6 +25,9 @@
 
 .class public auto ansi Test_deadtryfinallythrow extends [mscorlib] System.Object {
 .method public static int32 main() {
+    .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+        01 00 00 00
+    )
     .entrypoint
       .maxstack  2
         .locals init (
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadtryfinallythrow_il_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadtryfinallythrow_il_d.ilproj
index 51815d328d9c85..3a678a980b0d8c 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/deadtryfinallythrow_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadtryfinallythrow_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadtryfinallythrow_il_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadtryfinallythrow_il_r.ilproj
index 3323806e8648c2..ccefeec0eaa8c9 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/deadtryfinallythrow_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadtryfinallythrow_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/deadcode/endfinallyinloop.il b/src/tests/JIT/Methodical/eh/deadcode/endfinallyinloop.il
index a53985c7214ab3..b4930de33b69a5 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/endfinallyinloop.il
+++ b/src/tests/JIT/Methodical/eh/deadcode/endfinallyinloop.il
@@ -27,7 +27,9 @@
 .corflags 0x00000001
 
 
-.class private auto ansi beforefieldinit foo
+.namespace Test_endfinallyinloop_il
+{
+.class public auto ansi beforefieldinit foo
        extends [mscorlib]System.Object
 {
   .method public hidebysig static int32 Main() cil managed
@@ -102,3 +104,4 @@
   } 
 
 } 
+}
diff --git a/src/tests/JIT/Methodical/eh/deadcode/endfinallyinloop_il_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/endfinallyinloop_il_d.ilproj
index 352cdcc9bd0c6a..b3b17010d0c532 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/endfinallyinloop_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/deadcode/endfinallyinloop_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/deadcode/endfinallyinloop_il_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/endfinallyinloop_il_r.ilproj
index d34a9558132a03..6efd34be679570 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/endfinallyinloop_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/deadcode/endfinallyinloop_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/deadcode/loopstrswitchgoto.cs b/src/tests/JIT/Methodical/eh/deadcode/loopstrswitchgoto.cs
index a8adb75237355a..096551c7a306b6 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/loopstrswitchgoto.cs
+++ b/src/tests/JIT/Methodical/eh/deadcode/loopstrswitchgoto.cs
@@ -4,10 +4,11 @@
 /* dead code in a switch contained ina a loop */
 
 using System;
+using Xunit;
 
-namespace strswitch
+namespace strswitch_loopstrswitchgoto_cs
 {
-    internal class Class1
+    public class Class1
     {
         private static TestUtil.TestLog s_testLog;
 
@@ -25,7 +26,8 @@ static Class1()
             s_testLog = new TestUtil.TestLog(expectedOut);
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             string[] s = { "one", "two", "three", "four", "five", "six" };
             s_testLog.StartRecording();
diff --git a/src/tests/JIT/Methodical/eh/deadcode/loopstrswitchgoto_d.csproj b/src/tests/JIT/Methodical/eh/deadcode/loopstrswitchgoto_d.csproj
index 7b3727b2bab9b7..b5590f44bcfa0b 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/loopstrswitchgoto_d.csproj
+++ b/src/tests/JIT/Methodical/eh/deadcode/loopstrswitchgoto_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/deadcode/loopstrswitchgoto_do.csproj b/src/tests/JIT/Methodical/eh/deadcode/loopstrswitchgoto_do.csproj
index 8f003ce4b36518..3f0e27131e90f4 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/loopstrswitchgoto_do.csproj
+++ b/src/tests/JIT/Methodical/eh/deadcode/loopstrswitchgoto_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/deadcode/loopstrswitchgoto_r.csproj b/src/tests/JIT/Methodical/eh/deadcode/loopstrswitchgoto_r.csproj
index d90da26ae87eaa..d6909f678df3b5 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/loopstrswitchgoto_r.csproj
+++ b/src/tests/JIT/Methodical/eh/deadcode/loopstrswitchgoto_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/deadcode/loopstrswitchgoto_ro.csproj b/src/tests/JIT/Methodical/eh/deadcode/loopstrswitchgoto_ro.csproj
index f9362a5e624651..4142657f83fc36 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/loopstrswitchgoto_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/deadcode/loopstrswitchgoto_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/deadcode/severaldeadehregions.il b/src/tests/JIT/Methodical/eh/deadcode/severaldeadehregions.il
index 3a00de9deec06d..2f0808b1606034 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/severaldeadehregions.il
+++ b/src/tests/JIT/Methodical/eh/deadcode/severaldeadehregions.il
@@ -8,6 +8,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
+.assembly extern xunit.core {}
 .assembly extern mscorlib
 {
   .ver 0:0:0:0
@@ -25,6 +26,9 @@
 
 .class public auto ansi Test_severaldeadehregions extends [mscorlib] System.Object {
 .method public static int32 main() {
+    .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+        01 00 00 00
+    )
     .entrypoint
     .maxstack  400
     .locals init (int32 V_0,
diff --git a/src/tests/JIT/Methodical/eh/deadcode/severaldeadehregions_il_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/severaldeadehregions_il_d.ilproj
index 7d916c5a9e5490..179bb9e5f78cd8 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/severaldeadehregions_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/deadcode/severaldeadehregions_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/deadcode/severaldeadehregions_il_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/severaldeadehregions_il_r.ilproj
index 2285ae52bf12b4..07244e9a3709ef 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/severaldeadehregions_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/deadcode/severaldeadehregions_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/deadcode/severalnesteddeadehregions.il b/src/tests/JIT/Methodical/eh/deadcode/severalnesteddeadehregions.il
index a8b139717185da..59c1be45bfcdf4 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/severalnesteddeadehregions.il
+++ b/src/tests/JIT/Methodical/eh/deadcode/severalnesteddeadehregions.il
@@ -8,6 +8,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
+.assembly extern xunit.core {}
 .assembly extern mscorlib
 {
   .ver 0:0:0:0
@@ -24,6 +25,9 @@
 
 .class public auto ansi Test_severalnesteddeadehregions extends [mscorlib] System.Object {
 .method public static int32 main() {
+    .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+        01 00 00 00
+    )
     .entrypoint
     .maxstack  400
     .locals init (int32 V_0,
diff --git a/src/tests/JIT/Methodical/eh/deadcode/severalnesteddeadehregions_il_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/severalnesteddeadehregions_il_d.ilproj
index 55e9a847518cdf..d7320fa98b9fc7 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/severalnesteddeadehregions_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/deadcode/severalnesteddeadehregions_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/deadcode/severalnesteddeadehregions_il_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/severalnesteddeadehregions_il_r.ilproj
index a6350564c56164..a7c2199800e9fc 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/severalnesteddeadehregions_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/deadcode/severalnesteddeadehregions_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/deadcode/simpledeadehregion.il b/src/tests/JIT/Methodical/eh/deadcode/simpledeadehregion.il
index cf5b29bd560aa1..160d7b0ce6cf99 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/simpledeadehregion.il
+++ b/src/tests/JIT/Methodical/eh/deadcode/simpledeadehregion.il
@@ -8,6 +8,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
+.assembly extern xunit.core {}
 .assembly extern mscorlib
 {
   .ver 0:0:0:0
@@ -24,6 +25,9 @@
 
 .class public auto ansi Test_simpledeadehregion extends [mscorlib] System.Object {
 .method public static int32 main() {
+    .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+        01 00 00 00
+    )
     .entrypoint
     .maxstack  400
     .locals	init (	int32 V_0,
diff --git a/src/tests/JIT/Methodical/eh/deadcode/simpledeadehregion_il_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/simpledeadehregion_il_d.ilproj
index 21d0e9f51cf84c..0eb2a7ee926f6c 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/simpledeadehregion_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/deadcode/simpledeadehregion_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/deadcode/simpledeadehregion_il_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/simpledeadehregion_il_r.ilproj
index 71989e69952401..f64d19fe8ffc81 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/simpledeadehregion_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/deadcode/simpledeadehregion_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/disconnected/backwardleave.il b/src/tests/JIT/Methodical/eh/disconnected/backwardleave.il
index b92a9417741c1b..a427a170967ecd 100644
--- a/src/tests/JIT/Methodical/eh/disconnected/backwardleave.il
+++ b/src/tests/JIT/Methodical/eh/disconnected/backwardleave.il
@@ -7,6 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
+.assembly extern xunit.core {}
 .assembly extern mscorlib
 {
   .ver 0:0:0:0
@@ -23,6 +24,9 @@
 
 .class public auto ansi Test_backwardleave extends [mscorlib] System.Object {
 .method public static int32 main() {
+    .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+        01 00 00 00
+    )
     .entrypoint
     .maxstack  400
     .locals init (int32 V_0,
diff --git a/src/tests/JIT/Methodical/eh/disconnected/backwardleave_il_d.ilproj b/src/tests/JIT/Methodical/eh/disconnected/backwardleave_il_d.ilproj
index 4020b5b27504a8..981b4fcd1f24f0 100644
--- a/src/tests/JIT/Methodical/eh/disconnected/backwardleave_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/disconnected/backwardleave_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/disconnected/backwardleave_il_r.ilproj b/src/tests/JIT/Methodical/eh/disconnected/backwardleave_il_r.ilproj
index 401efd49bc621b..12cf2d8468f788 100644
--- a/src/tests/JIT/Methodical/eh/disconnected/backwardleave_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/disconnected/backwardleave_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/disconnected/catchbeforetrybody.il b/src/tests/JIT/Methodical/eh/disconnected/catchbeforetrybody.il
index af583048f1e244..7870eac45bcb0d 100644
--- a/src/tests/JIT/Methodical/eh/disconnected/catchbeforetrybody.il
+++ b/src/tests/JIT/Methodical/eh/disconnected/catchbeforetrybody.il
@@ -8,6 +8,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
+.assembly extern xunit.core {}
 .assembly extern mscorlib
 {
   .ver 0:0:0:0
@@ -24,6 +25,9 @@
 
 .class public auto ansi Test_catchbeforetrybody extends [mscorlib] System.Object {
 .method public static int32 main() {
+    .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+        01 00 00 00
+    )
     .entrypoint
     .maxstack  2
     .locals init (	int32 V_0,
diff --git a/src/tests/JIT/Methodical/eh/disconnected/catchbeforetrybody_il_d.ilproj b/src/tests/JIT/Methodical/eh/disconnected/catchbeforetrybody_il_d.ilproj
index 1dbf2b81ffadb3..306015e6299fca 100644
--- a/src/tests/JIT/Methodical/eh/disconnected/catchbeforetrybody_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/disconnected/catchbeforetrybody_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/disconnected/catchbeforetrybody_il_r.ilproj b/src/tests/JIT/Methodical/eh/disconnected/catchbeforetrybody_il_r.ilproj
index d5315ce1ea3aa3..b9581d82116260 100644
--- a/src/tests/JIT/Methodical/eh/disconnected/catchbeforetrybody_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/disconnected/catchbeforetrybody_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/disconnected/catchtryintryfinally.il b/src/tests/JIT/Methodical/eh/disconnected/catchtryintryfinally.il
index 4396f775fd1d0d..43f61b5d123d33 100644
--- a/src/tests/JIT/Methodical/eh/disconnected/catchtryintryfinally.il
+++ b/src/tests/JIT/Methodical/eh/disconnected/catchtryintryfinally.il
@@ -8,6 +8,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
+.assembly extern xunit.core {}
 .assembly extern mscorlib
 {
   .ver 0:0:0:0
@@ -24,6 +25,9 @@
 .class public auto ansi Test_catchtryintryfinally extends [mscorlib] System.Object {
 .method public static int32  main() cil managed
 {
+  .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+      01 00 00 00
+  )
   .entrypoint
   .maxstack  400
   .locals init (int32 V_0,
diff --git a/src/tests/JIT/Methodical/eh/disconnected/catchtryintryfinally_il_d.ilproj b/src/tests/JIT/Methodical/eh/disconnected/catchtryintryfinally_il_d.ilproj
index dd36cb0bb8934c..f3db7d5148207d 100644
--- a/src/tests/JIT/Methodical/eh/disconnected/catchtryintryfinally_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/disconnected/catchtryintryfinally_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/disconnected/catchtryintryfinally_il_r.ilproj b/src/tests/JIT/Methodical/eh/disconnected/catchtryintryfinally_il_r.ilproj
index 998bdc0372fdd0..9af5aef6ca022f 100644
--- a/src/tests/JIT/Methodical/eh/disconnected/catchtryintryfinally_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/disconnected/catchtryintryfinally_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/disconnected/faultbeforetrybody.il b/src/tests/JIT/Methodical/eh/disconnected/faultbeforetrybody.il
index d47705c9c032ba..803d1f064f7c16 100644
--- a/src/tests/JIT/Methodical/eh/disconnected/faultbeforetrybody.il
+++ b/src/tests/JIT/Methodical/eh/disconnected/faultbeforetrybody.il
@@ -7,6 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
+.assembly extern xunit.core {}
 .assembly extern mscorlib
 {
   .ver 0:0:0:0
@@ -23,6 +24,9 @@
 
 .class public auto ansi Test_faultbeforetrybody extends [mscorlib] System.Object {
 .method public static int32 main() {
+    .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+        01 00 00 00
+    )
     .entrypoint
     .maxstack  400
     .locals init (int32 V_0,
diff --git a/src/tests/JIT/Methodical/eh/disconnected/faultbeforetrybody_il_d.ilproj b/src/tests/JIT/Methodical/eh/disconnected/faultbeforetrybody_il_d.ilproj
index a11fe456f089e9..d8ddc8eaa20c9c 100644
--- a/src/tests/JIT/Methodical/eh/disconnected/faultbeforetrybody_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/disconnected/faultbeforetrybody_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/disconnected/faultbeforetrybody_il_r.ilproj b/src/tests/JIT/Methodical/eh/disconnected/faultbeforetrybody_il_r.ilproj
index b4a222fcac4250..624f5a8e1f9e04 100644
--- a/src/tests/JIT/Methodical/eh/disconnected/faultbeforetrybody_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/disconnected/faultbeforetrybody_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/disconnected/finallybeforetrybody.il b/src/tests/JIT/Methodical/eh/disconnected/finallybeforetrybody.il
index 3e402f1435882d..4af2b3d6f5c655 100644
--- a/src/tests/JIT/Methodical/eh/disconnected/finallybeforetrybody.il
+++ b/src/tests/JIT/Methodical/eh/disconnected/finallybeforetrybody.il
@@ -7,6 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
+.assembly extern xunit.core {}
 .assembly extern mscorlib
 {
   .ver 0:0:0:0
@@ -23,6 +24,9 @@
 
 .class public auto ansi Test_finallybeforetrybody extends [mscorlib] System.Object {
 .method public static int32 main() {
+    .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+        01 00 00 00
+    )
     .entrypoint
     .maxstack  2
     .locals init (int32 V_0,
diff --git a/src/tests/JIT/Methodical/eh/disconnected/finallybeforetrybody_il_d.ilproj b/src/tests/JIT/Methodical/eh/disconnected/finallybeforetrybody_il_d.ilproj
index 370a34e86ef83b..a8013d5117fd77 100644
--- a/src/tests/JIT/Methodical/eh/disconnected/finallybeforetrybody_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/disconnected/finallybeforetrybody_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/disconnected/finallybeforetrybody_il_r.ilproj b/src/tests/JIT/Methodical/eh/disconnected/finallybeforetrybody_il_r.ilproj
index 53fd06b491934d..6d17437c0d8d36 100644
--- a/src/tests/JIT/Methodical/eh/disconnected/finallybeforetrybody_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/disconnected/finallybeforetrybody_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/disconnected/finallytryintryfinally.il b/src/tests/JIT/Methodical/eh/disconnected/finallytryintryfinally.il
index 84ec50ab372369..a0c63321bca3b7 100644
--- a/src/tests/JIT/Methodical/eh/disconnected/finallytryintryfinally.il
+++ b/src/tests/JIT/Methodical/eh/disconnected/finallytryintryfinally.il
@@ -7,6 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
+.assembly extern xunit.core {}
 .assembly extern mscorlib
 {
   .ver 0:0:0:0
@@ -23,6 +24,9 @@
 
 .class public auto ansi Test_finallytryintryfinally extends [mscorlib] System.Object {
 .method public static int32 main() {
+    .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+        01 00 00 00
+    )
     .entrypoint
     .maxstack  4
     .locals init (	int32 V_0,
diff --git a/src/tests/JIT/Methodical/eh/disconnected/finallytryintryfinally_il_d.ilproj b/src/tests/JIT/Methodical/eh/disconnected/finallytryintryfinally_il_d.ilproj
index 410c21fb630aea..00af3116572655 100644
--- a/src/tests/JIT/Methodical/eh/disconnected/finallytryintryfinally_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/disconnected/finallytryintryfinally_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/disconnected/finallytryintryfinally_il_r.ilproj b/src/tests/JIT/Methodical/eh/disconnected/finallytryintryfinally_il_r.ilproj
index d5a16de3006b2b..2ff4567705ebc4 100644
--- a/src/tests/JIT/Methodical/eh/disconnected/finallytryintryfinally_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/disconnected/finallytryintryfinally_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/disconnected/reversedhandlers.il b/src/tests/JIT/Methodical/eh/disconnected/reversedhandlers.il
index a143fecbb685eb..32c8aa85d77f9b 100644
--- a/src/tests/JIT/Methodical/eh/disconnected/reversedhandlers.il
+++ b/src/tests/JIT/Methodical/eh/disconnected/reversedhandlers.il
@@ -7,6 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
+.assembly extern xunit.core {}
 .assembly extern mscorlib
 {
   .ver 0:0:0:0
@@ -23,6 +24,9 @@
 
 .class public auto ansi Test_reversedhandlers extends [mscorlib] System.Object {
 .method public static int32 main() {
+    .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+        01 00 00 00
+    )
     .entrypoint
     .maxstack  2
     .locals init (	int32 V_0,
diff --git a/src/tests/JIT/Methodical/eh/disconnected/reversedhandlers_il_d.ilproj b/src/tests/JIT/Methodical/eh/disconnected/reversedhandlers_il_d.ilproj
index c53265408ae908..6ff6886a6da8c2 100644
--- a/src/tests/JIT/Methodical/eh/disconnected/reversedhandlers_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/disconnected/reversedhandlers_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/disconnected/reversedhandlers_il_r.ilproj b/src/tests/JIT/Methodical/eh/disconnected/reversedhandlers_il_r.ilproj
index d742ea981edfbc..837c453322cd73 100644
--- a/src/tests/JIT/Methodical/eh/disconnected/reversedhandlers_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/disconnected/reversedhandlers_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/disconnected/reversedtryblock.il b/src/tests/JIT/Methodical/eh/disconnected/reversedtryblock.il
index 7cde3539a13abf..d71a80ec8ff2ee 100644
--- a/src/tests/JIT/Methodical/eh/disconnected/reversedtryblock.il
+++ b/src/tests/JIT/Methodical/eh/disconnected/reversedtryblock.il
@@ -7,6 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
+.assembly extern xunit.core {}
 .assembly extern mscorlib
 {
   .ver 0:0:0:0
@@ -23,6 +24,9 @@
 
 .class public auto ansi Test_reversedtryblock extends [mscorlib] System.Object {
 .method public static int32 main() {
+    .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+        01 00 00 00
+    )
     .entrypoint
     .maxstack  2
     .locals init (int32 V_0,
diff --git a/src/tests/JIT/Methodical/eh/disconnected/reversedtryblock_il_d.ilproj b/src/tests/JIT/Methodical/eh/disconnected/reversedtryblock_il_d.ilproj
index 5051d360ae02e8..f85b78c7d44a1c 100644
--- a/src/tests/JIT/Methodical/eh/disconnected/reversedtryblock_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/disconnected/reversedtryblock_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/disconnected/reversedtryblock_il_r.ilproj b/src/tests/JIT/Methodical/eh/disconnected/reversedtryblock_il_r.ilproj
index 7dec86e8a47fd8..b5da9b73c0fbab 100644
--- a/src/tests/JIT/Methodical/eh/disconnected/reversedtryblock_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/disconnected/reversedtryblock_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/disconnected/sehhandlerbeforetry.il b/src/tests/JIT/Methodical/eh/disconnected/sehhandlerbeforetry.il
index 156f8a59ecb98f..36b6c0a47b97fa 100644
--- a/src/tests/JIT/Methodical/eh/disconnected/sehhandlerbeforetry.il
+++ b/src/tests/JIT/Methodical/eh/disconnected/sehhandlerbeforetry.il
@@ -7,6 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
+.assembly extern xunit.core {}
 .assembly extern mscorlib
 {
   .ver 0:0:0:0
@@ -23,6 +24,9 @@
 
 .class public auto ansi Test_sehhandlerbeforetry extends [mscorlib] System.Object {
 .method public static int32 main() {
+    .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+        01 00 00 00
+    )
     .entrypoint
     .maxstack  2
 	  .locals init (
diff --git a/src/tests/JIT/Methodical/eh/disconnected/sehhandlerbeforetry_il_d.ilproj b/src/tests/JIT/Methodical/eh/disconnected/sehhandlerbeforetry_il_d.ilproj
index 76c21c5a7ce846..9e5224e5c77a4d 100644
--- a/src/tests/JIT/Methodical/eh/disconnected/sehhandlerbeforetry_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/disconnected/sehhandlerbeforetry_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/disconnected/sehhandlerbeforetry_il_r.ilproj b/src/tests/JIT/Methodical/eh/disconnected/sehhandlerbeforetry_il_r.ilproj
index a782ce986fcbdb..46175b68dae69a 100644
--- a/src/tests/JIT/Methodical/eh/disconnected/sehhandlerbeforetry_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/disconnected/sehhandlerbeforetry_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/disconnected/testeit.il b/src/tests/JIT/Methodical/eh/disconnected/testeit.il
index eda0857b3676f1..93a10a0526657e 100644
--- a/src/tests/JIT/Methodical/eh/disconnected/testeit.il
+++ b/src/tests/JIT/Methodical/eh/disconnected/testeit.il
@@ -8,6 +8,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
+.assembly extern xunit.core {}
 .assembly extern mscorlib
 {
   .ver 0:0:0:0
@@ -24,6 +25,9 @@
 
 .class public auto ansi Test_testeit extends [mscorlib] System.Object {
 .method public static int32 main() {
+    .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+        01 00 00 00
+    )
     .entrypoint
     .maxstack  400
     .locals init (int32 V_0,
diff --git a/src/tests/JIT/Methodical/eh/disconnected/testeit_il_d.ilproj b/src/tests/JIT/Methodical/eh/disconnected/testeit_il_d.ilproj
index c3d2d0dcab29a1..d189b14918f472 100644
--- a/src/tests/JIT/Methodical/eh/disconnected/testeit_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/disconnected/testeit_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/disconnected/testeit_il_r.ilproj b/src/tests/JIT/Methodical/eh/disconnected/testeit_il_r.ilproj
index b989a8fe13230e..fbdf3c63039c77 100644
--- a/src/tests/JIT/Methodical/eh/disconnected/testeit_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/disconnected/testeit_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers.il b/src/tests/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers.il
index 8cb16d7e5f83eb..de3b8c4e7be5e5 100644
--- a/src/tests/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers.il
+++ b/src/tests/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers.il
@@ -8,6 +8,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
+.assembly extern xunit.core {}
 .assembly extern mscorlib
 {
   .ver 0:0:0:0
@@ -24,6 +25,9 @@
 
 .class public auto ansi Test_trybodyinbetweencatchhandlers extends [mscorlib] System.Object {
 .method public static int32 main() {
+    .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+        01 00 00 00
+    )
     .entrypoint
     .maxstack  400
     .locals init (	int32 V_0,
diff --git a/src/tests/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers_il_d.ilproj b/src/tests/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers_il_d.ilproj
index e627c25f5faa76..690d3659cbf50c 100644
--- a/src/tests/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers_il_r.ilproj b/src/tests/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers_il_r.ilproj
index 9c1135149f3f9e..d5aca26bb93ed2 100644
--- a/src/tests/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/disconnected/tryfinallyincatchtry.il b/src/tests/JIT/Methodical/eh/disconnected/tryfinallyincatchtry.il
index 40da63cd79e572..ef3bc251e50f09 100644
--- a/src/tests/JIT/Methodical/eh/disconnected/tryfinallyincatchtry.il
+++ b/src/tests/JIT/Methodical/eh/disconnected/tryfinallyincatchtry.il
@@ -7,6 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
+.assembly extern xunit.core {}
 .assembly extern mscorlib
 {
   .ver 0:0:0:0
@@ -23,6 +24,9 @@
 
 .class public auto ansi Test_tryfinallyincatchtry extends [mscorlib] System.Object {
 .method public static int32 main() {
+    .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+        01 00 00 00
+    )
     .entrypoint
     .maxstack  400
     .locals init (	int32 V_0,
diff --git a/src/tests/JIT/Methodical/eh/disconnected/tryfinallyincatchtry_il_d.ilproj b/src/tests/JIT/Methodical/eh/disconnected/tryfinallyincatchtry_il_d.ilproj
index a5a5400574214d..c9c5b4a84a8c58 100644
--- a/src/tests/JIT/Methodical/eh/disconnected/tryfinallyincatchtry_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/disconnected/tryfinallyincatchtry_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/disconnected/tryfinallyincatchtry_il_r.ilproj b/src/tests/JIT/Methodical/eh/disconnected/tryfinallyincatchtry_il_r.ilproj
index 07d37ff63e1437..b96e61e1659e27 100644
--- a/src/tests/JIT/Methodical/eh/disconnected/tryfinallyincatchtry_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/disconnected/tryfinallyincatchtry_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry.cs b/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry.cs
index 45c9acc9b9258d..f0b98aec073919 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry.cs
+++ b/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry.cs
@@ -5,11 +5,12 @@
 // we will need to use the il after the C# compiler is fixed
 
 using System;
+using Xunit;
 
-namespace strswitch
+namespace strswitch_catchrettoinnertry_cs
 {
 
-    class Class1
+    public class Class1
     {
         private static TestUtil.TestLog testLog;
 
@@ -28,7 +29,8 @@ static Class1()
             testLog = new TestUtil.TestLog(expectedOut);
         }
 
-        static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             //Start recording
             testLog.StartRecording();
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry.il b/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry.il
index c9b25864039f67..50b0176e0ca8fa 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry.il
+++ b/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry.il
@@ -19,9 +19,9 @@
  }
 .assembly extern xunit.core {}
 
-.namespace strswitch
+.namespace strswitch_catchrettoinnertry_il
 {
-   .class private auto ansi beforefieldinit Class1
+   .class public auto ansi beforefieldinit Class1
           extends [mscorlib]System.Object
    {
     .field private static class [eh_common]TestUtil.TestLog testLog
@@ -42,10 +42,10 @@
             callvirt   instance void [mscorlib]System.IO.TextWriter::WriteLine(string)
             ldloc.s    expectedOut
             newobj     instance void [eh_common]TestUtil.TestLog::.ctor(object)
-            stsfld     class [eh_common]TestUtil.TestLog strswitch.Class1::testLog
+            stsfld     class [eh_common]TestUtil.TestLog strswitch_catchrettoinnertry_il.Class1::testLog
             ret
     }
-     .method private hidebysig static int32
+     .method public hidebysig static int32
              Main() cil managed
      {
        .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -54,7 +54,7 @@
        .entrypoint
        .maxstack  2
 
-        ldsfld     class [eh_common]TestUtil.TestLog strswitch.Class1::testLog
+        ldsfld     class [eh_common]TestUtil.TestLog strswitch_catchrettoinnertry_il.Class1::testLog
         callvirt   instance void [eh_common]TestUtil.TestLog::StartRecording()
 
        .locals init (int32 V_0,
@@ -104,10 +104,10 @@
            endfinally
        }
        branch_003a:
-        ldsfld     class [eh_common]TestUtil.TestLog strswitch.Class1::testLog
+        ldsfld     class [eh_common]TestUtil.TestLog strswitch_catchrettoinnertry_il.Class1::testLog
         callvirt   instance void [eh_common]TestUtil.TestLog::StopRecording()
 
-        ldsfld     class [eh_common]TestUtil.TestLog strswitch.Class1::testLog
+        ldsfld     class [eh_common]TestUtil.TestLog strswitch_catchrettoinnertry_il.Class1::testLog
         callvirt   instance int32 [eh_common]TestUtil.TestLog::VerifyOutput()
 
          ret
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_d.csproj b/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_d.csproj
index 37128b28596e77..802a5977149a1d 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_d.csproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_do.csproj b/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_do.csproj
index 7c9e6b04e3cf4f..6205bb9ffd2e59 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_do.csproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_r.csproj b/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_r.csproj
index 28d3017ad6554d..04e5374587f7d7 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_r.csproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_ro.csproj b/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_ro.csproj
index 6dc8e5384f3254..6b6b9cd4634915 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry_il_d.ilproj b/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry_il_d.ilproj
index 6d4bce51c373e1..c2bdb01ee41b8a 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry_il_r.ilproj b/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry_il_r.ilproj
index e754c6e68fce12..104df2007c1cb5 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/localgotoinahandler.cs b/src/tests/JIT/Methodical/eh/finallyexec/localgotoinahandler.cs
index f771e6a4779a93..79b9b7998d2aae 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/localgotoinahandler.cs
+++ b/src/tests/JIT/Methodical/eh/finallyexec/localgotoinahandler.cs
@@ -4,8 +4,11 @@
 // local goto in a handler should not cause us to add the goto into the nonlocal handler map
 // 112209
 using System;
+using Xunit;
 
-class Class1
+namespace Test_localgotoinahandler_cs
+{
+public class Class1
 {
     private static TestUtil.TestLog testLog;
 
@@ -24,7 +27,8 @@ static Class1()
         // Create and initialize test log object
         testLog = new TestUtil.TestLog(expectedOut);
     }
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         //Start recording
         testLog.StartRecording();
@@ -69,3 +73,4 @@ public static int Main()
         return testLog.VerifyOutput();
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/localgotoinahandler_d.csproj b/src/tests/JIT/Methodical/eh/finallyexec/localgotoinahandler_d.csproj
index d6811aff2fcbe4..6bf3ccd86052e3 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/localgotoinahandler_d.csproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/localgotoinahandler_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/localgotoinahandler_do.csproj b/src/tests/JIT/Methodical/eh/finallyexec/localgotoinahandler_do.csproj
index 0c01a9a908d51e..0c5eabc14f7742 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/localgotoinahandler_do.csproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/localgotoinahandler_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/localgotoinahandler_r.csproj b/src/tests/JIT/Methodical/eh/finallyexec/localgotoinahandler_r.csproj
index 9fbc2d3fd36e9d..e6cd7ad7a68cab 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/localgotoinahandler_r.csproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/localgotoinahandler_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/localgotoinahandler_ro.csproj b/src/tests/JIT/Methodical/eh/finallyexec/localgotoinahandler_ro.csproj
index ee3b164bac89a2..7382672262e8f3 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/localgotoinahandler_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/localgotoinahandler_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/loopinfinally.cs b/src/tests/JIT/Methodical/eh/finallyexec/loopinfinally.cs
index a57183df8a3db9..3b9be67adc2257 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/loopinfinally.cs
+++ b/src/tests/JIT/Methodical/eh/finallyexec/loopinfinally.cs
@@ -2,8 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-class Class1
+namespace Test_loopinfinally_cs
+{
+public class Class1
 {
     private static TestUtil.TestLog testLog;
 
@@ -23,7 +26,8 @@ static Class1()
         testLog = new TestUtil.TestLog(expectedOut);
     }
 
-    static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         //Start recording
         testLog.StartRecording();
@@ -65,3 +69,4 @@ static int Main()
         return testLog.VerifyOutput();
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/loopinfinally_d.csproj b/src/tests/JIT/Methodical/eh/finallyexec/loopinfinally_d.csproj
index 276ccb0f2aea74..03ed68b549a2c8 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/loopinfinally_d.csproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/loopinfinally_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/loopinfinally_do.csproj b/src/tests/JIT/Methodical/eh/finallyexec/loopinfinally_do.csproj
index cd3823bdc57080..6aaec0b746d469 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/loopinfinally_do.csproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/loopinfinally_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/loopinfinally_r.csproj b/src/tests/JIT/Methodical/eh/finallyexec/loopinfinally_r.csproj
index cd0ca518293707..ef40527f68d330 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/loopinfinally_r.csproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/loopinfinally_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/loopinfinally_ro.csproj b/src/tests/JIT/Methodical/eh/finallyexec/loopinfinally_ro.csproj
index 1ff99cf5e9f60f..dd0413e4ec8975 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/loopinfinally_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/loopinfinally_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/nestedfinallycall_il_d.ilproj b/src/tests/JIT/Methodical/eh/finallyexec/nestedfinallycall_il_d.ilproj
index f4da491f7bee16..f041ce54a91675 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/nestedfinallycall_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/nestedfinallycall_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/nestedfinallycall_il_r.ilproj b/src/tests/JIT/Methodical/eh/finallyexec/nestedfinallycall_il_r.ilproj
index c0a99a1a96a2f1..de7de715c7072a 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/nestedfinallycall_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/nestedfinallycall_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittobeginningoftry.cs b/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittobeginningoftry.cs
index 01d3b631a5337d..ead333c6f090c1 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittobeginningoftry.cs
+++ b/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittobeginningoftry.cs
@@ -4,10 +4,11 @@
 // try/finally embedded in a try catch with a nonlocal exit to the beginning of try block
 // to make sure that we don't execute the finally unnecessarily 
 using System;
+using Xunit;
 
-namespace hello
+namespace hello_nonlocalexittobeginningoftry_finallyexec_cs
 {
-    class Class1
+    public class Class1
     {
         private static TestUtil.TestLog testLog;
 
@@ -27,7 +28,8 @@ static Class1()
             testLog = new TestUtil.TestLog(expectedOut);
         }
 
-        static public int Main()
+        [Fact]
+        static public int TestEntryPoint()
         {
             //Start recording
             testLog.StartRecording();
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittobeginningoftry_d.csproj b/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittobeginningoftry_d.csproj
index 3c70ea279407f1..a84a811be49ed2 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittobeginningoftry_d.csproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittobeginningoftry_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittobeginningoftry_do.csproj b/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittobeginningoftry_do.csproj
index 558ae56be06b25..9409fb0080c6a0 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittobeginningoftry_do.csproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittobeginningoftry_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittobeginningoftry_r.csproj b/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittobeginningoftry_r.csproj
index 6bac894fe1b7ed..aade27e58d7701 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittobeginningoftry_r.csproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittobeginningoftry_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittobeginningoftry_ro.csproj b/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittobeginningoftry_ro.csproj
index ec8527451c2229..01c7dd6aef13a7 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittobeginningoftry_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittobeginningoftry_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling.il b/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling.il
index 16b22c14b97f87..97e8046e18a3b6 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling.il
+++ b/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling.il
@@ -14,9 +14,9 @@
 .assembly extern xunit.core {}
  
  
- .namespace hello
+ .namespace hello_nonlocalexittonestedsibling_finallyexec_il
  {
-   .class private auto ansi beforefieldinit Class1
+   .class public auto ansi beforefieldinit Class1
           extends [mscorlib]System.Object
    {
     .field private static class [eh_common]TestUtil.TestLog testLog
@@ -51,7 +51,7 @@
 
       ldloc.s    expectedOut
       newobj     instance void [eh_common]TestUtil.TestLog::.ctor(object)
-      stsfld     class [eh_common]TestUtil.TestLog hello.Class1::testLog
+      stsfld     class [eh_common]TestUtil.TestLog hello_nonlocalexittonestedsibling_finallyexec_il.Class1::testLog
       ret
     } 
     
@@ -69,7 +69,7 @@
                 class [mscorlib]System.ArithmeticException V_3,
                 string V_4,
                 int32 V_5)
-		ldsfld     class [eh_common]TestUtil.TestLog hello.Class1::testLog
+		ldsfld     class [eh_common]TestUtil.TestLog hello_nonlocalexittonestedsibling_finallyexec_il.Class1::testLog
 		callvirt   instance void [eh_common]TestUtil.TestLog::StartRecording()
 		
         ldc.i4     0x4d2
@@ -192,10 +192,10 @@
  
        branch_00ce:
        
-		ldsfld     class [eh_common]TestUtil.TestLog hello.Class1::testLog
+		ldsfld     class [eh_common]TestUtil.TestLog hello_nonlocalexittonestedsibling_finallyexec_il.Class1::testLog
       	callvirt   instance void [eh_common]TestUtil.TestLog::StopRecording()
       
-      	ldsfld     class [eh_common]TestUtil.TestLog hello.Class1::testLog
+      	ldsfld     class [eh_common]TestUtil.TestLog hello_nonlocalexittonestedsibling_finallyexec_il.Class1::testLog
       	callvirt   instance int32 [eh_common]TestUtil.TestLog::VerifyOutput()
         
          ret
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling_il_d.ilproj b/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling_il_d.ilproj
index 1667e95e3f4af5..0d98ce4535f4bc 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling_il_r.ilproj b/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling_il_r.ilproj
index dc056bd26bddbc..442a97cc8c2ede 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/nonlocalgotoinatryblockinahandler.cs b/src/tests/JIT/Methodical/eh/finallyexec/nonlocalgotoinatryblockinahandler.cs
index b1f597138b9e3b..e3698288cde187 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/nonlocalgotoinatryblockinahandler.cs
+++ b/src/tests/JIT/Methodical/eh/finallyexec/nonlocalgotoinatryblockinahandler.cs
@@ -7,8 +7,9 @@
 // LEAVE with an OPGOTO to the beginning of the cascading CATCHRET chain to unwind the stack...
 
 using System;
+using Xunit;
 
-class simple
+public class simple
 {
     private static TestUtil.TestLog testLog;
 
@@ -26,7 +27,8 @@ static simple()
         // Create and initialize test log object
         testLog = new TestUtil.TestLog(expectedOut);
     }
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         //Start recording
         testLog.StartRecording();
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/nonlocalgotoinatryblockinahandler_d.csproj b/src/tests/JIT/Methodical/eh/finallyexec/nonlocalgotoinatryblockinahandler_d.csproj
index 373edaa8676083..31e4e6f77817cd 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/nonlocalgotoinatryblockinahandler_d.csproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/nonlocalgotoinatryblockinahandler_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/nonlocalgotoinatryblockinahandler_do.csproj b/src/tests/JIT/Methodical/eh/finallyexec/nonlocalgotoinatryblockinahandler_do.csproj
index cd08ecc409ff2e..1990e510fb01b8 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/nonlocalgotoinatryblockinahandler_do.csproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/nonlocalgotoinatryblockinahandler_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/nonlocalgotoinatryblockinahandler_r.csproj b/src/tests/JIT/Methodical/eh/finallyexec/nonlocalgotoinatryblockinahandler_r.csproj
index 8165794d53342c..324e2e2d963834 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/nonlocalgotoinatryblockinahandler_r.csproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/nonlocalgotoinatryblockinahandler_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/nonlocalgotoinatryblockinahandler_ro.csproj b/src/tests/JIT/Methodical/eh/finallyexec/nonlocalgotoinatryblockinahandler_ro.csproj
index 860ab117fe4bfd..d895f05d2184a5 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/nonlocalgotoinatryblockinahandler_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/nonlocalgotoinatryblockinahandler_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/simplenonlocalexit.cs b/src/tests/JIT/Methodical/eh/finallyexec/simplenonlocalexit.cs
index 76e0747a2359e0..5fa901819ab348 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/simplenonlocalexit.cs
+++ b/src/tests/JIT/Methodical/eh/finallyexec/simplenonlocalexit.cs
@@ -3,10 +3,11 @@
 
 // try/finally embedded in a try catch with a nonlocal exit 
 using System;
+using Xunit;
 
-namespace hello
+namespace hello_simplenonlocalexit_finallyexec_cs
 {
-    class Class1
+    public class Class1
     {
         private static TestUtil.TestLog testLog;
 
@@ -23,7 +24,8 @@ static Class1()
             testLog = new TestUtil.TestLog(expectedOut);
         }
 
-        static public int Main()
+        [Fact]
+        static public int TestEntryPoint()
         {
             //Start recording
             testLog.StartRecording();
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/simplenonlocalexit_d.csproj b/src/tests/JIT/Methodical/eh/finallyexec/simplenonlocalexit_d.csproj
index 3460e93d3c7d70..e6ef3322a887c5 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/simplenonlocalexit_d.csproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/simplenonlocalexit_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/simplenonlocalexit_do.csproj b/src/tests/JIT/Methodical/eh/finallyexec/simplenonlocalexit_do.csproj
index fc6f1501d0d43c..01bcb81e0a94b8 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/simplenonlocalexit_do.csproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/simplenonlocalexit_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/simplenonlocalexit_r.csproj b/src/tests/JIT/Methodical/eh/finallyexec/simplenonlocalexit_r.csproj
index d705a59ba45b20..f5f4ecb4862a4b 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/simplenonlocalexit_r.csproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/simplenonlocalexit_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/simplenonlocalexit_ro.csproj b/src/tests/JIT/Methodical/eh/finallyexec/simplenonlocalexit_ro.csproj
index a9a52d25985a52..516e213e3bbc42 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/simplenonlocalexit_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/simplenonlocalexit_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/simplenonlocalexitnestedintrycatch.cs b/src/tests/JIT/Methodical/eh/finallyexec/simplenonlocalexitnestedintrycatch.cs
index e29140426b36ee..e4ef850f47d44d 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/simplenonlocalexitnestedintrycatch.cs
+++ b/src/tests/JIT/Methodical/eh/finallyexec/simplenonlocalexitnestedintrycatch.cs
@@ -3,10 +3,11 @@
 
 // try/finally embedded in a try catch with a nonlocal exit 
 using System;
+using Xunit;
 
-namespace hello
+namespace hello_simplenonlocalexitnestedintrycatch_finallyexec_cs
 {
-    class Class1
+    public class Class1
     {
         private static TestUtil.TestLog testLog;
         static Class1()
@@ -22,7 +23,8 @@ static Class1()
             testLog = new TestUtil.TestLog(expectedOut);
         }
 
-        static public int Main()
+        [Fact]
+        static public int TestEntryPoint()
         {
             //Start recording
             testLog.StartRecording();
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/simplenonlocalexitnestedintrycatch_d.csproj b/src/tests/JIT/Methodical/eh/finallyexec/simplenonlocalexitnestedintrycatch_d.csproj
index f2adc6361d7472..e97676784d3a1a 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/simplenonlocalexitnestedintrycatch_d.csproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/simplenonlocalexitnestedintrycatch_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/simplenonlocalexitnestedintrycatch_do.csproj b/src/tests/JIT/Methodical/eh/finallyexec/simplenonlocalexitnestedintrycatch_do.csproj
index c4f3e524a13e13..2c7e95cf5b9add 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/simplenonlocalexitnestedintrycatch_do.csproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/simplenonlocalexitnestedintrycatch_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/simplenonlocalexitnestedintrycatch_r.csproj b/src/tests/JIT/Methodical/eh/finallyexec/simplenonlocalexitnestedintrycatch_r.csproj
index 64a5a98d38259d..375bd29c4aa077 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/simplenonlocalexitnestedintrycatch_r.csproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/simplenonlocalexitnestedintrycatch_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/simplenonlocalexitnestedintrycatch_ro.csproj b/src/tests/JIT/Methodical/eh/finallyexec/simplenonlocalexitnestedintrycatch_ro.csproj
index 8197cf0f84c7a1..be3ce2a5be5b37 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/simplenonlocalexitnestedintrycatch_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/simplenonlocalexitnestedintrycatch_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/switchincatch.cs b/src/tests/JIT/Methodical/eh/finallyexec/switchincatch.cs
index ef63bac33f6ae6..894306a90f8dbc 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/switchincatch.cs
+++ b/src/tests/JIT/Methodical/eh/finallyexec/switchincatch.cs
@@ -4,13 +4,14 @@
 // switch in catch 
 
 using System;
+using Xunit;
 
-namespace strswitch
+namespace strswitch_switchincatch_cs
 {
     /// <summary>
     /// Summary description for Class1.
     /// </summary>
-    class Class1
+    public class Class1
     {
         private static TestUtil.TestLog testLog;
 
@@ -40,7 +41,8 @@ static Class1()
         /// <summary>
         /// The main entry point for the application.
         /// </summary>
-        static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             string[] s = { "one", "two", "three", "four", "five", "six" };
             //Start recording
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/switchincatch_d.csproj b/src/tests/JIT/Methodical/eh/finallyexec/switchincatch_d.csproj
index 97a2bde07f7df2..e03fe144ab8d3f 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/switchincatch_d.csproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/switchincatch_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/switchincatch_do.csproj b/src/tests/JIT/Methodical/eh/finallyexec/switchincatch_do.csproj
index 9d03e7f27961e2..2e73f476388af5 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/switchincatch_do.csproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/switchincatch_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/switchincatch_r.csproj b/src/tests/JIT/Methodical/eh/finallyexec/switchincatch_r.csproj
index f2b9084ae33075..254410a30920fd 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/switchincatch_r.csproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/switchincatch_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/switchincatch_ro.csproj b/src/tests/JIT/Methodical/eh/finallyexec/switchincatch_ro.csproj
index 1f5a01c8a2185a..b2a47d2588e646 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/switchincatch_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/switchincatch_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit1.cs b/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit1.cs
index d46a617d6881d8..cc6065f4785189 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit1.cs
+++ b/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit1.cs
@@ -2,8 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-class Class1
+namespace Test_tryCatchFinallyThrow_nonlocalexit1_cs
+{
+public class Class1
 {
     private static TestUtil.TestLog testLog;
 
@@ -43,7 +46,8 @@ static public void Middle1(int i)
         Console.WriteLine("middle1 L1");
     }
 
-    static public int Main()
+    [Fact]
+    static public int TestEntryPoint()
     {
         // start recording
         testLog.StartRecording();
@@ -65,3 +69,4 @@ static public int Main()
         return testLog.VerifyOutput();
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit1_d.csproj b/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit1_d.csproj
index 48eb77fa370ee8..dc5ac7aeb79a30 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit1_d.csproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit1_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit1_do.csproj b/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit1_do.csproj
index b6002d36bcc2db..b8af8f6e80e42b 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit1_do.csproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit1_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit1_r.csproj b/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit1_r.csproj
index ffb340f1245d37..d89521aee0f664 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit1_r.csproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit1_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit1_ro.csproj b/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit1_ro.csproj
index c8f6b707db3aa0..1cab52abfaac2f 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit1_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit1_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit2.cs b/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit2.cs
index 93d2d48d39a175..e1982fd9ec81c5 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit2.cs
+++ b/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit2.cs
@@ -2,8 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-class Class1
+namespace Test_tryCatchFinallyThrow_nonlocalexit2_cs
+{
+public class Class1
 {
     private static TestUtil.TestLog testLog;
 
@@ -68,7 +71,8 @@ static public void Middle2(int i)
         Console.WriteLine("middle2 L2");
     }
 
-    static public int Main()
+    [Fact]
+    static public int TestEntryPoint()
     {
         // start recording
         testLog.StartRecording();
@@ -94,3 +98,4 @@ static public int Main()
         return testLog.VerifyOutput();
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit2_d.csproj b/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit2_d.csproj
index 5ea02ce470d381..f1063b0379aeb6 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit2_d.csproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit2_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit2_do.csproj b/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit2_do.csproj
index aad9e95ab2e42d..55be758d423e56 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit2_do.csproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit2_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit2_r.csproj b/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit2_r.csproj
index 14696db66e2651..e71e2225043bd8 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit2_r.csproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit2_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit2_ro.csproj b/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit2_ro.csproj
index 6c5c4643e81438..d1e3cf0918fe10 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit2_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit2_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit3.cs b/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit3.cs
index 5ef9a2e00a70d8..77c89c97e80ed0 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit3.cs
+++ b/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit3.cs
@@ -2,8 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-class Class1
+namespace Test_tryCatchFinallyThrow_nonlocalexit3_cs
+{
+public class Class1
 {
     private static TestUtil.TestLog testLog;
 
@@ -84,7 +87,8 @@ static public void Middle2(int i)
         Console.WriteLine("    in middle2 L2B");
     }
 
-    static public int Main()
+    [Fact]
+    static public int TestEntryPoint()
     {
         // start recording
         testLog.StartRecording();
@@ -110,3 +114,4 @@ static public int Main()
         return testLog.VerifyOutput();
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit3_d.csproj b/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit3_d.csproj
index c0b923bb12cdbc..dd35a29f26dd5b 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit3_d.csproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit3_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit3_do.csproj b/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit3_do.csproj
index a86946974a8474..ebb1dae69e2508 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit3_do.csproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit3_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit3_r.csproj b/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit3_r.csproj
index de41134201400f..7c0ae289a1564c 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit3_r.csproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit3_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit3_ro.csproj b/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit3_ro.csproj
index c9ed59aa8cdc7f..e794afeeadff42 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit3_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit3_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit4.cs b/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit4.cs
index 6b7b2f5f14cdd1..0534c69bc6ad6e 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit4.cs
+++ b/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit4.cs
@@ -2,8 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-class Class1
+namespace Test_tryCatchFinallyThrow_nonlocalexit4_cs
+{
+public class Class1
 {
     private static TestUtil.TestLog testLog;
 
@@ -60,7 +63,8 @@ static public void foo(int i)
     }
 
 
-    static public int Main()
+    [Fact]
+    static public int TestEntryPoint()
     {
         // start recording
         testLog.StartRecording();
@@ -82,3 +86,4 @@ static public int Main()
         return testLog.VerifyOutput();
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit4_d.csproj b/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit4_d.csproj
index dffec8e6288c4e..dc0c8c703339dd 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit4_d.csproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit4_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit4_do.csproj b/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit4_do.csproj
index 157253a86ef169..36aca48eebc2ac 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit4_do.csproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit4_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit4_r.csproj b/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit4_r.csproj
index b90cd2085c6b2f..0e319ed1495763 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit4_r.csproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit4_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit4_ro.csproj b/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit4_ro.csproj
index 0cdeb3ed205b95..c1b1099b4ebb14 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit4_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit4_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/tryfinallythrow_nonlocalexit.cs b/src/tests/JIT/Methodical/eh/finallyexec/tryfinallythrow_nonlocalexit.cs
index 3e26c2428ecab8..34836f8e6ccfe0 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/tryfinallythrow_nonlocalexit.cs
+++ b/src/tests/JIT/Methodical/eh/finallyexec/tryfinallythrow_nonlocalexit.cs
@@ -12,10 +12,11 @@ done outside of trybody
     }
 */
 using System;
+using Xunit;
 
-namespace hello
+namespace hello_tryfinallythrow_nonlocalexit_finallyexec_cs
 {
-    class Class1
+    public class Class1
     {
 
         private static TestUtil.TestLog testLog;
@@ -53,7 +54,8 @@ static public void Middle(int i)
 
         }
 
-        static public int Main()
+        [Fact]
+        static public int TestEntryPoint()
         {
             //Start recording
             testLog.StartRecording();
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/tryfinallythrow_nonlocalexit_d.csproj b/src/tests/JIT/Methodical/eh/finallyexec/tryfinallythrow_nonlocalexit_d.csproj
index b3fed6c4ce20aa..3fbb7597d67136 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/tryfinallythrow_nonlocalexit_d.csproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/tryfinallythrow_nonlocalexit_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/tryfinallythrow_nonlocalexit_do.csproj b/src/tests/JIT/Methodical/eh/finallyexec/tryfinallythrow_nonlocalexit_do.csproj
index 98be0b378e0daa..686daca2345235 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/tryfinallythrow_nonlocalexit_do.csproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/tryfinallythrow_nonlocalexit_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/tryfinallythrow_nonlocalexit_r.csproj b/src/tests/JIT/Methodical/eh/finallyexec/tryfinallythrow_nonlocalexit_r.csproj
index 077db4c280c48f..c0f535dcf80d01 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/tryfinallythrow_nonlocalexit_r.csproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/tryfinallythrow_nonlocalexit_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/tryfinallythrow_nonlocalexit_ro.csproj b/src/tests/JIT/Methodical/eh/finallyexec/tryfinallythrow_nonlocalexit_ro.csproj
index 8c87dde4db4adb..0b120d97b11881 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/tryfinallythrow_nonlocalexit_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/finallyexec/tryfinallythrow_nonlocalexit_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/generics/throwincatch.cs b/src/tests/JIT/Methodical/eh/generics/throwincatch.cs
index cffe48762e4d0a..3eb62002f6cb3c 100644
--- a/src/tests/JIT/Methodical/eh/generics/throwincatch.cs
+++ b/src/tests/JIT/Methodical/eh/generics/throwincatch.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.IO;
+using Xunit;
 
 
 public class GenException<T> : Exception
@@ -76,7 +77,8 @@ static Test_throwincatch()
 
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         //Start recording
         testLog.StartRecording();
diff --git a/src/tests/JIT/Methodical/eh/generics/throwincatch_generics_d.csproj b/src/tests/JIT/Methodical/eh/generics/throwincatch_generics_d.csproj
index 8b69adfc97a48b..7a946d40544272 100644
--- a/src/tests/JIT/Methodical/eh/generics/throwincatch_generics_d.csproj
+++ b/src/tests/JIT/Methodical/eh/generics/throwincatch_generics_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/generics/throwincatch_generics_do.csproj b/src/tests/JIT/Methodical/eh/generics/throwincatch_generics_do.csproj
index faf0d00b1742b8..a654a1c98e0d22 100644
--- a/src/tests/JIT/Methodical/eh/generics/throwincatch_generics_do.csproj
+++ b/src/tests/JIT/Methodical/eh/generics/throwincatch_generics_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/generics/throwincatch_generics_r.csproj b/src/tests/JIT/Methodical/eh/generics/throwincatch_generics_r.csproj
index 7adfebc17a6739..16d6b53b3d65af 100644
--- a/src/tests/JIT/Methodical/eh/generics/throwincatch_generics_r.csproj
+++ b/src/tests/JIT/Methodical/eh/generics/throwincatch_generics_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/generics/throwincatch_generics_ro.csproj b/src/tests/JIT/Methodical/eh/generics/throwincatch_generics_ro.csproj
index 4e9ccaade291e4..ef4a4a278f242c 100644
--- a/src/tests/JIT/Methodical/eh/generics/throwincatch_generics_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/generics/throwincatch_generics_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/generics/trycatchnestedtype.cs b/src/tests/JIT/Methodical/eh/generics/trycatchnestedtype.cs
index 6f46178a4390f6..a43af3246e44d1 100644
--- a/src/tests/JIT/Methodical/eh/generics/trycatchnestedtype.cs
+++ b/src/tests/JIT/Methodical/eh/generics/trycatchnestedtype.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.IO;
+using Xunit;
 
 
 public class GenException<T> : Exception
@@ -65,7 +66,8 @@ static Test_trycatchnestedtype()
 
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         //Start recording
         testLog.StartRecording();
diff --git a/src/tests/JIT/Methodical/eh/generics/trycatchnestedtype_d.csproj b/src/tests/JIT/Methodical/eh/generics/trycatchnestedtype_d.csproj
index c38fe96a3d1551..c9328c48b6d8c6 100644
--- a/src/tests/JIT/Methodical/eh/generics/trycatchnestedtype_d.csproj
+++ b/src/tests/JIT/Methodical/eh/generics/trycatchnestedtype_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/generics/trycatchnestedtype_do.csproj b/src/tests/JIT/Methodical/eh/generics/trycatchnestedtype_do.csproj
index ad254f3632ac2c..bbe6869b327c83 100644
--- a/src/tests/JIT/Methodical/eh/generics/trycatchnestedtype_do.csproj
+++ b/src/tests/JIT/Methodical/eh/generics/trycatchnestedtype_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/generics/trycatchnestedtype_r.csproj b/src/tests/JIT/Methodical/eh/generics/trycatchnestedtype_r.csproj
index da91f8f4cf8467..cb484c0dedc46c 100644
--- a/src/tests/JIT/Methodical/eh/generics/trycatchnestedtype_r.csproj
+++ b/src/tests/JIT/Methodical/eh/generics/trycatchnestedtype_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/generics/trycatchnestedtype_ro.csproj b/src/tests/JIT/Methodical/eh/generics/trycatchnestedtype_ro.csproj
index 6791d30ce250db..ce8304c4b31e83 100644
--- a/src/tests/JIT/Methodical/eh/generics/trycatchnestedtype_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/generics/trycatchnestedtype_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/generics/trycatchsimpletype.cs b/src/tests/JIT/Methodical/eh/generics/trycatchsimpletype.cs
index c6a2e078d8af2e..a6cf237311bf69 100644
--- a/src/tests/JIT/Methodical/eh/generics/trycatchsimpletype.cs
+++ b/src/tests/JIT/Methodical/eh/generics/trycatchsimpletype.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.IO;
+using Xunit;
 
 
 public class GenException<T> : Exception
@@ -60,7 +61,8 @@ static Test_trycatchsimpletype()
 
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         //Start recording
         testLog.StartRecording();
diff --git a/src/tests/JIT/Methodical/eh/generics/trycatchsimpletype_d.csproj b/src/tests/JIT/Methodical/eh/generics/trycatchsimpletype_d.csproj
index 4cb75702da026c..b8a1a960a2f006 100644
--- a/src/tests/JIT/Methodical/eh/generics/trycatchsimpletype_d.csproj
+++ b/src/tests/JIT/Methodical/eh/generics/trycatchsimpletype_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/generics/trycatchsimpletype_do.csproj b/src/tests/JIT/Methodical/eh/generics/trycatchsimpletype_do.csproj
index 70c9a023e90c2b..451dceb610e222 100644
--- a/src/tests/JIT/Methodical/eh/generics/trycatchsimpletype_do.csproj
+++ b/src/tests/JIT/Methodical/eh/generics/trycatchsimpletype_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/generics/trycatchsimpletype_r.csproj b/src/tests/JIT/Methodical/eh/generics/trycatchsimpletype_r.csproj
index e4a96aaace2c74..200c6059d86e16 100644
--- a/src/tests/JIT/Methodical/eh/generics/trycatchsimpletype_r.csproj
+++ b/src/tests/JIT/Methodical/eh/generics/trycatchsimpletype_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/generics/trycatchsimpletype_ro.csproj b/src/tests/JIT/Methodical/eh/generics/trycatchsimpletype_ro.csproj
index 4febc6189f67fa..4354935f2ea9b5 100644
--- a/src/tests/JIT/Methodical/eh/generics/trycatchsimpletype_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/generics/trycatchsimpletype_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/interactions/ehSO.cs b/src/tests/JIT/Methodical/eh/interactions/ehSO.cs
index 4a33ab6ca1722e..3e096addbeeda7 100644
--- a/src/tests/JIT/Methodical/eh/interactions/ehSO.cs
+++ b/src/tests/JIT/Methodical/eh/interactions/ehSO.cs
@@ -1,4 +1,5 @@
 // Licensed to the .NET Foundation under one or more agreements.
+using Xunit;
 // The .NET Foundation licenses this file to you under the MIT license.
 
 /*
@@ -29,7 +30,8 @@ public Form1()
         }
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         Form1 f = new Form1();
         return 100;
diff --git a/src/tests/JIT/Methodical/eh/interactions/ehso.csproj b/src/tests/JIT/Methodical/eh/interactions/ehso.csproj
index 53d9afa697b16f..89cc59c51bd7c2 100644
--- a/src/tests/JIT/Methodical/eh/interactions/ehso.csproj
+++ b/src/tests/JIT/Methodical/eh/interactions/ehso.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/interactions/gcincatch.cs b/src/tests/JIT/Methodical/eh/interactions/gcincatch.cs
index 152bfe23dfdd1d..85407bbaba2983 100644
--- a/src/tests/JIT/Methodical/eh/interactions/gcincatch.cs
+++ b/src/tests/JIT/Methodical/eh/interactions/gcincatch.cs
@@ -4,13 +4,14 @@
 // GC.Collect in a handler might corrupt values in gc heap if gcinfo is not correct
 
 using System;
+using Xunit;
 
 namespace test2
 {
     /// <summary>
     /// Summary description for Class1.
     /// </summary>
-    class Class1
+    public class Class1
     {
         private static TestUtil.TestLog testLog;
 
@@ -40,7 +41,8 @@ static Class1()
         /// <summary>
         /// The main entry point for the application.
         /// </summary>
-        public static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             int[] ar = new int[] { 1, 2, 3, 4, 5 };
 
diff --git a/src/tests/JIT/Methodical/eh/interactions/gcincatch_d.csproj b/src/tests/JIT/Methodical/eh/interactions/gcincatch_d.csproj
index 69f6f4f21ceec9..eb12a99f1fc670 100644
--- a/src/tests/JIT/Methodical/eh/interactions/gcincatch_d.csproj
+++ b/src/tests/JIT/Methodical/eh/interactions/gcincatch_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/interactions/gcincatch_do.csproj b/src/tests/JIT/Methodical/eh/interactions/gcincatch_do.csproj
index 50f9580550fb96..fe9bdfae353937 100644
--- a/src/tests/JIT/Methodical/eh/interactions/gcincatch_do.csproj
+++ b/src/tests/JIT/Methodical/eh/interactions/gcincatch_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/interactions/gcincatch_r.csproj b/src/tests/JIT/Methodical/eh/interactions/gcincatch_r.csproj
index 7dccaecc1f78df..e7c1423a76f65d 100644
--- a/src/tests/JIT/Methodical/eh/interactions/gcincatch_r.csproj
+++ b/src/tests/JIT/Methodical/eh/interactions/gcincatch_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/interactions/gcincatch_ro.csproj b/src/tests/JIT/Methodical/eh/interactions/gcincatch_ro.csproj
index fd75a0e92b13aa..8b06b2107cab5f 100644
--- a/src/tests/JIT/Methodical/eh/interactions/gcincatch_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/interactions/gcincatch_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/interactions/rangecheckinfinally.cs b/src/tests/JIT/Methodical/eh/interactions/rangecheckinfinally.cs
index 7e8be151ff474e..aadeb7ef2ec5e0 100644
--- a/src/tests/JIT/Methodical/eh/interactions/rangecheckinfinally.cs
+++ b/src/tests/JIT/Methodical/eh/interactions/rangecheckinfinally.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace hello
+namespace hello_rangecheckinfinally_interactions_cs
 {
-    class Class1
+    public class Class1
     {
         private static TestUtil.TestLog testLog;
 
@@ -22,7 +23,8 @@ static Class1()
             // Create and initialize test log object
             testLog = new TestUtil.TestLog(expectedOut);
         }
-        static public int Main()
+        [Fact]
+        static public int TestEntryPoint()
         {
             int[] a;
             //Start recording
diff --git a/src/tests/JIT/Methodical/eh/interactions/rangecheckinfinally_d.csproj b/src/tests/JIT/Methodical/eh/interactions/rangecheckinfinally_d.csproj
index fb65118a0a8970..75343d6c2442a4 100644
--- a/src/tests/JIT/Methodical/eh/interactions/rangecheckinfinally_d.csproj
+++ b/src/tests/JIT/Methodical/eh/interactions/rangecheckinfinally_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/interactions/rangecheckinfinally_do.csproj b/src/tests/JIT/Methodical/eh/interactions/rangecheckinfinally_do.csproj
index 419ed339ea5509..b5812ac85e8599 100644
--- a/src/tests/JIT/Methodical/eh/interactions/rangecheckinfinally_do.csproj
+++ b/src/tests/JIT/Methodical/eh/interactions/rangecheckinfinally_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/interactions/rangecheckinfinally_r.csproj b/src/tests/JIT/Methodical/eh/interactions/rangecheckinfinally_r.csproj
index cb20910703c696..ecddeaa61ad707 100644
--- a/src/tests/JIT/Methodical/eh/interactions/rangecheckinfinally_r.csproj
+++ b/src/tests/JIT/Methodical/eh/interactions/rangecheckinfinally_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/interactions/rangecheckinfinally_ro.csproj b/src/tests/JIT/Methodical/eh/interactions/rangecheckinfinally_ro.csproj
index 4fa95a8abb3c1e..7766e1dda3f0e1 100644
--- a/src/tests/JIT/Methodical/eh/interactions/rangecheckinfinally_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/interactions/rangecheckinfinally_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/interactions/strswitchfinal.cs b/src/tests/JIT/Methodical/eh/interactions/strswitchfinal.cs
index e8f70274934461..d2dc51b5aa1249 100644
--- a/src/tests/JIT/Methodical/eh/interactions/strswitchfinal.cs
+++ b/src/tests/JIT/Methodical/eh/interactions/strswitchfinal.cs
@@ -4,10 +4,11 @@
 /* switch with string values contained in a loop with various try/catch and try/finally constructs */
 
 using System;
+using Xunit;
 
-namespace strswitch
+namespace strswitch_strswitchfinal_cs
 {
-    internal class Class1
+    public class Class1
     {
         private static TestUtil.TestLog s_testLog;
 
@@ -54,7 +55,8 @@ static Class1()
             s_testLog = new TestUtil.TestLog(expectedOut);
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             string[] s = { "one", "two", "three", "four", "five", "six" };
             s_testLog.StartRecording();
diff --git a/src/tests/JIT/Methodical/eh/interactions/strswitchfinal_d.csproj b/src/tests/JIT/Methodical/eh/interactions/strswitchfinal_d.csproj
index 09faff138877e2..218db32ece71f3 100644
--- a/src/tests/JIT/Methodical/eh/interactions/strswitchfinal_d.csproj
+++ b/src/tests/JIT/Methodical/eh/interactions/strswitchfinal_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
diff --git a/src/tests/JIT/Methodical/eh/interactions/strswitchfinal_do.csproj b/src/tests/JIT/Methodical/eh/interactions/strswitchfinal_do.csproj
index 6a020c1519bc06..797eb24aa82d67 100644
--- a/src/tests/JIT/Methodical/eh/interactions/strswitchfinal_do.csproj
+++ b/src/tests/JIT/Methodical/eh/interactions/strswitchfinal_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
diff --git a/src/tests/JIT/Methodical/eh/interactions/strswitchfinal_r.csproj b/src/tests/JIT/Methodical/eh/interactions/strswitchfinal_r.csproj
index 00aa580cabfb16..37af775826d42c 100644
--- a/src/tests/JIT/Methodical/eh/interactions/strswitchfinal_r.csproj
+++ b/src/tests/JIT/Methodical/eh/interactions/strswitchfinal_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
diff --git a/src/tests/JIT/Methodical/eh/interactions/strswitchfinal_ro.csproj b/src/tests/JIT/Methodical/eh/interactions/strswitchfinal_ro.csproj
index a4b05658e5ec38..1a46ccd74ade7f 100644
--- a/src/tests/JIT/Methodical/eh/interactions/strswitchfinal_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/interactions/strswitchfinal_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
diff --git a/src/tests/JIT/Methodical/eh/interactions/switchinfinally.cs b/src/tests/JIT/Methodical/eh/interactions/switchinfinally.cs
index 33a551c68d1627..7dce04e5e7536a 100644
--- a/src/tests/JIT/Methodical/eh/interactions/switchinfinally.cs
+++ b/src/tests/JIT/Methodical/eh/interactions/switchinfinally.cs
@@ -4,6 +4,7 @@
 // switch statement in a finally 
 
 using System;
+using Xunit;
 
 namespace test3
 {
@@ -61,7 +62,7 @@ public void testit(int i)
     /// <summary>
     /// Summary description for Class1.
     /// </summary>
-    class Class1
+    public class Class1
     {
         private static TestUtil.TestLog testLog;
 
@@ -85,7 +86,8 @@ static Class1()
         /// <summary>
         /// The main entry point for the application.
         /// </summary>
-        static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             //Start recording
             testLog.StartRecording();
diff --git a/src/tests/JIT/Methodical/eh/interactions/switchinfinally_d.csproj b/src/tests/JIT/Methodical/eh/interactions/switchinfinally_d.csproj
index 9495fe4601cd50..9054ee0e709beb 100644
--- a/src/tests/JIT/Methodical/eh/interactions/switchinfinally_d.csproj
+++ b/src/tests/JIT/Methodical/eh/interactions/switchinfinally_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/interactions/switchinfinally_do.csproj b/src/tests/JIT/Methodical/eh/interactions/switchinfinally_do.csproj
index f22a1ab0544c60..63d6d8a981729d 100644
--- a/src/tests/JIT/Methodical/eh/interactions/switchinfinally_do.csproj
+++ b/src/tests/JIT/Methodical/eh/interactions/switchinfinally_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/interactions/switchinfinally_r.csproj b/src/tests/JIT/Methodical/eh/interactions/switchinfinally_r.csproj
index cff3b88e13b7a6..3748824984ab72 100644
--- a/src/tests/JIT/Methodical/eh/interactions/switchinfinally_r.csproj
+++ b/src/tests/JIT/Methodical/eh/interactions/switchinfinally_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/interactions/switchinfinally_ro.csproj b/src/tests/JIT/Methodical/eh/interactions/switchinfinally_ro.csproj
index 70ee8c9e3bb010..40b179bc907d23 100644
--- a/src/tests/JIT/Methodical/eh/interactions/switchinfinally_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/interactions/switchinfinally_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/interactions/throw1dimarray.il b/src/tests/JIT/Methodical/eh/interactions/throw1dimarray.il
index a23066d7d4e61c..c2f2493617d8cf 100644
--- a/src/tests/JIT/Methodical/eh/interactions/throw1dimarray.il
+++ b/src/tests/JIT/Methodical/eh/interactions/throw1dimarray.il
@@ -36,7 +36,9 @@
 
 
 
-.class private auto ansi beforefieldinit App
+.namespace Test_throw1dimarray
+{
+.class public auto ansi beforefieldinit App
        extends [mscorlib]System.Object
 {
   .method public hidebysig static int32  Main() cil managed
@@ -302,3 +304,4 @@
   } 
 
 } 
+}
diff --git a/src/tests/JIT/Methodical/eh/interactions/throw1dimarray_il_d.ilproj b/src/tests/JIT/Methodical/eh/interactions/throw1dimarray_il_d.ilproj
index 74353312cd448f..bc7ebcc09251ae 100644
--- a/src/tests/JIT/Methodical/eh/interactions/throw1dimarray_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/interactions/throw1dimarray_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/interactions/throw1dimarray_il_r.ilproj b/src/tests/JIT/Methodical/eh/interactions/throw1dimarray_il_r.ilproj
index ee6a87566fcbd4..c4540ed797d777 100644
--- a/src/tests/JIT/Methodical/eh/interactions/throw1dimarray_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/interactions/throw1dimarray_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/interactions/throw2dimarray.il b/src/tests/JIT/Methodical/eh/interactions/throw2dimarray.il
index 580cfe6f6565e8..9a1d306739ade8 100644
--- a/src/tests/JIT/Methodical/eh/interactions/throw2dimarray.il
+++ b/src/tests/JIT/Methodical/eh/interactions/throw2dimarray.il
@@ -35,7 +35,9 @@
 
 
 
-.class private auto ansi beforefieldinit App
+.namespace Test_throw2dimarray
+{
+.class public auto ansi beforefieldinit App
        extends [mscorlib]System.Object
 {
   .method public hidebysig static int32  Main() cil managed
@@ -408,3 +410,4 @@
   } 
 
 } 
+}
diff --git a/src/tests/JIT/Methodical/eh/interactions/throw2dimarray_il_d.ilproj b/src/tests/JIT/Methodical/eh/interactions/throw2dimarray_il_d.ilproj
index f6497cf229b027..9f6901323105da 100644
--- a/src/tests/JIT/Methodical/eh/interactions/throw2dimarray_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/interactions/throw2dimarray_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/interactions/throw2dimarray_il_r.ilproj b/src/tests/JIT/Methodical/eh/interactions/throw2dimarray_il_r.ilproj
index 9c0c939ed05e50..1026a97ea7e302 100644
--- a/src/tests/JIT/Methodical/eh/interactions/throw2dimarray_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/interactions/throw2dimarray_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/interactions/volatileFromFinally.cs b/src/tests/JIT/Methodical/eh/interactions/volatileFromFinally.cs
index b20a51f7151c62..e4316f97e0732c 100644
--- a/src/tests/JIT/Methodical/eh/interactions/volatileFromFinally.cs
+++ b/src/tests/JIT/Methodical/eh/interactions/volatileFromFinally.cs
@@ -16,8 +16,11 @@ Process is terminated due to StackOverflowException.
 
 using System;
 using System.IO;
+using Xunit;
 
-internal class Test
+namespace Test_volatileFromFinally
+{
+public class Test
 {
     private static volatile bool s_someField = false;
 
@@ -37,7 +40,8 @@ private static void Crash()
         }
     }
 
-    private static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         //Console.WriteLine("64 bit = {0}", Environment.Is64BitProcess);
 
@@ -48,3 +52,4 @@ private static int Main()
     }
 }
 
+}
diff --git a/src/tests/JIT/Methodical/eh/interactions/volatilefromfinally.csproj b/src/tests/JIT/Methodical/eh/interactions/volatilefromfinally.csproj
index 5dd5c31018b186..2f8cce3c974c2c 100644
--- a/src/tests/JIT/Methodical/eh/interactions/volatilefromfinally.csproj
+++ b/src/tests/JIT/Methodical/eh/interactions/volatilefromfinally.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/leaves/2branchesoutoftry.il b/src/tests/JIT/Methodical/eh/leaves/2branchesoutoftry.il
index 25cd53f9527563..676ef7ebba0580 100644
--- a/src/tests/JIT/Methodical/eh/leaves/2branchesoutoftry.il
+++ b/src/tests/JIT/Methodical/eh/leaves/2branchesoutoftry.il
@@ -32,9 +32,9 @@
 
 
 
-.namespace hello
+.namespace hello_2branchesoutoftry_leaves_il
 {
-  .class private auto ansi beforefieldinit Class1
+  .class public auto ansi beforefieldinit Class1
          extends [mscorlib]System.Object
   {
     .method public hidebysig static int32 
diff --git a/src/tests/JIT/Methodical/eh/leaves/2branchesoutoftry_il_d.ilproj b/src/tests/JIT/Methodical/eh/leaves/2branchesoutoftry_il_d.ilproj
index ef70c4396c2fd3..77377afceee8aa 100644
--- a/src/tests/JIT/Methodical/eh/leaves/2branchesoutoftry_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/leaves/2branchesoutoftry_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/leaves/2branchesoutoftry_il_r.ilproj b/src/tests/JIT/Methodical/eh/leaves/2branchesoutoftry_il_r.ilproj
index c63878f8754e6a..503d693fed4185 100644
--- a/src/tests/JIT/Methodical/eh/leaves/2branchesoutoftry_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/leaves/2branchesoutoftry_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/leaves/backwardleaveincatch.il b/src/tests/JIT/Methodical/eh/leaves/backwardleaveincatch.il
index 0083d08b13c3d2..70ce8168d15da8 100644
--- a/src/tests/JIT/Methodical/eh/leaves/backwardleaveincatch.il
+++ b/src/tests/JIT/Methodical/eh/leaves/backwardleaveincatch.il
@@ -32,9 +32,9 @@
 
 
 
-.namespace hello
+.namespace hello_backwardleaveincatch_leaves_il
 {
-  .class private auto ansi beforefieldinit Class1
+  .class public auto ansi beforefieldinit Class1
          extends [mscorlib]System.Object
   {
     .method public hidebysig static void 
@@ -127,10 +127,10 @@
 
       .try
       {
-        call       void hello.Class1::inTry()
+        call       void hello_backwardleaveincatch_leaves_il.Class1::inTry()
         .try
         {
-          call       void hello.Class1::inTry2()
+          call       void hello_backwardleaveincatch_leaves_il.Class1::inTry2()
           ldc.i4.1
           stloc.0
           newobj     instance void [mscorlib]System.Exception::.ctor()
@@ -140,14 +140,14 @@
         }  
         catch [mscorlib]System.Exception
         {
-          call       void hello.Class1::inCatch()
+          call       void hello_backwardleaveincatch_leaves_il.Class1::inCatch()
           leave.s before
         }  
 
       }  
       finally
       {
-        call       void hello.Class1::inFinally()
+        call       void hello_backwardleaveincatch_leaves_il.Class1::inFinally()
         endfinally
       }  
     done: 
diff --git a/src/tests/JIT/Methodical/eh/leaves/backwardleaveincatch_il_d.ilproj b/src/tests/JIT/Methodical/eh/leaves/backwardleaveincatch_il_d.ilproj
index 94a31dd3897112..908d7e96dec070 100644
--- a/src/tests/JIT/Methodical/eh/leaves/backwardleaveincatch_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/leaves/backwardleaveincatch_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/leaves/backwardleaveincatch_il_r.ilproj b/src/tests/JIT/Methodical/eh/leaves/backwardleaveincatch_il_r.ilproj
index 0b82dccda87e1d..09b8da72cce4d2 100644
--- a/src/tests/JIT/Methodical/eh/leaves/backwardleaveincatch_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/leaves/backwardleaveincatch_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithcatch.il b/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithcatch.il
index 05affd9b7f7965..dc94e6c5f5515a 100644
--- a/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithcatch.il
+++ b/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithcatch.il
@@ -32,9 +32,9 @@
 
 
 
-.namespace hello
+.namespace hello_branchbackwardswithcatch_leaves_il
 {
-  .class private auto ansi beforefieldinit Class1
+  .class public auto ansi beforefieldinit Class1
          extends [mscorlib]System.Object
   {
     .method public hidebysig static void 
@@ -120,10 +120,10 @@ before:
 
       .try
       {
-        call       void hello.Class1::inTry()
+        call       void hello_branchbackwardswithcatch_leaves_il.Class1::inTry()
         .try
         {
-          call       void hello.Class1::inTry2()
+          call       void hello_branchbackwardswithcatch_leaves_il.Class1::inTry2()
           ldc.i4.1
           stloc.0
           leave.s    before
@@ -131,14 +131,14 @@ before:
         }  
         catch [mscorlib]System.Exception
         {
-          call       void hello.Class1::inCatch()
+          call       void hello_branchbackwardswithcatch_leaves_il.Class1::inCatch()
           leave.s done
         }  
 
       }  
       catch [mscorlib]System.Object
       {
-        call       void hello.Class1::inCatch2()
+        call       void hello_branchbackwardswithcatch_leaves_il.Class1::inCatch2()
         leave.s done
       }  
     done: 
diff --git a/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithcatch_il_d.ilproj b/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithcatch_il_d.ilproj
index ec9bf1d9f72bf6..034ea3757094ef 100644
--- a/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithcatch_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithcatch_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithcatch_il_r.ilproj b/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithcatch_il_r.ilproj
index 7fd4f6c1c45c03..be31959b05f2bc 100644
--- a/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithcatch_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithcatch_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithfinally.il b/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithfinally.il
index 127425504c0a7b..6732501208e81d 100644
--- a/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithfinally.il
+++ b/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithfinally.il
@@ -32,9 +32,9 @@
 
 
 
-.namespace hello
+.namespace hello_branchbackwardswithfinally_leaves_il
 {
-  .class private auto ansi beforefieldinit Class1
+  .class public auto ansi beforefieldinit Class1
          extends [mscorlib]System.Object
   {
     .method public hidebysig static void 
@@ -126,10 +126,10 @@
 
       .try
       {
-        call       void hello.Class1::inTry()
+        call       void hello_branchbackwardswithfinally_leaves_il.Class1::inTry()
         .try
         {
-          call       void hello.Class1::inTry2()
+          call       void hello_branchbackwardswithfinally_leaves_il.Class1::inTry2()
           ldc.i4.1
           stloc.0
           leave.s    before
@@ -137,14 +137,14 @@
         }  
         finally
         {
-          call       void hello.Class1::inFinally()
+          call       void hello_branchbackwardswithfinally_leaves_il.Class1::inFinally()
           endfinally
         }  
 
       }  
       finally
       {
-        call       void hello.Class1::inFinally2()
+        call       void hello_branchbackwardswithfinally_leaves_il.Class1::inFinally2()
         endfinally
       }  
     done:
diff --git a/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithfinally_il_d.ilproj b/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithfinally_il_d.ilproj
index ba3d5313739f23..60032669adeff5 100644
--- a/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithfinally_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithfinally_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithfinally_il_r.ilproj b/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithfinally_il_r.ilproj
index ce61adc283cac6..c5f670208a76ca 100644
--- a/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithfinally_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithfinally_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally.il b/src/tests/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally.il
index de2ec0385b8cdd..07d0b690d368b6 100644
--- a/src/tests/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally.il
+++ b/src/tests/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally.il
@@ -32,9 +32,9 @@
 
 
 
-.namespace hello
+.namespace hello_branchoutofnestedtryfinally_leaves_il
 {
-  .class private auto ansi beforefieldinit Class1
+  .class public auto ansi beforefieldinit Class1
          extends [mscorlib]System.Object
   {
 
@@ -122,13 +122,13 @@
       {
           ldstr      "In try 0"
           call       void [System.Console]System.Console::WriteLine(string)         
-          call       void hello.Class1::inTry0()
+          call       void hello_branchoutofnestedtryfinally_leaves_il.Class1::inTry0()
 
           .try
           {
                   ldstr      "In try"
                   call       void [System.Console]System.Console::WriteLine(string)
-                  call       void hello.Class1::inTry1()
+                  call       void hello_branchoutofnestedtryfinally_leaves_il.Class1::inTry1()
                   leave.s    done
 
           }  
@@ -136,19 +136,19 @@
           {
                   ldstr      "In finally"
                   call       void [System.Console]System.Console::WriteLine(string)
-                  call       void hello.Class1::inFinally1()
+                  call       void hello_branchoutofnestedtryfinally_leaves_il.Class1::inFinally1()
                   endfinally
           }  
        } finally {
           ldstr      "In finally 0"
           call       void [System.Console]System.Console::WriteLine(string)         
-          call       void hello.Class1::inFinally0()
+          call       void hello_branchoutofnestedtryfinally_leaves_il.Class1::inFinally0()
           endfinally
        }
 
        ldstr      "Unreached 2"
        call       void [System.Console]System.Console::WriteLine(string)
-       call       void hello.Class1::unreached1()
+       call       void hello_branchoutofnestedtryfinally_leaves_il.Class1::unreached1()
     done:  
 		ldstr      "After try"
 		call       void [System.Console]System.Console::WriteLine(string)
diff --git a/src/tests/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally_il_d.ilproj b/src/tests/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally_il_d.ilproj
index ed552517852dee..7ed00ef28e1bdf 100644
--- a/src/tests/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally_il_r.ilproj b/src/tests/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally_il_r.ilproj
index 639e66748b4285..043b1a9e3ada61 100644
--- a/src/tests/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/leaves/branchoutoftryfinally.il b/src/tests/JIT/Methodical/eh/leaves/branchoutoftryfinally.il
index e0c653e4f56164..298057e4af236d 100644
--- a/src/tests/JIT/Methodical/eh/leaves/branchoutoftryfinally.il
+++ b/src/tests/JIT/Methodical/eh/leaves/branchoutoftryfinally.il
@@ -33,9 +33,9 @@
 
 
 
-.namespace hello
+.namespace hello_branchoutoftryfinally_leaves_il
 {
-  .class private auto ansi beforefieldinit Class1
+  .class public auto ansi beforefieldinit Class1
          extends [mscorlib]System.Object
   {
     .method public hidebysig static int32
diff --git a/src/tests/JIT/Methodical/eh/leaves/branchoutoftryfinally_il_d.ilproj b/src/tests/JIT/Methodical/eh/leaves/branchoutoftryfinally_il_d.ilproj
index 0dba22bfa42beb..92bfd9197e5eae 100644
--- a/src/tests/JIT/Methodical/eh/leaves/branchoutoftryfinally_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/leaves/branchoutoftryfinally_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/leaves/branchoutoftryfinally_il_r.ilproj b/src/tests/JIT/Methodical/eh/leaves/branchoutoftryfinally_il_r.ilproj
index e4bc7ff30e5d65..672e836efeaf59 100644
--- a/src/tests/JIT/Methodical/eh/leaves/branchoutoftryfinally_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/leaves/branchoutoftryfinally_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/leaves/catchretnonlocalexitinfunclet.cs b/src/tests/JIT/Methodical/eh/leaves/catchretnonlocalexitinfunclet.cs
index a443c0719a41a3..f25c6aba3db9cb 100644
--- a/src/tests/JIT/Methodical/eh/leaves/catchretnonlocalexitinfunclet.cs
+++ b/src/tests/JIT/Methodical/eh/leaves/catchretnonlocalexitinfunclet.cs
@@ -6,10 +6,11 @@
 
 
 using System;
+using Xunit;
 
-namespace hello
+namespace hello_catchretnonlocalexitinfunclet_leaves_cs
 {
-    class Class1
+    public class Class1
     {
         private static TestUtil.TestLog testLog;
 
@@ -25,7 +26,8 @@ static Class1()
             // Create and initialize test log object
             testLog = new TestUtil.TestLog(expectedOut);
         }
-        static public int Main()
+        [Fact]
+        static public int TestEntryPoint()
         {
             //Start recording
             testLog.StartRecording();
diff --git a/src/tests/JIT/Methodical/eh/leaves/catchretnonlocalexitinfunclet_d.csproj b/src/tests/JIT/Methodical/eh/leaves/catchretnonlocalexitinfunclet_d.csproj
index 6dcdb183286625..40205910dd2841 100644
--- a/src/tests/JIT/Methodical/eh/leaves/catchretnonlocalexitinfunclet_d.csproj
+++ b/src/tests/JIT/Methodical/eh/leaves/catchretnonlocalexitinfunclet_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/leaves/catchretnonlocalexitinfunclet_do.csproj b/src/tests/JIT/Methodical/eh/leaves/catchretnonlocalexitinfunclet_do.csproj
index 356c25ec31d7e5..0da35c73ace45d 100644
--- a/src/tests/JIT/Methodical/eh/leaves/catchretnonlocalexitinfunclet_do.csproj
+++ b/src/tests/JIT/Methodical/eh/leaves/catchretnonlocalexitinfunclet_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/leaves/catchretnonlocalexitinfunclet_r.csproj b/src/tests/JIT/Methodical/eh/leaves/catchretnonlocalexitinfunclet_r.csproj
index 5893c7ffaf190a..30ace912c5bd4b 100644
--- a/src/tests/JIT/Methodical/eh/leaves/catchretnonlocalexitinfunclet_r.csproj
+++ b/src/tests/JIT/Methodical/eh/leaves/catchretnonlocalexitinfunclet_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/leaves/catchretnonlocalexitinfunclet_ro.csproj b/src/tests/JIT/Methodical/eh/leaves/catchretnonlocalexitinfunclet_ro.csproj
index b11e6d253fbb94..4cb855c68e464f 100644
--- a/src/tests/JIT/Methodical/eh/leaves/catchretnonlocalexitinfunclet_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/leaves/catchretnonlocalexitinfunclet_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/leaves/forwardleaveincatch.il b/src/tests/JIT/Methodical/eh/leaves/forwardleaveincatch.il
index d500275f8d4b90..46917a5917dab8 100644
--- a/src/tests/JIT/Methodical/eh/leaves/forwardleaveincatch.il
+++ b/src/tests/JIT/Methodical/eh/leaves/forwardleaveincatch.il
@@ -32,9 +32,9 @@
 
 
 
-.namespace hello
+.namespace hello_forwardleaveincatch_leaves_il
 {
-  .class private auto ansi beforefieldinit Class1
+  .class public auto ansi beforefieldinit Class1
          extends [mscorlib]System.Object
   {
     .method public hidebysig static void 
@@ -123,10 +123,10 @@
 
       .try
       {
-        call       void hello.Class1::inTry()
+        call       void hello_forwardleaveincatch_leaves_il.Class1::inTry()
         .try
         {
-          call       void hello.Class1::inTry2()
+          call       void hello_forwardleaveincatch_leaves_il.Class1::inTry2()
           ldc.i4.1
           stloc.0
           newobj     instance void [mscorlib]System.Exception::.ctor()
@@ -136,14 +136,14 @@
         }  
         catch [mscorlib]System.Exception
         {
-          call       void hello.Class1::inCatch()
+          call       void hello_forwardleaveincatch_leaves_il.Class1::inCatch()
           leave.s after
         }  
 
       }  
       finally
       {
-        call       void hello.Class1::inFinally()
+        call       void hello_forwardleaveincatch_leaves_il.Class1::inFinally()
         endfinally
       }  
     done: 
diff --git a/src/tests/JIT/Methodical/eh/leaves/forwardleaveincatch_il_d.ilproj b/src/tests/JIT/Methodical/eh/leaves/forwardleaveincatch_il_d.ilproj
index 31cf654efefcf9..1892f3169e3d45 100644
--- a/src/tests/JIT/Methodical/eh/leaves/forwardleaveincatch_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/leaves/forwardleaveincatch_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/leaves/forwardleaveincatch_il_r.ilproj b/src/tests/JIT/Methodical/eh/leaves/forwardleaveincatch_il_r.ilproj
index 03d1dd0d49da7b..9a93547062588e 100644
--- a/src/tests/JIT/Methodical/eh/leaves/forwardleaveincatch_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/leaves/forwardleaveincatch_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/leaves/labelbeforefinally.il b/src/tests/JIT/Methodical/eh/leaves/labelbeforefinally.il
index 317e13f0fe94c5..9f6f552b396607 100644
--- a/src/tests/JIT/Methodical/eh/leaves/labelbeforefinally.il
+++ b/src/tests/JIT/Methodical/eh/leaves/labelbeforefinally.il
@@ -31,12 +31,12 @@
 
 
 
-.namespace Test
+.namespace Test_labelbeforefinally_il
 {
-  .class private auto ansi beforefieldinit App
+  .class public auto ansi beforefieldinit App
          extends [mscorlib]System.Object
   {
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() cil managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
diff --git a/src/tests/JIT/Methodical/eh/leaves/labelbeforefinally_il_d.ilproj b/src/tests/JIT/Methodical/eh/leaves/labelbeforefinally_il_d.ilproj
index ddb436a23072f4..e4f1d0c9b24786 100644
--- a/src/tests/JIT/Methodical/eh/leaves/labelbeforefinally_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/leaves/labelbeforefinally_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/leaves/labelbeforefinally_il_r.ilproj b/src/tests/JIT/Methodical/eh/leaves/labelbeforefinally_il_r.ilproj
index ef50aa1c9b3cc3..0a653eef122a53 100644
--- a/src/tests/JIT/Methodical/eh/leaves/labelbeforefinally_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/leaves/labelbeforefinally_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/leaves/labelbeginningfinally.il b/src/tests/JIT/Methodical/eh/leaves/labelbeginningfinally.il
index 781f8517fb80ca..6780272cce6000 100644
--- a/src/tests/JIT/Methodical/eh/leaves/labelbeginningfinally.il
+++ b/src/tests/JIT/Methodical/eh/leaves/labelbeginningfinally.il
@@ -32,12 +32,12 @@
 
 
 
-.namespace Test
+.namespace Test_labelbeginningfinally_il
 {
-  .class private auto ansi beforefieldinit App
+  .class public auto ansi beforefieldinit App
          extends [mscorlib]System.Object
   {
-    .method private hidebysig static int32 
+    .method public hidebysig static int32 
             Main() cil managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
diff --git a/src/tests/JIT/Methodical/eh/leaves/labelbeginningfinally_il_d.ilproj b/src/tests/JIT/Methodical/eh/leaves/labelbeginningfinally_il_d.ilproj
index 4757fee213fb12..f4e40f9e99ea9a 100644
--- a/src/tests/JIT/Methodical/eh/leaves/labelbeginningfinally_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/leaves/labelbeginningfinally_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/leaves/labelbeginningfinally_il_r.ilproj b/src/tests/JIT/Methodical/eh/leaves/labelbeginningfinally_il_r.ilproj
index 7ce6a2a1a67c70..f30a5c5ee56549 100644
--- a/src/tests/JIT/Methodical/eh/leaves/labelbeginningfinally_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/leaves/labelbeginningfinally_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/leaves/leaveinsameregion.il b/src/tests/JIT/Methodical/eh/leaves/leaveinsameregion.il
index c6b6aa006c745a..a054f888417ded 100644
--- a/src/tests/JIT/Methodical/eh/leaves/leaveinsameregion.il
+++ b/src/tests/JIT/Methodical/eh/leaves/leaveinsameregion.il
@@ -31,9 +31,9 @@
 
 
 
-.namespace hello
+.namespace hello_leaveinsameregion_leaves_il
 {
-  .class private auto ansi beforefieldinit Class1
+  .class public auto ansi beforefieldinit Class1
          extends [mscorlib]System.Object
   {
     .method public hidebysig static void 
@@ -91,7 +91,7 @@
       
       .try
       {
-        IL_0000:  call       void hello.Class1::inTry()
+        IL_0000:  call       void hello_leaveinsameregion_leaves_il.Class1::inTry()
         IL_0005:  leave.s    IL_0015
 
       }  
@@ -102,7 +102,7 @@
                   leave.s IL_0009
                 
         IL_0009:  ldloc.0
-        IL_000e:  call       void hello.Class1::inCatch()
+        IL_000e:  call       void hello_leaveinsameregion_leaves_il.Class1::inCatch()
         IL_0013:  leave.s    IL_0015
 
       }  
diff --git a/src/tests/JIT/Methodical/eh/leaves/leaveinsameregion_il_d.ilproj b/src/tests/JIT/Methodical/eh/leaves/leaveinsameregion_il_d.ilproj
index 86bd872fe0dd59..2095d72351d6d4 100644
--- a/src/tests/JIT/Methodical/eh/leaves/leaveinsameregion_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/leaves/leaveinsameregion_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/leaves/leaveinsameregion_il_r.ilproj b/src/tests/JIT/Methodical/eh/leaves/leaveinsameregion_il_r.ilproj
index 0a47ccaf78ae53..060ca490f5afed 100644
--- a/src/tests/JIT/Methodical/eh/leaves/leaveinsameregion_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/leaves/leaveinsameregion_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/leaves/leaveintotrybody.il b/src/tests/JIT/Methodical/eh/leaves/leaveintotrybody.il
index 8ccab02bdd3b0f..60d21057082c98 100644
--- a/src/tests/JIT/Methodical/eh/leaves/leaveintotrybody.il
+++ b/src/tests/JIT/Methodical/eh/leaves/leaveintotrybody.il
@@ -23,9 +23,9 @@
 .subsystem 0x00000003
 .file alignment 512
 .corflags 0x00000001
-.namespace hello
+.namespace hello_leaveintotrybody_leaves_il
 {
-  .class private auto ansi beforefieldinit Class1
+  .class public auto ansi beforefieldinit Class1
          extends [mscorlib]System.Object
   {
     .method public hidebysig static void 
@@ -113,17 +113,17 @@
       {
         ldstr      "in Try ..."
         call       void [System.Console]System.Console::WriteLine(string)
-        call       void hello.Class1::inTry()
+        call       void hello_leaveintotrybody_leaves_il.Class1::inTry()
 
       cont1:
         ldstr      "in Try ... (again)"
         call       void [System.Console]System.Console::WriteLine(string)
-        call       void hello.Class1::inTry()
+        call       void hello_leaveintotrybody_leaves_il.Class1::inTry()
 
       cont2:
         ldstr      "in Try ... (again)"
         call       void [System.Console]System.Console::WriteLine(string)
-        call       void hello.Class1::inTry()
+        call       void hello_leaveintotrybody_leaves_il.Class1::inTry()
 
       cont3:
         ldstr      "in Try ... (again), leaving"
@@ -134,7 +134,7 @@
       catch [mscorlib]System.Exception 
       {
         pop
-        call       void hello.Class1::inCatch()
+        call       void hello_leaveintotrybody_leaves_il.Class1::inCatch()
         ldloc.0
         brfalse.s zero
         ldc.i4.1
diff --git a/src/tests/JIT/Methodical/eh/leaves/leaveintotrybody_il_d.ilproj b/src/tests/JIT/Methodical/eh/leaves/leaveintotrybody_il_d.ilproj
index c9d0ed390acaad..a453c57ffa9c41 100644
--- a/src/tests/JIT/Methodical/eh/leaves/leaveintotrybody_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/leaves/leaveintotrybody_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/leaves/leaveintotrybody_il_r.ilproj b/src/tests/JIT/Methodical/eh/leaves/leaveintotrybody_il_r.ilproj
index 0fadf0e1ebccb7..8dc5bae6c2f168 100644
--- a/src/tests/JIT/Methodical/eh/leaves/leaveintotrybody_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/leaves/leaveintotrybody_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/leaves/nonlocalexitfromnestedcatch.cs b/src/tests/JIT/Methodical/eh/leaves/nonlocalexitfromnestedcatch.cs
index a449f7901348ae..d1f489375d43eb 100644
--- a/src/tests/JIT/Methodical/eh/leaves/nonlocalexitfromnestedcatch.cs
+++ b/src/tests/JIT/Methodical/eh/leaves/nonlocalexitfromnestedcatch.cs
@@ -4,8 +4,11 @@
 // Non local exit from a catch handler nested inside another catch handler
 
 using System;
+using Xunit;
 
-class test
+namespace Test_nonlocalexitfromnestedcatch_cs
+{
+public class test
 {
     private static TestUtil.TestLog testLog;
 
@@ -26,7 +29,8 @@ static test()
         // Create and initialize test log object
         testLog = new TestUtil.TestLog(expectedOut);
     }
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         //Start recording
         testLog.StartRecording();
@@ -73,3 +77,4 @@ public static int Main()
 
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/eh/leaves/nonlocalexitfromnestedcatch_d.csproj b/src/tests/JIT/Methodical/eh/leaves/nonlocalexitfromnestedcatch_d.csproj
index dc89065297c00b..eaf96664026273 100644
--- a/src/tests/JIT/Methodical/eh/leaves/nonlocalexitfromnestedcatch_d.csproj
+++ b/src/tests/JIT/Methodical/eh/leaves/nonlocalexitfromnestedcatch_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/leaves/nonlocalexitfromnestedcatch_do.csproj b/src/tests/JIT/Methodical/eh/leaves/nonlocalexitfromnestedcatch_do.csproj
index a8bff543c56a43..c80ff7f2f0342a 100644
--- a/src/tests/JIT/Methodical/eh/leaves/nonlocalexitfromnestedcatch_do.csproj
+++ b/src/tests/JIT/Methodical/eh/leaves/nonlocalexitfromnestedcatch_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/leaves/nonlocalexitfromnestedcatch_r.csproj b/src/tests/JIT/Methodical/eh/leaves/nonlocalexitfromnestedcatch_r.csproj
index 89947df6657df7..029b6d0ce0630b 100644
--- a/src/tests/JIT/Methodical/eh/leaves/nonlocalexitfromnestedcatch_r.csproj
+++ b/src/tests/JIT/Methodical/eh/leaves/nonlocalexitfromnestedcatch_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/leaves/nonlocalexitfromnestedcatch_ro.csproj b/src/tests/JIT/Methodical/eh/leaves/nonlocalexitfromnestedcatch_ro.csproj
index 438a81153a00c5..c999137f580fe2 100644
--- a/src/tests/JIT/Methodical/eh/leaves/nonlocalexitfromnestedcatch_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/leaves/nonlocalexitfromnestedcatch_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/leaves/oponerror.cs b/src/tests/JIT/Methodical/eh/leaves/oponerror.cs
index a960800e2aacee..ce74041d17d4d5 100644
--- a/src/tests/JIT/Methodical/eh/leaves/oponerror.cs
+++ b/src/tests/JIT/Methodical/eh/leaves/oponerror.cs
@@ -7,10 +7,11 @@
 // after vswhidbey:5875 is fixed, intry will be outside the outer try block
 
 using System;
+using Xunit;
 
-namespace hello
+namespace hello_oponerror_leaves_cs
 {
-    class Class1
+    public class Class1
     {
         private static TestUtil.TestLog testLog;
 
@@ -27,7 +28,8 @@ static Class1()
             // Create and initialize test log object
             testLog = new TestUtil.TestLog(expectedOut);
         }
-        static public int Main()
+        [Fact]
+        static public int TestEntryPoint()
         {
             //Start recording
             testLog.StartRecording();
diff --git a/src/tests/JIT/Methodical/eh/leaves/oponerror_d.csproj b/src/tests/JIT/Methodical/eh/leaves/oponerror_d.csproj
index ea1b0fd583e1e6..d43b6965240fe5 100644
--- a/src/tests/JIT/Methodical/eh/leaves/oponerror_d.csproj
+++ b/src/tests/JIT/Methodical/eh/leaves/oponerror_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/leaves/oponerror_do.csproj b/src/tests/JIT/Methodical/eh/leaves/oponerror_do.csproj
index 0205d2938aa033..b9f6ca1becdab8 100644
--- a/src/tests/JIT/Methodical/eh/leaves/oponerror_do.csproj
+++ b/src/tests/JIT/Methodical/eh/leaves/oponerror_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/leaves/oponerror_r.csproj b/src/tests/JIT/Methodical/eh/leaves/oponerror_r.csproj
index 78f095c9bb3af0..a766576e0d0b5b 100644
--- a/src/tests/JIT/Methodical/eh/leaves/oponerror_r.csproj
+++ b/src/tests/JIT/Methodical/eh/leaves/oponerror_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/leaves/oponerror_ro.csproj b/src/tests/JIT/Methodical/eh/leaves/oponerror_ro.csproj
index 2290f5a5209055..5bb4b401c41392 100644
--- a/src/tests/JIT/Methodical/eh/leaves/oponerror_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/leaves/oponerror_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry.il b/src/tests/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry.il
index 6dc5ca240c8c17..b1e25aac901747 100644
--- a/src/tests/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry.il
+++ b/src/tests/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry.il
@@ -24,9 +24,9 @@
 .subsystem 0x00000003
 .file alignment 512
 .corflags 0x00000001
-.namespace hello
+.namespace hello_tryfinallyintrycatchwithleaveintotry_leaves_il
 {
-  .class private auto ansi beforefieldinit Class1
+  .class public auto ansi beforefieldinit Class1
          extends [mscorlib]System.Object
   {
     .method public hidebysig static void 
@@ -120,17 +120,17 @@
       {
         ldstr      "in Try ..."
         call       void [System.Console]System.Console::WriteLine(string)
-        call       void hello.Class1::inTry()
+        call       void hello_tryfinallyintrycatchwithleaveintotry_leaves_il.Class1::inTry()
 
       cont1:
         ldstr      "in Try ... (again)"
         call       void [System.Console]System.Console::WriteLine(string)
-        call       void hello.Class1::inTry()
+        call       void hello_tryfinallyintrycatchwithleaveintotry_leaves_il.Class1::inTry()
 
       cont2:
         ldstr      "in Try ... (again)"
         call       void [System.Console]System.Console::WriteLine(string)
-        call       void hello.Class1::inTry()
+        call       void hello_tryfinallyintrycatchwithleaveintotry_leaves_il.Class1::inTry()
 
       cont3:
         nop
@@ -150,7 +150,7 @@
       catch [mscorlib]System.Exception 
       {
         pop
-        call       void hello.Class1::inCatch()
+        call       void hello_tryfinallyintrycatchwithleaveintotry_leaves_il.Class1::inCatch()
         ldloc.0
         brfalse.s zero
         ldc.i4.1
diff --git a/src/tests/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry_il_d.ilproj b/src/tests/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry_il_d.ilproj
index 7ee14c9865875d..4c6c6ca342cd01 100644
--- a/src/tests/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry_il_r.ilproj b/src/tests/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry_il_r.ilproj
index cdda447565cae5..a56b303cb296f2 100644
--- a/src/tests/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/leaves/tryfinallyloop.cs b/src/tests/JIT/Methodical/eh/leaves/tryfinallyloop.cs
index d2a572fb45e475..b5c7e6f3ddde81 100644
--- a/src/tests/JIT/Methodical/eh/leaves/tryfinallyloop.cs
+++ b/src/tests/JIT/Methodical/eh/leaves/tryfinallyloop.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace hello
+namespace hello_tryfinallyloop_leaves_cs
 {
-    class Class1
+    public class Class1
     {
         private static TestUtil.TestLog testLog;
 
@@ -41,7 +42,8 @@ static public void inFinally()
         {
             Console.WriteLine("in Finally\n");
         }
-        static public int Main()
+        [Fact]
+        static public int TestEntryPoint()
         {
             int i = 0;
             //Start recording
diff --git a/src/tests/JIT/Methodical/eh/leaves/tryfinallyloop_d.csproj b/src/tests/JIT/Methodical/eh/leaves/tryfinallyloop_d.csproj
index 9da9bf19d1a104..088ce04bf0fe61 100644
--- a/src/tests/JIT/Methodical/eh/leaves/tryfinallyloop_d.csproj
+++ b/src/tests/JIT/Methodical/eh/leaves/tryfinallyloop_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/leaves/tryfinallyloop_do.csproj b/src/tests/JIT/Methodical/eh/leaves/tryfinallyloop_do.csproj
index 1d92d52698f9ea..bb637b2a269b32 100644
--- a/src/tests/JIT/Methodical/eh/leaves/tryfinallyloop_do.csproj
+++ b/src/tests/JIT/Methodical/eh/leaves/tryfinallyloop_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/leaves/tryfinallyloop_r.csproj b/src/tests/JIT/Methodical/eh/leaves/tryfinallyloop_r.csproj
index bfa18d68da6f81..50654d6d3c2759 100644
--- a/src/tests/JIT/Methodical/eh/leaves/tryfinallyloop_r.csproj
+++ b/src/tests/JIT/Methodical/eh/leaves/tryfinallyloop_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/leaves/tryfinallyloop_ro.csproj b/src/tests/JIT/Methodical/eh/leaves/tryfinallyloop_ro.csproj
index e0371bdf0648ea..259c6f87fadd7f 100644
--- a/src/tests/JIT/Methodical/eh/leaves/tryfinallyloop_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/leaves/tryfinallyloop_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/mixedhandler/catchfiltercatch.il b/src/tests/JIT/Methodical/eh/mixedhandler/catchfiltercatch.il
index 30b494ed6ae547..4f458f6a3e9934 100644
--- a/src/tests/JIT/Methodical/eh/mixedhandler/catchfiltercatch.il
+++ b/src/tests/JIT/Methodical/eh/mixedhandler/catchfiltercatch.il
@@ -26,9 +26,9 @@
 .subsystem 0x00000003
 .file alignment 512
 .corflags 0x00000001
-.namespace hello
+.namespace hello_catchfiltercatch_mixedhandler_il
 {
-  .class private auto ansi beforefieldinit Class1
+  .class public auto ansi beforefieldinit Class1
          extends [mscorlib]System.Object
   {
     .method public hidebysig static void 
diff --git a/src/tests/JIT/Methodical/eh/mixedhandler/catchfiltercatch_il_d.ilproj b/src/tests/JIT/Methodical/eh/mixedhandler/catchfiltercatch_il_d.ilproj
index 1992d47a7167e1..c00ca0f5ab41dc 100644
--- a/src/tests/JIT/Methodical/eh/mixedhandler/catchfiltercatch_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/mixedhandler/catchfiltercatch_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/mixedhandler/catchfiltercatch_il_r.ilproj b/src/tests/JIT/Methodical/eh/mixedhandler/catchfiltercatch_il_r.ilproj
index 114d614083632d..1306211ce9091f 100644
--- a/src/tests/JIT/Methodical/eh/mixedhandler/catchfiltercatch_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/mixedhandler/catchfiltercatch_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch.il b/src/tests/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch.il
index cef244dd43f09c..8204d2fd8aeea9 100644
--- a/src/tests/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch.il
+++ b/src/tests/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch.il
@@ -26,9 +26,9 @@
 .subsystem 0x00000003
 .file alignment 512
 .corflags 0x00000001
-.namespace hello
+.namespace hello_filterfiltercatchcatch_mixedhandler_il
 {
-  .class private auto ansi beforefieldinit Class1
+  .class public auto ansi beforefieldinit Class1
          extends [mscorlib]System.Object
   {
     .method public hidebysig static void 
diff --git a/src/tests/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch_il_d.ilproj b/src/tests/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch_il_d.ilproj
index 7a91443a09c9a0..d51b645652068c 100644
--- a/src/tests/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch_il_r.ilproj b/src/tests/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch_il_r.ilproj
index ece73fa9d319fa..e80ba5e5eb9370 100644
--- a/src/tests/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedcatch.il b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedcatch.il
index 06991996723210..ebc35a59abd0cb 100644
--- a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedcatch.il
+++ b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedcatch.il
@@ -6,6 +6,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
+.assembly extern xunit.core {}
 .assembly extern mscorlib {}
 .assembly extern eh_common {}
 .assembly 'cascadedcatch' {}
@@ -14,6 +15,9 @@
 
 .class public auto ansi Test_cascadedcatch extends [mscorlib] System.Object {
 .method public static int32 main() {
+  .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+      01 00 00 00
+  )
   .entrypoint
   .maxstack  2
   .locals init (
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedcatch_il_d.ilproj b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedcatch_il_d.ilproj
index 3bf22a0e44ba94..a124fc393418a5 100644
--- a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedcatch_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedcatch_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedcatch_il_r.ilproj b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedcatch_il_r.ilproj
index 40f2e9529fa351..6a7b1109ee730b 100644
--- a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedcatch_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedcatch_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept.il b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept.il
index 725e8bef97a6c0..d889311e19f934 100644
--- a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept.il
+++ b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept.il
@@ -6,6 +6,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
+.assembly extern xunit.core {}
 .assembly extern mscorlib {}
 .assembly extern eh_common {}
 .assembly 'cascadedexcept' {}
@@ -13,6 +14,9 @@
 
 .class public auto ansi Test_cascadedexcept extends [mscorlib] System.Object {
 .method public static int32 main() {
+  .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+      01 00 00 00
+  )
   .entrypoint
   .maxstack  2
   .locals init (
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept_il_d.ilproj b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept_il_d.ilproj
index b52e5767cb4a62..cf39dcdf17b8a4 100644
--- a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept_il_r.ilproj b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept_il_r.ilproj
index 55d368e7c55124..77025c3a21eee2 100644
--- a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch.il b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch.il
index ed1b127a1104c9..6cbfba0b5ce467 100644
--- a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch.il
+++ b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch.il
@@ -6,6 +6,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
+.assembly extern xunit.core {}
 .assembly extern mscorlib {}
 .assembly extern eh_common {}
 .assembly 'throwincascadedcatch' {}
@@ -14,6 +15,9 @@
 
 .class public auto ansi Test_throwincascadedcatch extends [mscorlib] System.Object {
 .method public static int32 main() {
+  .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+      01 00 00 00
+  )
   .entrypoint
   .maxstack  2
   .locals init (
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch_il_d.ilproj b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch_il_d.ilproj
index ee42e405fbd10a..ddc04c3be91d75 100644
--- a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch_il_r.ilproj b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch_il_r.ilproj
index 43452007cc1d29..2d33fc90b673ff 100644
--- a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin.il b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin.il
index 6926a841d5b1bf..0334dc2aa80b11 100644
--- a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin.il
+++ b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin.il
@@ -6,6 +6,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
+.assembly extern xunit.core {}
 .assembly extern mscorlib {}
 .assembly extern eh_common {}
 .assembly 'throwincascadedcatchnofin' {}
@@ -13,6 +14,9 @@
 
 .class public auto ansi Test_throwincascadedcatchnofin extends [mscorlib] System.Object {
 .method public static int32 main() {
+  .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+      01 00 00 00
+  )
   .entrypoint
   .maxstack  2
   .locals init (
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin_il_d.ilproj b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin_il_d.ilproj
index a88fe386557ada..77bbcf62725e8f 100644
--- a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin_il_r.ilproj b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin_il_r.ilproj
index 8b767273b70f7b..1dee6b9240be6a 100644
--- a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept.il b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept.il
index 212279fe3df530..aa37231ebaf79a 100644
--- a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept.il
+++ b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept.il
@@ -6,6 +6,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
+.assembly extern xunit.core {}
 .assembly extern mscorlib {}
 .assembly extern eh_common {}
 .assembly 'throwincascadedexcept' {}
@@ -14,6 +15,9 @@
 
 .class public auto ansi Test_throwincascadedexcept extends [mscorlib] System.Object {
 .method public static int32 main() {
+  .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+      01 00 00 00
+  )
   .entrypoint
   .maxstack  2
   .locals init (
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept_il_d.ilproj b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept_il_d.ilproj
index c50dd45e2f557c..8ee9633cbeab11 100644
--- a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept_il_r.ilproj b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept_il_r.ilproj
index f8589442682f14..6cebf91f554b5e 100644
--- a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin.il b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin.il
index c3b5d6ec6a12cd..39996e08c7ce8c 100644
--- a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin.il
+++ b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin.il
@@ -6,6 +6,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
+.assembly extern xunit.core {}
 .assembly extern mscorlib {}
 .assembly extern eh_common {}
 .assembly 'throwincascadedexceptnofin' {}
@@ -14,6 +15,9 @@
 
 .class public auto ansi Test_throwincascadedexceptnofin extends [mscorlib] System.Object {
 .method public static int32 main() {
+  .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+      01 00 00 00
+  )
   .entrypoint
   .maxstack  2
   .locals init (
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin_il_d.ilproj b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin_il_d.ilproj
index 22d338d00ed5fd..53a9d7d358e604 100644
--- a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin_il_r.ilproj b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin_il_r.ilproj
index 2f967450b448d6..2562d07f7d4c91 100644
--- a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/nested/general/cascadedcatch.cs b/src/tests/JIT/Methodical/eh/nested/general/cascadedcatch.cs
index 212a9c920c0072..17d31848d8690d 100644
--- a/src/tests/JIT/Methodical/eh/nested/general/cascadedcatch.cs
+++ b/src/tests/JIT/Methodical/eh/nested/general/cascadedcatch.cs
@@ -4,10 +4,11 @@
 // non-local exits in a catch handler nested in another catch handler
 
 using System;
+using Xunit;
 
-namespace hello
+namespace hello_cascadedcatch_general_cs
 {
-    class Class1
+    public class Class1
     {
         private static TestUtil.TestLog testLog;
 
@@ -57,7 +58,8 @@ static public void inFinally()
             Console.WriteLine("in Finally");
         }
 
-        static public int Main()
+        [Fact]
+        static public int TestEntryPoint()
         {
             string[] args = new string[] {};
 
diff --git a/src/tests/JIT/Methodical/eh/nested/general/cascadedcatch_d.csproj b/src/tests/JIT/Methodical/eh/nested/general/cascadedcatch_d.csproj
index da2113e6decd97..ecf453f9923830 100644
--- a/src/tests/JIT/Methodical/eh/nested/general/cascadedcatch_d.csproj
+++ b/src/tests/JIT/Methodical/eh/nested/general/cascadedcatch_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/nested/general/cascadedcatch_do.csproj b/src/tests/JIT/Methodical/eh/nested/general/cascadedcatch_do.csproj
index 822905bb900a13..472ed9bc6f9276 100644
--- a/src/tests/JIT/Methodical/eh/nested/general/cascadedcatch_do.csproj
+++ b/src/tests/JIT/Methodical/eh/nested/general/cascadedcatch_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/nested/general/cascadedcatch_r.csproj b/src/tests/JIT/Methodical/eh/nested/general/cascadedcatch_r.csproj
index 9c56660218e34e..2d591aa2d570be 100644
--- a/src/tests/JIT/Methodical/eh/nested/general/cascadedcatch_r.csproj
+++ b/src/tests/JIT/Methodical/eh/nested/general/cascadedcatch_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/nested/general/cascadedcatch_ro.csproj b/src/tests/JIT/Methodical/eh/nested/general/cascadedcatch_ro.csproj
index 708bf4355e3471..7bfd9d47ae12be 100644
--- a/src/tests/JIT/Methodical/eh/nested/general/cascadedcatch_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/nested/general/cascadedcatch_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/nested/general/localvarincatch.il b/src/tests/JIT/Methodical/eh/nested/general/localvarincatch.il
index 1930bc31678aca..3fce7a2a88d864 100644
--- a/src/tests/JIT/Methodical/eh/nested/general/localvarincatch.il
+++ b/src/tests/JIT/Methodical/eh/nested/general/localvarincatch.il
@@ -8,6 +8,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
+.assembly extern xunit.core {}
 .assembly extern mscorlib {}
 .assembly extern eh_common {}
 .assembly 'localvarincatch' {}
@@ -15,6 +16,9 @@
 
 .class public auto ansi Test_localvarincatch extends [mscorlib] System.Object {
 .method public static int32 main() {
+  .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+      01 00 00 00
+  )
   .entrypoint
   .maxstack  2
   .locals init (
diff --git a/src/tests/JIT/Methodical/eh/nested/general/localvarincatch_il_d.ilproj b/src/tests/JIT/Methodical/eh/nested/general/localvarincatch_il_d.ilproj
index b814e762e0069b..3861cf175ba54f 100644
--- a/src/tests/JIT/Methodical/eh/nested/general/localvarincatch_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/nested/general/localvarincatch_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/nested/general/localvarincatch_il_r.ilproj b/src/tests/JIT/Methodical/eh/nested/general/localvarincatch_il_r.ilproj
index 6a796e17b79bae..9d05d9f63e4d4e 100644
--- a/src/tests/JIT/Methodical/eh/nested/general/localvarincatch_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/nested/general/localvarincatch_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/nested/general/methodthrowsinfinally.cs b/src/tests/JIT/Methodical/eh/nested/general/methodthrowsinfinally.cs
index 1f0cbdc2e38738..d196bd87fc35b9 100644
--- a/src/tests/JIT/Methodical/eh/nested/general/methodthrowsinfinally.cs
+++ b/src/tests/JIT/Methodical/eh/nested/general/methodthrowsinfinally.cs
@@ -5,10 +5,11 @@
 // NDPWhidbey 10962
 
 using System;
+using Xunit;
 
-namespace Test
+namespace Test_methodthrowsinfinally_cs
 {
-    class Class1
+    public class Class1
     {
 
         private static TestUtil.TestLog testLog;
@@ -32,7 +33,8 @@ static Class1()
             testLog = new TestUtil.TestLog(expectedOut);
         }
 
-        static public int Main()
+        [Fact]
+        static public int TestEntryPoint()
         {
             //Start recording
             testLog.StartRecording();
diff --git a/src/tests/JIT/Methodical/eh/nested/general/methodthrowsinfinally_d.csproj b/src/tests/JIT/Methodical/eh/nested/general/methodthrowsinfinally_d.csproj
index 73ee291e01c72e..5a5bcc94118156 100644
--- a/src/tests/JIT/Methodical/eh/nested/general/methodthrowsinfinally_d.csproj
+++ b/src/tests/JIT/Methodical/eh/nested/general/methodthrowsinfinally_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/nested/general/methodthrowsinfinally_do.csproj b/src/tests/JIT/Methodical/eh/nested/general/methodthrowsinfinally_do.csproj
index 7831838cbcd8bf..80bb18d818565c 100644
--- a/src/tests/JIT/Methodical/eh/nested/general/methodthrowsinfinally_do.csproj
+++ b/src/tests/JIT/Methodical/eh/nested/general/methodthrowsinfinally_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/nested/general/methodthrowsinfinally_r.csproj b/src/tests/JIT/Methodical/eh/nested/general/methodthrowsinfinally_r.csproj
index ad80318b605b90..918a1df6beb909 100644
--- a/src/tests/JIT/Methodical/eh/nested/general/methodthrowsinfinally_r.csproj
+++ b/src/tests/JIT/Methodical/eh/nested/general/methodthrowsinfinally_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/nested/general/methodthrowsinfinally_ro.csproj b/src/tests/JIT/Methodical/eh/nested/general/methodthrowsinfinally_ro.csproj
index 28a28fe59e11e2..1cd62e7048f8ec 100644
--- a/src/tests/JIT/Methodical/eh/nested/general/methodthrowsinfinally_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/nested/general/methodthrowsinfinally_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/nested/general/rethrowincatchnestedinfinally.cs b/src/tests/JIT/Methodical/eh/nested/general/rethrowincatchnestedinfinally.cs
index 68621a1ec25de8..3512b417e86fc8 100644
--- a/src/tests/JIT/Methodical/eh/nested/general/rethrowincatchnestedinfinally.cs
+++ b/src/tests/JIT/Methodical/eh/nested/general/rethrowincatchnestedinfinally.cs
@@ -5,11 +5,12 @@
 // NDPWhidbey 10959
 
 using System;
+using Xunit;
 
-namespace Test
+namespace Test_rethrowincatchnestedinfinally_cs
 {
 
-    class Class1
+    public class Class1
     {
 
         private static TestUtil.TestLog testLog;
@@ -36,7 +37,8 @@ static Class1()
             testLog = new TestUtil.TestLog(expectedOut);
         }
 
-        static public int Main()
+        [Fact]
+        static public int TestEntryPoint()
         {
             //Start recording
             testLog.StartRecording();
diff --git a/src/tests/JIT/Methodical/eh/nested/general/rethrowincatchnestedinfinally_d.csproj b/src/tests/JIT/Methodical/eh/nested/general/rethrowincatchnestedinfinally_d.csproj
index 87ac22c592cd76..154b6c18fcc8dd 100644
--- a/src/tests/JIT/Methodical/eh/nested/general/rethrowincatchnestedinfinally_d.csproj
+++ b/src/tests/JIT/Methodical/eh/nested/general/rethrowincatchnestedinfinally_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/nested/general/rethrowincatchnestedinfinally_do.csproj b/src/tests/JIT/Methodical/eh/nested/general/rethrowincatchnestedinfinally_do.csproj
index 22dcc35478e6b0..d585fa0f6ea4e4 100644
--- a/src/tests/JIT/Methodical/eh/nested/general/rethrowincatchnestedinfinally_do.csproj
+++ b/src/tests/JIT/Methodical/eh/nested/general/rethrowincatchnestedinfinally_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/nested/general/rethrowincatchnestedinfinally_r.csproj b/src/tests/JIT/Methodical/eh/nested/general/rethrowincatchnestedinfinally_r.csproj
index 31b9e6c254b289..3df492e2b75ef3 100644
--- a/src/tests/JIT/Methodical/eh/nested/general/rethrowincatchnestedinfinally_r.csproj
+++ b/src/tests/JIT/Methodical/eh/nested/general/rethrowincatchnestedinfinally_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/nested/general/rethrowincatchnestedinfinally_ro.csproj b/src/tests/JIT/Methodical/eh/nested/general/rethrowincatchnestedinfinally_ro.csproj
index 699100171874ce..9dd08f6330d535 100644
--- a/src/tests/JIT/Methodical/eh/nested/general/rethrowincatchnestedinfinally_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/nested/general/rethrowincatchnestedinfinally_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/nested/general/throwinfinally.cs b/src/tests/JIT/Methodical/eh/nested/general/throwinfinally.cs
index 2fba0e34f92733..b915a2ffacd5d9 100644
--- a/src/tests/JIT/Methodical/eh/nested/general/throwinfinally.cs
+++ b/src/tests/JIT/Methodical/eh/nested/general/throwinfinally.cs
@@ -4,7 +4,10 @@
 // Throw from a try block nested in finally, non error case
 
 using System;
+using Xunit;
 
+namespace Test_throwinfinally_general
+{
 public class a
 {
     private static TestUtil.TestLog testLog;
@@ -48,7 +51,8 @@ public static void MiddleMethod()
         Console.WriteLine("Unreached...");
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         //Start recording
         testLog.StartRecording();
@@ -68,3 +72,4 @@ public static int Main()
         return testLog.VerifyOutput();
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/eh/nested/general/throwinfinally_general_d.csproj b/src/tests/JIT/Methodical/eh/nested/general/throwinfinally_general_d.csproj
index c7b7f3cbefe04e..978706fbf96555 100644
--- a/src/tests/JIT/Methodical/eh/nested/general/throwinfinally_general_d.csproj
+++ b/src/tests/JIT/Methodical/eh/nested/general/throwinfinally_general_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/nested/general/throwinfinally_general_do.csproj b/src/tests/JIT/Methodical/eh/nested/general/throwinfinally_general_do.csproj
index eaa6abf24631ce..4fbb831788bb2c 100644
--- a/src/tests/JIT/Methodical/eh/nested/general/throwinfinally_general_do.csproj
+++ b/src/tests/JIT/Methodical/eh/nested/general/throwinfinally_general_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/nested/general/throwinfinally_general_r.csproj b/src/tests/JIT/Methodical/eh/nested/general/throwinfinally_general_r.csproj
index 10a28f6bde6707..bc46cbb5e683f2 100644
--- a/src/tests/JIT/Methodical/eh/nested/general/throwinfinally_general_r.csproj
+++ b/src/tests/JIT/Methodical/eh/nested/general/throwinfinally_general_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/nested/general/throwinfinally_general_ro.csproj b/src/tests/JIT/Methodical/eh/nested/general/throwinfinally_general_ro.csproj
index 89d5be98a8a473..c4f6a39c55bce8 100644
--- a/src/tests/JIT/Methodical/eh/nested/general/throwinfinally_general_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/nested/general/throwinfinally_general_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/nested/general/throwinfinallynestedintry.cs b/src/tests/JIT/Methodical/eh/nested/general/throwinfinallynestedintry.cs
index 7a2595b4313bdb..ac5de5e92d22d5 100644
--- a/src/tests/JIT/Methodical/eh/nested/general/throwinfinallynestedintry.cs
+++ b/src/tests/JIT/Methodical/eh/nested/general/throwinfinallynestedintry.cs
@@ -4,7 +4,10 @@
 // Throw from a try block nested in a finally which in turn nested in a try block
 
 using System;
+using Xunit;
 
+namespace Test_throwinfinallynestedintry_general
+{
 public class a
 {
     private static TestUtil.TestLog testLog;
@@ -58,7 +61,8 @@ public static void MiddleMethod()
         Console.WriteLine("Unreached...");
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         //Start recording
         testLog.StartRecording();
@@ -78,3 +82,4 @@ public static int Main()
         return testLog.VerifyOutput();
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/eh/nested/general/throwinfinallynestedintry_d.csproj b/src/tests/JIT/Methodical/eh/nested/general/throwinfinallynestedintry_d.csproj
index 81396a07347f98..2a4b3bcbb5de02 100644
--- a/src/tests/JIT/Methodical/eh/nested/general/throwinfinallynestedintry_d.csproj
+++ b/src/tests/JIT/Methodical/eh/nested/general/throwinfinallynestedintry_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/nested/general/throwinfinallynestedintry_do.csproj b/src/tests/JIT/Methodical/eh/nested/general/throwinfinallynestedintry_do.csproj
index 5f310d4a787490..272503347e710a 100644
--- a/src/tests/JIT/Methodical/eh/nested/general/throwinfinallynestedintry_do.csproj
+++ b/src/tests/JIT/Methodical/eh/nested/general/throwinfinallynestedintry_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/nested/general/throwinfinallynestedintry_r.csproj b/src/tests/JIT/Methodical/eh/nested/general/throwinfinallynestedintry_r.csproj
index 523cafca8212a6..2ed3716a8b0cbf 100644
--- a/src/tests/JIT/Methodical/eh/nested/general/throwinfinallynestedintry_r.csproj
+++ b/src/tests/JIT/Methodical/eh/nested/general/throwinfinallynestedintry_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/nested/general/throwinfinallynestedintry_ro.csproj b/src/tests/JIT/Methodical/eh/nested/general/throwinfinallynestedintry_ro.csproj
index a559457aeb0d05..1eab4a16c2ce04 100644
--- a/src/tests/JIT/Methodical/eh/nested/general/throwinfinallynestedintry_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/nested/general/throwinfinallynestedintry_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/nested/general/throwinnestedcatch.il b/src/tests/JIT/Methodical/eh/nested/general/throwinnestedcatch.il
index 3902833523506f..d376c0782388b6 100644
--- a/src/tests/JIT/Methodical/eh/nested/general/throwinnestedcatch.il
+++ b/src/tests/JIT/Methodical/eh/nested/general/throwinnestedcatch.il
@@ -14,7 +14,9 @@
 .assembly extern xunit.core {}
 
 
-.class private auto ansi beforefieldinit test extends [mscorlib]System.Object
+.namespace Test_throwinnestedcatch_il
+{
+.class public auto ansi beforefieldinit test extends [mscorlib]System.Object
 {
   .field private static class [eh_common]TestUtil.TestLog testLog
   .method private hidebysig specialname rtspecialname static void  .cctor() cil managed
@@ -39,7 +41,7 @@
 
     ldloc.s    expectedOut
     newobj     instance void [eh_common]TestUtil.TestLog::.ctor(object)
-    stsfld     class [eh_common]TestUtil.TestLog test::testLog
+    stsfld     class [eh_common]TestUtil.TestLog Test_throwinnestedcatch_il.test::testLog
     ret
   } 
 
@@ -50,7 +52,7 @@
     )
     .entrypoint
 
-    ldsfld     class [eh_common]TestUtil.TestLog test::testLog
+    ldsfld     class [eh_common]TestUtil.TestLog Test_throwinnestedcatch_il.test::testLog
     callvirt   instance void [eh_common]TestUtil.TestLog::StartRecording()
       
     .try
@@ -90,12 +92,13 @@
       leave IL_END
     }
     IL_END:
-    ldsfld     class [eh_common]TestUtil.TestLog test::testLog
+    ldsfld     class [eh_common]TestUtil.TestLog Test_throwinnestedcatch_il.test::testLog
     callvirt   instance void [eh_common]TestUtil.TestLog::StopRecording()
       
-    ldsfld     class [eh_common]TestUtil.TestLog test::testLog
+    ldsfld     class [eh_common]TestUtil.TestLog Test_throwinnestedcatch_il.test::testLog
     callvirt   instance int32 [eh_common]TestUtil.TestLog::VerifyOutput()
 
     ret
   }  
 }
+}
diff --git a/src/tests/JIT/Methodical/eh/nested/general/throwinnestedcatch_il_d.ilproj b/src/tests/JIT/Methodical/eh/nested/general/throwinnestedcatch_il_d.ilproj
index e515cc4560f677..c3bdf18d3273d4 100644
--- a/src/tests/JIT/Methodical/eh/nested/general/throwinnestedcatch_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/nested/general/throwinnestedcatch_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/nested/general/throwinnestedcatch_il_r.ilproj b/src/tests/JIT/Methodical/eh/nested/general/throwinnestedcatch_il_r.ilproj
index 04aa3becd972a1..b16b772e0d064b 100644
--- a/src/tests/JIT/Methodical/eh/nested/general/throwinnestedcatch_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/nested/general/throwinnestedcatch_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/nested/general/throwinnestedfinally.cs b/src/tests/JIT/Methodical/eh/nested/general/throwinnestedfinally.cs
index ce3e55cb459fa9..e04a99cbd1520a 100644
--- a/src/tests/JIT/Methodical/eh/nested/general/throwinnestedfinally.cs
+++ b/src/tests/JIT/Methodical/eh/nested/general/throwinnestedfinally.cs
@@ -4,7 +4,10 @@
 // Throw from a try block nested in 2 finallys
 
 using System;
+using Xunit;
 
+namespace Test_throwinnestedfinally_general
+{
 public class a
 {
     private static TestUtil.TestLog testLog;
@@ -58,7 +61,8 @@ public static void MiddleMethod()
         Console.WriteLine("Unreached...");
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         //Start recording
         testLog.StartRecording();
@@ -78,3 +82,4 @@ public static int Main()
         return testLog.VerifyOutput();
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/eh/nested/general/throwinnestedfinally_d.csproj b/src/tests/JIT/Methodical/eh/nested/general/throwinnestedfinally_d.csproj
index 188620457be0fb..58100b851ea28f 100644
--- a/src/tests/JIT/Methodical/eh/nested/general/throwinnestedfinally_d.csproj
+++ b/src/tests/JIT/Methodical/eh/nested/general/throwinnestedfinally_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/nested/general/throwinnestedfinally_do.csproj b/src/tests/JIT/Methodical/eh/nested/general/throwinnestedfinally_do.csproj
index 5a8607104b5cc8..8b53f33aab4692 100644
--- a/src/tests/JIT/Methodical/eh/nested/general/throwinnestedfinally_do.csproj
+++ b/src/tests/JIT/Methodical/eh/nested/general/throwinnestedfinally_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/nested/general/throwinnestedfinally_r.csproj b/src/tests/JIT/Methodical/eh/nested/general/throwinnestedfinally_r.csproj
index 8d33d96719a954..7be6bdf776fd90 100644
--- a/src/tests/JIT/Methodical/eh/nested/general/throwinnestedfinally_r.csproj
+++ b/src/tests/JIT/Methodical/eh/nested/general/throwinnestedfinally_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/nested/general/throwinnestedfinally_ro.csproj b/src/tests/JIT/Methodical/eh/nested/general/throwinnestedfinally_ro.csproj
index 58c64045ef074f..eeea79a97c94b7 100644
--- a/src/tests/JIT/Methodical/eh/nested/general/throwinnestedfinally_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/nested/general/throwinnestedfinally_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/nested/general/trycatchintryfinally.cs b/src/tests/JIT/Methodical/eh/nested/general/trycatchintryfinally.cs
index dafeddd16171a7..f2076f640a5b15 100644
--- a/src/tests/JIT/Methodical/eh/nested/general/trycatchintryfinally.cs
+++ b/src/tests/JIT/Methodical/eh/nested/general/trycatchintryfinally.cs
@@ -4,7 +4,10 @@
 // Throw from a try block nested in finally, non error case
 
 using System;
+using Xunit;
 
+namespace Test_trycatchintryfinally_general
+{
 public class a
 {
     private static TestUtil.TestLog testLog;
@@ -48,7 +51,8 @@ public static void MiddleMethod()
         Console.WriteLine("Done.");
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         //Start recording
         testLog.StartRecording();
@@ -61,3 +65,4 @@ public static int Main()
         return testLog.VerifyOutput();
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/eh/nested/general/trycatchintryfinally_d.csproj b/src/tests/JIT/Methodical/eh/nested/general/trycatchintryfinally_d.csproj
index 033776e9935dac..3fee9720823e63 100644
--- a/src/tests/JIT/Methodical/eh/nested/general/trycatchintryfinally_d.csproj
+++ b/src/tests/JIT/Methodical/eh/nested/general/trycatchintryfinally_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/nested/general/trycatchintryfinally_do.csproj b/src/tests/JIT/Methodical/eh/nested/general/trycatchintryfinally_do.csproj
index ad3e344d2db652..3a716feaab9388 100644
--- a/src/tests/JIT/Methodical/eh/nested/general/trycatchintryfinally_do.csproj
+++ b/src/tests/JIT/Methodical/eh/nested/general/trycatchintryfinally_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/nested/general/trycatchintryfinally_r.csproj b/src/tests/JIT/Methodical/eh/nested/general/trycatchintryfinally_r.csproj
index dc6bb15446495f..0f282b3fa307bf 100644
--- a/src/tests/JIT/Methodical/eh/nested/general/trycatchintryfinally_r.csproj
+++ b/src/tests/JIT/Methodical/eh/nested/general/trycatchintryfinally_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/nested/general/trycatchintryfinally_ro.csproj b/src/tests/JIT/Methodical/eh/nested/general/trycatchintryfinally_ro.csproj
index 08a32bb340a9e7..d085efb2c9a151 100644
--- a/src/tests/JIT/Methodical/eh/nested/general/trycatchintryfinally_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/nested/general/trycatchintryfinally_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch.il b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch.il
index ba1f91c2bf1179..8348bfc63db989 100644
--- a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch.il
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch.il
@@ -6,6 +6,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
+.assembly extern xunit.core {}
 .assembly extern mscorlib {}
 .assembly extern eh_common {}
 .assembly 'nestedtrycatch' {}
@@ -14,6 +15,9 @@
 
 .class public auto ansi Test_nestedtrycatch extends [mscorlib] System.Object {
 .method public static int32 main() {
+  .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+      01 00 00 00
+  )
   .entrypoint
   .maxstack  2
   .locals init (
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch_il_d.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch_il_d.ilproj
index 092458e188a121..df5230ec85cd29 100644
--- a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch_il_r.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch_il_r.ilproj
index b86bf019c45ea5..94b45bf7bef498 100644
--- a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept.il b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept.il
index 948aa07b0e418c..d0e4fab33aff05 100644
--- a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept.il
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept.il
@@ -6,6 +6,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
+.assembly extern xunit.core {}
 .assembly extern mscorlib {}
 .assembly extern eh_common {}
 .assembly 'nestedtryexcept' {}
@@ -14,6 +15,9 @@
 
 .class public auto ansi Test_nestedtryexcept extends [mscorlib] System.Object {
 .method public static int32 main() {
+  .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+      01 00 00 00
+  )
   .entrypoint
   .maxstack  2
   .locals init (
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept_il_d.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept_il_d.ilproj
index 543be74411224b..f04572ca63e9f3 100644
--- a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept_il_r.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept_il_r.ilproj
index 3af1a81c101ec0..5119f10cad442f 100644
--- a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfault.il b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfault.il
index cb4af7c0a36f17..5fa2dddb52b561 100644
--- a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfault.il
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfault.il
@@ -6,6 +6,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
+.assembly extern xunit.core {}
 .assembly extern mscorlib {}
 .assembly extern eh_common {}
 .assembly 'nestedtryfault' {}
@@ -14,6 +15,9 @@
 
 .class public auto ansi Test_nestedtryfault extends [mscorlib] System.Object {
 .method public static int32 main() {
+  .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+      01 00 00 00
+  )
   .entrypoint
   .maxstack  2
   .locals init (
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfault_il_d.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfault_il_d.ilproj
index 879fdac64ff2e1..1b098390d3ec30 100644
--- a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfault_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfault_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfault_il_r.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfault_il_r.ilproj
index 15c97509e2a637..305136c13afba7 100644
--- a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfault_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfault_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally.il b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally.il
index a5fa0858d87968..59048a79f61b33 100644
--- a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally.il
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally.il
@@ -6,6 +6,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
+.assembly extern xunit.core {}
 .assembly extern mscorlib {}
 .assembly extern eh_common {}
 .assembly 'nestedtryfinally' {}
@@ -14,6 +15,9 @@
 
 .class public auto ansi Test_nestedtryfinally extends [mscorlib] System.Object {
 .method public static int32 main() {
+  .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+      01 00 00 00
+  )
   .entrypoint
   .maxstack  2
   .locals init (
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally_il_d.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally_il_d.ilproj
index ccde14e3c5e0ce..da0235b46c275d 100644
--- a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally_il_r.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally_il_r.ilproj
index fd5769c4efc19e..5ebd7728a4d634 100644
--- a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch.il b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch.il
index 0d5a9b682d2d4f..78a81c73c59b0e 100644
--- a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch.il
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch.il
@@ -6,6 +6,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
+.assembly extern xunit.core {}
 .assembly extern mscorlib {}
 .assembly extern eh_common {}
 .assembly 'throwinnestedtrycatch' {}
@@ -14,6 +15,9 @@
 
 .class public auto ansi Test_throwinnestedtrycatch extends [mscorlib] System.Object {
 .method public static int32 main() {
+  .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+      01 00 00 00
+  )
   .entrypoint
   .maxstack  2
   .locals init (
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch_il_d.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch_il_d.ilproj
index 2d70095397b8ad..1f16c9fc1b9ee1 100644
--- a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch_il_r.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch_il_r.ilproj
index 6dc7b6d86088fe..3060d049b82027 100644
--- a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept.il b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept.il
index d7f0f1ed8e91f5..66220c2b861fff 100644
--- a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept.il
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept.il
@@ -6,6 +6,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
+.assembly extern xunit.core {}
 .assembly extern mscorlib {}
 .assembly extern eh_common {}
 .assembly 'throwinnestedtryexcept' {}
@@ -14,6 +15,9 @@
 
 .class public auto ansi Test_throwinnestedtryexcept extends [mscorlib] System.Object {
 .method public static int32 main() {
+  .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+      01 00 00 00
+  )
   .entrypoint
   .maxstack  2
   .locals init (
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept_il_d.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept_il_d.ilproj
index 37bc5031fd8935..194646e27f92ce 100644
--- a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept_il_r.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept_il_r.ilproj
index 6c9b51deb8a999..58d1ae46cb90e1 100644
--- a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault.il b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault.il
index 8df59bb51b9def..a0a064f14318c4 100644
--- a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault.il
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault.il
@@ -6,6 +6,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
+.assembly extern xunit.core {}
 .assembly extern mscorlib {}
 .assembly extern eh_common {}
 .assembly 'throwinnestedtryfault' {}
@@ -14,6 +15,9 @@
 
 .class public auto ansi Test_throwinnestedtryfault extends [mscorlib] System.Object {
 .method public static int32 main() {
+  .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+      01 00 00 00
+  )
   .entrypoint
   .maxstack  2
   .locals init (
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault_il_d.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault_il_d.ilproj
index 7fc6417667db25..891fe8891b5ad2 100644
--- a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault_il_r.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault_il_r.ilproj
index 8c78e449537c79..d89d0cf3509395 100644
--- a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally.il b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally.il
index 60bd92d039f92a..93f2aad0f71cb3 100644
--- a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally.il
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally.il
@@ -6,6 +6,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
+.assembly extern xunit.core {}
 .assembly extern mscorlib {}
 .assembly extern eh_common {}
 .assembly 'throwinnestedtryfinally' {}
@@ -14,6 +15,9 @@
 
 .class public auto ansi Test_throwinnestedtryfinally extends [mscorlib] System.Object {
 .method public static int32 main() {
+  .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+      01 00 00 00
+  )
   .entrypoint
   .maxstack  2
   .locals init (
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally_il_d.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally_il_d.ilproj
index 5877d8fc409455..55e41ff358069f 100644
--- a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally_il_r.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally_il_r.ilproj
index c5e6fb55352d99..3979ccf232c277 100644
--- a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinally_50.cs b/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinally_50.cs
index e0fac50cf8a051..3fe57267c27df7 100644
--- a/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinally_50.cs
+++ b/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinally_50.cs
@@ -2,9 +2,12 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
+namespace Test_throwinfinally_50_cs
+{
 // levels of nesting = 50
-class Class1
+public class Class1
 {
     private static TestUtil.TestLog testLog;
 
@@ -829,7 +832,8 @@ static public void foo(int i)
     }
 
 
-    static public int Main()
+    [Fact]
+    static public int TestEntryPoint()
     {
         //Start recording
         testLog.StartRecording();
@@ -851,3 +855,4 @@ static public int Main()
         return testLog.VerifyOutput();
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinally_50_d.csproj b/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinally_50_d.csproj
index 1a645df98599b5..f38686416f9686 100644
--- a/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinally_50_d.csproj
+++ b/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinally_50_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinally_50_do.csproj b/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinally_50_do.csproj
index f9b08eec5959d5..d4f7f003a895ad 100644
--- a/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinally_50_do.csproj
+++ b/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinally_50_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinally_50_r.csproj b/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinally_50_r.csproj
index a37ce0aa8e587b..d17fde0def6b63 100644
--- a/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinally_50_r.csproj
+++ b/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinally_50_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinally_50_ro.csproj b/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinally_50_ro.csproj
index 4413a92debe813..1640b54989007b 100644
--- a/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinally_50_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinally_50_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallynestedintry_30.cs b/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallynestedintry_30.cs
index c43352061d10e8..96a1bb1f96ce87 100644
--- a/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallynestedintry_30.cs
+++ b/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallynestedintry_30.cs
@@ -2,9 +2,12 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
+namespace Test_throwinfinallynestedintry_30_cs
+{
 // levels of nesting = 30
-class Class1
+public class Class1
 {
     private static TestUtil.TestLog testLog;
 
@@ -1401,7 +1404,8 @@ static public void foo(int i)
     }
 
 
-    static public int Main()
+    [Fact]
+    static public int TestEntryPoint()
     {
         //Start recording
         testLog.StartRecording();
@@ -1423,3 +1427,4 @@ static public int Main()
         return testLog.VerifyOutput();
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallynestedintry_30_d.csproj b/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallynestedintry_30_d.csproj
index 37afc59e86f97d..f8b63f3c337507 100644
--- a/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallynestedintry_30_d.csproj
+++ b/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallynestedintry_30_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallynestedintry_30_do.csproj b/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallynestedintry_30_do.csproj
index bbbab575c92736..ed0127d3aca646 100644
--- a/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallynestedintry_30_do.csproj
+++ b/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallynestedintry_30_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallynestedintry_30_r.csproj b/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallynestedintry_30_r.csproj
index bc4b50a83cf895..accf2ebc5e6b3f 100644
--- a/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallynestedintry_30_r.csproj
+++ b/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallynestedintry_30_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallynestedintry_30_ro.csproj b/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallynestedintry_30_ro.csproj
index 739efe1dfdd667..de4b97b267982e 100644
--- a/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallynestedintry_30_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallynestedintry_30_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallyrecursive_20.cs b/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallyrecursive_20.cs
index 389f5e3cb5cd56..1338b33e9c9997 100644
--- a/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallyrecursive_20.cs
+++ b/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallyrecursive_20.cs
@@ -2,9 +2,12 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
+namespace Test_throwinfinallyrecursive_20_cs
+{
 // levels of nesting = 20
-class Class1
+public class Class1
 {
     private static TestUtil.TestLog testLog;
 
@@ -1631,7 +1634,8 @@ static public void foo(int i)
     }
 
 
-    static public int Main()
+    [Fact]
+    static public int TestEntryPoint()
     {
         //Start recording
         testLog.StartRecording();
@@ -1653,3 +1657,4 @@ static public int Main()
         return testLog.VerifyOutput();
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallyrecursive_20_d.csproj b/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallyrecursive_20_d.csproj
index e6d506c7ec9f2e..ce5b96f2148336 100644
--- a/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallyrecursive_20_d.csproj
+++ b/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallyrecursive_20_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallyrecursive_20_do.csproj b/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallyrecursive_20_do.csproj
index 1feb65fe447a31..345d19936c460d 100644
--- a/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallyrecursive_20_do.csproj
+++ b/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallyrecursive_20_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallyrecursive_20_r.csproj b/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallyrecursive_20_r.csproj
index 0c2937f832c1d2..4cc7f8838b63b4 100644
--- a/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallyrecursive_20_r.csproj
+++ b/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallyrecursive_20_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallyrecursive_20_ro.csproj b/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallyrecursive_20_ro.csproj
index 6135cd6ed8cb97..013ce915384285 100644
--- a/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallyrecursive_20_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallyrecursive_20_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/regress/asurt/122239/outermostFinally.cs b/src/tests/JIT/Methodical/eh/regress/asurt/122239/outermostFinally.cs
index 02c3b91d90aac3..8339ad0257c0bd 100644
--- a/src/tests/JIT/Methodical/eh/regress/asurt/122239/outermostFinally.cs
+++ b/src/tests/JIT/Methodical/eh/regress/asurt/122239/outermostFinally.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace test
+namespace test_outermostFinally
 {
-    class Class1
+    public class Class1
     {
         private static TestUtil.TestLog testLog;
 
@@ -26,7 +27,8 @@ static Class1()
             testLog = new TestUtil.TestLog(expectedOut);
         }
 
-        static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             int[] array = { 1, 2, 3, 4, 5, 6 };
 
diff --git a/src/tests/JIT/Methodical/eh/regress/asurt/122239/outermostFinally.csproj b/src/tests/JIT/Methodical/eh/regress/asurt/122239/outermostFinally.csproj
index c7096bd5bfe84f..717f9fa50a87b6 100644
--- a/src/tests/JIT/Methodical/eh/regress/asurt/122239/outermostFinally.csproj
+++ b/src/tests/JIT/Methodical/eh/regress/asurt/122239/outermostFinally.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/regress/asurt/140713/innerFinally.cs b/src/tests/JIT/Methodical/eh/regress/asurt/140713/innerFinally.cs
index 13aac3c34a87a0..668f131e32af16 100644
--- a/src/tests/JIT/Methodical/eh/regress/asurt/140713/innerFinally.cs
+++ b/src/tests/JIT/Methodical/eh/regress/asurt/140713/innerFinally.cs
@@ -2,11 +2,12 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace test
+namespace test_innerFinally
 {
 
-    class Class1
+    public class Class1
     {
 
         private static TestUtil.TestLog testLog;
@@ -29,7 +30,8 @@ static Class1()
             // Create and initialize test log object
             testLog = new TestUtil.TestLog(expectedOut);
         }
-        static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             int x = 7, y = 0, z;
             //Start recording
diff --git a/src/tests/JIT/Methodical/eh/regress/asurt/140713/innerFinally_d.csproj b/src/tests/JIT/Methodical/eh/regress/asurt/140713/innerFinally_d.csproj
index 866898afecfd1c..e8d9c4906ba964 100644
--- a/src/tests/JIT/Methodical/eh/regress/asurt/140713/innerFinally_d.csproj
+++ b/src/tests/JIT/Methodical/eh/regress/asurt/140713/innerFinally_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/regress/asurt/140713/innerFinally_do.csproj b/src/tests/JIT/Methodical/eh/regress/asurt/140713/innerFinally_do.csproj
index 8a4f87c6bc8253..e9e30520b14ef2 100644
--- a/src/tests/JIT/Methodical/eh/regress/asurt/140713/innerFinally_do.csproj
+++ b/src/tests/JIT/Methodical/eh/regress/asurt/140713/innerFinally_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/regress/asurt/140713/innerFinally_r.csproj b/src/tests/JIT/Methodical/eh/regress/asurt/140713/innerFinally_r.csproj
index 7ad67f2ef6df39..921b5e4b12df21 100644
--- a/src/tests/JIT/Methodical/eh/regress/asurt/140713/innerFinally_r.csproj
+++ b/src/tests/JIT/Methodical/eh/regress/asurt/140713/innerFinally_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/regress/asurt/140713/innerFinally_ro.csproj b/src/tests/JIT/Methodical/eh/regress/asurt/140713/innerFinally_ro.csproj
index 4709184f08b16a..e62c47ceaf1ad1 100644
--- a/src/tests/JIT/Methodical/eh/regress/asurt/140713/innerFinally_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/regress/asurt/140713/innerFinally_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/regress/asurt/141358/uncaughtException.cs b/src/tests/JIT/Methodical/eh/regress/asurt/141358/uncaughtException.cs
index ba882c232506c9..c339bf5326392c 100644
--- a/src/tests/JIT/Methodical/eh/regress/asurt/141358/uncaughtException.cs
+++ b/src/tests/JIT/Methodical/eh/regress/asurt/141358/uncaughtException.cs
@@ -2,11 +2,12 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace test
+namespace test_uncaughtException
 {
 
-    class Class1
+    public class Class1
     {
 
         private static TestUtil.TestLog testLog;
@@ -30,7 +31,8 @@ static Class1()
             // Create and initialize test log object
             testLog = new TestUtil.TestLog(expectedOut);
         }
-        static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             //Start recording
             testLog.StartRecording();
diff --git a/src/tests/JIT/Methodical/eh/regress/asurt/141358/uncaughtException_d.csproj b/src/tests/JIT/Methodical/eh/regress/asurt/141358/uncaughtException_d.csproj
index 53fb4734aae198..a65b43bf723df2 100644
--- a/src/tests/JIT/Methodical/eh/regress/asurt/141358/uncaughtException_d.csproj
+++ b/src/tests/JIT/Methodical/eh/regress/asurt/141358/uncaughtException_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/regress/asurt/141358/uncaughtException_do.csproj b/src/tests/JIT/Methodical/eh/regress/asurt/141358/uncaughtException_do.csproj
index 474a329e88c52a..39f3b0e075a007 100644
--- a/src/tests/JIT/Methodical/eh/regress/asurt/141358/uncaughtException_do.csproj
+++ b/src/tests/JIT/Methodical/eh/regress/asurt/141358/uncaughtException_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/regress/asurt/141358/uncaughtException_r.csproj b/src/tests/JIT/Methodical/eh/regress/asurt/141358/uncaughtException_r.csproj
index 61a3aa55104f76..4a1983488dd51e 100644
--- a/src/tests/JIT/Methodical/eh/regress/asurt/141358/uncaughtException_r.csproj
+++ b/src/tests/JIT/Methodical/eh/regress/asurt/141358/uncaughtException_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/regress/asurt/141358/uncaughtException_ro.csproj b/src/tests/JIT/Methodical/eh/regress/asurt/141358/uncaughtException_ro.csproj
index 27d83dfeb3181d..aa87b35910fbc7 100644
--- a/src/tests/JIT/Methodical/eh/regress/asurt/141358/uncaughtException_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/regress/asurt/141358/uncaughtException_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/regress/vswhidbey/148190/baduwinfo.cs b/src/tests/JIT/Methodical/eh/regress/vswhidbey/148190/baduwinfo.cs
index 797a22be453345..2474c759d51d71 100644
--- a/src/tests/JIT/Methodical/eh/regress/vswhidbey/148190/baduwinfo.cs
+++ b/src/tests/JIT/Methodical/eh/regress/vswhidbey/148190/baduwinfo.cs
@@ -2,8 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-class Test_baduwinfo
+public class Test_baduwinfo
 {
     private static TestUtil.TestLog testLog;
     static Test_baduwinfo()
@@ -113,7 +114,8 @@ public static int foo()
         }
         return ret;
     }
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         String s = "Test1";
 
diff --git a/src/tests/JIT/Methodical/eh/regress/vswhidbey/148190/baduwinfo.csproj b/src/tests/JIT/Methodical/eh/regress/vswhidbey/148190/baduwinfo.csproj
index af65afdc74de17..af9b7952114b89 100644
--- a/src/tests/JIT/Methodical/eh/regress/vswhidbey/148190/baduwinfo.csproj
+++ b/src/tests/JIT/Methodical/eh/regress/vswhidbey/148190/baduwinfo.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/regress/vswhidbey/148190/baduwinfo1.cs b/src/tests/JIT/Methodical/eh/regress/vswhidbey/148190/baduwinfo1.cs
index d0f9e96f327389..6a0084ee14d1c6 100644
--- a/src/tests/JIT/Methodical/eh/regress/vswhidbey/148190/baduwinfo1.cs
+++ b/src/tests/JIT/Methodical/eh/regress/vswhidbey/148190/baduwinfo1.cs
@@ -2,8 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-class Test_baduwinfo1
+public class Test_baduwinfo1
 {
     private static TestUtil.TestLog testLog;
 
@@ -115,7 +116,8 @@ public static int foo()
         }
         return ret;
     }
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         String s = "Test1";
         testLog.StartRecording();
diff --git a/src/tests/JIT/Methodical/eh/regress/vswhidbey/148190/baduwinfo1.csproj b/src/tests/JIT/Methodical/eh/regress/vswhidbey/148190/baduwinfo1.csproj
index 9f83ef71330cc7..036aa8edf35102 100644
--- a/src/tests/JIT/Methodical/eh/regress/vswhidbey/148190/baduwinfo1.csproj
+++ b/src/tests/JIT/Methodical/eh/regress/vswhidbey/148190/baduwinfo1.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyaftercatch.cs b/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyaftercatch.cs
index 94d098d2ce7dec..d72d20e385499f 100644
--- a/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyaftercatch.cs
+++ b/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyaftercatch.cs
@@ -11,10 +11,11 @@
 //
 
 using System;
+using Xunit;
 
-namespace Test
+namespace Test_rethrowinfinallyaftercatch_cs
 {
-    class Class1
+    public class Class1
     {
         private static TestUtil.TestLog testLog;
 
@@ -36,7 +37,8 @@ static Class1()
             testLog = new TestUtil.TestLog(expectedOut);
         }
 
-        static public int Main()
+        [Fact]
+        static public int TestEntryPoint()
         {
             //Start recording
             testLog.StartRecording();
diff --git a/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyaftercatch_d.csproj b/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyaftercatch_d.csproj
index 01858451d49040..b88274eb54f50e 100644
--- a/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyaftercatch_d.csproj
+++ b/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyaftercatch_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyaftercatch_do.csproj b/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyaftercatch_do.csproj
index 745b5ebc04b6c6..665739ceaa926e 100644
--- a/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyaftercatch_do.csproj
+++ b/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyaftercatch_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyaftercatch_r.csproj b/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyaftercatch_r.csproj
index b6e2c07d66fc03..fe7b54ff248d5c 100644
--- a/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyaftercatch_r.csproj
+++ b/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyaftercatch_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyaftercatch_ro.csproj b/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyaftercatch_ro.csproj
index eadf8765580322..f738fd05b19eb5 100644
--- a/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyaftercatch_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyaftercatch_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch.il b/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch.il
index ea985dc848fe70..5b714ee9419de9 100644
--- a/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch.il
+++ b/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch.il
@@ -12,9 +12,9 @@
 .assembly extern xunit.core {}
 
 
-.namespace Test
+.namespace Test_rethrowinfinallyinsidecatch_il
 {
-  .class private auto ansi beforefieldinit Class1
+  .class public auto ansi beforefieldinit Class1
          extends [mscorlib]System.Object
   {
     .field private static class [eh_common]TestUtil.TestLog testLog
@@ -49,7 +49,7 @@
 
       ldloc.s    expectedOut
       newobj     instance void [eh_common]TestUtil.TestLog::.ctor(object)
-      stsfld     class [eh_common]TestUtil.TestLog Test.Class1::testLog
+      stsfld     class [eh_common]TestUtil.TestLog Test_rethrowinfinallyinsidecatch_il.Class1::testLog
       ret
     } 
 
@@ -66,7 +66,7 @@
                class [mscorlib]System.Exception e,
                int32 V_3)
 
-      ldsfld     class [eh_common]TestUtil.TestLog Test.Class1::testLog
+      ldsfld     class [eh_common]TestUtil.TestLog Test_rethrowinfinallyinsidecatch_il.Class1::testLog
       callvirt   instance void [eh_common]TestUtil.TestLog::StartRecording()
 
       .try
@@ -142,10 +142,10 @@
 
       }  
       L3:  
-      ldsfld     class [eh_common]TestUtil.TestLog Test.Class1::testLog
+      ldsfld     class [eh_common]TestUtil.TestLog Test_rethrowinfinallyinsidecatch_il.Class1::testLog
       callvirt   instance void [eh_common]TestUtil.TestLog::StopRecording()
       
-      ldsfld     class [eh_common]TestUtil.TestLog Test.Class1::testLog
+      ldsfld     class [eh_common]TestUtil.TestLog Test_rethrowinfinallyinsidecatch_il.Class1::testLog
       callvirt   instance int32 [eh_common]TestUtil.TestLog::VerifyOutput()
 
       ret
diff --git a/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch_il_d.ilproj b/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch_il_d.ilproj
index 1c3bcfb087a629..70695dc268af6f 100644
--- a/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch_il_r.ilproj b/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch_il_r.ilproj
index 7b170ed6437cd4..6b6ae456b2101e 100644
--- a/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch_il_r.ilproj
@@ -1,6 +1,5 @@
     <Project Sdk="Microsoft.NET.Sdk.IL">
       <PropertyGroup>
-        <OutputType>Exe</OutputType>
         <CLRTestPriority>1</CLRTestPriority>
       </PropertyGroup>
       <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/rethrow/rethrowwithhandlerscatchingbase.cs b/src/tests/JIT/Methodical/eh/rethrow/rethrowwithhandlerscatchingbase.cs
index 0851b29cec52f3..6d2cc12b62a19e 100644
--- a/src/tests/JIT/Methodical/eh/rethrow/rethrowwithhandlerscatchingbase.cs
+++ b/src/tests/JIT/Methodical/eh/rethrow/rethrowwithhandlerscatchingbase.cs
@@ -7,10 +7,11 @@
 // clauses that catch the base class of the exception being rethrown
 using System;
 using System.IO;
+using Xunit;
 
-namespace hello
+namespace hello_rethrowwithhandlerscatchingbase_rethrow_cs
 {
-    class Class1
+    public class Class1
     {
         private static TestUtil.TestLog testLog;
 
@@ -55,7 +56,8 @@ static public void f1()
             }
         }
 
-        static public int Main()
+        [Fact]
+        static public int TestEntryPoint()
         {
             //Start recording
             testLog.StartRecording();
diff --git a/src/tests/JIT/Methodical/eh/rethrow/rethrowwithhandlerscatchingbase_d.csproj b/src/tests/JIT/Methodical/eh/rethrow/rethrowwithhandlerscatchingbase_d.csproj
index a70e1303588c54..c3eb3550c607b4 100644
--- a/src/tests/JIT/Methodical/eh/rethrow/rethrowwithhandlerscatchingbase_d.csproj
+++ b/src/tests/JIT/Methodical/eh/rethrow/rethrowwithhandlerscatchingbase_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/rethrow/rethrowwithhandlerscatchingbase_do.csproj b/src/tests/JIT/Methodical/eh/rethrow/rethrowwithhandlerscatchingbase_do.csproj
index 97a3f1b613ae01..7563bf06f8d2cf 100644
--- a/src/tests/JIT/Methodical/eh/rethrow/rethrowwithhandlerscatchingbase_do.csproj
+++ b/src/tests/JIT/Methodical/eh/rethrow/rethrowwithhandlerscatchingbase_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/rethrow/rethrowwithhandlerscatchingbase_r.csproj b/src/tests/JIT/Methodical/eh/rethrow/rethrowwithhandlerscatchingbase_r.csproj
index 611f61a5cf3bb7..084478d7d53b54 100644
--- a/src/tests/JIT/Methodical/eh/rethrow/rethrowwithhandlerscatchingbase_r.csproj
+++ b/src/tests/JIT/Methodical/eh/rethrow/rethrowwithhandlerscatchingbase_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/rethrow/rethrowwithhandlerscatchingbase_ro.csproj b/src/tests/JIT/Methodical/eh/rethrow/rethrowwithhandlerscatchingbase_ro.csproj
index 5a9b99c2af3a08..9e2a05c8051176 100644
--- a/src/tests/JIT/Methodical/eh/rethrow/rethrowwithhandlerscatchingbase_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/rethrow/rethrowwithhandlerscatchingbase_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/rethrow/samerethrowtwice.cs b/src/tests/JIT/Methodical/eh/rethrow/samerethrowtwice.cs
index 195be061360a7f..d3b445ddcbb8d1 100644
--- a/src/tests/JIT/Methodical/eh/rethrow/samerethrowtwice.cs
+++ b/src/tests/JIT/Methodical/eh/rethrow/samerethrowtwice.cs
@@ -6,10 +6,11 @@
 // execute the same throw in handler (int f1, f2) twice (accomplished by calling f1 twice)
 
 using System;
+using Xunit;
 
-namespace hello
+namespace hello_samerethrowtwice_rethrow_cs
 {
-    class Class1
+    public class Class1
     {
         private static TestUtil.TestLog testLog;
 
@@ -68,7 +69,8 @@ static public void f1()
             }
         }
 
-        static public int Main()
+        [Fact]
+        static public int TestEntryPoint()
         {
             //Start recording
             testLog.StartRecording();
diff --git a/src/tests/JIT/Methodical/eh/rethrow/samerethrowtwice_d.csproj b/src/tests/JIT/Methodical/eh/rethrow/samerethrowtwice_d.csproj
index 0eaa0ee81e6a3c..9d1b39495541bb 100644
--- a/src/tests/JIT/Methodical/eh/rethrow/samerethrowtwice_d.csproj
+++ b/src/tests/JIT/Methodical/eh/rethrow/samerethrowtwice_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/rethrow/samerethrowtwice_do.csproj b/src/tests/JIT/Methodical/eh/rethrow/samerethrowtwice_do.csproj
index ac7164570eda8c..390b3486700e8e 100644
--- a/src/tests/JIT/Methodical/eh/rethrow/samerethrowtwice_do.csproj
+++ b/src/tests/JIT/Methodical/eh/rethrow/samerethrowtwice_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/rethrow/samerethrowtwice_r.csproj b/src/tests/JIT/Methodical/eh/rethrow/samerethrowtwice_r.csproj
index 14a4c7e65f95fb..f36fc5b40f08b0 100644
--- a/src/tests/JIT/Methodical/eh/rethrow/samerethrowtwice_r.csproj
+++ b/src/tests/JIT/Methodical/eh/rethrow/samerethrowtwice_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/rethrow/samerethrowtwice_ro.csproj b/src/tests/JIT/Methodical/eh/rethrow/samerethrowtwice_ro.csproj
index 87d117d0af9fe7..6c3bde65d413a2 100644
--- a/src/tests/JIT/Methodical/eh/rethrow/samerethrowtwice_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/rethrow/samerethrowtwice_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/rethrow/samethrowtwice.cs b/src/tests/JIT/Methodical/eh/rethrow/samethrowtwice.cs
index d7263040debdd0..4c46c8095270bd 100644
--- a/src/tests/JIT/Methodical/eh/rethrow/samethrowtwice.cs
+++ b/src/tests/JIT/Methodical/eh/rethrow/samethrowtwice.cs
@@ -5,10 +5,11 @@
 // execute the same throw in handler (int f1, f2) twice (accomplished by calling f1 twice)
 
 using System;
+using Xunit;
 
-namespace hello
+namespace hello_samethrowtwice_rethrow_cs
 {
-    class Class1
+    public class Class1
     {
         private static TestUtil.TestLog testLog;
 
@@ -67,7 +68,8 @@ static public void f1()
             }
         }
 
-        static public int Main()
+        [Fact]
+        static public int TestEntryPoint()
         {
             //Start recording
             testLog.StartRecording();
diff --git a/src/tests/JIT/Methodical/eh/rethrow/samethrowtwice_d.csproj b/src/tests/JIT/Methodical/eh/rethrow/samethrowtwice_d.csproj
index 5261b784fe77b8..ab67f7e2ad67d6 100644
--- a/src/tests/JIT/Methodical/eh/rethrow/samethrowtwice_d.csproj
+++ b/src/tests/JIT/Methodical/eh/rethrow/samethrowtwice_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/rethrow/samethrowtwice_do.csproj b/src/tests/JIT/Methodical/eh/rethrow/samethrowtwice_do.csproj
index c1d394e1b023ce..002bd582ade7ee 100644
--- a/src/tests/JIT/Methodical/eh/rethrow/samethrowtwice_do.csproj
+++ b/src/tests/JIT/Methodical/eh/rethrow/samethrowtwice_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/rethrow/samethrowtwice_r.csproj b/src/tests/JIT/Methodical/eh/rethrow/samethrowtwice_r.csproj
index 4a0b8db8a2fd83..67893f2e098da1 100644
--- a/src/tests/JIT/Methodical/eh/rethrow/samethrowtwice_r.csproj
+++ b/src/tests/JIT/Methodical/eh/rethrow/samethrowtwice_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/rethrow/samethrowtwice_ro.csproj b/src/tests/JIT/Methodical/eh/rethrow/samethrowtwice_ro.csproj
index 808437daf52f62..28c0828b1c8b93 100644
--- a/src/tests/JIT/Methodical/eh/rethrow/samethrowtwice_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/rethrow/samethrowtwice_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/rethrow/simplerethrow.cs b/src/tests/JIT/Methodical/eh/rethrow/simplerethrow.cs
index 48ee6357a8258e..4b6c489ae00124 100644
--- a/src/tests/JIT/Methodical/eh/rethrow/simplerethrow.cs
+++ b/src/tests/JIT/Methodical/eh/rethrow/simplerethrow.cs
@@ -4,10 +4,11 @@
 // simple rethrow test 
 
 using System;
+using Xunit;
 
-namespace hello
+namespace hello_simplerethrow_rethrow_cs
 {
-    class Class1
+    public class Class1
     {
         private static TestUtil.TestLog testLog;
 
@@ -26,7 +27,8 @@ static Class1()
             testLog = new TestUtil.TestLog(expectedOut);
         }
 
-        static public int Main()
+        [Fact]
+        static public int TestEntryPoint()
         {
             //Start recording
             testLog.StartRecording();
diff --git a/src/tests/JIT/Methodical/eh/rethrow/simplerethrow_d.csproj b/src/tests/JIT/Methodical/eh/rethrow/simplerethrow_d.csproj
index a3627f1d3af3a3..358201ae77b6ee 100644
--- a/src/tests/JIT/Methodical/eh/rethrow/simplerethrow_d.csproj
+++ b/src/tests/JIT/Methodical/eh/rethrow/simplerethrow_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/rethrow/simplerethrow_do.csproj b/src/tests/JIT/Methodical/eh/rethrow/simplerethrow_do.csproj
index 02ac6a3f988f57..3aca83edab531c 100644
--- a/src/tests/JIT/Methodical/eh/rethrow/simplerethrow_do.csproj
+++ b/src/tests/JIT/Methodical/eh/rethrow/simplerethrow_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/rethrow/simplerethrow_r.csproj b/src/tests/JIT/Methodical/eh/rethrow/simplerethrow_r.csproj
index 825982b2c9aaef..aee5d009d1d84a 100644
--- a/src/tests/JIT/Methodical/eh/rethrow/simplerethrow_r.csproj
+++ b/src/tests/JIT/Methodical/eh/rethrow/simplerethrow_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/rethrow/simplerethrow_ro.csproj b/src/tests/JIT/Methodical/eh/rethrow/simplerethrow_ro.csproj
index 0d74d0bf048181..8d929e4cdda2ee 100644
--- a/src/tests/JIT/Methodical/eh/rethrow/simplerethrow_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/rethrow/simplerethrow_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/rethrow/throwwithhandlerscatchingbase.cs b/src/tests/JIT/Methodical/eh/rethrow/throwwithhandlerscatchingbase.cs
index 3ebfe08c752e1c..6efe9d6d45d100 100644
--- a/src/tests/JIT/Methodical/eh/rethrow/throwwithhandlerscatchingbase.cs
+++ b/src/tests/JIT/Methodical/eh/rethrow/throwwithhandlerscatchingbase.cs
@@ -7,10 +7,11 @@
 
 using System;
 using System.IO;
+using Xunit;
 
-namespace hello
+namespace hello_throwwithhandlerscatchingbase_rethrow_cs
 {
-    class Class1
+    public class Class1
     {
         private static TestUtil.TestLog testLog;
 
@@ -55,7 +56,8 @@ static public void f1()
             }
         }
 
-        static public int Main()
+        [Fact]
+        static public int TestEntryPoint()
         {
             //Start recording
             testLog.StartRecording();
diff --git a/src/tests/JIT/Methodical/eh/rethrow/throwwithhandlerscatchingbase_d.csproj b/src/tests/JIT/Methodical/eh/rethrow/throwwithhandlerscatchingbase_d.csproj
index e495a0ae80f82d..b630e295ffd9cb 100644
--- a/src/tests/JIT/Methodical/eh/rethrow/throwwithhandlerscatchingbase_d.csproj
+++ b/src/tests/JIT/Methodical/eh/rethrow/throwwithhandlerscatchingbase_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/rethrow/throwwithhandlerscatchingbase_do.csproj b/src/tests/JIT/Methodical/eh/rethrow/throwwithhandlerscatchingbase_do.csproj
index 3e9da1b05bd7da..bf810c63f05456 100644
--- a/src/tests/JIT/Methodical/eh/rethrow/throwwithhandlerscatchingbase_do.csproj
+++ b/src/tests/JIT/Methodical/eh/rethrow/throwwithhandlerscatchingbase_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/eh/rethrow/throwwithhandlerscatchingbase_r.csproj b/src/tests/JIT/Methodical/eh/rethrow/throwwithhandlerscatchingbase_r.csproj
index 18709fa130cd90..8c4e4b8caab525 100644
--- a/src/tests/JIT/Methodical/eh/rethrow/throwwithhandlerscatchingbase_r.csproj
+++ b/src/tests/JIT/Methodical/eh/rethrow/throwwithhandlerscatchingbase_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/eh/rethrow/throwwithhandlerscatchingbase_ro.csproj b/src/tests/JIT/Methodical/eh/rethrow/throwwithhandlerscatchingbase_ro.csproj
index 2846b1edb2a42d..f3a963c402656e 100644
--- a/src/tests/JIT/Methodical/eh/rethrow/throwwithhandlerscatchingbase_ro.csproj
+++ b/src/tests/JIT/Methodical/eh/rethrow/throwwithhandlerscatchingbase_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_c.cs b/src/tests/JIT/Methodical/explicit/basic/refarg_c.cs
index 3ec76f1706c12b..67ea0f5c8b09d8 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_c.cs
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_c.cs
@@ -2,8 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace Test
+namespace Test_refarg_c_cs
 {
     internal class AA
     {
@@ -28,7 +29,7 @@ internal class AA
         }
     }
 
-    internal class App
+    public class App
     {
         private static AA s_aa = new AA();
         public static int exitCode = 1;
@@ -51,7 +52,8 @@ private static void Test(ref char n)
             exitCode = 100;
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             Test(ref s_aa.mm);
             GC.Collect();
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_c.il b/src/tests/JIT/Methodical/explicit/basic/refarg_c.il
index cf9d0dd3945678..a1d22ab45c76ba 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_c.il
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_c.il
@@ -19,12 +19,12 @@
 }
 .assembly extern xunit.core {}
 // MVID: {E2604B1E-0A0A-41BB-B225-61A4B5873CA3}
-.namespace Test
+.namespace Test_refarg_c_il
 {
   .class private auto ansi AA extends ['mscorlib']System.Object
   {
     .field family wchar pad1
-    .field private class Test.AA self
+    .field private class Test_refarg_c_il.AA self
     .field public int32 mm
     .method public hidebysig specialname rtspecialname 
             instance void .ctor() il managed
@@ -33,18 +33,18 @@
       .maxstack  8
       IL_0000:  ldarg.0
       IL_0001:  ldc.i4.s   122
-      IL_0003:  stfld      wchar Test.AA::pad1
+      IL_0003:  stfld      wchar Test_refarg_c_il.AA::pad1
       IL_0008:  ldarg.0
       IL_0009:  ldnull
-      IL_000a:  stfld      class Test.AA Test.AA::self
+      IL_000a:  stfld      class Test_refarg_c_il.AA Test_refarg_c_il.AA::self
       IL_000f:  ldarg.0
       IL_0010:  ldc.i4.s   11
-      IL_0012:  stfld      int32 Test.AA::mm
+      IL_0012:  stfld      int32 Test_refarg_c_il.AA::mm
       IL_0017:  ldarg.0
       IL_0018:  call       instance void ['mscorlib']System.Object::.ctor()
       IL_001d:  ldarg.0
       IL_001e:  ldarg.0
-      IL_001f:  stfld      class Test.AA Test.AA::self
+      IL_001f:  stfld      class Test_refarg_c_il.AA Test_refarg_c_il.AA::self
       IL_0024:  ret
     } // end of method 'AA::.ctor'
 
@@ -54,12 +54,12 @@
       // Code size       61 (0x3d)
       .maxstack  8
       IL_0000:  ldarg.0
-      IL_0001:  ldfld      wchar Test.AA::pad1
+      IL_0001:  ldfld      wchar Test_refarg_c_il.AA::pad1
       IL_0006:  ldc.i4.s   122
       IL_0008:  bne.un.s   IL_0014
 
       IL_000a:  ldarg.0
-      IL_000b:  ldfld      int32 Test.AA::mm
+      IL_000b:  ldfld      int32 Test_refarg_c_il.AA::mm
       IL_0010:  ldc.i4.s   11
       IL_0012:  beq.s      IL_001a
 
@@ -67,16 +67,16 @@
       IL_0019:  throw
 
       IL_001a:  ldarg.0
-      IL_001b:  ldfld      class Test.AA Test.AA::self
+      IL_001b:  ldfld      class Test_refarg_c_il.AA Test_refarg_c_il.AA::self
       IL_0020:  brfalse.s  IL_003c
 
       IL_0022:  ldarg.0
-      IL_0023:  ldfld      wchar Test.AA::pad1
+      IL_0023:  ldfld      wchar Test_refarg_c_il.AA::pad1
       IL_0028:  ldc.i4.s   122
       IL_002a:  bne.un.s   IL_0036
 
       IL_002c:  ldarg.0
-      IL_002d:  ldfld      int32 Test.AA::mm
+      IL_002d:  ldfld      int32 Test_refarg_c_il.AA::mm
       IL_0032:  ldc.i4.s   11
       IL_0034:  beq.s      IL_003c
 
@@ -88,9 +88,9 @@
 
   } // end of class 'AA'
 
-  .class private auto ansi App extends ['mscorlib']System.Object
+  .class public auto ansi App extends ['mscorlib']System.Object
   {
-    .field private static class Test.AA s_aa
+    .field private static class Test_refarg_c_il.AA s_aa
     .method private hidebysig static void
             Litter() il managed
     {
@@ -119,14 +119,14 @@
     } // end of method 'App::Litter'
 
     .method private hidebysig static int32 
-            Test(int32& n) il managed
+            Test_refarg_c_il(int32& n) il managed
     {
       // Code size       47 (0x2f)
       .maxstack  2
       .locals (int32 V_0)
       IL_0000:  ldnull
-      IL_0001:  stsfld     class Test.AA Test.App::s_aa
-      IL_0006:  call       void Test.App::Litter()
+      IL_0001:  stsfld     class Test_refarg_c_il.AA Test_refarg_c_il.App::s_aa
+      IL_0006:  call       void Test_refarg_c_il.App::Litter()
       IL_000b:  ldarg.0
       IL_000c:  ldind.i4
       IL_000d:  ldc.i4.s   11
@@ -146,9 +146,9 @@
 
       IL_002d:  ldloc.0
       IL_002e:  ret
-    } // end of method 'App::Test'
+    } // end of method 'App::Test_refarg_c_il'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -159,9 +159,9 @@
       .maxstack  1
       .locals (int32 V_0,
                int32 V_1)
-      IL_0000:  ldsfld     class Test.AA Test.App::s_aa
-      IL_0005:  ldflda     int32 Test.AA::mm
-      IL_000a:  call       int32 Test.App::Test(int32&)
+      IL_0000:  ldsfld     class Test_refarg_c_il.AA Test_refarg_c_il.App::s_aa
+      IL_0005:  ldflda     int32 Test_refarg_c_il.AA::mm
+      IL_000a:  call       int32 Test_refarg_c_il.App::Test_refarg_c_il(int32&)
       IL_000f:  stloc.0
       IL_0010:  call       void ['mscorlib']System.GC::Collect()
       IL_0015:  call       void ['mscorlib']System.GC::WaitForPendingFinalizers()
@@ -178,8 +178,8 @@
     {
       // Code size       11 (0xb)
       .maxstack  8
-      IL_0000:  newobj     instance void Test.AA::.ctor()
-      IL_0005:  stsfld     class Test.AA Test.App::s_aa
+      IL_0000:  newobj     instance void Test_refarg_c_il.AA::.ctor()
+      IL_0005:  stsfld     class Test_refarg_c_il.AA Test_refarg_c_il.App::s_aa
       IL_000a:  ret
     } // end of method 'App::.cctor'
 
@@ -195,6 +195,6 @@
 
   } // end of class 'App'
 
-} // end of namespace 'Test'
+} // end of namespace 'Test_refarg_c_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_c_d.csproj b/src/tests/JIT/Methodical/explicit/basic/refarg_c_d.csproj
index fbbf04f9224ae5..604003cce7a260 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_c_d.csproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_c_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_c_do.csproj b/src/tests/JIT/Methodical/explicit/basic/refarg_c_do.csproj
index c2d8425d19c787..74a105b393d689 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_c_do.csproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_c_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_c_il_d.ilproj b/src/tests/JIT/Methodical/explicit/basic/refarg_c_il_d.ilproj
index 30b26902f24aa4..29dc37bd59cbee 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_c_il_d.ilproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_c_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_c_il_r.ilproj b/src/tests/JIT/Methodical/explicit/basic/refarg_c_il_r.ilproj
index fab53e9d4a2d3a..bbf95d45999c6e 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_c_il_r.ilproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_c_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_c_r.csproj b/src/tests/JIT/Methodical/explicit/basic/refarg_c_r.csproj
index 8a6abe7e9585d8..38bc301dde018a 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_c_r.csproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_c_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_c_ro.csproj b/src/tests/JIT/Methodical/explicit/basic/refarg_c_ro.csproj
index a0cdd1b75aae48..25c34bc08994df 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_c_ro.csproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_c_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_f4.cs b/src/tests/JIT/Methodical/explicit/basic/refarg_f4.cs
index 3363ecd87fc1e3..8d4d65fb492772 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_f4.cs
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_f4.cs
@@ -2,8 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace Test
+namespace Test_refarg_f4_cs
 {
     internal class AA
     {
@@ -40,7 +41,7 @@ protected void CheckFields()
         }
     }
 
-    internal class App
+    public class App
     {
         private static AA s_aa = new AA(0);
 
@@ -67,7 +68,8 @@ private static int Test(ref float n)
             return 100;
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             int exitCode = Test(ref s_aa.mm2);
             GC.Collect();
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_f4.il b/src/tests/JIT/Methodical/explicit/basic/refarg_f4.il
index 41615e50cfa001..e4c84064369820 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_f4.il
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_f4.il
@@ -19,14 +19,14 @@
 }
 .assembly extern xunit.core {}
 // MVID: {32D92914-4A90-441D-BAD9-DD653D751832}
-.namespace Test
+.namespace Test_refarg_f4_il
 {
   .class private auto ansi AA extends ['mscorlib']System.Object
   {
     .field public float32 mm2
-    .field public class Test.AA self1
+    .field public class Test_refarg_f4_il.AA self1
     .field public float32 mm1
-    .field public class Test.AA self2
+    .field public class Test_refarg_f4_il.AA self2
     .method public hidebysig specialname rtspecialname 
             instance void  .ctor(int32 reclevel) il managed
     {
@@ -34,16 +34,16 @@
       .maxstack  3
       IL_0000:  ldarg.0
       IL_0001:  ldc.r4     12.
-      IL_0006:  stfld      float32 Test.AA::mm2
+      IL_0006:  stfld      float32 Test_refarg_f4_il.AA::mm2
       IL_000b:  ldarg.0
       IL_000c:  ldnull
-      IL_000d:  stfld      class Test.AA Test.AA::self1
+      IL_000d:  stfld      class Test_refarg_f4_il.AA Test_refarg_f4_il.AA::self1
       IL_0012:  ldarg.0
       IL_0013:  ldc.r4     11.314
-      IL_0018:  stfld      float32 Test.AA::mm1
+      IL_0018:  stfld      float32 Test_refarg_f4_il.AA::mm1
       IL_001d:  ldarg.0
       IL_001e:  ldnull
-      IL_001f:  stfld      class Test.AA Test.AA::self2
+      IL_001f:  stfld      class Test_refarg_f4_il.AA Test_refarg_f4_il.AA::self2
       IL_0024:  ldarg.0
       IL_0025:  call       instance void ['mscorlib']System.Object::.ctor()
       IL_002a:  ldarg.1
@@ -54,21 +54,21 @@
       IL_0030:  ldarg.1
       IL_0031:  ldc.i4.1
       IL_0032:  add
-      IL_0033:  newobj     instance void Test.AA::.ctor(int32)
-      IL_0038:  stfld      class Test.AA Test.AA::self1
+      IL_0033:  newobj     instance void Test_refarg_f4_il.AA::.ctor(int32)
+      IL_0038:  stfld      class Test_refarg_f4_il.AA Test_refarg_f4_il.AA::self1
       IL_003d:  ldarg.0
       IL_003e:  ldarg.0
-      IL_003f:  ldfld      class Test.AA Test.AA::self1
-      IL_0044:  ldfld      class Test.AA Test.AA::self1
-      IL_0049:  stfld      class Test.AA Test.AA::self2
+      IL_003f:  ldfld      class Test_refarg_f4_il.AA Test_refarg_f4_il.AA::self1
+      IL_0044:  ldfld      class Test_refarg_f4_il.AA Test_refarg_f4_il.AA::self1
+      IL_0049:  stfld      class Test_refarg_f4_il.AA Test_refarg_f4_il.AA::self2
       IL_004e:  br.s       IL_005e
 
       IL_0050:  ldarg.0
       IL_0051:  ldarg.0
-      IL_0052:  stfld      class Test.AA Test.AA::self1
+      IL_0052:  stfld      class Test_refarg_f4_il.AA Test_refarg_f4_il.AA::self1
       IL_0057:  ldarg.0
       IL_0058:  ldnull
-      IL_0059:  stfld      class Test.AA Test.AA::self2
+      IL_0059:  stfld      class Test_refarg_f4_il.AA Test_refarg_f4_il.AA::self2
       IL_005e:  ret
     } // end of method 'AA::.ctor'
 
@@ -78,12 +78,12 @@
       // Code size       33 (0x21)
       .maxstack  8
       IL_0000:  ldarg.0
-      IL_0001:  ldfld      float32 Test.AA::mm2
+      IL_0001:  ldfld      float32 Test_refarg_f4_il.AA::mm2
       IL_0006:  ldc.r4     12.
       IL_000b:  bne.un.s   IL_001a
 
       IL_000d:  ldarg.0
-      IL_000e:  ldfld      float32 Test.AA::mm1
+      IL_000e:  ldfld      float32 Test_refarg_f4_il.AA::mm1
       IL_0013:  ldc.r4     11.314
       IL_0018:  beq.s      IL_0020
 
@@ -99,29 +99,29 @@
       // Code size       45 (0x2d)
       .maxstack  8
       IL_0000:  ldarg.0
-      IL_0001:  call       instance void Test.AA::CheckFields()
+      IL_0001:  call       instance void Test_refarg_f4_il.AA::CheckFields()
       IL_0006:  ldarg.0
-      IL_0007:  ldfld      class Test.AA Test.AA::self1
+      IL_0007:  ldfld      class Test_refarg_f4_il.AA Test_refarg_f4_il.AA::self1
       IL_000c:  brfalse.s  IL_0019
 
       IL_000e:  ldarg.0
-      IL_000f:  ldfld      class Test.AA Test.AA::self1
-      IL_0014:  call       instance void Test.AA::CheckFields()
+      IL_000f:  ldfld      class Test_refarg_f4_il.AA Test_refarg_f4_il.AA::self1
+      IL_0014:  call       instance void Test_refarg_f4_il.AA::CheckFields()
       IL_0019:  ldarg.0
-      IL_001a:  ldfld      class Test.AA Test.AA::self2
+      IL_001a:  ldfld      class Test_refarg_f4_il.AA Test_refarg_f4_il.AA::self2
       IL_001f:  brfalse.s  IL_002c
 
       IL_0021:  ldarg.0
-      IL_0022:  ldfld      class Test.AA Test.AA::self2
-      IL_0027:  call       instance void Test.AA::CheckFields()
+      IL_0022:  ldfld      class Test_refarg_f4_il.AA Test_refarg_f4_il.AA::self2
+      IL_0027:  call       instance void Test_refarg_f4_il.AA::CheckFields()
       IL_002c:  ret
     } // end of method 'AA::Finalize'
 
   } // end of class 'AA'
 
-  .class private auto ansi App extends ['mscorlib']System.Object
+  .class public auto ansi App extends ['mscorlib']System.Object
   {
-    .field private static class Test.AA s_aa
+    .field private static class Test_refarg_f4_il.AA s_aa
     .method private hidebysig static void
             Litter() il managed
     {
@@ -150,14 +150,14 @@
     } // end of method 'App::Litter'
 
     .method private hidebysig static int32 
-            Test(float32& n) il managed
+            Test_refarg_f4_il(float32& n) il managed
     {
       // Code size       50 (0x32)
       .maxstack  2
       .locals (int32 V_0)
       IL_0000:  ldnull
-      IL_0001:  stsfld     class Test.AA Test.App::s_aa
-      IL_0006:  call       void Test.App::Litter()
+      IL_0001:  stsfld     class Test_refarg_f4_il.AA Test_refarg_f4_il.App::s_aa
+      IL_0006:  call       void Test_refarg_f4_il.App::Litter()
       IL_000b:  ldarg.0
       IL_000c:  ldind.r4
       IL_000d:  ldc.r4     12.
@@ -177,9 +177,9 @@
 
       IL_0030:  ldloc.0
       IL_0031:  ret
-    } // end of method 'App::Test'
+    } // end of method 'App::Test_refarg_f4_il'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -190,9 +190,9 @@
       .maxstack  1
       .locals (int32 V_0,
                int32 V_1)
-      IL_0000:  ldsfld     class Test.AA Test.App::s_aa
-      IL_0005:  ldflda     float32 Test.AA::mm2
-      IL_000a:  call       int32 Test.App::Test(float32&)
+      IL_0000:  ldsfld     class Test_refarg_f4_il.AA Test_refarg_f4_il.App::s_aa
+      IL_0005:  ldflda     float32 Test_refarg_f4_il.AA::mm2
+      IL_000a:  call       int32 Test_refarg_f4_il.App::Test_refarg_f4_il(float32&)
       IL_000f:  stloc.0
       IL_0010:  call       void ['mscorlib']System.GC::Collect()
       IL_0015:  call       void ['mscorlib']System.GC::WaitForPendingFinalizers()
@@ -210,8 +210,8 @@
       // Code size       12 (0xc)
       .maxstack  8
       IL_0000:  ldc.i4.0
-      IL_0001:  newobj     instance void Test.AA::.ctor(int32)
-      IL_0006:  stsfld     class Test.AA Test.App::s_aa
+      IL_0001:  newobj     instance void Test_refarg_f4_il.AA::.ctor(int32)
+      IL_0006:  stsfld     class Test_refarg_f4_il.AA Test_refarg_f4_il.App::s_aa
       IL_000b:  ret
     } // end of method 'App::.cctor'
 
@@ -227,6 +227,6 @@
 
   } // end of class 'App'
 
-} // end of namespace 'Test'
+} // end of namespace 'Test_refarg_f4_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_f4_d.csproj b/src/tests/JIT/Methodical/explicit/basic/refarg_f4_d.csproj
index 13bf50894a3934..aaf8601e1e0ed5 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_f4_d.csproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_f4_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_f4_do.csproj b/src/tests/JIT/Methodical/explicit/basic/refarg_f4_do.csproj
index fb5b9582475241..a162b0aea742f6 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_f4_do.csproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_f4_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_f4_il_d.ilproj b/src/tests/JIT/Methodical/explicit/basic/refarg_f4_il_d.ilproj
index 38ac468ff59598..61aa67382ec2eb 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_f4_il_d.ilproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_f4_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_f4_il_r.ilproj b/src/tests/JIT/Methodical/explicit/basic/refarg_f4_il_r.ilproj
index b208cf1be00fe3..a5ca07a1733ce9 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_f4_il_r.ilproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_f4_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_f4_r.csproj b/src/tests/JIT/Methodical/explicit/basic/refarg_f4_r.csproj
index 88f608c2644a1b..b06e45ca8d9820 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_f4_r.csproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_f4_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_f4_ro.csproj b/src/tests/JIT/Methodical/explicit/basic/refarg_f4_ro.csproj
index 76e294ffcc6ced..8533ea462a9167 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_f4_ro.csproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_f4_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_f8.cs b/src/tests/JIT/Methodical/explicit/basic/refarg_f8.cs
index 821487cca22b9e..a5d274e357a15a 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_f8.cs
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_f8.cs
@@ -2,8 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace Test
+namespace Test_refarg_f8_cs
 {
     internal class AA
     {
@@ -43,7 +44,7 @@ protected void CheckFields()
         }
     }
 
-    internal class App
+    public class App
     {
         private static AA s_aa = new AA(0);
         public static int exitCode = 1;
@@ -66,7 +67,8 @@ private static void Test(ref double n)
             exitCode = 100;
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             Test(ref s_aa.mm1);
             GC.Collect();
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_f8.il b/src/tests/JIT/Methodical/explicit/basic/refarg_f8.il
index 84a1472834a132..e4596537f23618 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_f8.il
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_f8.il
@@ -19,13 +19,13 @@
 }
 .assembly extern xunit.core {}
 // MVID: {37A8EE05-2AD1-417E-ABC1-6C1463EFE15F}
-.namespace Test
+.namespace Test_refarg_f8_il
 {
   .class private auto ansi AA extends ['mscorlib']System.Object
   {
     .field public float64 mm1
-    .field public class Test.AA self1
-    .field public class Test.AA self2
+    .field public class Test_refarg_f8_il.AA self1
+    .field public class Test_refarg_f8_il.AA self2
     .field public float64 mm2
     .method public hidebysig specialname rtspecialname 
             instance void  .ctor(int32 reclevel) il managed
@@ -34,16 +34,16 @@
       .maxstack  3
       IL_0000:  ldarg.0
       IL_0001:  ldc.r8     11.314
-      IL_000a:  stfld      float64 Test.AA::mm1
+      IL_000a:  stfld      float64 Test_refarg_f8_il.AA::mm1
       IL_000f:  ldarg.0
       IL_0010:  ldnull
-      IL_0011:  stfld      class Test.AA Test.AA::self1
+      IL_0011:  stfld      class Test_refarg_f8_il.AA Test_refarg_f8_il.AA::self1
       IL_0016:  ldarg.0
       IL_0017:  ldnull
-      IL_0018:  stfld      class Test.AA Test.AA::self2
+      IL_0018:  stfld      class Test_refarg_f8_il.AA Test_refarg_f8_il.AA::self2
       IL_001d:  ldarg.0
       IL_001e:  ldc.r8     12.
-      IL_0027:  stfld      float64 Test.AA::mm2
+      IL_0027:  stfld      float64 Test_refarg_f8_il.AA::mm2
       IL_002c:  ldarg.0
       IL_002d:  call       instance void ['mscorlib']System.Object::.ctor()
       IL_0032:  ldarg.1
@@ -54,21 +54,21 @@
       IL_0038:  ldarg.1
       IL_0039:  ldc.i4.1
       IL_003a:  add
-      IL_003b:  newobj     instance void Test.AA::.ctor(int32)
-      IL_0040:  stfld      class Test.AA Test.AA::self1
+      IL_003b:  newobj     instance void Test_refarg_f8_il.AA::.ctor(int32)
+      IL_0040:  stfld      class Test_refarg_f8_il.AA Test_refarg_f8_il.AA::self1
       IL_0045:  ldarg.0
       IL_0046:  ldarg.0
-      IL_0047:  ldfld      class Test.AA Test.AA::self1
-      IL_004c:  ldfld      class Test.AA Test.AA::self1
-      IL_0051:  stfld      class Test.AA Test.AA::self2
+      IL_0047:  ldfld      class Test_refarg_f8_il.AA Test_refarg_f8_il.AA::self1
+      IL_004c:  ldfld      class Test_refarg_f8_il.AA Test_refarg_f8_il.AA::self1
+      IL_0051:  stfld      class Test_refarg_f8_il.AA Test_refarg_f8_il.AA::self2
       IL_0056:  br.s       IL_0066
 
       IL_0058:  ldarg.0
       IL_0059:  ldarg.0
-      IL_005a:  stfld      class Test.AA Test.AA::self1
+      IL_005a:  stfld      class Test_refarg_f8_il.AA Test_refarg_f8_il.AA::self1
       IL_005f:  ldarg.0
       IL_0060:  ldnull
-      IL_0061:  stfld      class Test.AA Test.AA::self2
+      IL_0061:  stfld      class Test_refarg_f8_il.AA Test_refarg_f8_il.AA::self2
       IL_0066:  ret
     } // end of method 'AA::.ctor'
 
@@ -78,12 +78,12 @@
       // Code size       41 (0x29)
       .maxstack  8
       IL_0000:  ldarg.0
-      IL_0001:  ldfld      float64 Test.AA::mm2
+      IL_0001:  ldfld      float64 Test_refarg_f8_il.AA::mm2
       IL_0006:  ldc.r8     12.
       IL_000f:  bne.un.s   IL_0022
 
       IL_0011:  ldarg.0
-      IL_0012:  ldfld      float64 Test.AA::mm1
+      IL_0012:  ldfld      float64 Test_refarg_f8_il.AA::mm1
       IL_0017:  ldc.r8     11.314
       IL_0020:  beq.s      IL_0028
 
@@ -99,29 +99,29 @@
       // Code size       45 (0x2d)
       .maxstack  8
       IL_0000:  ldarg.0
-      IL_0001:  call       instance void Test.AA::CheckFields()
+      IL_0001:  call       instance void Test_refarg_f8_il.AA::CheckFields()
       IL_0006:  ldarg.0
-      IL_0007:  ldfld      class Test.AA Test.AA::self1
+      IL_0007:  ldfld      class Test_refarg_f8_il.AA Test_refarg_f8_il.AA::self1
       IL_000c:  brfalse.s  IL_0019
 
       IL_000e:  ldarg.0
-      IL_000f:  ldfld      class Test.AA Test.AA::self1
-      IL_0014:  call       instance void Test.AA::CheckFields()
+      IL_000f:  ldfld      class Test_refarg_f8_il.AA Test_refarg_f8_il.AA::self1
+      IL_0014:  call       instance void Test_refarg_f8_il.AA::CheckFields()
       IL_0019:  ldarg.0
-      IL_001a:  ldfld      class Test.AA Test.AA::self2
+      IL_001a:  ldfld      class Test_refarg_f8_il.AA Test_refarg_f8_il.AA::self2
       IL_001f:  brfalse.s  IL_002c
 
       IL_0021:  ldarg.0
-      IL_0022:  ldfld      class Test.AA Test.AA::self2
-      IL_0027:  call       instance void Test.AA::CheckFields()
+      IL_0022:  ldfld      class Test_refarg_f8_il.AA Test_refarg_f8_il.AA::self2
+      IL_0027:  call       instance void Test_refarg_f8_il.AA::CheckFields()
       IL_002c:  ret
     } // end of method 'AA::Finalize'
 
   } // end of class 'AA'
 
-  .class private auto ansi App extends ['mscorlib']System.Object
+  .class public auto ansi App extends ['mscorlib']System.Object
   {
-    .field private static class Test.AA s_aa
+    .field private static class Test_refarg_f8_il.AA s_aa
     .method private hidebysig static void
             Litter() il managed
     {
@@ -150,14 +150,14 @@
     } // end of method 'App::Litter'
 
     .method private hidebysig static int32 
-            Test(float64& n) il managed
+            Test_refarg_f8_il(float64& n) il managed
     {
       // Code size       54 (0x36)
       .maxstack  2
       .locals (int32 V_0)
       IL_0000:  ldnull
-      IL_0001:  stsfld     class Test.AA Test.App::s_aa
-      IL_0006:  call       void Test.App::Litter()
+      IL_0001:  stsfld     class Test_refarg_f8_il.AA Test_refarg_f8_il.App::s_aa
+      IL_0006:  call       void Test_refarg_f8_il.App::Litter()
       IL_000b:  ldarg.0
       IL_000c:  ldind.r8
       IL_000d:  ldc.r8     11.314
@@ -177,9 +177,9 @@
 
       IL_0034:  ldloc.0
       IL_0035:  ret
-    } // end of method 'App::Test'
+    } // end of method 'App::Test_refarg_f8_il'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -190,9 +190,9 @@
       .maxstack  1
       .locals (int32 V_0,
                int32 V_1)
-      IL_0000:  ldsfld     class Test.AA Test.App::s_aa
-      IL_0005:  ldflda     float64 Test.AA::mm1
-      IL_000a:  call       int32 Test.App::Test(float64&)
+      IL_0000:  ldsfld     class Test_refarg_f8_il.AA Test_refarg_f8_il.App::s_aa
+      IL_0005:  ldflda     float64 Test_refarg_f8_il.AA::mm1
+      IL_000a:  call       int32 Test_refarg_f8_il.App::Test_refarg_f8_il(float64&)
       IL_000f:  stloc.0
       IL_0010:  call       void ['mscorlib']System.GC::Collect()
       IL_0015:  call       void ['mscorlib']System.GC::WaitForPendingFinalizers()
@@ -210,8 +210,8 @@
       // Code size       12 (0xc)
       .maxstack  8
       IL_0000:  ldc.i4.0
-      IL_0001:  newobj     instance void Test.AA::.ctor(int32)
-      IL_0006:  stsfld     class Test.AA Test.App::s_aa
+      IL_0001:  newobj     instance void Test_refarg_f8_il.AA::.ctor(int32)
+      IL_0006:  stsfld     class Test_refarg_f8_il.AA Test_refarg_f8_il.App::s_aa
       IL_000b:  ret
     } // end of method 'App::.cctor'
 
@@ -227,6 +227,6 @@
 
   } // end of class 'App'
 
-} // end of namespace 'Test'
+} // end of namespace 'Test_refarg_f8_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_f8_d.csproj b/src/tests/JIT/Methodical/explicit/basic/refarg_f8_d.csproj
index 18efd8b46032cc..65b63e5281ee66 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_f8_d.csproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_f8_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_f8_do.csproj b/src/tests/JIT/Methodical/explicit/basic/refarg_f8_do.csproj
index e4c1bc43662c58..bd08329d943195 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_f8_do.csproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_f8_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_f8_il_d.ilproj b/src/tests/JIT/Methodical/explicit/basic/refarg_f8_il_d.ilproj
index 869f65f5443a7d..55592c8a73c396 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_f8_il_d.ilproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_f8_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_f8_il_r.ilproj b/src/tests/JIT/Methodical/explicit/basic/refarg_f8_il_r.ilproj
index 8c3614d8cc1586..ac1ddb62f90fac 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_f8_il_r.ilproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_f8_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_f8_r.csproj b/src/tests/JIT/Methodical/explicit/basic/refarg_f8_r.csproj
index 6fe982c3435304..75b9efffb0c9eb 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_f8_r.csproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_f8_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_f8_ro.csproj b/src/tests/JIT/Methodical/explicit/basic/refarg_f8_ro.csproj
index 040ad173478ea6..2409104d74533f 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_f8_ro.csproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_f8_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_i1.cs b/src/tests/JIT/Methodical/explicit/basic/refarg_i1.cs
index fb69d229de9ace..0bee189efbd8e3 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_i1.cs
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_i1.cs
@@ -2,8 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace Test
+namespace Test_refarg_i1_cs
 {
     internal class AA
     {
@@ -34,7 +35,7 @@ internal class AA
         }
     }
 
-    internal class App
+    public class App
     {
         private static AA s_aa = new AA(0);
         public static int exitCode = 1;
@@ -57,7 +58,8 @@ private static void Test(ref byte n)
             exitCode = 100;
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             Test(ref s_aa.mm);
             GC.Collect();
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_i1.il b/src/tests/JIT/Methodical/explicit/basic/refarg_i1.il
index 052503c60e2d6f..d202bedac9f6c9 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_i1.il
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_i1.il
@@ -19,11 +19,11 @@
 }
 .assembly extern xunit.core {}
 // MVID: {6CD6F89D-FAE4-46E5-B4D6-684A3371C90D}
-.namespace Test
+.namespace Test_refarg_i1_il
 {
   .class private auto ansi AA extends ['mscorlib']System.Object
   {
-    .field private class Test.AA self
+    .field private class Test_refarg_i1_il.AA self
     .field private unsigned int8 pad1
     .field public int32 mm
     .method public hidebysig specialname rtspecialname 
@@ -33,13 +33,13 @@
       .maxstack  8
       IL_0000:  ldarg.0
       IL_0001:  ldnull
-      IL_0002:  stfld      class Test.AA Test.AA::self
+      IL_0002:  stfld      class Test_refarg_i1_il.AA Test_refarg_i1_il.AA::self
       IL_0007:  ldarg.0
       IL_0008:  ldc.i4     0xbf
-      IL_000d:  stfld      unsigned int8 Test.AA::pad1
+      IL_000d:  stfld      unsigned int8 Test_refarg_i1_il.AA::pad1
       IL_0012:  ldarg.0
       IL_0013:  ldc.i4.s   11
-      IL_0015:  stfld      int32 Test.AA::mm
+      IL_0015:  stfld      int32 Test_refarg_i1_il.AA::mm
       IL_001a:  ldarg.0
       IL_001b:  call       instance void ['mscorlib']System.Object::.ctor()
       IL_0020:  ldarg.1
@@ -50,8 +50,8 @@
       IL_0026:  ldarg.1
       IL_0027:  ldc.i4.1
       IL_0028:  add
-      IL_0029:  newobj     instance void Test.AA::.ctor(int32)
-      IL_002e:  stfld      class Test.AA Test.AA::self
+      IL_0029:  newobj     instance void Test_refarg_i1_il.AA::.ctor(int32)
+      IL_002e:  stfld      class Test_refarg_i1_il.AA Test_refarg_i1_il.AA::self
       IL_0033:  ret
     } // end of method 'AA::.ctor'
 
@@ -63,24 +63,24 @@
       .try
       {
         IL_0000:  ldarg.0
-        IL_0001:  ldfld      unsigned int8 Test.AA::pad1
+        IL_0001:  ldfld      unsigned int8 Test_refarg_i1_il.AA::pad1
         IL_0006:  ldc.i4     0xbf
         IL_000b:  bne.un.s   IL_0038
 
         IL_000d:  ldarg.0
-        IL_000e:  ldfld      int32 Test.AA::mm
+        IL_000e:  ldfld      int32 Test_refarg_i1_il.AA::mm
         IL_0013:  ldc.i4.s   11
         IL_0015:  bne.un.s   IL_0038
 
         IL_0017:  ldarg.0
-        IL_0018:  ldfld      class Test.AA Test.AA::self
-        IL_001d:  ldfld      unsigned int8 Test.AA::pad1
+        IL_0018:  ldfld      class Test_refarg_i1_il.AA Test_refarg_i1_il.AA::self
+        IL_001d:  ldfld      unsigned int8 Test_refarg_i1_il.AA::pad1
         IL_0022:  ldc.i4     0xbf
         IL_0027:  bne.un.s   IL_0038
 
         IL_0029:  ldarg.0
-        IL_002a:  ldfld      class Test.AA Test.AA::self
-        IL_002f:  ldfld      int32 Test.AA::mm
+        IL_002a:  ldfld      class Test_refarg_i1_il.AA Test_refarg_i1_il.AA::self
+        IL_002f:  ldfld      int32 Test_refarg_i1_il.AA::mm
         IL_0034:  ldc.i4.s   11
         IL_0036:  beq.s      IL_003e
 
@@ -103,9 +103,9 @@
 
   } // end of class 'AA'
 
-  .class private auto ansi App extends ['mscorlib']System.Object
+  .class public auto ansi App extends ['mscorlib']System.Object
   {
-    .field private static class Test.AA s_aa
+    .field private static class Test_refarg_i1_il.AA s_aa
     .method private hidebysig static void
             Litter() il managed
     {
@@ -134,14 +134,14 @@
     } // end of method 'App::Litter'
 
     .method private hidebysig static int32 
-            Test(int32& n) il managed
+            Test_refarg_i1_il(int32& n) il managed
     {
       // Code size       47 (0x2f)
       .maxstack  2
       .locals (int32 V_0)
       IL_0000:  ldnull
-      IL_0001:  stsfld     class Test.AA Test.App::s_aa
-      IL_0006:  call       void Test.App::Litter()
+      IL_0001:  stsfld     class Test_refarg_i1_il.AA Test_refarg_i1_il.App::s_aa
+      IL_0006:  call       void Test_refarg_i1_il.App::Litter()
       IL_000b:  ldarg.0
       IL_000c:  ldind.i4
       IL_000d:  ldc.i4.s   11
@@ -161,9 +161,9 @@
 
       IL_002d:  ldloc.0
       IL_002e:  ret
-    } // end of method 'App::Test'
+    } // end of method 'App::Test_refarg_i1_il'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -174,9 +174,9 @@
       .maxstack  1
       .locals (int32 V_0,
                int32 V_1)
-      IL_0000:  ldsfld     class Test.AA Test.App::s_aa
-      IL_0005:  ldflda     int32 Test.AA::mm
-      IL_000a:  call       int32 Test.App::Test(int32&)
+      IL_0000:  ldsfld     class Test_refarg_i1_il.AA Test_refarg_i1_il.App::s_aa
+      IL_0005:  ldflda     int32 Test_refarg_i1_il.AA::mm
+      IL_000a:  call       int32 Test_refarg_i1_il.App::Test_refarg_i1_il(int32&)
       IL_000f:  stloc.0
       IL_0010:  call       void ['mscorlib']System.GC::Collect()
       IL_0015:  call       void ['mscorlib']System.GC::WaitForPendingFinalizers()
@@ -194,8 +194,8 @@
       // Code size       12 (0xc)
       .maxstack  8
       IL_0000:  ldc.i4.0
-      IL_0001:  newobj     instance void Test.AA::.ctor(int32)
-      IL_0006:  stsfld     class Test.AA Test.App::s_aa
+      IL_0001:  newobj     instance void Test_refarg_i1_il.AA::.ctor(int32)
+      IL_0006:  stsfld     class Test_refarg_i1_il.AA Test_refarg_i1_il.App::s_aa
       IL_000b:  ret
     } // end of method 'App::.cctor'
 
@@ -211,6 +211,6 @@
 
   } // end of class 'App'
 
-} // end of namespace 'Test'
+} // end of namespace 'Test_refarg_i1_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_i1_d.csproj b/src/tests/JIT/Methodical/explicit/basic/refarg_i1_d.csproj
index 136e1bb1e2d003..fb4a6334b4720f 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_i1_d.csproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_i1_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <!-- TestAssemblyLoadContext.Load called from the finalizer -->
     <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_i1_do.csproj b/src/tests/JIT/Methodical/explicit/basic/refarg_i1_do.csproj
index 101a0a66e1d0fb..53e395a0c74dab 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_i1_do.csproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_i1_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_i1_il_d.ilproj b/src/tests/JIT/Methodical/explicit/basic/refarg_i1_il_d.ilproj
index 9934e128149348..7432c5c0f680ba 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_i1_il_d.ilproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_i1_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_i1_il_r.ilproj b/src/tests/JIT/Methodical/explicit/basic/refarg_i1_il_r.ilproj
index 9fd4641c46eccd..3d02bd8dff6f12 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_i1_il_r.ilproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_i1_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_i1_r.csproj b/src/tests/JIT/Methodical/explicit/basic/refarg_i1_r.csproj
index ddf64e624ef2b4..cf6da82cedbfdb 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_i1_r.csproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_i1_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <!-- TestAssemblyLoadContext.Load called from the finalizer -->
     <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_i1_ro.csproj b/src/tests/JIT/Methodical/explicit/basic/refarg_i1_ro.csproj
index a3e2e4070e809b..71e5005d56bb67 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_i1_ro.csproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_i1_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_i2.cs b/src/tests/JIT/Methodical/explicit/basic/refarg_i2.cs
index 35d3ea1f57fdb2..16b3cdd2c36c22 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_i2.cs
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_i2.cs
@@ -2,8 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace Test
+namespace Test_refarg_i2_cs
 {
     internal class AA
     {
@@ -27,7 +28,7 @@ internal class AA
         }
     }
 
-    internal class App
+    public class App
     {
         private static AA s_aa = new AA();
         public static int exitCode = 1;
@@ -50,7 +51,8 @@ private static void Test(ref short n)
             exitCode = 100;
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             s_aa.self = new AA();
             Test(ref s_aa.mm);
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_i2.il b/src/tests/JIT/Methodical/explicit/basic/refarg_i2.il
index 1a68c831f94639..bc6f45d732d691 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_i2.il
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_i2.il
@@ -19,25 +19,25 @@
 }
 .assembly extern xunit.core {}
 // MVID: {DB5DE5DC-5255-410E-B565-E88E6CF43E3E}
-.namespace Test
+.namespace Test_refarg_i2_il
 {
   .class private auto ansi AA extends ['mscorlib']System.Object
   {
     .field private int16 pad1
     .field public int32 mm
-    .field public class Test.AA self
+    .field public class Test_refarg_i2_il.AA self
     .method family hidebysig virtual instance void
             Finalize() il managed
     {
       // Code size       67 (0x43)
       .maxstack  2
       IL_0000:  ldarg.0
-      IL_0001:  ldfld      int16 Test.AA::pad1
+      IL_0001:  ldfld      int16 Test_refarg_i2_il.AA::pad1
       IL_0006:  ldc.i4     0xbf
       IL_000b:  bne.un.s   IL_0017
 
       IL_000d:  ldarg.0
-      IL_000e:  ldfld      int32 Test.AA::mm
+      IL_000e:  ldfld      int32 Test_refarg_i2_il.AA::mm
       IL_0013:  ldc.i4.s   11
       IL_0015:  beq.s      IL_001d
 
@@ -45,16 +45,16 @@
       IL_001c:  throw
 
       IL_001d:  ldarg.0
-      IL_001e:  ldfld      class Test.AA Test.AA::self
+      IL_001e:  ldfld      class Test_refarg_i2_il.AA Test_refarg_i2_il.AA::self
       IL_0023:  brfalse.s  IL_0042
 
       IL_0025:  ldarg.0
-      IL_0026:  ldfld      int16 Test.AA::pad1
+      IL_0026:  ldfld      int16 Test_refarg_i2_il.AA::pad1
       IL_002b:  ldc.i4     0xbf
       IL_0030:  bne.un.s   IL_003c
 
       IL_0032:  ldarg.0
-      IL_0033:  ldfld      int32 Test.AA::mm
+      IL_0033:  ldfld      int32 Test_refarg_i2_il.AA::mm
       IL_0038:  ldc.i4.s   11
       IL_003a:  beq.s      IL_0042
 
@@ -71,13 +71,13 @@
       .maxstack  8
       IL_0000:  ldarg.0
       IL_0001:  ldc.i4     0xbf
-      IL_0006:  stfld      int16 Test.AA::pad1
+      IL_0006:  stfld      int16 Test_refarg_i2_il.AA::pad1
       IL_000b:  ldarg.0
       IL_000c:  ldc.i4.s   11
-      IL_000e:  stfld      int32 Test.AA::mm
+      IL_000e:  stfld      int32 Test_refarg_i2_il.AA::mm
       IL_0013:  ldarg.0
       IL_0014:  ldnull
-      IL_0015:  stfld      class Test.AA Test.AA::self
+      IL_0015:  stfld      class Test_refarg_i2_il.AA Test_refarg_i2_il.AA::self
       IL_001a:  ldarg.0
       IL_001b:  call       instance void ['mscorlib']System.Object::.ctor()
       IL_0020:  ret
@@ -85,9 +85,9 @@
 
   } // end of class 'AA'
 
-  .class private auto ansi App extends ['mscorlib']System.Object
+  .class public auto ansi App extends ['mscorlib']System.Object
   {
-    .field private static class Test.AA s_aa
+    .field private static class Test_refarg_i2_il.AA s_aa
     .method private hidebysig static void
             Litter() il managed
     {
@@ -116,14 +116,14 @@
     } // end of method 'App::Litter'
 
     .method private hidebysig static int32 
-            Test(int32& n) il managed
+            Test_refarg_i2_il(int32& n) il managed
     {
       // Code size       47 (0x2f)
       .maxstack  2
       .locals (int32 V_0)
       IL_0000:  ldnull
-      IL_0001:  stsfld     class Test.AA Test.App::s_aa
-      IL_0006:  call       void Test.App::Litter()
+      IL_0001:  stsfld     class Test_refarg_i2_il.AA Test_refarg_i2_il.App::s_aa
+      IL_0006:  call       void Test_refarg_i2_il.App::Litter()
       IL_000b:  ldarg.0
       IL_000c:  ldind.i4
       IL_000d:  ldc.i4.s   11
@@ -143,9 +143,9 @@
 
       IL_002d:  ldloc.0
       IL_002e:  ret
-    } // end of method 'App::Test'
+    } // end of method 'App::Test_refarg_i2_il'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -156,12 +156,12 @@
       .maxstack  2
       .locals (int32 V_0,
                int32 V_1)
-      IL_0000:  ldsfld     class Test.AA Test.App::s_aa
-      IL_0005:  newobj     instance void Test.AA::.ctor()
-      IL_000a:  stfld      class Test.AA Test.AA::self
-      IL_000f:  ldsfld     class Test.AA Test.App::s_aa
-      IL_0014:  ldflda     int32 Test.AA::mm
-      IL_0019:  call       int32 Test.App::Test(int32&)
+      IL_0000:  ldsfld     class Test_refarg_i2_il.AA Test_refarg_i2_il.App::s_aa
+      IL_0005:  newobj     instance void Test_refarg_i2_il.AA::.ctor()
+      IL_000a:  stfld      class Test_refarg_i2_il.AA Test_refarg_i2_il.AA::self
+      IL_000f:  ldsfld     class Test_refarg_i2_il.AA Test_refarg_i2_il.App::s_aa
+      IL_0014:  ldflda     int32 Test_refarg_i2_il.AA::mm
+      IL_0019:  call       int32 Test_refarg_i2_il.App::Test_refarg_i2_il(int32&)
       IL_001e:  stloc.0
       IL_001f:  call       void ['mscorlib']System.GC::Collect()
       IL_0024:  call       void ['mscorlib']System.GC::WaitForPendingFinalizers()
@@ -178,8 +178,8 @@
     {
       // Code size       11 (0xb)
       .maxstack  8
-      IL_0000:  newobj     instance void Test.AA::.ctor()
-      IL_0005:  stsfld     class Test.AA Test.App::s_aa
+      IL_0000:  newobj     instance void Test_refarg_i2_il.AA::.ctor()
+      IL_0005:  stsfld     class Test_refarg_i2_il.AA Test_refarg_i2_il.App::s_aa
       IL_000a:  ret
     } // end of method 'App::.cctor'
 
@@ -195,6 +195,6 @@
 
   } // end of class 'App'
 
-} // end of namespace 'Test'
+} // end of namespace 'Test_refarg_i2_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_i2_d.csproj b/src/tests/JIT/Methodical/explicit/basic/refarg_i2_d.csproj
index 33719107e00a22..3dfd65a7bf7dd8 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_i2_d.csproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_i2_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_i2_do.csproj b/src/tests/JIT/Methodical/explicit/basic/refarg_i2_do.csproj
index a3f3c5b7b10137..1d8354cfa8014e 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_i2_do.csproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_i2_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_i2_il_d.ilproj b/src/tests/JIT/Methodical/explicit/basic/refarg_i2_il_d.ilproj
index 704d68cea7e41e..bb74b2d00df80b 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_i2_il_d.ilproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_i2_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_i2_il_r.ilproj b/src/tests/JIT/Methodical/explicit/basic/refarg_i2_il_r.ilproj
index bbddc8b81c695b..3e912423c9826f 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_i2_il_r.ilproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_i2_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_i2_r.csproj b/src/tests/JIT/Methodical/explicit/basic/refarg_i2_r.csproj
index 457bae92b0dac2..96160bc6158ea8 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_i2_r.csproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_i2_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_i2_ro.csproj b/src/tests/JIT/Methodical/explicit/basic/refarg_i2_ro.csproj
index baaee418e0b6f3..ed2e9b2fab90f0 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_i2_ro.csproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_i2_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_i4.cs b/src/tests/JIT/Methodical/explicit/basic/refarg_i4.cs
index c410004582c9d9..111987f7ea911c 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_i4.cs
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_i4.cs
@@ -2,8 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace Test
+namespace Test_refarg_i4_cs
 {
     internal class AA
     {
@@ -45,7 +46,7 @@ protected void CheckFields()
         }
     }
 
-    internal class App
+    public class App
     {
         private static AA s_aa = new AA(0);
         public static int exitCode = 1;
@@ -68,7 +69,8 @@ private static void Test(ref int n)
             exitCode = 100;
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             Test(ref s_aa.mm);
             GC.Collect();
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_i4.il b/src/tests/JIT/Methodical/explicit/basic/refarg_i4.il
index 00351ec1cd9ee3..89931ac53898b9 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_i4.il
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_i4.il
@@ -19,40 +19,40 @@
 }
 .assembly extern xunit.core {}
 // MVID: {0D4BD404-2598-466F-9449-2F343E513C7B}
-.namespace Test
+.namespace Test_refarg_i4_il
 {
   .class private auto ansi AA extends ['mscorlib']System.Object
   {
-    .field public class Test.AA self3
-    .field public class Test.AA self4
+    .field public class Test_refarg_i4_il.AA self3
+    .field public class Test_refarg_i4_il.AA self4
     .field private int32 pad1
     .field public int32 mm
-    .field public class Test.AA self1
-    .field public class Test.AA self2
+    .field public class Test_refarg_i4_il.AA self1
+    .field public class Test_refarg_i4_il.AA self2
     .method public hidebysig specialname rtspecialname 
             instance void  .ctor(int32 reclevel) il managed
     {
       // Code size       98 (0x62)
       .maxstack  5
-      .locals (class Test.AA V_0)
+      .locals (class Test_refarg_i4_il.AA V_0)
       IL_0000:  ldarg.0
       IL_0001:  ldnull
-      IL_0002:  stfld      class Test.AA Test.AA::self3
+      IL_0002:  stfld      class Test_refarg_i4_il.AA Test_refarg_i4_il.AA::self3
       IL_0007:  ldarg.0
       IL_0008:  ldnull
-      IL_0009:  stfld      class Test.AA Test.AA::self4
+      IL_0009:  stfld      class Test_refarg_i4_il.AA Test_refarg_i4_il.AA::self4
       IL_000e:  ldarg.0
       IL_000f:  ldc.i4     0xbf
-      IL_0014:  stfld      int32 Test.AA::pad1
+      IL_0014:  stfld      int32 Test_refarg_i4_il.AA::pad1
       IL_0019:  ldarg.0
       IL_001a:  ldc.i4.s   11
-      IL_001c:  stfld      int32 Test.AA::mm
+      IL_001c:  stfld      int32 Test_refarg_i4_il.AA::mm
       IL_0021:  ldarg.0
       IL_0022:  ldnull
-      IL_0023:  stfld      class Test.AA Test.AA::self1
+      IL_0023:  stfld      class Test_refarg_i4_il.AA Test_refarg_i4_il.AA::self1
       IL_0028:  ldarg.0
       IL_0029:  ldnull
-      IL_002a:  stfld      class Test.AA Test.AA::self2
+      IL_002a:  stfld      class Test_refarg_i4_il.AA Test_refarg_i4_il.AA::self2
       IL_002f:  ldarg.0
       IL_0030:  call       instance void ['mscorlib']System.Object::.ctor()
       IL_0035:  ldarg.0
@@ -61,13 +61,13 @@
       IL_0038:  ldarg.0
       IL_0039:  dup
       IL_003a:  stloc.0
-      IL_003b:  stfld      class Test.AA Test.AA::self4
+      IL_003b:  stfld      class Test_refarg_i4_il.AA Test_refarg_i4_il.AA::self4
       IL_0040:  ldloc.0
       IL_0041:  dup
       IL_0042:  stloc.0
-      IL_0043:  stfld      class Test.AA Test.AA::self2
+      IL_0043:  stfld      class Test_refarg_i4_il.AA Test_refarg_i4_il.AA::self2
       IL_0048:  ldloc.0
-      IL_0049:  stfld      class Test.AA Test.AA::self1
+      IL_0049:  stfld      class Test_refarg_i4_il.AA Test_refarg_i4_il.AA::self1
       IL_004e:  ldarg.1
       IL_004f:  ldc.i4.s   100
       IL_0051:  bge.s      IL_0061
@@ -76,8 +76,8 @@
       IL_0054:  ldarg.1
       IL_0055:  ldc.i4.1
       IL_0056:  add
-      IL_0057:  newobj     instance void Test.AA::.ctor(int32)
-      IL_005c:  stfld      class Test.AA Test.AA::self3
+      IL_0057:  newobj     instance void Test_refarg_i4_il.AA::.ctor(int32)
+      IL_005c:  stfld      class Test_refarg_i4_il.AA Test_refarg_i4_il.AA::self3
       IL_0061:  ret
     } // end of method 'AA::.ctor'
 
@@ -93,12 +93,12 @@
       IL_0008:  throw
 
       IL_0009:  ldarg.0
-      IL_000a:  ldfld      int32 Test.AA::pad1
+      IL_000a:  ldfld      int32 Test_refarg_i4_il.AA::pad1
       IL_000f:  ldc.i4     0xbf
       IL_0014:  bne.un.s   IL_0020
 
       IL_0016:  ldarg.0
-      IL_0017:  ldfld      int32 Test.AA::mm
+      IL_0017:  ldfld      int32 Test_refarg_i4_il.AA::mm
       IL_001c:  ldc.i4.s   11
       IL_001e:  beq.s      IL_0026
 
@@ -114,43 +114,43 @@
       // Code size       83 (0x53)
       .maxstack  1
       IL_0000:  ldarg.0
-      IL_0001:  call       instance void Test.AA::CheckFields()
+      IL_0001:  call       instance void Test_refarg_i4_il.AA::CheckFields()
       IL_0006:  ldarg.0
-      IL_0007:  ldfld      class Test.AA Test.AA::self1
+      IL_0007:  ldfld      class Test_refarg_i4_il.AA Test_refarg_i4_il.AA::self1
       IL_000c:  brfalse.s  IL_0019
 
       IL_000e:  ldarg.0
-      IL_000f:  ldfld      class Test.AA Test.AA::self1
-      IL_0014:  call       instance void Test.AA::CheckFields()
+      IL_000f:  ldfld      class Test_refarg_i4_il.AA Test_refarg_i4_il.AA::self1
+      IL_0014:  call       instance void Test_refarg_i4_il.AA::CheckFields()
       IL_0019:  ldarg.0
-      IL_001a:  ldfld      class Test.AA Test.AA::self2
+      IL_001a:  ldfld      class Test_refarg_i4_il.AA Test_refarg_i4_il.AA::self2
       IL_001f:  brfalse.s  IL_002c
 
       IL_0021:  ldarg.0
-      IL_0022:  ldfld      class Test.AA Test.AA::self2
-      IL_0027:  call       instance void Test.AA::CheckFields()
+      IL_0022:  ldfld      class Test_refarg_i4_il.AA Test_refarg_i4_il.AA::self2
+      IL_0027:  call       instance void Test_refarg_i4_il.AA::CheckFields()
       IL_002c:  ldarg.0
-      IL_002d:  ldfld      class Test.AA Test.AA::self3
+      IL_002d:  ldfld      class Test_refarg_i4_il.AA Test_refarg_i4_il.AA::self3
       IL_0032:  brfalse.s  IL_003f
 
       IL_0034:  ldarg.0
-      IL_0035:  ldfld      class Test.AA Test.AA::self3
-      IL_003a:  call       instance void Test.AA::CheckFields()
+      IL_0035:  ldfld      class Test_refarg_i4_il.AA Test_refarg_i4_il.AA::self3
+      IL_003a:  call       instance void Test_refarg_i4_il.AA::CheckFields()
       IL_003f:  ldarg.0
-      IL_0040:  ldfld      class Test.AA Test.AA::self4
+      IL_0040:  ldfld      class Test_refarg_i4_il.AA Test_refarg_i4_il.AA::self4
       IL_0045:  brfalse.s  IL_0052
 
       IL_0047:  ldarg.0
-      IL_0048:  ldfld      class Test.AA Test.AA::self4
-      IL_004d:  call       instance void Test.AA::CheckFields()
+      IL_0048:  ldfld      class Test_refarg_i4_il.AA Test_refarg_i4_il.AA::self4
+      IL_004d:  call       instance void Test_refarg_i4_il.AA::CheckFields()
       IL_0052:  ret
     } // end of method 'AA::Finalize'
 
   } // end of class 'AA'
 
-  .class private auto ansi App extends ['mscorlib']System.Object
+  .class public auto ansi App extends ['mscorlib']System.Object
   {
-    .field private static class Test.AA s_aa
+    .field private static class Test_refarg_i4_il.AA s_aa
     .method private hidebysig static void
             Litter() il managed
     {
@@ -179,14 +179,14 @@
     } // end of method 'App::Litter'
 
     .method private hidebysig static int32 
-            Test(int32& n) il managed
+            Test_refarg_i4_il(int32& n) il managed
     {
       // Code size       47 (0x2f)
       .maxstack  2
       .locals (int32 V_0)
       IL_0000:  ldnull
-      IL_0001:  stsfld     class Test.AA Test.App::s_aa
-      IL_0006:  call       void Test.App::Litter()
+      IL_0001:  stsfld     class Test_refarg_i4_il.AA Test_refarg_i4_il.App::s_aa
+      IL_0006:  call       void Test_refarg_i4_il.App::Litter()
       IL_000b:  ldarg.0
       IL_000c:  ldind.i4
       IL_000d:  ldc.i4.s   11
@@ -206,9 +206,9 @@
 
       IL_002d:  ldloc.0
       IL_002e:  ret
-    } // end of method 'App::Test'
+    } // end of method 'App::Test_refarg_i4_il'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -219,9 +219,9 @@
       .maxstack  1
       .locals (int32 V_0,
                int32 V_1)
-      IL_0000:  ldsfld     class Test.AA Test.App::s_aa
-      IL_0005:  ldflda     int32 Test.AA::mm
-      IL_000a:  call       int32 Test.App::Test(int32&)
+      IL_0000:  ldsfld     class Test_refarg_i4_il.AA Test_refarg_i4_il.App::s_aa
+      IL_0005:  ldflda     int32 Test_refarg_i4_il.AA::mm
+      IL_000a:  call       int32 Test_refarg_i4_il.App::Test_refarg_i4_il(int32&)
       IL_000f:  stloc.0
       IL_0010:  call       void ['mscorlib']System.GC::Collect()
       IL_0015:  call       void ['mscorlib']System.GC::WaitForPendingFinalizers()
@@ -239,8 +239,8 @@
       // Code size       12 (0xc)
       .maxstack  8
       IL_0000:  ldc.i4.0
-      IL_0001:  newobj     instance void Test.AA::.ctor(int32)
-      IL_0006:  stsfld     class Test.AA Test.App::s_aa
+      IL_0001:  newobj     instance void Test_refarg_i4_il.AA::.ctor(int32)
+      IL_0006:  stsfld     class Test_refarg_i4_il.AA Test_refarg_i4_il.App::s_aa
       IL_000b:  ret
     } // end of method 'App::.cctor'
 
@@ -256,6 +256,6 @@
 
   } // end of class 'App'
 
-} // end of namespace 'Test'
+} // end of namespace 'Test_refarg_i4_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_i4_d.csproj b/src/tests/JIT/Methodical/explicit/basic/refarg_i4_d.csproj
index 901a2f44ca8ce8..a0b87b27d59fb3 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_i4_d.csproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_i4_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_i4_do.csproj b/src/tests/JIT/Methodical/explicit/basic/refarg_i4_do.csproj
index 04529b355a9f61..fe136789d9c245 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_i4_do.csproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_i4_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_i4_il_d.ilproj b/src/tests/JIT/Methodical/explicit/basic/refarg_i4_il_d.ilproj
index 8303b0a013aece..56924881d9eafc 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_i4_il_d.ilproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_i4_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_i4_il_r.ilproj b/src/tests/JIT/Methodical/explicit/basic/refarg_i4_il_r.ilproj
index cd395b143ce123..97f3d4d5559c9a 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_i4_il_r.ilproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_i4_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_i4_r.csproj b/src/tests/JIT/Methodical/explicit/basic/refarg_i4_r.csproj
index 023a2c88b5c1d2..c9260f64124ef7 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_i4_r.csproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_i4_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_i4_ro.csproj b/src/tests/JIT/Methodical/explicit/basic/refarg_i4_ro.csproj
index 53e89884cd5aaa..dd8938d11062c1 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_i4_ro.csproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_i4_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_o.cs b/src/tests/JIT/Methodical/explicit/basic/refarg_o.cs
index 7ce68a0f3d5a02..89a517f7581bd8 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_o.cs
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_o.cs
@@ -2,8 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace Test
+namespace Test_refarg_o_cs
 {
     internal class AA
     {
@@ -23,7 +24,7 @@ internal class AA
         }
     }
 
-    internal class App
+    public class App
     {
         private static AA s_aa = new AA(new AA(null));
 
@@ -50,7 +51,8 @@ private static int Test(ref AA aa)
             return 100;
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             int exitCode = Test(ref s_aa.m_aa);
             GC.Collect();
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_o.il b/src/tests/JIT/Methodical/explicit/basic/refarg_o.il
index 1d1b7fdf9a00fa..3098bde0786978 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_o.il
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_o.il
@@ -19,32 +19,32 @@
 }
 .assembly extern xunit.core {}
 // MVID: {98C433B3-3689-48CF-A0CC-1320952F1424}
-.namespace Test
+.namespace Test_refarg_o_il
 {
   .class private auto ansi AA extends ['mscorlib']System.Object
   {
     .field family wchar pad1
     .field public int32 mm
-    .field public class Test.AA m_aa
+    .field public class Test_refarg_o_il.AA m_aa
     .method public hidebysig specialname rtspecialname 
-            instance void  .ctor(class Test.AA aa) il managed
+            instance void  .ctor(class Test_refarg_o_il.AA aa) il managed
     {
       // Code size       37 (0x25)
       .maxstack  8
       IL_0000:  ldarg.0
       IL_0001:  ldc.i4.s   122
-      IL_0003:  stfld      wchar Test.AA::pad1
+      IL_0003:  stfld      wchar Test_refarg_o_il.AA::pad1
       IL_0008:  ldarg.0
       IL_0009:  ldc.i4.s   11
-      IL_000b:  stfld      int32 Test.AA::mm
+      IL_000b:  stfld      int32 Test_refarg_o_il.AA::mm
       IL_0010:  ldarg.0
       IL_0011:  ldnull
-      IL_0012:  stfld      class Test.AA Test.AA::m_aa
+      IL_0012:  stfld      class Test_refarg_o_il.AA Test_refarg_o_il.AA::m_aa
       IL_0017:  ldarg.0
       IL_0018:  call       instance void ['mscorlib']System.Object::.ctor()
       IL_001d:  ldarg.0
       IL_001e:  ldarg.1
-      IL_001f:  stfld      class Test.AA Test.AA::m_aa
+      IL_001f:  stfld      class Test_refarg_o_il.AA Test_refarg_o_il.AA::m_aa
       IL_0024:  ret
     } // end of method 'AA::.ctor'
 
@@ -54,12 +54,12 @@
       // Code size       71 (0x47)
       .maxstack  2
       IL_0000:  ldarg.0
-      IL_0001:  ldfld      wchar Test.AA::pad1
+      IL_0001:  ldfld      wchar Test_refarg_o_il.AA::pad1
       IL_0006:  ldc.i4.s   122
       IL_0008:  bne.un.s   IL_0014
 
       IL_000a:  ldarg.0
-      IL_000b:  ldfld      int32 Test.AA::mm
+      IL_000b:  ldfld      int32 Test_refarg_o_il.AA::mm
       IL_0010:  ldc.i4.s   11
       IL_0012:  beq.s      IL_001a
 
@@ -67,18 +67,18 @@
       IL_0019:  throw
 
       IL_001a:  ldarg.0
-      IL_001b:  ldfld      class Test.AA Test.AA::m_aa
+      IL_001b:  ldfld      class Test_refarg_o_il.AA Test_refarg_o_il.AA::m_aa
       IL_0020:  brfalse.s  IL_0046
 
       IL_0022:  ldarg.0
-      IL_0023:  ldfld      class Test.AA Test.AA::m_aa
-      IL_0028:  ldfld      wchar Test.AA::pad1
+      IL_0023:  ldfld      class Test_refarg_o_il.AA Test_refarg_o_il.AA::m_aa
+      IL_0028:  ldfld      wchar Test_refarg_o_il.AA::pad1
       IL_002d:  ldc.i4.s   122
       IL_002f:  bne.un.s   IL_0040
 
       IL_0031:  ldarg.0
-      IL_0032:  ldfld      class Test.AA Test.AA::m_aa
-      IL_0037:  ldfld      int32 Test.AA::mm
+      IL_0032:  ldfld      class Test_refarg_o_il.AA Test_refarg_o_il.AA::m_aa
+      IL_0037:  ldfld      int32 Test_refarg_o_il.AA::mm
       IL_003c:  ldc.i4.s   11
       IL_003e:  beq.s      IL_0046
 
@@ -90,9 +90,9 @@
 
   } // end of class 'AA'
 
-  .class private auto ansi App extends ['mscorlib']System.Object
+  .class public auto ansi App extends ['mscorlib']System.Object
   {
-    .field private static class Test.AA s_aa
+    .field private static class Test_refarg_o_il.AA s_aa
     .method private hidebysig static void
             Litter() il managed
     {
@@ -121,17 +121,17 @@
     } // end of method 'App::Litter'
 
     .method private hidebysig static int32 
-            Test(class Test.AA& aa) il managed
+            Test_refarg_o_il(class Test_refarg_o_il.AA& aa) il managed
     {
       // Code size       52 (0x34)
       .maxstack  2
       .locals (int32 V_0)
       IL_0000:  ldnull
-      IL_0001:  stsfld     class Test.AA Test.App::s_aa
-      IL_0006:  call       void Test.App::Litter()
+      IL_0001:  stsfld     class Test_refarg_o_il.AA Test_refarg_o_il.App::s_aa
+      IL_0006:  call       void Test_refarg_o_il.App::Litter()
       IL_000b:  ldarg.0
       IL_000c:  ldind.ref
-      IL_000d:  ldfld      int32 Test.AA::mm
+      IL_000d:  ldfld      int32 Test_refarg_o_il.AA::mm
       IL_0012:  ldc.i4.s   11
       IL_0014:  beq.s      IL_0024
 
@@ -149,9 +149,9 @@
 
       IL_0032:  ldloc.0
       IL_0033:  ret
-    } // end of method 'App::Test'
+    } // end of method 'App::Test_refarg_o_il'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -162,9 +162,9 @@
       .maxstack  1
       .locals (int32 V_0,
                int32 V_1)
-      IL_0000:  ldsfld     class Test.AA Test.App::s_aa
-      IL_0005:  ldflda     class Test.AA Test.AA::m_aa
-      IL_000a:  call       int32 Test.App::Test(class Test.AA&)
+      IL_0000:  ldsfld     class Test_refarg_o_il.AA Test_refarg_o_il.App::s_aa
+      IL_0005:  ldflda     class Test_refarg_o_il.AA Test_refarg_o_il.AA::m_aa
+      IL_000a:  call       int32 Test_refarg_o_il.App::Test_refarg_o_il(class Test_refarg_o_il.AA&)
       IL_000f:  stloc.0
       IL_0010:  call       void ['mscorlib']System.GC::Collect()
       IL_0015:  call       void ['mscorlib']System.GC::WaitForPendingFinalizers()
@@ -182,9 +182,9 @@
       // Code size       17 (0x11)
       .maxstack  8
       IL_0000:  ldnull
-      IL_0001:  newobj     instance void Test.AA::.ctor(class Test.AA)
-      IL_0006:  newobj     instance void Test.AA::.ctor(class Test.AA)
-      IL_000b:  stsfld     class Test.AA Test.App::s_aa
+      IL_0001:  newobj     instance void Test_refarg_o_il.AA::.ctor(class Test_refarg_o_il.AA)
+      IL_0006:  newobj     instance void Test_refarg_o_il.AA::.ctor(class Test_refarg_o_il.AA)
+      IL_000b:  stsfld     class Test_refarg_o_il.AA Test_refarg_o_il.App::s_aa
       IL_0010:  ret
     } // end of method 'App::.cctor'
 
@@ -200,6 +200,6 @@
 
   } // end of class 'App'
 
-} // end of namespace 'Test'
+} // end of namespace 'Test_refarg_o_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_o_d.csproj b/src/tests/JIT/Methodical/explicit/basic/refarg_o_d.csproj
index 6abe34e7348b25..a880c7ca57e020 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_o_d.csproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_o_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_o_do.csproj b/src/tests/JIT/Methodical/explicit/basic/refarg_o_do.csproj
index 321c07c6cd9810..df86f61e0d3631 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_o_do.csproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_o_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_o_il_d.ilproj b/src/tests/JIT/Methodical/explicit/basic/refarg_o_il_d.ilproj
index 360fa514fa2fa3..c93f7a619851bd 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_o_il_d.ilproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_o_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_o_il_r.ilproj b/src/tests/JIT/Methodical/explicit/basic/refarg_o_il_r.ilproj
index 4cf375cb727b5d..b46c6b404f9ea8 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_o_il_r.ilproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_o_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_o_r.csproj b/src/tests/JIT/Methodical/explicit/basic/refarg_o_r.csproj
index e098406ad7914e..310dc037d557fd 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_o_r.csproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_o_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_o_ro.csproj b/src/tests/JIT/Methodical/explicit/basic/refarg_o_ro.csproj
index cff26559c8f34f..c0ebefef741069 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_o_ro.csproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_o_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_s.cs b/src/tests/JIT/Methodical/explicit/basic/refarg_s.cs
index a72361c2662244..e3c76c7f1b9bee 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_s.cs
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_s.cs
@@ -2,8 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace Test
+namespace Test_refarg_s_cs
 {
     internal class AA
     {
@@ -23,7 +24,7 @@ internal class AA
         }
     }
 
-    internal class App
+    public class App
     {
         private static AA s_aa = new AA();
 
@@ -50,7 +51,8 @@ private static int Test(ref String n)
             return 100;
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             int exitCode = Test(ref s_aa.mm);
             GC.Collect();
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_s.il b/src/tests/JIT/Methodical/explicit/basic/refarg_s.il
index bab5a916420ea1..193130dc0b1088 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_s.il
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_s.il
@@ -19,13 +19,13 @@
 }
 .assembly extern xunit.core {}
 // MVID: {003C53D6-66A7-45B4-8632-F678BD70244A}
-.namespace Test
+.namespace Test_refarg_s_il
 {
   .class private auto ansi AA extends ['mscorlib']System.Object
   {
     .field family wchar pad1
     .field public class System.String mm
-    .field private class Test.AA self
+    .field private class Test_refarg_s_il.AA self
     .method public hidebysig specialname rtspecialname 
             instance void .ctor() il managed
     {
@@ -33,18 +33,18 @@
       .maxstack  8
       IL_0000:  ldarg.0
       IL_0001:  ldc.i4.s   122
-      IL_0003:  stfld      wchar Test.AA::pad1
+      IL_0003:  stfld      wchar Test_refarg_s_il.AA::pad1
       IL_0008:  ldarg.0
       IL_0009:  ldstr      "monolight"
-      IL_000e:  stfld      class System.String Test.AA::mm
+      IL_000e:  stfld      class System.String Test_refarg_s_il.AA::mm
       IL_0013:  ldarg.0
       IL_0014:  ldnull
-      IL_0015:  stfld      class Test.AA Test.AA::self
+      IL_0015:  stfld      class Test_refarg_s_il.AA Test_refarg_s_il.AA::self
       IL_001a:  ldarg.0
       IL_001b:  call       instance void ['mscorlib']System.Object::.ctor()
       IL_0020:  ldarg.0
       IL_0021:  ldarg.0
-      IL_0022:  stfld      class Test.AA Test.AA::self
+      IL_0022:  stfld      class Test_refarg_s_il.AA Test_refarg_s_il.AA::self
       IL_0027:  ret
     } // end of method 'AA::.ctor'
 
@@ -54,12 +54,12 @@
       // Code size       77 (0x4d)
       .maxstack  2
       IL_0000:  ldarg.0
-      IL_0001:  ldfld      wchar Test.AA::pad1
+      IL_0001:  ldfld      wchar Test_refarg_s_il.AA::pad1
       IL_0006:  ldc.i4.s   122
       IL_0008:  bne.un.s   IL_001c
 
       IL_000a:  ldarg.0
-      IL_000b:  ldfld      class System.String Test.AA::mm
+      IL_000b:  ldfld      class System.String Test_refarg_s_il.AA::mm
       IL_0010:  ldstr      "monolight"
       IL_0015:  call       bool ['mscorlib']System.String::Equals(class System.String,
                                                                   class System.String)
@@ -69,16 +69,16 @@
       IL_0021:  throw
 
       IL_0022:  ldarg.0
-      IL_0023:  ldfld      class Test.AA Test.AA::self
+      IL_0023:  ldfld      class Test_refarg_s_il.AA Test_refarg_s_il.AA::self
       IL_0028:  brfalse.s  IL_004c
 
       IL_002a:  ldarg.0
-      IL_002b:  ldfld      wchar Test.AA::pad1
+      IL_002b:  ldfld      wchar Test_refarg_s_il.AA::pad1
       IL_0030:  ldc.i4.s   122
       IL_0032:  bne.un.s   IL_0046
 
       IL_0034:  ldarg.0
-      IL_0035:  ldfld      class System.String Test.AA::mm
+      IL_0035:  ldfld      class System.String Test_refarg_s_il.AA::mm
       IL_003a:  ldstr      "monolight"
       IL_003f:  call       bool ['mscorlib']System.String::Equals(class System.String,
                                                                   class System.String)
@@ -92,9 +92,9 @@
 
   } // end of class 'AA'
 
-  .class private auto ansi App extends ['mscorlib']System.Object
+  .class public auto ansi App extends ['mscorlib']System.Object
   {
-    .field private static class Test.AA s_aa
+    .field private static class Test_refarg_s_il.AA s_aa
     .method private hidebysig static void
             Litter() il managed
     {
@@ -123,14 +123,14 @@
     } // end of method 'App::Litter'
 
     .method private hidebysig static int32 
-            Test(class System.String& n) il managed
+            Test_refarg_s_il(class System.String& n) il managed
     {
       // Code size       55 (0x37)
       .maxstack  2
       .locals (int32 V_0)
       IL_0000:  ldnull
-      IL_0001:  stsfld     class Test.AA Test.App::s_aa
-      IL_0006:  call       void Test.App::Litter()
+      IL_0001:  stsfld     class Test_refarg_s_il.AA Test_refarg_s_il.App::s_aa
+      IL_0006:  call       void Test_refarg_s_il.App::Litter()
       IL_000b:  ldarg.0
       IL_000c:  ldind.ref
       IL_000d:  ldstr      "monolight"
@@ -152,9 +152,9 @@
 
       IL_0035:  ldloc.0
       IL_0036:  ret
-    } // end of method 'App::Test'
+    } // end of method 'App::Test_refarg_s_il'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -165,9 +165,9 @@
       .maxstack  1
       .locals (int32 V_0,
                int32 V_1)
-      IL_0000:  ldsfld     class Test.AA Test.App::s_aa
-      IL_0005:  ldflda     class System.String Test.AA::mm
-      IL_000a:  call       int32 Test.App::Test(class System.String&)
+      IL_0000:  ldsfld     class Test_refarg_s_il.AA Test_refarg_s_il.App::s_aa
+      IL_0005:  ldflda     class System.String Test_refarg_s_il.AA::mm
+      IL_000a:  call       int32 Test_refarg_s_il.App::Test_refarg_s_il(class System.String&)
       IL_000f:  stloc.0
       IL_0010:  call       void ['mscorlib']System.GC::Collect()
       IL_0015:  call       void ['mscorlib']System.GC::WaitForPendingFinalizers()
@@ -184,8 +184,8 @@
     {
       // Code size       11 (0xb)
       .maxstack  8
-      IL_0000:  newobj     instance void Test.AA::.ctor()
-      IL_0005:  stsfld     class Test.AA Test.App::s_aa
+      IL_0000:  newobj     instance void Test_refarg_s_il.AA::.ctor()
+      IL_0005:  stsfld     class Test_refarg_s_il.AA Test_refarg_s_il.App::s_aa
       IL_000a:  ret
     } // end of method 'App::.cctor'
 
@@ -201,6 +201,6 @@
 
   } // end of class 'App'
 
-} // end of namespace 'Test'
+} // end of namespace 'Test_refarg_s_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_s_d.csproj b/src/tests/JIT/Methodical/explicit/basic/refarg_s_d.csproj
index f0c0f5b60c35f3..0d0eb4df623f5a 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_s_d.csproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_s_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_s_do.csproj b/src/tests/JIT/Methodical/explicit/basic/refarg_s_do.csproj
index 9a880dacb5c1de..220df0ff99f853 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_s_do.csproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_s_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_s_il_d.ilproj b/src/tests/JIT/Methodical/explicit/basic/refarg_s_il_d.ilproj
index 4042d9aa7b3021..301317a0344d0a 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_s_il_d.ilproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_s_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_s_il_r.ilproj b/src/tests/JIT/Methodical/explicit/basic/refarg_s_il_r.ilproj
index 924b66593ff6d1..6fa0c908744c54 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_s_il_r.ilproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_s_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_s_r.csproj b/src/tests/JIT/Methodical/explicit/basic/refarg_s_r.csproj
index 26addb618cd58a..87bd587c87f48d 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_s_r.csproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_s_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_s_ro.csproj b/src/tests/JIT/Methodical/explicit/basic/refarg_s_ro.csproj
index 1a1c9a71e03dc4..e58935a327d258 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_s_ro.csproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_s_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_c.il b/src/tests/JIT/Methodical/explicit/basic/refloc_c.il
index 8d28ec36a405a9..a133effd3ffdc8 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_c.il
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_c.il
@@ -19,12 +19,12 @@
 }
 .assembly extern xunit.core {}
 // MVID: {79AF88AB-FAAC-4FD1-BE7F-0957B4D34D71}
-.namespace Test
+.namespace Test_refloc_c_il
 {
   .class private auto ansi AA extends ['mscorlib']System.Object
   {
-    .field static family class Test.AA s_aa
-    .field family class Test.AA m_aa
+    .field static family class Test_refloc_c_il.AA s_aa
+    .field family class Test_refloc_c_il.AA m_aa
     .field public wchar mm
     .field public static bool finalizerCalled
     .method family hidebysig virtual instance void
@@ -35,7 +35,7 @@
       IL_0000:  ldstr      "finalizer called."
       IL_0005:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_000a:  ldarg.0
-      IL_0027:  ldfld      wchar Test.AA::mm
+      IL_0027:  ldfld      wchar Test_refloc_c_il.AA::mm
       			ldc.i4 84
       IL_002c:  beq.s      IL_0034
 
@@ -43,7 +43,7 @@
       IL_0033:  throw
 
       IL_0034:  ldc.i4.1
-      IL_0035:  stsfld     bool Test.AA::finalizerCalled
+      IL_0035:  stsfld     bool Test_refloc_c_il.AA::finalizerCalled
       IL_003a:  ret
     } // end of method 'AA::Finalize'
 
@@ -52,10 +52,10 @@
     {
       // Code size       17 (0x11)
       .maxstack  8
-      IL_0000:  newobj     instance void Test.AA::.ctor()
-      IL_0005:  stsfld     class Test.AA Test.AA::s_aa
+      IL_0000:  newobj     instance void Test_refloc_c_il.AA::.ctor()
+      IL_0005:  stsfld     class Test_refloc_c_il.AA Test_refloc_c_il.AA::s_aa
       IL_000a:  ldc.i4.0
-      IL_000b:  stsfld     bool Test.AA::finalizerCalled
+      IL_000b:  stsfld     bool Test_refloc_c_il.AA::finalizerCalled
       IL_0010:  ret
     } // end of method 'AA::.cctor'
 
@@ -65,11 +65,11 @@
       // Code size       26 (0x1a)
       .maxstack  8
       IL_0000:  ldarg.0
-      IL_0001:  ldsfld     class Test.AA Test.AA::s_aa
-      IL_0006:  stfld      class Test.AA Test.AA::m_aa
+      IL_0001:  ldsfld     class Test_refloc_c_il.AA Test_refloc_c_il.AA::s_aa
+      IL_0006:  stfld      class Test_refloc_c_il.AA Test_refloc_c_il.AA::m_aa
       IL_000b:  ldarg.0
       IL_000c:  ldc.i4.s   84
-      IL_000e:  stfld      wchar Test.AA::mm
+      IL_000e:  stfld      wchar Test_refloc_c_il.AA::mm
       IL_0013:  ldarg.0
       IL_0014:  call       instance void ['mscorlib']System.Object::.ctor()
       IL_0019:  ret
@@ -77,9 +77,9 @@
 
   } // end of class 'AA'
 
-  .class private auto ansi App extends ['mscorlib']System.Object
+  .class public auto ansi App extends ['mscorlib']System.Object
   {
-    .field private static class Test.AA s_aa
+    .field private static class Test_refloc_c_il.AA s_aa
     .method private hidebysig static void
             Litter() il managed
     {
@@ -108,7 +108,7 @@
       IL_002a:  ret
     } // end of method 'App::Litter'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -119,13 +119,13 @@
       .maxstack  2
       .locals (wchar & V_0,
                int32 V_1)
-      IL_0000:  ldsfld     class Test.AA Test.App::s_aa
-      IL_0005:  ldflda      wchar Test.AA::mm
+      IL_0000:  ldsfld     class Test_refloc_c_il.AA Test_refloc_c_il.App::s_aa
+      IL_0005:  ldflda      wchar Test_refloc_c_il.AA::mm
       IL_000a:  stloc.0
       IL_000b:  ldnull
-      IL_000c:  stsfld     class Test.AA Test.App::s_aa
-      IL_0011:  call       void Test.App::Litter()
-      IL_0016:  ldsfld     bool Test.AA::finalizerCalled
+      IL_000c:  stsfld     class Test_refloc_c_il.AA Test_refloc_c_il.App::s_aa
+      IL_0011:  call       void Test_refloc_c_il.App::Litter()
+      IL_0016:  ldsfld     bool Test_refloc_c_il.AA::finalizerCalled
       IL_001b:  brtrue.s   IL_0022
 
       IL_001d:  ldloc.0
@@ -154,8 +154,8 @@
     {
       // Code size       11 (0xb)
       .maxstack  8
-      IL_0000:  newobj     instance void Test.AA::.ctor()
-      IL_0005:  stsfld     class Test.AA Test.App::s_aa
+      IL_0000:  newobj     instance void Test_refloc_c_il.AA::.ctor()
+      IL_0005:  stsfld     class Test_refloc_c_il.AA Test_refloc_c_il.App::s_aa
       IL_000a:  ret
     } // end of method 'App::.cctor'
 
@@ -171,6 +171,6 @@
 
   } // end of class 'App'
 
-} // end of namespace 'Test'
+} // end of namespace 'Test_refloc_c_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_c_il_d.ilproj b/src/tests/JIT/Methodical/explicit/basic/refloc_c_il_d.ilproj
index 4520750274c2af..c223517a51b0dc 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_c_il_d.ilproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_c_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_c_il_r.ilproj b/src/tests/JIT/Methodical/explicit/basic/refloc_c_il_r.ilproj
index e57c3e273646c9..abc736448f21ca 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_c_il_r.ilproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_c_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_i1.il b/src/tests/JIT/Methodical/explicit/basic/refloc_i1.il
index 6c4a72d3ede1d8..4c0bc0710ffcda 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_i1.il
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_i1.il
@@ -19,13 +19,13 @@
 }
 .assembly extern xunit.core {}
 // MVID: {3752C643-F767-47EB-BDBF-8588A1A0B6B3}
-.namespace Test
+.namespace Test_refloc_i1_il
 {
   .class private auto ansi AA extends ['mscorlib']System.Object
   {
     .field public unsigned int8 mm
-    .field static family class Test.AA s_aa
-    .field family class Test.AA m_aa
+    .field static family class Test_refloc_i1_il.AA s_aa
+    .field family class Test_refloc_i1_il.AA m_aa
     .field public static bool finalizerCalled
     .method family hidebysig virtual instance void
             Finalize() il managed
@@ -35,7 +35,7 @@
       IL_0000:  ldstr      "finalizer called."
       IL_0005:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_000a:  ldarg.0
-      IL_0027:  ldfld      unsigned int8 Test.AA::mm
+      IL_0027:  ldfld      unsigned int8 Test_refloc_i1_il.AA::mm
       			ldc.i4 45
       IL_002c:  beq.s      IL_0034
 
@@ -43,7 +43,7 @@
       IL_0033:  throw
 
       IL_0034:  ldc.i4.1
-      IL_0035:  stsfld     bool Test.AA::finalizerCalled
+      IL_0035:  stsfld     bool Test_refloc_i1_il.AA::finalizerCalled
       IL_003a:  ret
     } // end of method 'AA::Finalize'
 
@@ -52,10 +52,10 @@
     {
       // Code size       17 (0x11)
       .maxstack  8
-      IL_0000:  newobj     instance void Test.AA::.ctor()
-      IL_0005:  stsfld     class Test.AA Test.AA::s_aa
+      IL_0000:  newobj     instance void Test_refloc_i1_il.AA::.ctor()
+      IL_0005:  stsfld     class Test_refloc_i1_il.AA Test_refloc_i1_il.AA::s_aa
       IL_000a:  ldc.i4.0
-      IL_000b:  stsfld     bool Test.AA::finalizerCalled
+      IL_000b:  stsfld     bool Test_refloc_i1_il.AA::finalizerCalled
       IL_0010:  ret
     } // end of method 'AA::.cctor'
 
@@ -66,10 +66,10 @@
       .maxstack  8
       IL_0000:  ldarg.0
       IL_0001:  ldc.i4.s   45
-      IL_0003:  stfld      unsigned int8 Test.AA::mm
+      IL_0003:  stfld      unsigned int8 Test_refloc_i1_il.AA::mm
       IL_0008:  ldarg.0
-      IL_0009:  ldsfld     class Test.AA Test.AA::s_aa
-      IL_000e:  stfld      class Test.AA Test.AA::m_aa
+      IL_0009:  ldsfld     class Test_refloc_i1_il.AA Test_refloc_i1_il.AA::s_aa
+      IL_000e:  stfld      class Test_refloc_i1_il.AA Test_refloc_i1_il.AA::m_aa
       IL_0013:  ldarg.0
       IL_0014:  call       instance void ['mscorlib']System.Object::.ctor()
       IL_0019:  ret
@@ -77,9 +77,9 @@
 
   } // end of class 'AA'
 
-  .class private auto ansi App extends ['mscorlib']System.Object
+  .class public auto ansi App extends ['mscorlib']System.Object
   {
-    .field private static class Test.AA s_aa
+    .field private static class Test_refloc_i1_il.AA s_aa
     .method private hidebysig static void
             Litter() il managed
     {
@@ -108,7 +108,7 @@
       IL_002a:  ret
     } // end of method 'App::Litter'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -119,13 +119,13 @@
       .maxstack  2
       .locals (unsigned int8 & V_0,
                int32 V_1)
-      IL_0000:  ldsfld     class Test.AA Test.App::s_aa
-      IL_0005:  ldflda      unsigned int8 Test.AA::mm
+      IL_0000:  ldsfld     class Test_refloc_i1_il.AA Test_refloc_i1_il.App::s_aa
+      IL_0005:  ldflda      unsigned int8 Test_refloc_i1_il.AA::mm
       IL_000a:  stloc.0
       IL_000b:  ldnull
-      IL_000c:  stsfld     class Test.AA Test.App::s_aa
-      IL_0011:  call       void Test.App::Litter()
-      IL_0016:  ldsfld     bool Test.AA::finalizerCalled
+      IL_000c:  stsfld     class Test_refloc_i1_il.AA Test_refloc_i1_il.App::s_aa
+      IL_0011:  call       void Test_refloc_i1_il.App::Litter()
+      IL_0016:  ldsfld     bool Test_refloc_i1_il.AA::finalizerCalled
       IL_001b:  brtrue.s   IL_0022
 
       IL_001d:  ldloc.0
@@ -154,8 +154,8 @@
     {
       // Code size       11 (0xb)
       .maxstack  8
-      IL_0000:  newobj     instance void Test.AA::.ctor()
-      IL_0005:  stsfld     class Test.AA Test.App::s_aa
+      IL_0000:  newobj     instance void Test_refloc_i1_il.AA::.ctor()
+      IL_0005:  stsfld     class Test_refloc_i1_il.AA Test_refloc_i1_il.App::s_aa
       IL_000a:  ret
     } // end of method 'App::.cctor'
 
@@ -171,6 +171,6 @@
 
   } // end of class 'App'
 
-} // end of namespace 'Test'
+} // end of namespace 'Test_refloc_i1_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_i1_il_d.ilproj b/src/tests/JIT/Methodical/explicit/basic/refloc_i1_il_d.ilproj
index fbc924d8d20b3b..5fa2ddd06762c6 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_i1_il_d.ilproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_i1_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_i1_il_r.ilproj b/src/tests/JIT/Methodical/explicit/basic/refloc_i1_il_r.ilproj
index 1d5ab258d94a92..8c9f7e981f7da7 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_i1_il_r.ilproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_i1_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_i2.il b/src/tests/JIT/Methodical/explicit/basic/refloc_i2.il
index c84a65779703a9..5ac3a11295a679 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_i2.il
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_i2.il
@@ -19,12 +19,12 @@
 }
 .assembly extern xunit.core {}
 // MVID: {310C7C47-EDC8-46C9-A5AD-A4054CE0204A}
-.namespace Test
+.namespace Test_refloc_i2_il
 {
   .class private auto ansi AA extends ['mscorlib']System.Object
   {
-    .field static family class Test.AA s_aa
-    .field family class Test.AA m_aa
+    .field static family class Test_refloc_i2_il.AA s_aa
+    .field family class Test_refloc_i2_il.AA m_aa
     .field public int16 mm
     .field public static bool finalizerCalled
     .method family hidebysig virtual instance void
@@ -35,7 +35,7 @@
       IL_0000:  ldstr      "finalizer called."
       IL_0005:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_000a:  ldarg.0
-      IL_0027:  ldfld      int16 Test.AA::mm
+      IL_0027:  ldfld      int16 Test_refloc_i2_il.AA::mm
       			ldc.i4 -45
       IL_002c:  beq.s      IL_0034
 
@@ -43,7 +43,7 @@
       IL_0033:  throw
 
       IL_0034:  ldc.i4.1
-      IL_0035:  stsfld     bool Test.AA::finalizerCalled
+      IL_0035:  stsfld     bool Test_refloc_i2_il.AA::finalizerCalled
       IL_003a:  ret
     } // end of method 'AA::Finalize'
 
@@ -52,10 +52,10 @@
     {
       // Code size       17 (0x11)
       .maxstack  8
-      IL_0000:  newobj     instance void Test.AA::.ctor()
-      IL_0005:  stsfld     class Test.AA Test.AA::s_aa
+      IL_0000:  newobj     instance void Test_refloc_i2_il.AA::.ctor()
+      IL_0005:  stsfld     class Test_refloc_i2_il.AA Test_refloc_i2_il.AA::s_aa
       IL_000a:  ldc.i4.0
-      IL_000b:  stsfld     bool Test.AA::finalizerCalled
+      IL_000b:  stsfld     bool Test_refloc_i2_il.AA::finalizerCalled
       IL_0010:  ret
     } // end of method 'AA::.cctor'
 
@@ -65,11 +65,11 @@
       // Code size       26 (0x1a)
       .maxstack  8
       IL_0000:  ldarg.0
-      IL_0001:  ldsfld     class Test.AA Test.AA::s_aa
-      IL_0006:  stfld      class Test.AA Test.AA::m_aa
+      IL_0001:  ldsfld     class Test_refloc_i2_il.AA Test_refloc_i2_il.AA::s_aa
+      IL_0006:  stfld      class Test_refloc_i2_il.AA Test_refloc_i2_il.AA::m_aa
       IL_000b:  ldarg.0
       IL_000c:  ldc.i4.s   -45
-      IL_000e:  stfld      int16 Test.AA::mm
+      IL_000e:  stfld      int16 Test_refloc_i2_il.AA::mm
       IL_0013:  ldarg.0
       IL_0014:  call       instance void ['mscorlib']System.Object::.ctor()
       IL_0019:  ret
@@ -77,9 +77,9 @@
 
   } // end of class 'AA'
 
-  .class private auto ansi App extends ['mscorlib']System.Object
+  .class public auto ansi App extends ['mscorlib']System.Object
   {
-    .field private static class Test.AA s_aa
+    .field private static class Test_refloc_i2_il.AA s_aa
     .method private hidebysig static void
             Litter() il managed
     {
@@ -108,7 +108,7 @@
       IL_002a:  ret
     } // end of method 'App::Litter'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -119,13 +119,13 @@
       .maxstack  2
       .locals (int16 & V_0,
                int32 V_1)
-      IL_0000:  ldsfld     class Test.AA Test.App::s_aa
-      IL_0005:  ldflda      int16 Test.AA::mm
+      IL_0000:  ldsfld     class Test_refloc_i2_il.AA Test_refloc_i2_il.App::s_aa
+      IL_0005:  ldflda      int16 Test_refloc_i2_il.AA::mm
       IL_000a:  stloc.0
       IL_000b:  ldnull
-      IL_000c:  stsfld     class Test.AA Test.App::s_aa
-      IL_0011:  call       void Test.App::Litter()
-      IL_0016:  ldsfld     bool Test.AA::finalizerCalled
+      IL_000c:  stsfld     class Test_refloc_i2_il.AA Test_refloc_i2_il.App::s_aa
+      IL_0011:  call       void Test_refloc_i2_il.App::Litter()
+      IL_0016:  ldsfld     bool Test_refloc_i2_il.AA::finalizerCalled
       IL_001b:  brtrue.s   IL_0022
 
       IL_001d:  ldloc.0
@@ -154,8 +154,8 @@
     {
       // Code size       11 (0xb)
       .maxstack  8
-      IL_0000:  newobj     instance void Test.AA::.ctor()
-      IL_0005:  stsfld     class Test.AA Test.App::s_aa
+      IL_0000:  newobj     instance void Test_refloc_i2_il.AA::.ctor()
+      IL_0005:  stsfld     class Test_refloc_i2_il.AA Test_refloc_i2_il.App::s_aa
       IL_000a:  ret
     } // end of method 'App::.cctor'
 
@@ -171,6 +171,6 @@
 
   } // end of class 'App'
 
-} // end of namespace 'Test'
+} // end of namespace 'Test_refloc_i2_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_i2_il_d.ilproj b/src/tests/JIT/Methodical/explicit/basic/refloc_i2_il_d.ilproj
index 8f61e835f3b24f..9a81143f72feb4 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_i2_il_d.ilproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_i2_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_i2_il_r.ilproj b/src/tests/JIT/Methodical/explicit/basic/refloc_i2_il_r.ilproj
index 95c5d3a94b0aee..30b60f6efea69a 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_i2_il_r.ilproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_i2_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_i4.il b/src/tests/JIT/Methodical/explicit/basic/refloc_i4.il
index 171f7351fcd990..c2a895f62219a1 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_i4.il
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_i4.il
@@ -19,12 +19,12 @@
 }
 .assembly extern xunit.core {}
 // MVID: {D12582D0-C0F0-40C6-B4E1-807EE328456C}
-.namespace Test
+.namespace Test_refloc_i4_il
 {
   .class private auto ansi AA extends ['mscorlib']System.Object
   {
-    .field static family class Test.AA s_aa
-    .field family class Test.AA m_aa
+    .field static family class Test_refloc_i4_il.AA s_aa
+    .field family class Test_refloc_i4_il.AA m_aa
     .field public int32 mm
     .field public static bool finalizerCalled
     .method family hidebysig virtual instance void
@@ -35,7 +35,7 @@
       IL_0000:  ldstr      "finalizer called."
       IL_0005:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_000a:  ldarg.0
-      IL_0027:  ldfld      int32 Test.AA::mm
+      IL_0027:  ldfld      int32 Test_refloc_i4_il.AA::mm
       			ldc.i4 45
       IL_002c:  beq.s      IL_0034
 
@@ -43,7 +43,7 @@
       IL_0033:  throw
 
       IL_0034:  ldc.i4.1
-      IL_0035:  stsfld     bool Test.AA::finalizerCalled
+      IL_0035:  stsfld     bool Test_refloc_i4_il.AA::finalizerCalled
       IL_003a:  ret
     } // end of method 'AA::Finalize'
 
@@ -52,10 +52,10 @@
     {
       // Code size       17 (0x11)
       .maxstack  8
-      IL_0000:  newobj     instance void Test.AA::.ctor()
-      IL_0005:  stsfld     class Test.AA Test.AA::s_aa
+      IL_0000:  newobj     instance void Test_refloc_i4_il.AA::.ctor()
+      IL_0005:  stsfld     class Test_refloc_i4_il.AA Test_refloc_i4_il.AA::s_aa
       IL_000a:  ldc.i4.0
-      IL_000b:  stsfld     bool Test.AA::finalizerCalled
+      IL_000b:  stsfld     bool Test_refloc_i4_il.AA::finalizerCalled
       IL_0010:  ret
     } // end of method 'AA::.cctor'
 
@@ -65,11 +65,11 @@
       // Code size       26 (0x1a)
       .maxstack  8
       IL_0000:  ldarg.0
-      IL_0001:  ldsfld     class Test.AA Test.AA::s_aa
-      IL_0006:  stfld      class Test.AA Test.AA::m_aa
+      IL_0001:  ldsfld     class Test_refloc_i4_il.AA Test_refloc_i4_il.AA::s_aa
+      IL_0006:  stfld      class Test_refloc_i4_il.AA Test_refloc_i4_il.AA::m_aa
       IL_000b:  ldarg.0
       IL_000c:  ldc.i4.s   45
-      IL_000e:  stfld      int32 Test.AA::mm
+      IL_000e:  stfld      int32 Test_refloc_i4_il.AA::mm
       IL_0013:  ldarg.0
       IL_0014:  call       instance void ['mscorlib']System.Object::.ctor()
       IL_0019:  ret
@@ -77,9 +77,9 @@
 
   } // end of class 'AA'
 
-  .class private auto ansi App extends ['mscorlib']System.Object
+  .class public auto ansi App extends ['mscorlib']System.Object
   {
-    .field private static class Test.AA s_aa
+    .field private static class Test_refloc_i4_il.AA s_aa
     .method private hidebysig static void
             Litter() il managed
     {
@@ -108,7 +108,7 @@
       IL_002a:  ret
     } // end of method 'App::Litter'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -119,13 +119,13 @@
       .maxstack  2
       .locals (int32 & V_0,
                int32 V_1)
-      IL_0000:  ldsfld     class Test.AA Test.App::s_aa
-      IL_0005:  ldflda      int32 Test.AA::mm
+      IL_0000:  ldsfld     class Test_refloc_i4_il.AA Test_refloc_i4_il.App::s_aa
+      IL_0005:  ldflda      int32 Test_refloc_i4_il.AA::mm
       IL_000a:  stloc.0
       IL_000b:  ldnull
-      IL_000c:  stsfld     class Test.AA Test.App::s_aa
-      IL_0011:  call       void Test.App::Litter()
-      IL_0016:  ldsfld     bool Test.AA::finalizerCalled
+      IL_000c:  stsfld     class Test_refloc_i4_il.AA Test_refloc_i4_il.App::s_aa
+      IL_0011:  call       void Test_refloc_i4_il.App::Litter()
+      IL_0016:  ldsfld     bool Test_refloc_i4_il.AA::finalizerCalled
       IL_001b:  brtrue.s   IL_0022
 
       IL_001d:  ldloc.0
@@ -154,8 +154,8 @@
     {
       // Code size       11 (0xb)
       .maxstack  8
-      IL_0000:  newobj     instance void Test.AA::.ctor()
-      IL_0005:  stsfld     class Test.AA Test.App::s_aa
+      IL_0000:  newobj     instance void Test_refloc_i4_il.AA::.ctor()
+      IL_0005:  stsfld     class Test_refloc_i4_il.AA Test_refloc_i4_il.App::s_aa
       IL_000a:  ret
     } // end of method 'App::.cctor'
 
@@ -171,6 +171,6 @@
 
   } // end of class 'App'
 
-} // end of namespace 'Test'
+} // end of namespace 'Test_refloc_i4_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_i4_il_d.ilproj b/src/tests/JIT/Methodical/explicit/basic/refloc_i4_il_d.ilproj
index 03a06cdab705d7..ed2ba5a8e7f677 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_i4_il_d.ilproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_i4_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_i4_il_r.ilproj b/src/tests/JIT/Methodical/explicit/basic/refloc_i4_il_r.ilproj
index 3514b9241bd6ce..82c40e6864186d 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_i4_il_r.ilproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_i4_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_o.il b/src/tests/JIT/Methodical/explicit/basic/refloc_o.il
index 0f6e11f983f638..9c607f1415de2f 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_o.il
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_o.il
@@ -19,11 +19,11 @@
 }
 .assembly extern xunit.core {}
 // MVID: {3CF0A869-1266-4091-97CF-DEFA0C36E038}
-.namespace Test
+.namespace Test_refloc_o_il
 {
   .class private auto ansi AA extends ['mscorlib']System.Object
   {
-    .field public class Test.AA m_aa
+    .field public class Test_refloc_o_il.AA m_aa
     .field public int32 m_nn
     .field public static bool finalizerCalled
     .method public hidebysig specialname rtspecialname 
@@ -35,15 +35,15 @@
       IL_0001:  call       instance void ['mscorlib']System.Object::.ctor()
       IL_0006:  ldarg.0
       IL_0007:  ldnull
-      IL_0008:  stfld      class Test.AA Test.AA::m_aa
+      IL_0008:  stfld      class Test_refloc_o_il.AA Test_refloc_o_il.AA::m_aa
       IL_000d:  ldarg.0
       IL_000e:  ldarg.1
-      IL_000f:  stfld      int32 Test.AA::m_nn
+      IL_000f:  stfld      int32 Test_refloc_o_il.AA::m_nn
       IL_0014:  ret
     } // end of method 'AA::.ctor'
 
     .method public hidebysig specialname rtspecialname 
-            instance void  .ctor(class Test.AA aa) il managed
+            instance void  .ctor(class Test_refloc_o_il.AA aa) il managed
     {
       // Code size       21 (0x15)
       .maxstack  8
@@ -51,10 +51,10 @@
       IL_0001:  call       instance void ['mscorlib']System.Object::.ctor()
       IL_0006:  ldarg.0
       IL_0007:  ldarg.1
-      IL_0008:  stfld      class Test.AA Test.AA::m_aa
+      IL_0008:  stfld      class Test_refloc_o_il.AA Test_refloc_o_il.AA::m_aa
       IL_000d:  ldarg.0
       IL_000e:  ldc.i4.0
-      IL_000f:  stfld      int32 Test.AA::m_nn
+      IL_000f:  stfld      int32 Test_refloc_o_il.AA::m_nn
       IL_0014:  ret
     } // end of method 'AA::.ctor'
 
@@ -63,12 +63,12 @@
     {
       // Code size       60 (0x3c)
       .maxstack  2
-      .locals (class Test.AA V_0)
+      .locals (class Test_refloc_o_il.AA V_0)
       IL_0000:  ldstr      "finalizer called."
       IL_0005:  call       void [System.Console]System.Console::WriteLine(class System.String)
 
       IL_0035:  ldc.i4.1
-      IL_0036:  stsfld     bool Test.AA::finalizerCalled
+      IL_0036:  stsfld     bool Test_refloc_o_il.AA::finalizerCalled
       IL_003b:  ret
     } // end of method 'AA::Finalize'
 
@@ -78,15 +78,15 @@
       // Code size       7 (0x7)
       .maxstack  8
       IL_0000:  ldc.i4.0
-      IL_0001:  stsfld     bool Test.AA::finalizerCalled
+      IL_0001:  stsfld     bool Test_refloc_o_il.AA::finalizerCalled
       IL_0006:  ret
     } // end of method 'AA::.cctor'
 
   } // end of class 'AA'
 
-  .class private auto ansi App extends ['mscorlib']System.Object
+  .class public auto ansi App extends ['mscorlib']System.Object
   {
-    .field private static class Test.AA s_aa
+    .field private static class Test_refloc_o_il.AA s_aa
     .method private hidebysig static void
             Litter() il managed
     {
@@ -115,7 +115,7 @@
       IL_002a:  ret
     } // end of method 'App::Litter'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -124,20 +124,20 @@
       .entrypoint
       // Code size       72 (0x48)
       .maxstack  2
-      .locals (class Test.AA & V_0,
+      .locals (class Test_refloc_o_il.AA & V_0,
                int32 V_1)
-      IL_0000:  ldsfld     class Test.AA Test.App::s_aa
-      IL_0005:  ldflda      class Test.AA Test.AA::m_aa
+      IL_0000:  ldsfld     class Test_refloc_o_il.AA Test_refloc_o_il.App::s_aa
+      IL_0005:  ldflda      class Test_refloc_o_il.AA Test_refloc_o_il.AA::m_aa
       IL_000a:  stloc.0
       IL_000b:  ldnull
-      IL_000c:  stsfld     class Test.AA Test.App::s_aa
-      IL_0011:  call       void Test.App::Litter()
-      IL_0016:  ldsfld     bool Test.AA::finalizerCalled
+      IL_000c:  stsfld     class Test_refloc_o_il.AA Test_refloc_o_il.App::s_aa
+      IL_0011:  call       void Test_refloc_o_il.App::Litter()
+      IL_0016:  ldsfld     bool Test_refloc_o_il.AA::finalizerCalled
       IL_001b:  brtrue.s   IL_002a
 
       IL_001d:  ldloc.0
       			ldind.ref
-      IL_001e:  ldfld      int32 Test.AA::m_nn
+      IL_001e:  ldfld      int32 Test_refloc_o_il.AA::m_nn
       IL_0023:  ldc.i4     0x6819
       IL_0028:  beq.s      IL_0038
 
@@ -163,9 +163,9 @@
       // Code size       21 (0x15)
       .maxstack  8
       IL_0000:  ldc.i4     0x6819
-      IL_0005:  newobj     instance void Test.AA::.ctor(int32)
-      IL_000a:  newobj     instance void Test.AA::.ctor(class Test.AA)
-      IL_000f:  stsfld     class Test.AA Test.App::s_aa
+      IL_0005:  newobj     instance void Test_refloc_o_il.AA::.ctor(int32)
+      IL_000a:  newobj     instance void Test_refloc_o_il.AA::.ctor(class Test_refloc_o_il.AA)
+      IL_000f:  stsfld     class Test_refloc_o_il.AA Test_refloc_o_il.App::s_aa
       IL_0014:  ret
     } // end of method 'App::.cctor'
 
@@ -181,6 +181,6 @@
 
   } // end of class 'App'
 
-} // end of namespace 'Test'
+} // end of namespace 'Test_refloc_o_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_o2.il b/src/tests/JIT/Methodical/explicit/basic/refloc_o2.il
index 78245cc22be47c..72563a8c8fdff4 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_o2.il
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_o2.il
@@ -19,11 +19,11 @@
 }
 .assembly extern xunit.core {}
 // MVID: {3CF0A869-1266-4091-97CF-DEFA0C36E038}
-.namespace Test
+.namespace Test_refloc_o2_il
 {
   .class private auto ansi AA extends ['mscorlib']System.Object
   {
-    .field public class Test.AA m_aa
+    .field public class Test_refloc_o2_il.AA m_aa
     .field public int32 m_nn
     .field public static bool finalizerCalled
     .method public hidebysig specialname rtspecialname 
@@ -35,15 +35,15 @@
       IL_0001:  call       instance void ['mscorlib']System.Object::.ctor()
       IL_0006:  ldarg.0
       IL_0007:  ldnull
-      IL_0008:  stfld      class Test.AA Test.AA::m_aa
+      IL_0008:  stfld      class Test_refloc_o2_il.AA Test_refloc_o2_il.AA::m_aa
       IL_000d:  ldarg.0
       IL_000e:  ldarg.1
-      IL_000f:  stfld      int32 Test.AA::m_nn
+      IL_000f:  stfld      int32 Test_refloc_o2_il.AA::m_nn
       IL_0014:  ret
     } // end of method 'AA::.ctor'
 
     .method public hidebysig specialname rtspecialname 
-            instance void  .ctor(class Test.AA aa) il managed
+            instance void  .ctor(class Test_refloc_o2_il.AA aa) il managed
     {
       // Code size       21 (0x15)
       .maxstack  8
@@ -51,10 +51,10 @@
       IL_0001:  call       instance void ['mscorlib']System.Object::.ctor()
       IL_0006:  ldarg.0
       IL_0007:  ldarg.1
-      IL_0008:  stfld      class Test.AA Test.AA::m_aa
+      IL_0008:  stfld      class Test_refloc_o2_il.AA Test_refloc_o2_il.AA::m_aa
       IL_000d:  ldarg.0
       IL_000e:  ldc.i4.0
-      IL_000f:  stfld      int32 Test.AA::m_nn
+      IL_000f:  stfld      int32 Test_refloc_o2_il.AA::m_nn
       IL_0014:  ret
     } // end of method 'AA::.ctor'
 
@@ -63,13 +63,13 @@
     {
       // Code size       60 (0x3c)
       .maxstack  3
-      .locals (class Test.AA V_0)
+      .locals (class Test_refloc_o2_il.AA V_0)
       IL_0000:  ldstr      "finalizer called."
       IL_0005:  call       void [System.Console]System.Console::WriteLine(class System.String)
       
       all_done: ldc.i4.1
       
-      IL_0036:  stsfld     bool Test.AA::finalizerCalled
+      IL_0036:  stsfld     bool Test_refloc_o2_il.AA::finalizerCalled
       IL_003b:  ret
     } // end of method 'AA::Finalize'
 
@@ -79,15 +79,15 @@
       // Code size       7 (0x7)
       .maxstack  8
       IL_0000:  ldc.i4.0
-      IL_0001:  stsfld     bool Test.AA::finalizerCalled
+      IL_0001:  stsfld     bool Test_refloc_o2_il.AA::finalizerCalled
       IL_0006:  ret
     } // end of method 'AA::.cctor'
 
   } // end of class 'AA'
 
-  .class private auto ansi App extends ['mscorlib']System.Object
+  .class public auto ansi App extends ['mscorlib']System.Object
   {
-    .field private static class Test.AA s_aa
+    .field private static class Test_refloc_o2_il.AA s_aa
     .method private hidebysig static void
             Litter() il managed
     {
@@ -116,7 +116,7 @@
       IL_002a:  ret
     } // end of method 'App::Litter'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -125,29 +125,29 @@
       .entrypoint
       // Code size       72 (0x48)
       .maxstack  2
-      .locals (class Test.AA & V_0,
+      .locals (class Test_refloc_o2_il.AA & V_0,
                int32 V_1)
-      IL_0000:  ldsfld     class Test.AA Test.App::s_aa
-      IL_0005:  ldflda      class Test.AA Test.AA::m_aa
+      IL_0000:  ldsfld     class Test_refloc_o2_il.AA Test_refloc_o2_il.App::s_aa
+      IL_0005:  ldflda      class Test_refloc_o2_il.AA Test_refloc_o2_il.AA::m_aa
       IL_000a:  stloc.0
       IL_000b:  ldnull
-      IL_000c:  stsfld     class Test.AA Test.App::s_aa
-      IL_0011:  call       void Test.App::Litter()
-      IL_0016:  ldsfld     bool Test.AA::finalizerCalled
+      IL_000c:  stsfld     class Test_refloc_o2_il.AA Test_refloc_o2_il.App::s_aa
+      IL_0011:  call       void Test_refloc_o2_il.App::Litter()
+      IL_0016:  ldsfld     bool Test_refloc_o2_il.AA::finalizerCalled
       IL_001b:  brtrue.s   IL_002a
 
       IL_001d:  ldloc.0
       			ldind.ref
-      IL_001e:  ldfld      int32 Test.AA::m_nn
+      IL_001e:  ldfld      int32 Test_refloc_o2_il.AA::m_nn
       IL_0023:  ldc.i4     0x6819
       IL_0028:  beq.s      IL_0038
 
       			ldloc.0
       			ldc.i4		0x9186
-      			newobj     instance void Test.AA::.ctor(int32)
+      			newobj     instance void Test_refloc_o2_il.AA::.ctor(int32)
       			stind.ref
       			
-      			call       void Test.App::Litter()
+      			call       void Test_refloc_o2_il.App::Litter()
       			
       IL_002a:  ldstr      "*** failed ***"
       IL_002f:  call       void [System.Console]System.Console::WriteLine(class System.String)
@@ -171,9 +171,9 @@
       // Code size       21 (0x15)
       .maxstack  8
       IL_0000:  ldc.i4     0x6819
-      IL_0005:  newobj     instance void Test.AA::.ctor(int32)
-      IL_000a:  newobj     instance void Test.AA::.ctor(class Test.AA)
-      IL_000f:  stsfld     class Test.AA Test.App::s_aa
+      IL_0005:  newobj     instance void Test_refloc_o2_il.AA::.ctor(int32)
+      IL_000a:  newobj     instance void Test_refloc_o2_il.AA::.ctor(class Test_refloc_o2_il.AA)
+      IL_000f:  stsfld     class Test_refloc_o2_il.AA Test_refloc_o2_il.App::s_aa
       IL_0014:  ret
     } // end of method 'App::.cctor'
 
@@ -189,6 +189,6 @@
 
   } // end of class 'App'
 
-} // end of namespace 'Test'
+} // end of namespace 'Test_refloc_o2_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_o2_il_d.ilproj b/src/tests/JIT/Methodical/explicit/basic/refloc_o2_il_d.ilproj
index 70371df809a2b6..bcd4c6f5d9f1bb 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_o2_il_d.ilproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_o2_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_o2_il_r.ilproj b/src/tests/JIT/Methodical/explicit/basic/refloc_o2_il_r.ilproj
index d24e2ad3e4679b..a66dbe9de1faac 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_o2_il_r.ilproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_o2_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_o_il_d.ilproj b/src/tests/JIT/Methodical/explicit/basic/refloc_o_il_d.ilproj
index 0d5a921a40e8ed..022395ec5380df 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_o_il_d.ilproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_o_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_o_il_r.ilproj b/src/tests/JIT/Methodical/explicit/basic/refloc_o_il_r.ilproj
index 209971ae64a79d..21a9d2f324567a 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_o_il_r.ilproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_o_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_r4.il b/src/tests/JIT/Methodical/explicit/basic/refloc_r4.il
index eefc899e700085..2cc84e8758adbf 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_r4.il
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_r4.il
@@ -19,15 +19,15 @@
 }
 .assembly extern xunit.core {}
 // MVID: {759403EF-2C74-4EEF-AB3C-166B1C468873}
-.namespace Test
+.namespace Test_refloc_r4_il
 {
   .class private auto ansi AA extends ['mscorlib']System.Object
   {
-    .field static family class Test.AA s_aa
-    .field family class Test.AA m_aa
+    .field static family class Test_refloc_r4_il.AA s_aa
+    .field family class Test_refloc_r4_il.AA m_aa
     .field public float32 mm
-    .field static family class Test.AA s_bb
-    .field family class Test.AA m_bb
+    .field static family class Test_refloc_r4_il.AA s_bb
+    .field family class Test_refloc_r4_il.AA m_bb
     .field public static bool finalizerCalled
     .method family hidebysig virtual instance void
             Finalize() il managed
@@ -37,7 +37,7 @@
       IL_0000:  ldstr      "finalizer called."
       IL_0005:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_000a:  ldarg.0
-      IL_0051:  ldfld      float32 Test.AA::mm
+      IL_0051:  ldfld      float32 Test_refloc_r4_il.AA::mm
       			ldc.r4     45.119999
       IL_0056:  beq.s      IL_005e
 
@@ -45,7 +45,7 @@
       IL_005d:  throw
 
       IL_005e:  ldc.i4.1
-      IL_005f:  stsfld     bool Test.AA::finalizerCalled
+      IL_005f:  stsfld     bool Test_refloc_r4_il.AA::finalizerCalled
       IL_0064:  ret
     } // end of method 'AA::Finalize'
 
@@ -54,12 +54,12 @@
     {
       // Code size       27 (0x1b)
       .maxstack  8
-      IL_0000:  newobj     instance void Test.AA::.ctor()
-      IL_0005:  stsfld     class Test.AA Test.AA::s_aa
-      IL_000a:  newobj     instance void Test.AA::.ctor()
-      IL_000f:  stsfld     class Test.AA Test.AA::s_bb
+      IL_0000:  newobj     instance void Test_refloc_r4_il.AA::.ctor()
+      IL_0005:  stsfld     class Test_refloc_r4_il.AA Test_refloc_r4_il.AA::s_aa
+      IL_000a:  newobj     instance void Test_refloc_r4_il.AA::.ctor()
+      IL_000f:  stsfld     class Test_refloc_r4_il.AA Test_refloc_r4_il.AA::s_bb
       IL_0014:  ldc.i4.0
-      IL_0015:  stsfld     bool Test.AA::finalizerCalled
+      IL_0015:  stsfld     bool Test_refloc_r4_il.AA::finalizerCalled
       IL_001a:  ret
     } // end of method 'AA::.cctor'
 
@@ -69,14 +69,14 @@
       // Code size       40 (0x28)
       .maxstack  8
       IL_0000:  ldarg.0
-      IL_0001:  ldsfld     class Test.AA Test.AA::s_aa
-      IL_0006:  stfld      class Test.AA Test.AA::m_aa
+      IL_0001:  ldsfld     class Test_refloc_r4_il.AA Test_refloc_r4_il.AA::s_aa
+      IL_0006:  stfld      class Test_refloc_r4_il.AA Test_refloc_r4_il.AA::m_aa
       IL_000b:  ldarg.0
       IL_000c:  ldc.r4     45.119999
-      IL_0011:  stfld      float32 Test.AA::mm
+      IL_0011:  stfld      float32 Test_refloc_r4_il.AA::mm
       IL_0016:  ldarg.0
-      IL_0017:  ldsfld     class Test.AA Test.AA::s_bb
-      IL_001c:  stfld      class Test.AA Test.AA::m_bb
+      IL_0017:  ldsfld     class Test_refloc_r4_il.AA Test_refloc_r4_il.AA::s_bb
+      IL_001c:  stfld      class Test_refloc_r4_il.AA Test_refloc_r4_il.AA::m_bb
       IL_0021:  ldarg.0
       IL_0022:  call       instance void ['mscorlib']System.Object::.ctor()
       IL_0027:  ret
@@ -84,9 +84,9 @@
 
   } // end of class 'AA'
 
-  .class private auto ansi App extends ['mscorlib']System.Object
+  .class public auto ansi App extends ['mscorlib']System.Object
   {
-    .field private static class Test.AA s_aa
+    .field private static class Test_refloc_r4_il.AA s_aa
     .method private hidebysig static void
             Litter() il managed
     {
@@ -115,7 +115,7 @@
       IL_002a:  ret
     } // end of method 'App::Litter'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -126,13 +126,13 @@
       .maxstack  2
       .locals (float32 & V_0,
                int32 V_1)
-      IL_0000:  ldsfld     class Test.AA Test.App::s_aa
-      IL_0005:  ldflda      float32 Test.AA::mm
+      IL_0000:  ldsfld     class Test_refloc_r4_il.AA Test_refloc_r4_il.App::s_aa
+      IL_0005:  ldflda      float32 Test_refloc_r4_il.AA::mm
       IL_000a:  stloc.0
       IL_000b:  ldnull
-      IL_000c:  stsfld     class Test.AA Test.App::s_aa
-      IL_0011:  call       void Test.App::Litter()
-      IL_0016:  ldsfld     bool Test.AA::finalizerCalled
+      IL_000c:  stsfld     class Test_refloc_r4_il.AA Test_refloc_r4_il.App::s_aa
+      IL_0011:  call       void Test_refloc_r4_il.App::Litter()
+      IL_0016:  ldsfld     bool Test_refloc_r4_il.AA::finalizerCalled
       IL_001b:  brtrue.s   IL_0025
 
       IL_001d:  ldloc.0
@@ -161,8 +161,8 @@
     {
       // Code size       11 (0xb)
       .maxstack  8
-      IL_0000:  newobj     instance void Test.AA::.ctor()
-      IL_0005:  stsfld     class Test.AA Test.App::s_aa
+      IL_0000:  newobj     instance void Test_refloc_r4_il.AA::.ctor()
+      IL_0005:  stsfld     class Test_refloc_r4_il.AA Test_refloc_r4_il.App::s_aa
       IL_000a:  ret
     } // end of method 'App::.cctor'
 
@@ -178,6 +178,6 @@
 
   } // end of class 'App'
 
-} // end of namespace 'Test'
+} // end of namespace 'Test_refloc_r4_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_r4_il_d.ilproj b/src/tests/JIT/Methodical/explicit/basic/refloc_r4_il_d.ilproj
index b7b43171800f24..564560d0a300cd 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_r4_il_d.ilproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_r4_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_r4_il_r.ilproj b/src/tests/JIT/Methodical/explicit/basic/refloc_r4_il_r.ilproj
index 78732d1a131e71..7db11b358a79b3 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_r4_il_r.ilproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_r4_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_r8.il b/src/tests/JIT/Methodical/explicit/basic/refloc_r8.il
index 4df0014bf85496..59e2668bf9156f 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_r8.il
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_r8.il
@@ -19,12 +19,12 @@
 }
 .assembly extern xunit.core {}
 // MVID: {6A5E4D09-08FF-4E91-A37B-252AB7E08397}
-.namespace Test
+.namespace Test_refloc_r8_il
 {
   .class private auto ansi AA extends ['mscorlib']System.Object
   {
-    .field static family class Test.AA s_aa
-    .field family class Test.AA m_aa
+    .field static family class Test_refloc_r8_il.AA s_aa
+    .field family class Test_refloc_r8_il.AA m_aa
     .field public float64 mm
     .field public static bool finalizerCalled
     .method family hidebysig virtual instance void
@@ -35,7 +35,7 @@
       IL_0000:  ldstr      "finalizer called."
       IL_0005:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_000a:  ldarg.0
-      IL_0027:  ldfld      float64 Test.AA::mm
+      IL_0027:  ldfld      float64 Test_refloc_r8_il.AA::mm
       			ldc.r8     -45.119999999999997
       IL_002c:  beq.s      IL_0034
 
@@ -43,7 +43,7 @@
       IL_0033:  throw
 
       IL_0034:  ldc.i4.1
-      IL_0035:  stsfld     bool Test.AA::finalizerCalled
+      IL_0035:  stsfld     bool Test_refloc_r8_il.AA::finalizerCalled
       IL_003a:  ret
     } // end of method 'AA::Finalize'
 
@@ -52,10 +52,10 @@
     {
       // Code size       17 (0x11)
       .maxstack  8
-      IL_0000:  newobj     instance void Test.AA::.ctor()
-      IL_0005:  stsfld     class Test.AA Test.AA::s_aa
+      IL_0000:  newobj     instance void Test_refloc_r8_il.AA::.ctor()
+      IL_0005:  stsfld     class Test_refloc_r8_il.AA Test_refloc_r8_il.AA::s_aa
       IL_000a:  ldc.i4.0
-      IL_000b:  stsfld     bool Test.AA::finalizerCalled
+      IL_000b:  stsfld     bool Test_refloc_r8_il.AA::finalizerCalled
       IL_0010:  ret
     } // end of method 'AA::.cctor'
 
@@ -65,11 +65,11 @@
       // Code size       33 (0x21)
       .maxstack  8
       IL_0000:  ldarg.0
-      IL_0001:  ldsfld     class Test.AA Test.AA::s_aa
-      IL_0006:  stfld      class Test.AA Test.AA::m_aa
+      IL_0001:  ldsfld     class Test_refloc_r8_il.AA Test_refloc_r8_il.AA::s_aa
+      IL_0006:  stfld      class Test_refloc_r8_il.AA Test_refloc_r8_il.AA::m_aa
       IL_000b:  ldarg.0
       IL_000c:  ldc.r8     -45.119999999999997
-      IL_0015:  stfld      float64 Test.AA::mm
+      IL_0015:  stfld      float64 Test_refloc_r8_il.AA::mm
       IL_001a:  ldarg.0
       IL_001b:  call       instance void ['mscorlib']System.Object::.ctor()
       IL_0020:  ret
@@ -77,9 +77,9 @@
 
   } // end of class 'AA'
 
-  .class private auto ansi App extends ['mscorlib']System.Object
+  .class public auto ansi App extends ['mscorlib']System.Object
   {
-    .field private static class Test.AA s_aa
+    .field private static class Test_refloc_r8_il.AA s_aa
     .method private hidebysig static void
             Litter() il managed
     {
@@ -108,7 +108,7 @@
       IL_002a:  ret
     } // end of method 'App::Litter'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -119,13 +119,13 @@
       .maxstack  2
       .locals (float64 & V_0,
                int32 V_1)
-      IL_0000:  ldsfld     class Test.AA Test.App::s_aa
-      IL_0005:  ldflda      float64 Test.AA::mm
+      IL_0000:  ldsfld     class Test_refloc_r8_il.AA Test_refloc_r8_il.App::s_aa
+      IL_0005:  ldflda      float64 Test_refloc_r8_il.AA::mm
       IL_000a:  stloc.0
       IL_000b:  ldnull
-      IL_000c:  stsfld     class Test.AA Test.App::s_aa
-      IL_0011:  call       void Test.App::Litter()
-      IL_0016:  ldsfld     bool Test.AA::finalizerCalled
+      IL_000c:  stsfld     class Test_refloc_r8_il.AA Test_refloc_r8_il.App::s_aa
+      IL_0011:  call       void Test_refloc_r8_il.App::Litter()
+      IL_0016:  ldsfld     bool Test_refloc_r8_il.AA::finalizerCalled
       IL_001b:  brtrue.s   IL_0029
 
       IL_001d:  ldloc.0
@@ -154,8 +154,8 @@
     {
       // Code size       11 (0xb)
       .maxstack  8
-      IL_0000:  newobj     instance void Test.AA::.ctor()
-      IL_0005:  stsfld     class Test.AA Test.App::s_aa
+      IL_0000:  newobj     instance void Test_refloc_r8_il.AA::.ctor()
+      IL_0005:  stsfld     class Test_refloc_r8_il.AA Test_refloc_r8_il.App::s_aa
       IL_000a:  ret
     } // end of method 'App::.cctor'
 
@@ -171,6 +171,6 @@
 
   } // end of class 'App'
 
-} // end of namespace 'Test'
+} // end of namespace 'Test_refloc_r8_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_r8_il_d.ilproj b/src/tests/JIT/Methodical/explicit/basic/refloc_r8_il_d.ilproj
index bdcdec39c218fe..2f20994808e258 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_r8_il_d.ilproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_r8_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_r8_il_r.ilproj b/src/tests/JIT/Methodical/explicit/basic/refloc_r8_il_r.ilproj
index 5951c23ec76404..baa1927cc1988d 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_r8_il_r.ilproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_r8_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_u2.il b/src/tests/JIT/Methodical/explicit/basic/refloc_u2.il
index 7941b096a35ac7..7fab0710af778d 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_u2.il
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_u2.il
@@ -19,12 +19,12 @@
 }
 .assembly extern xunit.core {}
 // MVID: {ADBCF0C8-A2B9-4481-BF63-32F2CB11E46E}
-.namespace Test
+.namespace Test_refloc_u2_il
 {
   .class private auto ansi AA extends ['mscorlib']System.Object
   {
-    .field static family class Test.AA s_aa
-    .field family class Test.AA m_aa
+    .field static family class Test_refloc_u2_il.AA s_aa
+    .field family class Test_refloc_u2_il.AA m_aa
     .field public unsigned int16 mm
     .field public static bool finalizerCalled
     .method family hidebysig virtual instance void
@@ -35,7 +35,7 @@
       IL_0000:  ldstr      "finalizer called."
       IL_0005:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_000a:  ldarg.0
-      IL_0028:  ldfld      unsigned int16 Test.AA::mm
+      IL_0028:  ldfld      unsigned int16 Test_refloc_u2_il.AA::mm
       IL_002d:  conv.i4
       			ldc.i4.s   45
       IL_002e:  beq.s      IL_0036
@@ -44,7 +44,7 @@
       IL_0035:  throw
 
       IL_0036:  ldc.i4.1
-      IL_0037:  stsfld     bool Test.AA::finalizerCalled
+      IL_0037:  stsfld     bool Test_refloc_u2_il.AA::finalizerCalled
       IL_003c:  ret
     } // end of method 'AA::Finalize'
 
@@ -53,10 +53,10 @@
     {
       // Code size       17 (0x11)
       .maxstack  8
-      IL_0000:  newobj     instance void Test.AA::.ctor()
-      IL_0005:  stsfld     class Test.AA Test.AA::s_aa
+      IL_0000:  newobj     instance void Test_refloc_u2_il.AA::.ctor()
+      IL_0005:  stsfld     class Test_refloc_u2_il.AA Test_refloc_u2_il.AA::s_aa
       IL_000a:  ldc.i4.0
-      IL_000b:  stsfld     bool Test.AA::finalizerCalled
+      IL_000b:  stsfld     bool Test_refloc_u2_il.AA::finalizerCalled
       IL_0010:  ret
     } // end of method 'AA::.cctor'
 
@@ -66,11 +66,11 @@
       // Code size       26 (0x1a)
       .maxstack  8
       IL_0000:  ldarg.0
-      IL_0001:  ldsfld     class Test.AA Test.AA::s_aa
-      IL_0006:  stfld      class Test.AA Test.AA::m_aa
+      IL_0001:  ldsfld     class Test_refloc_u2_il.AA Test_refloc_u2_il.AA::s_aa
+      IL_0006:  stfld      class Test_refloc_u2_il.AA Test_refloc_u2_il.AA::m_aa
       IL_000b:  ldarg.0
       IL_000c:  ldc.i4.s   45
-      IL_000e:  stfld      unsigned int16 Test.AA::mm
+      IL_000e:  stfld      unsigned int16 Test_refloc_u2_il.AA::mm
       IL_0013:  ldarg.0
       IL_0014:  call       instance void ['mscorlib']System.Object::.ctor()
       IL_0019:  ret
@@ -78,9 +78,9 @@
 
   } // end of class 'AA'
 
-  .class private auto ansi App extends ['mscorlib']System.Object
+  .class public auto ansi App extends ['mscorlib']System.Object
   {
-    .field private static class Test.AA s_aa
+    .field private static class Test_refloc_u2_il.AA s_aa
     .method private hidebysig static void
             Litter() il managed
     {
@@ -109,7 +109,7 @@
       IL_002a:  ret
     } // end of method 'App::Litter'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -120,13 +120,13 @@
       .maxstack  2
       .locals (unsigned int16 & V_0,
                int32 V_1)
-      IL_0000:  ldsfld     class Test.AA Test.App::s_aa
-      IL_0005:  ldflda      unsigned int16 Test.AA::mm
+      IL_0000:  ldsfld     class Test_refloc_u2_il.AA Test_refloc_u2_il.App::s_aa
+      IL_0005:  ldflda      unsigned int16 Test_refloc_u2_il.AA::mm
       IL_000a:  stloc.0
       IL_000b:  ldnull
-      IL_000c:  stsfld     class Test.AA Test.App::s_aa
-      IL_0011:  call       void Test.App::Litter()
-      IL_0016:  ldsfld     bool Test.AA::finalizerCalled
+      IL_000c:  stsfld     class Test_refloc_u2_il.AA Test_refloc_u2_il.App::s_aa
+      IL_0011:  call       void Test_refloc_u2_il.App::Litter()
+      IL_0016:  ldsfld     bool Test_refloc_u2_il.AA::finalizerCalled
       IL_001b:  brtrue.s   IL_0023
 
       IL_001d:  ldloc.0
@@ -156,8 +156,8 @@
     {
       // Code size       11 (0xb)
       .maxstack  8
-      IL_0000:  newobj     instance void Test.AA::.ctor()
-      IL_0005:  stsfld     class Test.AA Test.App::s_aa
+      IL_0000:  newobj     instance void Test_refloc_u2_il.AA::.ctor()
+      IL_0005:  stsfld     class Test_refloc_u2_il.AA Test_refloc_u2_il.App::s_aa
       IL_000a:  ret
     } // end of method 'App::.cctor'
 
@@ -173,6 +173,6 @@
 
   } // end of class 'App'
 
-} // end of namespace 'Test'
+} // end of namespace 'Test_refloc_u2_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_u2_il_d.ilproj b/src/tests/JIT/Methodical/explicit/basic/refloc_u2_il_d.ilproj
index d51f0d1afeee00..9afa6dbea7ffce 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_u2_il_d.ilproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_u2_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_u2_il_r.ilproj b/src/tests/JIT/Methodical/explicit/basic/refloc_u2_il_r.ilproj
index bcaec7fb91cc9b..93f05591fcbc22 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_u2_il_r.ilproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_u2_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_gc.il b/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_gc.il
index 5908b00d6cfa4a..7fe01e710f27b1 100644
--- a/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_gc.il
+++ b/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_gc.il
@@ -32,7 +32,9 @@
 //   note that class flags, 'extends' and 'implements' clauses
 //          are provided here for information only
 
-.class private explicit ansi sealed beforefieldinit AA
+.namespace Test_expl_funcptr_gc
+{
+.class public explicit ansi sealed beforefieldinit AA
        extends [mscorlib]System.Object
 {
   .field [0] public unsigned int8 tmp1
@@ -47,7 +49,7 @@
     .maxstack  1
     ldc.i4.s   100
     ret
-  } // end of method AA::ret_code
+  } // end of method Test_expl_funcptr_gc.AA::ret_code
 
   .method public hidebysig specialname rtspecialname 
           instance void  .ctor() cil managed
@@ -59,7 +61,7 @@
     IL_0006:  ret
   } // end of method TestApp::.ctor
   
-  .method private hidebysig static int32 
+  .method public hidebysig static int32 
           Main() cil managed
   {
     .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -68,22 +70,23 @@
     .entrypoint
     // Code size       31 (0x1f)
     .maxstack  3
-    .locals init (class AA V_0, int32 V_1)
-    newobj    instance void AA::.ctor()
+    .locals init (class Test_expl_funcptr_gc.AA V_0, int32 V_1)
+    newobj    instance void Test_expl_funcptr_gc.AA::.ctor()
     stloc.0
     ldloc.0
-    ldftn      int32 AA::ret_code()
-    stfld      native int AA::func_ptr
+    ldftn      int32 Test_expl_funcptr_gc.AA::ret_code()
+    stfld      native int Test_expl_funcptr_gc.AA::func_ptr
     ldloc.0
-    ldfld      native int AA::func_ptr
+    ldfld      native int Test_expl_funcptr_gc.AA::func_ptr
     calli       int32 *()
     ret
-  } // end of method AA::Main
+  } // end of method Test_expl_funcptr_gc.AA::Main
 
-} // end of class AA
+} // end of class Test_expl_funcptr_gc.AA
 
 
 // =============================================================
 
 //*********** DISASSEMBLY COMPLETE ***********************
 // WARNING: Created Win32 resource file funcptr_val.res
+}
diff --git a/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_gc_il_d.ilproj b/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_gc_il_d.ilproj
index d9808c2f19ee3d..77520d54715024 100644
--- a/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_gc_il_d.ilproj
+++ b/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_gc_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_gc_il_r.ilproj b/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_gc_il_r.ilproj
index 54040ae31ed92c..55c02529a3801e 100644
--- a/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_gc_il_r.ilproj
+++ b/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_gc_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_val.il b/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_val.il
index 5edf2371e3fdd6..57a62581525a9b 100644
--- a/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_val.il
+++ b/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_val.il
@@ -29,7 +29,9 @@
 //   note that class flags, 'extends' and 'implements' clauses
 //          are provided here for information only
 
-.class private explicit ansi sealed beforefieldinit AA
+.namespace Test_expl_funcptr_val
+{
+.class public explicit ansi sealed beforefieldinit AA
        extends [mscorlib]System.ValueType
 {
   .field [1] public unsigned int8 tmp1
@@ -44,9 +46,9 @@
     .maxstack  1
     ldc.i4.s   100
     ret
-  } // end of method AA::ret_code
+  } // end of method Test_expl_funcptr_val.AA::ret_code
 
-  .method private hidebysig static int32 
+  .method public hidebysig static int32 
           Main() cil managed
   {
     .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -55,20 +57,21 @@
     .entrypoint
     // Code size       31 (0x1f)
     .maxstack  3
-    .locals init (valuetype AA V_0, int32 V_1)
+    .locals init (valuetype Test_expl_funcptr_val.AA V_0, int32 V_1)
     ldloca.s   V_0
-    ldftn      int32 AA::ret_code()
-    stfld      native int AA::func_ptr
+    ldftn      int32 Test_expl_funcptr_val.AA::ret_code()
+    stfld      native int Test_expl_funcptr_val.AA::func_ptr
     ldloca.s   V_0
-    ldfld      native int AA::func_ptr
+    ldfld      native int Test_expl_funcptr_val.AA::func_ptr
     calli       int32 *()
     ret
-  } // end of method AA::Main
+  } // end of method Test_expl_funcptr_val.AA::Main
 
-} // end of class AA
+} // end of class Test_expl_funcptr_val.AA
 
 
 // =============================================================
 
 //*********** DISASSEMBLY COMPLETE ***********************
 // WARNING: Created Win32 resource file funcptr_val.res
+}
diff --git a/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_val_il_d.ilproj b/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_val_il_d.ilproj
index 999c1e68d79d77..dfd6e7f03197c2 100644
--- a/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_val_il_d.ilproj
+++ b/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_val_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_val_il_r.ilproj b/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_val_il_r.ilproj
index 2d3fb5c70e3020..1ca90331cbbb1f 100644
--- a/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_val_il_r.ilproj
+++ b/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_val_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_gc.il b/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_gc.il
index d01bd51ed6953f..b0367a9cda0ed6 100644
--- a/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_gc.il
+++ b/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_gc.il
@@ -26,7 +26,9 @@
 //   note that class flags, 'extends' and 'implements' clauses
 //          are provided here for information only
 
-.class private sequential ansi sealed beforefieldinit AA
+.namespace Test_seq_funcptr_gc
+{
+.class public sequential ansi sealed beforefieldinit AA
        extends [mscorlib]System.Object
 // =============================================================
 
@@ -43,7 +45,7 @@
     .maxstack  1
     ldc.i4.s   100
     ret
-  } // end of method AA::ret_code
+  } // end of method Test_seq_funcptr_gc.AA::ret_code
 
   .method public hidebysig specialname rtspecialname 
           instance void  .ctor() cil managed
@@ -55,7 +57,7 @@
     IL_0006:  ret
   } // end of method TestApp::.ctor
   
-  .method private hidebysig static int32 
+  .method public hidebysig static int32 
           Main() cil managed
   {
     .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -64,22 +66,23 @@
     .entrypoint
     // Code size       31 (0x1f)
     .maxstack  3
-    .locals init (class AA V_0, int32 V_1)
-    newobj    instance void AA::.ctor()
+    .locals init (class Test_seq_funcptr_gc.AA V_0, int32 V_1)
+    newobj    instance void Test_seq_funcptr_gc.AA::.ctor()
     stloc.0
     ldloc.0
-    ldftn      int32 AA::ret_code()
-    stfld      native int AA::func_ptr
+    ldftn      int32 Test_seq_funcptr_gc.AA::ret_code()
+    stfld      native int Test_seq_funcptr_gc.AA::func_ptr
     ldloc.0
-    ldfld      native int AA::func_ptr
+    ldfld      native int Test_seq_funcptr_gc.AA::func_ptr
     calli       int32 *()
     ret
-  } // end of method AA::Main
+  } // end of method Test_seq_funcptr_gc.AA::Main
 
-} // end of class AA
+} // end of class Test_seq_funcptr_gc.AA
 
 
 // =============================================================
 
 //*********** DISASSEMBLY COMPLETE ***********************
 // WARNING: Created Win32 resource file funcptr_val.res
+}
diff --git a/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_gc_il_d.ilproj b/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_gc_il_d.ilproj
index c76e78d26ecc48..d9e0c6d5b3d60a 100644
--- a/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_gc_il_d.ilproj
+++ b/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_gc_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_gc_il_r.ilproj b/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_gc_il_r.ilproj
index fc82c7d3bb0253..a70e153532640a 100644
--- a/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_gc_il_r.ilproj
+++ b/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_gc_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_val.il b/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_val.il
index 0382e28d3c7cbf..24273b23717ed7 100644
--- a/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_val.il
+++ b/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_val.il
@@ -44,7 +44,9 @@
 //   note that class flags, 'extends' and 'implements' clauses
 //          are provided here for information only
 
-.class private sequential ansi sealed beforefieldinit AA
+.namespace Test_seq_funcptr_val
+{
+.class public sequential ansi sealed beforefieldinit AA
        extends [mscorlib]System.ValueType
 {
   .field public unsigned int8 tmp1
@@ -59,9 +61,9 @@
     .maxstack  1
     ldc.i4.s   100
     ret
-  } // end of method AA::ret_code
+  } // end of method Test_seq_funcptr_val.AA::ret_code
 
-  .method private hidebysig static int32 
+  .method public hidebysig static int32 
           Main() cil managed
   {
     .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -70,20 +72,21 @@
     .entrypoint
     // Code size       31 (0x1f)
     .maxstack  3
-    .locals init (valuetype AA V_0, int32 V_1)
+    .locals init (valuetype Test_seq_funcptr_val.AA V_0, int32 V_1)
     ldloca.s   V_0
-    ldftn      int32 AA::ret_code()
-    stfld      native int AA::func_ptr
+    ldftn      int32 Test_seq_funcptr_val.AA::ret_code()
+    stfld      native int Test_seq_funcptr_val.AA::func_ptr
     ldloca.s   V_0
-    ldfld      native int AA::func_ptr
+    ldfld      native int Test_seq_funcptr_val.AA::func_ptr
     calli       int32 *()
     ret
-  } // end of method AA::Main
+  } // end of method Test_seq_funcptr_val.AA::Main
 
-} // end of class AA
+} // end of class Test_seq_funcptr_val.AA
 
 
 // =============================================================
 
 //*********** DISASSEMBLY COMPLETE ***********************
 // WARNING: Created Win32 resource file funcptr_val.res
+}
diff --git a/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_val_il_d.ilproj b/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_val_il_d.ilproj
index c6a3565c02da05..f29696925f2149 100644
--- a/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_val_il_d.ilproj
+++ b/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_val_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_val_il_r.ilproj b/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_val_il_r.ilproj
index a9f5c1a5468756..9ac1152ab3a9fe 100644
--- a/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_val_il_r.ilproj
+++ b/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_val_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/explicit/misc/explicit1.cs b/src/tests/JIT/Methodical/explicit/misc/explicit1.cs
index 17c0c5597e01ff..b25ad00a7b6479 100644
--- a/src/tests/JIT/Methodical/explicit/misc/explicit1.cs
+++ b/src/tests/JIT/Methodical/explicit/misc/explicit1.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace Rotate
+namespace Rotate_explicit1_cs
 {
-    internal class App
+    public class App
     {
         public static int s_weightCount = 1;
 
@@ -236,7 +237,8 @@ public virtual void rotateTree(ref int leftWeight, ref int rightWeight)
             }
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             try
             {
diff --git a/src/tests/JIT/Methodical/explicit/misc/explicit1_d.csproj b/src/tests/JIT/Methodical/explicit/misc/explicit1_d.csproj
index 00204839777e93..f9097d4b49fb7e 100644
--- a/src/tests/JIT/Methodical/explicit/misc/explicit1_d.csproj
+++ b/src/tests/JIT/Methodical/explicit/misc/explicit1_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/misc/explicit1_do.csproj b/src/tests/JIT/Methodical/explicit/misc/explicit1_do.csproj
index 504eb53782d34e..3f3d3dc61780e8 100644
--- a/src/tests/JIT/Methodical/explicit/misc/explicit1_do.csproj
+++ b/src/tests/JIT/Methodical/explicit/misc/explicit1_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/misc/explicit1_r.csproj b/src/tests/JIT/Methodical/explicit/misc/explicit1_r.csproj
index 31d729f1aea10f..d0d17889226b1c 100644
--- a/src/tests/JIT/Methodical/explicit/misc/explicit1_r.csproj
+++ b/src/tests/JIT/Methodical/explicit/misc/explicit1_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/misc/explicit1_ro.csproj b/src/tests/JIT/Methodical/explicit/misc/explicit1_ro.csproj
index 4a537adfb1741f..1e0ed5e8130bbe 100644
--- a/src/tests/JIT/Methodical/explicit/misc/explicit1_ro.csproj
+++ b/src/tests/JIT/Methodical/explicit/misc/explicit1_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/misc/explicit2.cs b/src/tests/JIT/Methodical/explicit/misc/explicit2.cs
index fbcc32a653105b..eb15b81197ad6b 100644
--- a/src/tests/JIT/Methodical/explicit/misc/explicit2.cs
+++ b/src/tests/JIT/Methodical/explicit/misc/explicit2.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace Rotate
+namespace Rotate_explicit2_cs
 {
-    internal class App
+    public class App
     {
         public static int s_weightCount = 1;
 
@@ -308,7 +309,8 @@ public virtual void rotateTree(ref int leftWeight, ref int rightWeight)
             }
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             try
             {
diff --git a/src/tests/JIT/Methodical/explicit/misc/explicit2_d.csproj b/src/tests/JIT/Methodical/explicit/misc/explicit2_d.csproj
index 79a6b3ec073144..d91f51a2e7dd02 100644
--- a/src/tests/JIT/Methodical/explicit/misc/explicit2_d.csproj
+++ b/src/tests/JIT/Methodical/explicit/misc/explicit2_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/misc/explicit2_do.csproj b/src/tests/JIT/Methodical/explicit/misc/explicit2_do.csproj
index 7d0c30785683b3..347a5254e23ab3 100644
--- a/src/tests/JIT/Methodical/explicit/misc/explicit2_do.csproj
+++ b/src/tests/JIT/Methodical/explicit/misc/explicit2_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/misc/explicit2_r.csproj b/src/tests/JIT/Methodical/explicit/misc/explicit2_r.csproj
index c847f9a6d0fb34..017f5c5ff124ad 100644
--- a/src/tests/JIT/Methodical/explicit/misc/explicit2_r.csproj
+++ b/src/tests/JIT/Methodical/explicit/misc/explicit2_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/misc/explicit2_ro.csproj b/src/tests/JIT/Methodical/explicit/misc/explicit2_ro.csproj
index 918dc093e4c480..e3a44567f8cb86 100644
--- a/src/tests/JIT/Methodical/explicit/misc/explicit2_ro.csproj
+++ b/src/tests/JIT/Methodical/explicit/misc/explicit2_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/misc/explicit3.cs b/src/tests/JIT/Methodical/explicit/misc/explicit3.cs
index 42bb806d667148..6a44e0c839ad44 100644
--- a/src/tests/JIT/Methodical/explicit/misc/explicit3.cs
+++ b/src/tests/JIT/Methodical/explicit/misc/explicit3.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace Rotate
+namespace Rotate_explicit3_cs
 {
-    internal class App
+    public class App
     {
         public static int s_weightCount = 1;
 
@@ -299,7 +300,8 @@ public virtual void rotateTree(ref int leftWeight, ref int rightWeight)
             }
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             try
             {
diff --git a/src/tests/JIT/Methodical/explicit/misc/explicit3_d.csproj b/src/tests/JIT/Methodical/explicit/misc/explicit3_d.csproj
index e449843bd8b4fb..3816583970628e 100644
--- a/src/tests/JIT/Methodical/explicit/misc/explicit3_d.csproj
+++ b/src/tests/JIT/Methodical/explicit/misc/explicit3_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/misc/explicit3_do.csproj b/src/tests/JIT/Methodical/explicit/misc/explicit3_do.csproj
index 82c353911bfe21..6d7831aae12e15 100644
--- a/src/tests/JIT/Methodical/explicit/misc/explicit3_do.csproj
+++ b/src/tests/JIT/Methodical/explicit/misc/explicit3_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/misc/explicit3_r.csproj b/src/tests/JIT/Methodical/explicit/misc/explicit3_r.csproj
index 5b05ae30766474..9e572b9d402fc9 100644
--- a/src/tests/JIT/Methodical/explicit/misc/explicit3_r.csproj
+++ b/src/tests/JIT/Methodical/explicit/misc/explicit3_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/misc/explicit3_ro.csproj b/src/tests/JIT/Methodical/explicit/misc/explicit3_ro.csproj
index dbef4a31be3c17..e94c36f5d3e48a 100644
--- a/src/tests/JIT/Methodical/explicit/misc/explicit3_ro.csproj
+++ b/src/tests/JIT/Methodical/explicit/misc/explicit3_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/misc/explicit4.cs b/src/tests/JIT/Methodical/explicit/misc/explicit4.cs
index 0ad9baf9376024..0aead0ade94869 100644
--- a/src/tests/JIT/Methodical/explicit/misc/explicit4.cs
+++ b/src/tests/JIT/Methodical/explicit/misc/explicit4.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace Rotate
+namespace Rotate_explicit4_cs
 {
-    internal class App
+    public class App
     {
         public static int s_weightCount = 1;
 
@@ -218,7 +219,8 @@ public virtual void rotateTree(ref int leftWeight, ref int rightWeight)
             }
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             try
             {
diff --git a/src/tests/JIT/Methodical/explicit/misc/explicit4_d.csproj b/src/tests/JIT/Methodical/explicit/misc/explicit4_d.csproj
index 54b5b290ef973e..9e1697edef4e50 100644
--- a/src/tests/JIT/Methodical/explicit/misc/explicit4_d.csproj
+++ b/src/tests/JIT/Methodical/explicit/misc/explicit4_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/misc/explicit4_do.csproj b/src/tests/JIT/Methodical/explicit/misc/explicit4_do.csproj
index cdd0f6f5f5a63b..2cad15eccdd694 100644
--- a/src/tests/JIT/Methodical/explicit/misc/explicit4_do.csproj
+++ b/src/tests/JIT/Methodical/explicit/misc/explicit4_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/misc/explicit4_r.csproj b/src/tests/JIT/Methodical/explicit/misc/explicit4_r.csproj
index 26f1699bc7f5c9..cd1067cae3a1f7 100644
--- a/src/tests/JIT/Methodical/explicit/misc/explicit4_r.csproj
+++ b/src/tests/JIT/Methodical/explicit/misc/explicit4_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/misc/explicit4_ro.csproj b/src/tests/JIT/Methodical/explicit/misc/explicit4_ro.csproj
index 5a8982a7a381a9..f865b0451567da 100644
--- a/src/tests/JIT/Methodical/explicit/misc/explicit4_ro.csproj
+++ b/src/tests/JIT/Methodical/explicit/misc/explicit4_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/misc/explicit5.cs b/src/tests/JIT/Methodical/explicit/misc/explicit5.cs
index 69a5ed242d1a1f..13b7e294a31924 100644
--- a/src/tests/JIT/Methodical/explicit/misc/explicit5.cs
+++ b/src/tests/JIT/Methodical/explicit/misc/explicit5.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace Rotate
+namespace Rotate_explicit5_cs
 {
-    internal class App
+    public class App
     {
         public static int s_weightCount = 1;
 
@@ -253,7 +254,8 @@ public virtual void rotateTree(ref int leftWeight, ref int rightWeight)
             }
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             try
             {
diff --git a/src/tests/JIT/Methodical/explicit/misc/explicit5_d.csproj b/src/tests/JIT/Methodical/explicit/misc/explicit5_d.csproj
index d359921e9a7075..36dc02082f03c6 100644
--- a/src/tests/JIT/Methodical/explicit/misc/explicit5_d.csproj
+++ b/src/tests/JIT/Methodical/explicit/misc/explicit5_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/misc/explicit5_do.csproj b/src/tests/JIT/Methodical/explicit/misc/explicit5_do.csproj
index 168a3e6f7856d1..290ccefde92f00 100644
--- a/src/tests/JIT/Methodical/explicit/misc/explicit5_do.csproj
+++ b/src/tests/JIT/Methodical/explicit/misc/explicit5_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/misc/explicit5_r.csproj b/src/tests/JIT/Methodical/explicit/misc/explicit5_r.csproj
index 1901949fac9f84..0b9305335d0237 100644
--- a/src/tests/JIT/Methodical/explicit/misc/explicit5_r.csproj
+++ b/src/tests/JIT/Methodical/explicit/misc/explicit5_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/misc/explicit5_ro.csproj b/src/tests/JIT/Methodical/explicit/misc/explicit5_ro.csproj
index 6050e3e925fdcf..fd86f3f92494fe 100644
--- a/src/tests/JIT/Methodical/explicit/misc/explicit5_ro.csproj
+++ b/src/tests/JIT/Methodical/explicit/misc/explicit5_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/misc/explicit6.cs b/src/tests/JIT/Methodical/explicit/misc/explicit6.cs
index cfe61a62ba2a05..dee12b29da96bf 100644
--- a/src/tests/JIT/Methodical/explicit/misc/explicit6.cs
+++ b/src/tests/JIT/Methodical/explicit/misc/explicit6.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace Rotate
+namespace Rotate_explicit6_cs
 {
-    internal class App
+    public class App
     {
         public static int s_weightCount = 1;
 
@@ -215,7 +216,8 @@ public virtual void rotateTree(ref int leftWeight, ref int rightWeight)
             }
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             try
             {
diff --git a/src/tests/JIT/Methodical/explicit/misc/explicit6_d.csproj b/src/tests/JIT/Methodical/explicit/misc/explicit6_d.csproj
index dfa8cca0d8b01c..ef0377f05c9b19 100644
--- a/src/tests/JIT/Methodical/explicit/misc/explicit6_d.csproj
+++ b/src/tests/JIT/Methodical/explicit/misc/explicit6_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/misc/explicit6_do.csproj b/src/tests/JIT/Methodical/explicit/misc/explicit6_do.csproj
index 35b4e497b96004..ef9862dd5fb882 100644
--- a/src/tests/JIT/Methodical/explicit/misc/explicit6_do.csproj
+++ b/src/tests/JIT/Methodical/explicit/misc/explicit6_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/misc/explicit6_r.csproj b/src/tests/JIT/Methodical/explicit/misc/explicit6_r.csproj
index 0e8b323894ff49..f5b9d82ccaba94 100644
--- a/src/tests/JIT/Methodical/explicit/misc/explicit6_r.csproj
+++ b/src/tests/JIT/Methodical/explicit/misc/explicit6_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/misc/explicit6_ro.csproj b/src/tests/JIT/Methodical/explicit/misc/explicit6_ro.csproj
index ebceea2e51afd3..de07fb25bca9c7 100644
--- a/src/tests/JIT/Methodical/explicit/misc/explicit6_ro.csproj
+++ b/src/tests/JIT/Methodical/explicit/misc/explicit6_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/misc/explicit7.cs b/src/tests/JIT/Methodical/explicit/misc/explicit7.cs
index 3e30b3c7f15a72..9e24aed143449b 100644
--- a/src/tests/JIT/Methodical/explicit/misc/explicit7.cs
+++ b/src/tests/JIT/Methodical/explicit/misc/explicit7.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace Rotate
+namespace Rotate_explicit7_cs
 {
-    internal class App
+    public class App
     {
         public static int s_weightCount = 1;
 
@@ -293,7 +294,8 @@ public virtual void rotateTree(ref int leftWeight, ref int rightWeight)
             }
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             try
             {
diff --git a/src/tests/JIT/Methodical/explicit/misc/explicit7_d.csproj b/src/tests/JIT/Methodical/explicit/misc/explicit7_d.csproj
index d3ba6ded918b96..8434ad089dab51 100644
--- a/src/tests/JIT/Methodical/explicit/misc/explicit7_d.csproj
+++ b/src/tests/JIT/Methodical/explicit/misc/explicit7_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/misc/explicit7_do.csproj b/src/tests/JIT/Methodical/explicit/misc/explicit7_do.csproj
index 3d6cfc0feed4cb..e795c69b56e879 100644
--- a/src/tests/JIT/Methodical/explicit/misc/explicit7_do.csproj
+++ b/src/tests/JIT/Methodical/explicit/misc/explicit7_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/misc/explicit7_r.csproj b/src/tests/JIT/Methodical/explicit/misc/explicit7_r.csproj
index 074b6a014a135c..985b9f8805b912 100644
--- a/src/tests/JIT/Methodical/explicit/misc/explicit7_r.csproj
+++ b/src/tests/JIT/Methodical/explicit/misc/explicit7_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/misc/explicit7_ro.csproj b/src/tests/JIT/Methodical/explicit/misc/explicit7_ro.csproj
index 786b1988434365..1ea54e73f42903 100644
--- a/src/tests/JIT/Methodical/explicit/misc/explicit7_ro.csproj
+++ b/src/tests/JIT/Methodical/explicit/misc/explicit7_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/misc/explicit8.cs b/src/tests/JIT/Methodical/explicit/misc/explicit8.cs
index 8c5611ccd1708c..de190af4f3de9e 100644
--- a/src/tests/JIT/Methodical/explicit/misc/explicit8.cs
+++ b/src/tests/JIT/Methodical/explicit/misc/explicit8.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace Rotate
+namespace Rotate_explicit8_cs
 {
-    internal class App
+    public class App
     {
         public static int s_weightCount = 1;
 
@@ -305,7 +306,8 @@ public virtual void rotateTree(ref int leftWeight, ref int rightWeight)
             }
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             try
             {
diff --git a/src/tests/JIT/Methodical/explicit/misc/explicit8_d.csproj b/src/tests/JIT/Methodical/explicit/misc/explicit8_d.csproj
index aa252406ec6690..aedca7f8e72f2a 100644
--- a/src/tests/JIT/Methodical/explicit/misc/explicit8_d.csproj
+++ b/src/tests/JIT/Methodical/explicit/misc/explicit8_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/misc/explicit8_do.csproj b/src/tests/JIT/Methodical/explicit/misc/explicit8_do.csproj
index fa94ef3d7bdd94..7416db95567be5 100644
--- a/src/tests/JIT/Methodical/explicit/misc/explicit8_do.csproj
+++ b/src/tests/JIT/Methodical/explicit/misc/explicit8_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/misc/explicit8_r.csproj b/src/tests/JIT/Methodical/explicit/misc/explicit8_r.csproj
index a6e40255837c8d..60e98944c29b9c 100644
--- a/src/tests/JIT/Methodical/explicit/misc/explicit8_r.csproj
+++ b/src/tests/JIT/Methodical/explicit/misc/explicit8_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/misc/explicit8_ro.csproj b/src/tests/JIT/Methodical/explicit/misc/explicit8_ro.csproj
index 754c29d2ac833e..d00676f7fe1ca9 100644
--- a/src/tests/JIT/Methodical/explicit/misc/explicit8_ro.csproj
+++ b/src/tests/JIT/Methodical/explicit/misc/explicit8_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/misc/refarg_box_f8.il b/src/tests/JIT/Methodical/explicit/misc/refarg_box_f8.il
index b68fa53619af96..ede1066c7adb3b 100644
--- a/src/tests/JIT/Methodical/explicit/misc/refarg_box_f8.il
+++ b/src/tests/JIT/Methodical/explicit/misc/refarg_box_f8.il
@@ -12,9 +12,9 @@
 {
 }
 .assembly extern xunit.core {}
-.namespace Test
+.namespace Test_refarg_box_f8_il
 {
-  .class private auto ansi App extends [mscorlib]System.Object
+  .class public auto ansi App extends [mscorlib]System.Object
   {
     .field private static class System.Object s_aa
     .method private hidebysig static void
@@ -45,13 +45,13 @@
     } 
 
     .method private hidebysig static int32 
-            Test(float64& n) il managed
+            Test_refarg_box_f8_il(float64& n) il managed
     {
       .maxstack  4
       .locals (int32 V_0)
       IL_0000:  ldnull
-      IL_0001:  stsfld     class System.Object Test.App::s_aa
-      IL_0006:  call       void Test.App::Litter()
+      IL_0001:  stsfld     class System.Object Test_refarg_box_f8_il.App::s_aa
+      IL_0006:  call       void Test_refarg_box_f8_il.App::Litter()
       IL_000b:  ldarg.0
       IL_000c:  ldind.r8
                 dup
@@ -77,7 +77,7 @@
       IL_0035:  ret
     } 
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -91,10 +91,10 @@
       IL_0000:  ldc.r8     0.
       IL_0009:  stloc.0
       
-      			ldsfld     class System.Object Test.App::s_aa
+      			ldsfld     class System.Object Test_refarg_box_f8_il.App::s_aa
       			unbox      [mscorlib]System.Double		
       
-      IL_000c:  call       int32 Test.App::Test(float64&)
+      IL_000c:  call       int32 Test_refarg_box_f8_il.App::Test_refarg_box_f8_il(float64&)
       IL_0011:  stloc.1
       IL_0012:  call       void [mscorlib]System.GC::Collect()
       IL_0017:  call       void [mscorlib]System.GC::WaitForPendingFinalizers()
@@ -115,7 +115,7 @@
       IL_0009:  stloc.0
       IL_000a:  ldloc.s   V_0
       IL_000c:  box     [mscorlib]System.Double
-      IL_0011:  stsfld     class System.Object Test.App::s_aa
+      IL_0011:  stsfld     class System.Object Test_refarg_box_f8_il.App::s_aa
       IL_0016:  ret
     } 
 
diff --git a/src/tests/JIT/Methodical/explicit/misc/refarg_box_f8_il_d.ilproj b/src/tests/JIT/Methodical/explicit/misc/refarg_box_f8_il_d.ilproj
index 6b6a43fbb4341c..fe7a06a0b1f970 100644
--- a/src/tests/JIT/Methodical/explicit/misc/refarg_box_f8_il_d.ilproj
+++ b/src/tests/JIT/Methodical/explicit/misc/refarg_box_f8_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/misc/refarg_box_f8_il_r.ilproj b/src/tests/JIT/Methodical/explicit/misc/refarg_box_f8_il_r.ilproj
index cb826f3ae25f17..c7d18a0147eb35 100644
--- a/src/tests/JIT/Methodical/explicit/misc/refarg_box_f8_il_r.ilproj
+++ b/src/tests/JIT/Methodical/explicit/misc/refarg_box_f8_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/misc/refarg_box_val.il b/src/tests/JIT/Methodical/explicit/misc/refarg_box_val.il
index 2a6b5511302703..5fe05b673edf46 100644
--- a/src/tests/JIT/Methodical/explicit/misc/refarg_box_val.il
+++ b/src/tests/JIT/Methodical/explicit/misc/refarg_box_val.il
@@ -19,7 +19,7 @@
 }
 .assembly extern xunit.core {}
 // MVID: {27E0B251-2BC1-4652-9A1C-3EFA7F79CFC4}
-.namespace Test
+.namespace Test_refarg_box_val_il
 {
   .class value private auto ansi sealed Val extends ['mscorlib']System.ValueType
   {
@@ -36,28 +36,28 @@
       .locals (int32 V_0)
       IL_0000:  ldarg.0
       IL_0001:  ldc.r8     0.
-      IL_000a:  stfld      float64 Test.Val::padding1
+      IL_000a:  stfld      float64 Test_refarg_box_val_il.Val::padding1
       IL_000f:  ldarg.0
       IL_0010:  ldc.i4.s   11
       IL_0012:  stloc.0
       IL_0013:  ldloc.s   V_0
       IL_0015:  box     ['mscorlib']System.Int32
-      IL_001a:  stfld      class System.Object Test.Val::padding2
+      IL_001a:  stfld      class System.Object Test_refarg_box_val_il.Val::padding2
       IL_001f:  ldarg.0
       IL_0020:  ldc.i4.s   11
-      IL_0022:  stfld      unsigned int8 Test.Val::padding3
+      IL_0022:  stfld      unsigned int8 Test_refarg_box_val_il.Val::padding3
       IL_0027:  ldarg.0
       IL_0028:  ldc.i4.s   11
-      IL_002a:  stfld      unsigned int16 Test.Val::padding4
+      IL_002a:  stfld      unsigned int16 Test_refarg_box_val_il.Val::padding4
       IL_002f:  ldarg.0
       IL_0030:  ldarg.1
-      IL_0031:  stfld      int32 Test.Val::'value'
+      IL_0031:  stfld      int32 Test_refarg_box_val_il.Val::'value'
       IL_0036:  ret
     } // end of method 'Val::.ctor'
 
   } // end of class 'Val'
 
-  .class private auto ansi App extends ['mscorlib']System.Object
+  .class public auto ansi App extends ['mscorlib']System.Object
   {
     .field private static class System.Object s_aa
     .method private hidebysig static void
@@ -88,16 +88,16 @@
     } // end of method 'App::Litter'
 
     .method private hidebysig static int32 
-            Test(value class Test.Val& n) il managed
+            Test_refarg_box_val_il(value class Test_refarg_box_val_il.Val& n) il managed
     {
       // Code size       54 (0x36)
       .maxstack  2
       .locals (int32 V_0)
       IL_0000:  ldnull
-      IL_0001:  stsfld     class System.Object Test.App::s_aa
-      IL_0006:  call       void Test.App::Litter()
+      IL_0001:  stsfld     class System.Object Test_refarg_box_val_il.App::s_aa
+      IL_0006:  call       void Test_refarg_box_val_il.App::Litter()
       IL_000b:  ldarg.0
-      IL_000c:  ldfld      int32 Test.Val::'value'
+      IL_000c:  ldfld      int32 Test_refarg_box_val_il.Val::'value'
       IL_0011:  ldc.i4     0x13a
       IL_0016:  beq.s      IL_0026
 
@@ -115,9 +115,9 @@
 
       IL_0034:  ldloc.0
       IL_0035:  ret
-    } // end of method 'App::Test'
+    } // end of method 'App::Test_refarg_box_val_il'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -126,17 +126,17 @@
       .entrypoint
       // Code size       32 (0x20)
       .maxstack  2
-      .locals (value class Test.Val ZZZz, //not used now
+      .locals (value class Test_refarg_box_val_il.Val ZZZz, //not used now
                int32 V_1,
                int32 V_2)
       //IL_0000:  ldloc.s   V_0
       //IL_0002:  ldc.i4.0
-      //IL_0003:  call       instance void Test.Val::.ctor(int32)
+      //IL_0003:  call       instance void Test_refarg_box_val_il.Val::.ctor(int32)
       //IL_0008:  ldloc.s   V_0
-      			ldsfld     class System.Object Test.App::s_aa
-      			unbox      Test.Val
+      			ldsfld     class System.Object Test_refarg_box_val_il.App::s_aa
+      			unbox      Test_refarg_box_val_il.Val
       			
-      IL_000a:  call       int32 Test.App::Test(value class Test.Val&)
+      IL_000a:  call       int32 Test_refarg_box_val_il.App::Test_refarg_box_val_il(value class Test_refarg_box_val_il.Val&)
       IL_000f:  stloc.1
       IL_0010:  call       void ['mscorlib']System.GC::Collect()
       IL_0015:  call       void ['mscorlib']System.GC::WaitForPendingFinalizers()
@@ -153,13 +153,13 @@
     {
       // Code size       24 (0x18)
       .maxstack  2
-      .locals (value class Test.Val V_0)
+      .locals (value class Test_refarg_box_val_il.Val V_0)
       IL_0000:  ldc.i4     0x13a
-      IL_0005:  newobj     instance void Test.Val::.ctor(int32)
+      IL_0005:  newobj     instance void Test_refarg_box_val_il.Val::.ctor(int32)
       IL_000a:  stloc.0
       IL_000b:  ldloc.s   V_0
-      IL_000d:  box     Test.Val
-      IL_0012:  stsfld     class System.Object Test.App::s_aa
+      IL_000d:  box     Test_refarg_box_val_il.Val
+      IL_0012:  stsfld     class System.Object Test_refarg_box_val_il.App::s_aa
       IL_0017:  ret
     } // end of method 'App::.cctor'
 
@@ -175,6 +175,6 @@
 
   } // end of class 'App'
 
-} // end of namespace 'Test'
+} // end of namespace 'Test_refarg_box_val_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/explicit/misc/refarg_box_val_il_d.ilproj b/src/tests/JIT/Methodical/explicit/misc/refarg_box_val_il_d.ilproj
index 1531397a3ef250..afefa6931456dd 100644
--- a/src/tests/JIT/Methodical/explicit/misc/refarg_box_val_il_d.ilproj
+++ b/src/tests/JIT/Methodical/explicit/misc/refarg_box_val_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/explicit/misc/refarg_box_val_il_r.ilproj b/src/tests/JIT/Methodical/explicit/misc/refarg_box_val_il_r.ilproj
index 72ba93ff372632..b3cc59dbfec153 100644
--- a/src/tests/JIT/Methodical/explicit/misc/refarg_box_val_il_r.ilproj
+++ b/src/tests/JIT/Methodical/explicit/misc/refarg_box_val_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotarg_double.cs b/src/tests/JIT/Methodical/explicit/rotate/rotarg_double.cs
index ac68794a29b405..9d85ac865f4869 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotarg_double.cs
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotarg_double.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace Rotate
+namespace Rotate_rotarg_double_cs
 {
-    internal class App
+    public class App
     {
         public static int s_weightCount = 1;
         public static int s_objCount = 0;
@@ -110,7 +111,8 @@ public void rotateTree(ref double leftWeight, ref double rightWeight)
             }
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             Node root = new Node();
             root.growTree(4, "");
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotarg_double.il b/src/tests/JIT/Methodical/explicit/rotate/rotarg_double.il
index 0f2fd44482e73d..3f8542d9a9c4c5 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotarg_double.il
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotarg_double.il
@@ -19,15 +19,15 @@
 }
 .assembly extern xunit.core {}
 // MVID: {645882BF-F31B-417A-A923-D4914C5C82B7}
-.namespace Rotate
+.namespace Rotate_rotarg_double_il
 {
-  .class private auto ansi App extends ['mscorlib']System.Object
+  .class public auto ansi App extends ['mscorlib']System.Object
   {
     .class auto ansi nested private App$Node extends ['mscorlib']System.Object
     {
       .field public float64 m_weight
-      .field public class Rotate.App/App$Node m_leftChild
-      .field public class Rotate.App/App$Node m_rightChild
+      .field public class Rotate_rotarg_double_il.App/App$Node m_leftChild
+      .field public class Rotate_rotarg_double_il.App/App$Node m_rightChild
       .method public hidebysig specialname rtspecialname 
               instance void .ctor() il managed
       {
@@ -35,18 +35,18 @@
         .maxstack  8
         IL_0000:  ldarg.0
         IL_0001:  call       instance void ['mscorlib']System.Object::.ctor()
-        IL_0006:  ldsfld     int32 Rotate.App::s_objCount
+        IL_0006:  ldsfld     int32 Rotate_rotarg_double_il.App::s_objCount
         IL_000b:  ldc.i4.1
         IL_000c:  add
-        IL_000d:  stsfld     int32 Rotate.App::s_objCount
+        IL_000d:  stsfld     int32 Rotate_rotarg_double_il.App::s_objCount
         IL_0012:  ldarg.0
-        IL_0013:  ldsfld     int32 Rotate.App::s_weightCount
+        IL_0013:  ldsfld     int32 Rotate_rotarg_double_il.App::s_weightCount
         IL_0018:  dup
         IL_0019:  ldc.i4.1
         IL_001a:  add
-        IL_001b:  stsfld     int32 Rotate.App::s_weightCount
+        IL_001b:  stsfld     int32 Rotate_rotarg_double_il.App::s_weightCount
         IL_0020:  conv.r8
-        IL_0021:  stfld      float64 Rotate.App/App$Node::m_weight
+        IL_0021:  stfld      float64 Rotate_rotarg_double_il.App/App$Node::m_weight
         IL_0026:  ret
       } // end of method 'App$Node::.ctor'
 
@@ -55,10 +55,10 @@
       {
         // Code size       13 (0xd)
         .maxstack  8
-        IL_0000:  ldsfld     int32 Rotate.App::s_objCount
+        IL_0000:  ldsfld     int32 Rotate_rotarg_double_il.App::s_objCount
         IL_0005:  ldc.i4.1
         IL_0006:  sub
-        IL_0007:  stsfld     int32 Rotate.App::s_objCount
+        IL_0007:  stsfld     int32 Rotate_rotarg_double_il.App::s_objCount
         IL_000c:  ret
       } // end of method 'App$Node::Finalize'
 
@@ -68,16 +68,16 @@
       {
         // Code size       95 (0x5f)
         .maxstack  4
-        .locals (class Rotate.App/App$Node V_0)
+        .locals (class Rotate_rotarg_double_il.App/App$Node V_0)
         IL_0000:  ldarg.1
         IL_0001:  ldc.i4.0
         IL_0002:  ble.s      IL_004e
 
         IL_0004:  ldarg.0
-        IL_0005:  newobj     instance void Rotate.App/App$Node::.ctor()
-        IL_000a:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_0005:  newobj     instance void Rotate_rotarg_double_il.App/App$Node::.ctor()
+        IL_000a:  stfld      class Rotate_rotarg_double_il.App/App$Node Rotate_rotarg_double_il.App/App$Node::m_leftChild
         IL_000f:  ldarg.0
-        IL_0010:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_0010:  ldfld      class Rotate_rotarg_double_il.App/App$Node Rotate_rotarg_double_il.App/App$Node::m_leftChild
         IL_0015:  ldarg.1
         IL_0016:  ldc.i4.1
         IL_0017:  sub
@@ -85,13 +85,13 @@
         IL_0019:  ldstr      " "
         IL_001e:  call       class System.String ['mscorlib']System.String::Concat(class System.String,
                                                                                    class System.String)
-        IL_0023:  call       instance void Rotate.App/App$Node::growTree(int32,
+        IL_0023:  call       instance void Rotate_rotarg_double_il.App/App$Node::growTree(int32,
                                                                          class System.String)
         IL_0028:  ldarg.0
-        IL_0029:  newobj     instance void Rotate.App/App$Node::.ctor()
-        IL_002e:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_0029:  newobj     instance void Rotate_rotarg_double_il.App/App$Node::.ctor()
+        IL_002e:  stfld      class Rotate_rotarg_double_il.App/App$Node Rotate_rotarg_double_il.App/App$Node::m_rightChild
         IL_0033:  ldarg.0
-        IL_0034:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_0034:  ldfld      class Rotate_rotarg_double_il.App/App$Node Rotate_rotarg_double_il.App/App$Node::m_rightChild
         IL_0039:  ldarg.1
         IL_003a:  ldc.i4.1
         IL_003b:  sub
@@ -99,7 +99,7 @@
         IL_003d:  ldstr      " "
         IL_0042:  call       class System.String ['mscorlib']System.String::Concat(class System.String,
                                                                                    class System.String)
-        IL_0047:  call       instance void Rotate.App/App$Node::growTree(int32,
+        IL_0047:  call       instance void Rotate_rotarg_double_il.App/App$Node::growTree(int32,
                                                                          class System.String)
         IL_004c:  br.s       IL_005e
 
@@ -108,9 +108,9 @@
         IL_0050:  ldnull
         IL_0051:  dup
         IL_0052:  stloc.0
-        IL_0053:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_0053:  stfld      class Rotate_rotarg_double_il.App/App$Node Rotate_rotarg_double_il.App/App$Node::m_rightChild
         IL_0058:  ldloc.0
-        IL_0059:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_0059:  stfld      class Rotate_rotarg_double_il.App/App$Node Rotate_rotarg_double_il.App/App$Node::m_leftChild
         IL_005e:  ret
       } // end of method 'App$Node::growTree'
 
@@ -120,8 +120,8 @@
       {
         // Code size       474 (0x1da)
         .maxstack  3
-        .locals (class Rotate.App/App$Node V_0,
-                 class Rotate.App/App$Node V_1,
+        .locals (class Rotate_rotarg_double_il.App/App$Node V_0,
+                 class Rotate_rotarg_double_il.App/App$Node V_1,
                  int32 V_2,
                  int32 V_3,
                  int32[] V_4,
@@ -131,13 +131,13 @@
         IL_0001:  stloc.0
         IL_0002:  ldnull
         IL_0003:  stloc.1
-        IL_0004:  ldsfld     int32 Rotate.App::s_objCount
+        IL_0004:  ldsfld     int32 Rotate_rotarg_double_il.App::s_objCount
         IL_0009:  stloc.2
         IL_000a:  ldarg.0
-        IL_000b:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_000b:  ldfld      class Rotate_rotarg_double_il.App/App$Node Rotate_rotarg_double_il.App/App$Node::m_leftChild
         IL_0010:  brfalse.s  IL_004f
 
-        IL_0012:  newobj     instance void Rotate.App/App$Node::.ctor()
+        IL_0012:  newobj     instance void Rotate_rotarg_double_il.App/App$Node::.ctor()
         IL_0017:  stloc.1
         IL_0018:  ldloc.2
         IL_0019:  ldc.i4.1
@@ -145,24 +145,24 @@
         IL_001b:  stloc.2
         IL_001c:  ldloc.1
         IL_001d:  ldarg.0
-        IL_001e:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_0023:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_0028:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_001e:  ldfld      class Rotate_rotarg_double_il.App/App$Node Rotate_rotarg_double_il.App/App$Node::m_leftChild
+        IL_0023:  ldfld      class Rotate_rotarg_double_il.App/App$Node Rotate_rotarg_double_il.App/App$Node::m_leftChild
+        IL_0028:  stfld      class Rotate_rotarg_double_il.App/App$Node Rotate_rotarg_double_il.App/App$Node::m_leftChild
         IL_002d:  ldloc.1
         IL_002e:  ldarg.0
-        IL_002f:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_0034:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_0039:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_002f:  ldfld      class Rotate_rotarg_double_il.App/App$Node Rotate_rotarg_double_il.App/App$Node::m_leftChild
+        IL_0034:  ldfld      class Rotate_rotarg_double_il.App/App$Node Rotate_rotarg_double_il.App/App$Node::m_rightChild
+        IL_0039:  stfld      class Rotate_rotarg_double_il.App/App$Node Rotate_rotarg_double_il.App/App$Node::m_rightChild
         IL_003e:  ldloc.1
         IL_003f:  ldarg.0
-        IL_0040:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_0045:  ldfld      float64 Rotate.App/App$Node::m_weight
-        IL_004a:  stfld      float64 Rotate.App/App$Node::m_weight
+        IL_0040:  ldfld      class Rotate_rotarg_double_il.App/App$Node Rotate_rotarg_double_il.App/App$Node::m_leftChild
+        IL_0045:  ldfld      float64 Rotate_rotarg_double_il.App/App$Node::m_weight
+        IL_004a:  stfld      float64 Rotate_rotarg_double_il.App/App$Node::m_weight
         IL_004f:  ldarg.0
-        IL_0050:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_0050:  ldfld      class Rotate_rotarg_double_il.App/App$Node Rotate_rotarg_double_il.App/App$Node::m_rightChild
         IL_0055:  brfalse.s  IL_0094
 
-        IL_0057:  newobj     instance void Rotate.App/App$Node::.ctor()
+        IL_0057:  newobj     instance void Rotate_rotarg_double_il.App/App$Node::.ctor()
         IL_005c:  stloc.0
         IL_005d:  ldloc.2
         IL_005e:  ldc.i4.1
@@ -170,25 +170,25 @@
         IL_0060:  stloc.2
         IL_0061:  ldloc.0
         IL_0062:  ldarg.0
-        IL_0063:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_0068:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_006d:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_0063:  ldfld      class Rotate_rotarg_double_il.App/App$Node Rotate_rotarg_double_il.App/App$Node::m_rightChild
+        IL_0068:  ldfld      class Rotate_rotarg_double_il.App/App$Node Rotate_rotarg_double_il.App/App$Node::m_leftChild
+        IL_006d:  stfld      class Rotate_rotarg_double_il.App/App$Node Rotate_rotarg_double_il.App/App$Node::m_leftChild
         IL_0072:  ldloc.0
         IL_0073:  ldarg.0
-        IL_0074:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_0079:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_007e:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_0074:  ldfld      class Rotate_rotarg_double_il.App/App$Node Rotate_rotarg_double_il.App/App$Node::m_rightChild
+        IL_0079:  ldfld      class Rotate_rotarg_double_il.App/App$Node Rotate_rotarg_double_il.App/App$Node::m_rightChild
+        IL_007e:  stfld      class Rotate_rotarg_double_il.App/App$Node Rotate_rotarg_double_il.App/App$Node::m_rightChild
         IL_0083:  ldloc.0
         IL_0084:  ldarg.0
-        IL_0085:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_008a:  ldfld      float64 Rotate.App/App$Node::m_weight
-        IL_008f:  stfld      float64 Rotate.App/App$Node::m_weight
+        IL_0085:  ldfld      class Rotate_rotarg_double_il.App/App$Node Rotate_rotarg_double_il.App/App$Node::m_rightChild
+        IL_008a:  ldfld      float64 Rotate_rotarg_double_il.App/App$Node::m_weight
+        IL_008f:  stfld      float64 Rotate_rotarg_double_il.App/App$Node::m_weight
         IL_0094:  ldarg.0
         IL_0095:  ldloc.0
-        IL_0096:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_0096:  stfld      class Rotate_rotarg_double_il.App/App$Node Rotate_rotarg_double_il.App/App$Node::m_leftChild
         IL_009b:  ldarg.0
         IL_009c:  ldloc.1
-        IL_009d:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_009d:  stfld      class Rotate_rotarg_double_il.App/App$Node Rotate_rotarg_double_il.App/App$Node::m_rightChild
         IL_00a2:  ldc.i4.0
         IL_00a3:  stloc.3
         IL_00a4:  br.s       IL_00b6
@@ -206,46 +206,46 @@
 
         IL_00be:  call       void ['mscorlib']System.GC::Collect()
         IL_00c3:  ldarg.0
-        IL_00c4:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_00c4:  ldfld      class Rotate_rotarg_double_il.App/App$Node Rotate_rotarg_double_il.App/App$Node::m_rightChild
         IL_00c9:  brfalse    IL_014e
 
         IL_00ce:  ldarg.0
-        IL_00cf:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_00d4:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_00cf:  ldfld      class Rotate_rotarg_double_il.App/App$Node Rotate_rotarg_double_il.App/App$Node::m_rightChild
+        IL_00d4:  ldfld      class Rotate_rotarg_double_il.App/App$Node Rotate_rotarg_double_il.App/App$Node::m_leftChild
         IL_00d9:  brfalse.s  IL_0115
 
         IL_00db:  ldarg.0
-        IL_00dc:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_00e1:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_00dc:  ldfld      class Rotate_rotarg_double_il.App/App$Node Rotate_rotarg_double_il.App/App$Node::m_rightChild
+        IL_00e1:  ldfld      class Rotate_rotarg_double_il.App/App$Node Rotate_rotarg_double_il.App/App$Node::m_rightChild
         IL_00e6:  brfalse.s  IL_0115
 
         IL_00e8:  ldarg.0
-        IL_00e9:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_00e9:  ldfld      class Rotate_rotarg_double_il.App/App$Node Rotate_rotarg_double_il.App/App$Node::m_rightChild
         IL_00ee:  ldarg.0
-        IL_00ef:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_00f4:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_00f9:  ldflda     float64 Rotate.App/App$Node::m_weight
+        IL_00ef:  ldfld      class Rotate_rotarg_double_il.App/App$Node Rotate_rotarg_double_il.App/App$Node::m_rightChild
+        IL_00f4:  ldfld      class Rotate_rotarg_double_il.App/App$Node Rotate_rotarg_double_il.App/App$Node::m_leftChild
+        IL_00f9:  ldflda     float64 Rotate_rotarg_double_il.App/App$Node::m_weight
         IL_00fe:  ldarg.0
-        IL_00ff:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_0104:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_0109:  ldflda     float64 Rotate.App/App$Node::m_weight
-        IL_010e:  call       instance void Rotate.App/App$Node::rotateTree(float64&,
+        IL_00ff:  ldfld      class Rotate_rotarg_double_il.App/App$Node Rotate_rotarg_double_il.App/App$Node::m_rightChild
+        IL_0104:  ldfld      class Rotate_rotarg_double_il.App/App$Node Rotate_rotarg_double_il.App/App$Node::m_rightChild
+        IL_0109:  ldflda     float64 Rotate_rotarg_double_il.App/App$Node::m_weight
+        IL_010e:  call       instance void Rotate_rotarg_double_il.App/App$Node::rotateTree(float64&,
                                                                            float64&)
         IL_0113:  br.s       IL_012f
 
         IL_0115:  ldc.r8     -1.
         IL_011e:  stloc.s    V_5
         IL_0120:  ldarg.0
-        IL_0121:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_0121:  ldfld      class Rotate_rotarg_double_il.App/App$Node Rotate_rotarg_double_il.App/App$Node::m_rightChild
         IL_0126:  ldloca.s   V_5
         IL_0128:  ldloca.s   V_5
-        IL_012a:  call       instance void Rotate.App/App$Node::rotateTree(float64&,
+        IL_012a:  call       instance void Rotate_rotarg_double_il.App/App$Node::rotateTree(float64&,
                                                                            float64&)
         IL_012f:  ldarg.1
         IL_0130:  ldind.r8
         IL_0131:  ldarg.0
-        IL_0132:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_0137:  ldfld      float64 Rotate.App/App$Node::m_weight
+        IL_0132:  ldfld      class Rotate_rotarg_double_il.App/App$Node Rotate_rotarg_double_il.App/App$Node::m_rightChild
+        IL_0137:  ldfld      float64 Rotate_rotarg_double_il.App/App$Node::m_weight
         IL_013c:  beq.s      IL_014e
 
         IL_013e:  ldstr      "left weight do not match."
@@ -254,46 +254,46 @@
         IL_014d:  throw
 
         IL_014e:  ldarg.0
-        IL_014f:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_014f:  ldfld      class Rotate_rotarg_double_il.App/App$Node Rotate_rotarg_double_il.App/App$Node::m_leftChild
         IL_0154:  brfalse    IL_01d9
 
         IL_0159:  ldarg.0
-        IL_015a:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_015f:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_015a:  ldfld      class Rotate_rotarg_double_il.App/App$Node Rotate_rotarg_double_il.App/App$Node::m_leftChild
+        IL_015f:  ldfld      class Rotate_rotarg_double_il.App/App$Node Rotate_rotarg_double_il.App/App$Node::m_leftChild
         IL_0164:  brfalse.s  IL_01a0
 
         IL_0166:  ldarg.0
-        IL_0167:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_016c:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_0167:  ldfld      class Rotate_rotarg_double_il.App/App$Node Rotate_rotarg_double_il.App/App$Node::m_leftChild
+        IL_016c:  ldfld      class Rotate_rotarg_double_il.App/App$Node Rotate_rotarg_double_il.App/App$Node::m_rightChild
         IL_0171:  brfalse.s  IL_01a0
 
         IL_0173:  ldarg.0
-        IL_0174:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_0174:  ldfld      class Rotate_rotarg_double_il.App/App$Node Rotate_rotarg_double_il.App/App$Node::m_leftChild
         IL_0179:  ldarg.0
-        IL_017a:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_017f:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_0184:  ldflda     float64 Rotate.App/App$Node::m_weight
+        IL_017a:  ldfld      class Rotate_rotarg_double_il.App/App$Node Rotate_rotarg_double_il.App/App$Node::m_leftChild
+        IL_017f:  ldfld      class Rotate_rotarg_double_il.App/App$Node Rotate_rotarg_double_il.App/App$Node::m_leftChild
+        IL_0184:  ldflda     float64 Rotate_rotarg_double_il.App/App$Node::m_weight
         IL_0189:  ldarg.0
-        IL_018a:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_018f:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_0194:  ldflda     float64 Rotate.App/App$Node::m_weight
-        IL_0199:  call       instance void Rotate.App/App$Node::rotateTree(float64&,
+        IL_018a:  ldfld      class Rotate_rotarg_double_il.App/App$Node Rotate_rotarg_double_il.App/App$Node::m_leftChild
+        IL_018f:  ldfld      class Rotate_rotarg_double_il.App/App$Node Rotate_rotarg_double_il.App/App$Node::m_rightChild
+        IL_0194:  ldflda     float64 Rotate_rotarg_double_il.App/App$Node::m_weight
+        IL_0199:  call       instance void Rotate_rotarg_double_il.App/App$Node::rotateTree(float64&,
                                                                            float64&)
         IL_019e:  br.s       IL_01ba
 
         IL_01a0:  ldc.r8     -1.
         IL_01a9:  stloc.s    V_6
         IL_01ab:  ldarg.0
-        IL_01ac:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_01ac:  ldfld      class Rotate_rotarg_double_il.App/App$Node Rotate_rotarg_double_il.App/App$Node::m_leftChild
         IL_01b1:  ldloca.s   V_6
         IL_01b3:  ldloca.s   V_6
-        IL_01b5:  call       instance void Rotate.App/App$Node::rotateTree(float64&,
+        IL_01b5:  call       instance void Rotate_rotarg_double_il.App/App$Node::rotateTree(float64&,
                                                                            float64&)
         IL_01ba:  ldarg.2
         IL_01bb:  ldind.r8
         IL_01bc:  ldarg.0
-        IL_01bd:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_01c2:  ldfld      float64 Rotate.App/App$Node::m_weight
+        IL_01bd:  ldfld      class Rotate_rotarg_double_il.App/App$Node Rotate_rotarg_double_il.App/App$Node::m_leftChild
+        IL_01c2:  ldfld      float64 Rotate_rotarg_double_il.App/App$Node::m_weight
         IL_01c7:  beq.s      IL_01d9
 
         IL_01c9:  ldstr      "right weight do not match."
@@ -308,7 +308,7 @@
 
     .field public static int32 s_weightCount
     .field public static int32 s_objCount
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -317,22 +317,22 @@
       .entrypoint
       // Code size       47 (0x2f)
       .maxstack  3
-      .locals (class Rotate.App/App$Node V_0)
-      IL_0000:  newobj     instance void Rotate.App/App$Node::.ctor()
+      .locals (class Rotate_rotarg_double_il.App/App$Node V_0)
+      IL_0000:  newobj     instance void Rotate_rotarg_double_il.App/App$Node::.ctor()
       IL_0005:  stloc.0
       IL_0006:  ldloc.0
       IL_0007:  ldc.i4.4
       IL_0008:  ldnull
-      IL_000d:  call       instance void Rotate.App/App$Node::growTree(int32,
+      IL_000d:  call       instance void Rotate_rotarg_double_il.App/App$Node::growTree(int32,
                                                                        class System.String)
       IL_0012:  ldloc.0
       IL_0013:  ldloc.0
-      IL_0014:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-      IL_0019:  ldflda     float64 Rotate.App/App$Node::m_weight
+      IL_0014:  ldfld      class Rotate_rotarg_double_il.App/App$Node Rotate_rotarg_double_il.App/App$Node::m_leftChild
+      IL_0019:  ldflda     float64 Rotate_rotarg_double_il.App/App$Node::m_weight
       IL_001e:  ldloc.0
-      IL_001f:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-      IL_0024:  ldflda     float64 Rotate.App/App$Node::m_weight
-      IL_0029:  call       instance void Rotate.App/App$Node::rotateTree(float64&,
+      IL_001f:  ldfld      class Rotate_rotarg_double_il.App/App$Node Rotate_rotarg_double_il.App/App$Node::m_rightChild
+      IL_0024:  ldflda     float64 Rotate_rotarg_double_il.App/App$Node::m_weight
+      IL_0029:  call       instance void Rotate_rotarg_double_il.App/App$Node::rotateTree(float64&,
                                                                          float64&)
       IL_002e:  ldc.i4    0x64
       IL_0033:  ret
@@ -344,9 +344,9 @@
       // Code size       13 (0xd)
       .maxstack  8
       IL_0000:  ldc.i4.1
-      IL_0001:  stsfld     int32 Rotate.App::s_weightCount
+      IL_0001:  stsfld     int32 Rotate_rotarg_double_il.App::s_weightCount
       IL_0006:  ldc.i4.0
-      IL_0007:  stsfld     int32 Rotate.App::s_objCount
+      IL_0007:  stsfld     int32 Rotate_rotarg_double_il.App::s_objCount
       IL_000c:  ret
     } // end of method 'App::.cctor'
 
@@ -362,6 +362,6 @@
 
   } // end of class 'App'
 
-} // end of namespace 'Rotate'
+} // end of namespace 'Rotate_rotarg_double_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotarg_double_d.csproj b/src/tests/JIT/Methodical/explicit/rotate/rotarg_double_d.csproj
index fec30c7ea3ed7a..eb7b446fa3db13 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotarg_double_d.csproj
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotarg_double_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotarg_double_do.csproj b/src/tests/JIT/Methodical/explicit/rotate/rotarg_double_do.csproj
index d945bca0f353c1..09818390bf4825 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotarg_double_do.csproj
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotarg_double_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotarg_double_il_d.ilproj b/src/tests/JIT/Methodical/explicit/rotate/rotarg_double_il_d.ilproj
index 6a2a5c3fc70e56..a9b101dba2909e 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotarg_double_il_d.ilproj
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotarg_double_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotarg_double_il_r.ilproj b/src/tests/JIT/Methodical/explicit/rotate/rotarg_double_il_r.ilproj
index 003014925f8095..83989dedf6b1cd 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotarg_double_il_r.ilproj
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotarg_double_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotarg_double_r.csproj b/src/tests/JIT/Methodical/explicit/rotate/rotarg_double_r.csproj
index 37a5fcd70112e9..f07504b12d0214 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotarg_double_r.csproj
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotarg_double_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotarg_double_ro.csproj b/src/tests/JIT/Methodical/explicit/rotate/rotarg_double_ro.csproj
index 0fa4c69e63dcfc..07995eb9ad0c6c 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotarg_double_ro.csproj
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotarg_double_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotarg_float.cs b/src/tests/JIT/Methodical/explicit/rotate/rotarg_float.cs
index 18ffddf34b835d..2e213e6bff7765 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotarg_float.cs
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotarg_float.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace Rotate
+namespace Rotate_rotarg_float_cs
 {
-    internal class App
+    public class App
     {
         public static int s_weightCount = 1;
         public static int s_objCount = 0;
@@ -110,7 +111,8 @@ public void rotateTree(ref float leftWeight, ref float rightWeight)
             }
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             Node root = new Node();
             root.growTree(4, "");
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotarg_float.il b/src/tests/JIT/Methodical/explicit/rotate/rotarg_float.il
index b2854e691fec68..6c00383ed73fab 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotarg_float.il
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotarg_float.il
@@ -19,15 +19,15 @@
 }
 .assembly extern xunit.core {}
 // MVID: {7ECA5CD0-D623-475E-8C8F-8781756FD492}
-.namespace Rotate
+.namespace Rotate_rotarg_float_il
 {
-  .class private auto ansi App extends ['mscorlib']System.Object
+  .class public auto ansi App extends ['mscorlib']System.Object
   {
     .class auto ansi nested private App$Node extends ['mscorlib']System.Object
     {
       .field public float32 m_weight
-      .field public class Rotate.App/App$Node m_leftChild
-      .field public class Rotate.App/App$Node m_rightChild
+      .field public class Rotate_rotarg_float_il.App/App$Node m_leftChild
+      .field public class Rotate_rotarg_float_il.App/App$Node m_rightChild
       .method public hidebysig specialname rtspecialname 
               instance void .ctor() il managed
       {
@@ -35,18 +35,18 @@
         .maxstack  8
         IL_0000:  ldarg.0
         IL_0001:  call       instance void ['mscorlib']System.Object::.ctor()
-        IL_0006:  ldsfld     int32 Rotate.App::s_objCount
+        IL_0006:  ldsfld     int32 Rotate_rotarg_float_il.App::s_objCount
         IL_000b:  ldc.i4.1
         IL_000c:  add
-        IL_000d:  stsfld     int32 Rotate.App::s_objCount
+        IL_000d:  stsfld     int32 Rotate_rotarg_float_il.App::s_objCount
         IL_0012:  ldarg.0
-        IL_0013:  ldsfld     int32 Rotate.App::s_weightCount
+        IL_0013:  ldsfld     int32 Rotate_rotarg_float_il.App::s_weightCount
         IL_0018:  dup
         IL_0019:  ldc.i4.1
         IL_001a:  add
-        IL_001b:  stsfld     int32 Rotate.App::s_weightCount
+        IL_001b:  stsfld     int32 Rotate_rotarg_float_il.App::s_weightCount
         IL_0020:  conv.r4
-        IL_0021:  stfld      float32 Rotate.App/App$Node::m_weight
+        IL_0021:  stfld      float32 Rotate_rotarg_float_il.App/App$Node::m_weight
         IL_0026:  ret
       } // end of method 'App$Node::.ctor'
 
@@ -55,10 +55,10 @@
       {
         // Code size       13 (0xd)
         .maxstack  8
-        IL_0000:  ldsfld     int32 Rotate.App::s_objCount
+        IL_0000:  ldsfld     int32 Rotate_rotarg_float_il.App::s_objCount
         IL_0005:  ldc.i4.1
         IL_0006:  sub
-        IL_0007:  stsfld     int32 Rotate.App::s_objCount
+        IL_0007:  stsfld     int32 Rotate_rotarg_float_il.App::s_objCount
         IL_000c:  ret
       } // end of method 'App$Node::Finalize'
 
@@ -68,16 +68,16 @@
       {
         // Code size       95 (0x5f)
         .maxstack  4
-        .locals (class Rotate.App/App$Node V_0)
+        .locals (class Rotate_rotarg_float_il.App/App$Node V_0)
         IL_0000:  ldarg.1
         IL_0001:  ldc.i4.0
         IL_0002:  ble.s      IL_004e
 
         IL_0004:  ldarg.0
-        IL_0005:  newobj     instance void Rotate.App/App$Node::.ctor()
-        IL_000a:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_0005:  newobj     instance void Rotate_rotarg_float_il.App/App$Node::.ctor()
+        IL_000a:  stfld      class Rotate_rotarg_float_il.App/App$Node Rotate_rotarg_float_il.App/App$Node::m_leftChild
         IL_000f:  ldarg.0
-        IL_0010:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_0010:  ldfld      class Rotate_rotarg_float_il.App/App$Node Rotate_rotarg_float_il.App/App$Node::m_leftChild
         IL_0015:  ldarg.1
         IL_0016:  ldc.i4.1
         IL_0017:  sub
@@ -85,13 +85,13 @@
         IL_0019:  ldstr      " "
         IL_001e:  call       class System.String ['mscorlib']System.String::Concat(class System.String,
                                                                                    class System.String)
-        IL_0023:  call       instance void Rotate.App/App$Node::growTree(int32,
+        IL_0023:  call       instance void Rotate_rotarg_float_il.App/App$Node::growTree(int32,
                                                                          class System.String)
         IL_0028:  ldarg.0
-        IL_0029:  newobj     instance void Rotate.App/App$Node::.ctor()
-        IL_002e:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_0029:  newobj     instance void Rotate_rotarg_float_il.App/App$Node::.ctor()
+        IL_002e:  stfld      class Rotate_rotarg_float_il.App/App$Node Rotate_rotarg_float_il.App/App$Node::m_rightChild
         IL_0033:  ldarg.0
-        IL_0034:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_0034:  ldfld      class Rotate_rotarg_float_il.App/App$Node Rotate_rotarg_float_il.App/App$Node::m_rightChild
         IL_0039:  ldarg.1
         IL_003a:  ldc.i4.1
         IL_003b:  sub
@@ -99,7 +99,7 @@
         IL_003d:  ldstr      " "
         IL_0042:  call       class System.String ['mscorlib']System.String::Concat(class System.String,
                                                                                    class System.String)
-        IL_0047:  call       instance void Rotate.App/App$Node::growTree(int32,
+        IL_0047:  call       instance void Rotate_rotarg_float_il.App/App$Node::growTree(int32,
                                                                          class System.String)
         IL_004c:  br.s       IL_005e
 
@@ -108,9 +108,9 @@
         IL_0050:  ldnull
         IL_0051:  dup
         IL_0052:  stloc.0
-        IL_0053:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_0053:  stfld      class Rotate_rotarg_float_il.App/App$Node Rotate_rotarg_float_il.App/App$Node::m_rightChild
         IL_0058:  ldloc.0
-        IL_0059:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_0059:  stfld      class Rotate_rotarg_float_il.App/App$Node Rotate_rotarg_float_il.App/App$Node::m_leftChild
         IL_005e:  ret
       } // end of method 'App$Node::growTree'
 
@@ -120,8 +120,8 @@
       {
         // Code size       460 (0x1cc)
         .maxstack  3
-        .locals (class Rotate.App/App$Node V_0,
-                 class Rotate.App/App$Node V_1,
+        .locals (class Rotate_rotarg_float_il.App/App$Node V_0,
+                 class Rotate_rotarg_float_il.App/App$Node V_1,
                  int32 V_2,
                  int32 V_3,
                  int32[] V_4,
@@ -131,13 +131,13 @@
         IL_0001:  stloc.0
         IL_0002:  ldnull
         IL_0003:  stloc.1
-        IL_0004:  ldsfld     int32 Rotate.App::s_objCount
+        IL_0004:  ldsfld     int32 Rotate_rotarg_float_il.App::s_objCount
         IL_0009:  stloc.2
         IL_000a:  ldarg.0
-        IL_000b:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_000b:  ldfld      class Rotate_rotarg_float_il.App/App$Node Rotate_rotarg_float_il.App/App$Node::m_leftChild
         IL_0010:  brfalse.s  IL_004f
 
-        IL_0012:  newobj     instance void Rotate.App/App$Node::.ctor()
+        IL_0012:  newobj     instance void Rotate_rotarg_float_il.App/App$Node::.ctor()
         IL_0017:  stloc.1
         IL_0018:  ldloc.2
         IL_0019:  ldc.i4.1
@@ -145,24 +145,24 @@
         IL_001b:  stloc.2
         IL_001c:  ldloc.1
         IL_001d:  ldarg.0
-        IL_001e:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_0023:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_0028:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_001e:  ldfld      class Rotate_rotarg_float_il.App/App$Node Rotate_rotarg_float_il.App/App$Node::m_leftChild
+        IL_0023:  ldfld      class Rotate_rotarg_float_il.App/App$Node Rotate_rotarg_float_il.App/App$Node::m_leftChild
+        IL_0028:  stfld      class Rotate_rotarg_float_il.App/App$Node Rotate_rotarg_float_il.App/App$Node::m_leftChild
         IL_002d:  ldloc.1
         IL_002e:  ldarg.0
-        IL_002f:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_0034:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_0039:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_002f:  ldfld      class Rotate_rotarg_float_il.App/App$Node Rotate_rotarg_float_il.App/App$Node::m_leftChild
+        IL_0034:  ldfld      class Rotate_rotarg_float_il.App/App$Node Rotate_rotarg_float_il.App/App$Node::m_rightChild
+        IL_0039:  stfld      class Rotate_rotarg_float_il.App/App$Node Rotate_rotarg_float_il.App/App$Node::m_rightChild
         IL_003e:  ldloc.1
         IL_003f:  ldarg.0
-        IL_0040:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_0045:  ldfld      float32 Rotate.App/App$Node::m_weight
-        IL_004a:  stfld      float32 Rotate.App/App$Node::m_weight
+        IL_0040:  ldfld      class Rotate_rotarg_float_il.App/App$Node Rotate_rotarg_float_il.App/App$Node::m_leftChild
+        IL_0045:  ldfld      float32 Rotate_rotarg_float_il.App/App$Node::m_weight
+        IL_004a:  stfld      float32 Rotate_rotarg_float_il.App/App$Node::m_weight
         IL_004f:  ldarg.0
-        IL_0050:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_0050:  ldfld      class Rotate_rotarg_float_il.App/App$Node Rotate_rotarg_float_il.App/App$Node::m_rightChild
         IL_0055:  brfalse.s  IL_0094
 
-        IL_0057:  newobj     instance void Rotate.App/App$Node::.ctor()
+        IL_0057:  newobj     instance void Rotate_rotarg_float_il.App/App$Node::.ctor()
         IL_005c:  stloc.0
         IL_005d:  ldloc.2
         IL_005e:  ldc.i4.1
@@ -170,25 +170,25 @@
         IL_0060:  stloc.2
         IL_0061:  ldloc.0
         IL_0062:  ldarg.0
-        IL_0063:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_0068:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_006d:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_0063:  ldfld      class Rotate_rotarg_float_il.App/App$Node Rotate_rotarg_float_il.App/App$Node::m_rightChild
+        IL_0068:  ldfld      class Rotate_rotarg_float_il.App/App$Node Rotate_rotarg_float_il.App/App$Node::m_leftChild
+        IL_006d:  stfld      class Rotate_rotarg_float_il.App/App$Node Rotate_rotarg_float_il.App/App$Node::m_leftChild
         IL_0072:  ldloc.0
         IL_0073:  ldarg.0
-        IL_0074:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_0079:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_007e:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_0074:  ldfld      class Rotate_rotarg_float_il.App/App$Node Rotate_rotarg_float_il.App/App$Node::m_rightChild
+        IL_0079:  ldfld      class Rotate_rotarg_float_il.App/App$Node Rotate_rotarg_float_il.App/App$Node::m_rightChild
+        IL_007e:  stfld      class Rotate_rotarg_float_il.App/App$Node Rotate_rotarg_float_il.App/App$Node::m_rightChild
         IL_0083:  ldloc.0
         IL_0084:  ldarg.0
-        IL_0085:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_008a:  ldfld      float32 Rotate.App/App$Node::m_weight
-        IL_008f:  stfld      float32 Rotate.App/App$Node::m_weight
+        IL_0085:  ldfld      class Rotate_rotarg_float_il.App/App$Node Rotate_rotarg_float_il.App/App$Node::m_rightChild
+        IL_008a:  ldfld      float32 Rotate_rotarg_float_il.App/App$Node::m_weight
+        IL_008f:  stfld      float32 Rotate_rotarg_float_il.App/App$Node::m_weight
         IL_0094:  ldarg.0
         IL_0095:  ldloc.0
-        IL_0096:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_0096:  stfld      class Rotate_rotarg_float_il.App/App$Node Rotate_rotarg_float_il.App/App$Node::m_leftChild
         IL_009b:  ldarg.0
         IL_009c:  ldloc.1
-        IL_009d:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_009d:  stfld      class Rotate_rotarg_float_il.App/App$Node Rotate_rotarg_float_il.App/App$Node::m_rightChild
         IL_00a2:  ldc.i4.0
         IL_00a3:  stloc.3
         IL_00a4:  br.s       IL_00b6
@@ -206,46 +206,46 @@
 
         IL_00be:  call       void ['mscorlib']System.GC::Collect()
         IL_00c3:  ldarg.0
-        IL_00c4:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_00c4:  ldfld      class Rotate_rotarg_float_il.App/App$Node Rotate_rotarg_float_il.App/App$Node::m_rightChild
         IL_00c9:  brfalse.s  IL_0147
 
         IL_00cb:  ldarg.0
-        IL_00cc:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_00d1:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_00cc:  ldfld      class Rotate_rotarg_float_il.App/App$Node Rotate_rotarg_float_il.App/App$Node::m_rightChild
+        IL_00d1:  ldfld      class Rotate_rotarg_float_il.App/App$Node Rotate_rotarg_float_il.App/App$Node::m_leftChild
         IL_00d6:  brfalse.s  IL_0112
 
         IL_00d8:  ldarg.0
-        IL_00d9:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_00de:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_00d9:  ldfld      class Rotate_rotarg_float_il.App/App$Node Rotate_rotarg_float_il.App/App$Node::m_rightChild
+        IL_00de:  ldfld      class Rotate_rotarg_float_il.App/App$Node Rotate_rotarg_float_il.App/App$Node::m_rightChild
         IL_00e3:  brfalse.s  IL_0112
 
         IL_00e5:  ldarg.0
-        IL_00e6:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_00e6:  ldfld      class Rotate_rotarg_float_il.App/App$Node Rotate_rotarg_float_il.App/App$Node::m_rightChild
         IL_00eb:  ldarg.0
-        IL_00ec:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_00f1:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_00f6:  ldflda     float32 Rotate.App/App$Node::m_weight
+        IL_00ec:  ldfld      class Rotate_rotarg_float_il.App/App$Node Rotate_rotarg_float_il.App/App$Node::m_rightChild
+        IL_00f1:  ldfld      class Rotate_rotarg_float_il.App/App$Node Rotate_rotarg_float_il.App/App$Node::m_leftChild
+        IL_00f6:  ldflda     float32 Rotate_rotarg_float_il.App/App$Node::m_weight
         IL_00fb:  ldarg.0
-        IL_00fc:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_0101:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_0106:  ldflda     float32 Rotate.App/App$Node::m_weight
-        IL_010b:  call       instance void Rotate.App/App$Node::rotateTree(float32&,
+        IL_00fc:  ldfld      class Rotate_rotarg_float_il.App/App$Node Rotate_rotarg_float_il.App/App$Node::m_rightChild
+        IL_0101:  ldfld      class Rotate_rotarg_float_il.App/App$Node Rotate_rotarg_float_il.App/App$Node::m_rightChild
+        IL_0106:  ldflda     float32 Rotate_rotarg_float_il.App/App$Node::m_weight
+        IL_010b:  call       instance void Rotate_rotarg_float_il.App/App$Node::rotateTree(float32&,
                                                                            float32&)
         IL_0110:  br.s       IL_0128
 
         IL_0112:  ldc.r4     -1.
         IL_0117:  stloc.s    V_5
         IL_0119:  ldarg.0
-        IL_011a:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_011a:  ldfld      class Rotate_rotarg_float_il.App/App$Node Rotate_rotarg_float_il.App/App$Node::m_rightChild
         IL_011f:  ldloca.s   V_5
         IL_0121:  ldloca.s   V_5
-        IL_0123:  call       instance void Rotate.App/App$Node::rotateTree(float32&,
+        IL_0123:  call       instance void Rotate_rotarg_float_il.App/App$Node::rotateTree(float32&,
                                                                            float32&)
         IL_0128:  ldarg.1
         IL_0129:  ldind.r4
         IL_012a:  ldarg.0
-        IL_012b:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_0130:  ldfld      float32 Rotate.App/App$Node::m_weight
+        IL_012b:  ldfld      class Rotate_rotarg_float_il.App/App$Node Rotate_rotarg_float_il.App/App$Node::m_rightChild
+        IL_0130:  ldfld      float32 Rotate_rotarg_float_il.App/App$Node::m_weight
         IL_0135:  beq.s      IL_0147
 
         IL_0137:  ldstr      "left weight do not match."
@@ -254,46 +254,46 @@
         IL_0146:  throw
 
         IL_0147:  ldarg.0
-        IL_0148:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_0148:  ldfld      class Rotate_rotarg_float_il.App/App$Node Rotate_rotarg_float_il.App/App$Node::m_leftChild
         IL_014d:  brfalse.s  IL_01cb
 
         IL_014f:  ldarg.0
-        IL_0150:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_0155:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_0150:  ldfld      class Rotate_rotarg_float_il.App/App$Node Rotate_rotarg_float_il.App/App$Node::m_leftChild
+        IL_0155:  ldfld      class Rotate_rotarg_float_il.App/App$Node Rotate_rotarg_float_il.App/App$Node::m_leftChild
         IL_015a:  brfalse.s  IL_0196
 
         IL_015c:  ldarg.0
-        IL_015d:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_0162:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_015d:  ldfld      class Rotate_rotarg_float_il.App/App$Node Rotate_rotarg_float_il.App/App$Node::m_leftChild
+        IL_0162:  ldfld      class Rotate_rotarg_float_il.App/App$Node Rotate_rotarg_float_il.App/App$Node::m_rightChild
         IL_0167:  brfalse.s  IL_0196
 
         IL_0169:  ldarg.0
-        IL_016a:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_016a:  ldfld      class Rotate_rotarg_float_il.App/App$Node Rotate_rotarg_float_il.App/App$Node::m_leftChild
         IL_016f:  ldarg.0
-        IL_0170:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_0175:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_017a:  ldflda     float32 Rotate.App/App$Node::m_weight
+        IL_0170:  ldfld      class Rotate_rotarg_float_il.App/App$Node Rotate_rotarg_float_il.App/App$Node::m_leftChild
+        IL_0175:  ldfld      class Rotate_rotarg_float_il.App/App$Node Rotate_rotarg_float_il.App/App$Node::m_leftChild
+        IL_017a:  ldflda     float32 Rotate_rotarg_float_il.App/App$Node::m_weight
         IL_017f:  ldarg.0
-        IL_0180:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_0185:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_018a:  ldflda     float32 Rotate.App/App$Node::m_weight
-        IL_018f:  call       instance void Rotate.App/App$Node::rotateTree(float32&,
+        IL_0180:  ldfld      class Rotate_rotarg_float_il.App/App$Node Rotate_rotarg_float_il.App/App$Node::m_leftChild
+        IL_0185:  ldfld      class Rotate_rotarg_float_il.App/App$Node Rotate_rotarg_float_il.App/App$Node::m_rightChild
+        IL_018a:  ldflda     float32 Rotate_rotarg_float_il.App/App$Node::m_weight
+        IL_018f:  call       instance void Rotate_rotarg_float_il.App/App$Node::rotateTree(float32&,
                                                                            float32&)
         IL_0194:  br.s       IL_01ac
 
         IL_0196:  ldc.r4     -1.
         IL_019b:  stloc.s    V_6
         IL_019d:  ldarg.0
-        IL_019e:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_019e:  ldfld      class Rotate_rotarg_float_il.App/App$Node Rotate_rotarg_float_il.App/App$Node::m_leftChild
         IL_01a3:  ldloca.s   V_6
         IL_01a5:  ldloca.s   V_6
-        IL_01a7:  call       instance void Rotate.App/App$Node::rotateTree(float32&,
+        IL_01a7:  call       instance void Rotate_rotarg_float_il.App/App$Node::rotateTree(float32&,
                                                                            float32&)
         IL_01ac:  ldarg.2
         IL_01ad:  ldind.r4
         IL_01ae:  ldarg.0
-        IL_01af:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_01b4:  ldfld      float32 Rotate.App/App$Node::m_weight
+        IL_01af:  ldfld      class Rotate_rotarg_float_il.App/App$Node Rotate_rotarg_float_il.App/App$Node::m_leftChild
+        IL_01b4:  ldfld      float32 Rotate_rotarg_float_il.App/App$Node::m_weight
         IL_01b9:  beq.s      IL_01cb
 
         IL_01bb:  ldstr      "right weight do not match."
@@ -308,7 +308,7 @@
 
     .field public static int32 s_weightCount
     .field public static int32 s_objCount
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -317,22 +317,22 @@
       .entrypoint
       // Code size       47 (0x2f)
       .maxstack  3
-      .locals (class Rotate.App/App$Node V_0)
-      IL_0000:  newobj     instance void Rotate.App/App$Node::.ctor()
+      .locals (class Rotate_rotarg_float_il.App/App$Node V_0)
+      IL_0000:  newobj     instance void Rotate_rotarg_float_il.App/App$Node::.ctor()
       IL_0005:  stloc.0
       IL_0006:  ldloc.0
       IL_0007:  ldc.i4.4
       IL_0008:  ldnull
-      IL_000d:  call       instance void Rotate.App/App$Node::growTree(int32,
+      IL_000d:  call       instance void Rotate_rotarg_float_il.App/App$Node::growTree(int32,
                                                                        class System.String)
       IL_0012:  ldloc.0
       IL_0013:  ldloc.0
-      IL_0014:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-      IL_0019:  ldflda     float32 Rotate.App/App$Node::m_weight
+      IL_0014:  ldfld      class Rotate_rotarg_float_il.App/App$Node Rotate_rotarg_float_il.App/App$Node::m_leftChild
+      IL_0019:  ldflda     float32 Rotate_rotarg_float_il.App/App$Node::m_weight
       IL_001e:  ldloc.0
-      IL_001f:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-      IL_0024:  ldflda     float32 Rotate.App/App$Node::m_weight
-      IL_0029:  call       instance void Rotate.App/App$Node::rotateTree(float32&,
+      IL_001f:  ldfld      class Rotate_rotarg_float_il.App/App$Node Rotate_rotarg_float_il.App/App$Node::m_rightChild
+      IL_0024:  ldflda     float32 Rotate_rotarg_float_il.App/App$Node::m_weight
+      IL_0029:  call       instance void Rotate_rotarg_float_il.App/App$Node::rotateTree(float32&,
                                                                          float32&)
       IL_002e:  ldc.i4    0x64
       IL_0033:  ret
@@ -344,9 +344,9 @@
       // Code size       13 (0xd)
       .maxstack  8
       IL_0000:  ldc.i4.1
-      IL_0001:  stsfld     int32 Rotate.App::s_weightCount
+      IL_0001:  stsfld     int32 Rotate_rotarg_float_il.App::s_weightCount
       IL_0006:  ldc.i4.0
-      IL_0007:  stsfld     int32 Rotate.App::s_objCount
+      IL_0007:  stsfld     int32 Rotate_rotarg_float_il.App::s_objCount
       IL_000c:  ret
     } // end of method 'App::.cctor'
 
@@ -362,6 +362,6 @@
 
   } // end of class 'App'
 
-} // end of namespace 'Rotate'
+} // end of namespace 'Rotate_rotarg_float_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotarg_float_d.csproj b/src/tests/JIT/Methodical/explicit/rotate/rotarg_float_d.csproj
index c0146fab337330..007778b47ff6d4 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotarg_float_d.csproj
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotarg_float_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotarg_float_do.csproj b/src/tests/JIT/Methodical/explicit/rotate/rotarg_float_do.csproj
index d7d15a7ff35f59..1b5d2cd0b922ae 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotarg_float_do.csproj
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotarg_float_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotarg_float_il_d.ilproj b/src/tests/JIT/Methodical/explicit/rotate/rotarg_float_il_d.ilproj
index b9aa0bad8564cd..e879cab61b53cb 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotarg_float_il_d.ilproj
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotarg_float_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotarg_float_il_r.ilproj b/src/tests/JIT/Methodical/explicit/rotate/rotarg_float_il_r.ilproj
index 2f6909d99609a1..92d05f1d6d763d 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotarg_float_il_r.ilproj
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotarg_float_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotarg_float_r.csproj b/src/tests/JIT/Methodical/explicit/rotate/rotarg_float_r.csproj
index 109fc8510591ed..f02ecdccb6f9d3 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotarg_float_r.csproj
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotarg_float_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotarg_float_ro.csproj b/src/tests/JIT/Methodical/explicit/rotate/rotarg_float_ro.csproj
index 558fbd7bf08d72..99253bd7724337 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotarg_float_ro.csproj
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotarg_float_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotarg_objref.cs b/src/tests/JIT/Methodical/explicit/rotate/rotarg_objref.cs
index 63ce64d826be2f..5bbb3909521d07 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotarg_objref.cs
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotarg_objref.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace Rotate
+namespace Rotate_rotarg_objref_cs
 {
-    internal class App
+    public class App
     {
         public static int s_weightCount = 1;
         public static int s_objCount = 0;
@@ -116,7 +117,8 @@ public void rotateTree(ref Weight leftWeight, ref Weight rightWeight)
             }
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             Node root = new Node();
             root.growTree(4, "");
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotarg_objref.il b/src/tests/JIT/Methodical/explicit/rotate/rotarg_objref.il
index 24bc2b486a2534..6220f94f9d4703 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotarg_objref.il
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotarg_objref.il
@@ -19,9 +19,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {163DF86C-2BE3-4ACE-B98C-6AF0382DBFD1}
-.namespace Rotate
+.namespace Rotate_rotarg_objref_il
 {
-  .class private auto ansi App extends ['mscorlib']System.Object
+  .class public auto ansi App extends ['mscorlib']System.Object
   {
     .class auto ansi nested private App$Weight extends ['mscorlib']System.Object
     {
@@ -35,7 +35,7 @@
         IL_0001:  call       instance void ['mscorlib']System.Object::.ctor()
         IL_0006:  ldarg.0
         IL_0007:  ldarg.1
-        IL_0008:  stfld      int32 Rotate.App/App$Weight::m_value
+        IL_0008:  stfld      int32 Rotate_rotarg_objref_il.App/App$Weight::m_value
         IL_000d:  ret
       } // end of method 'App$Weight::.ctor'
 
@@ -43,9 +43,9 @@
 
     .class auto ansi nested private App$Node extends ['mscorlib']System.Object
     {
-      .field public class Rotate.App/App$Weight m_weight
-      .field public class Rotate.App/App$Node m_leftChild
-      .field public class Rotate.App/App$Node m_rightChild
+      .field public class Rotate_rotarg_objref_il.App/App$Weight m_weight
+      .field public class Rotate_rotarg_objref_il.App/App$Node m_leftChild
+      .field public class Rotate_rotarg_objref_il.App/App$Node m_rightChild
       .method public hidebysig specialname rtspecialname 
               instance void .ctor() il managed
       {
@@ -53,18 +53,18 @@
         .maxstack  8
         IL_0000:  ldarg.0
         IL_0001:  call       instance void ['mscorlib']System.Object::.ctor()
-        IL_0006:  ldsfld     int32 Rotate.App::s_objCount
+        IL_0006:  ldsfld     int32 Rotate_rotarg_objref_il.App::s_objCount
         IL_000b:  ldc.i4.1
         IL_000c:  add
-        IL_000d:  stsfld     int32 Rotate.App::s_objCount
+        IL_000d:  stsfld     int32 Rotate_rotarg_objref_il.App::s_objCount
         IL_0012:  ldarg.0
-        IL_0013:  ldsfld     int32 Rotate.App::s_weightCount
+        IL_0013:  ldsfld     int32 Rotate_rotarg_objref_il.App::s_weightCount
         IL_0018:  dup
         IL_0019:  ldc.i4.1
         IL_001a:  add
-        IL_001b:  stsfld     int32 Rotate.App::s_weightCount
-        IL_0020:  newobj     instance void Rotate.App/App$Weight::.ctor(int32)
-        IL_0025:  stfld      class Rotate.App/App$Weight Rotate.App/App$Node::m_weight
+        IL_001b:  stsfld     int32 Rotate_rotarg_objref_il.App::s_weightCount
+        IL_0020:  newobj     instance void Rotate_rotarg_objref_il.App/App$Weight::.ctor(int32)
+        IL_0025:  stfld      class Rotate_rotarg_objref_il.App/App$Weight Rotate_rotarg_objref_il.App/App$Node::m_weight
         IL_002a:  ret
       } // end of method 'App$Node::.ctor'
 
@@ -73,10 +73,10 @@
       {
         // Code size       13 (0xd)
         .maxstack  8
-        IL_0000:  ldsfld     int32 Rotate.App::s_objCount
+        IL_0000:  ldsfld     int32 Rotate_rotarg_objref_il.App::s_objCount
         IL_0005:  ldc.i4.1
         IL_0006:  sub
-        IL_0007:  stsfld     int32 Rotate.App::s_objCount
+        IL_0007:  stsfld     int32 Rotate_rotarg_objref_il.App::s_objCount
         IL_000c:  ret
       } // end of method 'App$Node::Finalize'
 
@@ -86,16 +86,16 @@
       {
         // Code size       95 (0x5f)
         .maxstack  4
-        .locals (class Rotate.App/App$Node V_0)
+        .locals (class Rotate_rotarg_objref_il.App/App$Node V_0)
         IL_0000:  ldarg.1
         IL_0001:  ldc.i4.0
         IL_0002:  ble.s      IL_004e
 
         IL_0004:  ldarg.0
-        IL_0005:  newobj     instance void Rotate.App/App$Node::.ctor()
-        IL_000a:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_0005:  newobj     instance void Rotate_rotarg_objref_il.App/App$Node::.ctor()
+        IL_000a:  stfld      class Rotate_rotarg_objref_il.App/App$Node Rotate_rotarg_objref_il.App/App$Node::m_leftChild
         IL_000f:  ldarg.0
-        IL_0010:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_0010:  ldfld      class Rotate_rotarg_objref_il.App/App$Node Rotate_rotarg_objref_il.App/App$Node::m_leftChild
         IL_0015:  ldarg.1
         IL_0016:  ldc.i4.1
         IL_0017:  sub
@@ -103,13 +103,13 @@
         IL_0019:  ldstr      " "
         IL_001e:  call       class System.String ['mscorlib']System.String::Concat(class System.String,
                                                                                    class System.String)
-        IL_0023:  call       instance void Rotate.App/App$Node::growTree(int32,
+        IL_0023:  call       instance void Rotate_rotarg_objref_il.App/App$Node::growTree(int32,
                                                                          class System.String)
         IL_0028:  ldarg.0
-        IL_0029:  newobj     instance void Rotate.App/App$Node::.ctor()
-        IL_002e:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_0029:  newobj     instance void Rotate_rotarg_objref_il.App/App$Node::.ctor()
+        IL_002e:  stfld      class Rotate_rotarg_objref_il.App/App$Node Rotate_rotarg_objref_il.App/App$Node::m_rightChild
         IL_0033:  ldarg.0
-        IL_0034:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_0034:  ldfld      class Rotate_rotarg_objref_il.App/App$Node Rotate_rotarg_objref_il.App/App$Node::m_rightChild
         IL_0039:  ldarg.1
         IL_003a:  ldc.i4.1
         IL_003b:  sub
@@ -117,7 +117,7 @@
         IL_003d:  ldstr      " "
         IL_0042:  call       class System.String ['mscorlib']System.String::Concat(class System.String,
                                                                                    class System.String)
-        IL_0047:  call       instance void Rotate.App/App$Node::growTree(int32,
+        IL_0047:  call       instance void Rotate_rotarg_objref_il.App/App$Node::growTree(int32,
                                                                          class System.String)
         IL_004c:  br.s       IL_005e
 
@@ -126,36 +126,36 @@
         IL_0050:  ldnull
         IL_0051:  dup
         IL_0052:  stloc.0
-        IL_0053:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_0053:  stfld      class Rotate_rotarg_objref_il.App/App$Node Rotate_rotarg_objref_il.App/App$Node::m_rightChild
         IL_0058:  ldloc.0
-        IL_0059:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_0059:  stfld      class Rotate_rotarg_objref_il.App/App$Node Rotate_rotarg_objref_il.App/App$Node::m_leftChild
         IL_005e:  ret
       } // end of method 'App$Node::growTree'
 
       .method public hidebysig instance void 
-              rotateTree(class Rotate.App/App$Weight& leftWeight,
-                         class Rotate.App/App$Weight& rightWeight) il managed
+              rotateTree(class Rotate_rotarg_objref_il.App/App$Weight& leftWeight,
+                         class Rotate_rotarg_objref_il.App/App$Weight& rightWeight) il managed
       {
         // Code size       452 (0x1c4)
         .maxstack  3
-        .locals (class Rotate.App/App$Node V_0,
-                 class Rotate.App/App$Node V_1,
+        .locals (class Rotate_rotarg_objref_il.App/App$Node V_0,
+                 class Rotate_rotarg_objref_il.App/App$Node V_1,
                  int32 V_2,
                  int32 V_3,
                  int32[] V_4,
-                 class Rotate.App/App$Weight V_5,
-                 class Rotate.App/App$Weight V_6)
+                 class Rotate_rotarg_objref_il.App/App$Weight V_5,
+                 class Rotate_rotarg_objref_il.App/App$Weight V_6)
         IL_0000:  ldnull
         IL_0001:  stloc.0
         IL_0002:  ldnull
         IL_0003:  stloc.1
-        IL_0004:  ldsfld     int32 Rotate.App::s_objCount
+        IL_0004:  ldsfld     int32 Rotate_rotarg_objref_il.App::s_objCount
         IL_0009:  stloc.2
         IL_000a:  ldarg.0
-        IL_000b:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_000b:  ldfld      class Rotate_rotarg_objref_il.App/App$Node Rotate_rotarg_objref_il.App/App$Node::m_leftChild
         IL_0010:  brfalse.s  IL_004f
 
-        IL_0012:  newobj     instance void Rotate.App/App$Node::.ctor()
+        IL_0012:  newobj     instance void Rotate_rotarg_objref_il.App/App$Node::.ctor()
         IL_0017:  stloc.1
         IL_0018:  ldloc.2
         IL_0019:  ldc.i4.1
@@ -163,24 +163,24 @@
         IL_001b:  stloc.2
         IL_001c:  ldloc.1
         IL_001d:  ldarg.0
-        IL_001e:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_0023:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_0028:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_001e:  ldfld      class Rotate_rotarg_objref_il.App/App$Node Rotate_rotarg_objref_il.App/App$Node::m_leftChild
+        IL_0023:  ldfld      class Rotate_rotarg_objref_il.App/App$Node Rotate_rotarg_objref_il.App/App$Node::m_leftChild
+        IL_0028:  stfld      class Rotate_rotarg_objref_il.App/App$Node Rotate_rotarg_objref_il.App/App$Node::m_leftChild
         IL_002d:  ldloc.1
         IL_002e:  ldarg.0
-        IL_002f:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_0034:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_0039:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_002f:  ldfld      class Rotate_rotarg_objref_il.App/App$Node Rotate_rotarg_objref_il.App/App$Node::m_leftChild
+        IL_0034:  ldfld      class Rotate_rotarg_objref_il.App/App$Node Rotate_rotarg_objref_il.App/App$Node::m_rightChild
+        IL_0039:  stfld      class Rotate_rotarg_objref_il.App/App$Node Rotate_rotarg_objref_il.App/App$Node::m_rightChild
         IL_003e:  ldloc.1
         IL_003f:  ldarg.0
-        IL_0040:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_0045:  ldfld      class Rotate.App/App$Weight Rotate.App/App$Node::m_weight
-        IL_004a:  stfld      class Rotate.App/App$Weight Rotate.App/App$Node::m_weight
+        IL_0040:  ldfld      class Rotate_rotarg_objref_il.App/App$Node Rotate_rotarg_objref_il.App/App$Node::m_leftChild
+        IL_0045:  ldfld      class Rotate_rotarg_objref_il.App/App$Weight Rotate_rotarg_objref_il.App/App$Node::m_weight
+        IL_004a:  stfld      class Rotate_rotarg_objref_il.App/App$Weight Rotate_rotarg_objref_il.App/App$Node::m_weight
         IL_004f:  ldarg.0
-        IL_0050:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_0050:  ldfld      class Rotate_rotarg_objref_il.App/App$Node Rotate_rotarg_objref_il.App/App$Node::m_rightChild
         IL_0055:  brfalse.s  IL_0094
 
-        IL_0057:  newobj     instance void Rotate.App/App$Node::.ctor()
+        IL_0057:  newobj     instance void Rotate_rotarg_objref_il.App/App$Node::.ctor()
         IL_005c:  stloc.0
         IL_005d:  ldloc.2
         IL_005e:  ldc.i4.1
@@ -188,25 +188,25 @@
         IL_0060:  stloc.2
         IL_0061:  ldloc.0
         IL_0062:  ldarg.0
-        IL_0063:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_0068:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_006d:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_0063:  ldfld      class Rotate_rotarg_objref_il.App/App$Node Rotate_rotarg_objref_il.App/App$Node::m_rightChild
+        IL_0068:  ldfld      class Rotate_rotarg_objref_il.App/App$Node Rotate_rotarg_objref_il.App/App$Node::m_leftChild
+        IL_006d:  stfld      class Rotate_rotarg_objref_il.App/App$Node Rotate_rotarg_objref_il.App/App$Node::m_leftChild
         IL_0072:  ldloc.0
         IL_0073:  ldarg.0
-        IL_0074:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_0079:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_007e:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_0074:  ldfld      class Rotate_rotarg_objref_il.App/App$Node Rotate_rotarg_objref_il.App/App$Node::m_rightChild
+        IL_0079:  ldfld      class Rotate_rotarg_objref_il.App/App$Node Rotate_rotarg_objref_il.App/App$Node::m_rightChild
+        IL_007e:  stfld      class Rotate_rotarg_objref_il.App/App$Node Rotate_rotarg_objref_il.App/App$Node::m_rightChild
         IL_0083:  ldloc.0
         IL_0084:  ldarg.0
-        IL_0085:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_008a:  ldfld      class Rotate.App/App$Weight Rotate.App/App$Node::m_weight
-        IL_008f:  stfld      class Rotate.App/App$Weight Rotate.App/App$Node::m_weight
+        IL_0085:  ldfld      class Rotate_rotarg_objref_il.App/App$Node Rotate_rotarg_objref_il.App/App$Node::m_rightChild
+        IL_008a:  ldfld      class Rotate_rotarg_objref_il.App/App$Weight Rotate_rotarg_objref_il.App/App$Node::m_weight
+        IL_008f:  stfld      class Rotate_rotarg_objref_il.App/App$Weight Rotate_rotarg_objref_il.App/App$Node::m_weight
         IL_0094:  ldarg.0
         IL_0095:  ldloc.0
-        IL_0096:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_0096:  stfld      class Rotate_rotarg_objref_il.App/App$Node Rotate_rotarg_objref_il.App/App$Node::m_leftChild
         IL_009b:  ldarg.0
         IL_009c:  ldloc.1
-        IL_009d:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_009d:  stfld      class Rotate_rotarg_objref_il.App/App$Node Rotate_rotarg_objref_il.App/App$Node::m_rightChild
         IL_00a2:  ldc.i4.0
         IL_00a3:  stloc.3
         IL_00a4:  br.s       IL_00b6
@@ -224,46 +224,46 @@
 
         IL_00be:  call       void ['mscorlib']System.GC::Collect()
         IL_00c3:  ldarg.0
-        IL_00c4:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_00c4:  ldfld      class Rotate_rotarg_objref_il.App/App$Node Rotate_rotarg_objref_il.App/App$Node::m_rightChild
         IL_00c9:  brfalse.s  IL_0143
 
         IL_00cb:  ldarg.0
-        IL_00cc:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_00d1:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_00cc:  ldfld      class Rotate_rotarg_objref_il.App/App$Node Rotate_rotarg_objref_il.App/App$Node::m_rightChild
+        IL_00d1:  ldfld      class Rotate_rotarg_objref_il.App/App$Node Rotate_rotarg_objref_il.App/App$Node::m_leftChild
         IL_00d6:  brfalse.s  IL_0112
 
         IL_00d8:  ldarg.0
-        IL_00d9:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_00de:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_00d9:  ldfld      class Rotate_rotarg_objref_il.App/App$Node Rotate_rotarg_objref_il.App/App$Node::m_rightChild
+        IL_00de:  ldfld      class Rotate_rotarg_objref_il.App/App$Node Rotate_rotarg_objref_il.App/App$Node::m_rightChild
         IL_00e3:  brfalse.s  IL_0112
 
         IL_00e5:  ldarg.0
-        IL_00e6:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_00e6:  ldfld      class Rotate_rotarg_objref_il.App/App$Node Rotate_rotarg_objref_il.App/App$Node::m_rightChild
         IL_00eb:  ldarg.0
-        IL_00ec:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_00f1:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_00f6:  ldflda     class Rotate.App/App$Weight Rotate.App/App$Node::m_weight
+        IL_00ec:  ldfld      class Rotate_rotarg_objref_il.App/App$Node Rotate_rotarg_objref_il.App/App$Node::m_rightChild
+        IL_00f1:  ldfld      class Rotate_rotarg_objref_il.App/App$Node Rotate_rotarg_objref_il.App/App$Node::m_leftChild
+        IL_00f6:  ldflda     class Rotate_rotarg_objref_il.App/App$Weight Rotate_rotarg_objref_il.App/App$Node::m_weight
         IL_00fb:  ldarg.0
-        IL_00fc:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_0101:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_0106:  ldflda     class Rotate.App/App$Weight Rotate.App/App$Node::m_weight
-        IL_010b:  call       instance void Rotate.App/App$Node::rotateTree(class Rotate.App/App$Weight&,
-                                                                           class Rotate.App/App$Weight&)
+        IL_00fc:  ldfld      class Rotate_rotarg_objref_il.App/App$Node Rotate_rotarg_objref_il.App/App$Node::m_rightChild
+        IL_0101:  ldfld      class Rotate_rotarg_objref_il.App/App$Node Rotate_rotarg_objref_il.App/App$Node::m_rightChild
+        IL_0106:  ldflda     class Rotate_rotarg_objref_il.App/App$Weight Rotate_rotarg_objref_il.App/App$Node::m_weight
+        IL_010b:  call       instance void Rotate_rotarg_objref_il.App/App$Node::rotateTree(class Rotate_rotarg_objref_il.App/App$Weight&,
+                                                                           class Rotate_rotarg_objref_il.App/App$Weight&)
         IL_0110:  br.s       IL_0124
 
         IL_0112:  ldnull
         IL_0113:  stloc.s    V_5
         IL_0115:  ldarg.0
-        IL_0116:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_0116:  ldfld      class Rotate_rotarg_objref_il.App/App$Node Rotate_rotarg_objref_il.App/App$Node::m_rightChild
         IL_011b:  ldloca.s   V_5
         IL_011d:  ldloca.s   V_5
-        IL_011f:  call       instance void Rotate.App/App$Node::rotateTree(class Rotate.App/App$Weight&,
-                                                                           class Rotate.App/App$Weight&)
+        IL_011f:  call       instance void Rotate_rotarg_objref_il.App/App$Node::rotateTree(class Rotate_rotarg_objref_il.App/App$Weight&,
+                                                                           class Rotate_rotarg_objref_il.App/App$Weight&)
         IL_0124:  ldarg.1
         IL_0125:  ldind.ref
         IL_0126:  ldarg.0
-        IL_0127:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_012c:  ldfld      class Rotate.App/App$Weight Rotate.App/App$Node::m_weight
+        IL_0127:  ldfld      class Rotate_rotarg_objref_il.App/App$Node Rotate_rotarg_objref_il.App/App$Node::m_rightChild
+        IL_012c:  ldfld      class Rotate_rotarg_objref_il.App/App$Weight Rotate_rotarg_objref_il.App/App$Node::m_weight
         IL_0131:  beq.s      IL_0143
 
         IL_0133:  ldstr      "left weight do not match."
@@ -272,46 +272,46 @@
         IL_0142:  throw
 
         IL_0143:  ldarg.0
-        IL_0144:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_0144:  ldfld      class Rotate_rotarg_objref_il.App/App$Node Rotate_rotarg_objref_il.App/App$Node::m_leftChild
         IL_0149:  brfalse.s  IL_01c3
 
         IL_014b:  ldarg.0
-        IL_014c:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_0151:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_014c:  ldfld      class Rotate_rotarg_objref_il.App/App$Node Rotate_rotarg_objref_il.App/App$Node::m_leftChild
+        IL_0151:  ldfld      class Rotate_rotarg_objref_il.App/App$Node Rotate_rotarg_objref_il.App/App$Node::m_leftChild
         IL_0156:  brfalse.s  IL_0192
 
         IL_0158:  ldarg.0
-        IL_0159:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_015e:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_0159:  ldfld      class Rotate_rotarg_objref_il.App/App$Node Rotate_rotarg_objref_il.App/App$Node::m_leftChild
+        IL_015e:  ldfld      class Rotate_rotarg_objref_il.App/App$Node Rotate_rotarg_objref_il.App/App$Node::m_rightChild
         IL_0163:  brfalse.s  IL_0192
 
         IL_0165:  ldarg.0
-        IL_0166:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_0166:  ldfld      class Rotate_rotarg_objref_il.App/App$Node Rotate_rotarg_objref_il.App/App$Node::m_leftChild
         IL_016b:  ldarg.0
-        IL_016c:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_0171:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_0176:  ldflda     class Rotate.App/App$Weight Rotate.App/App$Node::m_weight
+        IL_016c:  ldfld      class Rotate_rotarg_objref_il.App/App$Node Rotate_rotarg_objref_il.App/App$Node::m_leftChild
+        IL_0171:  ldfld      class Rotate_rotarg_objref_il.App/App$Node Rotate_rotarg_objref_il.App/App$Node::m_leftChild
+        IL_0176:  ldflda     class Rotate_rotarg_objref_il.App/App$Weight Rotate_rotarg_objref_il.App/App$Node::m_weight
         IL_017b:  ldarg.0
-        IL_017c:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_0181:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_0186:  ldflda     class Rotate.App/App$Weight Rotate.App/App$Node::m_weight
-        IL_018b:  call       instance void Rotate.App/App$Node::rotateTree(class Rotate.App/App$Weight&,
-                                                                           class Rotate.App/App$Weight&)
+        IL_017c:  ldfld      class Rotate_rotarg_objref_il.App/App$Node Rotate_rotarg_objref_il.App/App$Node::m_leftChild
+        IL_0181:  ldfld      class Rotate_rotarg_objref_il.App/App$Node Rotate_rotarg_objref_il.App/App$Node::m_rightChild
+        IL_0186:  ldflda     class Rotate_rotarg_objref_il.App/App$Weight Rotate_rotarg_objref_il.App/App$Node::m_weight
+        IL_018b:  call       instance void Rotate_rotarg_objref_il.App/App$Node::rotateTree(class Rotate_rotarg_objref_il.App/App$Weight&,
+                                                                           class Rotate_rotarg_objref_il.App/App$Weight&)
         IL_0190:  br.s       IL_01a4
 
         IL_0192:  ldnull
         IL_0193:  stloc.s    V_6
         IL_0195:  ldarg.0
-        IL_0196:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_0196:  ldfld      class Rotate_rotarg_objref_il.App/App$Node Rotate_rotarg_objref_il.App/App$Node::m_leftChild
         IL_019b:  ldloca.s   V_6
         IL_019d:  ldloca.s   V_6
-        IL_019f:  call       instance void Rotate.App/App$Node::rotateTree(class Rotate.App/App$Weight&,
-                                                                           class Rotate.App/App$Weight&)
+        IL_019f:  call       instance void Rotate_rotarg_objref_il.App/App$Node::rotateTree(class Rotate_rotarg_objref_il.App/App$Weight&,
+                                                                           class Rotate_rotarg_objref_il.App/App$Weight&)
         IL_01a4:  ldarg.2
         IL_01a5:  ldind.ref
         IL_01a6:  ldarg.0
-        IL_01a7:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_01ac:  ldfld      class Rotate.App/App$Weight Rotate.App/App$Node::m_weight
+        IL_01a7:  ldfld      class Rotate_rotarg_objref_il.App/App$Node Rotate_rotarg_objref_il.App/App$Node::m_leftChild
+        IL_01ac:  ldfld      class Rotate_rotarg_objref_il.App/App$Weight Rotate_rotarg_objref_il.App/App$Node::m_weight
         IL_01b1:  beq.s      IL_01c3
 
         IL_01b3:  ldstr      "right weight do not match."
@@ -326,7 +326,7 @@
 
     .field public static int32 s_weightCount
     .field public static int32 s_objCount
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -335,23 +335,23 @@
       .entrypoint
       // Code size       47 (0x2f)
       .maxstack  3
-      .locals (class Rotate.App/App$Node V_0)
-      IL_0000:  newobj     instance void Rotate.App/App$Node::.ctor()
+      .locals (class Rotate_rotarg_objref_il.App/App$Node V_0)
+      IL_0000:  newobj     instance void Rotate_rotarg_objref_il.App/App$Node::.ctor()
       IL_0005:  stloc.0
       IL_0006:  ldloc.0
       IL_0007:  ldc.i4.4
       IL_0008:  ldnull
-      IL_000d:  call       instance void Rotate.App/App$Node::growTree(int32,
+      IL_000d:  call       instance void Rotate_rotarg_objref_il.App/App$Node::growTree(int32,
                                                                        class System.String)
       IL_0012:  ldloc.0
       IL_0013:  ldloc.0
-      IL_0014:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-      IL_0019:  ldflda     class Rotate.App/App$Weight Rotate.App/App$Node::m_weight
+      IL_0014:  ldfld      class Rotate_rotarg_objref_il.App/App$Node Rotate_rotarg_objref_il.App/App$Node::m_leftChild
+      IL_0019:  ldflda     class Rotate_rotarg_objref_il.App/App$Weight Rotate_rotarg_objref_il.App/App$Node::m_weight
       IL_001e:  ldloc.0
-      IL_001f:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-      IL_0024:  ldflda     class Rotate.App/App$Weight Rotate.App/App$Node::m_weight
-      IL_0029:  call       instance void Rotate.App/App$Node::rotateTree(class Rotate.App/App$Weight&,
-                                                                         class Rotate.App/App$Weight&)
+      IL_001f:  ldfld      class Rotate_rotarg_objref_il.App/App$Node Rotate_rotarg_objref_il.App/App$Node::m_rightChild
+      IL_0024:  ldflda     class Rotate_rotarg_objref_il.App/App$Weight Rotate_rotarg_objref_il.App/App$Node::m_weight
+      IL_0029:  call       instance void Rotate_rotarg_objref_il.App/App$Node::rotateTree(class Rotate_rotarg_objref_il.App/App$Weight&,
+                                                                         class Rotate_rotarg_objref_il.App/App$Weight&)
       IL_002e:  ldc.i4    0x64
       IL_0033:  ret
     } // end of method 'App::Main'
@@ -362,9 +362,9 @@
       // Code size       13 (0xd)
       .maxstack  8
       IL_0000:  ldc.i4.1
-      IL_0001:  stsfld     int32 Rotate.App::s_weightCount
+      IL_0001:  stsfld     int32 Rotate_rotarg_objref_il.App::s_weightCount
       IL_0006:  ldc.i4.0
-      IL_0007:  stsfld     int32 Rotate.App::s_objCount
+      IL_0007:  stsfld     int32 Rotate_rotarg_objref_il.App::s_objCount
       IL_000c:  ret
     } // end of method 'App::.cctor'
 
@@ -380,6 +380,6 @@
 
   } // end of class 'App'
 
-} // end of namespace 'Rotate'
+} // end of namespace 'Rotate_rotarg_objref_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotarg_objref_d.csproj b/src/tests/JIT/Methodical/explicit/rotate/rotarg_objref_d.csproj
index fe83fbf8e37d94..5de9202db680cc 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotarg_objref_d.csproj
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotarg_objref_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotarg_objref_do.csproj b/src/tests/JIT/Methodical/explicit/rotate/rotarg_objref_do.csproj
index baf44703dfdc64..f96b5bf64a63a4 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotarg_objref_do.csproj
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotarg_objref_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotarg_objref_il_d.ilproj b/src/tests/JIT/Methodical/explicit/rotate/rotarg_objref_il_d.ilproj
index 2a8e958e529267..edb37498285b93 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotarg_objref_il_d.ilproj
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotarg_objref_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotarg_objref_il_r.ilproj b/src/tests/JIT/Methodical/explicit/rotate/rotarg_objref_il_r.ilproj
index e0235e2dc0e01c..22e04dbf80aafa 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotarg_objref_il_r.ilproj
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotarg_objref_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotarg_objref_r.csproj b/src/tests/JIT/Methodical/explicit/rotate/rotarg_objref_r.csproj
index e9e6decaa5aca8..3ba0389419f1bf 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotarg_objref_r.csproj
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotarg_objref_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotarg_objref_ro.csproj b/src/tests/JIT/Methodical/explicit/rotate/rotarg_objref_ro.csproj
index 063cf744fd2bf1..5066a3f95356f7 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotarg_objref_ro.csproj
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotarg_objref_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotarg_valref.cs b/src/tests/JIT/Methodical/explicit/rotate/rotarg_valref.cs
index 4080273bb7cfc6..d41bc06ca19d4c 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotarg_valref.cs
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotarg_valref.cs
@@ -2,8 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace Rotate
+namespace Rotate_rotarg_valref_cs
 {
     public struct Weight
     {
@@ -14,7 +15,7 @@ public struct Weight
         public Object m_padding3;
     }
 
-    internal class App
+    public class App
     {
         public static int s_weightCount = 1;
         public static int s_objCount = 0;
@@ -119,7 +120,8 @@ public void rotateTree(ref Weight leftWeight, ref Weight rightWeight)
             }
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             Node root = new Node();
             root.growTree(4, "");
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotarg_valref.il b/src/tests/JIT/Methodical/explicit/rotate/rotarg_valref.il
index 0c89cf9bbda089..805e572b8a7f02 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotarg_valref.il
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotarg_valref.il
@@ -19,7 +19,7 @@
 }
 .assembly extern xunit.core {}
 // MVID: {674E1F39-687D-4762-9954-BB9254236385}
-.namespace Rotate
+.namespace Rotate_rotarg_valref_il
 {
   .class value private auto ansi sealed Weight extends ['mscorlib']System.ValueType
   {
@@ -34,28 +34,28 @@
       .maxstack  8
       IL_0000:  ldarg.0
       IL_0001:  ldarg.1
-      IL_0002:  stfld      int32 Rotate.Weight::m_value
+      IL_0002:  stfld      int32 Rotate_rotarg_valref_il.Weight::m_value
       IL_0007:  ldarg.0
       IL_0008:  ldc.i4.s   48
-      IL_000a:  stfld      wchar Rotate.Weight::m_padding1
+      IL_000a:  stfld      wchar Rotate_rotarg_valref_il.Weight::m_padding1
       IL_000f:  ldarg.0
       IL_0010:  ldnull
-      IL_0015:  stfld      class System.String Rotate.Weight::m_padding2
+      IL_0015:  stfld      class System.String Rotate_rotarg_valref_il.Weight::m_padding2
       IL_001a:  ldarg.0
-      IL_001b:  newobj     instance void Rotate.App::.ctor()
-      IL_0020:  stfld      class System.Object Rotate.Weight::m_padding3
+      IL_001b:  newobj     instance void Rotate_rotarg_valref_il.App::.ctor()
+      IL_0020:  stfld      class System.Object Rotate_rotarg_valref_il.Weight::m_padding3
       IL_0025:  ret
     } // end of method 'Weight::.ctor'
 
   } // end of class 'Weight'
 
-  .class private auto ansi App extends ['mscorlib']System.Object
+  .class public auto ansi App extends ['mscorlib']System.Object
   {
     .class auto ansi nested private App$Node extends ['mscorlib']System.Object
     {
-      .field public value class Rotate.Weight m_weight
-      .field public class Rotate.App/App$Node m_leftChild
-      .field public class Rotate.App/App$Node m_rightChild
+      .field public value class Rotate_rotarg_valref_il.Weight m_weight
+      .field public class Rotate_rotarg_valref_il.App/App$Node m_leftChild
+      .field public class Rotate_rotarg_valref_il.App/App$Node m_rightChild
       .method public hidebysig specialname rtspecialname 
               instance void .ctor() il managed
       {
@@ -63,18 +63,18 @@
         .maxstack  8
         IL_0000:  ldarg.0
         IL_0001:  call       instance void ['mscorlib']System.Object::.ctor()
-        IL_0006:  ldsfld     int32 Rotate.App::s_objCount
+        IL_0006:  ldsfld     int32 Rotate_rotarg_valref_il.App::s_objCount
         IL_000b:  ldc.i4.1
         IL_000c:  add
-        IL_000d:  stsfld     int32 Rotate.App::s_objCount
+        IL_000d:  stsfld     int32 Rotate_rotarg_valref_il.App::s_objCount
         IL_0012:  ldarg.0
-        IL_0013:  ldflda     value class Rotate.Weight Rotate.App/App$Node::m_weight
-        IL_0018:  ldsfld     int32 Rotate.App::s_weightCount
+        IL_0013:  ldflda     value class Rotate_rotarg_valref_il.Weight Rotate_rotarg_valref_il.App/App$Node::m_weight
+        IL_0018:  ldsfld     int32 Rotate_rotarg_valref_il.App::s_weightCount
         IL_001d:  dup
         IL_001e:  ldc.i4.1
         IL_001f:  add
-        IL_0020:  stsfld     int32 Rotate.App::s_weightCount
-        IL_0025:  call       instance void Rotate.Weight::.ctor(int32)
+        IL_0020:  stsfld     int32 Rotate_rotarg_valref_il.App::s_weightCount
+        IL_0025:  call       instance void Rotate_rotarg_valref_il.Weight::.ctor(int32)
         IL_002a:  ret
       } // end of method 'App$Node::.ctor'
 
@@ -83,10 +83,10 @@
       {
         // Code size       13 (0xd)
         .maxstack  8
-        IL_0000:  ldsfld     int32 Rotate.App::s_objCount
+        IL_0000:  ldsfld     int32 Rotate_rotarg_valref_il.App::s_objCount
         IL_0005:  ldc.i4.1
         IL_0006:  sub
-        IL_0007:  stsfld     int32 Rotate.App::s_objCount
+        IL_0007:  stsfld     int32 Rotate_rotarg_valref_il.App::s_objCount
         IL_000c:  ret
       } // end of method 'App$Node::Finalize'
 
@@ -96,16 +96,16 @@
       {
         // Code size       95 (0x5f)
         .maxstack  4
-        .locals (class Rotate.App/App$Node V_0)
+        .locals (class Rotate_rotarg_valref_il.App/App$Node V_0)
         IL_0000:  ldarg.1
         IL_0001:  ldc.i4.0
         IL_0002:  ble.s      IL_004e
 
         IL_0004:  ldarg.0
-        IL_0005:  newobj     instance void Rotate.App/App$Node::.ctor()
-        IL_000a:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_0005:  newobj     instance void Rotate_rotarg_valref_il.App/App$Node::.ctor()
+        IL_000a:  stfld      class Rotate_rotarg_valref_il.App/App$Node Rotate_rotarg_valref_il.App/App$Node::m_leftChild
         IL_000f:  ldarg.0
-        IL_0010:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_0010:  ldfld      class Rotate_rotarg_valref_il.App/App$Node Rotate_rotarg_valref_il.App/App$Node::m_leftChild
         IL_0015:  ldarg.1
         IL_0016:  ldc.i4.1
         IL_0017:  sub
@@ -113,13 +113,13 @@
         IL_0019:  ldstr      " "
         IL_001e:  call       class System.String ['mscorlib']System.String::Concat(class System.String,
                                                                                    class System.String)
-        IL_0023:  call       instance void Rotate.App/App$Node::growTree(int32,
+        IL_0023:  call       instance void Rotate_rotarg_valref_il.App/App$Node::growTree(int32,
                                                                          class System.String)
         IL_0028:  ldarg.0
-        IL_0029:  newobj     instance void Rotate.App/App$Node::.ctor()
-        IL_002e:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_0029:  newobj     instance void Rotate_rotarg_valref_il.App/App$Node::.ctor()
+        IL_002e:  stfld      class Rotate_rotarg_valref_il.App/App$Node Rotate_rotarg_valref_il.App/App$Node::m_rightChild
         IL_0033:  ldarg.0
-        IL_0034:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_0034:  ldfld      class Rotate_rotarg_valref_il.App/App$Node Rotate_rotarg_valref_il.App/App$Node::m_rightChild
         IL_0039:  ldarg.1
         IL_003a:  ldc.i4.1
         IL_003b:  sub
@@ -127,7 +127,7 @@
         IL_003d:  ldstr      " "
         IL_0042:  call       class System.String ['mscorlib']System.String::Concat(class System.String,
                                                                                    class System.String)
-        IL_0047:  call       instance void Rotate.App/App$Node::growTree(int32,
+        IL_0047:  call       instance void Rotate_rotarg_valref_il.App/App$Node::growTree(int32,
                                                                          class System.String)
         IL_004c:  br.s       IL_005e
 
@@ -136,36 +136,36 @@
         IL_0050:  ldnull
         IL_0051:  dup
         IL_0052:  stloc.0
-        IL_0053:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_0053:  stfld      class Rotate_rotarg_valref_il.App/App$Node Rotate_rotarg_valref_il.App/App$Node::m_rightChild
         IL_0058:  ldloc.0
-        IL_0059:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_0059:  stfld      class Rotate_rotarg_valref_il.App/App$Node Rotate_rotarg_valref_il.App/App$Node::m_leftChild
         IL_005e:  ret
       } // end of method 'App$Node::growTree'
 
       .method public hidebysig instance void 
-              rotateTree(value class Rotate.Weight& leftWeight,
-                         value class Rotate.Weight& rightWeight) il managed
+              rotateTree(value class Rotate_rotarg_valref_il.Weight& leftWeight,
+                         value class Rotate_rotarg_valref_il.Weight& rightWeight) il managed
       {
         // Code size       486 (0x1e6)
         .maxstack  3
-        .locals (class Rotate.App/App$Node V_0,
-                 class Rotate.App/App$Node V_1,
+        .locals (class Rotate_rotarg_valref_il.App/App$Node V_0,
+                 class Rotate_rotarg_valref_il.App/App$Node V_1,
                  int32 V_2,
                  int32 V_3,
                  int32[] V_4,
-                 value class Rotate.Weight V_5,
-                 value class Rotate.Weight V_6)
+                 value class Rotate_rotarg_valref_il.Weight V_5,
+                 value class Rotate_rotarg_valref_il.Weight V_6)
         IL_0000:  ldnull
         IL_0001:  stloc.0
         IL_0002:  ldnull
         IL_0003:  stloc.1
-        IL_0004:  ldsfld     int32 Rotate.App::s_objCount
+        IL_0004:  ldsfld     int32 Rotate_rotarg_valref_il.App::s_objCount
         IL_0009:  stloc.2
         IL_000a:  ldarg.0
-        IL_000b:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_000b:  ldfld      class Rotate_rotarg_valref_il.App/App$Node Rotate_rotarg_valref_il.App/App$Node::m_leftChild
         IL_0010:  brfalse.s  IL_004f
 
-        IL_0012:  newobj     instance void Rotate.App/App$Node::.ctor()
+        IL_0012:  newobj     instance void Rotate_rotarg_valref_il.App/App$Node::.ctor()
         IL_0017:  stloc.1
         IL_0018:  ldloc.2
         IL_0019:  ldc.i4.1
@@ -173,24 +173,24 @@
         IL_001b:  stloc.2
         IL_001c:  ldloc.1
         IL_001d:  ldarg.0
-        IL_001e:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_0023:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_0028:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_001e:  ldfld      class Rotate_rotarg_valref_il.App/App$Node Rotate_rotarg_valref_il.App/App$Node::m_leftChild
+        IL_0023:  ldfld      class Rotate_rotarg_valref_il.App/App$Node Rotate_rotarg_valref_il.App/App$Node::m_leftChild
+        IL_0028:  stfld      class Rotate_rotarg_valref_il.App/App$Node Rotate_rotarg_valref_il.App/App$Node::m_leftChild
         IL_002d:  ldloc.1
         IL_002e:  ldarg.0
-        IL_002f:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_0034:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_0039:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_002f:  ldfld      class Rotate_rotarg_valref_il.App/App$Node Rotate_rotarg_valref_il.App/App$Node::m_leftChild
+        IL_0034:  ldfld      class Rotate_rotarg_valref_il.App/App$Node Rotate_rotarg_valref_il.App/App$Node::m_rightChild
+        IL_0039:  stfld      class Rotate_rotarg_valref_il.App/App$Node Rotate_rotarg_valref_il.App/App$Node::m_rightChild
         IL_003e:  ldloc.1
         IL_003f:  ldarg.0
-        IL_0040:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_0045:  ldfld      value class Rotate.Weight Rotate.App/App$Node::m_weight
-        IL_004a:  stfld      value class Rotate.Weight Rotate.App/App$Node::m_weight
+        IL_0040:  ldfld      class Rotate_rotarg_valref_il.App/App$Node Rotate_rotarg_valref_il.App/App$Node::m_leftChild
+        IL_0045:  ldfld      value class Rotate_rotarg_valref_il.Weight Rotate_rotarg_valref_il.App/App$Node::m_weight
+        IL_004a:  stfld      value class Rotate_rotarg_valref_il.Weight Rotate_rotarg_valref_il.App/App$Node::m_weight
         IL_004f:  ldarg.0
-        IL_0050:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_0050:  ldfld      class Rotate_rotarg_valref_il.App/App$Node Rotate_rotarg_valref_il.App/App$Node::m_rightChild
         IL_0055:  brfalse.s  IL_0094
 
-        IL_0057:  newobj     instance void Rotate.App/App$Node::.ctor()
+        IL_0057:  newobj     instance void Rotate_rotarg_valref_il.App/App$Node::.ctor()
         IL_005c:  stloc.0
         IL_005d:  ldloc.2
         IL_005e:  ldc.i4.1
@@ -198,25 +198,25 @@
         IL_0060:  stloc.2
         IL_0061:  ldloc.0
         IL_0062:  ldarg.0
-        IL_0063:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_0068:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_006d:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_0063:  ldfld      class Rotate_rotarg_valref_il.App/App$Node Rotate_rotarg_valref_il.App/App$Node::m_rightChild
+        IL_0068:  ldfld      class Rotate_rotarg_valref_il.App/App$Node Rotate_rotarg_valref_il.App/App$Node::m_leftChild
+        IL_006d:  stfld      class Rotate_rotarg_valref_il.App/App$Node Rotate_rotarg_valref_il.App/App$Node::m_leftChild
         IL_0072:  ldloc.0
         IL_0073:  ldarg.0
-        IL_0074:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_0079:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_007e:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_0074:  ldfld      class Rotate_rotarg_valref_il.App/App$Node Rotate_rotarg_valref_il.App/App$Node::m_rightChild
+        IL_0079:  ldfld      class Rotate_rotarg_valref_il.App/App$Node Rotate_rotarg_valref_il.App/App$Node::m_rightChild
+        IL_007e:  stfld      class Rotate_rotarg_valref_il.App/App$Node Rotate_rotarg_valref_il.App/App$Node::m_rightChild
         IL_0083:  ldloc.0
         IL_0084:  ldarg.0
-        IL_0085:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_008a:  ldfld      value class Rotate.Weight Rotate.App/App$Node::m_weight
-        IL_008f:  stfld      value class Rotate.Weight Rotate.App/App$Node::m_weight
+        IL_0085:  ldfld      class Rotate_rotarg_valref_il.App/App$Node Rotate_rotarg_valref_il.App/App$Node::m_rightChild
+        IL_008a:  ldfld      value class Rotate_rotarg_valref_il.Weight Rotate_rotarg_valref_il.App/App$Node::m_weight
+        IL_008f:  stfld      value class Rotate_rotarg_valref_il.Weight Rotate_rotarg_valref_il.App/App$Node::m_weight
         IL_0094:  ldarg.0
         IL_0095:  ldloc.0
-        IL_0096:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_0096:  stfld      class Rotate_rotarg_valref_il.App/App$Node Rotate_rotarg_valref_il.App/App$Node::m_leftChild
         IL_009b:  ldarg.0
         IL_009c:  ldloc.1
-        IL_009d:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_009d:  stfld      class Rotate_rotarg_valref_il.App/App$Node Rotate_rotarg_valref_il.App/App$Node::m_rightChild
         IL_00a2:  ldc.i4.0
         IL_00a3:  stloc.3
         IL_00a4:  br.s       IL_00b6
@@ -234,48 +234,48 @@
 
         IL_00be:  call       void ['mscorlib']System.GC::Collect()
         IL_00c3:  ldarg.0
-        IL_00c4:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_00c4:  ldfld      class Rotate_rotarg_valref_il.App/App$Node Rotate_rotarg_valref_il.App/App$Node::m_rightChild
         IL_00c9:  brfalse    IL_0154
 
         IL_00ce:  ldarg.0
-        IL_00cf:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_00d4:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_00cf:  ldfld      class Rotate_rotarg_valref_il.App/App$Node Rotate_rotarg_valref_il.App/App$Node::m_rightChild
+        IL_00d4:  ldfld      class Rotate_rotarg_valref_il.App/App$Node Rotate_rotarg_valref_il.App/App$Node::m_leftChild
         IL_00d9:  brfalse.s  IL_0115
 
         IL_00db:  ldarg.0
-        IL_00dc:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_00e1:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_00dc:  ldfld      class Rotate_rotarg_valref_il.App/App$Node Rotate_rotarg_valref_il.App/App$Node::m_rightChild
+        IL_00e1:  ldfld      class Rotate_rotarg_valref_il.App/App$Node Rotate_rotarg_valref_il.App/App$Node::m_rightChild
         IL_00e6:  brfalse.s  IL_0115
 
         IL_00e8:  ldarg.0
-        IL_00e9:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_00e9:  ldfld      class Rotate_rotarg_valref_il.App/App$Node Rotate_rotarg_valref_il.App/App$Node::m_rightChild
         IL_00ee:  ldarg.0
-        IL_00ef:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_00f4:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_00f9:  ldflda     value class Rotate.Weight Rotate.App/App$Node::m_weight
+        IL_00ef:  ldfld      class Rotate_rotarg_valref_il.App/App$Node Rotate_rotarg_valref_il.App/App$Node::m_rightChild
+        IL_00f4:  ldfld      class Rotate_rotarg_valref_il.App/App$Node Rotate_rotarg_valref_il.App/App$Node::m_leftChild
+        IL_00f9:  ldflda     value class Rotate_rotarg_valref_il.Weight Rotate_rotarg_valref_il.App/App$Node::m_weight
         IL_00fe:  ldarg.0
-        IL_00ff:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_0104:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_0109:  ldflda     value class Rotate.Weight Rotate.App/App$Node::m_weight
-        IL_010e:  call       instance void Rotate.App/App$Node::rotateTree(value class Rotate.Weight&,
-                                                                           value class Rotate.Weight&)
+        IL_00ff:  ldfld      class Rotate_rotarg_valref_il.App/App$Node Rotate_rotarg_valref_il.App/App$Node::m_rightChild
+        IL_0104:  ldfld      class Rotate_rotarg_valref_il.App/App$Node Rotate_rotarg_valref_il.App/App$Node::m_rightChild
+        IL_0109:  ldflda     value class Rotate_rotarg_valref_il.Weight Rotate_rotarg_valref_il.App/App$Node::m_weight
+        IL_010e:  call       instance void Rotate_rotarg_valref_il.App/App$Node::rotateTree(value class Rotate_rotarg_valref_il.Weight&,
+                                                                           value class Rotate_rotarg_valref_il.Weight&)
         IL_0113:  br.s       IL_012c
 
         IL_0115:  ldloca.s   V_5
         IL_0117:  ldc.i4.0
-        IL_0118:  call       instance void Rotate.Weight::.ctor(int32)
+        IL_0118:  call       instance void Rotate_rotarg_valref_il.Weight::.ctor(int32)
         IL_011d:  ldarg.0
-        IL_011e:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_011e:  ldfld      class Rotate_rotarg_valref_il.App/App$Node Rotate_rotarg_valref_il.App/App$Node::m_rightChild
         IL_0123:  ldloca.s   V_5
         IL_0125:  ldloca.s   V_5
-        IL_0127:  call       instance void Rotate.App/App$Node::rotateTree(value class Rotate.Weight&,
-                                                                           value class Rotate.Weight&)
+        IL_0127:  call       instance void Rotate_rotarg_valref_il.App/App$Node::rotateTree(value class Rotate_rotarg_valref_il.Weight&,
+                                                                           value class Rotate_rotarg_valref_il.Weight&)
         IL_012c:  ldarg.1
-        IL_012d:  ldfld      int32 Rotate.Weight::m_value
+        IL_012d:  ldfld      int32 Rotate_rotarg_valref_il.Weight::m_value
         IL_0132:  ldarg.0
-        IL_0133:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_0138:  ldflda     value class Rotate.Weight Rotate.App/App$Node::m_weight
-        IL_013d:  ldfld      int32 Rotate.Weight::m_value
+        IL_0133:  ldfld      class Rotate_rotarg_valref_il.App/App$Node Rotate_rotarg_valref_il.App/App$Node::m_rightChild
+        IL_0138:  ldflda     value class Rotate_rotarg_valref_il.Weight Rotate_rotarg_valref_il.App/App$Node::m_weight
+        IL_013d:  ldfld      int32 Rotate_rotarg_valref_il.Weight::m_value
         IL_0142:  beq.s      IL_0154
 
         IL_0144:  ldstr      "left weight do not match."
@@ -284,48 +284,48 @@
         IL_0153:  throw
 
         IL_0154:  ldarg.0
-        IL_0155:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_0155:  ldfld      class Rotate_rotarg_valref_il.App/App$Node Rotate_rotarg_valref_il.App/App$Node::m_leftChild
         IL_015a:  brfalse    IL_01e5
 
         IL_015f:  ldarg.0
-        IL_0160:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_0165:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_0160:  ldfld      class Rotate_rotarg_valref_il.App/App$Node Rotate_rotarg_valref_il.App/App$Node::m_leftChild
+        IL_0165:  ldfld      class Rotate_rotarg_valref_il.App/App$Node Rotate_rotarg_valref_il.App/App$Node::m_leftChild
         IL_016a:  brfalse.s  IL_01a6
 
         IL_016c:  ldarg.0
-        IL_016d:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_0172:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_016d:  ldfld      class Rotate_rotarg_valref_il.App/App$Node Rotate_rotarg_valref_il.App/App$Node::m_leftChild
+        IL_0172:  ldfld      class Rotate_rotarg_valref_il.App/App$Node Rotate_rotarg_valref_il.App/App$Node::m_rightChild
         IL_0177:  brfalse.s  IL_01a6
 
         IL_0179:  ldarg.0
-        IL_017a:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_017a:  ldfld      class Rotate_rotarg_valref_il.App/App$Node Rotate_rotarg_valref_il.App/App$Node::m_leftChild
         IL_017f:  ldarg.0
-        IL_0180:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_0185:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_018a:  ldflda     value class Rotate.Weight Rotate.App/App$Node::m_weight
+        IL_0180:  ldfld      class Rotate_rotarg_valref_il.App/App$Node Rotate_rotarg_valref_il.App/App$Node::m_leftChild
+        IL_0185:  ldfld      class Rotate_rotarg_valref_il.App/App$Node Rotate_rotarg_valref_il.App/App$Node::m_leftChild
+        IL_018a:  ldflda     value class Rotate_rotarg_valref_il.Weight Rotate_rotarg_valref_il.App/App$Node::m_weight
         IL_018f:  ldarg.0
-        IL_0190:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_0195:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_019a:  ldflda     value class Rotate.Weight Rotate.App/App$Node::m_weight
-        IL_019f:  call       instance void Rotate.App/App$Node::rotateTree(value class Rotate.Weight&,
-                                                                           value class Rotate.Weight&)
+        IL_0190:  ldfld      class Rotate_rotarg_valref_il.App/App$Node Rotate_rotarg_valref_il.App/App$Node::m_leftChild
+        IL_0195:  ldfld      class Rotate_rotarg_valref_il.App/App$Node Rotate_rotarg_valref_il.App/App$Node::m_rightChild
+        IL_019a:  ldflda     value class Rotate_rotarg_valref_il.Weight Rotate_rotarg_valref_il.App/App$Node::m_weight
+        IL_019f:  call       instance void Rotate_rotarg_valref_il.App/App$Node::rotateTree(value class Rotate_rotarg_valref_il.Weight&,
+                                                                           value class Rotate_rotarg_valref_il.Weight&)
         IL_01a4:  br.s       IL_01bd
 
         IL_01a6:  ldloca.s   V_6
         IL_01a8:  ldc.i4.0
-        IL_01a9:  call       instance void Rotate.Weight::.ctor(int32)
+        IL_01a9:  call       instance void Rotate_rotarg_valref_il.Weight::.ctor(int32)
         IL_01ae:  ldarg.0
-        IL_01af:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_01af:  ldfld      class Rotate_rotarg_valref_il.App/App$Node Rotate_rotarg_valref_il.App/App$Node::m_leftChild
         IL_01b4:  ldloca.s   V_6
         IL_01b6:  ldloca.s   V_6
-        IL_01b8:  call       instance void Rotate.App/App$Node::rotateTree(value class Rotate.Weight&,
-                                                                           value class Rotate.Weight&)
+        IL_01b8:  call       instance void Rotate_rotarg_valref_il.App/App$Node::rotateTree(value class Rotate_rotarg_valref_il.Weight&,
+                                                                           value class Rotate_rotarg_valref_il.Weight&)
         IL_01bd:  ldarg.2
-        IL_01be:  ldfld      int32 Rotate.Weight::m_value
+        IL_01be:  ldfld      int32 Rotate_rotarg_valref_il.Weight::m_value
         IL_01c3:  ldarg.0
-        IL_01c4:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_01c9:  ldflda     value class Rotate.Weight Rotate.App/App$Node::m_weight
-        IL_01ce:  ldfld      int32 Rotate.Weight::m_value
+        IL_01c4:  ldfld      class Rotate_rotarg_valref_il.App/App$Node Rotate_rotarg_valref_il.App/App$Node::m_leftChild
+        IL_01c9:  ldflda     value class Rotate_rotarg_valref_il.Weight Rotate_rotarg_valref_il.App/App$Node::m_weight
+        IL_01ce:  ldfld      int32 Rotate_rotarg_valref_il.Weight::m_value
         IL_01d3:  beq.s      IL_01e5
 
         IL_01d5:  ldstr      "right weight do not match."
@@ -340,7 +340,7 @@
 
     .field public static int32 s_weightCount
     .field public static int32 s_objCount
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -349,23 +349,23 @@
       .entrypoint
       // Code size       47 (0x2f)
       .maxstack  3
-      .locals (class Rotate.App/App$Node V_0)
-      IL_0000:  newobj     instance void Rotate.App/App$Node::.ctor()
+      .locals (class Rotate_rotarg_valref_il.App/App$Node V_0)
+      IL_0000:  newobj     instance void Rotate_rotarg_valref_il.App/App$Node::.ctor()
       IL_0005:  stloc.0
       IL_0006:  ldloc.0
       IL_0007:  ldc.i4.4
       IL_0008:  ldnull
-      IL_000d:  call       instance void Rotate.App/App$Node::growTree(int32,
+      IL_000d:  call       instance void Rotate_rotarg_valref_il.App/App$Node::growTree(int32,
                                                                        class System.String)
       IL_0012:  ldloc.0
       IL_0013:  ldloc.0
-      IL_0014:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-      IL_0019:  ldflda     value class Rotate.Weight Rotate.App/App$Node::m_weight
+      IL_0014:  ldfld      class Rotate_rotarg_valref_il.App/App$Node Rotate_rotarg_valref_il.App/App$Node::m_leftChild
+      IL_0019:  ldflda     value class Rotate_rotarg_valref_il.Weight Rotate_rotarg_valref_il.App/App$Node::m_weight
       IL_001e:  ldloc.0
-      IL_001f:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-      IL_0024:  ldflda     value class Rotate.Weight Rotate.App/App$Node::m_weight
-      IL_0029:  call       instance void Rotate.App/App$Node::rotateTree(value class Rotate.Weight&,
-                                                                         value class Rotate.Weight&)
+      IL_001f:  ldfld      class Rotate_rotarg_valref_il.App/App$Node Rotate_rotarg_valref_il.App/App$Node::m_rightChild
+      IL_0024:  ldflda     value class Rotate_rotarg_valref_il.Weight Rotate_rotarg_valref_il.App/App$Node::m_weight
+      IL_0029:  call       instance void Rotate_rotarg_valref_il.App/App$Node::rotateTree(value class Rotate_rotarg_valref_il.Weight&,
+                                                                         value class Rotate_rotarg_valref_il.Weight&)
       IL_002e:  ldc.i4    0x64
       IL_0033:  ret
     } // end of method 'App::Main'
@@ -376,9 +376,9 @@
       // Code size       13 (0xd)
       .maxstack  8
       IL_0000:  ldc.i4.1
-      IL_0001:  stsfld     int32 Rotate.App::s_weightCount
+      IL_0001:  stsfld     int32 Rotate_rotarg_valref_il.App::s_weightCount
       IL_0006:  ldc.i4.0
-      IL_0007:  stsfld     int32 Rotate.App::s_objCount
+      IL_0007:  stsfld     int32 Rotate_rotarg_valref_il.App::s_objCount
       IL_000c:  ret
     } // end of method 'App::.cctor'
 
@@ -394,6 +394,6 @@
 
   } // end of class 'App'
 
-} // end of namespace 'Rotate'
+} // end of namespace 'Rotate_rotarg_valref_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotarg_valref_d.csproj b/src/tests/JIT/Methodical/explicit/rotate/rotarg_valref_d.csproj
index 65db897a7230eb..d79b42dd81b3d7 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotarg_valref_d.csproj
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotarg_valref_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotarg_valref_do.csproj b/src/tests/JIT/Methodical/explicit/rotate/rotarg_valref_do.csproj
index d265adbbdd777e..892ca77b12433e 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotarg_valref_do.csproj
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotarg_valref_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotarg_valref_il_d.ilproj b/src/tests/JIT/Methodical/explicit/rotate/rotarg_valref_il_d.ilproj
index fd6b6bda0d87be..453efb638ade8f 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotarg_valref_il_d.ilproj
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotarg_valref_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotarg_valref_il_r.ilproj b/src/tests/JIT/Methodical/explicit/rotate/rotarg_valref_il_r.ilproj
index 4d95639e97b950..48eea6d7eb76e9 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotarg_valref_il_r.ilproj
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotarg_valref_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotarg_valref_r.csproj b/src/tests/JIT/Methodical/explicit/rotate/rotarg_valref_r.csproj
index a0a015db4e5f89..8c88033b5dbe60 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotarg_valref_r.csproj
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotarg_valref_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotarg_valref_ro.csproj b/src/tests/JIT/Methodical/explicit/rotate/rotarg_valref_ro.csproj
index 1e6d80b667368a..5a6ce47268a628 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotarg_valref_ro.csproj
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotarg_valref_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotate_i4.il b/src/tests/JIT/Methodical/explicit/rotate/rotate_i4.il
index 0c2d6fc7c6eaa3..5ff441ef29cd84 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotate_i4.il
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotate_i4.il
@@ -19,15 +19,15 @@
 }
 .assembly extern xunit.core {}
 // MVID: {A112EBC7-3218-46C8-939E-D43B5ED4DE98}
-.namespace Rotate
+.namespace Rotate_rotate_i4_il
 {
-  .class private auto ansi App extends ['mscorlib']System.Object
+  .class public auto ansi App extends ['mscorlib']System.Object
   {
     .class auto ansi nested private App$Node extends ['mscorlib']System.Object
     {
       .field private int32 m_weight
-      .field private class Rotate.App/App$Node m_leftChild
-      .field private class Rotate.App/App$Node m_rightChild
+      .field private class Rotate_rotate_i4_il.App/App$Node m_leftChild
+      .field private class Rotate_rotate_i4_il.App/App$Node m_rightChild
       .method public hidebysig specialname rtspecialname 
               instance void .ctor() il managed
       {
@@ -36,10 +36,10 @@
         IL_0000:  ldarg.0
         IL_0001:  call       instance void ['mscorlib']System.Object::.ctor()
         IL_0006:  ldarg.0
-        IL_0007:  ldsfld     class ['mscorlib']System.Random Rotate.App::s_randomGen
+        IL_0007:  ldsfld     class ['mscorlib']System.Random Rotate_rotate_i4_il.App::s_randomGen
         IL_000c:  ldc.i4     0x2710
         IL_0011:  callvirt   instance int32 ['mscorlib']System.Random::Next(int32)
-        IL_0016:  stfld      int32 Rotate.App/App$Node::m_weight
+        IL_0016:  stfld      int32 Rotate_rotate_i4_il.App/App$Node::m_weight
         IL_001b:  ret
       } // end of method 'App$Node::.ctor'
 
@@ -48,29 +48,29 @@
       {
         // Code size       73 (0x49)
         .maxstack  4
-        .locals (class Rotate.App/App$Node V_0)
+        .locals (class Rotate_rotate_i4_il.App/App$Node V_0)
         IL_0000:  ldarg.1
         IL_0001:  ldc.i4.0
         IL_0002:  ble.s      IL_0038
 
         IL_0004:  ldarg.0
-        IL_0005:  newobj     instance void Rotate.App/App$Node::.ctor()
-        IL_000a:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_0005:  newobj     instance void Rotate_rotate_i4_il.App/App$Node::.ctor()
+        IL_000a:  stfld      class Rotate_rotate_i4_il.App/App$Node Rotate_rotate_i4_il.App/App$Node::m_leftChild
         IL_000f:  ldarg.0
-        IL_0010:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_0010:  ldfld      class Rotate_rotate_i4_il.App/App$Node Rotate_rotate_i4_il.App/App$Node::m_leftChild
         IL_0015:  ldarg.1
         IL_0016:  ldc.i4.1
         IL_0017:  sub
-        IL_0018:  call       instance void Rotate.App/App$Node::growTree(int32)
+        IL_0018:  call       instance void Rotate_rotate_i4_il.App/App$Node::growTree(int32)
         IL_001d:  ldarg.0
-        IL_001e:  newobj     instance void Rotate.App/App$Node::.ctor()
-        IL_0023:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_001e:  newobj     instance void Rotate_rotate_i4_il.App/App$Node::.ctor()
+        IL_0023:  stfld      class Rotate_rotate_i4_il.App/App$Node Rotate_rotate_i4_il.App/App$Node::m_rightChild
         IL_0028:  ldarg.0
-        IL_0029:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_0029:  ldfld      class Rotate_rotate_i4_il.App/App$Node Rotate_rotate_i4_il.App/App$Node::m_rightChild
         IL_002e:  ldarg.1
         IL_002f:  ldc.i4.1
         IL_0030:  sub
-        IL_0031:  call       instance void Rotate.App/App$Node::growTree(int32)
+        IL_0031:  call       instance void Rotate_rotate_i4_il.App/App$Node::growTree(int32)
         IL_0036:  br.s       IL_0048
 
         IL_0038:  ldarg.0
@@ -78,9 +78,9 @@
         IL_003a:  ldnull
         IL_003b:  dup
         IL_003c:  stloc.0
-        IL_003d:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_003d:  stfld      class Rotate_rotate_i4_il.App/App$Node Rotate_rotate_i4_il.App/App$Node::m_rightChild
         IL_0042:  ldloc.0
-        IL_0043:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_0043:  stfld      class Rotate_rotate_i4_il.App/App$Node Rotate_rotate_i4_il.App/App$Node::m_leftChild
         IL_0048:  ret
       } // end of method 'App$Node::growTree'
 
@@ -89,8 +89,8 @@
       {
         // Code size       270 (0x10e)
         .maxstack  2
-        .locals (class Rotate.App/App$Node V_0,
-                 class Rotate.App/App$Node V_1,
+        .locals (class Rotate_rotate_i4_il.App/App$Node V_0,
+                 class Rotate_rotate_i4_il.App/App$Node V_1,
                  int32 V_2,
                  int32 & V_3,
                  int32 & V_4)
@@ -105,92 +105,92 @@
         IL_0008:  ldloca V_2 //ldc.i4.m1
         IL_0009:  stloc.s    V_4
         IL_000b:  ldarg.0
-        IL_000c:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_000c:  ldfld      class Rotate_rotate_i4_il.App/App$Node Rotate_rotate_i4_il.App/App$Node::m_leftChild
         IL_0011:  brfalse.s  IL_0058
 
-        IL_0013:  newobj     instance void Rotate.App/App$Node::.ctor()
+        IL_0013:  newobj     instance void Rotate_rotate_i4_il.App/App$Node::.ctor()
         IL_0018:  stloc.1
         IL_0019:  ldloc.1
         IL_001a:  ldarg.0
-        IL_001b:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_0020:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_0025:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_001b:  ldfld      class Rotate_rotate_i4_il.App/App$Node Rotate_rotate_i4_il.App/App$Node::m_leftChild
+        IL_0020:  ldfld      class Rotate_rotate_i4_il.App/App$Node Rotate_rotate_i4_il.App/App$Node::m_leftChild
+        IL_0025:  stfld      class Rotate_rotate_i4_il.App/App$Node Rotate_rotate_i4_il.App/App$Node::m_leftChild
         IL_002a:  ldloc.1
         IL_002b:  ldarg.0
-        IL_002c:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_0031:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_0036:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_002c:  ldfld      class Rotate_rotate_i4_il.App/App$Node Rotate_rotate_i4_il.App/App$Node::m_leftChild
+        IL_0031:  ldfld      class Rotate_rotate_i4_il.App/App$Node Rotate_rotate_i4_il.App/App$Node::m_rightChild
+        IL_0036:  stfld      class Rotate_rotate_i4_il.App/App$Node Rotate_rotate_i4_il.App/App$Node::m_rightChild
         IL_003b:  ldloc.1
         IL_003c:  ldarg.0
-        IL_003d:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_0042:  ldfld      int32 Rotate.App/App$Node::m_weight
-        IL_0047:  stfld      int32 Rotate.App/App$Node::m_weight
+        IL_003d:  ldfld      class Rotate_rotate_i4_il.App/App$Node Rotate_rotate_i4_il.App/App$Node::m_leftChild
+        IL_0042:  ldfld      int32 Rotate_rotate_i4_il.App/App$Node::m_weight
+        IL_0047:  stfld      int32 Rotate_rotate_i4_il.App/App$Node::m_weight
         IL_004c:  ldarg.0
-        IL_004d:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_0052:  ldflda      int32 Rotate.App/App$Node::m_weight
+        IL_004d:  ldfld      class Rotate_rotate_i4_il.App/App$Node Rotate_rotate_i4_il.App/App$Node::m_leftChild
+        IL_0052:  ldflda      int32 Rotate_rotate_i4_il.App/App$Node::m_weight
         IL_0057:  stloc.3
         IL_0058:  ldarg.0
-        IL_0059:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_0059:  ldfld      class Rotate_rotate_i4_il.App/App$Node Rotate_rotate_i4_il.App/App$Node::m_rightChild
         IL_005e:  brfalse.s  IL_00a6
 
-        IL_0060:  newobj     instance void Rotate.App/App$Node::.ctor()
+        IL_0060:  newobj     instance void Rotate_rotate_i4_il.App/App$Node::.ctor()
         IL_0065:  stloc.0
         IL_0066:  ldloc.0
         IL_0067:  ldarg.0
-        IL_0068:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_006d:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_0072:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_0068:  ldfld      class Rotate_rotate_i4_il.App/App$Node Rotate_rotate_i4_il.App/App$Node::m_rightChild
+        IL_006d:  ldfld      class Rotate_rotate_i4_il.App/App$Node Rotate_rotate_i4_il.App/App$Node::m_leftChild
+        IL_0072:  stfld      class Rotate_rotate_i4_il.App/App$Node Rotate_rotate_i4_il.App/App$Node::m_leftChild
         IL_0077:  ldloc.0
         IL_0078:  ldarg.0
-        IL_0079:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_007e:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_0083:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_0079:  ldfld      class Rotate_rotate_i4_il.App/App$Node Rotate_rotate_i4_il.App/App$Node::m_rightChild
+        IL_007e:  ldfld      class Rotate_rotate_i4_il.App/App$Node Rotate_rotate_i4_il.App/App$Node::m_rightChild
+        IL_0083:  stfld      class Rotate_rotate_i4_il.App/App$Node Rotate_rotate_i4_il.App/App$Node::m_rightChild
         IL_0088:  ldloc.0
         IL_0089:  ldarg.0
-        IL_008a:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_008f:  ldfld      int32 Rotate.App/App$Node::m_weight
-        IL_0094:  stfld      int32 Rotate.App/App$Node::m_weight
+        IL_008a:  ldfld      class Rotate_rotate_i4_il.App/App$Node Rotate_rotate_i4_il.App/App$Node::m_rightChild
+        IL_008f:  ldfld      int32 Rotate_rotate_i4_il.App/App$Node::m_weight
+        IL_0094:  stfld      int32 Rotate_rotate_i4_il.App/App$Node::m_weight
         IL_0099:  ldarg.0
-        IL_009a:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_009f:  ldflda      int32 Rotate.App/App$Node::m_weight
+        IL_009a:  ldfld      class Rotate_rotate_i4_il.App/App$Node Rotate_rotate_i4_il.App/App$Node::m_rightChild
+        IL_009f:  ldflda      int32 Rotate_rotate_i4_il.App/App$Node::m_weight
         IL_00a4:  stloc.s    V_4
         IL_00a6:  ldarg.0
         IL_00a7:  ldloc.0
-        IL_00a8:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_00a8:  stfld      class Rotate_rotate_i4_il.App/App$Node Rotate_rotate_i4_il.App/App$Node::m_leftChild
         IL_00ad:  ldarg.0
         IL_00ae:  ldloc.1
-        IL_00af:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_00af:  stfld      class Rotate_rotate_i4_il.App/App$Node Rotate_rotate_i4_il.App/App$Node::m_rightChild
         IL_00b4:  call       void ['mscorlib']System.GC::Collect()
         IL_00b9:  call       void ['mscorlib']System.GC::WaitForPendingFinalizers()
         IL_00be:  ldarg.0
-        IL_00bf:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_00bf:  ldfld      class Rotate_rotate_i4_il.App/App$Node Rotate_rotate_i4_il.App/App$Node::m_rightChild
         IL_00c4:  brfalse.s  IL_00e5
 
         IL_00c6:  ldarg.0
-        IL_00c7:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_00cc:  call       instance void Rotate.App/App$Node::rotateTree()
+        IL_00c7:  ldfld      class Rotate_rotate_i4_il.App/App$Node Rotate_rotate_i4_il.App/App$Node::m_rightChild
+        IL_00cc:  call       instance void Rotate_rotate_i4_il.App/App$Node::rotateTree()
         IL_00d1:  ldloc.3
         			ldind.i4
         IL_00d2:  ldarg.0
-        IL_00d3:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_00d8:  ldfld      int32 Rotate.App/App$Node::m_weight
+        IL_00d3:  ldfld      class Rotate_rotate_i4_il.App/App$Node Rotate_rotate_i4_il.App/App$Node::m_rightChild
+        IL_00d8:  ldfld      int32 Rotate_rotate_i4_il.App/App$Node::m_weight
         IL_00dd:  beq.s      IL_00e5
 
         IL_00df:  newobj     instance void ['mscorlib']System.Exception::.ctor()
         IL_00e4:  throw
 
         IL_00e5:  ldarg.0
-        IL_00e6:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_00e6:  ldfld      class Rotate_rotate_i4_il.App/App$Node Rotate_rotate_i4_il.App/App$Node::m_leftChild
         IL_00eb:  brfalse.s  IL_010d
 
         IL_00ed:  ldarg.0
-        IL_00ee:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_00f3:  call       instance void Rotate.App/App$Node::rotateTree()
+        IL_00ee:  ldfld      class Rotate_rotate_i4_il.App/App$Node Rotate_rotate_i4_il.App/App$Node::m_leftChild
+        IL_00f3:  call       instance void Rotate_rotate_i4_il.App/App$Node::rotateTree()
         IL_00f8:  ldloc.s    V_4
         			ldind.i4
         IL_00fa:  ldarg.0
-        IL_00fb:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_0100:  ldfld      int32 Rotate.App/App$Node::m_weight
+        IL_00fb:  ldfld      class Rotate_rotate_i4_il.App/App$Node Rotate_rotate_i4_il.App/App$Node::m_leftChild
+        IL_0100:  ldfld      int32 Rotate_rotate_i4_il.App/App$Node::m_weight
         IL_0105:  beq.s      IL_010d
 
         IL_0107:  newobj     instance void ['mscorlib']System.Exception::.ctor()
@@ -202,7 +202,7 @@
     } // end of class 'App$Node'
 
     .field public static class ['mscorlib']System.Random s_randomGen
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -211,14 +211,14 @@
       .entrypoint
       // Code size       20 (0x14)
       .maxstack  2
-      .locals (class Rotate.App/App$Node V_0)
-      IL_0000:  newobj     instance void Rotate.App/App$Node::.ctor()
+      .locals (class Rotate_rotate_i4_il.App/App$Node V_0)
+      IL_0000:  newobj     instance void Rotate_rotate_i4_il.App/App$Node::.ctor()
       IL_0005:  stloc.0
       IL_0006:  ldloc.0
       IL_0007:  ldc.i4.6
-      IL_0008:  call       instance void Rotate.App/App$Node::growTree(int32)
+      IL_0008:  call       instance void Rotate_rotate_i4_il.App/App$Node::growTree(int32)
       IL_000d:  ldloc.0
-      IL_000e:  call       instance void Rotate.App/App$Node::rotateTree()
+      IL_000e:  call       instance void Rotate_rotate_i4_il.App/App$Node::rotateTree()
       IL_0013:  ldc.i4    0x64
       IL_0018:  ret
     } // end of method 'App::Main'
@@ -229,7 +229,7 @@
       // Code size       11 (0xb)
       .maxstack  8
       IL_0000:  newobj     instance void ['mscorlib']System.Random::.ctor()
-      IL_0005:  stsfld     class ['mscorlib']System.Random Rotate.App::s_randomGen
+      IL_0005:  stsfld     class ['mscorlib']System.Random Rotate_rotate_i4_il.App::s_randomGen
       IL_000a:  ret
     } // end of method 'App::.cctor'
 
@@ -245,6 +245,6 @@
 
   } // end of class 'App'
 
-} // end of namespace 'Rotate'
+} // end of namespace 'Rotate_rotate_i4_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotate_i4_il_d.ilproj b/src/tests/JIT/Methodical/explicit/rotate/rotate_i4_il_d.ilproj
index e0b9a6401118d2..9bd3449f9af9cf 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotate_i4_il_d.ilproj
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotate_i4_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotate_i4_il_r.ilproj b/src/tests/JIT/Methodical/explicit/rotate/rotate_i4_il_r.ilproj
index 6dfac4be0048ba..c784246629026a 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotate_i4_il_r.ilproj
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotate_i4_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotate_u2.il b/src/tests/JIT/Methodical/explicit/rotate/rotate_u2.il
index 2be02c40a2b6c9..df02ff35ee04b4 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotate_u2.il
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotate_u2.il
@@ -19,18 +19,18 @@
 }
 .assembly extern xunit.core {}
 // MVID: {D13C2D0A-FC17-423E-926F-6A239416DD1C}
-.namespace Rotate
+.namespace Rotate_rotate_u2_il
 {
-  .class private auto ansi App extends ['mscorlib']System.Object
+  .class public auto ansi App extends ['mscorlib']System.Object
   {
     .class auto ansi nested private App$Node extends ['mscorlib']System.Object
     {
-      .field private class Rotate.App/App$Node m_leftChild
+      .field private class Rotate_rotate_u2_il.App/App$Node m_leftChild
       .field private unsigned int8 padding1
       .field private unsigned int8 padding2
       .field private unsigned int16 m_weight
       .field private unsigned int8 padding3
-      .field private class Rotate.App/App$Node m_rightChild
+      .field private class Rotate_rotate_u2_il.App/App$Node m_rightChild
       .method public hidebysig specialname rtspecialname 
               instance void .ctor() il managed
       {
@@ -39,11 +39,11 @@
         IL_0000:  ldarg.0
         IL_0001:  call       instance void ['mscorlib']System.Object::.ctor()
         IL_0006:  ldarg.0
-        IL_0007:  ldsfld     class ['mscorlib']System.Random Rotate.App::s_randomGen
+        IL_0007:  ldsfld     class ['mscorlib']System.Random Rotate_rotate_u2_il.App::s_randomGen
         IL_000c:  ldc.i4     0x2710
         IL_0011:  callvirt   instance int32 ['mscorlib']System.Random::Next(int32)
         IL_0016:  conv.u2
-        IL_0017:  stfld      unsigned int16 Rotate.App/App$Node::m_weight
+        IL_0017:  stfld      unsigned int16 Rotate_rotate_u2_il.App/App$Node::m_weight
         IL_001c:  ret
       } // end of method 'App$Node::.ctor'
 
@@ -60,29 +60,29 @@
       {
         // Code size       73 (0x49)
         .maxstack  4
-        .locals (class Rotate.App/App$Node V_0)
+        .locals (class Rotate_rotate_u2_il.App/App$Node V_0)
         IL_0000:  ldarg.1
         IL_0001:  ldc.i4.0
         IL_0002:  ble.s      IL_0038
 
         IL_0004:  ldarg.0
-        IL_0005:  newobj     instance void Rotate.App/App$Node::.ctor()
-        IL_000a:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_0005:  newobj     instance void Rotate_rotate_u2_il.App/App$Node::.ctor()
+        IL_000a:  stfld      class Rotate_rotate_u2_il.App/App$Node Rotate_rotate_u2_il.App/App$Node::m_leftChild
         IL_000f:  ldarg.0
-        IL_0010:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_0010:  ldfld      class Rotate_rotate_u2_il.App/App$Node Rotate_rotate_u2_il.App/App$Node::m_leftChild
         IL_0015:  ldarg.1
         IL_0016:  ldc.i4.1
         IL_0017:  sub
-        IL_0018:  call       instance void Rotate.App/App$Node::growTree(int32)
+        IL_0018:  call       instance void Rotate_rotate_u2_il.App/App$Node::growTree(int32)
         IL_001d:  ldarg.0
-        IL_001e:  newobj     instance void Rotate.App/App$Node::.ctor()
-        IL_0023:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_001e:  newobj     instance void Rotate_rotate_u2_il.App/App$Node::.ctor()
+        IL_0023:  stfld      class Rotate_rotate_u2_il.App/App$Node Rotate_rotate_u2_il.App/App$Node::m_rightChild
         IL_0028:  ldarg.0
-        IL_0029:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_0029:  ldfld      class Rotate_rotate_u2_il.App/App$Node Rotate_rotate_u2_il.App/App$Node::m_rightChild
         IL_002e:  ldarg.1
         IL_002f:  ldc.i4.1
         IL_0030:  sub
-        IL_0031:  call       instance void Rotate.App/App$Node::growTree(int32)
+        IL_0031:  call       instance void Rotate_rotate_u2_il.App/App$Node::growTree(int32)
         IL_0036:  br.s       IL_0048
 
         IL_0038:  ldarg.0
@@ -90,9 +90,9 @@
         IL_003a:  ldnull
         IL_003b:  dup
         IL_003c:  stloc.0
-        IL_003d:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_003d:  stfld      class Rotate_rotate_u2_il.App/App$Node Rotate_rotate_u2_il.App/App$Node::m_rightChild
         IL_0042:  ldloc.0
-        IL_0043:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_0043:  stfld      class Rotate_rotate_u2_il.App/App$Node Rotate_rotate_u2_il.App/App$Node::m_leftChild
         IL_0048:  ret
       } // end of method 'App$Node::growTree'
 
@@ -101,8 +101,8 @@
       {
         // Code size       282 (0x11a)
         .maxstack  2
-        .locals (class Rotate.App/App$Node V_0,
-                 class Rotate.App/App$Node V_1,
+        .locals (class Rotate_rotate_u2_il.App/App$Node V_0,
+                 class Rotate_rotate_u2_il.App/App$Node V_1,
                  unsigned int16 V_2,
                  unsigned int16 & V_3,
                  unsigned int16 & V_4)
@@ -117,76 +117,76 @@
         IL_000c:  ldloca V_2 // ldc.i4     0xffff
         IL_0011:  stloc.s    V_4
         IL_0013:  ldarg.0
-        IL_0014:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_0014:  ldfld      class Rotate_rotate_u2_il.App/App$Node Rotate_rotate_u2_il.App/App$Node::m_leftChild
         IL_0019:  brfalse.s  IL_0060
 
-        IL_001b:  newobj     instance void Rotate.App/App$Node::.ctor()
+        IL_001b:  newobj     instance void Rotate_rotate_u2_il.App/App$Node::.ctor()
         IL_0020:  stloc.1
         IL_0021:  ldloc.1
         IL_0022:  ldarg.0
-        IL_0023:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_0028:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_002d:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_0023:  ldfld      class Rotate_rotate_u2_il.App/App$Node Rotate_rotate_u2_il.App/App$Node::m_leftChild
+        IL_0028:  ldfld      class Rotate_rotate_u2_il.App/App$Node Rotate_rotate_u2_il.App/App$Node::m_leftChild
+        IL_002d:  stfld      class Rotate_rotate_u2_il.App/App$Node Rotate_rotate_u2_il.App/App$Node::m_leftChild
         IL_0032:  ldloc.1
         IL_0033:  ldarg.0
-        IL_0034:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_0039:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_003e:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_0034:  ldfld      class Rotate_rotate_u2_il.App/App$Node Rotate_rotate_u2_il.App/App$Node::m_leftChild
+        IL_0039:  ldfld      class Rotate_rotate_u2_il.App/App$Node Rotate_rotate_u2_il.App/App$Node::m_rightChild
+        IL_003e:  stfld      class Rotate_rotate_u2_il.App/App$Node Rotate_rotate_u2_il.App/App$Node::m_rightChild
         IL_0043:  ldloc.1
         IL_0044:  ldarg.0
-        IL_0045:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_004a:  ldfld      unsigned int16 Rotate.App/App$Node::m_weight
-        IL_004f:  stfld      unsigned int16 Rotate.App/App$Node::m_weight
+        IL_0045:  ldfld      class Rotate_rotate_u2_il.App/App$Node Rotate_rotate_u2_il.App/App$Node::m_leftChild
+        IL_004a:  ldfld      unsigned int16 Rotate_rotate_u2_il.App/App$Node::m_weight
+        IL_004f:  stfld      unsigned int16 Rotate_rotate_u2_il.App/App$Node::m_weight
         IL_0054:  ldarg.0
-        IL_0055:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_005a:  ldflda      unsigned int16 Rotate.App/App$Node::m_weight
+        IL_0055:  ldfld      class Rotate_rotate_u2_il.App/App$Node Rotate_rotate_u2_il.App/App$Node::m_leftChild
+        IL_005a:  ldflda      unsigned int16 Rotate_rotate_u2_il.App/App$Node::m_weight
         IL_005f:  stloc.3
         IL_0060:  ldarg.0
-        IL_0061:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_0061:  ldfld      class Rotate_rotate_u2_il.App/App$Node Rotate_rotate_u2_il.App/App$Node::m_rightChild
         IL_0066:  brfalse.s  IL_00ae
 
-        IL_0068:  newobj     instance void Rotate.App/App$Node::.ctor()
+        IL_0068:  newobj     instance void Rotate_rotate_u2_il.App/App$Node::.ctor()
         IL_006d:  stloc.0
         IL_006e:  ldloc.0
         IL_006f:  ldarg.0
-        IL_0070:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_0075:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_007a:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_0070:  ldfld      class Rotate_rotate_u2_il.App/App$Node Rotate_rotate_u2_il.App/App$Node::m_rightChild
+        IL_0075:  ldfld      class Rotate_rotate_u2_il.App/App$Node Rotate_rotate_u2_il.App/App$Node::m_leftChild
+        IL_007a:  stfld      class Rotate_rotate_u2_il.App/App$Node Rotate_rotate_u2_il.App/App$Node::m_leftChild
         IL_007f:  ldloc.0
         IL_0080:  ldarg.0
-        IL_0081:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_0086:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_008b:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_0081:  ldfld      class Rotate_rotate_u2_il.App/App$Node Rotate_rotate_u2_il.App/App$Node::m_rightChild
+        IL_0086:  ldfld      class Rotate_rotate_u2_il.App/App$Node Rotate_rotate_u2_il.App/App$Node::m_rightChild
+        IL_008b:  stfld      class Rotate_rotate_u2_il.App/App$Node Rotate_rotate_u2_il.App/App$Node::m_rightChild
         IL_0090:  ldloc.0
         IL_0091:  ldarg.0
-        IL_0092:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_0097:  ldfld      unsigned int16 Rotate.App/App$Node::m_weight
-        IL_009c:  stfld      unsigned int16 Rotate.App/App$Node::m_weight
+        IL_0092:  ldfld      class Rotate_rotate_u2_il.App/App$Node Rotate_rotate_u2_il.App/App$Node::m_rightChild
+        IL_0097:  ldfld      unsigned int16 Rotate_rotate_u2_il.App/App$Node::m_weight
+        IL_009c:  stfld      unsigned int16 Rotate_rotate_u2_il.App/App$Node::m_weight
         IL_00a1:  ldarg.0
-        IL_00a2:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_00a7:  ldflda      unsigned int16 Rotate.App/App$Node::m_weight
+        IL_00a2:  ldfld      class Rotate_rotate_u2_il.App/App$Node Rotate_rotate_u2_il.App/App$Node::m_rightChild
+        IL_00a7:  ldflda      unsigned int16 Rotate_rotate_u2_il.App/App$Node::m_weight
         IL_00ac:  stloc.s    V_4
         IL_00ae:  ldarg.0
         IL_00af:  ldloc.0
-        IL_00b0:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_00b0:  stfld      class Rotate_rotate_u2_il.App/App$Node Rotate_rotate_u2_il.App/App$Node::m_leftChild
         IL_00b5:  ldarg.0
         IL_00b6:  ldloc.1
-        IL_00b7:  stfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_00b7:  stfld      class Rotate_rotate_u2_il.App/App$Node Rotate_rotate_u2_il.App/App$Node::m_rightChild
         IL_00bc:  call       void ['mscorlib']System.GC::Collect()
         IL_00c1:  call       void ['mscorlib']System.GC::WaitForPendingFinalizers()
         IL_00c6:  ldarg.0
-        IL_00c7:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
+        IL_00c7:  ldfld      class Rotate_rotate_u2_il.App/App$Node Rotate_rotate_u2_il.App/App$Node::m_rightChild
         IL_00cc:  brfalse.s  IL_00ef
 
         IL_00ce:  ldarg.0
-        IL_00cf:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_00d4:  call       instance void Rotate.App/App$Node::rotateTree()
+        IL_00cf:  ldfld      class Rotate_rotate_u2_il.App/App$Node Rotate_rotate_u2_il.App/App$Node::m_rightChild
+        IL_00d4:  call       instance void Rotate_rotate_u2_il.App/App$Node::rotateTree()
         IL_00d9:  ldloc.3
         			ldind.i2
         IL_00da:  conv.i4
         IL_00db:  ldarg.0
-        IL_00dc:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_rightChild
-        IL_00e1:  ldfld      unsigned int16 Rotate.App/App$Node::m_weight
+        IL_00dc:  ldfld      class Rotate_rotate_u2_il.App/App$Node Rotate_rotate_u2_il.App/App$Node::m_rightChild
+        IL_00e1:  ldfld      unsigned int16 Rotate_rotate_u2_il.App/App$Node::m_weight
         IL_00e6:  conv.i4
         IL_00e7:  beq.s      IL_00ef
 
@@ -194,18 +194,18 @@
         IL_00ee:  throw
 
         IL_00ef:  ldarg.0
-        IL_00f0:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
+        IL_00f0:  ldfld      class Rotate_rotate_u2_il.App/App$Node Rotate_rotate_u2_il.App/App$Node::m_leftChild
         IL_00f5:  brfalse.s  IL_0119
 
         IL_00f7:  ldarg.0
-        IL_00f8:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_00fd:  call       instance void Rotate.App/App$Node::rotateTree()
+        IL_00f8:  ldfld      class Rotate_rotate_u2_il.App/App$Node Rotate_rotate_u2_il.App/App$Node::m_leftChild
+        IL_00fd:  call       instance void Rotate_rotate_u2_il.App/App$Node::rotateTree()
         IL_0102:  ldloc.s    V_4
         			ldind.i2
         IL_0104:  conv.i4
         IL_0105:  ldarg.0
-        IL_0106:  ldfld      class Rotate.App/App$Node Rotate.App/App$Node::m_leftChild
-        IL_010b:  ldfld      unsigned int16 Rotate.App/App$Node::m_weight
+        IL_0106:  ldfld      class Rotate_rotate_u2_il.App/App$Node Rotate_rotate_u2_il.App/App$Node::m_leftChild
+        IL_010b:  ldfld      unsigned int16 Rotate_rotate_u2_il.App/App$Node::m_weight
         IL_0110:  conv.i4
         IL_0111:  beq.s      IL_0119
 
@@ -218,7 +218,7 @@
     } // end of class 'App$Node'
 
     .field public static class ['mscorlib']System.Random s_randomGen
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -227,14 +227,14 @@
       .entrypoint
       // Code size       20 (0x14)
       .maxstack  2
-      .locals (class Rotate.App/App$Node V_0)
-      IL_0000:  newobj     instance void Rotate.App/App$Node::.ctor()
+      .locals (class Rotate_rotate_u2_il.App/App$Node V_0)
+      IL_0000:  newobj     instance void Rotate_rotate_u2_il.App/App$Node::.ctor()
       IL_0005:  stloc.0
       IL_0006:  ldloc.0
       IL_0007:  ldc.i4.6
-      IL_0008:  call       instance void Rotate.App/App$Node::growTree(int32)
+      IL_0008:  call       instance void Rotate_rotate_u2_il.App/App$Node::growTree(int32)
       IL_000d:  ldloc.0
-      IL_000e:  call       instance void Rotate.App/App$Node::rotateTree()
+      IL_000e:  call       instance void Rotate_rotate_u2_il.App/App$Node::rotateTree()
       IL_0013:  ldc.i4    0x64
       IL_0018:  ret
     } // end of method 'App::Main'
@@ -245,7 +245,7 @@
       // Code size       11 (0xb)
       .maxstack  8
       IL_0000:  newobj     instance void ['mscorlib']System.Random::.ctor()
-      IL_0005:  stsfld     class ['mscorlib']System.Random Rotate.App::s_randomGen
+      IL_0005:  stsfld     class ['mscorlib']System.Random Rotate_rotate_u2_il.App::s_randomGen
       IL_000a:  ret
     } // end of method 'App::.cctor'
 
@@ -261,6 +261,6 @@
 
   } // end of class 'App'
 
-} // end of namespace 'Rotate'
+} // end of namespace 'Rotate_rotate_u2_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotate_u2_il_d.ilproj b/src/tests/JIT/Methodical/explicit/rotate/rotate_u2_il_d.ilproj
index 2f36c7ff6c6afb..83d375c840f576 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotate_u2_il_d.ilproj
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotate_u2_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotate_u2_il_r.ilproj b/src/tests/JIT/Methodical/explicit/rotate/rotate_u2_il_r.ilproj
index dca84acfd5751f..4c122b6e809893 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotate_u2_il_r.ilproj
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotate_u2_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/flowgraph/bug614098/intToByte.cs b/src/tests/JIT/Methodical/flowgraph/bug614098/intToByte.cs
index a1271faf1520b7..e24fb7b13d63ed 100644
--- a/src/tests/JIT/Methodical/flowgraph/bug614098/intToByte.cs
+++ b/src/tests/JIT/Methodical/flowgraph/bug614098/intToByte.cs
@@ -17,8 +17,11 @@
 */
 
 using System;
+using Xunit;
 
-internal class Program
+namespace Test_intToByte_cs
+{
+public class Program
 {
     private struct MyStruct
     {
@@ -31,7 +34,8 @@ public MyStruct(ushort value)
 
     static private MyStruct[] s_myObjects = { new MyStruct(0x0100) };
 
-    private static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         MyStruct obj = s_myObjects[0];
         ushort value = obj.value;
@@ -41,3 +45,4 @@ private static int Main()
         return (lowByteInt == 0) ? 100 : 101;
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/flowgraph/bug614098/intToByte.csproj b/src/tests/JIT/Methodical/flowgraph/bug614098/intToByte.csproj
index 30f43669245d40..1061232386ae76 100644
--- a/src/tests/JIT/Methodical/flowgraph/bug614098/intToByte.csproj
+++ b/src/tests/JIT/Methodical/flowgraph/bug614098/intToByte.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/flowgraph/bug619534/ILStackAllocRepro.il b/src/tests/JIT/Methodical/flowgraph/bug619534/ILStackAllocRepro.il
index fbd3d2fd3b9058..1680a9f1306bf4 100644
--- a/src/tests/JIT/Methodical/flowgraph/bug619534/ILStackAllocRepro.il
+++ b/src/tests/JIT/Methodical/flowgraph/bug619534/ILStackAllocRepro.il
@@ -12,11 +12,11 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib{auto}
 
-.class private auto ansi beforefieldinit Foo
+.class public auto ansi beforefieldinit Foo
        extends [mscorlib]System.Object
 {
   .field private static int32* buffer
-  .method private hidebysig static int32 Main() cil managed
+  .method public hidebysig static int32 Main() cil managed
   {
     .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
         01 00 00 00
diff --git a/src/tests/JIT/Methodical/flowgraph/bug619534/ILStackAllocRepro.ilproj b/src/tests/JIT/Methodical/flowgraph/bug619534/ILStackAllocRepro.ilproj
index abe450526a0a4c..d7337ca06de602 100644
--- a/src/tests/JIT/Methodical/flowgraph/bug619534/ILStackAllocRepro.ilproj
+++ b/src/tests/JIT/Methodical/flowgraph/bug619534/ILStackAllocRepro.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/flowgraph/bug619534/ehCodeMotion.cs b/src/tests/JIT/Methodical/flowgraph/bug619534/ehCodeMotion.cs
index 61cc0ae0a9da2f..dd78743393f846 100644
--- a/src/tests/JIT/Methodical/flowgraph/bug619534/ehCodeMotion.cs
+++ b/src/tests/JIT/Methodical/flowgraph/bug619534/ehCodeMotion.cs
@@ -15,10 +15,14 @@
 
 
 using System;
+using Xunit;
 
-internal class Program
+namespace Test_ehCodeMotion_cs
 {
-    private static int Main()
+public class Program
+{
+    [Fact]
+    public static int TestEntryPoint()
     {
         //Console.WriteLine("Main: " + new C().M());
         if (new C().M()) return 100; else return 101;
@@ -49,3 +53,4 @@ public bool M()
         return ret;
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/flowgraph/bug619534/ehCodeMotion.csproj b/src/tests/JIT/Methodical/flowgraph/bug619534/ehCodeMotion.csproj
index 7ee4eb252fbc05..f8e997fee587bf 100644
--- a/src/tests/JIT/Methodical/flowgraph/bug619534/ehCodeMotion.csproj
+++ b/src/tests/JIT/Methodical/flowgraph/bug619534/ehCodeMotion.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/flowgraph/bug619534/finallyclone.cs b/src/tests/JIT/Methodical/flowgraph/bug619534/finallyclone.cs
index d81493f9274b17..cecbfd066a40f0 100644
--- a/src/tests/JIT/Methodical/flowgraph/bug619534/finallyclone.cs
+++ b/src/tests/JIT/Methodical/flowgraph/bug619534/finallyclone.cs
@@ -11,12 +11,16 @@
  * */
 
 using System;
+using Xunit;
 
+namespace Test_finallyclone
+{
 class ApplicationException : Exception { }
 
 public class TestClass
 {
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         //this should return true;
         return Test() ? 100 : 101;
@@ -68,3 +72,4 @@ public static bool Test()
     }
 }
 
+}
diff --git a/src/tests/JIT/Methodical/flowgraph/bug619534/finallyclone.csproj b/src/tests/JIT/Methodical/flowgraph/bug619534/finallyclone.csproj
index 2e5c6ad6d9813b..281cbe5cc0a437 100644
--- a/src/tests/JIT/Methodical/flowgraph/bug619534/finallyclone.csproj
+++ b/src/tests/JIT/Methodical/flowgraph/bug619534/finallyclone.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/flowgraph/bug619534/moduleHandleCache.cs b/src/tests/JIT/Methodical/flowgraph/bug619534/moduleHandleCache.cs
index 00cb8348adf0a0..d55e2a4a9b7482 100644
--- a/src/tests/JIT/Methodical/flowgraph/bug619534/moduleHandleCache.cs
+++ b/src/tests/JIT/Methodical/flowgraph/bug619534/moduleHandleCache.cs
@@ -23,8 +23,11 @@ at Repro.Main() in c:\tests\Dev10\640711\app.cs:line 16
 
 using System;
 using System.Runtime.CompilerServices;
+using Xunit;
 
-static class Repro
+namespace Test_moduleHandleCache_cs
+{
+public static class Repro
 {
     [MethodImpl(MethodImplOptions.NoInlining)]
     static void Caller(bool b)
@@ -37,7 +40,8 @@ static void Caller(bool b)
         }
     }
 
-    static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         try
         {
@@ -50,3 +54,4 @@ static int Main()
         return 100;
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/flowgraph/bug619534/moduleHandleCache.csproj b/src/tests/JIT/Methodical/flowgraph/bug619534/moduleHandleCache.csproj
index 7d1a3b89ad5535..1eae335a9713f3 100644
--- a/src/tests/JIT/Methodical/flowgraph/bug619534/moduleHandleCache.csproj
+++ b/src/tests/JIT/Methodical/flowgraph/bug619534/moduleHandleCache.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/flowgraph/bug619534/twoEndFinallys.cs b/src/tests/JIT/Methodical/flowgraph/bug619534/twoEndFinallys.cs
index c5061549bfab27..61f516867f57aa 100644
--- a/src/tests/JIT/Methodical/flowgraph/bug619534/twoEndFinallys.cs
+++ b/src/tests/JIT/Methodical/flowgraph/bug619534/twoEndFinallys.cs
@@ -17,8 +17,11 @@
 
 using System;
 using System.Runtime.CompilerServices;
+using Xunit;
 
-internal class Test
+namespace Test_twoEndFinallys
+{
+public class Test
 {
     private int _temp;
     private static int s_result = 100;
@@ -28,7 +31,8 @@ private Test()
         _temp = 101;
     }
 
-    private static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         Test t = TwoEndFinallys(new string[] {});
         if (t._temp == 101)
@@ -97,3 +101,4 @@ private static Test dummyCall(int input)
     }
 }
 
+}
diff --git a/src/tests/JIT/Methodical/flowgraph/bug619534/twoEndFinallys.csproj b/src/tests/JIT/Methodical/flowgraph/bug619534/twoEndFinallys.csproj
index 6a4a24f53ffe11..5e399e6677fa95 100644
--- a/src/tests/JIT/Methodical/flowgraph/bug619534/twoEndFinallys.csproj
+++ b/src/tests/JIT/Methodical/flowgraph/bug619534/twoEndFinallys.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/flowgraph/bug619534/twoEndFinallys.il b/src/tests/JIT/Methodical/flowgraph/bug619534/twoEndFinallys.il
index 1d34d53210cc74..c9d6646e3aba83 100644
--- a/src/tests/JIT/Methodical/flowgraph/bug619534/twoEndFinallys.il
+++ b/src/tests/JIT/Methodical/flowgraph/bug619534/twoEndFinallys.il
@@ -31,7 +31,7 @@
 
 // =============== CLASS MEMBERS DECLARATION ===================
 
-.class private auto ansi beforefieldinit Test_twoEndFinallys
+.class public auto ansi beforefieldinit Test_twoEndFinallys
        extends [mscorlib]System.Object
 {
   .field private int32 temp
@@ -49,7 +49,7 @@
     IL_000e:  ret
   } // end of method Test::.ctor
 
-  .method private hidebysig static int32 
+  .method public hidebysig static int32 
           Main() cil managed
   {
     .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
diff --git a/src/tests/JIT/Methodical/flowgraph/bug619534/twoEndFinallys_il_r.ilproj b/src/tests/JIT/Methodical/flowgraph/bug619534/twoEndFinallys_il_r.ilproj
index 6ff753bddcc8ef..22adeb7d2c3d6a 100644
--- a/src/tests/JIT/Methodical/flowgraph/bug619534/twoEndFinallys_il_r.ilproj
+++ b/src/tests/JIT/Methodical/flowgraph/bug619534/twoEndFinallys_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/flowgraph/bug621705/ptuple_lost.cs b/src/tests/JIT/Methodical/flowgraph/bug621705/ptuple_lost.cs
index dabb3c53d8a8e5..58b13c5d2d8518 100644
--- a/src/tests/JIT/Methodical/flowgraph/bug621705/ptuple_lost.cs
+++ b/src/tests/JIT/Methodical/flowgraph/bug621705/ptuple_lost.cs
@@ -2,11 +2,13 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 namespace Test_ptuple_lost
 {
-internal class A
+public class A
 {
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         int[] arr = new int[10];
 
diff --git a/src/tests/JIT/Methodical/flowgraph/bug621705/ptuple_lost.csproj b/src/tests/JIT/Methodical/flowgraph/bug621705/ptuple_lost.csproj
index 0b596cbeea9a35..4a486c5df78e96 100644
--- a/src/tests/JIT/Methodical/flowgraph/bug621705/ptuple_lost.csproj
+++ b/src/tests/JIT/Methodical/flowgraph/bug621705/ptuple_lost.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/flowgraph/bug647189/ssa_tuIsAddr.cs b/src/tests/JIT/Methodical/flowgraph/bug647189/ssa_tuIsAddr.cs
index 19a1985109db20..0b85290af7c41e 100644
--- a/src/tests/JIT/Methodical/flowgraph/bug647189/ssa_tuIsAddr.cs
+++ b/src/tests/JIT/Methodical/flowgraph/bug647189/ssa_tuIsAddr.cs
@@ -8,8 +8,11 @@
  */
 
 using System;
+using Xunit;
 
-internal class Repro
+namespace Test_ssa_tuIsAddr_cs
+{
+public class Repro
 {
     private static int s_field0 = 0;
     private static int s_field1 = 1;
@@ -72,7 +75,8 @@ internal class Repro
     private static int s_field58 = 58;
     private static int s_field59 = 59;
 
-    private static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         s_field0 = 2;
         if (s_field0 == 2)
@@ -87,3 +91,4 @@ private static int Main()
         }
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/flowgraph/bug647189/ssa_tuIsAddr.csproj b/src/tests/JIT/Methodical/flowgraph/bug647189/ssa_tuIsAddr.csproj
index 69f158712fcf72..8dd28e3c1ae59a 100644
--- a/src/tests/JIT/Methodical/flowgraph/bug647189/ssa_tuIsAddr.csproj
+++ b/src/tests/JIT/Methodical/flowgraph/bug647189/ssa_tuIsAddr.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/flowgraph/dev10_bug642944/GCMaskForGSCookie.il b/src/tests/JIT/Methodical/flowgraph/dev10_bug642944/GCMaskForGSCookie.il
index 2d225ee80d9c4d..ae3c163f9b27b9 100644
--- a/src/tests/JIT/Methodical/flowgraph/dev10_bug642944/GCMaskForGSCookie.il
+++ b/src/tests/JIT/Methodical/flowgraph/dev10_bug642944/GCMaskForGSCookie.il
@@ -21,7 +21,7 @@
 
 // =============== CLASS MEMBERS DECLARATION ===================
 
-.class private auto ansi beforefieldinit JumpBug
+.class public auto ansi beforefieldinit JumpBug
        extends [mscorlib]System.Object
 {
   .method private hidebysig instance string 
@@ -45,7 +45,7 @@
     IL_0000:  jmp       instance string JumpBug::JumpCallTarget()
   } // end of method JumpBug::BugRepro
 
-  .method private hidebysig static int32 Main() cil managed
+  .method public hidebysig static int32 Main() cil managed
   {
     .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
         01 00 00 00
diff --git a/src/tests/JIT/Methodical/flowgraph/dev10_bug642944/GCMaskForGSCookie.ilproj b/src/tests/JIT/Methodical/flowgraph/dev10_bug642944/GCMaskForGSCookie.ilproj
index 4a536e26eea89e..edb7cf3c23accb 100644
--- a/src/tests/JIT/Methodical/flowgraph/dev10_bug642944/GCMaskForGSCookie.ilproj
+++ b/src/tests/JIT/Methodical/flowgraph/dev10_bug642944/GCMaskForGSCookie.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/flowgraph/dev10_bug675304/arrayDim.cs b/src/tests/JIT/Methodical/flowgraph/dev10_bug675304/arrayDim.cs
index 671e0e93a02b91..ae8b1b11453ccd 100644
--- a/src/tests/JIT/Methodical/flowgraph/dev10_bug675304/arrayDim.cs
+++ b/src/tests/JIT/Methodical/flowgraph/dev10_bug675304/arrayDim.cs
@@ -7,11 +7,13 @@
  * */
 
 using System;
+using Xunit;
 
 public class Test_arrayDim
 
 {
-    private static int Main()
+    [Fact]
+    public static int TestEntryPoint()
 
     {
         int[] iAr1 = null;
diff --git a/src/tests/JIT/Methodical/flowgraph/dev10_bug675304/arrayDim.csproj b/src/tests/JIT/Methodical/flowgraph/dev10_bug675304/arrayDim.csproj
index 2a69fa4aeb3aa8..def6c0b98d7844 100644
--- a/src/tests/JIT/Methodical/flowgraph/dev10_bug675304/arrayDim.csproj
+++ b/src/tests/JIT/Methodical/flowgraph/dev10_bug675304/arrayDim.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/flowgraph/dev10_bug675304/loopIV_init.il b/src/tests/JIT/Methodical/flowgraph/dev10_bug675304/loopIV_init.il
index 361604f4d9340a..271ede34486219 100644
--- a/src/tests/JIT/Methodical/flowgraph/dev10_bug675304/loopIV_init.il
+++ b/src/tests/JIT/Methodical/flowgraph/dev10_bug675304/loopIV_init.il
@@ -27,6 +27,8 @@
 
 
 
+.namespace Test_loopIV_init_il
+{
 .class private sequential ansi sealed beforefieldinit V
        extends [mscorlib]System.ValueType
 {
@@ -40,7 +42,7 @@
     .field public int64 FixedElementField
   } // end of class '<x>e__FixedBuffer0'
 
-  .field public valuetype V/'<x>e__FixedBuffer0' x
+  .field public valuetype Test_loopIV_init_il.V/'<x>e__FixedBuffer0' x
   .custom instance void [mscorlib]System.Runtime.CompilerServices.FixedBufferAttribute::.ctor(class [mscorlib]System.Type,
                                                                                               int32) = ( 01 00 59 53 79 73 74 65 6D 2E 49 6E 74 36 34 2C   // ..YSystem.Int64,
                                                                                                          20 6D 73 63 6F 72 6C 69 62 2C 20 56 65 72 73 69   //  mscorlib, Versi
@@ -49,25 +51,25 @@
                                                                                                          6C 69 63 4B 65 79 54 6F 6B 65 6E 3D 62 37 37 61   // licKeyToken=b77a
                                                                                                          35 63 35 36 31 39 33 34 65 30 38 39 E8 03 00 00   // 5c561934e089....
                                                                                                          00 00 ) 
-} // end of class V
+} // end of class Test_loopIV_init_il.V
 
-.class private abstract auto ansi sealed beforefieldinit Repro
+.class public abstract auto ansi sealed beforefieldinit Repro
        extends [mscorlib]System.Object
 {
-  .method private hidebysig static int32 Main() cil managed
+  .method public hidebysig static int32 Main() cil managed
   {
     .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
         01 00 00 00
     )
     .entrypoint
     .maxstack  3
-    .locals init (valuetype V V_0,
-             valuetype V/'<x>e__FixedBuffer0'& V_1,
+    .locals init (valuetype Test_loopIV_init_il.V V_0,
+             valuetype Test_loopIV_init_il.V/'<x>e__FixedBuffer0'& V_1,
              int32 V_2)
     IL_0000:  ldloca.s   V_0
-    IL_0002:  initobj    V
+    IL_0002:  initobj    Test_loopIV_init_il.V
     IL_0008:  ldloca.s   V_0
-    IL_000a:  ldflda     valuetype V/'<x>e__FixedBuffer0' V::x
+    IL_000a:  ldflda     valuetype Test_loopIV_init_il.V/'<x>e__FixedBuffer0' Test_loopIV_init_il.V::x
     IL_0016:  stloc.1
     IL_0017:  ldc.i4.0
     IL_0018:  stloc.2
@@ -92,9 +94,10 @@
     IL_0030:  blt.s      IL_0019
     IL_0032:  ldc.i4 100
     IL_0034:  ret
-  } // end of method Repro::Main
+  } // end of method Test_loopIV_init_il.Repro::Main
 
-} // end of class Repro
+} // end of class Test_loopIV_init_il.Repro
 
 
 
+}
diff --git a/src/tests/JIT/Methodical/flowgraph/dev10_bug675304/loopIV_init.ilproj b/src/tests/JIT/Methodical/flowgraph/dev10_bug675304/loopIV_init.ilproj
index 5d05b846621026..a16d7cb6656b01 100644
--- a/src/tests/JIT/Methodical/flowgraph/dev10_bug675304/loopIV_init.ilproj
+++ b/src/tests/JIT/Methodical/flowgraph/dev10_bug675304/loopIV_init.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/flowgraph/dev10_bug675304/osrAddovershot.cs b/src/tests/JIT/Methodical/flowgraph/dev10_bug675304/osrAddovershot.cs
index 7c5445dc3f93e6..0b05893ae3e3b3 100644
--- a/src/tests/JIT/Methodical/flowgraph/dev10_bug675304/osrAddovershot.cs
+++ b/src/tests/JIT/Methodical/flowgraph/dev10_bug675304/osrAddovershot.cs
@@ -23,13 +23,16 @@
 // PLEASE NOTE: You have to set complus_GCSTRESS=4 to see the AV.
 
 using System;
+using Xunit;
 
+namespace Test_osrAddovershot_cs
+{
 internal struct MyStruct
 {
     public int a, b, c, d, e, f, g, h;
 }
 
-internal static class Repro
+public static class Repro
 {
     private static int SumMSH(MyStruct[] ms)
     {
@@ -59,7 +62,8 @@ private static MyStruct[] InitMS(int length)
         return ms;
     }
 
-    private static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         MyStruct[] ms = InitMS(5); //InitMS(args.Length > 0 ? int.Parse(args[0]) : 5);
                                    //Do not expect to take in any arguments here for simplicity sake.
@@ -67,3 +71,4 @@ private static int Main()
         if (SumMSH(ms) == 115) return 100; else return 101;
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/flowgraph/dev10_bug675304/osrAddovershot.csproj b/src/tests/JIT/Methodical/flowgraph/dev10_bug675304/osrAddovershot.csproj
index 53a30666c38f9d..dea1e872f2deb5 100644
--- a/src/tests/JIT/Methodical/flowgraph/dev10_bug675304/osrAddovershot.csproj
+++ b/src/tests/JIT/Methodical/flowgraph/dev10_bug675304/osrAddovershot.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/EHCopyProp.cs b/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/EHCopyProp.cs
index 0a5dbdf70cd9a7..7fcfb6381df2d4 100644
--- a/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/EHCopyProp.cs
+++ b/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/EHCopyProp.cs
@@ -2,10 +2,12 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-internal static class Exploit
+public static class Exploit
 {
-    private static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         string s = "my string";
         IntPtr i = Helper.RetypeObject<IntPtr, string>(s);
diff --git a/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/EHCopyProp.csproj b/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/EHCopyProp.csproj
index 773fd8863f9d51..790258961e9e98 100644
--- a/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/EHCopyProp.csproj
+++ b/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/EHCopyProp.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/GCOverReporting.cs b/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/GCOverReporting.cs
index c1a36c5e4ec328..ed04df3a5aa957 100644
--- a/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/GCOverReporting.cs
+++ b/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/GCOverReporting.cs
@@ -32,6 +32,8 @@
 using System.Runtime.CompilerServices;
 using Xunit;
 
+namespace Test_GCOverReporting_cs
+{
 public struct MB8
 {
     public object foo;
@@ -107,3 +109,4 @@ public static int TestEntryPoint()
         return 100;
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/GCOverReporting.csproj b/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/GCOverReporting.csproj
index e701b06cebc4c1..8a6e5b3493de70 100644
--- a/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/GCOverReporting.csproj
+++ b/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/GCOverReporting.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/castClassEH.cs b/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/castClassEH.cs
index b79d02783e63c2..bf730ef0728664 100644
--- a/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/castClassEH.cs
+++ b/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/castClassEH.cs
@@ -13,8 +13,11 @@ This is a potential security exploit.
 
 using System;
 using System.Runtime.CompilerServices;
+using Xunit;
 
-internal static class Repro
+namespace Test_castClassEH_cs
+{
+public static class Repro
 {
     private class Helper<T>
     {
@@ -46,7 +49,8 @@ private static int reinterpret_cast<DestType, SrcType>(SrcType s)
         return ReturnVal;
     }
 
-    private static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         int exploit = reinterpret_cast<IntPtr, string>("Hello World!");
         Console.WriteLine(exploit);
@@ -54,3 +58,4 @@ private static int Main()
     }
 }
 
+}
diff --git a/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/castClassEH.csproj b/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/castClassEH.csproj
index 507fe743249f31..7d63fe458ca2d5 100644
--- a/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/castClassEH.csproj
+++ b/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/castClassEH.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/dependentLifetimes.il b/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/dependentLifetimes.il
index 4315a07720f9a4..84f262b562008a 100644
--- a/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/dependentLifetimes.il
+++ b/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/dependentLifetimes.il
@@ -21,10 +21,10 @@
 .assembly extern xunit.core {}
 
 
-.class private auto ansi beforefieldinit BugRepro
+.class public auto ansi beforefieldinit BugRepro
        extends [mscorlib]System.Object
 {
-  .method private hidebysig static int32 Main() cil managed
+  .method public hidebysig static int32 Main() cil managed
   {
     .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
         01 00 00 00
diff --git a/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/dependentLifetimes.ilproj b/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/dependentLifetimes.ilproj
index aeb38b936a4e1c..d9bc15848ca17f 100644
--- a/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/dependentLifetimes.ilproj
+++ b/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/dependentLifetimes.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/ehDescriptorPtrUpdate.ilproj b/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/ehDescriptorPtrUpdate.ilproj
index 1da085604dfe53..4621809061cddf 100644
--- a/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/ehDescriptorPtrUpdate.ilproj
+++ b/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/ehDescriptorPtrUpdate.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/fgloop.ilproj b/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/fgloop.ilproj
index 51f205b2fc2f16..289af161551450 100644
--- a/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/fgloop.ilproj
+++ b/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/fgloop.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/fgloop2.ilproj b/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/fgloop2.ilproj
index 25db9f2c7f254a..2b108f4bc8073a 100644
--- a/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/fgloop2.ilproj
+++ b/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/fgloop2.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/sealedCastVariance.cs b/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/sealedCastVariance.cs
index 30c46165e1e740..19f11b2ac387b8 100644
--- a/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/sealedCastVariance.cs
+++ b/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/sealedCastVariance.cs
@@ -6,14 +6,18 @@
  */
 
 using System;
+using Xunit;
 
-internal static class Repro
+namespace Test_sealedCastVariance_cs
+{
+public static class Repro
 {
     private static bool CheckType(Action<string> a)
     {
         return a.GetType() == typeof(Action<object>);
     }
-    private static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         Action<string> a = (Action<object>)Console.WriteLine;
         if (CheckType(a))
@@ -25,3 +29,4 @@ private static int Main()
         return 101;
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/sealedCastVariance.csproj b/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/sealedCastVariance.csproj
index 7965c2a30b38b6..3260400e738b37 100644
--- a/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/sealedCastVariance.csproj
+++ b/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/sealedCastVariance.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/singleRefField.cs b/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/singleRefField.cs
index 216ea7399ffbff..5279735491190a 100644
--- a/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/singleRefField.cs
+++ b/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/singleRefField.cs
@@ -11,6 +11,8 @@
 using System.Runtime.CompilerServices;
 using Xunit;
 
+namespace Test_singleRefField_cs
+{
 public struct MB8
 {
     public object foo;
@@ -74,3 +76,4 @@ public static int TestEntryPoint()
         return 100;
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/singleRefField.csproj b/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/singleRefField.csproj
index 07abc321942dd0..680bd55bf0a00d 100644
--- a/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/singleRefField.csproj
+++ b/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/singleRefField.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/zeroInitStackSlot.cs b/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/zeroInitStackSlot.cs
index fbd0e83f071af7..464c4706181402 100644
--- a/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/zeroInitStackSlot.cs
+++ b/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/zeroInitStackSlot.cs
@@ -8,7 +8,10 @@
 
 using System;
 using System.Runtime.CompilerServices;
+using Xunit;
 
+namespace Test_zeroInitStackSlot_cs
+{
 internal struct SqlBinary
 {
     private byte[] _value;
@@ -29,9 +32,10 @@ void IDisposable.Dispose()
 
 internal delegate bool WarehouseRowVersionQueryDelegate(WarehouseResultDatabase database, SqlBinary waterMark);
 
-internal class Repro
+public class Repro
 {
-    private static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         new Repro().ProcessResults(Query);
         return 100;
@@ -65,3 +69,4 @@ private void ProcessResults(WarehouseRowVersionQueryDelegate query)
         }
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/zeroInitStackSlot.csproj b/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/zeroInitStackSlot.csproj
index 82e13485e7d546..a64c23f1595ce6 100644
--- a/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/zeroInitStackSlot.csproj
+++ b/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/zeroInitStackSlot.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/flowgraph/dev10_bug679053/cpblkInt32.il b/src/tests/JIT/Methodical/flowgraph/dev10_bug679053/cpblkInt32.il
index 944e96d0e18cca..f3ffd9e7f5e0ff 100644
--- a/src/tests/JIT/Methodical/flowgraph/dev10_bug679053/cpblkInt32.il
+++ b/src/tests/JIT/Methodical/flowgraph/dev10_bug679053/cpblkInt32.il
@@ -6,7 +6,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib{auto}
 
-.class ILGEN_0xb8816d7d {
+.class public ILGEN_0xb8816d7d {
 
 //BEGIN STATIC FIELDS
 .field static native int[] field_0x0
@@ -163,7 +163,7 @@ End_Orphan_b_12:
 
  ret
 }
-.method static int32 Main() {
+.method public static int32 Main() {
 .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
     01 00 00 00
 )
diff --git a/src/tests/JIT/Methodical/flowgraph/dev10_bug679053/cpblkInt32.ilproj b/src/tests/JIT/Methodical/flowgraph/dev10_bug679053/cpblkInt32.ilproj
index 639d142a9396f3..bf7707061c97ac 100644
--- a/src/tests/JIT/Methodical/flowgraph/dev10_bug679053/cpblkInt32.ilproj
+++ b/src/tests/JIT/Methodical/flowgraph/dev10_bug679053/cpblkInt32.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/flowgraph/dev10_bug679053/flowgraph.il b/src/tests/JIT/Methodical/flowgraph/dev10_bug679053/flowgraph.il
index 27948d7eea3411..48355e1953170c 100644
--- a/src/tests/JIT/Methodical/flowgraph/dev10_bug679053/flowgraph.il
+++ b/src/tests/JIT/Methodical/flowgraph/dev10_bug679053/flowgraph.il
@@ -7,7 +7,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib{auto}
 
-.class ILGEN_0x97f1b6bf {
+.class public ILGEN_0x97f1b6bf {
 
 //BEGIN STATIC FIELDS
 .field static native int[] field_0x0
@@ -270,7 +270,7 @@ End_Orphan_b_15:
 conv.u2
  ret
 }
-.method static int32 Main() {
+.method public static int32 Main() {
 .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
     01 00 00 00
 )
diff --git a/src/tests/JIT/Methodical/flowgraph/dev10_bug679053/flowgraph.ilproj b/src/tests/JIT/Methodical/flowgraph/dev10_bug679053/flowgraph.ilproj
index 73f945c0567ba7..fd2499f1ea7ba9 100644
--- a/src/tests/JIT/Methodical/flowgraph/dev10_bug679053/flowgraph.ilproj
+++ b/src/tests/JIT/Methodical/flowgraph/dev10_bug679053/flowgraph.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/flowgraph/dev10_bug679053/regionLive.ilproj b/src/tests/JIT/Methodical/flowgraph/dev10_bug679053/regionLive.ilproj
index 711a2cfbbbdd0c..7733899d76906d 100644
--- a/src/tests/JIT/Methodical/flowgraph/dev10_bug679053/regionLive.ilproj
+++ b/src/tests/JIT/Methodical/flowgraph/dev10_bug679053/regionLive.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/flowgraph/dev10_bug679955/indexMinusOne.il b/src/tests/JIT/Methodical/flowgraph/dev10_bug679955/indexMinusOne.il
index 6a7ed96de0dcde..51182f91908e55 100644
--- a/src/tests/JIT/Methodical/flowgraph/dev10_bug679955/indexMinusOne.il
+++ b/src/tests/JIT/Methodical/flowgraph/dev10_bug679955/indexMinusOne.il
@@ -5,7 +5,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib{auto}
 
-.class ILGEN_0x52ea038a {
+.class public ILGEN_0x52ea038a {
 
 //BEGIN STATIC FIELDS
 .field static native int[] field_0x0
@@ -2517,7 +2517,7 @@ End_Orphan_b_188:
 ldelem.i4
  ret
 }
-.method static int32 Main() {
+.method public static int32 Main() {
 .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
     01 00 00 00
 )
diff --git a/src/tests/JIT/Methodical/flowgraph/dev10_bug679955/indexMinusOne.ilproj b/src/tests/JIT/Methodical/flowgraph/dev10_bug679955/indexMinusOne.ilproj
index 641a997cabae36..d264db37492138 100644
--- a/src/tests/JIT/Methodical/flowgraph/dev10_bug679955/indexMinusOne.ilproj
+++ b/src/tests/JIT/Methodical/flowgraph/dev10_bug679955/indexMinusOne.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/flowgraph/dev10_bug679955/volatileLocal1.il b/src/tests/JIT/Methodical/flowgraph/dev10_bug679955/volatileLocal1.il
index a8e3a9f56b7b6b..382da45abeafe3 100644
--- a/src/tests/JIT/Methodical/flowgraph/dev10_bug679955/volatileLocal1.il
+++ b/src/tests/JIT/Methodical/flowgraph/dev10_bug679955/volatileLocal1.il
@@ -5,7 +5,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib{auto}
 
-.class ILGEN_0xd01d9fe9 {
+.class public ILGEN_0xd01d9fe9 {
 
 //BEGIN STATIC FIELDS
 .field static	unsigned int32[] field_0x0
@@ -295,7 +295,7 @@ add
 neg
  ret
 }
-.method static int32 Main() {
+.method public static int32 Main() {
 .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
     01 00 00 00
 )
diff --git a/src/tests/JIT/Methodical/flowgraph/dev10_bug679955/volatileLocal1.ilproj b/src/tests/JIT/Methodical/flowgraph/dev10_bug679955/volatileLocal1.ilproj
index c6c30c42a1437d..e26f3ecb373ccc 100644
--- a/src/tests/JIT/Methodical/flowgraph/dev10_bug679955/volatileLocal1.ilproj
+++ b/src/tests/JIT/Methodical/flowgraph/dev10_bug679955/volatileLocal1.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/flowgraph/dev10_bug679955/volatileLocal2.il b/src/tests/JIT/Methodical/flowgraph/dev10_bug679955/volatileLocal2.il
index cdb10766e130b7..2bb49b9aa070fa 100644
--- a/src/tests/JIT/Methodical/flowgraph/dev10_bug679955/volatileLocal2.il
+++ b/src/tests/JIT/Methodical/flowgraph/dev10_bug679955/volatileLocal2.il
@@ -5,7 +5,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib{auto}
 
-.class ILGEN_0x537f7b0 {
+.class public ILGEN_0x537f7b0 {
 
 //BEGIN STATIC FIELDS
 .field static	unsigned int16[] field_0x0
@@ -1224,7 +1224,7 @@ End_Orphan_b_54:
 conv.r.un
  ret
 }
-.method static int32 Main() {
+.method public static int32 Main() {
 .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
     01 00 00 00
 )
diff --git a/src/tests/JIT/Methodical/flowgraph/dev10_bug679955/volatileLocal2.ilproj b/src/tests/JIT/Methodical/flowgraph/dev10_bug679955/volatileLocal2.ilproj
index 1fda0a0d173e4a..743ebcc081ce29 100644
--- a/src/tests/JIT/Methodical/flowgraph/dev10_bug679955/volatileLocal2.ilproj
+++ b/src/tests/JIT/Methodical/flowgraph/dev10_bug679955/volatileLocal2.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/flowgraph/dev10_bug723489/qMarkColon.cs b/src/tests/JIT/Methodical/flowgraph/dev10_bug723489/qMarkColon.cs
index be4eb2e9606443..7e1a24d317fd66 100644
--- a/src/tests/JIT/Methodical/flowgraph/dev10_bug723489/qMarkColon.cs
+++ b/src/tests/JIT/Methodical/flowgraph/dev10_bug723489/qMarkColon.cs
@@ -7,14 +7,18 @@
  */
 
 using System;
-internal class Repro
+using Xunit;
+namespace Test_qMarkColon_cs
+{
+public class Repro
 {
     public static bool MyEquals(object obj1, object obj2)
     {
         return ((obj1 as Version) == (obj2 as Version));
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         Version ver0 = null;
         Version ver1 = null;
@@ -26,3 +30,4 @@ public static int Main()
             return 101;
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/flowgraph/dev10_bug723489/qMarkColon.csproj b/src/tests/JIT/Methodical/flowgraph/dev10_bug723489/qMarkColon.csproj
index 464a41774f4b44..575db859d63e71 100644
--- a/src/tests/JIT/Methodical/flowgraph/dev10_bug723489/qMarkColon.csproj
+++ b/src/tests/JIT/Methodical/flowgraph/dev10_bug723489/qMarkColon.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/fp/apps/BouncingBall.cs b/src/tests/JIT/Methodical/fp/apps/BouncingBall.cs
index 0d509c897fc57e..3ca0bdde807b18 100644
--- a/src/tests/JIT/Methodical/fp/apps/BouncingBall.cs
+++ b/src/tests/JIT/Methodical/fp/apps/BouncingBall.cs
@@ -4,11 +4,13 @@
 // Method:  Simulate a bouncing ball based on the laws of physics.
 
 using System;
+using Xunit;
 
-class BouncingBall
+public class BouncingBall
 {
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         double coef;
         double height;
diff --git a/src/tests/JIT/Methodical/fp/apps/bouncingball_cs_d.csproj b/src/tests/JIT/Methodical/fp/apps/bouncingball_cs_d.csproj
index 32da5cfca5aa75..9134647338312d 100644
--- a/src/tests/JIT/Methodical/fp/apps/bouncingball_cs_d.csproj
+++ b/src/tests/JIT/Methodical/fp/apps/bouncingball_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/fp/apps/bouncingball_cs_do.csproj b/src/tests/JIT/Methodical/fp/apps/bouncingball_cs_do.csproj
index 0ea05c8b1b9c6a..1651a052d23542 100644
--- a/src/tests/JIT/Methodical/fp/apps/bouncingball_cs_do.csproj
+++ b/src/tests/JIT/Methodical/fp/apps/bouncingball_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/fp/apps/bouncingball_cs_r.csproj b/src/tests/JIT/Methodical/fp/apps/bouncingball_cs_r.csproj
index 21d70bd3babba7..c4b2d271142026 100644
--- a/src/tests/JIT/Methodical/fp/apps/bouncingball_cs_r.csproj
+++ b/src/tests/JIT/Methodical/fp/apps/bouncingball_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/fp/apps/bouncingball_cs_ro.csproj b/src/tests/JIT/Methodical/fp/apps/bouncingball_cs_ro.csproj
index 2ae6bbde3ae862..212b7343181098 100644
--- a/src/tests/JIT/Methodical/fp/apps/bouncingball_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/fp/apps/bouncingball_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/fp/exgen/1000w1d.cs b/src/tests/JIT/Methodical/fp/exgen/1000w1d.cs
index 4ff5fc547b3197..fff286bd0bcb6e 100644
--- a/src/tests/JIT/Methodical/fp/exgen/1000w1d.cs
+++ b/src/tests/JIT/Methodical/fp/exgen/1000w1d.cs
@@ -2,7 +2,10 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
-internal unsafe class testout1
+using Xunit;
+namespace Test_1000w1d
+{
+public unsafe class testout1
 {
     public struct VT_0
     {
@@ -660,7 +663,8 @@ public static int Func_0()
         return Convert.ToInt32((Convert.ToInt32(((((Convert.ToDouble(Convert.ToDecimal(asgop120) / Convert.ToDecimal((Convert.ToDecimal(asgop23) / (Convert.ToDecimal((Convert.ToInt32(Convert.ToUInt16(asgop0 + vtstatic_0.a272_0)) - Convert.ToInt32(38126L / clstatic_0.a14_0))) * (Convert.ToDecimal(asgop162) / -128M))))) + (Convert.ToUInt64(Convert.ToUInt32(Convert.ToUInt32((Convert.ToInt32(Convert.ToInt64(asgop6) - Convert.ToInt64((s_a261_0)))) / cl_0.a50_0)) + Convert.ToInt64(Convert.ToInt64(Convert.ToUInt16(Convert.ToUInt16(Convert.ToInt64(asgop149) + Convert.ToInt64(vtstatic_0.a356_0))) - Convert.ToInt64(Convert.ToInt64(Convert.ToUInt32(s_a105_0) - Convert.ToInt64(a452_0)))))) / (Convert.ToUInt32((Convert.ToInt32((Convert.ToInt32(s_a65_0) - (Convert.ToInt32(vtstatic_0.arr2d_0[2, 47] * clstatic_0.a14_0))) * asgop111)) * asgop86) * ((Convert.ToUInt16(Convert.ToInt32((2816 + s_a219_0)) - Convert.ToInt32(cl_0.a311_0))) * (asgop154 / -3.4750246253123208E+25))))) + asgop30) - (((((((Convert.ToDouble(vtstatic_0.a272_0 * (clstatic_0.a14_0 / clstatic_0.a172_0))) + s_a139_0) + (Convert.ToInt16(0.001953125F + 2815.998F) * s_a150_0)) + asgop95) - ((Convert.ToInt64(Convert.ToInt32((Convert.ToInt32(s_a65_0) - ((2816 + (Convert.ToInt32(s_a101_0 + -1731306277.1818183)))))) - Convert.ToInt64(Convert.ToInt64(Convert.ToDouble(Convert.ToInt64(Convert.ToInt32(s_a158_0) - Convert.ToInt64(-1731287084L))) / 2.5781110577566729E-10))) / (vtstatic_0.a113_0 * 3.7256973298300746E-08)))) - (Convert.ToUInt64(Convert.ToInt16(Convert.ToInt16((Convert.ToInt16(vtstatic_0.a48_0 + 2809M) / 1) * Convert.ToSingle(Convert.ToSingle((Convert.ToUInt16(vtstatic_0.a113_0 / 45412.999868849016)) * (2815.998F / clstatic_0.a135_0))))) - Convert.ToInt64(Convert.ToInt64(Convert.ToDouble(Convert.ToInt64(Convert.ToInt32((Convert.ToInt32(vtstatic_0.a113_0 * clstatic_0.a14_0))) + Convert.ToInt64(asgop171))) / ((-1735519511L / -46582407462475096.0) - (asgop166))))) / ((((Convert.ToUInt32((a436_0 + 0.0) + 3897661180.3377886)) * 9.1496436869845726E-09) + asgop144) - ((Convert.ToInt32(1731325207L / clstatic_0.a14_0) / asgop17))))) - ((Convert.ToSingle(Convert.ToUInt32(Convert.ToUInt16(Convert.ToInt32(1731325207L / clstatic_0.a14_0) / Convert.ToSingle(45413F)) + (Convert.ToInt32((Convert.ToInt32(asgop161 * (Convert.ToInt64(Convert.ToInt64(vtstatic_0.a272_0 - 37995UL) / clstatic_0.a14_0)))) * (vtstatic_0.a113_0 / asgop156)))) / (Convert.ToDouble((Convert.ToUInt64(Convert.ToUInt64(Convert.ToInt16(asgop13) + Convert.ToInt64(37995L)) / Convert.ToUInt64(Convert.ToUInt16(Convert.ToUInt16(Convert.ToSingle(37995UL / 0.83665470239799178) + vtstatic_0.a431_0)) + Convert.ToInt64(-38123L)))) * (asgop82 / (s_a65_0 / -1592863.3581561216))))) / ((Convert.ToUInt16((Convert.ToInt32((Convert.ToInt32((Convert.ToInt32((Convert.ToInt32(Convert.ToInt64(-38123L) - Convert.ToInt64((-1731363330L)))) * (vtstatic_0.a113_0 * 5.4913969573838816E-10))))) % (Convert.ToInt32(Convert.ToInt32(Convert.ToDecimal(Convert.ToInt32(vtstatic_0.a113_0 / 1.05181293921208)) / vtstatic_0.a266_0))))) / Convert.ToSingle(asgop21)) * ((Convert.ToUInt16(vtstatic_0.arr2d_0[2, 25] / 43175.928129262407)) / (-41442.11F * asgop104))) * (Convert.ToSingle(Convert.ToUInt32(vtstatic_0.arr2d_0[2, 25] * a369_0) * (-38123L / asgop101)) * (Convert.ToUInt16(vtstatic_0.arr2d_0[2, 25] / Convert.ToSingle(43175.9258F)) / asgop52))))))) - ((Convert.ToInt16(Convert.ToInt64(Convert.ToInt64(Convert.ToInt16(Convert.ToInt16(Convert.ToUInt16((Convert.ToDecimal(asgop71) / asgop167) - asgop80) - Convert.ToUInt16(Convert.ToInt16(Convert.ToDecimal((Convert.ToInt16(27759 / Convert.ToSingle(9.857599F)) / Convert.ToInt16(s_a105_0 - 3897661215U))) / 0.0935361721915897163356141633M) * Convert.ToSingle(Convert.ToSingle(s_a65_0 * asgop59))))) - Convert.ToInt64(Convert.ToInt64(Convert.ToInt32((Convert.ToInt32((Convert.ToUInt16(vtstatic_0.arr2d_0[2, 25] / (vtstatic_0.arr2d_0[2, 25] * (s_a65_0 / vt_0.a191_0))))) + asgop128)) + Convert.ToInt64((Convert.ToInt64(Convert.ToInt64(Convert.ToUInt32(s_a105_0) - Convert.ToInt64(Convert.ToInt64(Convert.ToUInt16(Convert.ToUInt16(Convert.ToDecimal(27759) * 1.3733924132713714470982384092M)) - Convert.ToInt64(-3897623091L))))) * Convert.ToInt64((Convert.ToInt64(Convert.ToDouble(-3897623091L) / clstatic_0.a490_0) + -725656033019148410L)))))))) + Convert.ToInt64(((Convert.ToInt64(asgop2) + Convert.ToInt64(Convert.ToInt32((Convert.ToInt32(s_arr1d_0[353] * vt_0.a327_0))) + Convert.ToInt64((Convert.ToInt64(Convert.ToInt16(27759) + Convert.ToInt64(clstatic_0.a461_0)) - (asgop102))))) + Convert.ToInt64(Convert.ToInt32(((Convert.ToInt32((Convert.ToUInt16(7.5655281721000671E-07 - (asgop37)))) - ((Convert.ToInt32(s_arr1d_0[353] / (s_arr1d_0[353] / 1424492376.0)) / Convert.ToInt32(0.0935361721915897M - 1.0935361721915897M)))) * (Convert.ToInt32(Convert.ToInt64(Convert.ToInt64(Convert.ToUInt32(s_a105_0) - Convert.ToInt64(-2453101145507960936L))) + Convert.ToInt64(Convert.ToInt64(Convert.ToUInt16(s_a65_0) - Convert.ToInt64(s_a15_0))))))) - Convert.ToInt64(Convert.ToInt64(Convert.ToUInt32(s_a92_0) - Convert.ToInt64(Convert.ToInt64(Convert.ToInt16(Convert.ToInt16(Convert.ToInt16(s_a92_0 - 3450200465U) - vtstatic_0.a119_0)) + Convert.ToInt64(asgop73))))))))) * ((Convert.ToDouble((Convert.ToUInt64(Convert.ToInt16(Convert.ToInt16((Convert.ToInt16(Convert.ToInt16(vtstatic_0.a119_0 / Convert.ToSingle(1.9921056F)))) % (Convert.ToInt16(Convert.ToInt16(vt_0.a32_0 * ((s_arr1d_0[353] / -5811.2136188331888) * (vt_0.a32_0 / clstatic_0.a390_0))))))) + Convert.ToInt64(Convert.ToInt64(Convert.ToDouble(asgop158) / asgop165))) * asgop94) * asgop57)) / (((asgop50 / (asgop18 / asgop54)) - ((Convert.ToInt64(Convert.ToDouble(asgop114) / (Convert.ToUInt32(arr3d_0[4, 237, 3] * 2.0125482504315224) * clstatic_0.a487_0)) / ((2816 / asgop88) - (Convert.ToInt64(Convert.ToDouble(clstatic_0.a14_0) / (2816 / -4827586734080.0)) / asgop90))))) - ((((2816 * (9.857599F * -75.548544143842989)) - cl_0.a49_0) + ((Convert.ToSingle(s_a92_0 / clstatic_0.a379_0) * (arr3d_0[4, 237, 3] / -1329.724264912511)) - (Convert.ToDouble(asgop140 * (s_a65_0 / s_a147_0))))))))))) + ((((Convert.ToSingle(Convert.ToInt16(Convert.ToInt16(Convert.ToInt32(vt_0.arr3d_0[4, 71, 3]) + Convert.ToInt32((Convert.ToInt32(Convert.ToInt64(-1714341880L) - Convert.ToInt64((-289823010L)))))) * (Convert.ToUInt64(Convert.ToInt32(clstatic_0.a125_0) + Convert.ToInt64(Convert.ToInt64(Convert.ToDouble(Convert.ToInt64(Convert.ToDouble(-289823010L) * -9.6610686639407962E-06)) / 1.96557590602558E-06))) / (Convert.ToDouble(Convert.ToUInt64(Convert.ToUInt16(s_a65_0) - Convert.ToInt64(asgop105)) * 0.47619047619047616)))) / (((s_a65_0 * 1.2490569619936947E-05) - clstatic_0.a306_0) + (((Convert.ToUInt32(clstatic_0.a125_0 / Convert.ToSingle(-0.412876725F)) / (asgop173 - 226969.69494047618)) - 0.0) - (asgop12)))) - Convert.ToSingle(Convert.ToUInt16(asgop28 * Convert.ToSingle(Convert.ToSingle(asgop1 / (1 * ((*a479_0)))))) / (Convert.ToUInt32(Convert.ToInt32(Convert.ToDecimal(s_arr1d_0[9]) * 0.9999980231961172123567096051M) / Convert.ToSingle(cl_0.a30_0)) / asgop4))) / ((Convert.ToUInt16((Convert.ToInt32(1424522711M - vt_0.a275_0) - ((Convert.ToInt32(asgop136 + asgop127)))) / Convert.ToSingle(Convert.ToSingle(Convert.ToInt16(s_a351_0 + -3840M) / ((1 + (1 + clstatic_0.arr2d_0[2, 403])) * s_a320_0)))) * (Convert.ToSingle(Convert.ToUInt32(vtstatic_0.a231_0 + 1714341887UL) / (Convert.ToDouble(Convert.ToDecimal(-3840M) / Convert.ToDecimal(-20122720931645959.577092140687M)) + asgop138)) * (asgop157 / s_a44_0))) - vt_0.a20_0)) + (((((Convert.ToInt16(Convert.ToInt64(Convert.ToInt64(Convert.ToDouble(38123L) * vtstatic_0.a493_0)) - Convert.ToInt64(Convert.ToInt64(Convert.ToInt16(1) + Convert.ToInt64(4681581972605108222L)))) * ((1714341887UL / clstatic_0.arr1d_0[371]) - (vt_0.a29_0))) + asgop123) - ((asgop77 * (Convert.ToUInt64(Convert.ToUInt32(s_a92_0) - Convert.ToInt64(1735886337L)) / vtstatic_0.a255_0)))) - (Convert.ToDouble(Convert.ToDecimal((Convert.ToDecimal((Convert.ToInt32((Convert.ToInt32((Convert.ToInt32(vtstatic_0.a255_0 + clstatic_0.arr1d_0[215])) * (s_a65_0 / 38123.99981661429))) * (clstatic_0.a21_0 / ((*a114_0)))))) / (Convert.ToDecimal(Convert.ToInt64(Convert.ToDouble(Convert.ToInt64(Convert.ToInt32(asgop119) + Convert.ToInt64(Convert.ToInt64(Convert.ToUInt16(s_a65_0) - Convert.ToInt64(-4681581972397180400L))))) * -6.8352963137785907E-18)) / (Convert.ToDecimal(Convert.ToInt16(Convert.ToInt64(clstatic_0.a69_0) - Convert.ToInt64((Convert.ToInt64(Convert.ToUInt32(s_a92_0) - Convert.ToInt64(a206_0)))))) * (Convert.ToDecimal(Convert.ToInt16(Convert.ToInt32(386662224) + Convert.ToInt32(s_arr2d_0[2, 309]))) / (Convert.ToDecimal(1) * vtstatic_0.a475_0)))))) * Convert.ToDecimal(asgop34)))) - ((((Convert.ToSingle(asgop70 / (8823 / 141168.0)) - (asgop53)) * Convert.ToSingle(asgop11 / ((8823 / s_a477_0) + (asgop131 / clstatic_0.a432_0)))) / ((Convert.ToUInt16(asgop39 / ((Convert.ToInt64(Convert.ToInt64(Convert.ToDouble(a206_0) / -107819633.03125)) * Convert.ToInt64(clstatic_0.a14_0)) / (Convert.ToSingle(1 / clstatic_0.a322_0) / (s_a65_0 / -697196.373046875))))) * (vtstatic_0.arr1d_0[205] * (32.0F / (s_a65_0 / 2.6601794673711162E-08))))) - ((((asgop75 * (s_a65_0 / -0.07271575927734375)) + (37453 * 444.45422262569087)) - (Convert.ToUInt32(Convert.ToDecimal(((Convert.ToInt32(Convert.ToInt64(clstatic_0.a14_0) + Convert.ToInt64(Convert.ToInt64(clstatic_0.a21_0 + cl_0.a270_0)))) / cl_0.arr3d_0[4, 19, 3])) / 0.3571276361416189114315102123M) / asgop35)))))) + ((((Convert.ToInt16((Convert.ToInt16(Convert.ToInt16((Convert.ToInt16(Convert.ToInt16(Convert.ToInt32(cl_0.arr3d_0[4, 19, 3]) + Convert.ToInt32(s_arr2d_0[2, 247])))) % (Convert.ToInt16(cl_0.a480_0))))) % (Convert.ToInt16(Convert.ToInt16(Convert.ToInt16(Convert.ToInt16(Convert.ToUInt16(Convert.ToInt32(s_arr2d_0[2, 247]) + Convert.ToInt32(8730)) - 25144) * 1) / (clstatic_0.a197_0 * 1242.7939262472885))))) * (Convert.ToUInt16(Convert.ToUInt16(Convert.ToInt16(Convert.ToInt16(1 * clstatic_0.a14_0) / s_a148_0) * asgop100) + (Convert.ToUInt16((Convert.ToUInt16(65536.0F - clstatic_0.a413_0)) % 21556))) * (Convert.ToUInt16(Convert.ToDecimal(Convert.ToInt16(1714341888U - 1714329579U)) * clstatic_0.a162_0) * s_a245_0))) - (asgop126)) - (((((clstatic_0.a151_0 / clstatic_0.arr1d_0[414]) - s_a238_0) + (asgop14 / asgop122)) + asgop91) + ((asgop19 * ((1714341888U / asgop64) / ((Convert.ToUInt16(32768.0F - (-19275.0F))) * (52043 / vt_0.a35_0)))) + asgop55))) - (((((Convert.ToUInt16(clstatic_0.a151_0 * ((*a347_0))) / (-1.52587891E-05F / asgop96)) + (Convert.ToDouble(Convert.ToUInt64(Convert.ToUInt32(Convert.ToUInt32(vt_0.arr3d_0[4, 315, 3] * (1714341888U / asgop168))) - Convert.ToInt64(Convert.ToInt64(Convert.ToInt16(Convert.ToInt16(clstatic_0.a151_0 / cl_0.arr3d_0[4, 19, 3])) + Convert.ToInt64(Convert.ToInt64(Convert.ToInt32(cl_0.arr3d_0[4, 19, 3]) + Convert.ToInt64(vt_0.a199_0)))))) * (Convert.ToInt64(clstatic_0.a21_0 + clstatic_0.a21_0) / (clstatic_0.a151_0 * (-1.52587891E-05F * -553.00995451249253)))))) - asgop93) - (((Convert.ToUInt64(Convert.ToUInt64((Convert.ToInt64(Convert.ToDouble(Convert.ToInt64(Convert.ToInt32(Convert.ToInt32(clstatic_0.a14_0 / (Convert.ToInt64(clstatic_0.a14_0 / clstatic_0.a14_0)))) + Convert.ToInt64(Convert.ToInt64(Convert.ToUInt16(52043) + Convert.ToInt64(1177416765L))))) * asgop163) - (s_a116_0)) + Convert.ToInt64(Convert.ToInt32(arr3d_0[4, 182, 3]) - Convert.ToInt64(Convert.ToInt64(Convert.ToInt16(Convert.ToInt16(Convert.ToInt64(s_a116_0) + Convert.ToInt64(4225041378952953975L))) - Convert.ToInt64(clstatic_0.a377_0))))) / asgop36)) / ((((clstatic_0.a21_0 / asgop118) - 0.0) * ((Convert.ToUInt16((vtstatic_0.a276_0 / clstatic_0.arr1d_0[363]) - (asgop83))) / asgop24)) - (((Convert.ToDouble(Convert.ToInt64(Convert.ToDouble(clstatic_0.a377_0) / vtstatic_0.a408_0) * clstatic_0.a57_0)) + ((Convert.ToDouble(-4685L * (vtstatic_0.a276_0 * 4.4491889804765315E-11))) + asgop41)))))))))))));
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         vtstatic_0.a8_0 = -0.029533917859225767;
         vtstatic_0.a20_0 = 0.0;
@@ -747,3 +751,4 @@ public static int Main()
         return retval;
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/fp/exgen/1000w1d_cs_d.csproj b/src/tests/JIT/Methodical/fp/exgen/1000w1d_cs_d.csproj
index 3ca96487697a48..38a802708c79e4 100644
--- a/src/tests/JIT/Methodical/fp/exgen/1000w1d_cs_d.csproj
+++ b/src/tests/JIT/Methodical/fp/exgen/1000w1d_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/fp/exgen/1000w1d_cs_do.csproj b/src/tests/JIT/Methodical/fp/exgen/1000w1d_cs_do.csproj
index c1f8c1fa83fb53..e57ef0dd496901 100644
--- a/src/tests/JIT/Methodical/fp/exgen/1000w1d_cs_do.csproj
+++ b/src/tests/JIT/Methodical/fp/exgen/1000w1d_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/fp/exgen/1000w1d_cs_r.csproj b/src/tests/JIT/Methodical/fp/exgen/1000w1d_cs_r.csproj
index 0c32734c024d00..702d8f64415552 100644
--- a/src/tests/JIT/Methodical/fp/exgen/1000w1d_cs_r.csproj
+++ b/src/tests/JIT/Methodical/fp/exgen/1000w1d_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/fp/exgen/1000w1d_cs_ro.csproj b/src/tests/JIT/Methodical/fp/exgen/1000w1d_cs_ro.csproj
index a5e83c9ff2ccd1..fb2aa19baede13 100644
--- a/src/tests/JIT/Methodical/fp/exgen/1000w1d_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/fp/exgen/1000w1d_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/fp/exgen/10w250d.cs b/src/tests/JIT/Methodical/fp/exgen/10w250d.cs
index cb88e079841ec6..a205a1659fb4a6 100644
--- a/src/tests/JIT/Methodical/fp/exgen/10w250d.cs
+++ b/src/tests/JIT/Methodical/fp/exgen/10w250d.cs
@@ -3,7 +3,10 @@
 
 
 using System;
-internal unsafe class testout1
+using Xunit;
+namespace Test_10w250d
+{
+public unsafe class testout1
 {
     public struct VT_0_1_1_1_1_1_1_1_1_1_1_1_1_1_1_1_1_1_1_1_1_1_1_1_1_1_1_1_1_1_1_1_1_1_1_1_1_1_1_1_1
     {
@@ -4283,7 +4286,8 @@ public static double Func_0()
         return retval_0;
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         s_arr2d_0[2, 0] = -0.000244140625;
 
@@ -4297,3 +4301,4 @@ public static int Main()
         return retval;
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/fp/exgen/10w250d_cs_d.csproj b/src/tests/JIT/Methodical/fp/exgen/10w250d_cs_d.csproj
index b9248b47951ca7..ef7f81673659c6 100644
--- a/src/tests/JIT/Methodical/fp/exgen/10w250d_cs_d.csproj
+++ b/src/tests/JIT/Methodical/fp/exgen/10w250d_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/fp/exgen/10w250d_cs_do.csproj b/src/tests/JIT/Methodical/fp/exgen/10w250d_cs_do.csproj
index ae45d85f907098..667c75031820d9 100644
--- a/src/tests/JIT/Methodical/fp/exgen/10w250d_cs_do.csproj
+++ b/src/tests/JIT/Methodical/fp/exgen/10w250d_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/fp/exgen/10w250d_cs_r.csproj b/src/tests/JIT/Methodical/fp/exgen/10w250d_cs_r.csproj
index 94af25d38998c7..eab2c32e9c7a1a 100644
--- a/src/tests/JIT/Methodical/fp/exgen/10w250d_cs_r.csproj
+++ b/src/tests/JIT/Methodical/fp/exgen/10w250d_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/fp/exgen/10w250d_cs_ro.csproj b/src/tests/JIT/Methodical/fp/exgen/10w250d_cs_ro.csproj
index 4bfc9ea7f7c413..1fe81f4529e75d 100644
--- a/src/tests/JIT/Methodical/fp/exgen/10w250d_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/fp/exgen/10w250d_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/fp/exgen/10w5d.cs b/src/tests/JIT/Methodical/fp/exgen/10w5d.cs
index ccd43ee3426c55..d42ff9b01d72f7 100644
--- a/src/tests/JIT/Methodical/fp/exgen/10w5d.cs
+++ b/src/tests/JIT/Methodical/fp/exgen/10w5d.cs
@@ -2,7 +2,10 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
-unsafe class testout1
+using Xunit;
+namespace Test_10w5d
+{
+public unsafe class testout1
 {
 
     public struct VT_0_6_6_6_2
@@ -36315,7 +36318,8 @@ public static int Func_0()
         return retval_0;
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
 
 
@@ -36329,3 +36333,4 @@ public static int Main()
         return retval;
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/fp/exgen/10w5d_cs_d.csproj b/src/tests/JIT/Methodical/fp/exgen/10w5d_cs_d.csproj
index d9e03b8c1d2927..4b23107f7fde9c 100644
--- a/src/tests/JIT/Methodical/fp/exgen/10w5d_cs_d.csproj
+++ b/src/tests/JIT/Methodical/fp/exgen/10w5d_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <!-- NOTE: this test simply takes too long to complete under GC stress/heap verify; it is not fundamentally incompatible -->
     <GCStressIncompatible Condition="'$(TargetArchitecture)' == 'x86'">true</GCStressIncompatible>
     <HeapVerifyIncompatible>true</HeapVerifyIncompatible>
diff --git a/src/tests/JIT/Methodical/fp/exgen/10w5d_cs_do.csproj b/src/tests/JIT/Methodical/fp/exgen/10w5d_cs_do.csproj
index bcdf9f91e0051c..472e6176b5c2c4 100644
--- a/src/tests/JIT/Methodical/fp/exgen/10w5d_cs_do.csproj
+++ b/src/tests/JIT/Methodical/fp/exgen/10w5d_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/fp/exgen/10w5d_cs_r.csproj b/src/tests/JIT/Methodical/fp/exgen/10w5d_cs_r.csproj
index 164352e001623f..66cf4d42911c03 100644
--- a/src/tests/JIT/Methodical/fp/exgen/10w5d_cs_r.csproj
+++ b/src/tests/JIT/Methodical/fp/exgen/10w5d_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <!-- NOTE: this test simply takes too long to complete under GC stress/heap verify; it is not fundamentally incompatible -->
     <GCStressIncompatible Condition="'$(TargetArchitecture)' == 'x86'">true</GCStressIncompatible>
     <HeapVerifyIncompatible>true</HeapVerifyIncompatible>
diff --git a/src/tests/JIT/Methodical/fp/exgen/10w5d_cs_ro.csproj b/src/tests/JIT/Methodical/fp/exgen/10w5d_cs_ro.csproj
index 663029758a9023..c578348dfc34c9 100644
--- a/src/tests/JIT/Methodical/fp/exgen/10w5d_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/fp/exgen/10w5d_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/fp/exgen/200w1d-01.cs b/src/tests/JIT/Methodical/fp/exgen/200w1d-01.cs
index 3068f47549512b..4014254bd4d9c4 100644
--- a/src/tests/JIT/Methodical/fp/exgen/200w1d-01.cs
+++ b/src/tests/JIT/Methodical/fp/exgen/200w1d-01.cs
@@ -3,7 +3,10 @@
 
 
 using System;
-internal unsafe class testout1
+using Xunit;
+namespace Test_200w1d_01
+{
+public unsafe class testout1
 {
     private static double s_a3_0 = 134217728.0;
     private static double s_a9_0 = 2.0;
@@ -181,7 +184,8 @@ public static double Func_0()
         return Convert.ToDouble(((((((asgop50 / asgop78) - ((asgop39 / (asgop79 * 33.032258064516128)))) + ((*a24_0))) + (asgop20 * (((asgop68 / 0.25) + 0.0) - (*a36_0)))) * ((asgop51 / asgop66) + ((((asgop5 / asgop81) + s_a75_0) + s_a25_0) * s_a87_0))) + ((asgop26 * asgop49) + (s_a58_0 * ((arr3d_0[4, 47, 3] / ((asgop73 * s_a71_0) - (s_a45_0))) - asgop37)))));
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         int retval;
         retval = Convert.ToInt32(Func_0());
@@ -193,3 +197,4 @@ public static int Main()
         return retval;
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/fp/exgen/200w1d-01_cs_d.csproj b/src/tests/JIT/Methodical/fp/exgen/200w1d-01_cs_d.csproj
index c1fac2c5c69d9d..524df0679243b0 100644
--- a/src/tests/JIT/Methodical/fp/exgen/200w1d-01_cs_d.csproj
+++ b/src/tests/JIT/Methodical/fp/exgen/200w1d-01_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/fp/exgen/200w1d-01_cs_do.csproj b/src/tests/JIT/Methodical/fp/exgen/200w1d-01_cs_do.csproj
index 82b50a6032e13b..51a861e76bec63 100644
--- a/src/tests/JIT/Methodical/fp/exgen/200w1d-01_cs_do.csproj
+++ b/src/tests/JIT/Methodical/fp/exgen/200w1d-01_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/fp/exgen/200w1d-01_cs_r.csproj b/src/tests/JIT/Methodical/fp/exgen/200w1d-01_cs_r.csproj
index d7e38d1ecc1a75..a26a42619b79dc 100644
--- a/src/tests/JIT/Methodical/fp/exgen/200w1d-01_cs_r.csproj
+++ b/src/tests/JIT/Methodical/fp/exgen/200w1d-01_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/fp/exgen/200w1d-01_cs_ro.csproj b/src/tests/JIT/Methodical/fp/exgen/200w1d-01_cs_ro.csproj
index 930a99b26f0adc..6c56375341a1f6 100644
--- a/src/tests/JIT/Methodical/fp/exgen/200w1d-01_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/fp/exgen/200w1d-01_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/fp/exgen/200w1d-02.cs b/src/tests/JIT/Methodical/fp/exgen/200w1d-02.cs
index f7f86765bdf248..6f50c0f9b6f3c4 100644
--- a/src/tests/JIT/Methodical/fp/exgen/200w1d-02.cs
+++ b/src/tests/JIT/Methodical/fp/exgen/200w1d-02.cs
@@ -3,7 +3,10 @@
 
 
 using System;
-internal unsafe class testout1
+using Xunit;
+namespace Test_200w1d_02
+{
+public unsafe class testout1
 {
     public struct VT_0
     {
@@ -147,7 +150,8 @@ public static int Func_0()
         return Convert.ToInt32((Convert.ToInt32((Convert.ToInt32((Convert.ToInt32(Convert.ToInt64(Convert.ToInt64(Convert.ToDouble(Convert.ToInt64(Convert.ToUInt16(Convert.ToUInt16(asgop26 / Convert.ToSingle(Convert.ToSingle(Convert.ToUInt64(Convert.ToInt16(asgop6) + Convert.ToInt64(Convert.ToInt64(Convert.ToUInt16(vtstatic_0.a74_0) - Convert.ToInt64((Convert.ToInt64(clstatic_0.a17_0) + -1747119413L))))) * asgop5)))) - Convert.ToInt64(Convert.ToInt64(Convert.ToDouble(asgop25) * asgop24)))) * (Convert.ToDouble((Convert.ToInt64((Convert.ToInt64(Convert.ToInt64(Convert.ToDouble(Convert.ToInt64(Convert.ToDouble(clstatic_0.a27_0) * -1.1920928960153885E-07)) * (Convert.ToInt16(1 * s_a18_0) * (clstatic_0.a27_0 / -4503599625452928.0)))) * Convert.ToInt64(Convert.ToInt64(Convert.ToDouble(asgop20) / (Convert.ToUInt32(vtstatic_0.a74_0 + 1746873331) * -2517.6143380671915))))) * Convert.ToInt64((Convert.ToInt64((Convert.ToInt64(Convert.ToInt64(Convert.ToDouble(s_a61_0) * asgop32)) * Convert.ToInt64(64L)) / (Convert.ToInt64((Convert.ToInt64((asgop18 + 0L) / asgop15)) / clstatic_0.a96_0)))))) * (Convert.ToUInt32(Convert.ToUInt32(Convert.ToInt32(s_a18_0 / 7.8880111854144145E-10) / Convert.ToDouble(Convert.ToDecimal(10.4980392156863M) / Convert.ToDecimal(35.3437719552881165816490907M))) % Convert.ToUInt32(Convert.ToInt64(asgop22) + Convert.ToInt64(vtstatic_0.a25_0))) * (Convert.ToDouble((Convert.ToInt64(Convert.ToInt64(Convert.ToDouble(vtstatic_0.a25_0) * 1.7947574048581106E-09)) * Convert.ToInt64(Convert.ToInt64(Convert.ToDouble(vtstatic_0.a25_0) * 4.4868935121452766E-10))) * 8.3079175512520556E-13))))))) + Convert.ToInt64(Convert.ToInt64(Convert.ToUInt16((Convert.ToUInt16(Convert.ToUInt16(Convert.ToInt16(Convert.ToDecimal(asgop31) / (Convert.ToDecimal(clstatic_0.a26_0) * s_a75_0)) + Convert.ToInt16(Convert.ToInt64(Convert.ToInt64(clstatic_0.a26_0 - 7UL)) + Convert.ToInt64(asgop17))) % (Convert.ToUInt16(asgop16 / asgop35))))) - Convert.ToInt64(Convert.ToInt64(Convert.ToUInt16(Convert.ToUInt16(Convert.ToInt16(Convert.ToInt16(16475 / s_a18_0) * Convert.ToSingle(0.4701062F)) * Convert.ToSingle(Convert.ToSingle(vtstatic_0.a70_0 * (s_a42_0 / 223377976.25057024))))) - Convert.ToInt64((Convert.ToInt64(Convert.ToInt64(Convert.ToUInt16(Convert.ToUInt16(0.00013283314898831372 + (0.00013283314898831372 + (0.00013283314898831372 + 37004.999601500553)))) - Convert.ToInt64(vtstatic_0.a38_0))) * Convert.ToInt64((Convert.ToInt64(Convert.ToInt64(Convert.ToUInt32(clstatic_0.a17_0) - Convert.ToInt64(clstatic_0.a98_0))) * Convert.ToInt64((Convert.ToInt64(clstatic_0.a17_0) + clstatic_0.a68_0)))))))))))))) % (Convert.ToInt32(Convert.ToInt32((Convert.ToInt32((Convert.ToInt32(Convert.ToInt32(Convert.ToDecimal((Convert.ToInt32((Convert.ToUInt16((Convert.ToUInt16(Convert.ToInt32(asgop34) - Convert.ToInt32((asgop27)))) % vtstatic_0.a74_0))) + (Convert.ToInt32(Convert.ToInt64(s_a16_0) + Convert.ToInt64(Convert.ToInt64(Convert.ToInt32((clstatic_0.arr1d_0[28] + -109529)) - Convert.ToInt64(s_a86_0))))))) * (Convert.ToDecimal(Convert.ToInt64(Convert.ToDouble(s_a16_0) * clstatic_0.a57_0)) / asgop8)))) % (Convert.ToInt32(Convert.ToInt32((*a36_0) + (Convert.ToDecimal(asgop2 * asgop12))))))) / asgop3))))));
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         vtstatic_0.a0_0 = 3.7914999471280252E-09;
         vtstatic_0.a2_0 = 5.0980403367171836E-10;
@@ -172,3 +176,4 @@ public static int Main()
         return retval;
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/fp/exgen/200w1d-02_cs_d.csproj b/src/tests/JIT/Methodical/fp/exgen/200w1d-02_cs_d.csproj
index 093e5440d2d72e..676c8bc495dbd5 100644
--- a/src/tests/JIT/Methodical/fp/exgen/200w1d-02_cs_d.csproj
+++ b/src/tests/JIT/Methodical/fp/exgen/200w1d-02_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/fp/exgen/200w1d-02_cs_do.csproj b/src/tests/JIT/Methodical/fp/exgen/200w1d-02_cs_do.csproj
index db5ede3ff94d54..5ae3a4258cc22f 100644
--- a/src/tests/JIT/Methodical/fp/exgen/200w1d-02_cs_do.csproj
+++ b/src/tests/JIT/Methodical/fp/exgen/200w1d-02_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/fp/exgen/200w1d-02_cs_r.csproj b/src/tests/JIT/Methodical/fp/exgen/200w1d-02_cs_r.csproj
index 1ad02d47d4988b..2c26142232ec96 100644
--- a/src/tests/JIT/Methodical/fp/exgen/200w1d-02_cs_r.csproj
+++ b/src/tests/JIT/Methodical/fp/exgen/200w1d-02_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/fp/exgen/200w1d-02_cs_ro.csproj b/src/tests/JIT/Methodical/fp/exgen/200w1d-02_cs_ro.csproj
index 82d6e6919f0cef..6cff42441c94b0 100644
--- a/src/tests/JIT/Methodical/fp/exgen/200w1d-02_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/fp/exgen/200w1d-02_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/fp/exgen/3w1d-01.cs b/src/tests/JIT/Methodical/fp/exgen/3w1d-01.cs
index f409792dc13b20..05d20d03b033ef 100644
--- a/src/tests/JIT/Methodical/fp/exgen/3w1d-01.cs
+++ b/src/tests/JIT/Methodical/fp/exgen/3w1d-01.cs
@@ -2,7 +2,10 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
-internal unsafe class testout1
+using Xunit;
+namespace Test_3w1d_01
+{
+public unsafe class testout1
 {
     public class CL_0
     {
@@ -19,7 +22,8 @@ public static int Func_0()
         return retval_0;
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         int retval;
         retval = Convert.ToInt32(Func_0());
@@ -31,3 +35,4 @@ public static int Main()
         return retval;
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/fp/exgen/3w1d-01_cs_d.csproj b/src/tests/JIT/Methodical/fp/exgen/3w1d-01_cs_d.csproj
index a8ce62f9998755..22410a42890a4d 100644
--- a/src/tests/JIT/Methodical/fp/exgen/3w1d-01_cs_d.csproj
+++ b/src/tests/JIT/Methodical/fp/exgen/3w1d-01_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/fp/exgen/3w1d-01_cs_do.csproj b/src/tests/JIT/Methodical/fp/exgen/3w1d-01_cs_do.csproj
index 043d9dd53b9670..2b2593c2d6cc50 100644
--- a/src/tests/JIT/Methodical/fp/exgen/3w1d-01_cs_do.csproj
+++ b/src/tests/JIT/Methodical/fp/exgen/3w1d-01_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/fp/exgen/3w1d-01_cs_r.csproj b/src/tests/JIT/Methodical/fp/exgen/3w1d-01_cs_r.csproj
index ed84e2b7f96cd9..c6416f98e59480 100644
--- a/src/tests/JIT/Methodical/fp/exgen/3w1d-01_cs_r.csproj
+++ b/src/tests/JIT/Methodical/fp/exgen/3w1d-01_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/fp/exgen/3w1d-01_cs_ro.csproj b/src/tests/JIT/Methodical/fp/exgen/3w1d-01_cs_ro.csproj
index 8d2c509d3af737..6dc69b0007eaaf 100644
--- a/src/tests/JIT/Methodical/fp/exgen/3w1d-01_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/fp/exgen/3w1d-01_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/fp/exgen/3w1d-02.cs b/src/tests/JIT/Methodical/fp/exgen/3w1d-02.cs
index 03ab81cace2678..c47800319399b0 100644
--- a/src/tests/JIT/Methodical/fp/exgen/3w1d-02.cs
+++ b/src/tests/JIT/Methodical/fp/exgen/3w1d-02.cs
@@ -2,7 +2,10 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
-internal unsafe class testout1
+using Xunit;
+namespace Test_3w1d_02
+{
+public unsafe class testout1
 {
     public struct VT_0
     {
@@ -32,7 +35,8 @@ public static double Func_0()
         return retval_0;
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         vtstatic_0.arr3d_0[4, 0, 3] = 1UL;
 
@@ -46,3 +50,4 @@ public static int Main()
         return retval;
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/fp/exgen/3w1d-02_cs_d.csproj b/src/tests/JIT/Methodical/fp/exgen/3w1d-02_cs_d.csproj
index 2b1a8100ae6802..d3c8bf55db2deb 100644
--- a/src/tests/JIT/Methodical/fp/exgen/3w1d-02_cs_d.csproj
+++ b/src/tests/JIT/Methodical/fp/exgen/3w1d-02_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/fp/exgen/3w1d-02_cs_do.csproj b/src/tests/JIT/Methodical/fp/exgen/3w1d-02_cs_do.csproj
index b52da6d5bdc6e5..3e07c7748f1b83 100644
--- a/src/tests/JIT/Methodical/fp/exgen/3w1d-02_cs_do.csproj
+++ b/src/tests/JIT/Methodical/fp/exgen/3w1d-02_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/fp/exgen/3w1d-02_cs_r.csproj b/src/tests/JIT/Methodical/fp/exgen/3w1d-02_cs_r.csproj
index 5cb8cab320562d..451d561e056462 100644
--- a/src/tests/JIT/Methodical/fp/exgen/3w1d-02_cs_r.csproj
+++ b/src/tests/JIT/Methodical/fp/exgen/3w1d-02_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/fp/exgen/3w1d-02_cs_ro.csproj b/src/tests/JIT/Methodical/fp/exgen/3w1d-02_cs_ro.csproj
index acfdc6d837fadd..a036bcc573dee4 100644
--- a/src/tests/JIT/Methodical/fp/exgen/3w1d-02_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/fp/exgen/3w1d-02_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/fp/exgen/5w1d-01.cs b/src/tests/JIT/Methodical/fp/exgen/5w1d-01.cs
index d471dfd3a70a43..02cf66b169c77d 100644
--- a/src/tests/JIT/Methodical/fp/exgen/5w1d-01.cs
+++ b/src/tests/JIT/Methodical/fp/exgen/5w1d-01.cs
@@ -2,7 +2,10 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
-internal unsafe class testout1
+using Xunit;
+namespace Test_5w1d_01
+{
+public unsafe class testout1
 {
     public struct VT_0
     {
@@ -47,7 +50,8 @@ public static int Func_0()
         return Convert.ToInt32((Convert.ToInt32(((583855800 * -1.1646711396889438E-07) / vtstatic_0.arr2d_0[2, 0]) - (vtstatic_0.arr2d_0[2, 2]))));
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         vtstatic_0.arr2d_0[2, 0] = -2.125;
         vtstatic_0.arr2d_0[2, 2] = -68.0;
@@ -62,3 +66,4 @@ public static int Main()
         return retval;
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/fp/exgen/5w1d-01_cs_d.csproj b/src/tests/JIT/Methodical/fp/exgen/5w1d-01_cs_d.csproj
index 621036acfe9120..c0402a730dac5c 100644
--- a/src/tests/JIT/Methodical/fp/exgen/5w1d-01_cs_d.csproj
+++ b/src/tests/JIT/Methodical/fp/exgen/5w1d-01_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/fp/exgen/5w1d-01_cs_do.csproj b/src/tests/JIT/Methodical/fp/exgen/5w1d-01_cs_do.csproj
index 69ed6dcbecedea..4fe7717f66af7b 100644
--- a/src/tests/JIT/Methodical/fp/exgen/5w1d-01_cs_do.csproj
+++ b/src/tests/JIT/Methodical/fp/exgen/5w1d-01_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/fp/exgen/5w1d-01_cs_r.csproj b/src/tests/JIT/Methodical/fp/exgen/5w1d-01_cs_r.csproj
index e6980688391de0..b0a02a2a2d7dde 100644
--- a/src/tests/JIT/Methodical/fp/exgen/5w1d-01_cs_r.csproj
+++ b/src/tests/JIT/Methodical/fp/exgen/5w1d-01_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/fp/exgen/5w1d-01_cs_ro.csproj b/src/tests/JIT/Methodical/fp/exgen/5w1d-01_cs_ro.csproj
index 4d747b51106f6b..5e4888ddc051ab 100644
--- a/src/tests/JIT/Methodical/fp/exgen/5w1d-01_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/fp/exgen/5w1d-01_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/fp/exgen/5w1d-02.cs b/src/tests/JIT/Methodical/fp/exgen/5w1d-02.cs
index c92355477db8ad..0356bda3eade1e 100644
--- a/src/tests/JIT/Methodical/fp/exgen/5w1d-02.cs
+++ b/src/tests/JIT/Methodical/fp/exgen/5w1d-02.cs
@@ -2,7 +2,10 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
-internal unsafe class testout1
+using Xunit;
+namespace Test_5w1d_02
+{
+public unsafe class testout1
 {
     private static double[] s_arr1d_0 = new double[6];
     private static double s_a2_0 = 128.0;
@@ -18,7 +21,8 @@ public static double Func_0()
         return Convert.ToDouble(((s_a2_0 - asgop0) - (asgop1)));
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         s_arr1d_0[0] = 3758096384.0;
 
@@ -32,3 +36,4 @@ public static int Main()
         return retval;
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/fp/exgen/5w1d-02_cs_d.csproj b/src/tests/JIT/Methodical/fp/exgen/5w1d-02_cs_d.csproj
index 045584af594f22..61f7ce8ea9e404 100644
--- a/src/tests/JIT/Methodical/fp/exgen/5w1d-02_cs_d.csproj
+++ b/src/tests/JIT/Methodical/fp/exgen/5w1d-02_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/fp/exgen/5w1d-02_cs_do.csproj b/src/tests/JIT/Methodical/fp/exgen/5w1d-02_cs_do.csproj
index 77ecbd4055e422..af6f5f5c6fede3 100644
--- a/src/tests/JIT/Methodical/fp/exgen/5w1d-02_cs_do.csproj
+++ b/src/tests/JIT/Methodical/fp/exgen/5w1d-02_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/fp/exgen/5w1d-02_cs_r.csproj b/src/tests/JIT/Methodical/fp/exgen/5w1d-02_cs_r.csproj
index d3ca7a80b2e789..557cb3b3cecbae 100644
--- a/src/tests/JIT/Methodical/fp/exgen/5w1d-02_cs_r.csproj
+++ b/src/tests/JIT/Methodical/fp/exgen/5w1d-02_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/fp/exgen/5w1d-02_cs_ro.csproj b/src/tests/JIT/Methodical/fp/exgen/5w1d-02_cs_ro.csproj
index c89df4f3edb518..7fdbc27fdbaeda 100644
--- a/src/tests/JIT/Methodical/fp/exgen/5w1d-02_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/fp/exgen/5w1d-02_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/fp/exgen/5w1d-03.cs b/src/tests/JIT/Methodical/fp/exgen/5w1d-03.cs
index 126d302b339e74..d032ecb30df09d 100644
--- a/src/tests/JIT/Methodical/fp/exgen/5w1d-03.cs
+++ b/src/tests/JIT/Methodical/fp/exgen/5w1d-03.cs
@@ -2,7 +2,10 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
-internal unsafe class testout1
+using Xunit;
+namespace Test_5w1d_03
+{
+public unsafe class testout1
 {
     public class CL_0
     {
@@ -22,7 +25,8 @@ public static int Func_0()
         return retval_0;
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         int retval;
         retval = Convert.ToInt32(Func_0());
@@ -34,3 +38,4 @@ public static int Main()
         return retval;
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/fp/exgen/5w1d-03_cs_d.csproj b/src/tests/JIT/Methodical/fp/exgen/5w1d-03_cs_d.csproj
index d76461d9e35da7..37ee78a8743a90 100644
--- a/src/tests/JIT/Methodical/fp/exgen/5w1d-03_cs_d.csproj
+++ b/src/tests/JIT/Methodical/fp/exgen/5w1d-03_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/fp/exgen/5w1d-03_cs_do.csproj b/src/tests/JIT/Methodical/fp/exgen/5w1d-03_cs_do.csproj
index 4018e13c339c12..2a4a642085883e 100644
--- a/src/tests/JIT/Methodical/fp/exgen/5w1d-03_cs_do.csproj
+++ b/src/tests/JIT/Methodical/fp/exgen/5w1d-03_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/fp/exgen/5w1d-03_cs_r.csproj b/src/tests/JIT/Methodical/fp/exgen/5w1d-03_cs_r.csproj
index 825f538235c801..ebf57343dd71d8 100644
--- a/src/tests/JIT/Methodical/fp/exgen/5w1d-03_cs_r.csproj
+++ b/src/tests/JIT/Methodical/fp/exgen/5w1d-03_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/fp/exgen/5w1d-03_cs_ro.csproj b/src/tests/JIT/Methodical/fp/exgen/5w1d-03_cs_ro.csproj
index c0168fa00f9431..85f0fa1b01e14c 100644
--- a/src/tests/JIT/Methodical/fp/exgen/5w1d-03_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/fp/exgen/5w1d-03_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/fp/exgen/5w1d-04.cs b/src/tests/JIT/Methodical/fp/exgen/5w1d-04.cs
index 658d73ebaa7a97..d52d26b35d471d 100644
--- a/src/tests/JIT/Methodical/fp/exgen/5w1d-04.cs
+++ b/src/tests/JIT/Methodical/fp/exgen/5w1d-04.cs
@@ -2,7 +2,10 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
-internal unsafe class testout1
+using Xunit;
+namespace Test_5w1d_04
+{
+public unsafe class testout1
 {
     public struct VT_0
     {
@@ -31,7 +34,8 @@ public static double Func_0()
         return Convert.ToDouble((asgop0 / asgop1));
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         int retval;
         retval = Convert.ToInt32(Func_0());
@@ -43,3 +47,4 @@ public static int Main()
         return retval;
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/fp/exgen/5w1d-04_cs_d.csproj b/src/tests/JIT/Methodical/fp/exgen/5w1d-04_cs_d.csproj
index 960a367c8e202a..1b79d0339fd45b 100644
--- a/src/tests/JIT/Methodical/fp/exgen/5w1d-04_cs_d.csproj
+++ b/src/tests/JIT/Methodical/fp/exgen/5w1d-04_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/fp/exgen/5w1d-04_cs_do.csproj b/src/tests/JIT/Methodical/fp/exgen/5w1d-04_cs_do.csproj
index 3aa84696a48b20..d0066c973cfac2 100644
--- a/src/tests/JIT/Methodical/fp/exgen/5w1d-04_cs_do.csproj
+++ b/src/tests/JIT/Methodical/fp/exgen/5w1d-04_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/fp/exgen/5w1d-04_cs_r.csproj b/src/tests/JIT/Methodical/fp/exgen/5w1d-04_cs_r.csproj
index f19b5452aa288b..3bd44f60c7a08a 100644
--- a/src/tests/JIT/Methodical/fp/exgen/5w1d-04_cs_r.csproj
+++ b/src/tests/JIT/Methodical/fp/exgen/5w1d-04_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/fp/exgen/5w1d-04_cs_ro.csproj b/src/tests/JIT/Methodical/fp/exgen/5w1d-04_cs_ro.csproj
index 34d3179b30adeb..e9460ed56fd6b7 100644
--- a/src/tests/JIT/Methodical/fp/exgen/5w1d-04_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/fp/exgen/5w1d-04_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/fp/exgen/5w1d-05.cs b/src/tests/JIT/Methodical/fp/exgen/5w1d-05.cs
index 05747a7d0cd6af..e79fac60a3df1a 100644
--- a/src/tests/JIT/Methodical/fp/exgen/5w1d-05.cs
+++ b/src/tests/JIT/Methodical/fp/exgen/5w1d-05.cs
@@ -2,7 +2,10 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
-internal unsafe class testout1
+using Xunit;
+namespace Test_5w1d_05
+{
+public unsafe class testout1
 {
     private static float[] s_arr1d_0 = new float[6];
 
@@ -18,7 +21,8 @@ public static int Func_0()
         return Convert.ToInt32((2048.0F - ((*a2_0))) + asgop0);
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         s_arr1d_0[0] = -3996.0F;
 
@@ -32,3 +36,4 @@ public static int Main()
         return retval;
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/fp/exgen/5w1d-05_cs_d.csproj b/src/tests/JIT/Methodical/fp/exgen/5w1d-05_cs_d.csproj
index a0f595e17dc53a..5604e96f7d74c0 100644
--- a/src/tests/JIT/Methodical/fp/exgen/5w1d-05_cs_d.csproj
+++ b/src/tests/JIT/Methodical/fp/exgen/5w1d-05_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/fp/exgen/5w1d-05_cs_do.csproj b/src/tests/JIT/Methodical/fp/exgen/5w1d-05_cs_do.csproj
index 1a41eca1b3836b..fc5b7e94154ab2 100644
--- a/src/tests/JIT/Methodical/fp/exgen/5w1d-05_cs_do.csproj
+++ b/src/tests/JIT/Methodical/fp/exgen/5w1d-05_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/fp/exgen/5w1d-05_cs_r.csproj b/src/tests/JIT/Methodical/fp/exgen/5w1d-05_cs_r.csproj
index 54656111d9b74d..bb414bc7802c2d 100644
--- a/src/tests/JIT/Methodical/fp/exgen/5w1d-05_cs_r.csproj
+++ b/src/tests/JIT/Methodical/fp/exgen/5w1d-05_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/fp/exgen/5w1d-05_cs_ro.csproj b/src/tests/JIT/Methodical/fp/exgen/5w1d-05_cs_ro.csproj
index c69d6eac458f76..eabaa6ec4810b8 100644
--- a/src/tests/JIT/Methodical/fp/exgen/5w1d-05_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/fp/exgen/5w1d-05_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/fp/exgen/5w1d-06.cs b/src/tests/JIT/Methodical/fp/exgen/5w1d-06.cs
index 99355bdc066d3c..ccc95faf2f9a7d 100644
--- a/src/tests/JIT/Methodical/fp/exgen/5w1d-06.cs
+++ b/src/tests/JIT/Methodical/fp/exgen/5w1d-06.cs
@@ -2,7 +2,10 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
-internal class testout1
+using Xunit;
+namespace Test_5w1d_06
+{
+public class testout1
 {
     private static double[,,] s_arr3d_0 = new double[5, 6, 4];
     private static double[,] s_arr2d_0 = new double[3, 6];
@@ -18,7 +21,8 @@ public static int Func_0()
         return retval_0;
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         int retval;
         retval = Convert.ToInt32(Func_0());
@@ -30,3 +34,4 @@ public static int Main()
         return retval;
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/fp/exgen/5w1d-06_cs_d.csproj b/src/tests/JIT/Methodical/fp/exgen/5w1d-06_cs_d.csproj
index 19cf8aaa785c75..fd4a1a44e8d7ec 100644
--- a/src/tests/JIT/Methodical/fp/exgen/5w1d-06_cs_d.csproj
+++ b/src/tests/JIT/Methodical/fp/exgen/5w1d-06_cs_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/fp/exgen/5w1d-06_cs_do.csproj b/src/tests/JIT/Methodical/fp/exgen/5w1d-06_cs_do.csproj
index 53049cc7f1ef7b..fcdff41a7351db 100644
--- a/src/tests/JIT/Methodical/fp/exgen/5w1d-06_cs_do.csproj
+++ b/src/tests/JIT/Methodical/fp/exgen/5w1d-06_cs_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/fp/exgen/5w1d-06_cs_r.csproj b/src/tests/JIT/Methodical/fp/exgen/5w1d-06_cs_r.csproj
index 83f05cfcbfc074..bd9894d53f4d9d 100644
--- a/src/tests/JIT/Methodical/fp/exgen/5w1d-06_cs_r.csproj
+++ b/src/tests/JIT/Methodical/fp/exgen/5w1d-06_cs_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/fp/exgen/5w1d-06_cs_ro.csproj b/src/tests/JIT/Methodical/fp/exgen/5w1d-06_cs_ro.csproj
index e4311c6b03d211..d213ebb2e9c73d 100644
--- a/src/tests/JIT/Methodical/fp/exgen/5w1d-06_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/fp/exgen/5w1d-06_cs_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/gc_poll/InsertGCPoll.cs b/src/tests/JIT/Methodical/gc_poll/InsertGCPoll.cs
index 56daeb76a6f9c1..c080dae1c74cf2 100644
--- a/src/tests/JIT/Methodical/gc_poll/InsertGCPoll.cs
+++ b/src/tests/JIT/Methodical/gc_poll/InsertGCPoll.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Runtime.InteropServices;
+using Xunit;
 
 static class GCPollNative
 {
@@ -19,7 +20,7 @@ static class GCPollNative
     public static extern ulong NextUInt64(ulong n);
 }
 
-class InsertGCPoll
+public class InsertGCPoll
 {
     private static int PropNextInt32 => (int)GCPollNative.NextUInt32(0);
     private static long PropNextInt64 => (long)GCPollNative.NextUInt64(0);
@@ -85,7 +86,8 @@ private static void LoopOn64()
         }
     }
     
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         try
         {
diff --git a/src/tests/JIT/Methodical/gc_poll/InsertGCPoll.csproj b/src/tests/JIT/Methodical/gc_poll/InsertGCPoll.csproj
index 8b3391ee478bcf..1bf11922b1f5ed 100644
--- a/src/tests/JIT/Methodical/gc_poll/InsertGCPoll.csproj
+++ b/src/tests/JIT/Methodical/gc_poll/InsertGCPoll.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup>
@@ -12,4 +11,4 @@
   <ItemGroup>
     <CMakeProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/tests/JIT/Methodical/inlining/boolean/InlineBool.cs b/src/tests/JIT/Methodical/inlining/boolean/InlineBool.cs
index 85bf97afae5b6d..227b37ec26721c 100644
--- a/src/tests/JIT/Methodical/inlining/boolean/InlineBool.cs
+++ b/src/tests/JIT/Methodical/inlining/boolean/InlineBool.cs
@@ -6,6 +6,7 @@
 
 using System;
 using System.Runtime.CompilerServices;
+using Xunit;
 namespace InlineBool
 {
     public class Program
@@ -157,7 +158,8 @@ public class Program
         static bool Id99(bool x) { return Id04(x != false) ? true : false; }
 
         [MethodImpl(MethodImplOptions.NoOptimization)]
-        public static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             bool result = true;
 
diff --git a/src/tests/JIT/Methodical/inlining/boolean/test_boolean.csproj b/src/tests/JIT/Methodical/inlining/boolean/test_boolean.csproj
index ab02b2893774ee..db4c532003fb05 100644
--- a/src/tests/JIT/Methodical/inlining/boolean/test_boolean.csproj
+++ b/src/tests/JIT/Methodical/inlining/boolean/test_boolean.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/inlining/bug505642/test.cs b/src/tests/JIT/Methodical/inlining/bug505642/test.cs
index 7cd63e1fc891b0..8d7a106d5b12e5 100644
--- a/src/tests/JIT/Methodical/inlining/bug505642/test.cs
+++ b/src/tests/JIT/Methodical/inlining/bug505642/test.cs
@@ -13,6 +13,7 @@
  */
 
 using System;
+using Xunit;
 
 public struct Tuple<T0, T1>
 {
@@ -25,9 +26,10 @@ public Tuple(T0 Field0, T1 Field1)
     }
 }
 
-internal static class M
+public static class M
 {
-    private static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         return meth<int>(8, 100);
         //Console.Write(meth<int>(8, 100));
diff --git a/src/tests/JIT/Methodical/inlining/bug505642/test_bug505642.csproj b/src/tests/JIT/Methodical/inlining/bug505642/test_bug505642.csproj
index 0c412f2d213711..a10728d944d6f5 100644
--- a/src/tests/JIT/Methodical/inlining/bug505642/test_bug505642.csproj
+++ b/src/tests/JIT/Methodical/inlining/bug505642/test_bug505642.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/inlining/dev10_bug719093/variancesmall.il b/src/tests/JIT/Methodical/inlining/dev10_bug719093/variancesmall.il
index 6b2bb0bade8224..593cabc982247c 100644
--- a/src/tests/JIT/Methodical/inlining/dev10_bug719093/variancesmall.il
+++ b/src/tests/JIT/Methodical/inlining/dev10_bug719093/variancesmall.il
@@ -31,6 +31,8 @@
 
 
 
+.namespace Test_variancesmall_il
+{
 .class interface private abstract auto ansi I`1<-S>
 {
   .method public hidebysig newslot abstract virtual 
@@ -55,14 +57,14 @@
 } 
 
 .class public auto ansi beforefieldinit CDerived
-       extends CBase
+       extends Test_variancesmall_il.CBase
 {
   .method public hidebysig specialname rtspecialname 
           instance void  .ctor() cil managed
   {
     .maxstack  8
     IL_0000:  ldarg.0
-    IL_0001:  call       instance void CBase::.ctor()
+    IL_0001:  call       instance void Test_variancesmall_il.CBase::.ctor()
     IL_0006:  ret
   } 
 
@@ -70,23 +72,23 @@
 
 .class public sequential ansi sealed beforefieldinit MyStruct2
        extends [mscorlib]System.ValueType
-       implements class I`1<object>,
-                  class I`1<class CDerived>
+       implements class Test_variancesmall_il.I`1<object>,
+                  class Test_variancesmall_il.I`1<class Test_variancesmall_il.CDerived>
 {
   .field public int32 n
   .method public hidebysig newslot virtual final 
-          instance string  Print(class CDerived 'value') cil managed
+          instance string  Print(class Test_variancesmall_il.CDerived 'value') cil managed
   {
     .maxstack  3
     .locals init (string V_0)
     IL_0000:  nop
     IL_0001:  ldarg.0
     IL_0002:  dup
-    IL_0003:  ldfld      int32 MyStruct2::n
+    IL_0003:  ldfld      int32 Test_variancesmall_il.MyStruct2::n
     IL_0008:  ldc.i4.1
     IL_0009:  add
-    IL_000a:  stfld      int32 MyStruct2::n
-    IL_000f:  ldstr      "Print(CDerived)"
+    IL_000a:  stfld      int32 Test_variancesmall_il.MyStruct2::n
+    IL_000f:  ldstr      "Print(Test_variancesmall_il.CDerived)"
     IL_0014:  stloc.0
     IL_0015:  br.s       IL_0017
 
@@ -102,10 +104,10 @@
     IL_0000:  nop
     IL_0001:  ldarg.0
     IL_0002:  dup
-    IL_0003:  ldfld      int32 MyStruct2::n
+    IL_0003:  ldfld      int32 Test_variancesmall_il.MyStruct2::n
     IL_0008:  ldc.i4.1
     IL_0009:  add
-    IL_000a:  stfld      int32 MyStruct2::n
+    IL_000a:  stfld      int32 Test_variancesmall_il.MyStruct2::n
     IL_000f:  ldstr      "Print(object)"
     IL_0014:  stloc.0
     IL_0015:  br.s       IL_0017
@@ -116,7 +118,7 @@
 
 } 
 
-.class private auto ansi beforefieldinit Conversion`2<.ctor (class I`1<!TCBase>) TMyStruct,TCBase>
+.class private auto ansi beforefieldinit Conversion`2<.ctor (class Test_variancesmall_il.I`1<!TCBase>) TMyStruct,TCBase>
        extends [mscorlib]System.Object
 {
   .field public !TCBase 'value'
@@ -143,9 +145,9 @@
     IL_0021:  stloc.0
     IL_0022:  ldloca.s   V_0
     IL_0024:  ldarg.0
-    IL_0025:  ldfld      !1 class Conversion`2<!TMyStruct,!TCBase>::'value'
+    IL_0025:  ldfld      !1 class Test_variancesmall_il.Conversion`2<!TMyStruct,!TCBase>::'value'
     IL_002a:  constrained. !TMyStruct
-    IL_0030:  callvirt   instance string class I`1<!TCBase>::Print(!0)
+    IL_0030:  callvirt   instance string class Test_variancesmall_il.I`1<!TCBase>::Print(!0)
     IL_0035:  stloc.1
     IL_0036:  br.s       IL_0038
 
@@ -161,9 +163,9 @@
     IL_0000:  nop
     IL_0001:  ldarg.1
     IL_0002:  ldarg.0
-    IL_0003:  ldfld      !1 class Conversion`2<!TMyStruct,!TCBase>::'value'
+    IL_0003:  ldfld      !1 class Test_variancesmall_il.Conversion`2<!TMyStruct,!TCBase>::'value'
     IL_0008:  constrained. !TMyStruct
-    IL_000e:  callvirt   instance string class I`1<!TCBase>::Print(!0)
+    IL_000e:  callvirt   instance string class Test_variancesmall_il.I`1<!TCBase>::Print(!0)
     IL_0013:  stloc.0
     IL_0014:  br.s       IL_0016
 
@@ -181,7 +183,7 @@
     IL_0001:  ldarg.1
     IL_0002:  ldarg.2
     IL_0003:  constrained. !TMyStruct
-    IL_0009:  callvirt   instance string class I`1<!TCBase>::Print(!0)
+    IL_0009:  callvirt   instance string class Test_variancesmall_il.I`1<!TCBase>::Print(!0)
     IL_000e:  stloc.0
     IL_000f:  br.s       IL_0011
 
@@ -201,7 +203,7 @@
 } 
 
 
-.class private auto ansi beforefieldinit Program
+.class public auto ansi beforefieldinit Program
        extends [mscorlib]System.Object
 {
   .method private hidebysig static int32 
@@ -289,7 +291,7 @@
     IL_0095:  ret
   } 
 
-  .method private hidebysig static int32 
+  .method public hidebysig static int32 
           Main() cil managed
   {
     .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -298,8 +300,8 @@
     .entrypoint
     .maxstack  6
     .locals init (int32 V_0,
-             valuetype MyStruct2 V_2,
-             class Conversion`2<valuetype MyStruct2,class CBase> V_12,
+             valuetype Test_variancesmall_il.MyStruct2 V_2,
+             class Test_variancesmall_il.Conversion`2<valuetype Test_variancesmall_il.MyStruct2,class Test_variancesmall_il.CBase> V_12,
              string V_21,
              string V_22,
              string V_23,
@@ -308,23 +310,23 @@
     IL_0001:  ldc.i4.0
     IL_0002:  stloc.0
     IL_000b:  ldloca.s   V_2
-    IL_000d:  initobj    MyStruct2
-    IL_005a:  newobj     instance void class Conversion`2<valuetype MyStruct2,class CBase>::.ctor()
+    IL_000d:  initobj    Test_variancesmall_il.MyStruct2
+    IL_005a:  newobj     instance void class Test_variancesmall_il.Conversion`2<valuetype Test_variancesmall_il.MyStruct2,class Test_variancesmall_il.CBase>::.ctor()
     IL_005f:  stloc.s    V_12
     IL_00e2:  ldstr      "TEST2:"
     IL_00e7:  call       void [System.Console]System.Console::WriteLine(string)
     IL_00ec:  nop
     IL_00ed:  ldloc.s    V_12
-    IL_00ef:  callvirt   instance string class Conversion`2<valuetype MyStruct2,class CBase>::Caller1()
+    IL_00ef:  callvirt   instance string class Test_variancesmall_il.Conversion`2<valuetype Test_variancesmall_il.MyStruct2,class Test_variancesmall_il.CBase>::Caller1()
     IL_00f4:  stloc.s    V_21
     IL_00f6:  ldloc.s    V_12
     IL_00f8:  ldloca.s   V_2
-    IL_00fa:  callvirt   instance string class Conversion`2<valuetype MyStruct2,class CBase>::Caller2(!0&)
+    IL_00fa:  callvirt   instance string class Test_variancesmall_il.Conversion`2<valuetype Test_variancesmall_il.MyStruct2,class Test_variancesmall_il.CBase>::Caller2(!0&)
     IL_00ff:  stloc.s    V_22
     IL_0101:  ldloc.s    V_12
     IL_0103:  ldloca.s   V_2
-    IL_0105:  newobj     instance void class CBase::.ctor()
-    IL_010a:  callvirt   instance string class Conversion`2<valuetype MyStruct2,class CBase>::Caller3(!0&,
+    IL_0105:  newobj     instance void class Test_variancesmall_il.CBase::.ctor()
+    IL_010a:  callvirt   instance string class Test_variancesmall_il.Conversion`2<valuetype Test_variancesmall_il.MyStruct2,class Test_variancesmall_il.CBase>::Caller3(!0&,
                                                                                                           !1)
     IL_010f:  stloc.s    V_23
     IL_0111:  ldloc.0
@@ -333,8 +335,8 @@
     IL_0116:  ldloc.s    V_23
     IL_0118:  ldstr      "Print(object)"
     IL_011d:  ldloca.s   V_2
-    IL_011f:  ldfld      int32 MyStruct2::n
-    IL_0124:  call       int32 Program::Verification(string,
+    IL_011f:  ldfld      int32 Test_variancesmall_il.MyStruct2::n
+    IL_0124:  call       int32 Test_variancesmall_il.Program::Verification(string,
                                                      string,
                                                      string,
                                                      string,
@@ -366,3 +368,4 @@
   } 
 
 } 
+}
diff --git a/src/tests/JIT/Methodical/inlining/dev10_bug719093/variancesmall.ilproj b/src/tests/JIT/Methodical/inlining/dev10_bug719093/variancesmall.ilproj
index 8cc1123cd2d60a..06aadd1bfa2981 100644
--- a/src/tests/JIT/Methodical/inlining/dev10_bug719093/variancesmall.ilproj
+++ b/src/tests/JIT/Methodical/inlining/dev10_bug719093/variancesmall.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/arrays/hugedim.il b/src/tests/JIT/Methodical/int64/arrays/hugedim.il
index 1985c99751ba4b..3dbd19c2d6a071 100644
--- a/src/tests/JIT/Methodical/int64/arrays/hugedim.il
+++ b/src/tests/JIT/Methodical/int64/arrays/hugedim.il
@@ -22,12 +22,12 @@
 }
 .assembly extern xunit.core {}
 // MVID: {23E3D49B-6CFD-4DA0-8C9D-A611CE0BA103}
-.namespace JitTest
+.namespace JitTest_hugedim_arrays_il
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends ['mscorlib']System.Object
   {
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -515,5 +515,5 @@
     
   } // end of class 'Test'
   
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_hugedim_arrays_il'
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/int64/arrays/hugedim_il_d.ilproj b/src/tests/JIT/Methodical/int64/arrays/hugedim_il_d.ilproj
index 60ec8bcc7f7e36..7b29826b51b831 100644
--- a/src/tests/JIT/Methodical/int64/arrays/hugedim_il_d.ilproj
+++ b/src/tests/JIT/Methodical/int64/arrays/hugedim_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/arrays/hugedim_il_r.ilproj b/src/tests/JIT/Methodical/int64/arrays/hugedim_il_r.ilproj
index 33dd191bedc4cd..851eaa94cc378c 100644
--- a/src/tests/JIT/Methodical/int64/arrays/hugedim_il_r.ilproj
+++ b/src/tests/JIT/Methodical/int64/arrays/hugedim_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/arrays/lcs_long.cs b/src/tests/JIT/Methodical/int64/arrays/lcs_long.cs
index 8e1c3eb534181a..309aa9bffe0049 100644
--- a/src/tests/JIT/Methodical/int64/arrays/lcs_long.cs
+++ b/src/tests/JIT/Methodical/int64/arrays/lcs_long.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_lcs_long_arrays_cs
 {
-    internal class LCS
+    public class LCS
     {
         private const int RANK = 4;
 
@@ -82,7 +83,8 @@ private static void findLCS(long[,,,] c, long[,,,] b, char[][] seq, long[] len)
             }
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             Console.WriteLine("Test searches for longest common subsequence of 4 strings\n\n");
             String[] str = new String[RANK] {
diff --git a/src/tests/JIT/Methodical/int64/arrays/lcs_long.il b/src/tests/JIT/Methodical/int64/arrays/lcs_long.il
index 6f647f9fcea2f0..d5d26d7ef05dc2 100644
--- a/src/tests/JIT/Methodical/int64/arrays/lcs_long.il
+++ b/src/tests/JIT/Methodical/int64/arrays/lcs_long.il
@@ -18,9 +18,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {856A09FD-A814-4ED7-B594-E4AFD3850D67}
-.namespace JitTest
+.namespace JitTest_lcs_long_arrays_il
 {
-  .class private auto ansi LCS
+  .class public auto ansi LCS
          extends ['mscorlib']System.Object
   {
     .field private static literal int32 RANK = int32(0x00000004)
@@ -128,7 +128,7 @@
       IL_0064:  ldarg.0
       IL_0065:  ldarg.1
       IL_0066:  ldarg.2
-      IL_0067:  call       class System.String JitTest.LCS::buildLCS(int64[0...,0...,0...,0...],
+      IL_0067:  call       class System.String JitTest_lcs_long_arrays_il.LCS::buildLCS(int64[0...,0...,0...,0...],
                                                                      wchar[],
                                                                      int64[])
       IL_006c:  ldarg.1
@@ -168,7 +168,7 @@
       IL_009e:  ldarg.0
       IL_009f:  ldarg.1
       IL_00a0:  ldarg.2
-      IL_00a1:  call       class System.String JitTest.LCS::buildLCS(int64[0...,0...,0...,0...],
+      IL_00a1:  call       class System.String JitTest_lcs_long_arrays_il.LCS::buildLCS(int64[0...,0...,0...,0...],
                                                                      wchar[],
                                                                      int64[])
       IL_00a6:  stloc.s    V_4
@@ -605,7 +605,7 @@
       IL_01d6:  ret
     } // end of method 'LCS::findLCS'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -737,7 +737,7 @@
       IL_00a3:  ldloc.s    V_5
       IL_00a5:  ldloc.2
       IL_00a6:  ldloc.1
-      IL_00a7:  call       void JitTest.LCS::findLCS(int64[0...,0...,0...,0...],
+      IL_00a7:  call       void JitTest_lcs_long_arrays_il.LCS::findLCS(int64[0...,0...,0...,0...],
                                                      int64[0...,0...,0...,0...],
                                                      wchar[][],
                                                      int64[])
@@ -776,7 +776,7 @@
       IL_00da:  ldc.i4.0
       IL_00db:  ldelem.ref
       IL_00dc:  ldloc.1
-      IL_00dd:  call       class System.String JitTest.LCS::buildLCS(int64[0...,0...,0...,0...],
+      IL_00dd:  call       class System.String JitTest_lcs_long_arrays_il.LCS::buildLCS(int64[0...,0...,0...,0...],
                                                                      wchar[],
                                                                      int64[])
       IL_00e2:  call       bool ['mscorlib']System.String::Equals(class System.String,
@@ -811,6 +811,6 @@
 
   } // end of class 'LCS'
 
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_lcs_long_arrays_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/int64/arrays/lcs_long_d.csproj b/src/tests/JIT/Methodical/int64/arrays/lcs_long_d.csproj
index d4f35d4088f672..9a4827d682328c 100644
--- a/src/tests/JIT/Methodical/int64/arrays/lcs_long_d.csproj
+++ b/src/tests/JIT/Methodical/int64/arrays/lcs_long_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/arrays/lcs_long_do.csproj b/src/tests/JIT/Methodical/int64/arrays/lcs_long_do.csproj
index 81a6520ef1d4e7..d0c043e44c4375 100644
--- a/src/tests/JIT/Methodical/int64/arrays/lcs_long_do.csproj
+++ b/src/tests/JIT/Methodical/int64/arrays/lcs_long_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/arrays/lcs_long_il_d.ilproj b/src/tests/JIT/Methodical/int64/arrays/lcs_long_il_d.ilproj
index 30ce8320b6a8d1..4819a22a25329f 100644
--- a/src/tests/JIT/Methodical/int64/arrays/lcs_long_il_d.ilproj
+++ b/src/tests/JIT/Methodical/int64/arrays/lcs_long_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/arrays/lcs_long_il_r.ilproj b/src/tests/JIT/Methodical/int64/arrays/lcs_long_il_r.ilproj
index 3cc56fc75d4a0c..7fff9d2a8d0904 100644
--- a/src/tests/JIT/Methodical/int64/arrays/lcs_long_il_r.ilproj
+++ b/src/tests/JIT/Methodical/int64/arrays/lcs_long_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/arrays/lcs_long_r.csproj b/src/tests/JIT/Methodical/int64/arrays/lcs_long_r.csproj
index 63d688532c5bac..18a696b6707872 100644
--- a/src/tests/JIT/Methodical/int64/arrays/lcs_long_r.csproj
+++ b/src/tests/JIT/Methodical/int64/arrays/lcs_long_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/arrays/lcs_long_ro.csproj b/src/tests/JIT/Methodical/int64/arrays/lcs_long_ro.csproj
index ba82ce7b6cb938..b8f79dcc111f9e 100644
--- a/src/tests/JIT/Methodical/int64/arrays/lcs_long_ro.csproj
+++ b/src/tests/JIT/Methodical/int64/arrays/lcs_long_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/arrays/lcs_ulong.cs b/src/tests/JIT/Methodical/int64/arrays/lcs_ulong.cs
index db9fd883dbd441..6c9798c506d333 100644
--- a/src/tests/JIT/Methodical/int64/arrays/lcs_ulong.cs
+++ b/src/tests/JIT/Methodical/int64/arrays/lcs_ulong.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_lcs_ulong_arrays_cs
 {
-    internal class LCS
+    public class LCS
     {
         private const int RANK = 4;
 
@@ -82,7 +83,8 @@ private static void findLCS(ulong[,,,] c, ulong[,,,] b, char[][] seq, ulong[] le
             }
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             Console.WriteLine("Test searches for ulongest common subsequence of 4 strings\n\n");
             String[] str = new String[RANK] {
diff --git a/src/tests/JIT/Methodical/int64/arrays/lcs_ulong.il b/src/tests/JIT/Methodical/int64/arrays/lcs_ulong.il
index 9aa18840f5d3a3..d374c8cc91e115 100644
--- a/src/tests/JIT/Methodical/int64/arrays/lcs_ulong.il
+++ b/src/tests/JIT/Methodical/int64/arrays/lcs_ulong.il
@@ -18,9 +18,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {4FECC02C-D871-4196-A531-897C5458F477}
-.namespace JitTest
+.namespace JitTest_lcs_ulong_arrays_il
 {
-  .class private auto ansi LCS
+  .class public auto ansi LCS
          extends ['mscorlib']System.Object
   {
     .field private static literal int32 RANK = int32(0x00000004)
@@ -128,7 +128,7 @@
       IL_0064:  ldarg.0
       IL_0065:  ldarg.1
       IL_0066:  ldarg.2
-      IL_0067:  call       class System.String JitTest.LCS::buildLCS(unsigned int64[0...,0...,0...,0...],
+      IL_0067:  call       class System.String JitTest_lcs_ulong_arrays_il.LCS::buildLCS(unsigned int64[0...,0...,0...,0...],
                                                                      wchar[],
                                                                      unsigned int64[])
       IL_006c:  ldarg.1
@@ -168,7 +168,7 @@
       IL_009e:  ldarg.0
       IL_009f:  ldarg.1
       IL_00a0:  ldarg.2
-      IL_00a1:  call       class System.String JitTest.LCS::buildLCS(unsigned int64[0...,0...,0...,0...],
+      IL_00a1:  call       class System.String JitTest_lcs_ulong_arrays_il.LCS::buildLCS(unsigned int64[0...,0...,0...,0...],
                                                                      wchar[],
                                                                      unsigned int64[])
       IL_00a6:  stloc.s    V_4
@@ -620,7 +620,7 @@
       IL_01e5:  ret
     } // end of method 'LCS::findLCS'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -752,7 +752,7 @@
       IL_00a3:  ldloc.s    V_5
       IL_00a5:  ldloc.2
       IL_00a6:  ldloc.1
-      IL_00a7:  call       void JitTest.LCS::findLCS(unsigned int64[0...,0...,0...,0...],
+      IL_00a7:  call       void JitTest_lcs_ulong_arrays_il.LCS::findLCS(unsigned int64[0...,0...,0...,0...],
                                                      unsigned int64[0...,0...,0...,0...],
                                                      wchar[][],
                                                      unsigned int64[])
@@ -791,7 +791,7 @@
       IL_00da:  ldc.i4.0
       IL_00db:  ldelem.ref
       IL_00dc:  ldloc.1
-      IL_00dd:  call       class System.String JitTest.LCS::buildLCS(unsigned int64[0...,0...,0...,0...],
+      IL_00dd:  call       class System.String JitTest_lcs_ulong_arrays_il.LCS::buildLCS(unsigned int64[0...,0...,0...,0...],
                                                                      wchar[],
                                                                      unsigned int64[])
       IL_00e2:  call       bool ['mscorlib']System.String::Equals(class System.String,
@@ -826,6 +826,6 @@
 
   } // end of class 'LCS'
 
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_lcs_ulong_arrays_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/int64/arrays/lcs_ulong_d.csproj b/src/tests/JIT/Methodical/int64/arrays/lcs_ulong_d.csproj
index cd95ce836f7f13..4a1da957a747ad 100644
--- a/src/tests/JIT/Methodical/int64/arrays/lcs_ulong_d.csproj
+++ b/src/tests/JIT/Methodical/int64/arrays/lcs_ulong_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/arrays/lcs_ulong_do.csproj b/src/tests/JIT/Methodical/int64/arrays/lcs_ulong_do.csproj
index 2544882bfe7593..2eb04e993497ab 100644
--- a/src/tests/JIT/Methodical/int64/arrays/lcs_ulong_do.csproj
+++ b/src/tests/JIT/Methodical/int64/arrays/lcs_ulong_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/arrays/lcs_ulong_il_d.ilproj b/src/tests/JIT/Methodical/int64/arrays/lcs_ulong_il_d.ilproj
index df08d2d9144a87..b49de1e7ca2642 100644
--- a/src/tests/JIT/Methodical/int64/arrays/lcs_ulong_il_d.ilproj
+++ b/src/tests/JIT/Methodical/int64/arrays/lcs_ulong_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/arrays/lcs_ulong_il_r.ilproj b/src/tests/JIT/Methodical/int64/arrays/lcs_ulong_il_r.ilproj
index 0f5570e70fd841..4810c0a3cd1392 100644
--- a/src/tests/JIT/Methodical/int64/arrays/lcs_ulong_il_r.ilproj
+++ b/src/tests/JIT/Methodical/int64/arrays/lcs_ulong_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/arrays/lcs_ulong_r.csproj b/src/tests/JIT/Methodical/int64/arrays/lcs_ulong_r.csproj
index c838816dd11d27..4dbaeaa36a759a 100644
--- a/src/tests/JIT/Methodical/int64/arrays/lcs_ulong_r.csproj
+++ b/src/tests/JIT/Methodical/int64/arrays/lcs_ulong_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/arrays/lcs_ulong_ro.csproj b/src/tests/JIT/Methodical/int64/arrays/lcs_ulong_ro.csproj
index fb28b60983800f..9f32a72fc93547 100644
--- a/src/tests/JIT/Methodical/int64/arrays/lcs_ulong_ro.csproj
+++ b/src/tests/JIT/Methodical/int64/arrays/lcs_ulong_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/misc/binop.cs b/src/tests/JIT/Methodical/int64/misc/binop.cs
index 437d76d095f803..b3b262008dcb53 100644
--- a/src/tests/JIT/Methodical/int64/misc/binop.cs
+++ b/src/tests/JIT/Methodical/int64/misc/binop.cs
@@ -2,12 +2,14 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_binop_misc_cs
 {
-    internal class Test
+    public class Test
     {
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             long L1, L2;
             ulong U1, U2;
diff --git a/src/tests/JIT/Methodical/int64/misc/binop.il b/src/tests/JIT/Methodical/int64/misc/binop.il
index f9a77d82eba761..a73e0b6ba3aa77 100644
--- a/src/tests/JIT/Methodical/int64/misc/binop.il
+++ b/src/tests/JIT/Methodical/int64/misc/binop.il
@@ -18,12 +18,12 @@
 }
 .assembly extern xunit.core {}
 // MVID: {E24B38CB-1AB3-45BA-AA54-5C10DD72CDBA}
-.namespace JitTest
+.namespace JitTest_binop_misc_il
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends ['mscorlib']System.Object
   {
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -126,6 +126,6 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_binop_misc_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/int64/misc/binop_d.csproj b/src/tests/JIT/Methodical/int64/misc/binop_d.csproj
index ff13788b39b3d4..005d8ece53af56 100644
--- a/src/tests/JIT/Methodical/int64/misc/binop_d.csproj
+++ b/src/tests/JIT/Methodical/int64/misc/binop_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/misc/binop_do.csproj b/src/tests/JIT/Methodical/int64/misc/binop_do.csproj
index 46b08bdbeede0f..1b78fd9cbd0221 100644
--- a/src/tests/JIT/Methodical/int64/misc/binop_do.csproj
+++ b/src/tests/JIT/Methodical/int64/misc/binop_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/misc/binop_il_d.ilproj b/src/tests/JIT/Methodical/int64/misc/binop_il_d.ilproj
index 7c84a05ae772bd..d81a8a63177995 100644
--- a/src/tests/JIT/Methodical/int64/misc/binop_il_d.ilproj
+++ b/src/tests/JIT/Methodical/int64/misc/binop_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/misc/binop_il_r.ilproj b/src/tests/JIT/Methodical/int64/misc/binop_il_r.ilproj
index 7665fbf7c138c0..7c4cc30d508dc7 100644
--- a/src/tests/JIT/Methodical/int64/misc/binop_il_r.ilproj
+++ b/src/tests/JIT/Methodical/int64/misc/binop_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/misc/binop_r.csproj b/src/tests/JIT/Methodical/int64/misc/binop_r.csproj
index 8a98a5ab38f857..090b65542246ae 100644
--- a/src/tests/JIT/Methodical/int64/misc/binop_r.csproj
+++ b/src/tests/JIT/Methodical/int64/misc/binop_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/misc/binop_ro.csproj b/src/tests/JIT/Methodical/int64/misc/binop_ro.csproj
index b43a70fab9df67..a6edf7cffde9a4 100644
--- a/src/tests/JIT/Methodical/int64/misc/binop_ro.csproj
+++ b/src/tests/JIT/Methodical/int64/misc/binop_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/misc/box.cs b/src/tests/JIT/Methodical/int64/misc/box.cs
index f4190f46b9aa43..06253d3943bc2f 100644
--- a/src/tests/JIT/Methodical/int64/misc/box.cs
+++ b/src/tests/JIT/Methodical/int64/misc/box.cs
@@ -2,12 +2,14 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_box_misc_cs
 {
-    internal class Test
+    public class Test
     {
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             try
             {
diff --git a/src/tests/JIT/Methodical/int64/misc/box.il b/src/tests/JIT/Methodical/int64/misc/box.il
index ca47345075263b..fb63291962b71f 100644
--- a/src/tests/JIT/Methodical/int64/misc/box.il
+++ b/src/tests/JIT/Methodical/int64/misc/box.il
@@ -18,12 +18,12 @@
 }
 .assembly extern xunit.core {}
 // MVID: {8CBD3D83-F5B6-41AC-9D7A-099A59884AC4}
-.namespace JitTest
+.namespace JitTest_box_misc_il
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends ['mscorlib']System.Object
   {
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -120,6 +120,6 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_box_misc_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/int64/misc/box_d.csproj b/src/tests/JIT/Methodical/int64/misc/box_d.csproj
index f0d5e53f197b6b..429d945db7fb55 100644
--- a/src/tests/JIT/Methodical/int64/misc/box_d.csproj
+++ b/src/tests/JIT/Methodical/int64/misc/box_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/misc/box_do.csproj b/src/tests/JIT/Methodical/int64/misc/box_do.csproj
index 7f70ddb44272d7..05a5ba97e791b6 100644
--- a/src/tests/JIT/Methodical/int64/misc/box_do.csproj
+++ b/src/tests/JIT/Methodical/int64/misc/box_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/misc/box_il_d.ilproj b/src/tests/JIT/Methodical/int64/misc/box_il_d.ilproj
index c55e7d86daacce..6f0e0265ac8af4 100644
--- a/src/tests/JIT/Methodical/int64/misc/box_il_d.ilproj
+++ b/src/tests/JIT/Methodical/int64/misc/box_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/misc/box_il_r.ilproj b/src/tests/JIT/Methodical/int64/misc/box_il_r.ilproj
index 4d160dd1a88db7..641a80f99b1ba2 100644
--- a/src/tests/JIT/Methodical/int64/misc/box_il_r.ilproj
+++ b/src/tests/JIT/Methodical/int64/misc/box_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/misc/box_r.csproj b/src/tests/JIT/Methodical/int64/misc/box_r.csproj
index 893760d7ffdf61..48381e96bbe61d 100644
--- a/src/tests/JIT/Methodical/int64/misc/box_r.csproj
+++ b/src/tests/JIT/Methodical/int64/misc/box_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/misc/box_ro.csproj b/src/tests/JIT/Methodical/int64/misc/box_ro.csproj
index 52cb2fa58d665e..da3280fc05e50e 100644
--- a/src/tests/JIT/Methodical/int64/misc/box_ro.csproj
+++ b/src/tests/JIT/Methodical/int64/misc/box_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/misc/longmul.il b/src/tests/JIT/Methodical/int64/misc/longmul.il
index f73ebe95bf95bc..fbf2ae7b4cbe87 100644
--- a/src/tests/JIT/Methodical/int64/misc/longmul.il
+++ b/src/tests/JIT/Methodical/int64/misc/longmul.il
@@ -6,7 +6,7 @@
 .assembly 'longmul' { }
 .assembly extern xunit.core {}
 
-.class auto LongMulOn32BitTest extends [System.Runtime]System.Object
+.class public auto LongMulOn32BitTest extends [System.Runtime]System.Object
 {
   .method private hidebysig static void PrintErrorWithResult(string message, int64 result) cil managed
   {
@@ -26,7 +26,7 @@
     ret
   }
 
-  .method private hidebysig static int32 Main() cil managed
+  .method public hidebysig static int32 Main() cil managed
   {
     .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
         01 00 00 00
diff --git a/src/tests/JIT/Methodical/int64/misc/longmul.ilproj b/src/tests/JIT/Methodical/int64/misc/longmul.ilproj
index b31512ba88b784..658c9a347cd371 100644
--- a/src/tests/JIT/Methodical/int64/misc/longmul.ilproj
+++ b/src/tests/JIT/Methodical/int64/misc/longmul.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/signed/s_addsub.cs b/src/tests/JIT/Methodical/int64/signed/s_addsub.cs
index ae8170f3f36972..49a495ae586b0c 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_addsub.cs
+++ b/src/tests/JIT/Methodical/int64/signed/s_addsub.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_s_addsub_signed_cs
 {
-    internal class Test
+    public class Test
     {
         private static void testNumbers(long a, long b)
         {
@@ -66,7 +67,8 @@ private static void testNumbers(long a, long b)
                 throw new Exception();
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             try
             {
diff --git a/src/tests/JIT/Methodical/int64/signed/s_addsub.il b/src/tests/JIT/Methodical/int64/signed/s_addsub.il
index ea28c346adf992..c9c5d902157dd5 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_addsub.il
+++ b/src/tests/JIT/Methodical/int64/signed/s_addsub.il
@@ -18,9 +18,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {1BE54EA1-760A-4C23-A736-FE6F3A427E3E}
-.namespace JitTest
+.namespace JitTest_s_addsub_signed_il
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends ['mscorlib']System.Object
   {
     .method private hidebysig static void 
@@ -175,7 +175,7 @@
       IL_00c3:  ret
     } // end of method 'Test::testNumbers'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -191,1281 +191,1281 @@
         IL_0002:  conv.i8
         IL_0003:  ldc.i4     0xb8
         IL_0008:  conv.i8
-        IL_0009:  call       void JitTest.Test::testNumbers(int64,
+        IL_0009:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_000e:  ldc.i4.s   9
         IL_0010:  conv.i8
         IL_0011:  ldc.i4     0xf9
         IL_0016:  conv.i8
-        IL_0017:  call       void JitTest.Test::testNumbers(int64,
+        IL_0017:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_001c:  ldc.i4.s   110
         IL_001e:  conv.i8
         IL_001f:  ldc.i4     0x93
         IL_0024:  conv.i8
-        IL_0025:  call       void JitTest.Test::testNumbers(int64,
+        IL_0025:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_002a:  ldc.i4.s   30
         IL_002c:  conv.i8
         IL_002d:  ldc.i4     0x86
         IL_0032:  conv.i8
-        IL_0033:  call       void JitTest.Test::testNumbers(int64,
+        IL_0033:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0038:  ldc.i4     0xcc
         IL_003d:  conv.i8
         IL_003e:  ldc.i4     0x583f
         IL_0043:  conv.i8
-        IL_0044:  call       void JitTest.Test::testNumbers(int64,
+        IL_0044:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0049:  ldc.i4     0xc9
         IL_004e:  conv.i8
         IL_004f:  ldc.i4     0xa94c
         IL_0054:  conv.i8
-        IL_0055:  call       void JitTest.Test::testNumbers(int64,
+        IL_0055:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_005a:  ldc.i4.s   84
         IL_005c:  conv.i8
         IL_005d:  ldc.i4     0x2d06
         IL_0062:  conv.i8
-        IL_0063:  call       void JitTest.Test::testNumbers(int64,
+        IL_0063:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0068:  ldc.i4.s   48
         IL_006a:  conv.i8
         IL_006b:  ldc.i4     0x9921
         IL_0070:  conv.i8
-        IL_0071:  call       void JitTest.Test::testNumbers(int64,
+        IL_0071:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0076:  ldc.i4.s   29
         IL_0078:  conv.i8
         IL_0079:  ldc.i4     0x450842
         IL_007e:  conv.i8
-        IL_007f:  call       void JitTest.Test::testNumbers(int64,
+        IL_007f:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0084:  ldc.i4.s   42
         IL_0086:  conv.i8
         IL_0087:  ldc.i4     0x999f6c
         IL_008c:  conv.i8
-        IL_008d:  call       void JitTest.Test::testNumbers(int64,
+        IL_008d:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0092:  ldc.i4     0xc5
         IL_0097:  conv.i8
         IL_0098:  ldc.i4     0x90faa7
         IL_009d:  conv.i8
-        IL_009e:  call       void JitTest.Test::testNumbers(int64,
+        IL_009e:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_00a3:  ldc.i4.s   80
         IL_00a5:  conv.i8
         IL_00a6:  ldc.i4     0x69de08
         IL_00ab:  conv.i8
-        IL_00ac:  call       void JitTest.Test::testNumbers(int64,
+        IL_00ac:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_00b1:  ldc.i4     0x9a
         IL_00b6:  conv.i8
         IL_00b7:  ldc.i4     0xcd715be
         IL_00bc:  conv.i8
-        IL_00bd:  call       void JitTest.Test::testNumbers(int64,
+        IL_00bd:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_00c2:  ldc.i4.s   57
         IL_00c4:  conv.i8
         IL_00c5:  ldc.i4     0x16a61eb5
         IL_00ca:  conv.i8
-        IL_00cb:  call       void JitTest.Test::testNumbers(int64,
+        IL_00cb:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_00d0:  ldc.i4     0xe0
         IL_00d5:  conv.i8
         IL_00d6:  ldc.i4     0x95575fef
         IL_00db:  conv.u8
-        IL_00dc:  call       void JitTest.Test::testNumbers(int64,
+        IL_00dc:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_00e1:  ldc.i4     0x93
         IL_00e6:  conv.i8
         IL_00e7:  ldc.i4     0x209e58c5
         IL_00ec:  conv.i8
-        IL_00ed:  call       void JitTest.Test::testNumbers(int64,
+        IL_00ed:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_00f2:  ldc.i4.s   59
         IL_00f4:  conv.i8
         IL_00f5:  ldc.i8     0xc3c34b48c
-        IL_00fe:  call       void JitTest.Test::testNumbers(int64,
+        IL_00fe:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0103:  ldc.i4     0xc2
         IL_0108:  conv.i8
         IL_0109:  ldc.i8     0x6a671c470f
-        IL_0112:  call       void JitTest.Test::testNumbers(int64,
+        IL_0112:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0117:  ldc.i4.s   75
         IL_0119:  conv.i8
         IL_011a:  ldc.i8     0xf538cede2b
-        IL_0123:  call       void JitTest.Test::testNumbers(int64,
+        IL_0123:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0128:  ldc.i4     0x99
         IL_012d:  conv.i8
         IL_012e:  ldc.i8     0x5ba885d43b
-        IL_0137:  call       void JitTest.Test::testNumbers(int64,
+        IL_0137:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_013c:  ldc.i4.s   104
         IL_013e:  conv.i8
         IL_013f:  ldc.i8     0x9f692f98ac45
-        IL_0148:  call       void JitTest.Test::testNumbers(int64,
+        IL_0148:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_014d:  ldc.i4     0xd9
         IL_0152:  conv.i8
         IL_0153:  ldc.i8     0x8d5eaa7f0a8e
-        IL_015c:  call       void JitTest.Test::testNumbers(int64,
+        IL_015c:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0161:  ldc.i4     0xac
         IL_0166:  conv.i8
         IL_0167:  ldc.i8     0xba1316512e4c
-        IL_0170:  call       void JitTest.Test::testNumbers(int64,
+        IL_0170:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0175:  ldc.i4.s   28
         IL_0177:  conv.i8
         IL_0178:  ldc.i8     0x8c4fbf2f14aa
-        IL_0181:  call       void JitTest.Test::testNumbers(int64,
+        IL_0181:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0186:  ldc.i4     0xc0
         IL_018b:  conv.i8
         IL_018c:  ldc.i8     0x69a9eb9a9bc822
-        IL_0195:  call       void JitTest.Test::testNumbers(int64,
+        IL_0195:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_019a:  ldc.i4.s   116
         IL_019c:  conv.i8
         IL_019d:  ldc.i8     0x3f8f5a893de200
-        IL_01a6:  call       void JitTest.Test::testNumbers(int64,
+        IL_01a6:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_01ab:  ldc.i4.s   39
         IL_01ad:  conv.i8
         IL_01ae:  ldc.i8     0x650eb1747a5bc
-        IL_01b7:  call       void JitTest.Test::testNumbers(int64,
+        IL_01b7:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_01bc:  ldc.i4     0xd9
         IL_01c1:  conv.i8
         IL_01c2:  ldc.i8     0xd3d50809c70fda
-        IL_01cb:  call       void JitTest.Test::testNumbers(int64,
+        IL_01cb:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_01d0:  ldc.i4     0xc0
         IL_01d5:  conv.i8
         IL_01d6:  ldc.i8     0xac6556a4ca94513e
-        IL_01df:  call       void JitTest.Test::testNumbers(int64,
+        IL_01df:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_01e4:  ldc.i4.s   32
         IL_01e6:  conv.i8
         IL_01e7:  ldc.i8     0xa697fcbfd6d232d1
-        IL_01f0:  call       void JitTest.Test::testNumbers(int64,
+        IL_01f0:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_01f5:  ldc.i4     0x9c
         IL_01fa:  conv.i8
         IL_01fb:  ldc.i8     0xc4421a4f5147b9b8
-        IL_0204:  call       void JitTest.Test::testNumbers(int64,
+        IL_0204:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0209:  ldc.i4     0x9e
         IL_020e:  conv.i8
         IL_020f:  ldc.i8     0xc5ef494112a7b33f
-        IL_0218:  call       void JitTest.Test::testNumbers(int64,
+        IL_0218:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_021d:  ldc.i4     0xf7fa
         IL_0222:  conv.i8
         IL_0223:  ldc.i4     0xaf
         IL_0228:  conv.i8
-        IL_0229:  call       void JitTest.Test::testNumbers(int64,
+        IL_0229:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_022e:  ldc.i4     0xad17
         IL_0233:  conv.i8
         IL_0234:  ldc.i4     0xe8
         IL_0239:  conv.i8
-        IL_023a:  call       void JitTest.Test::testNumbers(int64,
+        IL_023a:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_023f:  ldc.i4     0xc9c4
         IL_0244:  conv.i8
         IL_0245:  ldc.i4.s   69
         IL_0247:  conv.i8
-        IL_0248:  call       void JitTest.Test::testNumbers(int64,
+        IL_0248:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_024d:  ldc.i4     0xa704
         IL_0252:  conv.i8
         IL_0253:  ldc.i4.s   18
         IL_0255:  conv.i8
-        IL_0256:  call       void JitTest.Test::testNumbers(int64,
+        IL_0256:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_025b:  ldc.i4     0xc55b
         IL_0260:  conv.i8
         IL_0261:  ldc.i4     0xa33a
         IL_0266:  conv.i8
-        IL_0267:  call       void JitTest.Test::testNumbers(int64,
+        IL_0267:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_026c:  ldc.i4     0xab88
         IL_0271:  conv.i8
         IL_0272:  ldc.i4     0x9a3c
         IL_0277:  conv.i8
-        IL_0278:  call       void JitTest.Test::testNumbers(int64,
+        IL_0278:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_027d:  ldc.i4     0xa539
         IL_0282:  conv.i8
         IL_0283:  ldc.i4     0xcf3a
         IL_0288:  conv.i8
-        IL_0289:  call       void JitTest.Test::testNumbers(int64,
+        IL_0289:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_028e:  ldc.i4     0x5890
         IL_0293:  conv.i8
         IL_0294:  ldc.i4     0xeec8
         IL_0299:  conv.i8
-        IL_029a:  call       void JitTest.Test::testNumbers(int64,
+        IL_029a:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_029f:  ldc.i4     0xe9e2
         IL_02a4:  conv.i8
         IL_02a5:  ldc.i4     0xfe7c46
         IL_02aa:  conv.i8
-        IL_02ab:  call       void JitTest.Test::testNumbers(int64,
+        IL_02ab:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_02b0:  ldc.i4     0x7303
         IL_02b5:  conv.i8
         IL_02b6:  ldc.i4     0x419f2a
         IL_02bb:  conv.i8
-        IL_02bc:  call       void JitTest.Test::testNumbers(int64,
+        IL_02bc:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_02c1:  ldc.i4     0xe105
         IL_02c6:  conv.i8
         IL_02c7:  ldc.i4     0x13f913
         IL_02cc:  conv.i8
-        IL_02cd:  call       void JitTest.Test::testNumbers(int64,
+        IL_02cd:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_02d2:  ldc.i4     0x8191
         IL_02d7:  conv.i8
         IL_02d8:  ldc.i4     0xfa2458
         IL_02dd:  conv.i8
-        IL_02de:  call       void JitTest.Test::testNumbers(int64,
+        IL_02de:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_02e3:  ldc.i4     0x6d9
         IL_02e8:  conv.i8
         IL_02e9:  ldc.i4     0x91cf14f7
         IL_02ee:  conv.u8
-        IL_02ef:  call       void JitTest.Test::testNumbers(int64,
+        IL_02ef:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_02f4:  ldc.i4     0xbdb1
         IL_02f9:  conv.i8
         IL_02fa:  ldc.i4     0x86c2a97c
         IL_02ff:  conv.u8
-        IL_0300:  call       void JitTest.Test::testNumbers(int64,
+        IL_0300:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0305:  ldc.i4     0xe905
         IL_030a:  conv.i8
         IL_030b:  ldc.i4     0x64f702f4
         IL_0310:  conv.i8
-        IL_0311:  call       void JitTest.Test::testNumbers(int64,
+        IL_0311:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0316:  ldc.i4     0x2fdc
         IL_031b:  conv.i8
         IL_031c:  ldc.i4     0xf059caf6
         IL_0321:  conv.u8
-        IL_0322:  call       void JitTest.Test::testNumbers(int64,
+        IL_0322:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0327:  ldc.i4     0xf8fd
         IL_032c:  conv.i8
         IL_032d:  ldc.i8     0x13f0265b1e
-        IL_0336:  call       void JitTest.Test::testNumbers(int64,
+        IL_0336:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_033b:  ldc.i4     0xe8b8
         IL_0340:  conv.i8
         IL_0341:  ldc.i8     0xaa69a6308
-        IL_034a:  call       void JitTest.Test::testNumbers(int64,
+        IL_034a:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_034f:  ldc.i4     0x3d00
         IL_0354:  conv.i8
         IL_0355:  ldc.i8     0xfbcb67879b
-        IL_035e:  call       void JitTest.Test::testNumbers(int64,
+        IL_035e:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0363:  ldc.i4     0xaa46
         IL_0368:  conv.i8
         IL_0369:  ldc.i8     0x85c3d371d5
-        IL_0372:  call       void JitTest.Test::testNumbers(int64,
+        IL_0372:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0377:  ldc.i4     0x5f60
         IL_037c:  conv.i8
         IL_037d:  ldc.i8     0x8cde4a63203
-        IL_0386:  call       void JitTest.Test::testNumbers(int64,
+        IL_0386:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_038b:  ldc.i4     0x92b5
         IL_0390:  conv.i8
         IL_0391:  ldc.i8     0x7ca86ba2f30e
-        IL_039a:  call       void JitTest.Test::testNumbers(int64,
+        IL_039a:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_039f:  ldc.i4     0x93c6
         IL_03a4:  conv.i8
         IL_03a5:  ldc.i8     0xa2d73fc4eac0
-        IL_03ae:  call       void JitTest.Test::testNumbers(int64,
+        IL_03ae:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_03b3:  ldc.i4     0x4156
         IL_03b8:  conv.i8
         IL_03b9:  ldc.i8     0x6dbd08f2fda
-        IL_03c2:  call       void JitTest.Test::testNumbers(int64,
+        IL_03c2:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_03c7:  ldc.i4     0x4597
         IL_03cc:  conv.i8
         IL_03cd:  ldc.i8     0x6cfb0ba5962826
-        IL_03d6:  call       void JitTest.Test::testNumbers(int64,
+        IL_03d6:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_03db:  ldc.i4     0x6bac
         IL_03e0:  conv.i8
         IL_03e1:  ldc.i8     0x1e79315071480f
-        IL_03ea:  call       void JitTest.Test::testNumbers(int64,
+        IL_03ea:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_03ef:  ldc.i4     0x2c3a
         IL_03f4:  conv.i8
         IL_03f5:  ldc.i8     0x92f12cbd82df69
-        IL_03fe:  call       void JitTest.Test::testNumbers(int64,
+        IL_03fe:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0403:  ldc.i4     0x9859
         IL_0408:  conv.i8
         IL_0409:  ldc.i8     0xb0f0cd9dc019f2
-        IL_0412:  call       void JitTest.Test::testNumbers(int64,
+        IL_0412:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0417:  ldc.i4     0xb37f
         IL_041c:  conv.i8
         IL_041d:  ldc.i8     0x4966447d15850076
-        IL_0426:  call       void JitTest.Test::testNumbers(int64,
+        IL_0426:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_042b:  ldc.i4     0x5e34
         IL_0430:  conv.i8
         IL_0431:  ldc.i8     0x7c1869c9ed2cad38
-        IL_043a:  call       void JitTest.Test::testNumbers(int64,
+        IL_043a:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_043f:  ldc.i4     0x5c54
         IL_0444:  conv.i8
         IL_0445:  ldc.i8     0x7cee70ee82837a08
-        IL_044e:  call       void JitTest.Test::testNumbers(int64,
+        IL_044e:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0453:  ldc.i4     0x967f
         IL_0458:  conv.i8
         IL_0459:  ldc.i8     0x4eb98adf4b8b0d32
-        IL_0462:  call       void JitTest.Test::testNumbers(int64,
+        IL_0462:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0467:  ldc.i4     0xfd2919
         IL_046c:  conv.i8
         IL_046d:  ldc.i4.s   93
         IL_046f:  conv.i8
-        IL_0470:  call       void JitTest.Test::testNumbers(int64,
+        IL_0470:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0475:  ldc.i4     0xabd5b1
         IL_047a:  conv.i8
         IL_047b:  ldc.i4     0x98
         IL_0480:  conv.i8
-        IL_0481:  call       void JitTest.Test::testNumbers(int64,
+        IL_0481:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0486:  ldc.i4     0xab1887
         IL_048b:  conv.i8
         IL_048c:  ldc.i4     0xef
         IL_0491:  conv.i8
-        IL_0492:  call       void JitTest.Test::testNumbers(int64,
+        IL_0492:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0497:  ldc.i4     0x96034a
         IL_049c:  conv.i8
         IL_049d:  ldc.i4.s   47
         IL_049f:  conv.i8
-        IL_04a0:  call       void JitTest.Test::testNumbers(int64,
+        IL_04a0:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_04a5:  ldc.i4     0xd5bb94
         IL_04aa:  conv.i8
         IL_04ab:  ldc.i4     0x57d2
         IL_04b0:  conv.i8
-        IL_04b1:  call       void JitTest.Test::testNumbers(int64,
+        IL_04b1:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_04b6:  ldc.i4     0xd7b2cb
         IL_04bb:  conv.i8
         IL_04bc:  ldc.i4     0x80f5
         IL_04c1:  conv.i8
-        IL_04c2:  call       void JitTest.Test::testNumbers(int64,
+        IL_04c2:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_04c7:  ldc.i4     0x4ccc6d
         IL_04cc:  conv.i8
         IL_04cd:  ldc.i4     0x87c
         IL_04d2:  conv.i8
-        IL_04d3:  call       void JitTest.Test::testNumbers(int64,
+        IL_04d3:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_04d8:  ldc.i4     0xec0c50
         IL_04dd:  conv.i8
         IL_04de:  ldc.i4     0xbdff
         IL_04e3:  conv.i8
-        IL_04e4:  call       void JitTest.Test::testNumbers(int64,
+        IL_04e4:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_04e9:  ldc.i4     0x8a6865
         IL_04ee:  conv.i8
         IL_04ef:  ldc.i4     0x76c014
         IL_04f4:  conv.i8
-        IL_04f5:  call       void JitTest.Test::testNumbers(int64,
+        IL_04f5:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_04fa:  ldc.i4     0xac38dd
         IL_04ff:  conv.i8
         IL_0500:  ldc.i4     0xf12b09
         IL_0505:  conv.i8
-        IL_0506:  call       void JitTest.Test::testNumbers(int64,
+        IL_0506:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_050b:  ldc.i4     0x615e2a
         IL_0510:  conv.i8
         IL_0511:  ldc.i4     0xe7cbf8
         IL_0516:  conv.i8
-        IL_0517:  call       void JitTest.Test::testNumbers(int64,
+        IL_0517:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_051c:  ldc.i4     0xe214f
         IL_0521:  conv.i8
         IL_0522:  ldc.i4     0x5b8e2f
         IL_0527:  conv.i8
-        IL_0528:  call       void JitTest.Test::testNumbers(int64,
+        IL_0528:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_052d:  ldc.i4     0x3bd7c6
         IL_0532:  conv.i8
         IL_0533:  ldc.i4     0xc1db4e46
         IL_0538:  conv.u8
-        IL_0539:  call       void JitTest.Test::testNumbers(int64,
+        IL_0539:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_053e:  ldc.i4     0xae208d
         IL_0543:  conv.i8
         IL_0544:  ldc.i4     0x1c9aa7a
         IL_0549:  conv.i8
-        IL_054a:  call       void JitTest.Test::testNumbers(int64,
+        IL_054a:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_054f:  ldc.i4     0x8a9cef
         IL_0554:  conv.i8
         IL_0555:  ldc.i4     0x3930b07
         IL_055a:  conv.i8
-        IL_055b:  call       void JitTest.Test::testNumbers(int64,
+        IL_055b:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0560:  ldc.i4     0x36b866
         IL_0565:  conv.i8
         IL_0566:  ldc.i4     0xd64b7bef
         IL_056b:  conv.u8
-        IL_056c:  call       void JitTest.Test::testNumbers(int64,
+        IL_056c:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0571:  ldc.i4     0xd337cd
         IL_0576:  conv.i8
         IL_0577:  ldc.i8     0xa2b45fb7de
-        IL_0580:  call       void JitTest.Test::testNumbers(int64,
+        IL_0580:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0585:  ldc.i4     0x24471
         IL_058a:  conv.i8
         IL_058b:  ldc.i8     0x5c5de3da89
-        IL_0594:  call       void JitTest.Test::testNumbers(int64,
+        IL_0594:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0599:  ldc.i4     0x12b15
         IL_059e:  conv.i8
         IL_059f:  ldc.i8     0x7cd40030fe
-        IL_05a8:  call       void JitTest.Test::testNumbers(int64,
+        IL_05a8:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_05ad:  ldc.i4     0xd38af2
         IL_05b2:  conv.i8
         IL_05b3:  ldc.i8     0x5905921572
-        IL_05bc:  call       void JitTest.Test::testNumbers(int64,
+        IL_05bc:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_05c1:  ldc.i4     0xaca0d7
         IL_05c6:  conv.i8
         IL_05c7:  ldc.i8     0xc632301abeb8
-        IL_05d0:  call       void JitTest.Test::testNumbers(int64,
+        IL_05d0:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_05d5:  ldc.i4     0x4eadc2
         IL_05da:  conv.i8
         IL_05db:  ldc.i8     0x6a1ebf37403c
-        IL_05e4:  call       void JitTest.Test::testNumbers(int64,
+        IL_05e4:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_05e9:  ldc.i4     0x5d909c
         IL_05ee:  conv.i8
         IL_05ef:  ldc.i8     0x4021bfa15862
-        IL_05f8:  call       void JitTest.Test::testNumbers(int64,
+        IL_05f8:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_05fd:  ldc.i4     0x710e08
         IL_0602:  conv.i8
         IL_0603:  ldc.i8     0xe9a1a030b230
-        IL_060c:  call       void JitTest.Test::testNumbers(int64,
+        IL_060c:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0611:  ldc.i4     0x478b9b
         IL_0616:  conv.i8
         IL_0617:  ldc.i8     0x804add8afc31d9
-        IL_0620:  call       void JitTest.Test::testNumbers(int64,
+        IL_0620:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0625:  ldc.i4     0x5754ed
         IL_062a:  conv.i8
         IL_062b:  ldc.i8     0xaf85e7ebb1ce33
-        IL_0634:  call       void JitTest.Test::testNumbers(int64,
+        IL_0634:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0639:  ldc.i4     0x3ab44e
         IL_063e:  conv.i8
         IL_063f:  ldc.i8     0xf41b9f70360f78
-        IL_0648:  call       void JitTest.Test::testNumbers(int64,
+        IL_0648:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_064d:  ldc.i4     0x7aa129
         IL_0652:  conv.i8
         IL_0653:  ldc.i8     0xeb6e4eddf7eb87
-        IL_065c:  call       void JitTest.Test::testNumbers(int64,
+        IL_065c:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0661:  ldc.i4     0x3b036f
         IL_0666:  conv.i8
         IL_0667:  ldc.i8     0x333874e4330fbfa4
-        IL_0670:  call       void JitTest.Test::testNumbers(int64,
+        IL_0670:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0675:  ldc.i4     0xa33186
         IL_067a:  conv.i8
         IL_067b:  ldc.i8     0xec8607412503fc4c
-        IL_0684:  call       void JitTest.Test::testNumbers(int64,
+        IL_0684:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0689:  ldc.i4     0x9af471
         IL_068e:  conv.i8
         IL_068f:  ldc.i8     0xe7ad0935fdbff151
-        IL_0698:  call       void JitTest.Test::testNumbers(int64,
+        IL_0698:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_069d:  ldc.i4     0xc04e8c
         IL_06a2:  conv.i8
         IL_06a3:  ldc.i8     0x58ee406ab936ac24
-        IL_06ac:  call       void JitTest.Test::testNumbers(int64,
+        IL_06ac:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_06b1:  ldc.i4     0x54fdd28b
         IL_06b6:  conv.i8
         IL_06b7:  ldc.i4.s   52
         IL_06b9:  conv.i8
-        IL_06ba:  call       void JitTest.Test::testNumbers(int64,
+        IL_06ba:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_06bf:  ldc.i4     0x33736b36
         IL_06c4:  conv.i8
         IL_06c5:  ldc.i4     0xfd
         IL_06ca:  conv.i8
-        IL_06cb:  call       void JitTest.Test::testNumbers(int64,
+        IL_06cb:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_06d0:  ldc.i4     0x69cfe4b7
         IL_06d5:  conv.i8
         IL_06d6:  ldc.i4.s   38
         IL_06d8:  conv.i8
-        IL_06d9:  call       void JitTest.Test::testNumbers(int64,
+        IL_06d9:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_06de:  ldc.i4     0xfd078d36
         IL_06e3:  conv.u8
         IL_06e4:  ldc.i4     0xdc
         IL_06e9:  conv.i8
-        IL_06ea:  call       void JitTest.Test::testNumbers(int64,
+        IL_06ea:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_06ef:  ldc.i4     0x75cc3f36
         IL_06f4:  conv.i8
         IL_06f5:  ldc.i4     0x1617
         IL_06fa:  conv.i8
-        IL_06fb:  call       void JitTest.Test::testNumbers(int64,
+        IL_06fb:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0700:  ldc.i4     0x75d660e
         IL_0705:  conv.i8
         IL_0706:  ldc.i4     0x8511
         IL_070b:  conv.i8
-        IL_070c:  call       void JitTest.Test::testNumbers(int64,
+        IL_070c:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0711:  ldc.i4     0x52acb037
         IL_0716:  conv.i8
         IL_0717:  ldc.i4     0x43cb
         IL_071c:  conv.i8
-        IL_071d:  call       void JitTest.Test::testNumbers(int64,
+        IL_071d:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0722:  ldc.i4     0xa0db7bf5
         IL_0727:  conv.u8
         IL_0728:  ldc.i4     0x2c98
         IL_072d:  conv.i8
-        IL_072e:  call       void JitTest.Test::testNumbers(int64,
+        IL_072e:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0733:  ldc.i4     0x83d4be11
         IL_0738:  conv.u8
         IL_0739:  ldc.i4     0xba37c9
         IL_073e:  conv.i8
-        IL_073f:  call       void JitTest.Test::testNumbers(int64,
+        IL_073f:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0744:  ldc.i4     0x83d04f94
         IL_0749:  conv.u8
         IL_074a:  ldc.i4     0x3ddbd0
         IL_074f:  conv.i8
-        IL_0750:  call       void JitTest.Test::testNumbers(int64,
+        IL_0750:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0755:  ldc.i4     0x5ed41f6a
         IL_075a:  conv.i8
         IL_075b:  ldc.i4     0xeaf1d5
         IL_0760:  conv.i8
-        IL_0761:  call       void JitTest.Test::testNumbers(int64,
+        IL_0761:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0766:  ldc.i4     0xe364a9a
         IL_076b:  conv.i8
         IL_076c:  ldc.i4     0x85880c
         IL_0771:  conv.i8
-        IL_0772:  call       void JitTest.Test::testNumbers(int64,
+        IL_0772:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0777:  ldc.i4     0x12657ecb
         IL_077c:  conv.i8
         IL_077d:  ldc.i4     0xa88b8a68
         IL_0782:  conv.u8
-        IL_0783:  call       void JitTest.Test::testNumbers(int64,
+        IL_0783:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0788:  ldc.i4     0x9897a4ac
         IL_078d:  conv.u8
         IL_078e:  ldc.i4     0x76707981
         IL_0793:  conv.i8
-        IL_0794:  call       void JitTest.Test::testNumbers(int64,
+        IL_0794:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0799:  ldc.i4     0x469cd1cf
         IL_079e:  conv.i8
         IL_079f:  ldc.i4     0xcf40f67a
         IL_07a4:  conv.u8
-        IL_07a5:  call       void JitTest.Test::testNumbers(int64,
+        IL_07a5:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_07aa:  ldc.i4     0xee7444c8
         IL_07af:  conv.u8
         IL_07b0:  ldc.i4     0xd1b0d7de
         IL_07b5:  conv.u8
-        IL_07b6:  call       void JitTest.Test::testNumbers(int64,
+        IL_07b6:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_07bb:  ldc.i4     0xfbb6f547
         IL_07c0:  conv.u8
         IL_07c1:  ldc.i8     0xc1ef3c4d9b
-        IL_07ca:  call       void JitTest.Test::testNumbers(int64,
+        IL_07ca:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_07cf:  ldc.i4     0xe20dd53
         IL_07d4:  conv.i8
         IL_07d5:  ldc.i8     0xb05833c7cf
-        IL_07de:  call       void JitTest.Test::testNumbers(int64,
+        IL_07de:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_07e3:  ldc.i4     0xe5733fb8
         IL_07e8:  conv.u8
         IL_07e9:  ldc.i8     0x8eae18a855
-        IL_07f2:  call       void JitTest.Test::testNumbers(int64,
+        IL_07f2:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_07f7:  ldc.i4     0x5db1c271
         IL_07fc:  conv.i8
         IL_07fd:  ldc.i8     0xc4a2f7c27d
-        IL_0806:  call       void JitTest.Test::testNumbers(int64,
+        IL_0806:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_080b:  ldc.i4     0x7add22a
         IL_0810:  conv.i8
         IL_0811:  ldc.i8     0xed9fd23dc3e
-        IL_081a:  call       void JitTest.Test::testNumbers(int64,
+        IL_081a:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_081f:  ldc.i4     0x2239d1d5
         IL_0824:  conv.i8
         IL_0825:  ldc.i8     0xa1ae07a62635
-        IL_082e:  call       void JitTest.Test::testNumbers(int64,
+        IL_082e:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0833:  ldc.i4     0x410d4d58
         IL_0838:  conv.i8
         IL_0839:  ldc.i8     0xc05c5205bed2
-        IL_0842:  call       void JitTest.Test::testNumbers(int64,
+        IL_0842:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0847:  ldc.i4     0x4c3c435e
         IL_084c:  conv.i8
         IL_084d:  ldc.i8     0x1e30c1bf628a
-        IL_0856:  call       void JitTest.Test::testNumbers(int64,
+        IL_0856:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_085b:  ldc.i4     0x96f44d5
         IL_0860:  conv.i8
         IL_0861:  ldc.i8     0x5488c521a6072b
-        IL_086a:  call       void JitTest.Test::testNumbers(int64,
+        IL_086a:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_086f:  ldc.i4     0x17f28913
         IL_0874:  conv.i8
         IL_0875:  ldc.i8     0x796ff3891c44ff
-        IL_087e:  call       void JitTest.Test::testNumbers(int64,
+        IL_087e:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0883:  ldc.i4     0x65be69cf
         IL_0888:  conv.i8
         IL_0889:  ldc.i8     0xdd5c6f9b3f3119
-        IL_0892:  call       void JitTest.Test::testNumbers(int64,
+        IL_0892:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0897:  ldc.i4     0x2200f221
         IL_089c:  conv.i8
         IL_089d:  ldc.i8     0xab6c98c90cfe9d
-        IL_08a6:  call       void JitTest.Test::testNumbers(int64,
+        IL_08a6:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_08ab:  ldc.i4     0xd48bee1a
         IL_08b0:  conv.u8
         IL_08b1:  ldc.i8     0x64b76d7491a58799
-        IL_08ba:  call       void JitTest.Test::testNumbers(int64,
+        IL_08ba:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_08bf:  ldc.i4     0x6cb93100
         IL_08c4:  conv.i8
         IL_08c5:  ldc.i8     0xa515fe27402dad45
-        IL_08ce:  call       void JitTest.Test::testNumbers(int64,
+        IL_08ce:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_08d3:  ldc.i4     0xbed95abe
         IL_08d8:  conv.u8
         IL_08d9:  ldc.i8     0xc9924098acc74be9
-        IL_08e2:  call       void JitTest.Test::testNumbers(int64,
+        IL_08e2:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_08e7:  ldc.i4     0x92781a2e
         IL_08ec:  conv.u8
         IL_08ed:  ldc.i8     0x67ada9ef3f9e39b7
-        IL_08f6:  call       void JitTest.Test::testNumbers(int64,
+        IL_08f6:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_08fb:  ldc.i8     0xe3aafcdae2
         IL_0904:  ldc.i4     0x9c
         IL_0909:  conv.i8
-        IL_090a:  call       void JitTest.Test::testNumbers(int64,
+        IL_090a:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_090f:  ldc.i8     0xd8dad80c34
         IL_0918:  ldc.i4     0x99
         IL_091d:  conv.i8
-        IL_091e:  call       void JitTest.Test::testNumbers(int64,
+        IL_091e:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0923:  ldc.i8     0xaddcd074d6
         IL_092c:  ldc.i4     0xea
         IL_0931:  conv.i8
-        IL_0932:  call       void JitTest.Test::testNumbers(int64,
+        IL_0932:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0937:  ldc.i8     0x96735bc25a
         IL_0940:  ldc.i4     0xba
         IL_0945:  conv.i8
-        IL_0946:  call       void JitTest.Test::testNumbers(int64,
+        IL_0946:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_094b:  ldc.i8     0xf492ef7446
         IL_0954:  ldc.i4     0x39b1
         IL_0959:  conv.i8
-        IL_095a:  call       void JitTest.Test::testNumbers(int64,
+        IL_095a:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_095f:  ldc.i8     0xbc86816119
         IL_0968:  ldc.i4     0x1520
         IL_096d:  conv.i8
-        IL_096e:  call       void JitTest.Test::testNumbers(int64,
+        IL_096e:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0973:  ldc.i8     0x60a36818e7
         IL_097c:  ldc.i4     0xc5a8
         IL_0981:  conv.i8
-        IL_0982:  call       void JitTest.Test::testNumbers(int64,
+        IL_0982:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0987:  ldc.i8     0x317121d508
         IL_0990:  ldc.i4     0xac3d
         IL_0995:  conv.i8
-        IL_0996:  call       void JitTest.Test::testNumbers(int64,
+        IL_0996:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_099b:  ldc.i8     0x4abfdaf232
         IL_09a4:  ldc.i4     0x5cea57
         IL_09a9:  conv.i8
-        IL_09aa:  call       void JitTest.Test::testNumbers(int64,
+        IL_09aa:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_09af:  ldc.i8     0xacc458f392
         IL_09b8:  ldc.i4     0xa9c3e3
         IL_09bd:  conv.i8
-        IL_09be:  call       void JitTest.Test::testNumbers(int64,
+        IL_09be:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_09c3:  ldc.i8     0x1020993532
         IL_09cc:  ldc.i4     0xdf6042
         IL_09d1:  conv.i8
-        IL_09d2:  call       void JitTest.Test::testNumbers(int64,
+        IL_09d2:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_09d7:  ldc.i8     0xad25b80abb
         IL_09e0:  ldc.i4     0xcec15b
         IL_09e5:  conv.i8
-        IL_09e6:  call       void JitTest.Test::testNumbers(int64,
+        IL_09e6:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_09eb:  ldc.i8     0x2305d2c443
         IL_09f4:  ldc.i4     0x2a26131c
         IL_09f9:  conv.i8
-        IL_09fa:  call       void JitTest.Test::testNumbers(int64,
+        IL_09fa:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_09ff:  ldc.i8     0x7c42e2ce0
         IL_0a08:  ldc.i4     0x9768024f
         IL_0a0d:  conv.u8
-        IL_0a0e:  call       void JitTest.Test::testNumbers(int64,
+        IL_0a0e:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0a13:  ldc.i8     0x76f674816c
         IL_0a1c:  ldc.i4     0x8d33c7b4
         IL_0a21:  conv.u8
-        IL_0a22:  call       void JitTest.Test::testNumbers(int64,
+        IL_0a22:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0a27:  ldc.i8     0xbf567b23bc
         IL_0a30:  ldc.i4     0xef264890
         IL_0a35:  conv.u8
-        IL_0a36:  call       void JitTest.Test::testNumbers(int64,
+        IL_0a36:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0a3b:  ldc.i8     0xe3283681a0
         IL_0a44:  ldc.i8     0x2e66850719
-        IL_0a4d:  call       void JitTest.Test::testNumbers(int64,
+        IL_0a4d:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0a52:  ldc.i8     0x11fe13754
         IL_0a5b:  ldc.i8     0x66fad0b407
-        IL_0a64:  call       void JitTest.Test::testNumbers(int64,
+        IL_0a64:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0a69:  ldc.i8     0x52f259009f
         IL_0a72:  ldc.i8     0xa2886ef414
-        IL_0a7b:  call       void JitTest.Test::testNumbers(int64,
+        IL_0a7b:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0a80:  ldc.i8     0xa9ebb540fc
         IL_0a89:  ldc.i8     0x9d27ba694f
-        IL_0a92:  call       void JitTest.Test::testNumbers(int64,
+        IL_0a92:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0a97:  ldc.i8     0x83af60d7eb
         IL_0aa0:  ldc.i8     0xb6f2a0f51f4c
-        IL_0aa9:  call       void JitTest.Test::testNumbers(int64,
+        IL_0aa9:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0aae:  ldc.i8     0xf2ec42d13a
         IL_0ab7:  ldc.i8     0x46855f279407
-        IL_0ac0:  call       void JitTest.Test::testNumbers(int64,
+        IL_0ac0:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0ac5:  ldc.i8     0x94e71cb562
         IL_0ace:  ldc.i8     0x2d9566618e56
-        IL_0ad7:  call       void JitTest.Test::testNumbers(int64,
+        IL_0ad7:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0adc:  ldc.i8     0xc0ee690ddc
         IL_0ae5:  ldc.i8     0x54295c8ca584
-        IL_0aee:  call       void JitTest.Test::testNumbers(int64,
+        IL_0aee:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0af3:  ldc.i8     0x2683cd5206
         IL_0afc:  ldc.i8     0xa5a2d269bcd188
-        IL_0b05:  call       void JitTest.Test::testNumbers(int64,
+        IL_0b05:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0b0a:  ldc.i8     0x2e77038305
         IL_0b13:  ldc.i8     0xc727f0f3787e22
-        IL_0b1c:  call       void JitTest.Test::testNumbers(int64,
+        IL_0b1c:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0b21:  ldc.i8     0x8323b9d026
         IL_0b2a:  ldc.i8     0xfed29f8575c120
-        IL_0b33:  call       void JitTest.Test::testNumbers(int64,
+        IL_0b33:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0b38:  ldc.i8     0x7b3231f0fc
         IL_0b41:  ldc.i8     0x91080854b27d3e
-        IL_0b4a:  call       void JitTest.Test::testNumbers(int64,
+        IL_0b4a:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0b4f:  ldc.i8     0x84522a7708
         IL_0b58:  ldc.i8     0x91ba8f22fccd6222
-        IL_0b61:  call       void JitTest.Test::testNumbers(int64,
+        IL_0b61:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0b66:  ldc.i8     0xafb1b50d90
         IL_0b6f:  ldc.i8     0x3261a532b65c7838
-        IL_0b78:  call       void JitTest.Test::testNumbers(int64,
+        IL_0b78:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0b7d:  ldc.i8     0x2c65e838c6
         IL_0b86:  ldc.i8     0x5b858452c9bf6f39
-        IL_0b8f:  call       void JitTest.Test::testNumbers(int64,
+        IL_0b8f:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0b94:  ldc.i8     0x219e837734
         IL_0b9d:  ldc.i8     0x97873bed5bb0a44b
-        IL_0ba6:  call       void JitTest.Test::testNumbers(int64,
+        IL_0ba6:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0bab:  ldc.i8     0x9f133e2f116f
         IL_0bb4:  ldc.i4.s   115
         IL_0bb6:  conv.i8
-        IL_0bb7:  call       void JitTest.Test::testNumbers(int64,
+        IL_0bb7:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0bbc:  ldc.i8     0x887577574766
         IL_0bc5:  ldc.i4.s   72
         IL_0bc7:  conv.i8
-        IL_0bc8:  call       void JitTest.Test::testNumbers(int64,
+        IL_0bc8:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0bcd:  ldc.i8     0xba4c778d4aa8
         IL_0bd6:  ldc.i4.s   58
         IL_0bd8:  conv.i8
-        IL_0bd9:  call       void JitTest.Test::testNumbers(int64,
+        IL_0bd9:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0bde:  ldc.i8     0x2683df421474
         IL_0be7:  ldc.i4.s   86
         IL_0be9:  conv.i8
-        IL_0bea:  call       void JitTest.Test::testNumbers(int64,
+        IL_0bea:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0bef:  ldc.i8     0x6ff76294c275
         IL_0bf8:  ldc.i4     0x89f7
         IL_0bfd:  conv.i8
-        IL_0bfe:  call       void JitTest.Test::testNumbers(int64,
+        IL_0bfe:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0c03:  ldc.i8     0xfdf053abefa2
         IL_0c0c:  ldc.i4     0xeb65
         IL_0c11:  conv.i8
-        IL_0c12:  call       void JitTest.Test::testNumbers(int64,
+        IL_0c12:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0c17:  ldc.i8     0xea4b254b24eb
         IL_0c20:  ldc.i4     0xba27
         IL_0c25:  conv.i8
-        IL_0c26:  call       void JitTest.Test::testNumbers(int64,
+        IL_0c26:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0c2b:  ldc.i8     0x9f7ce21b811
         IL_0c34:  ldc.i4     0xe8f6
         IL_0c39:  conv.i8
-        IL_0c3a:  call       void JitTest.Test::testNumbers(int64,
+        IL_0c3a:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0c3f:  ldc.i8     0x9cc645fa08a1
         IL_0c48:  ldc.i4     0xa29ea3
         IL_0c4d:  conv.i8
-        IL_0c4e:  call       void JitTest.Test::testNumbers(int64,
+        IL_0c4e:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0c53:  ldc.i8     0x726f9a9f816e
         IL_0c5c:  ldc.i4     0x70dce1
         IL_0c61:  conv.i8
-        IL_0c62:  call       void JitTest.Test::testNumbers(int64,
+        IL_0c62:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0c67:  ldc.i8     0xa4be34825ef6
         IL_0c70:  ldc.i4     0xbb2be7
         IL_0c75:  conv.i8
-        IL_0c76:  call       void JitTest.Test::testNumbers(int64,
+        IL_0c76:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0c7b:  ldc.i8     0x57ff147cb7c1
         IL_0c84:  ldc.i4     0xe255af
         IL_0c89:  conv.i8
-        IL_0c8a:  call       void JitTest.Test::testNumbers(int64,
+        IL_0c8a:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0c8f:  ldc.i8     0xab9d6f546dd4
         IL_0c98:  ldc.i4     0x7e2772a5
         IL_0c9d:  conv.i8
-        IL_0c9e:  call       void JitTest.Test::testNumbers(int64,
+        IL_0c9e:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0ca3:  ldc.i8     0xb148e3446e89
         IL_0cac:  ldc.i4     0x51ed3c28
         IL_0cb1:  conv.i8
-        IL_0cb2:  call       void JitTest.Test::testNumbers(int64,
+        IL_0cb2:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0cb7:  ldc.i8     0x1e3abfe9725e
         IL_0cc0:  ldc.i4     0xd4dec3f4
         IL_0cc5:  conv.u8
-        IL_0cc6:  call       void JitTest.Test::testNumbers(int64,
+        IL_0cc6:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0ccb:  ldc.i8     0xf61bcaba115e
         IL_0cd4:  ldc.i4     0xfade149f
         IL_0cd9:  conv.u8
-        IL_0cda:  call       void JitTest.Test::testNumbers(int64,
+        IL_0cda:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0cdf:  ldc.i8     0xae642b9a6626
         IL_0ce8:  ldc.i8     0xd8de0e0b9a
-        IL_0cf1:  call       void JitTest.Test::testNumbers(int64,
+        IL_0cf1:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0cf6:  ldc.i8     0x9d015a13c8ae
         IL_0cff:  ldc.i8     0xafc8827997
-        IL_0d08:  call       void JitTest.Test::testNumbers(int64,
+        IL_0d08:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0d0d:  ldc.i8     0xecc72cc2df89
         IL_0d16:  ldc.i8     0x70d47ec7c4
-        IL_0d1f:  call       void JitTest.Test::testNumbers(int64,
+        IL_0d1f:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0d24:  ldc.i8     0xfdbf05894fd2
         IL_0d2d:  ldc.i8     0x12aec393bd
-        IL_0d36:  call       void JitTest.Test::testNumbers(int64,
+        IL_0d36:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0d3b:  ldc.i8     0xcd7675a70874
         IL_0d44:  ldc.i8     0xd7d696a62cbc
-        IL_0d4d:  call       void JitTest.Test::testNumbers(int64,
+        IL_0d4d:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0d52:  ldc.i8     0xfad44a89216d
         IL_0d5b:  ldc.i8     0xcb8cfc8ada4c
-        IL_0d64:  call       void JitTest.Test::testNumbers(int64,
+        IL_0d64:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0d69:  ldc.i8     0xf41eb5363551
         IL_0d72:  ldc.i8     0x9c040aa7775e
-        IL_0d7b:  call       void JitTest.Test::testNumbers(int64,
+        IL_0d7b:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0d80:  ldc.i8     0x3c02d93e01f6
         IL_0d89:  ldc.i8     0xf1f4e68a14f8
-        IL_0d92:  call       void JitTest.Test::testNumbers(int64,
+        IL_0d92:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0d97:  ldc.i8     0xe0d99954b598
         IL_0da0:  ldc.i8     0xb2a2de4e453485
-        IL_0da9:  call       void JitTest.Test::testNumbers(int64,
+        IL_0da9:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0dae:  ldc.i8     0xa6081be866d9
         IL_0db7:  ldc.i8     0xf2a12e845e4f2e
-        IL_0dc0:  call       void JitTest.Test::testNumbers(int64,
+        IL_0dc0:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0dc5:  ldc.i8     0xae56a5680dfd
         IL_0dce:  ldc.i8     0xc96cd7c15d5bec
-        IL_0dd7:  call       void JitTest.Test::testNumbers(int64,
+        IL_0dd7:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0ddc:  ldc.i8     0x360363e37938
         IL_0de5:  ldc.i8     0xd4ed572e1937e0
-        IL_0dee:  call       void JitTest.Test::testNumbers(int64,
+        IL_0dee:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0df3:  ldc.i8     0x1f052aebf185
         IL_0dfc:  ldc.i8     0x3584e582d1c6db1a
-        IL_0e05:  call       void JitTest.Test::testNumbers(int64,
+        IL_0e05:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0e0a:  ldc.i8     0x3fac9c7b3d1b
         IL_0e13:  ldc.i8     0xa4b120f080d69113
-        IL_0e1c:  call       void JitTest.Test::testNumbers(int64,
+        IL_0e1c:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0e21:  ldc.i8     0x5330d51c3217
         IL_0e2a:  ldc.i8     0xc16dd32ffd822c0e
-        IL_0e33:  call       void JitTest.Test::testNumbers(int64,
+        IL_0e33:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0e38:  ldc.i8     0xcd0694ff5ab0
         IL_0e41:  ldc.i8     0x29673fe67245fbfc
-        IL_0e4a:  call       void JitTest.Test::testNumbers(int64,
+        IL_0e4a:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0e4f:  ldc.i8     0x98265e5a308523
         IL_0e58:  ldc.i4.s   125
         IL_0e5a:  conv.i8
-        IL_0e5b:  call       void JitTest.Test::testNumbers(int64,
+        IL_0e5b:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0e60:  ldc.i8     0x560863350df217
         IL_0e69:  ldc.i4     0xc8
         IL_0e6e:  conv.i8
-        IL_0e6f:  call       void JitTest.Test::testNumbers(int64,
+        IL_0e6f:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0e74:  ldc.i8     0x798ce804d829a1
         IL_0e7d:  ldc.i4     0xb1
         IL_0e82:  conv.i8
-        IL_0e83:  call       void JitTest.Test::testNumbers(int64,
+        IL_0e83:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0e88:  ldc.i8     0x7994c0051256fd
         IL_0e91:  ldc.i4.s   92
         IL_0e93:  conv.i8
-        IL_0e94:  call       void JitTest.Test::testNumbers(int64,
+        IL_0e94:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0e99:  ldc.i8     0xff1a2838e69f42
         IL_0ea2:  ldc.i4     0x3c16
         IL_0ea7:  conv.i8
-        IL_0ea8:  call       void JitTest.Test::testNumbers(int64,
+        IL_0ea8:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0ead:  ldc.i8     0x9e7e95ac5de2c7
         IL_0eb6:  ldc.i4     0xed49
         IL_0ebb:  conv.i8
-        IL_0ebc:  call       void JitTest.Test::testNumbers(int64,
+        IL_0ebc:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0ec1:  ldc.i8     0xfd6867eabba5c0
         IL_0eca:  ldc.i4     0xc689
         IL_0ecf:  conv.i8
-        IL_0ed0:  call       void JitTest.Test::testNumbers(int64,
+        IL_0ed0:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0ed5:  ldc.i8     0x9d1632daf20de0
         IL_0ede:  ldc.i4     0xb74f
         IL_0ee3:  conv.i8
-        IL_0ee4:  call       void JitTest.Test::testNumbers(int64,
+        IL_0ee4:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0ee9:  ldc.i8     0xee29d8f76d4e9c
         IL_0ef2:  ldc.i4     0x8020d4
         IL_0ef7:  conv.i8
-        IL_0ef8:  call       void JitTest.Test::testNumbers(int64,
+        IL_0ef8:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0efd:  ldc.i8     0x89e03ecf8daa0a
         IL_0f06:  ldc.i4     0x3e7587
         IL_0f0b:  conv.i8
-        IL_0f0c:  call       void JitTest.Test::testNumbers(int64,
+        IL_0f0c:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0f11:  ldc.i8     0x115763be4beb44
         IL_0f1a:  ldc.i4     0x88f762
         IL_0f1f:  conv.i8
-        IL_0f20:  call       void JitTest.Test::testNumbers(int64,
+        IL_0f20:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0f25:  ldc.i8     0x815cfc87c427d0
         IL_0f2e:  ldc.i4     0x9eec06
         IL_0f33:  conv.i8
-        IL_0f34:  call       void JitTest.Test::testNumbers(int64,
+        IL_0f34:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0f39:  ldc.i8     0x1d9c3c9ded0c1a
         IL_0f42:  ldc.i4     0xb9f6d331
         IL_0f47:  conv.u8
-        IL_0f48:  call       void JitTest.Test::testNumbers(int64,
+        IL_0f48:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0f4d:  ldc.i8     0x932225412f1222
         IL_0f56:  ldc.i4     0x130ff743
         IL_0f5b:  conv.i8
-        IL_0f5c:  call       void JitTest.Test::testNumbers(int64,
+        IL_0f5c:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0f61:  ldc.i8     0xfe82151e2e0bf3
         IL_0f6a:  ldc.i4     0x781cd6f9
         IL_0f6f:  conv.i8
-        IL_0f70:  call       void JitTest.Test::testNumbers(int64,
+        IL_0f70:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0f75:  ldc.i8     0x2222abb5061b12
         IL_0f7e:  ldc.i4     0x491f1df
         IL_0f83:  conv.i8
-        IL_0f84:  call       void JitTest.Test::testNumbers(int64,
+        IL_0f84:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0f89:  ldc.i8     0x12ce0cf0452748
         IL_0f92:  ldc.i8     0xa8566274aa
-        IL_0f9b:  call       void JitTest.Test::testNumbers(int64,
+        IL_0f9b:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0fa0:  ldc.i8     0xe570484e9937e1
         IL_0fa9:  ldc.i8     0xac81f171be
-        IL_0fb2:  call       void JitTest.Test::testNumbers(int64,
+        IL_0fb2:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0fb7:  ldc.i8     0xeb371f7f8f514e
         IL_0fc0:  ldc.i8     0xdf0248189c
-        IL_0fc9:  call       void JitTest.Test::testNumbers(int64,
+        IL_0fc9:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0fce:  ldc.i8     0x3777a7cc43dfd7
         IL_0fd7:  ldc.i8     0x3a7b8eaf40
-        IL_0fe0:  call       void JitTest.Test::testNumbers(int64,
+        IL_0fe0:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0fe5:  ldc.i8     0xe181db76238786
         IL_0fee:  ldc.i8     0x4126e572a568
-        IL_0ff7:  call       void JitTest.Test::testNumbers(int64,
+        IL_0ff7:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0ffc:  ldc.i8     0xac1df87977e122
         IL_1005:  ldc.i8     0xe1e8cfde6678
-        IL_100e:  call       void JitTest.Test::testNumbers(int64,
+        IL_100e:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_1013:  ldc.i8     0x1c858763a2c23b
         IL_101c:  ldc.i8     0x4ef61f3964f
-        IL_1025:  call       void JitTest.Test::testNumbers(int64,
+        IL_1025:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_102a:  ldc.i8     0xbd786bbb71ce46
         IL_1033:  ldc.i8     0x2cda097a464f
-        IL_103c:  call       void JitTest.Test::testNumbers(int64,
+        IL_103c:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_1041:  ldc.i8     0xa7a6de21a46360
         IL_104a:  ldc.i8     0x7afda16f98c3
-        IL_1053:  call       void JitTest.Test::testNumbers(int64,
+        IL_1053:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_1058:  ldc.i8     0x6fed70a6ccfdf2
         IL_1061:  ldc.i8     0x9771441e8e00e8
-        IL_106a:  call       void JitTest.Test::testNumbers(int64,
+        IL_106a:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_106f:  ldc.i8     0x5ad2782dcd5e60
         IL_1078:  ldc.i8     0xd170d518385f6
-        IL_1081:  call       void JitTest.Test::testNumbers(int64,
+        IL_1081:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_1086:  ldc.i8     0x1fd67b153bc9b9
         IL_108f:  ldc.i8     0x7b3366dff66c6c
-        IL_1098:  call       void JitTest.Test::testNumbers(int64,
+        IL_1098:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_109d:  ldc.i8     0xbf00203beb73f4
         IL_10a6:  ldc.i8     0x693495fefab1c77e
-        IL_10af:  call       void JitTest.Test::testNumbers(int64,
+        IL_10af:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_10b4:  ldc.i8     0x2faac1b1b068f8
         IL_10bd:  ldc.i8     0x1cb11cc5c3aaff86
-        IL_10c6:  call       void JitTest.Test::testNumbers(int64,
+        IL_10c6:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_10cb:  ldc.i8     0xbb63cfbffe7648
         IL_10d4:  ldc.i8     0x84f5b0c583f9e77b
-        IL_10dd:  call       void JitTest.Test::testNumbers(int64,
+        IL_10dd:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_10e2:  ldc.i8     0x615db89673241c
         IL_10eb:  ldc.i8     0x8de5f125247eba0f
-        IL_10f4:  call       void JitTest.Test::testNumbers(int64,
+        IL_10f4:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_10f9:  ldc.i8     0x9be183a6b293dffe
         IL_1102:  ldc.i4.s   114
         IL_1104:  conv.i8
-        IL_1105:  call       void JitTest.Test::testNumbers(int64,
+        IL_1105:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_110a:  ldc.i8     0xa3df9b76d8a51b19
         IL_1113:  ldc.i4     0xc4
         IL_1118:  conv.i8
-        IL_1119:  call       void JitTest.Test::testNumbers(int64,
+        IL_1119:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_111e:  ldc.i8     0xb4cc300f0ea7566d
         IL_1127:  ldc.i4.s   126
         IL_1129:  conv.i8
-        IL_112a:  call       void JitTest.Test::testNumbers(int64,
+        IL_112a:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_112f:  ldc.i8     0xfdac12a8e23e16e7
         IL_1138:  ldc.i4.s   21
         IL_113a:  conv.i8
-        IL_113b:  call       void JitTest.Test::testNumbers(int64,
+        IL_113b:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_1140:  ldc.i8     0xc0805405aadc0f47
         IL_1149:  ldc.i4     0x19d4
         IL_114e:  conv.i8
-        IL_114f:  call       void JitTest.Test::testNumbers(int64,
+        IL_114f:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_1154:  ldc.i8     0x843a391f8d9f8972
         IL_115d:  ldc.i4     0x317a
         IL_1162:  conv.i8
-        IL_1163:  call       void JitTest.Test::testNumbers(int64,
+        IL_1163:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_1168:  ldc.i8     0x5a0d124c427ed453
         IL_1171:  ldc.i4     0x34fe
         IL_1176:  conv.i8
-        IL_1177:  call       void JitTest.Test::testNumbers(int64,
+        IL_1177:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_117c:  ldc.i8     0x8631150f34008f1b
         IL_1185:  ldc.i4     0x2ecd
         IL_118a:  conv.i8
-        IL_118b:  call       void JitTest.Test::testNumbers(int64,
+        IL_118b:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_1190:  ldc.i8     0x3ff4c18715ad3a76
         IL_1199:  ldc.i4     0x72d22a
         IL_119e:  conv.i8
-        IL_119f:  call       void JitTest.Test::testNumbers(int64,
+        IL_119f:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_11a4:  ldc.i8     0x3ef93e5a649422bd
         IL_11ad:  ldc.i4     0xdb5c60
         IL_11b2:  conv.i8
-        IL_11b3:  call       void JitTest.Test::testNumbers(int64,
+        IL_11b3:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_11b8:  ldc.i8     0x6bdd1056ae58fe0e
         IL_11c1:  ldc.i4     0x805c75
         IL_11c6:  conv.i8
-        IL_11c7:  call       void JitTest.Test::testNumbers(int64,
+        IL_11c7:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_11cc:  ldc.i8     0xeff1fa30f3ad9ded
         IL_11d5:  ldc.i4     0xc83ca
         IL_11da:  conv.i8
-        IL_11db:  call       void JitTest.Test::testNumbers(int64,
+        IL_11db:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_11e0:  ldc.i8     0xbbc143ac147e56a9
         IL_11e9:  ldc.i4     0x161179b7
         IL_11ee:  conv.i8
-        IL_11ef:  call       void JitTest.Test::testNumbers(int64,
+        IL_11ef:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_11f4:  ldc.i8     0x829dde88caa2e45
         IL_11fd:  ldc.i4     0x1443ab62
         IL_1202:  conv.i8
-        IL_1203:  call       void JitTest.Test::testNumbers(int64,
+        IL_1203:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_1208:  ldc.i8     0x97ac43ff797a4514
         IL_1211:  ldc.i4     0x33eef42b
         IL_1216:  conv.i8
-        IL_1217:  call       void JitTest.Test::testNumbers(int64,
+        IL_1217:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_121c:  ldc.i8     0x703e9cdf96a148aa
         IL_1225:  ldc.i4     0x8e08f3d8
         IL_122a:  conv.u8
-        IL_122b:  call       void JitTest.Test::testNumbers(int64,
+        IL_122b:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_1230:  ldc.i8     0x75cbb739b54e2ad6
         IL_1239:  ldc.i8     0x7a8b12628c
-        IL_1242:  call       void JitTest.Test::testNumbers(int64,
+        IL_1242:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_1247:  ldc.i8     0x91e42fafe97d638f
         IL_1250:  ldc.i8     0xfbe867c51
-        IL_1259:  call       void JitTest.Test::testNumbers(int64,
+        IL_1259:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_125e:  ldc.i8     0x9159d77deec116c1
         IL_1267:  ldc.i8     0x96c0c774fc
-        IL_1270:  call       void JitTest.Test::testNumbers(int64,
+        IL_1270:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_1275:  ldc.i8     0xb59dbb4c15761d88
         IL_127e:  ldc.i8     0x4a033a73e7
-        IL_1287:  call       void JitTest.Test::testNumbers(int64,
+        IL_1287:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_128c:  ldc.i8     0xab668e9783af9617
         IL_1295:  ldc.i8     0x5aa18404076c
-        IL_129e:  call       void JitTest.Test::testNumbers(int64,
+        IL_129e:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_12a3:  ldc.i8     0x54c68e5b5c4127df
         IL_12ac:  ldc.i8     0xf2934fd8dd1f
-        IL_12b5:  call       void JitTest.Test::testNumbers(int64,
+        IL_12b5:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_12ba:  ldc.i8     0xf490d3936184c9f9
         IL_12c3:  ldc.i8     0x4007477e2110
-        IL_12cc:  call       void JitTest.Test::testNumbers(int64,
+        IL_12cc:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_12d1:  ldc.i8     0x349e577c9d5c44e2
         IL_12da:  ldc.i8     0xbdb2235af963
-        IL_12e3:  call       void JitTest.Test::testNumbers(int64,
+        IL_12e3:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_12e8:  ldc.i8     0x58f3ac26cdafde28
         IL_12f1:  ldc.i8     0x17d4f4ade9ec35
-        IL_12fa:  call       void JitTest.Test::testNumbers(int64,
+        IL_12fa:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_12ff:  ldc.i8     0xa4a263c316d21f4c
         IL_1308:  ldc.i8     0xa7ec1e6fda834b
-        IL_1311:  call       void JitTest.Test::testNumbers(int64,
+        IL_1311:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_1316:  ldc.i8     0x6ab14771c448666f
         IL_131f:  ldc.i8     0x5b0f49593c3a27
-        IL_1328:  call       void JitTest.Test::testNumbers(int64,
+        IL_1328:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_132d:  ldc.i8     0x15f392c3602aa4f7
         IL_1336:  ldc.i8     0x18af171045f88e
-        IL_133f:  call       void JitTest.Test::testNumbers(int64,
+        IL_133f:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_1344:  ldc.i8     0xf17de69c0063f62c
         IL_134d:  ldc.i8     0xee2a164c2c3a46f8
-        IL_1356:  call       void JitTest.Test::testNumbers(int64,
+        IL_1356:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_135b:  ldc.i8     0xf34b743eeff8e5c6
         IL_1364:  ldc.i8     0x4f4067f1a0e404ad
-        IL_136d:  call       void JitTest.Test::testNumbers(int64,
+        IL_136d:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_1372:  ldc.i8     0xee0296f678756647
         IL_137b:  ldc.i8     0xf1bbfdc6f0280d36
-        IL_1384:  call       void JitTest.Test::testNumbers(int64,
+        IL_1384:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_1389:  ldc.i8     0x65c33db0c952b829
         IL_1392:  ldc.i8     0xa7ab9c39dcffbcf3
-        IL_139b:  call       void JitTest.Test::testNumbers(int64,
+        IL_139b:  call       void JitTest_s_addsub_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_13a0:  ldstr      "All tests passed."
         IL_13a5:  call       void [System.Console]System.Console::WriteLine(class System.String)
@@ -1498,6 +1498,6 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_s_addsub_signed_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/int64/signed/s_addsub_d.csproj b/src/tests/JIT/Methodical/int64/signed/s_addsub_d.csproj
index 40389191c49bf5..d149a23b82e71f 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_addsub_d.csproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_addsub_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/signed/s_addsub_do.csproj b/src/tests/JIT/Methodical/int64/signed/s_addsub_do.csproj
index c801e81658ace2..5e233287ac2209 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_addsub_do.csproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_addsub_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/signed/s_addsub_il_d.ilproj b/src/tests/JIT/Methodical/int64/signed/s_addsub_il_d.ilproj
index d5c97e1adedfc8..08b8accd65b4a6 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_addsub_il_d.ilproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_addsub_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/signed/s_addsub_il_r.ilproj b/src/tests/JIT/Methodical/int64/signed/s_addsub_il_r.ilproj
index aca1c033fe7c38..79054e11b43fa6 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_addsub_il_r.ilproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_addsub_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/signed/s_addsub_r.csproj b/src/tests/JIT/Methodical/int64/signed/s_addsub_r.csproj
index b78df4d230d3a2..e0c4270a32d730 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_addsub_r.csproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_addsub_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/signed/s_addsub_ro.csproj b/src/tests/JIT/Methodical/int64/signed/s_addsub_ro.csproj
index 15d10e65e5242c..339ad0ecbdec63 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_addsub_ro.csproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_addsub_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldc_div.cs b/src/tests/JIT/Methodical/int64/signed/s_ldc_div.cs
index edb296e83c4f0a..2b4e139586f88e 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldc_div.cs
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldc_div.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_s_ldc_div_signed_cs
 {
-    internal class Test
+    public class Test
     {
         private static bool check(long op1, long op2, long product, bool overflow)
         {
@@ -24,7 +25,8 @@ private static bool check(long op1, long op2, long product, bool overflow)
             }
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             if (!check(0x000000007fffffff, 0x000000007fffffff, 0x3fffffff00000001, false))
                 goto fail;
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldc_div.il b/src/tests/JIT/Methodical/int64/signed/s_ldc_div.il
index 631a8a7823a912..792af2753b7934 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldc_div.il
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldc_div.il
@@ -18,9 +18,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {907922FB-D56B-4407-A016-0118205F2F38}
-.namespace JitTest
+.namespace JitTest_s_ldc_div_signed_il
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends ['mscorlib']System.Object
   {
     .method private hidebysig static bool 
@@ -74,7 +74,7 @@
       IL_003e:  ret
     } // end of method 'Test::check'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -90,7 +90,7 @@
       IL_000b:  conv.i8
       IL_000c:  ldc.i8     0x3fffffff00000001
       IL_0015:  ldc.i4.0
-      IL_0016:  call       bool JitTest.Test::check(int64,
+      IL_0016:  call       bool JitTest_s_ldc_div_signed_il.Test::check(int64,
                                                     int64,
                                                     int64,
                                                     bool)
@@ -103,7 +103,7 @@
       IL_0030:  conv.i8
       IL_0031:  ldc.i8     0x7fffffff00000000
       IL_003a:  ldc.i4.0
-      IL_003b:  call       bool JitTest.Test::check(int64,
+      IL_003b:  call       bool JitTest_s_ldc_div_signed_il.Test::check(int64,
                                                     int64,
                                                     int64,
                                                     bool)
@@ -116,7 +116,7 @@
       IL_0051:  conv.i8
       IL_0052:  ldc.i8     0x7ffffffffffffffe
       IL_005b:  ldc.i4.0
-      IL_005c:  call       bool JitTest.Test::check(int64,
+      IL_005c:  call       bool JitTest_s_ldc_div_signed_il.Test::check(int64,
                                                     int64,
                                                     int64,
                                                     bool)
@@ -131,7 +131,7 @@
       IL_006d:  ldc.i4.2
       IL_006e:  conv.i8
       IL_006f:  ldc.i4.0
-      IL_0070:  call       bool JitTest.Test::check(int64,
+      IL_0070:  call       bool JitTest_s_ldc_div_signed_il.Test::check(int64,
                                                     int64,
                                                     int64,
                                                     bool)
@@ -144,7 +144,7 @@
       IL_0082:  ldc.i8     0x1000000000
       IL_008b:  ldc.i8     0x100000000000000
       IL_0094:  ldc.i4.0
-      IL_0095:  call       bool JitTest.Test::check(int64,
+      IL_0095:  call       bool JitTest_s_ldc_div_signed_il.Test::check(int64,
                                                     int64,
                                                     int64,
                                                     bool)
@@ -159,7 +159,7 @@
       IL_00a2:  ldc.i4.1
       IL_00a3:  conv.i8
       IL_00a4:  ldc.i4.0
-      IL_00a5:  call       bool JitTest.Test::check(int64,
+      IL_00a5:  call       bool JitTest_s_ldc_div_signed_il.Test::check(int64,
                                                     int64,
                                                     int64,
                                                     bool)
@@ -174,7 +174,7 @@
       IL_00b3:  ldc.i4.1
       IL_00b4:  conv.i8
       IL_00b5:  ldc.i4.0
-      IL_00b6:  call       bool JitTest.Test::check(int64,
+      IL_00b6:  call       bool JitTest_s_ldc_div_signed_il.Test::check(int64,
                                                     int64,
                                                     int64,
                                                     bool)
@@ -187,7 +187,7 @@
       IL_00c1:  ldc.i8     0x8000000000000001
       IL_00ca:  ldc.i8     0x7fffffffffffffff
       IL_00d3:  ldc.i4.0
-      IL_00d4:  call       bool JitTest.Test::check(int64,
+      IL_00d4:  call       bool JitTest_s_ldc_div_signed_il.Test::check(int64,
                                                     int64,
                                                     int64,
                                                     bool)
@@ -202,7 +202,7 @@
       IL_00e1:  ldc.i4     0x3e8
       IL_00e6:  conv.i8
       IL_00e7:  ldc.i4.1
-      IL_00e8:  call       bool JitTest.Test::check(int64,
+      IL_00e8:  call       bool JitTest_s_ldc_div_signed_il.Test::check(int64,
                                                     int64,
                                                     int64,
                                                     bool)
@@ -238,6 +238,6 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_s_ldc_div_signed_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldc_div_d.csproj b/src/tests/JIT/Methodical/int64/signed/s_ldc_div_d.csproj
index 59fa280c8e5eea..b5c99db4c35252 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldc_div_d.csproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldc_div_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldc_div_do.csproj b/src/tests/JIT/Methodical/int64/signed/s_ldc_div_do.csproj
index c28ad524fb387a..230d07ed1783fe 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldc_div_do.csproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldc_div_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldc_div_il_d.ilproj b/src/tests/JIT/Methodical/int64/signed/s_ldc_div_il_d.ilproj
index d8ff8297ba214f..24d551ce9ed31f 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldc_div_il_d.ilproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldc_div_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldc_div_il_r.ilproj b/src/tests/JIT/Methodical/int64/signed/s_ldc_div_il_r.ilproj
index cf9317c2744a3b..b2cd5c9b57dc9c 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldc_div_il_r.ilproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldc_div_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldc_div_r.csproj b/src/tests/JIT/Methodical/int64/signed/s_ldc_div_r.csproj
index 0c1958dead3193..20a7d3348a23ef 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldc_div_r.csproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldc_div_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldc_div_ro.csproj b/src/tests/JIT/Methodical/int64/signed/s_ldc_div_ro.csproj
index 4f3ba0a70dea4b..de7851e3737cf3 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldc_div_ro.csproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldc_div_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldc_mul.cs b/src/tests/JIT/Methodical/int64/signed/s_ldc_mul.cs
index 267228c601a9db..116a09d509fd6e 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldc_mul.cs
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldc_mul.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_s_ldc_mul_signed_cs
 {
-    internal class Test
+    public class Test
     {
         private static bool check(long op1, long op2, long product, bool overflow)
         {
@@ -24,7 +25,8 @@ private static bool check(long op1, long op2, long product, bool overflow)
             }
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             if (!check(0x000000007fffffff, 0x000000007fffffff, 0x3fffffff00000001, false))
                 goto fail;
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldc_mul.il b/src/tests/JIT/Methodical/int64/signed/s_ldc_mul.il
index c933afe29b5dbf..d0a9809f01a54e 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldc_mul.il
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldc_mul.il
@@ -18,9 +18,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {DD9661FF-93A5-4664-8EAA-E345054EF8F6}
-.namespace JitTest
+.namespace JitTest_s_ldc_mul_signed_il
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends ['mscorlib']System.Object
   {
     .method private hidebysig static bool 
@@ -74,7 +74,7 @@
       IL_003e:  ret
     } // end of method 'Test::check'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -90,7 +90,7 @@
       IL_000b:  conv.i8
       IL_000c:  ldc.i8     0x3fffffff00000001
       IL_0015:  ldc.i4.0
-      IL_0016:  call       bool JitTest.Test::check(int64,
+      IL_0016:  call       bool JitTest_s_ldc_mul_signed_il.Test::check(int64,
                                                     int64,
                                                     int64,
                                                     bool)
@@ -103,7 +103,7 @@
       IL_0030:  conv.i8
       IL_0031:  ldc.i8     0x7fffffff00000000
       IL_003a:  ldc.i4.0
-      IL_003b:  call       bool JitTest.Test::check(int64,
+      IL_003b:  call       bool JitTest_s_ldc_mul_signed_il.Test::check(int64,
                                                     int64,
                                                     int64,
                                                     bool)
@@ -116,7 +116,7 @@
       IL_0059:  ldc.i4.0
       IL_005a:  conv.i8
       IL_005b:  ldc.i4.0
-      IL_005c:  call       bool JitTest.Test::check(int64,
+      IL_005c:  call       bool JitTest_s_ldc_mul_signed_il.Test::check(int64,
                                                     int64,
                                                     int64,
                                                     bool)
@@ -129,7 +129,7 @@
       IL_006f:  conv.i8
       IL_0070:  ldc.i8     0x7ffffffffffffffe
       IL_0079:  ldc.i4.0
-      IL_007a:  call       bool JitTest.Test::check(int64,
+      IL_007a:  call       bool JitTest_s_ldc_mul_signed_il.Test::check(int64,
                                                     int64,
                                                     int64,
                                                     bool)
@@ -144,7 +144,7 @@
       IL_0088:  ldc.i4.2
       IL_0089:  conv.i8
       IL_008a:  ldc.i4.0
-      IL_008b:  call       bool JitTest.Test::check(int64,
+      IL_008b:  call       bool JitTest_s_ldc_mul_signed_il.Test::check(int64,
                                                     int64,
                                                     int64,
                                                     bool)
@@ -157,7 +157,7 @@
       IL_009a:  ldc.i8     0x1000000000
       IL_00a3:  ldc.i8     0x100000000000000
       IL_00ac:  ldc.i4.0
-      IL_00ad:  call       bool JitTest.Test::check(int64,
+      IL_00ad:  call       bool JitTest_s_ldc_mul_signed_il.Test::check(int64,
                                                     int64,
                                                     int64,
                                                     bool)
@@ -170,7 +170,7 @@
       IL_00b8:  ldc.i8     0x8000000000000001
       IL_00c1:  ldc.i8     0x7fffffffffffffff
       IL_00ca:  ldc.i4.0
-      IL_00cb:  call       bool JitTest.Test::check(int64,
+      IL_00cb:  call       bool JitTest_s_ldc_mul_signed_il.Test::check(int64,
                                                     int64,
                                                     int64,
                                                     bool)
@@ -206,6 +206,6 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_s_ldc_mul_signed_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldc_mul_d.csproj b/src/tests/JIT/Methodical/int64/signed/s_ldc_mul_d.csproj
index f3191749d60619..e352b80e071344 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldc_mul_d.csproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldc_mul_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldc_mul_do.csproj b/src/tests/JIT/Methodical/int64/signed/s_ldc_mul_do.csproj
index 4f07121574f365..dbdd8c5f1c2bfa 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldc_mul_do.csproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldc_mul_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldc_mul_il_d.ilproj b/src/tests/JIT/Methodical/int64/signed/s_ldc_mul_il_d.ilproj
index b39c388e12e9f7..55cd56f9a36005 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldc_mul_il_d.ilproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldc_mul_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldc_mul_il_r.ilproj b/src/tests/JIT/Methodical/int64/signed/s_ldc_mul_il_r.ilproj
index ba6179587809d0..fab28a449799e0 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldc_mul_il_r.ilproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldc_mul_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldc_mul_r.csproj b/src/tests/JIT/Methodical/int64/signed/s_ldc_mul_r.csproj
index 0e5d89055c65a1..a29b98a0038eae 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldc_mul_r.csproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldc_mul_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldc_mul_ro.csproj b/src/tests/JIT/Methodical/int64/signed/s_ldc_mul_ro.csproj
index 6c6d261c3bf51b..b238ab2afa7f25 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldc_mul_ro.csproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldc_mul_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldc_mulovf.cs b/src/tests/JIT/Methodical/int64/signed/s_ldc_mulovf.cs
index a4b21421396fd8..246cf79f07ca30 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldc_mulovf.cs
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldc_mulovf.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_s_ldc_mulovf_signed_cs
 {
-    internal class Test
+    public class Test
     {
         private static bool check(long op1, long op2, long product, bool overflow)
         {
@@ -24,7 +25,8 @@ private static bool check(long op1, long op2, long product, bool overflow)
             }
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             if (!check(0x000000007fffffff, 0x000000007fffffff, 0x3fffffff00000001, false))
                 goto fail;
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldc_mulovf.il b/src/tests/JIT/Methodical/int64/signed/s_ldc_mulovf.il
index 40cdf2c41c3336..4db98feec4b394 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldc_mulovf.il
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldc_mulovf.il
@@ -18,9 +18,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {2BC63DAA-17AC-498E-A6E0-2E0A01266D5E}
-.namespace JitTest
+.namespace JitTest_s_ldc_mulovf_signed_il
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends ['mscorlib']System.Object
   {
     .method private hidebysig static bool 
@@ -74,7 +74,7 @@
       IL_003e:  ret
     } // end of method 'Test::check'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -90,7 +90,7 @@
       IL_000b:  conv.i8
       IL_000c:  ldc.i8     0x3fffffff00000001
       IL_0015:  ldc.i4.0
-      IL_0016:  call       bool JitTest.Test::check(int64,
+      IL_0016:  call       bool JitTest_s_ldc_mulovf_signed_il.Test::check(int64,
                                                     int64,
                                                     int64,
                                                     bool)
@@ -103,7 +103,7 @@
       IL_0030:  conv.i8
       IL_0031:  ldc.i8     0x7fffffff00000000
       IL_003a:  ldc.i4.0
-      IL_003b:  call       bool JitTest.Test::check(int64,
+      IL_003b:  call       bool JitTest_s_ldc_mulovf_signed_il.Test::check(int64,
                                                     int64,
                                                     int64,
                                                     bool)
@@ -116,7 +116,7 @@
       IL_0059:  ldc.i4.0
       IL_005a:  conv.i8
       IL_005b:  ldc.i4.1
-      IL_005c:  call       bool JitTest.Test::check(int64,
+      IL_005c:  call       bool JitTest_s_ldc_mulovf_signed_il.Test::check(int64,
                                                     int64,
                                                     int64,
                                                     bool)
@@ -129,7 +129,7 @@
       IL_006f:  conv.i8
       IL_0070:  ldc.i8     0x7ffffffffffffffe
       IL_0079:  ldc.i4.0
-      IL_007a:  call       bool JitTest.Test::check(int64,
+      IL_007a:  call       bool JitTest_s_ldc_mulovf_signed_il.Test::check(int64,
                                                     int64,
                                                     int64,
                                                     bool)
@@ -144,7 +144,7 @@
       IL_0088:  ldc.i4.2
       IL_0089:  conv.i8
       IL_008a:  ldc.i4.0
-      IL_008b:  call       bool JitTest.Test::check(int64,
+      IL_008b:  call       bool JitTest_s_ldc_mulovf_signed_il.Test::check(int64,
                                                     int64,
                                                     int64,
                                                     bool)
@@ -157,7 +157,7 @@
       IL_009a:  ldc.i8     0x1000000000
       IL_00a3:  ldc.i8     0x100000000000000
       IL_00ac:  ldc.i4.0
-      IL_00ad:  call       bool JitTest.Test::check(int64,
+      IL_00ad:  call       bool JitTest_s_ldc_mulovf_signed_il.Test::check(int64,
                                                     int64,
                                                     int64,
                                                     bool)
@@ -170,7 +170,7 @@
       IL_00b8:  ldc.i8     0x8000000000000001
       IL_00c1:  ldc.i8     0x7fffffffffffffff
       IL_00ca:  ldc.i4.0
-      IL_00cb:  call       bool JitTest.Test::check(int64,
+      IL_00cb:  call       bool JitTest_s_ldc_mulovf_signed_il.Test::check(int64,
                                                     int64,
                                                     int64,
                                                     bool)
@@ -206,6 +206,6 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_s_ldc_mulovf_signed_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldc_mulovf_d.csproj b/src/tests/JIT/Methodical/int64/signed/s_ldc_mulovf_d.csproj
index 301e9f27179e2d..7ec8104ec27109 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldc_mulovf_d.csproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldc_mulovf_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldc_mulovf_do.csproj b/src/tests/JIT/Methodical/int64/signed/s_ldc_mulovf_do.csproj
index 2931ab0c04b9d2..cd65a9fe5b9ac9 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldc_mulovf_do.csproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldc_mulovf_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldc_mulovf_il_d.ilproj b/src/tests/JIT/Methodical/int64/signed/s_ldc_mulovf_il_d.ilproj
index c76d1ee177a324..5a4dd60d62a735 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldc_mulovf_il_d.ilproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldc_mulovf_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldc_mulovf_il_r.ilproj b/src/tests/JIT/Methodical/int64/signed/s_ldc_mulovf_il_r.ilproj
index 334e52169110ef..782d874498e9b9 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldc_mulovf_il_r.ilproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldc_mulovf_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldc_mulovf_r.csproj b/src/tests/JIT/Methodical/int64/signed/s_ldc_mulovf_r.csproj
index bf5bbe1b9d7b98..89783a781c66c7 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldc_mulovf_r.csproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldc_mulovf_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldc_mulovf_ro.csproj b/src/tests/JIT/Methodical/int64/signed/s_ldc_mulovf_ro.csproj
index 5f4dba5965a5b1..852d28146063ac 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldc_mulovf_ro.csproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldc_mulovf_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldfld_mul.cs b/src/tests/JIT/Methodical/int64/signed/s_ldfld_mul.cs
index 80cb597afb6f08..980ad0640b6119 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldfld_mul.cs
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldfld_mul.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_s_ldfld_mul_signed_cs
 {
-    internal class Test
+    public class Test
     {
         private long _op1, _op2;
         private bool check(long product, bool overflow)
@@ -25,7 +26,8 @@ private bool check(long product, bool overflow)
             }
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             Test app = new Test();
             app._op1 = 0x000000007fffffff;
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldfld_mul.il b/src/tests/JIT/Methodical/int64/signed/s_ldfld_mul.il
index b5dd2c21106b2d..8db456f02b6032 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldfld_mul.il
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldfld_mul.il
@@ -18,9 +18,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {1194CBFB-CC76-4762-A87D-5001A75D57A4}
-.namespace JitTest
+.namespace JitTest_s_ldfld_mul_signed_il
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends ['mscorlib']System.Object
   {
     .field private int64 op1
@@ -34,10 +34,10 @@
       .locals (bool V_0)
       IL_0000:  ldstr      "Multiplying {0} and {1}..."
       IL_0005:  ldarg.0
-      IL_0006:  ldfld     int64 JitTest.Test::op1
+      IL_0006:  ldfld     int64 JitTest_s_ldfld_mul_signed_il.Test::op1
       IL_000b:  box     ['mscorlib']System.Int64
       IL_0010:  ldarg.0
-      IL_0011:  ldfld     int64 JitTest.Test::op2
+      IL_0011:  ldfld     int64 JitTest_s_ldfld_mul_signed_il.Test::op2
       IL_0016:  box     ['mscorlib']System.Int64
       IL_001b:  call       void [System.Console]System.Console::Write(class System.String,
                                                                   class System.Object,
@@ -45,9 +45,9 @@
       .try
       {
         IL_0020:  ldarg.0
-        IL_0021:  ldfld      int64 JitTest.Test::op1
+        IL_0021:  ldfld      int64 JitTest_s_ldfld_mul_signed_il.Test::op1
         IL_0026:  ldarg.0
-        IL_0027:  ldfld      int64 JitTest.Test::op2
+        IL_0027:  ldfld      int64 JitTest_s_ldfld_mul_signed_il.Test::op2
         IL_002c:  mul
         IL_002d:  ldarg.1
         IL_002e:  beq.s      IL_0034
@@ -78,7 +78,7 @@
       IL_0050:  ret
     } // end of method 'Test::check'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -87,22 +87,22 @@
       .entrypoint
       // Code size       425 (0x1a9)
       .maxstack  3
-      .locals (class JitTest.Test V_0,
+      .locals (class JitTest_s_ldfld_mul_signed_il.Test V_0,
                int32 V_1)
-      IL_0000:  newobj     instance void JitTest.Test::.ctor()
+      IL_0000:  newobj     instance void JitTest_s_ldfld_mul_signed_il.Test::.ctor()
       IL_0005:  stloc.0
       IL_0006:  ldloc.0
       IL_0007:  ldc.i4     0x7fffffff
       IL_000c:  conv.i8
-      IL_000d:  stfld      int64 JitTest.Test::op1
+      IL_000d:  stfld      int64 JitTest_s_ldfld_mul_signed_il.Test::op1
       IL_0012:  ldloc.0
       IL_0013:  ldc.i4     0x7fffffff
       IL_0018:  conv.i8
-      IL_0019:  stfld      int64 JitTest.Test::op2
+      IL_0019:  stfld      int64 JitTest_s_ldfld_mul_signed_il.Test::op2
       IL_001e:  ldloc.0
       IL_001f:  ldc.i8     0x3fffffff00000001
       IL_0028:  ldc.i4.0
-      IL_0029:  call       instance bool JitTest.Test::check(int64,
+      IL_0029:  call       instance bool JitTest_s_ldfld_mul_signed_il.Test::check(int64,
                                                              bool)
       IL_002e:  brtrue.s   IL_0035
 
@@ -110,15 +110,15 @@
 
       IL_0035:  ldloc.0
       IL_0036:  ldc.i8     0x100000000
-      IL_003f:  stfld      int64 JitTest.Test::op1
+      IL_003f:  stfld      int64 JitTest_s_ldfld_mul_signed_il.Test::op1
       IL_0044:  ldloc.0
       IL_0045:  ldc.i4     0x7fffffff
       IL_004a:  conv.i8
-      IL_004b:  stfld      int64 JitTest.Test::op2
+      IL_004b:  stfld      int64 JitTest_s_ldfld_mul_signed_il.Test::op2
       IL_0050:  ldloc.0
       IL_0051:  ldc.i8     0x7fffffff00000000
       IL_005a:  ldc.i4.0
-      IL_005b:  call       instance bool JitTest.Test::check(int64,
+      IL_005b:  call       instance bool JitTest_s_ldfld_mul_signed_il.Test::check(int64,
                                                              bool)
       IL_0060:  brtrue.s   IL_0067
 
@@ -126,15 +126,15 @@
 
       IL_0067:  ldloc.0
       IL_0068:  ldc.i8     0x100000000
-      IL_0071:  stfld      int64 JitTest.Test::op1
+      IL_0071:  stfld      int64 JitTest_s_ldfld_mul_signed_il.Test::op1
       IL_0076:  ldloc.0
       IL_0077:  ldc.i8     0x100000000
-      IL_0080:  stfld      int64 JitTest.Test::op2
+      IL_0080:  stfld      int64 JitTest_s_ldfld_mul_signed_il.Test::op2
       IL_0085:  ldloc.0
       IL_0086:  ldc.i4.0
       IL_0087:  conv.i8
       IL_0088:  ldc.i4.0
-      IL_0089:  call       instance bool JitTest.Test::check(int64,
+      IL_0089:  call       instance bool JitTest_s_ldfld_mul_signed_il.Test::check(int64,
                                                              bool)
       IL_008e:  brtrue.s   IL_0095
 
@@ -142,15 +142,15 @@
 
       IL_0095:  ldloc.0
       IL_0096:  ldc.i8     0x3fffffffffffffff
-      IL_009f:  stfld      int64 JitTest.Test::op1
+      IL_009f:  stfld      int64 JitTest_s_ldfld_mul_signed_il.Test::op1
       IL_00a4:  ldloc.0
       IL_00a5:  ldc.i4.2
       IL_00a6:  conv.i8
-      IL_00a7:  stfld      int64 JitTest.Test::op2
+      IL_00a7:  stfld      int64 JitTest_s_ldfld_mul_signed_il.Test::op2
       IL_00ac:  ldloc.0
       IL_00ad:  ldc.i8     0x7ffffffffffffffe
       IL_00b6:  ldc.i4.0
-      IL_00b7:  call       instance bool JitTest.Test::check(int64,
+      IL_00b7:  call       instance bool JitTest_s_ldfld_mul_signed_il.Test::check(int64,
                                                              bool)
       IL_00bc:  brtrue.s   IL_00c3
 
@@ -159,16 +159,16 @@
       IL_00c3:  ldloc.0
       IL_00c4:  ldc.i4.m1
       IL_00c5:  conv.i8
-      IL_00c6:  stfld      int64 JitTest.Test::op1
+      IL_00c6:  stfld      int64 JitTest_s_ldfld_mul_signed_il.Test::op1
       IL_00cb:  ldloc.0
       IL_00cc:  ldc.i4.s   -2
       IL_00ce:  conv.i8
-      IL_00cf:  stfld      int64 JitTest.Test::op2
+      IL_00cf:  stfld      int64 JitTest_s_ldfld_mul_signed_il.Test::op2
       IL_00d4:  ldloc.0
       IL_00d5:  ldc.i4.2
       IL_00d6:  conv.i8
       IL_00d7:  ldc.i4.0
-      IL_00d8:  call       instance bool JitTest.Test::check(int64,
+      IL_00d8:  call       instance bool JitTest_s_ldfld_mul_signed_il.Test::check(int64,
                                                              bool)
       IL_00dd:  brtrue.s   IL_00e4
 
@@ -177,14 +177,14 @@
       IL_00e4:  ldloc.0
       IL_00e5:  ldc.i4     0x100000
       IL_00ea:  conv.i8
-      IL_00eb:  stfld      int64 JitTest.Test::op1
+      IL_00eb:  stfld      int64 JitTest_s_ldfld_mul_signed_il.Test::op1
       IL_00f0:  ldloc.0
       IL_00f1:  ldc.i8     0x1000000000
-      IL_00fa:  stfld      int64 JitTest.Test::op2
+      IL_00fa:  stfld      int64 JitTest_s_ldfld_mul_signed_il.Test::op2
       IL_00ff:  ldloc.0
       IL_0100:  ldc.i8     0x100000000000000
       IL_0109:  ldc.i4.0
-      IL_010a:  call       instance bool JitTest.Test::check(int64,
+      IL_010a:  call       instance bool JitTest_s_ldfld_mul_signed_il.Test::check(int64,
                                                              bool)
       IL_010f:  brtrue.s   IL_0116
 
@@ -193,14 +193,14 @@
       IL_0116:  ldloc.0
       IL_0117:  ldc.i4.m1
       IL_0118:  conv.i8
-      IL_0119:  stfld      int64 JitTest.Test::op1
+      IL_0119:  stfld      int64 JitTest_s_ldfld_mul_signed_il.Test::op1
       IL_011e:  ldloc.0
       IL_011f:  ldc.i8     0x8000000000000001
-      IL_0128:  stfld      int64 JitTest.Test::op2
+      IL_0128:  stfld      int64 JitTest_s_ldfld_mul_signed_il.Test::op2
       IL_012d:  ldloc.0
       IL_012e:  ldc.i8     0x7fffffffffffffff
       IL_0137:  ldc.i4.0
-      IL_0138:  call       instance bool JitTest.Test::check(int64,
+      IL_0138:  call       instance bool JitTest_s_ldfld_mul_signed_il.Test::check(int64,
                                                              bool)
       IL_013d:  brtrue.s   IL_0141
 
@@ -209,15 +209,15 @@
       IL_0141:  ldloc.0
       IL_0142:  ldc.i4.s   -2
       IL_0144:  conv.i8
-      IL_0145:  stfld      int64 JitTest.Test::op1
+      IL_0145:  stfld      int64 JitTest_s_ldfld_mul_signed_il.Test::op1
       IL_014a:  ldloc.0
       IL_014b:  ldc.i8     0x8000000000000001
-      IL_0154:  stfld      int64 JitTest.Test::op2
+      IL_0154:  stfld      int64 JitTest_s_ldfld_mul_signed_il.Test::op2
       IL_0159:  ldloc.0
       IL_015a:  ldc.i4.s   -2
       IL_015c:  conv.i8
       IL_015d:  ldc.i4.0
-      IL_015e:  call       instance bool JitTest.Test::check(int64,
+      IL_015e:  call       instance bool JitTest_s_ldfld_mul_signed_il.Test::check(int64,
                                                              bool)
       IL_0163:  brtrue.s   IL_0167
 
@@ -226,15 +226,15 @@
       IL_0167:  ldloc.0
       IL_0168:  ldc.i4.2
       IL_0169:  conv.i8
-      IL_016a:  stfld      int64 JitTest.Test::op1
+      IL_016a:  stfld      int64 JitTest_s_ldfld_mul_signed_il.Test::op1
       IL_016f:  ldloc.0
       IL_0170:  ldc.i8     0x8000000000000001
-      IL_0179:  stfld      int64 JitTest.Test::op2
+      IL_0179:  stfld      int64 JitTest_s_ldfld_mul_signed_il.Test::op2
       IL_017e:  ldloc.0
       IL_017f:  ldc.i4.2
       IL_0180:  conv.i8
       IL_0181:  ldc.i4.0
-      IL_0182:  call       instance bool JitTest.Test::check(int64,
+      IL_0182:  call       instance bool JitTest_s_ldfld_mul_signed_il.Test::check(int64,
                                                              bool)
       IL_0187:  brtrue.s   IL_018b
 
@@ -268,6 +268,6 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_s_ldfld_mul_signed_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldfld_mul_d.csproj b/src/tests/JIT/Methodical/int64/signed/s_ldfld_mul_d.csproj
index 4184eb63ae4871..bd7ce8a7532dde 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldfld_mul_d.csproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldfld_mul_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldfld_mul_do.csproj b/src/tests/JIT/Methodical/int64/signed/s_ldfld_mul_do.csproj
index b18ae00a64678f..11ae3bf1e06a76 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldfld_mul_do.csproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldfld_mul_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldfld_mul_il_d.ilproj b/src/tests/JIT/Methodical/int64/signed/s_ldfld_mul_il_d.ilproj
index e330108a8e4183..54d30df0404b94 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldfld_mul_il_d.ilproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldfld_mul_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldfld_mul_il_r.ilproj b/src/tests/JIT/Methodical/int64/signed/s_ldfld_mul_il_r.ilproj
index 3988c4f8ed451f..9da5b7f81222fe 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldfld_mul_il_r.ilproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldfld_mul_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldfld_mul_r.csproj b/src/tests/JIT/Methodical/int64/signed/s_ldfld_mul_r.csproj
index cc78d0b6e5a747..ac9d8b57af4d5b 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldfld_mul_r.csproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldfld_mul_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldfld_mul_ro.csproj b/src/tests/JIT/Methodical/int64/signed/s_ldfld_mul_ro.csproj
index 6dd359ffa4e9c6..97b77ff3699ed3 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldfld_mul_ro.csproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldfld_mul_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldfld_mulovf.cs b/src/tests/JIT/Methodical/int64/signed/s_ldfld_mulovf.cs
index 0df7eb22bb3365..4900a178cb8d34 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldfld_mulovf.cs
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldfld_mulovf.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_s_ldfld_mulovf_signed_cs
 {
-    internal class Test
+    public class Test
     {
         private long _op1,_op2;
         private bool check(long product, bool overflow)
@@ -25,7 +26,8 @@ private bool check(long product, bool overflow)
             }
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             Test app = new Test();
             app._op1 = 0x000000007fffffff;
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldfld_mulovf.il b/src/tests/JIT/Methodical/int64/signed/s_ldfld_mulovf.il
index a2df76d0e53d7b..560aff3655d383 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldfld_mulovf.il
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldfld_mulovf.il
@@ -18,9 +18,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {8D78994E-61A5-4A50-98EF-B8CD04CD82A0}
-.namespace JitTest
+.namespace JitTest_s_ldfld_mulovf_signed_il
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends ['mscorlib']System.Object
   {
     .field private int64 op1
@@ -34,10 +34,10 @@
       .locals (bool V_0)
       IL_0000:  ldstr      "Multiplying {0} and {1}..."
       IL_0005:  ldarg.0
-      IL_0006:  ldfld     int64 JitTest.Test::op1
+      IL_0006:  ldfld     int64 JitTest_s_ldfld_mulovf_signed_il.Test::op1
       IL_000b:  box     ['mscorlib']System.Int64
       IL_0010:  ldarg.0
-      IL_0011:  ldfld     int64 JitTest.Test::op2
+      IL_0011:  ldfld     int64 JitTest_s_ldfld_mulovf_signed_il.Test::op2
       IL_0016:  box     ['mscorlib']System.Int64
       IL_001b:  call       void [System.Console]System.Console::Write(class System.String,
                                                                   class System.Object,
@@ -45,9 +45,9 @@
       .try
       {
         IL_0020:  ldarg.0
-        IL_0021:  ldfld      int64 JitTest.Test::op1
+        IL_0021:  ldfld      int64 JitTest_s_ldfld_mulovf_signed_il.Test::op1
         IL_0026:  ldarg.0
-        IL_0027:  ldfld      int64 JitTest.Test::op2
+        IL_0027:  ldfld      int64 JitTest_s_ldfld_mulovf_signed_il.Test::op2
         IL_002c:  mul.ovf
         IL_002d:  ldarg.1
         IL_002e:  beq.s      IL_0034
@@ -78,7 +78,7 @@
       IL_0050:  ret
     } // end of method 'Test::check'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -87,22 +87,22 @@
       .entrypoint
       // Code size       424 (0x1a8)
       .maxstack  3
-      .locals (class JitTest.Test V_0,
+      .locals (class JitTest_s_ldfld_mulovf_signed_il.Test V_0,
                int32 V_1)
-      IL_0000:  newobj     instance void JitTest.Test::.ctor()
+      IL_0000:  newobj     instance void JitTest_s_ldfld_mulovf_signed_il.Test::.ctor()
       IL_0005:  stloc.0
       IL_0006:  ldloc.0
       IL_0007:  ldc.i4     0x7fffffff
       IL_000c:  conv.i8
-      IL_000d:  stfld      int64 JitTest.Test::op1
+      IL_000d:  stfld      int64 JitTest_s_ldfld_mulovf_signed_il.Test::op1
       IL_0012:  ldloc.0
       IL_0013:  ldc.i4     0x7fffffff
       IL_0018:  conv.i8
-      IL_0019:  stfld      int64 JitTest.Test::op2
+      IL_0019:  stfld      int64 JitTest_s_ldfld_mulovf_signed_il.Test::op2
       IL_001e:  ldloc.0
       IL_001f:  ldc.i8     0x3fffffff00000001
       IL_0028:  ldc.i4.0
-      IL_0029:  call       instance bool JitTest.Test::check(int64,
+      IL_0029:  call       instance bool JitTest_s_ldfld_mulovf_signed_il.Test::check(int64,
                                                              bool)
       IL_002e:  brtrue.s   IL_0035
 
@@ -110,15 +110,15 @@
 
       IL_0035:  ldloc.0
       IL_0036:  ldc.i8     0x100000000
-      IL_003f:  stfld      int64 JitTest.Test::op1
+      IL_003f:  stfld      int64 JitTest_s_ldfld_mulovf_signed_il.Test::op1
       IL_0044:  ldloc.0
       IL_0045:  ldc.i4     0x7fffffff
       IL_004a:  conv.i8
-      IL_004b:  stfld      int64 JitTest.Test::op2
+      IL_004b:  stfld      int64 JitTest_s_ldfld_mulovf_signed_il.Test::op2
       IL_0050:  ldloc.0
       IL_0051:  ldc.i8     0x7fffffff00000000
       IL_005a:  ldc.i4.0
-      IL_005b:  call       instance bool JitTest.Test::check(int64,
+      IL_005b:  call       instance bool JitTest_s_ldfld_mulovf_signed_il.Test::check(int64,
                                                              bool)
       IL_0060:  brtrue.s   IL_0067
 
@@ -126,15 +126,15 @@
 
       IL_0067:  ldloc.0
       IL_0068:  ldc.i8     0x100000000
-      IL_0071:  stfld      int64 JitTest.Test::op1
+      IL_0071:  stfld      int64 JitTest_s_ldfld_mulovf_signed_il.Test::op1
       IL_0076:  ldloc.0
       IL_0077:  ldc.i8     0x100000000
-      IL_0080:  stfld      int64 JitTest.Test::op2
+      IL_0080:  stfld      int64 JitTest_s_ldfld_mulovf_signed_il.Test::op2
       IL_0085:  ldloc.0
       IL_0086:  ldc.i4.0
       IL_0087:  conv.i8
       IL_0088:  ldc.i4.1
-      IL_0089:  call       instance bool JitTest.Test::check(int64,
+      IL_0089:  call       instance bool JitTest_s_ldfld_mulovf_signed_il.Test::check(int64,
                                                              bool)
       IL_008e:  brtrue.s   IL_0095
 
@@ -142,15 +142,15 @@
 
       IL_0095:  ldloc.0
       IL_0096:  ldc.i8     0x3fffffffffffffff
-      IL_009f:  stfld      int64 JitTest.Test::op1
+      IL_009f:  stfld      int64 JitTest_s_ldfld_mulovf_signed_il.Test::op1
       IL_00a4:  ldloc.0
       IL_00a5:  ldc.i4.2
       IL_00a6:  conv.i8
-      IL_00a7:  stfld      int64 JitTest.Test::op2
+      IL_00a7:  stfld      int64 JitTest_s_ldfld_mulovf_signed_il.Test::op2
       IL_00ac:  ldloc.0
       IL_00ad:  ldc.i8     0x7ffffffffffffffe
       IL_00b6:  ldc.i4.0
-      IL_00b7:  call       instance bool JitTest.Test::check(int64,
+      IL_00b7:  call       instance bool JitTest_s_ldfld_mulovf_signed_il.Test::check(int64,
                                                              bool)
       IL_00bc:  brtrue.s   IL_00c3
 
@@ -159,16 +159,16 @@
       IL_00c3:  ldloc.0
       IL_00c4:  ldc.i4.m1
       IL_00c5:  conv.i8
-      IL_00c6:  stfld      int64 JitTest.Test::op1
+      IL_00c6:  stfld      int64 JitTest_s_ldfld_mulovf_signed_il.Test::op1
       IL_00cb:  ldloc.0
       IL_00cc:  ldc.i4.s   -2
       IL_00ce:  conv.i8
-      IL_00cf:  stfld      int64 JitTest.Test::op2
+      IL_00cf:  stfld      int64 JitTest_s_ldfld_mulovf_signed_il.Test::op2
       IL_00d4:  ldloc.0
       IL_00d5:  ldc.i4.2
       IL_00d6:  conv.i8
       IL_00d7:  ldc.i4.0
-      IL_00d8:  call       instance bool JitTest.Test::check(int64,
+      IL_00d8:  call       instance bool JitTest_s_ldfld_mulovf_signed_il.Test::check(int64,
                                                              bool)
       IL_00dd:  brtrue.s   IL_00e4
 
@@ -177,14 +177,14 @@
       IL_00e4:  ldloc.0
       IL_00e5:  ldc.i4     0x100000
       IL_00ea:  conv.i8
-      IL_00eb:  stfld      int64 JitTest.Test::op1
+      IL_00eb:  stfld      int64 JitTest_s_ldfld_mulovf_signed_il.Test::op1
       IL_00f0:  ldloc.0
       IL_00f1:  ldc.i8     0x1000000000
-      IL_00fa:  stfld      int64 JitTest.Test::op2
+      IL_00fa:  stfld      int64 JitTest_s_ldfld_mulovf_signed_il.Test::op2
       IL_00ff:  ldloc.0
       IL_0100:  ldc.i8     0x100000000000000
       IL_0109:  ldc.i4.0
-      IL_010a:  call       instance bool JitTest.Test::check(int64,
+      IL_010a:  call       instance bool JitTest_s_ldfld_mulovf_signed_il.Test::check(int64,
                                                              bool)
       IL_010f:  brtrue.s   IL_0116
 
@@ -193,14 +193,14 @@
       IL_0116:  ldloc.0
       IL_0117:  ldc.i4.m1
       IL_0118:  conv.i8
-      IL_0119:  stfld      int64 JitTest.Test::op1
+      IL_0119:  stfld      int64 JitTest_s_ldfld_mulovf_signed_il.Test::op1
       IL_011e:  ldloc.0
       IL_011f:  ldc.i8     0x8000000000000001
-      IL_0128:  stfld      int64 JitTest.Test::op2
+      IL_0128:  stfld      int64 JitTest_s_ldfld_mulovf_signed_il.Test::op2
       IL_012d:  ldloc.0
       IL_012e:  ldc.i8     0x7fffffffffffffff
       IL_0137:  ldc.i4.0
-      IL_0138:  call       instance bool JitTest.Test::check(int64,
+      IL_0138:  call       instance bool JitTest_s_ldfld_mulovf_signed_il.Test::check(int64,
                                                              bool)
       IL_013d:  brtrue.s   IL_0141
 
@@ -209,15 +209,15 @@
       IL_0141:  ldloc.0
       IL_0142:  ldc.i4.s   -2
       IL_0144:  conv.i8
-      IL_0145:  stfld      int64 JitTest.Test::op1
+      IL_0145:  stfld      int64 JitTest_s_ldfld_mulovf_signed_il.Test::op1
       IL_014a:  ldloc.0
       IL_014b:  ldc.i8     0x8000000000000001
-      IL_0154:  stfld      int64 JitTest.Test::op2
+      IL_0154:  stfld      int64 JitTest_s_ldfld_mulovf_signed_il.Test::op2
       IL_0159:  ldloc.0
       IL_015a:  ldc.i4.0
       IL_015b:  conv.i8
       IL_015c:  ldc.i4.1
-      IL_015d:  call       instance bool JitTest.Test::check(int64,
+      IL_015d:  call       instance bool JitTest_s_ldfld_mulovf_signed_il.Test::check(int64,
                                                              bool)
       IL_0162:  brtrue.s   IL_0166
 
@@ -226,15 +226,15 @@
       IL_0166:  ldloc.0
       IL_0167:  ldc.i4.2
       IL_0168:  conv.i8
-      IL_0169:  stfld      int64 JitTest.Test::op1
+      IL_0169:  stfld      int64 JitTest_s_ldfld_mulovf_signed_il.Test::op1
       IL_016e:  ldloc.0
       IL_016f:  ldc.i8     0x8000000000000001
-      IL_0178:  stfld      int64 JitTest.Test::op2
+      IL_0178:  stfld      int64 JitTest_s_ldfld_mulovf_signed_il.Test::op2
       IL_017d:  ldloc.0
       IL_017e:  ldc.i4.0
       IL_017f:  conv.i8
       IL_0180:  ldc.i4.1
-      IL_0181:  call       instance bool JitTest.Test::check(int64,
+      IL_0181:  call       instance bool JitTest_s_ldfld_mulovf_signed_il.Test::check(int64,
                                                              bool)
       IL_0186:  brtrue.s   IL_018a
 
@@ -268,6 +268,6 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_s_ldfld_mulovf_signed_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldfld_mulovf_d.csproj b/src/tests/JIT/Methodical/int64/signed/s_ldfld_mulovf_d.csproj
index 457ea036bdd7a9..6bd9541a9148c8 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldfld_mulovf_d.csproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldfld_mulovf_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldfld_mulovf_do.csproj b/src/tests/JIT/Methodical/int64/signed/s_ldfld_mulovf_do.csproj
index ee650e475ac964..ed9a82144cdcb6 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldfld_mulovf_do.csproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldfld_mulovf_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldfld_mulovf_il_d.ilproj b/src/tests/JIT/Methodical/int64/signed/s_ldfld_mulovf_il_d.ilproj
index 6219e931ea54d6..d9cf09af5a43e0 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldfld_mulovf_il_d.ilproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldfld_mulovf_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldfld_mulovf_il_r.ilproj b/src/tests/JIT/Methodical/int64/signed/s_ldfld_mulovf_il_r.ilproj
index bd0ca72de95d1d..d862fa9b670dd8 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldfld_mulovf_il_r.ilproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldfld_mulovf_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldfld_mulovf_r.csproj b/src/tests/JIT/Methodical/int64/signed/s_ldfld_mulovf_r.csproj
index dcee68f189b751..5fa429fc685666 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldfld_mulovf_r.csproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldfld_mulovf_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldfld_mulovf_ro.csproj b/src/tests/JIT/Methodical/int64/signed/s_ldfld_mulovf_ro.csproj
index dd491dfc44483b..176ea7ba0eebab 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldfld_mulovf_ro.csproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldfld_mulovf_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mul.cs b/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mul.cs
index 6d84b940d6800f..146d22cf72aee3 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mul.cs
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mul.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_s_ldsfld_mul_signed_cs
 {
-    internal class Test
+    public class Test
     {
         private static long s_op1,s_op2;
         private static bool check(long product, bool overflow)
@@ -25,7 +26,8 @@ private static bool check(long product, bool overflow)
             }
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             s_op1 = 0x000000007fffffff;
             s_op2 = 0x000000007fffffff;
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mul.il b/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mul.il
index 188f03800c001f..9e38262ba31992 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mul.il
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mul.il
@@ -18,9 +18,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {72B54BA1-0DAB-469F-8753-50AD9A199FE2}
-.namespace JitTest
+.namespace JitTest_s_ldsfld_mul_signed_il
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends ['mscorlib']System.Object
   {
     .field private static int64 op1
@@ -33,17 +33,17 @@
       .maxstack  3
       .locals (bool V_0)
       IL_0000:  ldstr      "Multiplying {0} and {1}..."
-      IL_0005:  ldsfld    int64 JitTest.Test::op1
+      IL_0005:  ldsfld    int64 JitTest_s_ldsfld_mul_signed_il.Test::op1
       IL_000a:  box     ['mscorlib']System.Int64
-      IL_000f:  ldsfld    int64 JitTest.Test::op2
+      IL_000f:  ldsfld    int64 JitTest_s_ldsfld_mul_signed_il.Test::op2
       IL_0014:  box     ['mscorlib']System.Int64
       IL_0019:  call       void [System.Console]System.Console::Write(class System.String,
                                                                   class System.Object,
                                                                   class System.Object)
       .try
       {
-        IL_001e:  ldsfld     int64 JitTest.Test::op1
-        IL_0023:  ldsfld     int64 JitTest.Test::op2
+        IL_001e:  ldsfld     int64 JitTest_s_ldsfld_mul_signed_il.Test::op1
+        IL_0023:  ldsfld     int64 JitTest_s_ldsfld_mul_signed_il.Test::op2
         IL_0028:  mul
         IL_0029:  ldarg.0
         IL_002a:  beq.s      IL_0030
@@ -74,7 +74,7 @@
       IL_004c:  ret
     } // end of method 'Test::check'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -86,52 +86,52 @@
       .locals (int32 V_0)
       IL_0000:  ldc.i4     0x7fffffff
       IL_0005:  conv.i8
-      IL_0006:  stsfld     int64 JitTest.Test::op1
+      IL_0006:  stsfld     int64 JitTest_s_ldsfld_mul_signed_il.Test::op1
       IL_000b:  ldc.i4     0x7fffffff
       IL_0010:  conv.i8
-      IL_0011:  stsfld     int64 JitTest.Test::op2
+      IL_0011:  stsfld     int64 JitTest_s_ldsfld_mul_signed_il.Test::op2
       IL_0016:  ldc.i8     0x3fffffff00000001
       IL_001f:  ldc.i4.0
-      IL_0020:  call       bool JitTest.Test::check(int64,
+      IL_0020:  call       bool JitTest_s_ldsfld_mul_signed_il.Test::check(int64,
                                                     bool)
       IL_0025:  brtrue.s   IL_002c
 
       IL_0027:  br         IL_0175
 
       IL_002c:  ldc.i8     0x100000000
-      IL_0035:  stsfld     int64 JitTest.Test::op1
+      IL_0035:  stsfld     int64 JitTest_s_ldsfld_mul_signed_il.Test::op1
       IL_003a:  ldc.i4     0x7fffffff
       IL_003f:  conv.i8
-      IL_0040:  stsfld     int64 JitTest.Test::op2
+      IL_0040:  stsfld     int64 JitTest_s_ldsfld_mul_signed_il.Test::op2
       IL_0045:  ldc.i8     0x7fffffff00000000
       IL_004e:  ldc.i4.0
-      IL_004f:  call       bool JitTest.Test::check(int64,
+      IL_004f:  call       bool JitTest_s_ldsfld_mul_signed_il.Test::check(int64,
                                                     bool)
       IL_0054:  brtrue.s   IL_005b
 
       IL_0056:  br         IL_0175
 
       IL_005b:  ldc.i8     0x100000000
-      IL_0064:  stsfld     int64 JitTest.Test::op1
+      IL_0064:  stsfld     int64 JitTest_s_ldsfld_mul_signed_il.Test::op1
       IL_0069:  ldc.i8     0x100000000
-      IL_0072:  stsfld     int64 JitTest.Test::op2
+      IL_0072:  stsfld     int64 JitTest_s_ldsfld_mul_signed_il.Test::op2
       IL_0077:  ldc.i4.0
       IL_0078:  conv.i8
       IL_0079:  ldc.i4.0
-      IL_007a:  call       bool JitTest.Test::check(int64,
+      IL_007a:  call       bool JitTest_s_ldsfld_mul_signed_il.Test::check(int64,
                                                     bool)
       IL_007f:  brtrue.s   IL_0086
 
       IL_0081:  br         IL_0175
 
       IL_0086:  ldc.i8     0x3fffffffffffffff
-      IL_008f:  stsfld     int64 JitTest.Test::op1
+      IL_008f:  stsfld     int64 JitTest_s_ldsfld_mul_signed_il.Test::op1
       IL_0094:  ldc.i4.2
       IL_0095:  conv.i8
-      IL_0096:  stsfld     int64 JitTest.Test::op2
+      IL_0096:  stsfld     int64 JitTest_s_ldsfld_mul_signed_il.Test::op2
       IL_009b:  ldc.i8     0x7ffffffffffffffe
       IL_00a4:  ldc.i4.0
-      IL_00a5:  call       bool JitTest.Test::check(int64,
+      IL_00a5:  call       bool JitTest_s_ldsfld_mul_signed_il.Test::check(int64,
                                                     bool)
       IL_00aa:  brtrue.s   IL_00b1
 
@@ -139,14 +139,14 @@
 
       IL_00b1:  ldc.i4.m1
       IL_00b2:  conv.i8
-      IL_00b3:  stsfld     int64 JitTest.Test::op1
+      IL_00b3:  stsfld     int64 JitTest_s_ldsfld_mul_signed_il.Test::op1
       IL_00b8:  ldc.i4.s   -2
       IL_00ba:  conv.i8
-      IL_00bb:  stsfld     int64 JitTest.Test::op2
+      IL_00bb:  stsfld     int64 JitTest_s_ldsfld_mul_signed_il.Test::op2
       IL_00c0:  ldc.i4.2
       IL_00c1:  conv.i8
       IL_00c2:  ldc.i4.0
-      IL_00c3:  call       bool JitTest.Test::check(int64,
+      IL_00c3:  call       bool JitTest_s_ldsfld_mul_signed_il.Test::check(int64,
                                                     bool)
       IL_00c8:  brtrue.s   IL_00cf
 
@@ -154,12 +154,12 @@
 
       IL_00cf:  ldc.i4     0x100000
       IL_00d4:  conv.i8
-      IL_00d5:  stsfld     int64 JitTest.Test::op1
+      IL_00d5:  stsfld     int64 JitTest_s_ldsfld_mul_signed_il.Test::op1
       IL_00da:  ldc.i8     0x1000000000
-      IL_00e3:  stsfld     int64 JitTest.Test::op2
+      IL_00e3:  stsfld     int64 JitTest_s_ldsfld_mul_signed_il.Test::op2
       IL_00e8:  ldc.i8     0x100000000000000
       IL_00f1:  ldc.i4.0
-      IL_00f2:  call       bool JitTest.Test::check(int64,
+      IL_00f2:  call       bool JitTest_s_ldsfld_mul_signed_il.Test::check(int64,
                                                     bool)
       IL_00f7:  brtrue.s   IL_00fb
 
@@ -167,12 +167,12 @@
 
       IL_00fb:  ldc.i4.m1
       IL_00fc:  conv.i8
-      IL_00fd:  stsfld     int64 JitTest.Test::op1
+      IL_00fd:  stsfld     int64 JitTest_s_ldsfld_mul_signed_il.Test::op1
       IL_0102:  ldc.i8     0x8000000000000001
-      IL_010b:  stsfld     int64 JitTest.Test::op2
+      IL_010b:  stsfld     int64 JitTest_s_ldsfld_mul_signed_il.Test::op2
       IL_0110:  ldc.i8     0x7fffffffffffffff
       IL_0119:  ldc.i4.0
-      IL_011a:  call       bool JitTest.Test::check(int64,
+      IL_011a:  call       bool JitTest_s_ldsfld_mul_signed_il.Test::check(int64,
                                                     bool)
       IL_011f:  brtrue.s   IL_0123
 
@@ -180,13 +180,13 @@
 
       IL_0123:  ldc.i4.s   -2
       IL_0125:  conv.i8
-      IL_0126:  stsfld     int64 JitTest.Test::op1
+      IL_0126:  stsfld     int64 JitTest_s_ldsfld_mul_signed_il.Test::op1
       IL_012b:  ldc.i8     0x8000000000000001
-      IL_0134:  stsfld     int64 JitTest.Test::op2
+      IL_0134:  stsfld     int64 JitTest_s_ldsfld_mul_signed_il.Test::op2
       IL_0139:  ldc.i4.s   -2
       IL_013b:  conv.i8
       IL_013c:  ldc.i4.0
-      IL_013d:  call       bool JitTest.Test::check(int64,
+      IL_013d:  call       bool JitTest_s_ldsfld_mul_signed_il.Test::check(int64,
                                                     bool)
       IL_0142:  brtrue.s   IL_0146
 
@@ -194,13 +194,13 @@
 
       IL_0146:  ldc.i4.2
       IL_0147:  conv.i8
-      IL_0148:  stsfld     int64 JitTest.Test::op1
+      IL_0148:  stsfld     int64 JitTest_s_ldsfld_mul_signed_il.Test::op1
       IL_014d:  ldc.i8     0x8000000000000001
-      IL_0156:  stsfld     int64 JitTest.Test::op2
+      IL_0156:  stsfld     int64 JitTest_s_ldsfld_mul_signed_il.Test::op2
       IL_015b:  ldc.i4.2
       IL_015c:  conv.i8
       IL_015d:  ldc.i4.0
-      IL_015e:  call       bool JitTest.Test::check(int64,
+      IL_015e:  call       bool JitTest_s_ldsfld_mul_signed_il.Test::check(int64,
                                                     bool)
       IL_0163:  brtrue.s   IL_0167
 
@@ -234,6 +234,6 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_s_ldsfld_mul_signed_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mul_d.csproj b/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mul_d.csproj
index 76afef0e1c7e08..268144e18d4ca3 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mul_d.csproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mul_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mul_do.csproj b/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mul_do.csproj
index 0a0ba11389ddc5..14f6175164f3ce 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mul_do.csproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mul_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mul_il_d.ilproj b/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mul_il_d.ilproj
index c54743b81f2d81..f2ca07d0fcbfb4 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mul_il_d.ilproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mul_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mul_il_r.ilproj b/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mul_il_r.ilproj
index 2c18c29ff9e8a6..e3860b7a2f637c 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mul_il_r.ilproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mul_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mul_r.csproj b/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mul_r.csproj
index bcb010061135d7..25f9bacd4f23b5 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mul_r.csproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mul_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mul_ro.csproj b/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mul_ro.csproj
index a80289b6a0d7e5..cc75b843485b0e 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mul_ro.csproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mul_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mulovf.cs b/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mulovf.cs
index 70e57ebd49a06d..dffa65f515d820 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mulovf.cs
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mulovf.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_s_ldsfld_mulovf_signed_cs
 {
-    internal class Test
+    public class Test
     {
         private static long s_op1,s_op2;
         private static bool check(long product, bool overflow)
@@ -25,7 +26,8 @@ private static bool check(long product, bool overflow)
             }
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             s_op1 = 0x000000007fffffff;
             s_op2 = 0x000000007fffffff;
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mulovf.il b/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mulovf.il
index d0751ae415aaf4..85ff433f2c02c0 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mulovf.il
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mulovf.il
@@ -18,9 +18,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {54816B74-C516-4067-93B9-A895F5F3D4AA}
-.namespace JitTest
+.namespace JitTest_s_ldsfld_mulovf_signed_il
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends ['mscorlib']System.Object
   {
     .field private static int64 op1
@@ -33,17 +33,17 @@
       .maxstack  3
       .locals (bool V_0)
       IL_0000:  ldstr      "Multiplying {0} and {1}..."
-      IL_0005:  ldsfld    int64 JitTest.Test::op1
+      IL_0005:  ldsfld    int64 JitTest_s_ldsfld_mulovf_signed_il.Test::op1
       IL_000a:  box     ['mscorlib']System.Int64
-      IL_000f:  ldsfld    int64 JitTest.Test::op2
+      IL_000f:  ldsfld    int64 JitTest_s_ldsfld_mulovf_signed_il.Test::op2
       IL_0014:  box     ['mscorlib']System.Int64
       IL_0019:  call       void [System.Console]System.Console::Write(class System.String,
                                                                   class System.Object,
                                                                   class System.Object)
       .try
       {
-        IL_001e:  ldsfld     int64 JitTest.Test::op1
-        IL_0023:  ldsfld     int64 JitTest.Test::op2
+        IL_001e:  ldsfld     int64 JitTest_s_ldsfld_mulovf_signed_il.Test::op1
+        IL_0023:  ldsfld     int64 JitTest_s_ldsfld_mulovf_signed_il.Test::op2
         IL_0028:  mul.ovf
         IL_0029:  ldarg.0
         IL_002a:  beq.s      IL_0030
@@ -74,7 +74,7 @@
       IL_004c:  ret
     } // end of method 'Test::check'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -86,52 +86,52 @@
       .locals (int32 V_0)
       IL_0000:  ldc.i4     0x7fffffff
       IL_0005:  conv.i8
-      IL_0006:  stsfld     int64 JitTest.Test::op1
+      IL_0006:  stsfld     int64 JitTest_s_ldsfld_mulovf_signed_il.Test::op1
       IL_000b:  ldc.i4     0x7fffffff
       IL_0010:  conv.i8
-      IL_0011:  stsfld     int64 JitTest.Test::op2
+      IL_0011:  stsfld     int64 JitTest_s_ldsfld_mulovf_signed_il.Test::op2
       IL_0016:  ldc.i8     0x3fffffff00000001
       IL_001f:  ldc.i4.0
-      IL_0020:  call       bool JitTest.Test::check(int64,
+      IL_0020:  call       bool JitTest_s_ldsfld_mulovf_signed_il.Test::check(int64,
                                                     bool)
       IL_0025:  brtrue.s   IL_002c
 
       IL_0027:  br         IL_0174
 
       IL_002c:  ldc.i8     0x100000000
-      IL_0035:  stsfld     int64 JitTest.Test::op1
+      IL_0035:  stsfld     int64 JitTest_s_ldsfld_mulovf_signed_il.Test::op1
       IL_003a:  ldc.i4     0x7fffffff
       IL_003f:  conv.i8
-      IL_0040:  stsfld     int64 JitTest.Test::op2
+      IL_0040:  stsfld     int64 JitTest_s_ldsfld_mulovf_signed_il.Test::op2
       IL_0045:  ldc.i8     0x7fffffff00000000
       IL_004e:  ldc.i4.0
-      IL_004f:  call       bool JitTest.Test::check(int64,
+      IL_004f:  call       bool JitTest_s_ldsfld_mulovf_signed_il.Test::check(int64,
                                                     bool)
       IL_0054:  brtrue.s   IL_005b
 
       IL_0056:  br         IL_0174
 
       IL_005b:  ldc.i8     0x100000000
-      IL_0064:  stsfld     int64 JitTest.Test::op1
+      IL_0064:  stsfld     int64 JitTest_s_ldsfld_mulovf_signed_il.Test::op1
       IL_0069:  ldc.i8     0x100000000
-      IL_0072:  stsfld     int64 JitTest.Test::op2
+      IL_0072:  stsfld     int64 JitTest_s_ldsfld_mulovf_signed_il.Test::op2
       IL_0077:  ldc.i4.0
       IL_0078:  conv.i8
       IL_0079:  ldc.i4.1
-      IL_007a:  call       bool JitTest.Test::check(int64,
+      IL_007a:  call       bool JitTest_s_ldsfld_mulovf_signed_il.Test::check(int64,
                                                     bool)
       IL_007f:  brtrue.s   IL_0086
 
       IL_0081:  br         IL_0174
 
       IL_0086:  ldc.i8     0x3fffffffffffffff
-      IL_008f:  stsfld     int64 JitTest.Test::op1
+      IL_008f:  stsfld     int64 JitTest_s_ldsfld_mulovf_signed_il.Test::op1
       IL_0094:  ldc.i4.2
       IL_0095:  conv.i8
-      IL_0096:  stsfld     int64 JitTest.Test::op2
+      IL_0096:  stsfld     int64 JitTest_s_ldsfld_mulovf_signed_il.Test::op2
       IL_009b:  ldc.i8     0x7ffffffffffffffe
       IL_00a4:  ldc.i4.0
-      IL_00a5:  call       bool JitTest.Test::check(int64,
+      IL_00a5:  call       bool JitTest_s_ldsfld_mulovf_signed_il.Test::check(int64,
                                                     bool)
       IL_00aa:  brtrue.s   IL_00b1
 
@@ -139,14 +139,14 @@
 
       IL_00b1:  ldc.i4.m1
       IL_00b2:  conv.i8
-      IL_00b3:  stsfld     int64 JitTest.Test::op1
+      IL_00b3:  stsfld     int64 JitTest_s_ldsfld_mulovf_signed_il.Test::op1
       IL_00b8:  ldc.i4.s   -2
       IL_00ba:  conv.i8
-      IL_00bb:  stsfld     int64 JitTest.Test::op2
+      IL_00bb:  stsfld     int64 JitTest_s_ldsfld_mulovf_signed_il.Test::op2
       IL_00c0:  ldc.i4.2
       IL_00c1:  conv.i8
       IL_00c2:  ldc.i4.0
-      IL_00c3:  call       bool JitTest.Test::check(int64,
+      IL_00c3:  call       bool JitTest_s_ldsfld_mulovf_signed_il.Test::check(int64,
                                                     bool)
       IL_00c8:  brtrue.s   IL_00cf
 
@@ -154,12 +154,12 @@
 
       IL_00cf:  ldc.i4     0x100000
       IL_00d4:  conv.i8
-      IL_00d5:  stsfld     int64 JitTest.Test::op1
+      IL_00d5:  stsfld     int64 JitTest_s_ldsfld_mulovf_signed_il.Test::op1
       IL_00da:  ldc.i8     0x1000000000
-      IL_00e3:  stsfld     int64 JitTest.Test::op2
+      IL_00e3:  stsfld     int64 JitTest_s_ldsfld_mulovf_signed_il.Test::op2
       IL_00e8:  ldc.i8     0x100000000000000
       IL_00f1:  ldc.i4.0
-      IL_00f2:  call       bool JitTest.Test::check(int64,
+      IL_00f2:  call       bool JitTest_s_ldsfld_mulovf_signed_il.Test::check(int64,
                                                     bool)
       IL_00f7:  brtrue.s   IL_00fb
 
@@ -167,12 +167,12 @@
 
       IL_00fb:  ldc.i4.m1
       IL_00fc:  conv.i8
-      IL_00fd:  stsfld     int64 JitTest.Test::op1
+      IL_00fd:  stsfld     int64 JitTest_s_ldsfld_mulovf_signed_il.Test::op1
       IL_0102:  ldc.i8     0x8000000000000001
-      IL_010b:  stsfld     int64 JitTest.Test::op2
+      IL_010b:  stsfld     int64 JitTest_s_ldsfld_mulovf_signed_il.Test::op2
       IL_0110:  ldc.i8     0x7fffffffffffffff
       IL_0119:  ldc.i4.0
-      IL_011a:  call       bool JitTest.Test::check(int64,
+      IL_011a:  call       bool JitTest_s_ldsfld_mulovf_signed_il.Test::check(int64,
                                                     bool)
       IL_011f:  brtrue.s   IL_0123
 
@@ -180,13 +180,13 @@
 
       IL_0123:  ldc.i4.s   -2
       IL_0125:  conv.i8
-      IL_0126:  stsfld     int64 JitTest.Test::op1
+      IL_0126:  stsfld     int64 JitTest_s_ldsfld_mulovf_signed_il.Test::op1
       IL_012b:  ldc.i8     0x8000000000000001
-      IL_0134:  stsfld     int64 JitTest.Test::op2
+      IL_0134:  stsfld     int64 JitTest_s_ldsfld_mulovf_signed_il.Test::op2
       IL_0139:  ldc.i4.0
       IL_013a:  conv.i8
       IL_013b:  ldc.i4.1
-      IL_013c:  call       bool JitTest.Test::check(int64,
+      IL_013c:  call       bool JitTest_s_ldsfld_mulovf_signed_il.Test::check(int64,
                                                     bool)
       IL_0141:  brtrue.s   IL_0145
 
@@ -194,13 +194,13 @@
 
       IL_0145:  ldc.i4.2
       IL_0146:  conv.i8
-      IL_0147:  stsfld     int64 JitTest.Test::op1
+      IL_0147:  stsfld     int64 JitTest_s_ldsfld_mulovf_signed_il.Test::op1
       IL_014c:  ldc.i8     0x8000000000000001
-      IL_0155:  stsfld     int64 JitTest.Test::op2
+      IL_0155:  stsfld     int64 JitTest_s_ldsfld_mulovf_signed_il.Test::op2
       IL_015a:  ldc.i4.0
       IL_015b:  conv.i8
       IL_015c:  ldc.i4.1
-      IL_015d:  call       bool JitTest.Test::check(int64,
+      IL_015d:  call       bool JitTest_s_ldsfld_mulovf_signed_il.Test::check(int64,
                                                     bool)
       IL_0162:  brtrue.s   IL_0166
 
@@ -234,6 +234,6 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_s_ldsfld_mulovf_signed_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mulovf_d.csproj b/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mulovf_d.csproj
index e8b4853adf07b2..b6677e0ca65be8 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mulovf_d.csproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mulovf_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mulovf_do.csproj b/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mulovf_do.csproj
index 4619d7ef4c9e18..e5e4f638541316 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mulovf_do.csproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mulovf_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mulovf_il_d.ilproj b/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mulovf_il_d.ilproj
index 111af8e403f332..94567a2d8de585 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mulovf_il_d.ilproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mulovf_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mulovf_il_r.ilproj b/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mulovf_il_r.ilproj
index 27ecb2bde7e32e..4269c2dab200d9 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mulovf_il_r.ilproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mulovf_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mulovf_r.csproj b/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mulovf_r.csproj
index 574adc07c03833..47984ed0082eee 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mulovf_r.csproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mulovf_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mulovf_ro.csproj b/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mulovf_ro.csproj
index 1c2df84ff78af2..1ab580df20de48 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mulovf_ro.csproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mulovf_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/signed/s_muldiv.cs b/src/tests/JIT/Methodical/int64/signed/s_muldiv.cs
index 05628c77942b25..8b41aeb2b83353 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_muldiv.cs
+++ b/src/tests/JIT/Methodical/int64/signed/s_muldiv.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_s_muldiv_signed_cs
 {
-    internal class Test
+    public class Test
     {
         private static long s_A,s_B;
 
@@ -90,7 +91,8 @@ private static void testNumbers(long a, long b)
             }
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             try
             {
diff --git a/src/tests/JIT/Methodical/int64/signed/s_muldiv.il b/src/tests/JIT/Methodical/int64/signed/s_muldiv.il
index 5cb5382b59918f..57128ee14ba778 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_muldiv.il
+++ b/src/tests/JIT/Methodical/int64/signed/s_muldiv.il
@@ -18,9 +18,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {BF2F71BF-B5EC-4C96-8B9A-70A2AFBE37F8}
-.namespace JitTest
+.namespace JitTest_s_muldiv_signed_il
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends ['mscorlib']System.Object
   {
     .field private static int64 A
@@ -42,9 +42,9 @@
                unsigned int64 V_8,
                unsigned int64 V_9)
       IL_0000:  ldarg.0
-      IL_0001:  stsfld     int64 JitTest.Test::A
+      IL_0001:  stsfld     int64 JitTest_s_muldiv_signed_il.Test::A
       IL_0006:  ldarg.1
-      IL_0007:  stsfld     int64 JitTest.Test::B
+      IL_0007:  stsfld     int64 JitTest_s_muldiv_signed_il.Test::B
       IL_000c:  ldc.i4.0
       IL_000d:  conv.i8
       IL_000e:  stloc.0
@@ -246,7 +246,7 @@
       IL_0114:  ret
     } // end of method 'Test::testNumbers'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -262,1281 +262,1281 @@
         IL_0002:  conv.i8
         IL_0003:  ldc.i4     0xb8
         IL_0008:  conv.i8
-        IL_0009:  call       void JitTest.Test::testNumbers(int64,
+        IL_0009:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_000e:  ldc.i4.s   9
         IL_0010:  conv.i8
         IL_0011:  ldc.i4     0xf9
         IL_0016:  conv.i8
-        IL_0017:  call       void JitTest.Test::testNumbers(int64,
+        IL_0017:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_001c:  ldc.i4.s   110
         IL_001e:  conv.i8
         IL_001f:  ldc.i4     0x93
         IL_0024:  conv.i8
-        IL_0025:  call       void JitTest.Test::testNumbers(int64,
+        IL_0025:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_002a:  ldc.i4.s   30
         IL_002c:  conv.i8
         IL_002d:  ldc.i4     0x86
         IL_0032:  conv.i8
-        IL_0033:  call       void JitTest.Test::testNumbers(int64,
+        IL_0033:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0038:  ldc.i4     0xcc
         IL_003d:  conv.i8
         IL_003e:  ldc.i4     0x583f
         IL_0043:  conv.i8
-        IL_0044:  call       void JitTest.Test::testNumbers(int64,
+        IL_0044:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0049:  ldc.i4     0xc9
         IL_004e:  conv.i8
         IL_004f:  ldc.i4     0xa94c
         IL_0054:  conv.i8
-        IL_0055:  call       void JitTest.Test::testNumbers(int64,
+        IL_0055:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_005a:  ldc.i4.s   84
         IL_005c:  conv.i8
         IL_005d:  ldc.i4     0x2d06
         IL_0062:  conv.i8
-        IL_0063:  call       void JitTest.Test::testNumbers(int64,
+        IL_0063:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0068:  ldc.i4.s   48
         IL_006a:  conv.i8
         IL_006b:  ldc.i4     0x9921
         IL_0070:  conv.i8
-        IL_0071:  call       void JitTest.Test::testNumbers(int64,
+        IL_0071:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0076:  ldc.i4.s   29
         IL_0078:  conv.i8
         IL_0079:  ldc.i4     0x450842
         IL_007e:  conv.i8
-        IL_007f:  call       void JitTest.Test::testNumbers(int64,
+        IL_007f:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0084:  ldc.i4.s   42
         IL_0086:  conv.i8
         IL_0087:  ldc.i4     0x999f6c
         IL_008c:  conv.i8
-        IL_008d:  call       void JitTest.Test::testNumbers(int64,
+        IL_008d:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0092:  ldc.i4     0xc5
         IL_0097:  conv.i8
         IL_0098:  ldc.i4     0x90faa7
         IL_009d:  conv.i8
-        IL_009e:  call       void JitTest.Test::testNumbers(int64,
+        IL_009e:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_00a3:  ldc.i4.s   80
         IL_00a5:  conv.i8
         IL_00a6:  ldc.i4     0x69de08
         IL_00ab:  conv.i8
-        IL_00ac:  call       void JitTest.Test::testNumbers(int64,
+        IL_00ac:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_00b1:  ldc.i4     0x9a
         IL_00b6:  conv.i8
         IL_00b7:  ldc.i4     0xcd715be
         IL_00bc:  conv.i8
-        IL_00bd:  call       void JitTest.Test::testNumbers(int64,
+        IL_00bd:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_00c2:  ldc.i4.s   57
         IL_00c4:  conv.i8
         IL_00c5:  ldc.i4     0x16a61eb5
         IL_00ca:  conv.i8
-        IL_00cb:  call       void JitTest.Test::testNumbers(int64,
+        IL_00cb:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_00d0:  ldc.i4     0xe0
         IL_00d5:  conv.i8
         IL_00d6:  ldc.i4     0x95575fef
         IL_00db:  conv.u8
-        IL_00dc:  call       void JitTest.Test::testNumbers(int64,
+        IL_00dc:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_00e1:  ldc.i4     0x93
         IL_00e6:  conv.i8
         IL_00e7:  ldc.i4     0x209e58c5
         IL_00ec:  conv.i8
-        IL_00ed:  call       void JitTest.Test::testNumbers(int64,
+        IL_00ed:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_00f2:  ldc.i4.s   59
         IL_00f4:  conv.i8
         IL_00f5:  ldc.i8     0xc3c34b48c
-        IL_00fe:  call       void JitTest.Test::testNumbers(int64,
+        IL_00fe:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0103:  ldc.i4     0xc2
         IL_0108:  conv.i8
         IL_0109:  ldc.i8     0x6a671c470f
-        IL_0112:  call       void JitTest.Test::testNumbers(int64,
+        IL_0112:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0117:  ldc.i4.s   75
         IL_0119:  conv.i8
         IL_011a:  ldc.i8     0xf538cede2b
-        IL_0123:  call       void JitTest.Test::testNumbers(int64,
+        IL_0123:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0128:  ldc.i4     0x99
         IL_012d:  conv.i8
         IL_012e:  ldc.i8     0x5ba885d43b
-        IL_0137:  call       void JitTest.Test::testNumbers(int64,
+        IL_0137:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_013c:  ldc.i4.s   104
         IL_013e:  conv.i8
         IL_013f:  ldc.i8     0x9f692f98ac45
-        IL_0148:  call       void JitTest.Test::testNumbers(int64,
+        IL_0148:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_014d:  ldc.i4     0xd9
         IL_0152:  conv.i8
         IL_0153:  ldc.i8     0x8d5eaa7f0a8e
-        IL_015c:  call       void JitTest.Test::testNumbers(int64,
+        IL_015c:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0161:  ldc.i4     0xac
         IL_0166:  conv.i8
         IL_0167:  ldc.i8     0xba1316512e4c
-        IL_0170:  call       void JitTest.Test::testNumbers(int64,
+        IL_0170:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0175:  ldc.i4.s   28
         IL_0177:  conv.i8
         IL_0178:  ldc.i8     0x8c4fbf2f14aa
-        IL_0181:  call       void JitTest.Test::testNumbers(int64,
+        IL_0181:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0186:  ldc.i4     0xc0
         IL_018b:  conv.i8
         IL_018c:  ldc.i8     0x69a9eb9a9bc822
-        IL_0195:  call       void JitTest.Test::testNumbers(int64,
+        IL_0195:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_019a:  ldc.i4.s   116
         IL_019c:  conv.i8
         IL_019d:  ldc.i8     0x3f8f5a893de200
-        IL_01a6:  call       void JitTest.Test::testNumbers(int64,
+        IL_01a6:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_01ab:  ldc.i4.s   39
         IL_01ad:  conv.i8
         IL_01ae:  ldc.i8     0x650eb1747a5bc
-        IL_01b7:  call       void JitTest.Test::testNumbers(int64,
+        IL_01b7:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_01bc:  ldc.i4     0xd9
         IL_01c1:  conv.i8
         IL_01c2:  ldc.i8     0xd3d50809c70fda
-        IL_01cb:  call       void JitTest.Test::testNumbers(int64,
+        IL_01cb:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_01d0:  ldc.i4     0xc0
         IL_01d5:  conv.i8
         IL_01d6:  ldc.i8     0xac6556a4ca94513e
-        IL_01df:  call       void JitTest.Test::testNumbers(int64,
+        IL_01df:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_01e4:  ldc.i4.s   32
         IL_01e6:  conv.i8
         IL_01e7:  ldc.i8     0xa697fcbfd6d232d1
-        IL_01f0:  call       void JitTest.Test::testNumbers(int64,
+        IL_01f0:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_01f5:  ldc.i4     0x9c
         IL_01fa:  conv.i8
         IL_01fb:  ldc.i8     0xc4421a4f5147b9b8
-        IL_0204:  call       void JitTest.Test::testNumbers(int64,
+        IL_0204:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0209:  ldc.i4     0x9e
         IL_020e:  conv.i8
         IL_020f:  ldc.i8     0xc5ef494112a7b33f
-        IL_0218:  call       void JitTest.Test::testNumbers(int64,
+        IL_0218:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_021d:  ldc.i4     0xf7fa
         IL_0222:  conv.i8
         IL_0223:  ldc.i4     0xaf
         IL_0228:  conv.i8
-        IL_0229:  call       void JitTest.Test::testNumbers(int64,
+        IL_0229:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_022e:  ldc.i4     0xad17
         IL_0233:  conv.i8
         IL_0234:  ldc.i4     0xe8
         IL_0239:  conv.i8
-        IL_023a:  call       void JitTest.Test::testNumbers(int64,
+        IL_023a:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_023f:  ldc.i4     0xc9c4
         IL_0244:  conv.i8
         IL_0245:  ldc.i4.s   69
         IL_0247:  conv.i8
-        IL_0248:  call       void JitTest.Test::testNumbers(int64,
+        IL_0248:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_024d:  ldc.i4     0xa704
         IL_0252:  conv.i8
         IL_0253:  ldc.i4.s   18
         IL_0255:  conv.i8
-        IL_0256:  call       void JitTest.Test::testNumbers(int64,
+        IL_0256:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_025b:  ldc.i4     0xc55b
         IL_0260:  conv.i8
         IL_0261:  ldc.i4     0xa33a
         IL_0266:  conv.i8
-        IL_0267:  call       void JitTest.Test::testNumbers(int64,
+        IL_0267:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_026c:  ldc.i4     0xab88
         IL_0271:  conv.i8
         IL_0272:  ldc.i4     0x9a3c
         IL_0277:  conv.i8
-        IL_0278:  call       void JitTest.Test::testNumbers(int64,
+        IL_0278:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_027d:  ldc.i4     0xa539
         IL_0282:  conv.i8
         IL_0283:  ldc.i4     0xcf3a
         IL_0288:  conv.i8
-        IL_0289:  call       void JitTest.Test::testNumbers(int64,
+        IL_0289:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_028e:  ldc.i4     0x5890
         IL_0293:  conv.i8
         IL_0294:  ldc.i4     0xeec8
         IL_0299:  conv.i8
-        IL_029a:  call       void JitTest.Test::testNumbers(int64,
+        IL_029a:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_029f:  ldc.i4     0xe9e2
         IL_02a4:  conv.i8
         IL_02a5:  ldc.i4     0xfe7c46
         IL_02aa:  conv.i8
-        IL_02ab:  call       void JitTest.Test::testNumbers(int64,
+        IL_02ab:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_02b0:  ldc.i4     0x7303
         IL_02b5:  conv.i8
         IL_02b6:  ldc.i4     0x419f2a
         IL_02bb:  conv.i8
-        IL_02bc:  call       void JitTest.Test::testNumbers(int64,
+        IL_02bc:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_02c1:  ldc.i4     0xe105
         IL_02c6:  conv.i8
         IL_02c7:  ldc.i4     0x13f913
         IL_02cc:  conv.i8
-        IL_02cd:  call       void JitTest.Test::testNumbers(int64,
+        IL_02cd:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_02d2:  ldc.i4     0x8191
         IL_02d7:  conv.i8
         IL_02d8:  ldc.i4     0xfa2458
         IL_02dd:  conv.i8
-        IL_02de:  call       void JitTest.Test::testNumbers(int64,
+        IL_02de:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_02e3:  ldc.i4     0x6d9
         IL_02e8:  conv.i8
         IL_02e9:  ldc.i4     0x91cf14f7
         IL_02ee:  conv.u8
-        IL_02ef:  call       void JitTest.Test::testNumbers(int64,
+        IL_02ef:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_02f4:  ldc.i4     0xbdb1
         IL_02f9:  conv.i8
         IL_02fa:  ldc.i4     0x86c2a97c
         IL_02ff:  conv.u8
-        IL_0300:  call       void JitTest.Test::testNumbers(int64,
+        IL_0300:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0305:  ldc.i4     0xe905
         IL_030a:  conv.i8
         IL_030b:  ldc.i4     0x64f702f4
         IL_0310:  conv.i8
-        IL_0311:  call       void JitTest.Test::testNumbers(int64,
+        IL_0311:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0316:  ldc.i4     0x2fdc
         IL_031b:  conv.i8
         IL_031c:  ldc.i4     0xf059caf6
         IL_0321:  conv.u8
-        IL_0322:  call       void JitTest.Test::testNumbers(int64,
+        IL_0322:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0327:  ldc.i4     0xf8fd
         IL_032c:  conv.i8
         IL_032d:  ldc.i8     0x13f0265b1e
-        IL_0336:  call       void JitTest.Test::testNumbers(int64,
+        IL_0336:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_033b:  ldc.i4     0xe8b8
         IL_0340:  conv.i8
         IL_0341:  ldc.i8     0xaa69a6308
-        IL_034a:  call       void JitTest.Test::testNumbers(int64,
+        IL_034a:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_034f:  ldc.i4     0x3d00
         IL_0354:  conv.i8
         IL_0355:  ldc.i8     0xfbcb67879b
-        IL_035e:  call       void JitTest.Test::testNumbers(int64,
+        IL_035e:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0363:  ldc.i4     0xaa46
         IL_0368:  conv.i8
         IL_0369:  ldc.i8     0x85c3d371d5
-        IL_0372:  call       void JitTest.Test::testNumbers(int64,
+        IL_0372:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0377:  ldc.i4     0x5f60
         IL_037c:  conv.i8
         IL_037d:  ldc.i8     0x8cde4a63203
-        IL_0386:  call       void JitTest.Test::testNumbers(int64,
+        IL_0386:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_038b:  ldc.i4     0x92b5
         IL_0390:  conv.i8
         IL_0391:  ldc.i8     0x7ca86ba2f30e
-        IL_039a:  call       void JitTest.Test::testNumbers(int64,
+        IL_039a:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_039f:  ldc.i4     0x93c6
         IL_03a4:  conv.i8
         IL_03a5:  ldc.i8     0xa2d73fc4eac0
-        IL_03ae:  call       void JitTest.Test::testNumbers(int64,
+        IL_03ae:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_03b3:  ldc.i4     0x4156
         IL_03b8:  conv.i8
         IL_03b9:  ldc.i8     0x6dbd08f2fda
-        IL_03c2:  call       void JitTest.Test::testNumbers(int64,
+        IL_03c2:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_03c7:  ldc.i4     0x4597
         IL_03cc:  conv.i8
         IL_03cd:  ldc.i8     0x6cfb0ba5962826
-        IL_03d6:  call       void JitTest.Test::testNumbers(int64,
+        IL_03d6:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_03db:  ldc.i4     0x6bac
         IL_03e0:  conv.i8
         IL_03e1:  ldc.i8     0x1e79315071480f
-        IL_03ea:  call       void JitTest.Test::testNumbers(int64,
+        IL_03ea:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_03ef:  ldc.i4     0x2c3a
         IL_03f4:  conv.i8
         IL_03f5:  ldc.i8     0x92f12cbd82df69
-        IL_03fe:  call       void JitTest.Test::testNumbers(int64,
+        IL_03fe:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0403:  ldc.i4     0x9859
         IL_0408:  conv.i8
         IL_0409:  ldc.i8     0xb0f0cd9dc019f2
-        IL_0412:  call       void JitTest.Test::testNumbers(int64,
+        IL_0412:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0417:  ldc.i4     0xb37f
         IL_041c:  conv.i8
         IL_041d:  ldc.i8     0x4966447d15850076
-        IL_0426:  call       void JitTest.Test::testNumbers(int64,
+        IL_0426:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_042b:  ldc.i4     0x5e34
         IL_0430:  conv.i8
         IL_0431:  ldc.i8     0x7c1869c9ed2cad38
-        IL_043a:  call       void JitTest.Test::testNumbers(int64,
+        IL_043a:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_043f:  ldc.i4     0x5c54
         IL_0444:  conv.i8
         IL_0445:  ldc.i8     0x7cee70ee82837a08
-        IL_044e:  call       void JitTest.Test::testNumbers(int64,
+        IL_044e:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0453:  ldc.i4     0x967f
         IL_0458:  conv.i8
         IL_0459:  ldc.i8     0x4eb98adf4b8b0d32
-        IL_0462:  call       void JitTest.Test::testNumbers(int64,
+        IL_0462:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0467:  ldc.i4     0xfd2919
         IL_046c:  conv.i8
         IL_046d:  ldc.i4.s   93
         IL_046f:  conv.i8
-        IL_0470:  call       void JitTest.Test::testNumbers(int64,
+        IL_0470:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0475:  ldc.i4     0xabd5b1
         IL_047a:  conv.i8
         IL_047b:  ldc.i4     0x98
         IL_0480:  conv.i8
-        IL_0481:  call       void JitTest.Test::testNumbers(int64,
+        IL_0481:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0486:  ldc.i4     0xab1887
         IL_048b:  conv.i8
         IL_048c:  ldc.i4     0xef
         IL_0491:  conv.i8
-        IL_0492:  call       void JitTest.Test::testNumbers(int64,
+        IL_0492:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0497:  ldc.i4     0x96034a
         IL_049c:  conv.i8
         IL_049d:  ldc.i4.s   47
         IL_049f:  conv.i8
-        IL_04a0:  call       void JitTest.Test::testNumbers(int64,
+        IL_04a0:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_04a5:  ldc.i4     0xd5bb94
         IL_04aa:  conv.i8
         IL_04ab:  ldc.i4     0x57d2
         IL_04b0:  conv.i8
-        IL_04b1:  call       void JitTest.Test::testNumbers(int64,
+        IL_04b1:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_04b6:  ldc.i4     0xd7b2cb
         IL_04bb:  conv.i8
         IL_04bc:  ldc.i4     0x80f5
         IL_04c1:  conv.i8
-        IL_04c2:  call       void JitTest.Test::testNumbers(int64,
+        IL_04c2:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_04c7:  ldc.i4     0x4ccc6d
         IL_04cc:  conv.i8
         IL_04cd:  ldc.i4     0x87c
         IL_04d2:  conv.i8
-        IL_04d3:  call       void JitTest.Test::testNumbers(int64,
+        IL_04d3:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_04d8:  ldc.i4     0xec0c50
         IL_04dd:  conv.i8
         IL_04de:  ldc.i4     0xbdff
         IL_04e3:  conv.i8
-        IL_04e4:  call       void JitTest.Test::testNumbers(int64,
+        IL_04e4:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_04e9:  ldc.i4     0x8a6865
         IL_04ee:  conv.i8
         IL_04ef:  ldc.i4     0x76c014
         IL_04f4:  conv.i8
-        IL_04f5:  call       void JitTest.Test::testNumbers(int64,
+        IL_04f5:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_04fa:  ldc.i4     0xac38dd
         IL_04ff:  conv.i8
         IL_0500:  ldc.i4     0xf12b09
         IL_0505:  conv.i8
-        IL_0506:  call       void JitTest.Test::testNumbers(int64,
+        IL_0506:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_050b:  ldc.i4     0x615e2a
         IL_0510:  conv.i8
         IL_0511:  ldc.i4     0xe7cbf8
         IL_0516:  conv.i8
-        IL_0517:  call       void JitTest.Test::testNumbers(int64,
+        IL_0517:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_051c:  ldc.i4     0xe214f
         IL_0521:  conv.i8
         IL_0522:  ldc.i4     0x5b8e2f
         IL_0527:  conv.i8
-        IL_0528:  call       void JitTest.Test::testNumbers(int64,
+        IL_0528:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_052d:  ldc.i4     0x3bd7c6
         IL_0532:  conv.i8
         IL_0533:  ldc.i4     0xc1db4e46
         IL_0538:  conv.u8
-        IL_0539:  call       void JitTest.Test::testNumbers(int64,
+        IL_0539:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_053e:  ldc.i4     0xae208d
         IL_0543:  conv.i8
         IL_0544:  ldc.i4     0x1c9aa7a
         IL_0549:  conv.i8
-        IL_054a:  call       void JitTest.Test::testNumbers(int64,
+        IL_054a:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_054f:  ldc.i4     0x8a9cef
         IL_0554:  conv.i8
         IL_0555:  ldc.i4     0x3930b07
         IL_055a:  conv.i8
-        IL_055b:  call       void JitTest.Test::testNumbers(int64,
+        IL_055b:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0560:  ldc.i4     0x36b866
         IL_0565:  conv.i8
         IL_0566:  ldc.i4     0xd64b7bef
         IL_056b:  conv.u8
-        IL_056c:  call       void JitTest.Test::testNumbers(int64,
+        IL_056c:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0571:  ldc.i4     0xd337cd
         IL_0576:  conv.i8
         IL_0577:  ldc.i8     0xa2b45fb7de
-        IL_0580:  call       void JitTest.Test::testNumbers(int64,
+        IL_0580:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0585:  ldc.i4     0x24471
         IL_058a:  conv.i8
         IL_058b:  ldc.i8     0x5c5de3da89
-        IL_0594:  call       void JitTest.Test::testNumbers(int64,
+        IL_0594:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0599:  ldc.i4     0x12b15
         IL_059e:  conv.i8
         IL_059f:  ldc.i8     0x7cd40030fe
-        IL_05a8:  call       void JitTest.Test::testNumbers(int64,
+        IL_05a8:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_05ad:  ldc.i4     0xd38af2
         IL_05b2:  conv.i8
         IL_05b3:  ldc.i8     0x5905921572
-        IL_05bc:  call       void JitTest.Test::testNumbers(int64,
+        IL_05bc:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_05c1:  ldc.i4     0xaca0d7
         IL_05c6:  conv.i8
         IL_05c7:  ldc.i8     0xc632301abeb8
-        IL_05d0:  call       void JitTest.Test::testNumbers(int64,
+        IL_05d0:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_05d5:  ldc.i4     0x4eadc2
         IL_05da:  conv.i8
         IL_05db:  ldc.i8     0x6a1ebf37403c
-        IL_05e4:  call       void JitTest.Test::testNumbers(int64,
+        IL_05e4:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_05e9:  ldc.i4     0x5d909c
         IL_05ee:  conv.i8
         IL_05ef:  ldc.i8     0x4021bfa15862
-        IL_05f8:  call       void JitTest.Test::testNumbers(int64,
+        IL_05f8:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_05fd:  ldc.i4     0x710e08
         IL_0602:  conv.i8
         IL_0603:  ldc.i8     0xe9a1a030b230
-        IL_060c:  call       void JitTest.Test::testNumbers(int64,
+        IL_060c:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0611:  ldc.i4     0x478b9b
         IL_0616:  conv.i8
         IL_0617:  ldc.i8     0x804add8afc31d9
-        IL_0620:  call       void JitTest.Test::testNumbers(int64,
+        IL_0620:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0625:  ldc.i4     0x5754ed
         IL_062a:  conv.i8
         IL_062b:  ldc.i8     0xaf85e7ebb1ce33
-        IL_0634:  call       void JitTest.Test::testNumbers(int64,
+        IL_0634:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0639:  ldc.i4     0x3ab44e
         IL_063e:  conv.i8
         IL_063f:  ldc.i8     0xf41b9f70360f78
-        IL_0648:  call       void JitTest.Test::testNumbers(int64,
+        IL_0648:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_064d:  ldc.i4     0x7aa129
         IL_0652:  conv.i8
         IL_0653:  ldc.i8     0xeb6e4eddf7eb87
-        IL_065c:  call       void JitTest.Test::testNumbers(int64,
+        IL_065c:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0661:  ldc.i4     0x3b036f
         IL_0666:  conv.i8
         IL_0667:  ldc.i8     0x333874e4330fbfa4
-        IL_0670:  call       void JitTest.Test::testNumbers(int64,
+        IL_0670:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0675:  ldc.i4     0xa33186
         IL_067a:  conv.i8
         IL_067b:  ldc.i8     0xec8607412503fc4c
-        IL_0684:  call       void JitTest.Test::testNumbers(int64,
+        IL_0684:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0689:  ldc.i4     0x9af471
         IL_068e:  conv.i8
         IL_068f:  ldc.i8     0xe7ad0935fdbff151
-        IL_0698:  call       void JitTest.Test::testNumbers(int64,
+        IL_0698:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_069d:  ldc.i4     0xc04e8c
         IL_06a2:  conv.i8
         IL_06a3:  ldc.i8     0x58ee406ab936ac24
-        IL_06ac:  call       void JitTest.Test::testNumbers(int64,
+        IL_06ac:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_06b1:  ldc.i4     0x54fdd28b
         IL_06b6:  conv.i8
         IL_06b7:  ldc.i4.s   52
         IL_06b9:  conv.i8
-        IL_06ba:  call       void JitTest.Test::testNumbers(int64,
+        IL_06ba:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_06bf:  ldc.i4     0x33736b36
         IL_06c4:  conv.i8
         IL_06c5:  ldc.i4     0xfd
         IL_06ca:  conv.i8
-        IL_06cb:  call       void JitTest.Test::testNumbers(int64,
+        IL_06cb:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_06d0:  ldc.i4     0x69cfe4b7
         IL_06d5:  conv.i8
         IL_06d6:  ldc.i4.s   38
         IL_06d8:  conv.i8
-        IL_06d9:  call       void JitTest.Test::testNumbers(int64,
+        IL_06d9:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_06de:  ldc.i4     0xfd078d36
         IL_06e3:  conv.u8
         IL_06e4:  ldc.i4     0xdc
         IL_06e9:  conv.i8
-        IL_06ea:  call       void JitTest.Test::testNumbers(int64,
+        IL_06ea:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_06ef:  ldc.i4     0x75cc3f36
         IL_06f4:  conv.i8
         IL_06f5:  ldc.i4     0x1617
         IL_06fa:  conv.i8
-        IL_06fb:  call       void JitTest.Test::testNumbers(int64,
+        IL_06fb:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0700:  ldc.i4     0x75d660e
         IL_0705:  conv.i8
         IL_0706:  ldc.i4     0x8511
         IL_070b:  conv.i8
-        IL_070c:  call       void JitTest.Test::testNumbers(int64,
+        IL_070c:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0711:  ldc.i4     0x52acb037
         IL_0716:  conv.i8
         IL_0717:  ldc.i4     0x43cb
         IL_071c:  conv.i8
-        IL_071d:  call       void JitTest.Test::testNumbers(int64,
+        IL_071d:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0722:  ldc.i4     0xa0db7bf5
         IL_0727:  conv.u8
         IL_0728:  ldc.i4     0x2c98
         IL_072d:  conv.i8
-        IL_072e:  call       void JitTest.Test::testNumbers(int64,
+        IL_072e:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0733:  ldc.i4     0x83d4be11
         IL_0738:  conv.u8
         IL_0739:  ldc.i4     0xba37c9
         IL_073e:  conv.i8
-        IL_073f:  call       void JitTest.Test::testNumbers(int64,
+        IL_073f:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0744:  ldc.i4     0x83d04f94
         IL_0749:  conv.u8
         IL_074a:  ldc.i4     0x3ddbd0
         IL_074f:  conv.i8
-        IL_0750:  call       void JitTest.Test::testNumbers(int64,
+        IL_0750:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0755:  ldc.i4     0x5ed41f6a
         IL_075a:  conv.i8
         IL_075b:  ldc.i4     0xeaf1d5
         IL_0760:  conv.i8
-        IL_0761:  call       void JitTest.Test::testNumbers(int64,
+        IL_0761:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0766:  ldc.i4     0xe364a9a
         IL_076b:  conv.i8
         IL_076c:  ldc.i4     0x85880c
         IL_0771:  conv.i8
-        IL_0772:  call       void JitTest.Test::testNumbers(int64,
+        IL_0772:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0777:  ldc.i4     0x12657ecb
         IL_077c:  conv.i8
         IL_077d:  ldc.i4     0xa88b8a68
         IL_0782:  conv.u8
-        IL_0783:  call       void JitTest.Test::testNumbers(int64,
+        IL_0783:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0788:  ldc.i4     0x9897a4ac
         IL_078d:  conv.u8
         IL_078e:  ldc.i4     0x76707981
         IL_0793:  conv.i8
-        IL_0794:  call       void JitTest.Test::testNumbers(int64,
+        IL_0794:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0799:  ldc.i4     0x469cd1cf
         IL_079e:  conv.i8
         IL_079f:  ldc.i4     0xcf40f67a
         IL_07a4:  conv.u8
-        IL_07a5:  call       void JitTest.Test::testNumbers(int64,
+        IL_07a5:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_07aa:  ldc.i4     0xee7444c8
         IL_07af:  conv.u8
         IL_07b0:  ldc.i4     0xd1b0d7de
         IL_07b5:  conv.u8
-        IL_07b6:  call       void JitTest.Test::testNumbers(int64,
+        IL_07b6:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_07bb:  ldc.i4     0xfbb6f547
         IL_07c0:  conv.u8
         IL_07c1:  ldc.i8     0xc1ef3c4d9b
-        IL_07ca:  call       void JitTest.Test::testNumbers(int64,
+        IL_07ca:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_07cf:  ldc.i4     0xe20dd53
         IL_07d4:  conv.i8
         IL_07d5:  ldc.i8     0xb05833c7cf
-        IL_07de:  call       void JitTest.Test::testNumbers(int64,
+        IL_07de:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_07e3:  ldc.i4     0xe5733fb8
         IL_07e8:  conv.u8
         IL_07e9:  ldc.i8     0x8eae18a855
-        IL_07f2:  call       void JitTest.Test::testNumbers(int64,
+        IL_07f2:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_07f7:  ldc.i4     0x5db1c271
         IL_07fc:  conv.i8
         IL_07fd:  ldc.i8     0xc4a2f7c27d
-        IL_0806:  call       void JitTest.Test::testNumbers(int64,
+        IL_0806:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_080b:  ldc.i4     0x7add22a
         IL_0810:  conv.i8
         IL_0811:  ldc.i8     0xed9fd23dc3e
-        IL_081a:  call       void JitTest.Test::testNumbers(int64,
+        IL_081a:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_081f:  ldc.i4     0x2239d1d5
         IL_0824:  conv.i8
         IL_0825:  ldc.i8     0xa1ae07a62635
-        IL_082e:  call       void JitTest.Test::testNumbers(int64,
+        IL_082e:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0833:  ldc.i4     0x410d4d58
         IL_0838:  conv.i8
         IL_0839:  ldc.i8     0xc05c5205bed2
-        IL_0842:  call       void JitTest.Test::testNumbers(int64,
+        IL_0842:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0847:  ldc.i4     0x4c3c435e
         IL_084c:  conv.i8
         IL_084d:  ldc.i8     0x1e30c1bf628a
-        IL_0856:  call       void JitTest.Test::testNumbers(int64,
+        IL_0856:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_085b:  ldc.i4     0x96f44d5
         IL_0860:  conv.i8
         IL_0861:  ldc.i8     0x5488c521a6072b
-        IL_086a:  call       void JitTest.Test::testNumbers(int64,
+        IL_086a:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_086f:  ldc.i4     0x17f28913
         IL_0874:  conv.i8
         IL_0875:  ldc.i8     0x796ff3891c44ff
-        IL_087e:  call       void JitTest.Test::testNumbers(int64,
+        IL_087e:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0883:  ldc.i4     0x65be69cf
         IL_0888:  conv.i8
         IL_0889:  ldc.i8     0xdd5c6f9b3f3119
-        IL_0892:  call       void JitTest.Test::testNumbers(int64,
+        IL_0892:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0897:  ldc.i4     0x2200f221
         IL_089c:  conv.i8
         IL_089d:  ldc.i8     0xab6c98c90cfe9d
-        IL_08a6:  call       void JitTest.Test::testNumbers(int64,
+        IL_08a6:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_08ab:  ldc.i4     0xd48bee1a
         IL_08b0:  conv.u8
         IL_08b1:  ldc.i8     0x64b76d7491a58799
-        IL_08ba:  call       void JitTest.Test::testNumbers(int64,
+        IL_08ba:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_08bf:  ldc.i4     0x6cb93100
         IL_08c4:  conv.i8
         IL_08c5:  ldc.i8     0xa515fe27402dad45
-        IL_08ce:  call       void JitTest.Test::testNumbers(int64,
+        IL_08ce:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_08d3:  ldc.i4     0xbed95abe
         IL_08d8:  conv.u8
         IL_08d9:  ldc.i8     0xc9924098acc74be9
-        IL_08e2:  call       void JitTest.Test::testNumbers(int64,
+        IL_08e2:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_08e7:  ldc.i4     0x92781a2e
         IL_08ec:  conv.u8
         IL_08ed:  ldc.i8     0x67ada9ef3f9e39b7
-        IL_08f6:  call       void JitTest.Test::testNumbers(int64,
+        IL_08f6:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_08fb:  ldc.i8     0xe3aafcdae2
         IL_0904:  ldc.i4     0x9c
         IL_0909:  conv.i8
-        IL_090a:  call       void JitTest.Test::testNumbers(int64,
+        IL_090a:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_090f:  ldc.i8     0xd8dad80c34
         IL_0918:  ldc.i4     0x99
         IL_091d:  conv.i8
-        IL_091e:  call       void JitTest.Test::testNumbers(int64,
+        IL_091e:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0923:  ldc.i8     0xaddcd074d6
         IL_092c:  ldc.i4     0xea
         IL_0931:  conv.i8
-        IL_0932:  call       void JitTest.Test::testNumbers(int64,
+        IL_0932:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0937:  ldc.i8     0x96735bc25a
         IL_0940:  ldc.i4     0xba
         IL_0945:  conv.i8
-        IL_0946:  call       void JitTest.Test::testNumbers(int64,
+        IL_0946:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_094b:  ldc.i8     0xf492ef7446
         IL_0954:  ldc.i4     0x39b1
         IL_0959:  conv.i8
-        IL_095a:  call       void JitTest.Test::testNumbers(int64,
+        IL_095a:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_095f:  ldc.i8     0xbc86816119
         IL_0968:  ldc.i4     0x1520
         IL_096d:  conv.i8
-        IL_096e:  call       void JitTest.Test::testNumbers(int64,
+        IL_096e:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0973:  ldc.i8     0x60a36818e7
         IL_097c:  ldc.i4     0xc5a8
         IL_0981:  conv.i8
-        IL_0982:  call       void JitTest.Test::testNumbers(int64,
+        IL_0982:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0987:  ldc.i8     0x317121d508
         IL_0990:  ldc.i4     0xac3d
         IL_0995:  conv.i8
-        IL_0996:  call       void JitTest.Test::testNumbers(int64,
+        IL_0996:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_099b:  ldc.i8     0x4abfdaf232
         IL_09a4:  ldc.i4     0x5cea57
         IL_09a9:  conv.i8
-        IL_09aa:  call       void JitTest.Test::testNumbers(int64,
+        IL_09aa:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_09af:  ldc.i8     0xacc458f392
         IL_09b8:  ldc.i4     0xa9c3e3
         IL_09bd:  conv.i8
-        IL_09be:  call       void JitTest.Test::testNumbers(int64,
+        IL_09be:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_09c3:  ldc.i8     0x1020993532
         IL_09cc:  ldc.i4     0xdf6042
         IL_09d1:  conv.i8
-        IL_09d2:  call       void JitTest.Test::testNumbers(int64,
+        IL_09d2:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_09d7:  ldc.i8     0xad25b80abb
         IL_09e0:  ldc.i4     0xcec15b
         IL_09e5:  conv.i8
-        IL_09e6:  call       void JitTest.Test::testNumbers(int64,
+        IL_09e6:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_09eb:  ldc.i8     0x2305d2c443
         IL_09f4:  ldc.i4     0x2a26131c
         IL_09f9:  conv.i8
-        IL_09fa:  call       void JitTest.Test::testNumbers(int64,
+        IL_09fa:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_09ff:  ldc.i8     0x7c42e2ce0
         IL_0a08:  ldc.i4     0x9768024f
         IL_0a0d:  conv.u8
-        IL_0a0e:  call       void JitTest.Test::testNumbers(int64,
+        IL_0a0e:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0a13:  ldc.i8     0x76f674816c
         IL_0a1c:  ldc.i4     0x8d33c7b4
         IL_0a21:  conv.u8
-        IL_0a22:  call       void JitTest.Test::testNumbers(int64,
+        IL_0a22:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0a27:  ldc.i8     0xbf567b23bc
         IL_0a30:  ldc.i4     0xef264890
         IL_0a35:  conv.u8
-        IL_0a36:  call       void JitTest.Test::testNumbers(int64,
+        IL_0a36:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0a3b:  ldc.i8     0xe3283681a0
         IL_0a44:  ldc.i8     0x2e66850719
-        IL_0a4d:  call       void JitTest.Test::testNumbers(int64,
+        IL_0a4d:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0a52:  ldc.i8     0x11fe13754
         IL_0a5b:  ldc.i8     0x66fad0b407
-        IL_0a64:  call       void JitTest.Test::testNumbers(int64,
+        IL_0a64:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0a69:  ldc.i8     0x52f259009f
         IL_0a72:  ldc.i8     0xa2886ef414
-        IL_0a7b:  call       void JitTest.Test::testNumbers(int64,
+        IL_0a7b:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0a80:  ldc.i8     0xa9ebb540fc
         IL_0a89:  ldc.i8     0x9d27ba694f
-        IL_0a92:  call       void JitTest.Test::testNumbers(int64,
+        IL_0a92:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0a97:  ldc.i8     0x83af60d7eb
         IL_0aa0:  ldc.i8     0xb6f2a0f51f4c
-        IL_0aa9:  call       void JitTest.Test::testNumbers(int64,
+        IL_0aa9:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0aae:  ldc.i8     0xf2ec42d13a
         IL_0ab7:  ldc.i8     0x46855f279407
-        IL_0ac0:  call       void JitTest.Test::testNumbers(int64,
+        IL_0ac0:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0ac5:  ldc.i8     0x94e71cb562
         IL_0ace:  ldc.i8     0x2d9566618e56
-        IL_0ad7:  call       void JitTest.Test::testNumbers(int64,
+        IL_0ad7:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0adc:  ldc.i8     0xc0ee690ddc
         IL_0ae5:  ldc.i8     0x54295c8ca584
-        IL_0aee:  call       void JitTest.Test::testNumbers(int64,
+        IL_0aee:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0af3:  ldc.i8     0x2683cd5206
         IL_0afc:  ldc.i8     0xa5a2d269bcd188
-        IL_0b05:  call       void JitTest.Test::testNumbers(int64,
+        IL_0b05:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0b0a:  ldc.i8     0x2e77038305
         IL_0b13:  ldc.i8     0xc727f0f3787e22
-        IL_0b1c:  call       void JitTest.Test::testNumbers(int64,
+        IL_0b1c:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0b21:  ldc.i8     0x8323b9d026
         IL_0b2a:  ldc.i8     0xfed29f8575c120
-        IL_0b33:  call       void JitTest.Test::testNumbers(int64,
+        IL_0b33:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0b38:  ldc.i8     0x7b3231f0fc
         IL_0b41:  ldc.i8     0x91080854b27d3e
-        IL_0b4a:  call       void JitTest.Test::testNumbers(int64,
+        IL_0b4a:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0b4f:  ldc.i8     0x84522a7708
         IL_0b58:  ldc.i8     0x91ba8f22fccd6222
-        IL_0b61:  call       void JitTest.Test::testNumbers(int64,
+        IL_0b61:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0b66:  ldc.i8     0xafb1b50d90
         IL_0b6f:  ldc.i8     0x3261a532b65c7838
-        IL_0b78:  call       void JitTest.Test::testNumbers(int64,
+        IL_0b78:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0b7d:  ldc.i8     0x2c65e838c6
         IL_0b86:  ldc.i8     0x5b858452c9bf6f39
-        IL_0b8f:  call       void JitTest.Test::testNumbers(int64,
+        IL_0b8f:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0b94:  ldc.i8     0x219e837734
         IL_0b9d:  ldc.i8     0x97873bed5bb0a44b
-        IL_0ba6:  call       void JitTest.Test::testNumbers(int64,
+        IL_0ba6:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0bab:  ldc.i8     0x9f133e2f116f
         IL_0bb4:  ldc.i4.s   115
         IL_0bb6:  conv.i8
-        IL_0bb7:  call       void JitTest.Test::testNumbers(int64,
+        IL_0bb7:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0bbc:  ldc.i8     0x887577574766
         IL_0bc5:  ldc.i4.s   72
         IL_0bc7:  conv.i8
-        IL_0bc8:  call       void JitTest.Test::testNumbers(int64,
+        IL_0bc8:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0bcd:  ldc.i8     0xba4c778d4aa8
         IL_0bd6:  ldc.i4.s   58
         IL_0bd8:  conv.i8
-        IL_0bd9:  call       void JitTest.Test::testNumbers(int64,
+        IL_0bd9:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0bde:  ldc.i8     0x2683df421474
         IL_0be7:  ldc.i4.s   86
         IL_0be9:  conv.i8
-        IL_0bea:  call       void JitTest.Test::testNumbers(int64,
+        IL_0bea:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0bef:  ldc.i8     0x6ff76294c275
         IL_0bf8:  ldc.i4     0x89f7
         IL_0bfd:  conv.i8
-        IL_0bfe:  call       void JitTest.Test::testNumbers(int64,
+        IL_0bfe:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0c03:  ldc.i8     0xfdf053abefa2
         IL_0c0c:  ldc.i4     0xeb65
         IL_0c11:  conv.i8
-        IL_0c12:  call       void JitTest.Test::testNumbers(int64,
+        IL_0c12:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0c17:  ldc.i8     0xea4b254b24eb
         IL_0c20:  ldc.i4     0xba27
         IL_0c25:  conv.i8
-        IL_0c26:  call       void JitTest.Test::testNumbers(int64,
+        IL_0c26:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0c2b:  ldc.i8     0x9f7ce21b811
         IL_0c34:  ldc.i4     0xe8f6
         IL_0c39:  conv.i8
-        IL_0c3a:  call       void JitTest.Test::testNumbers(int64,
+        IL_0c3a:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0c3f:  ldc.i8     0x9cc645fa08a1
         IL_0c48:  ldc.i4     0xa29ea3
         IL_0c4d:  conv.i8
-        IL_0c4e:  call       void JitTest.Test::testNumbers(int64,
+        IL_0c4e:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0c53:  ldc.i8     0x726f9a9f816e
         IL_0c5c:  ldc.i4     0x70dce1
         IL_0c61:  conv.i8
-        IL_0c62:  call       void JitTest.Test::testNumbers(int64,
+        IL_0c62:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0c67:  ldc.i8     0xa4be34825ef6
         IL_0c70:  ldc.i4     0xbb2be7
         IL_0c75:  conv.i8
-        IL_0c76:  call       void JitTest.Test::testNumbers(int64,
+        IL_0c76:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0c7b:  ldc.i8     0x57ff147cb7c1
         IL_0c84:  ldc.i4     0xe255af
         IL_0c89:  conv.i8
-        IL_0c8a:  call       void JitTest.Test::testNumbers(int64,
+        IL_0c8a:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0c8f:  ldc.i8     0xab9d6f546dd4
         IL_0c98:  ldc.i4     0x7e2772a5
         IL_0c9d:  conv.i8
-        IL_0c9e:  call       void JitTest.Test::testNumbers(int64,
+        IL_0c9e:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0ca3:  ldc.i8     0xb148e3446e89
         IL_0cac:  ldc.i4     0x51ed3c28
         IL_0cb1:  conv.i8
-        IL_0cb2:  call       void JitTest.Test::testNumbers(int64,
+        IL_0cb2:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0cb7:  ldc.i8     0x1e3abfe9725e
         IL_0cc0:  ldc.i4     0xd4dec3f4
         IL_0cc5:  conv.u8
-        IL_0cc6:  call       void JitTest.Test::testNumbers(int64,
+        IL_0cc6:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0ccb:  ldc.i8     0xf61bcaba115e
         IL_0cd4:  ldc.i4     0xfade149f
         IL_0cd9:  conv.u8
-        IL_0cda:  call       void JitTest.Test::testNumbers(int64,
+        IL_0cda:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0cdf:  ldc.i8     0xae642b9a6626
         IL_0ce8:  ldc.i8     0xd8de0e0b9a
-        IL_0cf1:  call       void JitTest.Test::testNumbers(int64,
+        IL_0cf1:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0cf6:  ldc.i8     0x9d015a13c8ae
         IL_0cff:  ldc.i8     0xafc8827997
-        IL_0d08:  call       void JitTest.Test::testNumbers(int64,
+        IL_0d08:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0d0d:  ldc.i8     0xecc72cc2df89
         IL_0d16:  ldc.i8     0x70d47ec7c4
-        IL_0d1f:  call       void JitTest.Test::testNumbers(int64,
+        IL_0d1f:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0d24:  ldc.i8     0xfdbf05894fd2
         IL_0d2d:  ldc.i8     0x12aec393bd
-        IL_0d36:  call       void JitTest.Test::testNumbers(int64,
+        IL_0d36:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0d3b:  ldc.i8     0xcd7675a70874
         IL_0d44:  ldc.i8     0xd7d696a62cbc
-        IL_0d4d:  call       void JitTest.Test::testNumbers(int64,
+        IL_0d4d:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0d52:  ldc.i8     0xfad44a89216d
         IL_0d5b:  ldc.i8     0xcb8cfc8ada4c
-        IL_0d64:  call       void JitTest.Test::testNumbers(int64,
+        IL_0d64:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0d69:  ldc.i8     0xf41eb5363551
         IL_0d72:  ldc.i8     0x9c040aa7775e
-        IL_0d7b:  call       void JitTest.Test::testNumbers(int64,
+        IL_0d7b:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0d80:  ldc.i8     0x3c02d93e01f6
         IL_0d89:  ldc.i8     0xf1f4e68a14f8
-        IL_0d92:  call       void JitTest.Test::testNumbers(int64,
+        IL_0d92:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0d97:  ldc.i8     0xe0d99954b598
         IL_0da0:  ldc.i8     0xb2a2de4e453485
-        IL_0da9:  call       void JitTest.Test::testNumbers(int64,
+        IL_0da9:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0dae:  ldc.i8     0xa6081be866d9
         IL_0db7:  ldc.i8     0xf2a12e845e4f2e
-        IL_0dc0:  call       void JitTest.Test::testNumbers(int64,
+        IL_0dc0:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0dc5:  ldc.i8     0xae56a5680dfd
         IL_0dce:  ldc.i8     0xc96cd7c15d5bec
-        IL_0dd7:  call       void JitTest.Test::testNumbers(int64,
+        IL_0dd7:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0ddc:  ldc.i8     0x360363e37938
         IL_0de5:  ldc.i8     0xd4ed572e1937e0
-        IL_0dee:  call       void JitTest.Test::testNumbers(int64,
+        IL_0dee:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0df3:  ldc.i8     0x1f052aebf185
         IL_0dfc:  ldc.i8     0x3584e582d1c6db1a
-        IL_0e05:  call       void JitTest.Test::testNumbers(int64,
+        IL_0e05:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0e0a:  ldc.i8     0x3fac9c7b3d1b
         IL_0e13:  ldc.i8     0xa4b120f080d69113
-        IL_0e1c:  call       void JitTest.Test::testNumbers(int64,
+        IL_0e1c:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0e21:  ldc.i8     0x5330d51c3217
         IL_0e2a:  ldc.i8     0xc16dd32ffd822c0e
-        IL_0e33:  call       void JitTest.Test::testNumbers(int64,
+        IL_0e33:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0e38:  ldc.i8     0xcd0694ff5ab0
         IL_0e41:  ldc.i8     0x29673fe67245fbfc
-        IL_0e4a:  call       void JitTest.Test::testNumbers(int64,
+        IL_0e4a:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0e4f:  ldc.i8     0x98265e5a308523
         IL_0e58:  ldc.i4.s   125
         IL_0e5a:  conv.i8
-        IL_0e5b:  call       void JitTest.Test::testNumbers(int64,
+        IL_0e5b:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0e60:  ldc.i8     0x560863350df217
         IL_0e69:  ldc.i4     0xc8
         IL_0e6e:  conv.i8
-        IL_0e6f:  call       void JitTest.Test::testNumbers(int64,
+        IL_0e6f:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0e74:  ldc.i8     0x798ce804d829a1
         IL_0e7d:  ldc.i4     0xb1
         IL_0e82:  conv.i8
-        IL_0e83:  call       void JitTest.Test::testNumbers(int64,
+        IL_0e83:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0e88:  ldc.i8     0x7994c0051256fd
         IL_0e91:  ldc.i4.s   92
         IL_0e93:  conv.i8
-        IL_0e94:  call       void JitTest.Test::testNumbers(int64,
+        IL_0e94:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0e99:  ldc.i8     0xff1a2838e69f42
         IL_0ea2:  ldc.i4     0x3c16
         IL_0ea7:  conv.i8
-        IL_0ea8:  call       void JitTest.Test::testNumbers(int64,
+        IL_0ea8:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0ead:  ldc.i8     0x9e7e95ac5de2c7
         IL_0eb6:  ldc.i4     0xed49
         IL_0ebb:  conv.i8
-        IL_0ebc:  call       void JitTest.Test::testNumbers(int64,
+        IL_0ebc:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0ec1:  ldc.i8     0xfd6867eabba5c0
         IL_0eca:  ldc.i4     0xc689
         IL_0ecf:  conv.i8
-        IL_0ed0:  call       void JitTest.Test::testNumbers(int64,
+        IL_0ed0:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0ed5:  ldc.i8     0x9d1632daf20de0
         IL_0ede:  ldc.i4     0xb74f
         IL_0ee3:  conv.i8
-        IL_0ee4:  call       void JitTest.Test::testNumbers(int64,
+        IL_0ee4:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0ee9:  ldc.i8     0xee29d8f76d4e9c
         IL_0ef2:  ldc.i4     0x8020d4
         IL_0ef7:  conv.i8
-        IL_0ef8:  call       void JitTest.Test::testNumbers(int64,
+        IL_0ef8:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0efd:  ldc.i8     0x89e03ecf8daa0a
         IL_0f06:  ldc.i4     0x3e7587
         IL_0f0b:  conv.i8
-        IL_0f0c:  call       void JitTest.Test::testNumbers(int64,
+        IL_0f0c:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0f11:  ldc.i8     0x115763be4beb44
         IL_0f1a:  ldc.i4     0x88f762
         IL_0f1f:  conv.i8
-        IL_0f20:  call       void JitTest.Test::testNumbers(int64,
+        IL_0f20:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0f25:  ldc.i8     0x815cfc87c427d0
         IL_0f2e:  ldc.i4     0x9eec06
         IL_0f33:  conv.i8
-        IL_0f34:  call       void JitTest.Test::testNumbers(int64,
+        IL_0f34:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0f39:  ldc.i8     0x1d9c3c9ded0c1a
         IL_0f42:  ldc.i4     0xb9f6d331
         IL_0f47:  conv.u8
-        IL_0f48:  call       void JitTest.Test::testNumbers(int64,
+        IL_0f48:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0f4d:  ldc.i8     0x932225412f1222
         IL_0f56:  ldc.i4     0x130ff743
         IL_0f5b:  conv.i8
-        IL_0f5c:  call       void JitTest.Test::testNumbers(int64,
+        IL_0f5c:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0f61:  ldc.i8     0xfe82151e2e0bf3
         IL_0f6a:  ldc.i4     0x781cd6f9
         IL_0f6f:  conv.i8
-        IL_0f70:  call       void JitTest.Test::testNumbers(int64,
+        IL_0f70:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0f75:  ldc.i8     0x2222abb5061b12
         IL_0f7e:  ldc.i4     0x491f1df
         IL_0f83:  conv.i8
-        IL_0f84:  call       void JitTest.Test::testNumbers(int64,
+        IL_0f84:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0f89:  ldc.i8     0x12ce0cf0452748
         IL_0f92:  ldc.i8     0xa8566274aa
-        IL_0f9b:  call       void JitTest.Test::testNumbers(int64,
+        IL_0f9b:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0fa0:  ldc.i8     0xe570484e9937e1
         IL_0fa9:  ldc.i8     0xac81f171be
-        IL_0fb2:  call       void JitTest.Test::testNumbers(int64,
+        IL_0fb2:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0fb7:  ldc.i8     0xeb371f7f8f514e
         IL_0fc0:  ldc.i8     0xdf0248189c
-        IL_0fc9:  call       void JitTest.Test::testNumbers(int64,
+        IL_0fc9:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0fce:  ldc.i8     0x3777a7cc43dfd7
         IL_0fd7:  ldc.i8     0x3a7b8eaf40
-        IL_0fe0:  call       void JitTest.Test::testNumbers(int64,
+        IL_0fe0:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0fe5:  ldc.i8     0xe181db76238786
         IL_0fee:  ldc.i8     0x4126e572a568
-        IL_0ff7:  call       void JitTest.Test::testNumbers(int64,
+        IL_0ff7:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_0ffc:  ldc.i8     0xac1df87977e122
         IL_1005:  ldc.i8     0xe1e8cfde6678
-        IL_100e:  call       void JitTest.Test::testNumbers(int64,
+        IL_100e:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_1013:  ldc.i8     0x1c858763a2c23b
         IL_101c:  ldc.i8     0x4ef61f3964f
-        IL_1025:  call       void JitTest.Test::testNumbers(int64,
+        IL_1025:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_102a:  ldc.i8     0xbd786bbb71ce46
         IL_1033:  ldc.i8     0x2cda097a464f
-        IL_103c:  call       void JitTest.Test::testNumbers(int64,
+        IL_103c:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_1041:  ldc.i8     0xa7a6de21a46360
         IL_104a:  ldc.i8     0x7afda16f98c3
-        IL_1053:  call       void JitTest.Test::testNumbers(int64,
+        IL_1053:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_1058:  ldc.i8     0x6fed70a6ccfdf2
         IL_1061:  ldc.i8     0x9771441e8e00e8
-        IL_106a:  call       void JitTest.Test::testNumbers(int64,
+        IL_106a:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_106f:  ldc.i8     0x5ad2782dcd5e60
         IL_1078:  ldc.i8     0xd170d518385f6
-        IL_1081:  call       void JitTest.Test::testNumbers(int64,
+        IL_1081:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_1086:  ldc.i8     0x1fd67b153bc9b9
         IL_108f:  ldc.i8     0x7b3366dff66c6c
-        IL_1098:  call       void JitTest.Test::testNumbers(int64,
+        IL_1098:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_109d:  ldc.i8     0xbf00203beb73f4
         IL_10a6:  ldc.i8     0x693495fefab1c77e
-        IL_10af:  call       void JitTest.Test::testNumbers(int64,
+        IL_10af:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_10b4:  ldc.i8     0x2faac1b1b068f8
         IL_10bd:  ldc.i8     0x1cb11cc5c3aaff86
-        IL_10c6:  call       void JitTest.Test::testNumbers(int64,
+        IL_10c6:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_10cb:  ldc.i8     0xbb63cfbffe7648
         IL_10d4:  ldc.i8     0x84f5b0c583f9e77b
-        IL_10dd:  call       void JitTest.Test::testNumbers(int64,
+        IL_10dd:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_10e2:  ldc.i8     0x615db89673241c
         IL_10eb:  ldc.i8     0x8de5f125247eba0f
-        IL_10f4:  call       void JitTest.Test::testNumbers(int64,
+        IL_10f4:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_10f9:  ldc.i8     0x9be183a6b293dffe
         IL_1102:  ldc.i4.s   114
         IL_1104:  conv.i8
-        IL_1105:  call       void JitTest.Test::testNumbers(int64,
+        IL_1105:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_110a:  ldc.i8     0xa3df9b76d8a51b19
         IL_1113:  ldc.i4     0xc4
         IL_1118:  conv.i8
-        IL_1119:  call       void JitTest.Test::testNumbers(int64,
+        IL_1119:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_111e:  ldc.i8     0xb4cc300f0ea7566d
         IL_1127:  ldc.i4.s   126
         IL_1129:  conv.i8
-        IL_112a:  call       void JitTest.Test::testNumbers(int64,
+        IL_112a:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_112f:  ldc.i8     0xfdac12a8e23e16e7
         IL_1138:  ldc.i4.s   21
         IL_113a:  conv.i8
-        IL_113b:  call       void JitTest.Test::testNumbers(int64,
+        IL_113b:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_1140:  ldc.i8     0xc0805405aadc0f47
         IL_1149:  ldc.i4     0x19d4
         IL_114e:  conv.i8
-        IL_114f:  call       void JitTest.Test::testNumbers(int64,
+        IL_114f:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_1154:  ldc.i8     0x843a391f8d9f8972
         IL_115d:  ldc.i4     0x317a
         IL_1162:  conv.i8
-        IL_1163:  call       void JitTest.Test::testNumbers(int64,
+        IL_1163:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_1168:  ldc.i8     0x5a0d124c427ed453
         IL_1171:  ldc.i4     0x34fe
         IL_1176:  conv.i8
-        IL_1177:  call       void JitTest.Test::testNumbers(int64,
+        IL_1177:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_117c:  ldc.i8     0x8631150f34008f1b
         IL_1185:  ldc.i4     0x2ecd
         IL_118a:  conv.i8
-        IL_118b:  call       void JitTest.Test::testNumbers(int64,
+        IL_118b:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_1190:  ldc.i8     0x3ff4c18715ad3a76
         IL_1199:  ldc.i4     0x72d22a
         IL_119e:  conv.i8
-        IL_119f:  call       void JitTest.Test::testNumbers(int64,
+        IL_119f:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_11a4:  ldc.i8     0x3ef93e5a649422bd
         IL_11ad:  ldc.i4     0xdb5c60
         IL_11b2:  conv.i8
-        IL_11b3:  call       void JitTest.Test::testNumbers(int64,
+        IL_11b3:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_11b8:  ldc.i8     0x6bdd1056ae58fe0e
         IL_11c1:  ldc.i4     0x805c75
         IL_11c6:  conv.i8
-        IL_11c7:  call       void JitTest.Test::testNumbers(int64,
+        IL_11c7:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_11cc:  ldc.i8     0xeff1fa30f3ad9ded
         IL_11d5:  ldc.i4     0xc83ca
         IL_11da:  conv.i8
-        IL_11db:  call       void JitTest.Test::testNumbers(int64,
+        IL_11db:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_11e0:  ldc.i8     0xbbc143ac147e56a9
         IL_11e9:  ldc.i4     0x161179b7
         IL_11ee:  conv.i8
-        IL_11ef:  call       void JitTest.Test::testNumbers(int64,
+        IL_11ef:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_11f4:  ldc.i8     0x829dde88caa2e45
         IL_11fd:  ldc.i4     0x1443ab62
         IL_1202:  conv.i8
-        IL_1203:  call       void JitTest.Test::testNumbers(int64,
+        IL_1203:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_1208:  ldc.i8     0x97ac43ff797a4514
         IL_1211:  ldc.i4     0x33eef42b
         IL_1216:  conv.i8
-        IL_1217:  call       void JitTest.Test::testNumbers(int64,
+        IL_1217:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_121c:  ldc.i8     0x703e9cdf96a148aa
         IL_1225:  ldc.i4     0x8e08f3d8
         IL_122a:  conv.u8
-        IL_122b:  call       void JitTest.Test::testNumbers(int64,
+        IL_122b:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_1230:  ldc.i8     0x75cbb739b54e2ad6
         IL_1239:  ldc.i8     0x7a8b12628c
-        IL_1242:  call       void JitTest.Test::testNumbers(int64,
+        IL_1242:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_1247:  ldc.i8     0x91e42fafe97d638f
         IL_1250:  ldc.i8     0xfbe867c51
-        IL_1259:  call       void JitTest.Test::testNumbers(int64,
+        IL_1259:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_125e:  ldc.i8     0x9159d77deec116c1
         IL_1267:  ldc.i8     0x96c0c774fc
-        IL_1270:  call       void JitTest.Test::testNumbers(int64,
+        IL_1270:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_1275:  ldc.i8     0xb59dbb4c15761d88
         IL_127e:  ldc.i8     0x4a033a73e7
-        IL_1287:  call       void JitTest.Test::testNumbers(int64,
+        IL_1287:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_128c:  ldc.i8     0xab668e9783af9617
         IL_1295:  ldc.i8     0x5aa18404076c
-        IL_129e:  call       void JitTest.Test::testNumbers(int64,
+        IL_129e:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_12a3:  ldc.i8     0x54c68e5b5c4127df
         IL_12ac:  ldc.i8     0xf2934fd8dd1f
-        IL_12b5:  call       void JitTest.Test::testNumbers(int64,
+        IL_12b5:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_12ba:  ldc.i8     0xf490d3936184c9f9
         IL_12c3:  ldc.i8     0x4007477e2110
-        IL_12cc:  call       void JitTest.Test::testNumbers(int64,
+        IL_12cc:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_12d1:  ldc.i8     0x349e577c9d5c44e2
         IL_12da:  ldc.i8     0xbdb2235af963
-        IL_12e3:  call       void JitTest.Test::testNumbers(int64,
+        IL_12e3:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_12e8:  ldc.i8     0x58f3ac26cdafde28
         IL_12f1:  ldc.i8     0x17d4f4ade9ec35
-        IL_12fa:  call       void JitTest.Test::testNumbers(int64,
+        IL_12fa:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_12ff:  ldc.i8     0xa4a263c316d21f4c
         IL_1308:  ldc.i8     0xa7ec1e6fda834b
-        IL_1311:  call       void JitTest.Test::testNumbers(int64,
+        IL_1311:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_1316:  ldc.i8     0x6ab14771c448666f
         IL_131f:  ldc.i8     0x5b0f49593c3a27
-        IL_1328:  call       void JitTest.Test::testNumbers(int64,
+        IL_1328:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_132d:  ldc.i8     0x15f392c3602aa4f7
         IL_1336:  ldc.i8     0x18af171045f88e
-        IL_133f:  call       void JitTest.Test::testNumbers(int64,
+        IL_133f:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_1344:  ldc.i8     0xf17de69c0063f62c
         IL_134d:  ldc.i8     0xee2a164c2c3a46f8
-        IL_1356:  call       void JitTest.Test::testNumbers(int64,
+        IL_1356:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_135b:  ldc.i8     0xf34b743eeff8e5c6
         IL_1364:  ldc.i8     0x4f4067f1a0e404ad
-        IL_136d:  call       void JitTest.Test::testNumbers(int64,
+        IL_136d:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_1372:  ldc.i8     0xee0296f678756647
         IL_137b:  ldc.i8     0xf1bbfdc6f0280d36
-        IL_1384:  call       void JitTest.Test::testNumbers(int64,
+        IL_1384:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_1389:  ldc.i8     0x65c33db0c952b829
         IL_1392:  ldc.i8     0xa7ab9c39dcffbcf3
-        IL_139b:  call       void JitTest.Test::testNumbers(int64,
+        IL_139b:  call       void JitTest_s_muldiv_signed_il.Test::testNumbers(int64,
                                                             int64)
         IL_13a0:  ldstr      "All tests passed."
         IL_13a5:  call       void [System.Console]System.Console::WriteLine(class System.String)
@@ -1569,6 +1569,6 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_s_muldiv_signed_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/int64/signed/s_muldiv_d.csproj b/src/tests/JIT/Methodical/int64/signed/s_muldiv_d.csproj
index 4d984f35a4c3d9..cca03ff987cc63 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_muldiv_d.csproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_muldiv_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/signed/s_muldiv_do.csproj b/src/tests/JIT/Methodical/int64/signed/s_muldiv_do.csproj
index 8d18d8d74a1756..3e99e95c66ef74 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_muldiv_do.csproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_muldiv_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/signed/s_muldiv_il_d.ilproj b/src/tests/JIT/Methodical/int64/signed/s_muldiv_il_d.ilproj
index 8c6fe2dc3e4d72..17b61f5e4b3b7b 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_muldiv_il_d.ilproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_muldiv_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/signed/s_muldiv_il_r.ilproj b/src/tests/JIT/Methodical/int64/signed/s_muldiv_il_r.ilproj
index 88550443b114a8..e382f9b10f6525 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_muldiv_il_r.ilproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_muldiv_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/signed/s_muldiv_r.csproj b/src/tests/JIT/Methodical/int64/signed/s_muldiv_r.csproj
index a5e380f268935e..c0b7bedb86a8ee 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_muldiv_r.csproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_muldiv_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/signed/s_muldiv_ro.csproj b/src/tests/JIT/Methodical/int64/signed/s_muldiv_ro.csproj
index 77bf555519bae2..5568112431089e 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_muldiv_ro.csproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_muldiv_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/superlong/superlong.cs b/src/tests/JIT/Methodical/int64/superlong/superlong.cs
index 6975ea92a2d468..3a6d7b2129d362 100644
--- a/src/tests/JIT/Methodical/int64/superlong/superlong.cs
+++ b/src/tests/JIT/Methodical/int64/superlong/superlong.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_superlong_cs
 {
-    internal struct superlong
+    public struct superlong
     {
         private ulong _lo,_hi;
 
@@ -30,7 +31,8 @@ private static superlong add(superlong op1, superlong op2)
             }
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             superlong v1;
             superlong v2;
diff --git a/src/tests/JIT/Methodical/int64/superlong/superlong.il b/src/tests/JIT/Methodical/int64/superlong/superlong.il
index 4ad606533bcdcf..818cc265ced005 100644
--- a/src/tests/JIT/Methodical/int64/superlong/superlong.il
+++ b/src/tests/JIT/Methodical/int64/superlong/superlong.il
@@ -18,55 +18,55 @@
 }
 .assembly extern xunit.core {}
 // MVID: {571950B7-63D3-4968-948F-25114244E0B8}
-.namespace JitTest
+.namespace JitTest_superlong_il
 {
-  .class value private auto ansi sealed superlong
+  .class value public auto ansi sealed superlong
          extends ['mscorlib']System.ValueType
   {
     .field private unsigned int64 lo
     .field private unsigned int64 hi
     .method private hidebysig instance void 
-            Assign(value class JitTest.superlong v) il managed
+            Assign(value class JitTest_superlong_il.superlong v) il managed
     {
       // Code size       27 (0x1b)
       .maxstack  9
       			ldarg.0
       			dup
       			ldarga.s   v
-      			ldfld      unsigned int64 JitTest.superlong::hi
-      			stfld      unsigned int64 JitTest.superlong::hi
+      			ldfld      unsigned int64 JitTest_superlong_il.superlong::hi
+      			stfld      unsigned int64 JitTest_superlong_il.superlong::hi
       			ldarga.s   v
-      			ldfld      unsigned int64 JitTest.superlong::lo
-      			stfld      unsigned int64 JitTest.superlong::lo
+      			ldfld      unsigned int64 JitTest_superlong_il.superlong::lo
+      			stfld      unsigned int64 JitTest_superlong_il.superlong::lo
       			ret
     } // end of method 'superlong::Assign'
 
-    .method private hidebysig static value class JitTest.superlong 
-            'add'(value class JitTest.superlong op1,
-                  value class JitTest.superlong op2) il managed
+    .method private hidebysig static value class JitTest_superlong_il.superlong 
+            'add'(value class JitTest_superlong_il.superlong op1,
+                  value class JitTest_superlong_il.superlong op2) il managed
     {
       // Code size       101 (0x65)
       .maxstack  3
-      .locals (value class JitTest.superlong V_0,
-               value class JitTest.superlong V_1)
+      .locals (value class JitTest_superlong_il.superlong V_0,
+               value class JitTest_superlong_il.superlong V_1)
       IL_0000:  ldloca.s   V_0
-      IL_0002:  initobj    JitTest.superlong
+      IL_0002:  initobj    JitTest_superlong_il.superlong
       IL_0008:  ldloca.s   V_0
       IL_000a:  ldarga.s   op1
-      IL_000c:  ldfld      unsigned int64 JitTest.superlong::hi
+      IL_000c:  ldfld      unsigned int64 JitTest_superlong_il.superlong::hi
       IL_0011:  ldarga.s   op2
-      IL_0013:  ldfld      unsigned int64 JitTest.superlong::hi
+      IL_0013:  ldfld      unsigned int64 JitTest_superlong_il.superlong::hi
       IL_0018:  add.ovf.un
-      IL_0019:  stfld      unsigned int64 JitTest.superlong::hi
+      IL_0019:  stfld      unsigned int64 JitTest_superlong_il.superlong::hi
       .try
       {
         IL_001e:  ldloca.s   V_0
         IL_0020:  ldarga.s   op1
-        IL_0022:  ldfld      unsigned int64 JitTest.superlong::lo
+        IL_0022:  ldfld      unsigned int64 JitTest_superlong_il.superlong::lo
         IL_0027:  ldarga.s   op2
-        IL_0029:  ldfld      unsigned int64 JitTest.superlong::lo
+        IL_0029:  ldfld      unsigned int64 JitTest_superlong_il.superlong::lo
         IL_002e:  add.ovf.un
-        IL_002f:  stfld      unsigned int64 JitTest.superlong::lo
+        IL_002f:  stfld      unsigned int64 JitTest_superlong_il.superlong::lo
         IL_0034:  leave.s    IL_005f
 
       }  // end .try
@@ -75,18 +75,18 @@
         IL_0036:  pop
         IL_0037:  ldloca.s   V_0
         IL_0039:  ldarga.s   op1
-        IL_003b:  ldfld      unsigned int64 JitTest.superlong::lo
+        IL_003b:  ldfld      unsigned int64 JitTest_superlong_il.superlong::lo
         IL_0040:  ldarga.s   op2
-        IL_0042:  ldfld      unsigned int64 JitTest.superlong::lo
+        IL_0042:  ldfld      unsigned int64 JitTest_superlong_il.superlong::lo
         IL_0047:  add
-        IL_0048:  stfld      unsigned int64 JitTest.superlong::lo
+        IL_0048:  stfld      unsigned int64 JitTest_superlong_il.superlong::lo
         IL_004d:  ldloca.s   V_0
         IL_004f:  dup
-        IL_0050:  ldfld      unsigned int64 JitTest.superlong::hi
+        IL_0050:  ldfld      unsigned int64 JitTest_superlong_il.superlong::hi
         IL_0055:  ldc.i4.1
         IL_0056:  conv.i8
         IL_0057:  add.ovf.un
-        IL_0058:  stfld      unsigned int64 JitTest.superlong::hi
+        IL_0058:  stfld      unsigned int64 JitTest_superlong_il.superlong::hi
         IL_005d:  leave.s    IL_005f
 
       }  // end handler
@@ -97,7 +97,7 @@
       IL_0064:  ret
     } // end of method 'superlong::add'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -106,41 +106,41 @@
       .entrypoint
       // Code size       305 (0x131)
       .maxstack  2
-      .locals (value class JitTest.superlong V_0,
-               value class JitTest.superlong V_1,
-               value class JitTest.superlong V_2,
+      .locals (value class JitTest_superlong_il.superlong V_0,
+               value class JitTest_superlong_il.superlong V_1,
+               value class JitTest_superlong_il.superlong V_2,
                int32 V_3)
       IL_0000:  ldloca.s   V_0
-      IL_0002:  initobj    JitTest.superlong
+      IL_0002:  initobj    JitTest_superlong_il.superlong
       IL_0008:  ldloca.s   V_1
-      IL_000a:  initobj    JitTest.superlong
+      IL_000a:  initobj    JitTest_superlong_il.superlong
       IL_0010:  ldloca.s   V_0
       IL_0012:  ldc.i8     0x8000000000000000
-      IL_001b:  stfld      unsigned int64 JitTest.superlong::hi
+      IL_001b:  stfld      unsigned int64 JitTest_superlong_il.superlong::hi
       IL_0020:  ldloca.s   V_0
       IL_0022:  ldc.i4.0
       IL_0023:  conv.i8
-      IL_0024:  stfld      unsigned int64 JitTest.superlong::lo
+      IL_0024:  stfld      unsigned int64 JitTest_superlong_il.superlong::lo
       IL_0029:  ldloca.s   V_1
       IL_002b:  ldc.i8     0x7fffffffffffffff
-      IL_0034:  stfld      unsigned int64 JitTest.superlong::hi
+      IL_0034:  stfld      unsigned int64 JitTest_superlong_il.superlong::hi
       IL_0039:  ldloca.s   V_1
       IL_003b:  ldc.i4.m1
       IL_003c:  conv.i8
-      IL_003d:  stfld      unsigned int64 JitTest.superlong::lo
+      IL_003d:  stfld      unsigned int64 JitTest_superlong_il.superlong::lo
       IL_0042:  ldloc.0
       IL_0043:  ldloc.1
-      IL_0044:  call       value class JitTest.superlong JitTest.superlong::'add'(value class JitTest.superlong,
-                                                                                  value class JitTest.superlong)
+      IL_0044:  call       value class JitTest_superlong_il.superlong JitTest_superlong_il.superlong::'add'(value class JitTest_superlong_il.superlong,
+                                                                                  value class JitTest_superlong_il.superlong)
       IL_0049:  stloc.2
       IL_004a:  ldloca.s   V_2
-      IL_004c:  ldfld      unsigned int64 JitTest.superlong::hi
+      IL_004c:  ldfld      unsigned int64 JitTest_superlong_il.superlong::hi
       IL_0051:  ldc.i4.m1
       IL_0052:  conv.i8
       IL_0053:  bne.un.s   IL_0060
 
       IL_0055:  ldloca.s   V_2
-      IL_0057:  ldfld      unsigned int64 JitTest.superlong::lo
+      IL_0057:  ldfld      unsigned int64 JitTest_superlong_il.superlong::lo
       IL_005c:  ldc.i4.m1
       IL_005d:  conv.i8
       IL_005e:  beq.s      IL_0071
@@ -153,20 +153,20 @@
 
       IL_0071:  ldloca.s   V_0
       IL_0073:  ldc.i8     0x8000000000000000
-      IL_007c:  stfld      unsigned int64 JitTest.superlong::hi
+      IL_007c:  stfld      unsigned int64 JitTest_superlong_il.superlong::hi
       IL_0081:  ldloca.s   V_0
       IL_0083:  ldc.i4.0
       IL_0084:  conv.i8
-      IL_0085:  stfld      unsigned int64 JitTest.superlong::lo
+      IL_0085:  stfld      unsigned int64 JitTest_superlong_il.superlong::lo
       IL_008a:  ldloca.s   V_1
       IL_008c:  ldloc.0
-      IL_008d:  call       instance void JitTest.superlong::Assign(value class JitTest.superlong)
+      IL_008d:  call       instance void JitTest_superlong_il.superlong::Assign(value class JitTest_superlong_il.superlong)
       .try
       {
         IL_0092:  ldloc.0
         IL_0093:  ldloc.1
-        IL_0094:  call       value class JitTest.superlong JitTest.superlong::'add'(value class JitTest.superlong,
-                                                                                    value class JitTest.superlong)
+        IL_0094:  call       value class JitTest_superlong_il.superlong JitTest_superlong_il.superlong::'add'(value class JitTest_superlong_il.superlong,
+                                                                                    value class JitTest_superlong_il.superlong)
         IL_0099:  stloc.2
         IL_009a:  leave      IL_0121
 
@@ -176,29 +176,29 @@
         IL_009f:  pop
         IL_00a0:  ldloca.s   V_0
         IL_00a2:  ldc.i8     0x1234567876543210
-        IL_00ab:  stfld      unsigned int64 JitTest.superlong::hi
+        IL_00ab:  stfld      unsigned int64 JitTest_superlong_il.superlong::hi
         IL_00b0:  ldloca.s   V_0
         IL_00b2:  ldc.i8     0xfdcba98789abcdef
-        IL_00bb:  stfld      unsigned int64 JitTest.superlong::lo
+        IL_00bb:  stfld      unsigned int64 JitTest_superlong_il.superlong::lo
         IL_00c0:  ldloca.s   V_1
         IL_00c2:  ldc.i8     0xedcba98789abcdee
-        IL_00cb:  stfld      unsigned int64 JitTest.superlong::hi
+        IL_00cb:  stfld      unsigned int64 JitTest_superlong_il.superlong::hi
         IL_00d0:  ldloca.s   V_1
         IL_00d2:  ldc.i8     0x1234567876543210
-        IL_00db:  stfld      unsigned int64 JitTest.superlong::lo
+        IL_00db:  stfld      unsigned int64 JitTest_superlong_il.superlong::lo
         IL_00e0:  ldloc.0
         IL_00e1:  ldloc.1
-        IL_00e2:  call       value class JitTest.superlong JitTest.superlong::'add'(value class JitTest.superlong,
-                                                                                    value class JitTest.superlong)
+        IL_00e2:  call       value class JitTest_superlong_il.superlong JitTest_superlong_il.superlong::'add'(value class JitTest_superlong_il.superlong,
+                                                                                    value class JitTest_superlong_il.superlong)
         IL_00e7:  stloc.2
         IL_00e8:  ldloca.s   V_2
-        IL_00ea:  ldfld      unsigned int64 JitTest.superlong::hi
+        IL_00ea:  ldfld      unsigned int64 JitTest_superlong_il.superlong::hi
         IL_00ef:  ldc.i4.m1
         IL_00f0:  conv.i8
         IL_00f1:  bne.un.s   IL_0105
 
         IL_00f3:  ldloca.s   V_2
-        IL_00f5:  ldfld      unsigned int64 JitTest.superlong::lo
+        IL_00f5:  ldfld      unsigned int64 JitTest_superlong_il.superlong::lo
         IL_00fa:  ldc.i8     0xfffffffffffffff
         IL_0103:  beq.s      IL_0113
 
@@ -227,6 +227,6 @@
 
   } // end of class 'superlong'
 
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_superlong_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/int64/superlong/superlong_d.csproj b/src/tests/JIT/Methodical/int64/superlong/superlong_d.csproj
index 58cf4bc388e0f7..0d52db667256e2 100644
--- a/src/tests/JIT/Methodical/int64/superlong/superlong_d.csproj
+++ b/src/tests/JIT/Methodical/int64/superlong/superlong_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/superlong/superlong_do.csproj b/src/tests/JIT/Methodical/int64/superlong/superlong_do.csproj
index ff5991bd15d6bb..689fd3a94b78be 100644
--- a/src/tests/JIT/Methodical/int64/superlong/superlong_do.csproj
+++ b/src/tests/JIT/Methodical/int64/superlong/superlong_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/superlong/superlong_il_d.ilproj b/src/tests/JIT/Methodical/int64/superlong/superlong_il_d.ilproj
index 8190639e9f8af0..332924c902cc5c 100644
--- a/src/tests/JIT/Methodical/int64/superlong/superlong_il_d.ilproj
+++ b/src/tests/JIT/Methodical/int64/superlong/superlong_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/superlong/superlong_il_r.ilproj b/src/tests/JIT/Methodical/int64/superlong/superlong_il_r.ilproj
index dd0d820fda51da..7257e415c8d269 100644
--- a/src/tests/JIT/Methodical/int64/superlong/superlong_il_r.ilproj
+++ b/src/tests/JIT/Methodical/int64/superlong/superlong_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/superlong/superlong_r.csproj b/src/tests/JIT/Methodical/int64/superlong/superlong_r.csproj
index d3439fb499d3ae..c820428455f1f4 100644
--- a/src/tests/JIT/Methodical/int64/superlong/superlong_r.csproj
+++ b/src/tests/JIT/Methodical/int64/superlong/superlong_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/superlong/superlong_ro.csproj b/src/tests/JIT/Methodical/int64/superlong/superlong_ro.csproj
index d1d846c5fe9608..3a4c1c4d91a3a3 100644
--- a/src/tests/JIT/Methodical/int64/superlong/superlong_ro.csproj
+++ b/src/tests/JIT/Methodical/int64/superlong/superlong_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/unsigned/addsub.cs b/src/tests/JIT/Methodical/int64/unsigned/addsub.cs
index 125183cdfc3601..9fd7a7fd8bd102 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/addsub.cs
+++ b/src/tests/JIT/Methodical/int64/unsigned/addsub.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_addsub_unsigned_cs
 {
-    internal class Test
+    public class Test
     {
         private static void testNumbers(ulong a, ulong b)
         {
@@ -46,7 +47,8 @@ private static void testNumbers(ulong a, ulong b)
                 throw new Exception();
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             try
             {
diff --git a/src/tests/JIT/Methodical/int64/unsigned/addsub.il b/src/tests/JIT/Methodical/int64/unsigned/addsub.il
index 0a7e4f62fa5e58..02dfe614dfec13 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/addsub.il
+++ b/src/tests/JIT/Methodical/int64/unsigned/addsub.il
@@ -18,9 +18,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {964B45BB-9F5B-4A2B-9ECD-E062E2FE8E23}
-.namespace JitTest
+.namespace JitTest_addsub_unsigned_il
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends ['mscorlib']System.Object
   {
     .method private hidebysig static void 
@@ -145,7 +145,7 @@
       IL_00a0:  ret
     } // end of method 'Test::testNumbers'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -161,1281 +161,1281 @@
         IL_0002:  conv.i8
         IL_0003:  ldc.i4     0xb8
         IL_0008:  conv.i8
-        IL_0009:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0009:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_000e:  ldc.i4.s   9
         IL_0010:  conv.i8
         IL_0011:  ldc.i4     0xf9
         IL_0016:  conv.i8
-        IL_0017:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0017:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_001c:  ldc.i4.s   110
         IL_001e:  conv.i8
         IL_001f:  ldc.i4     0x93
         IL_0024:  conv.i8
-        IL_0025:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0025:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_002a:  ldc.i4.s   30
         IL_002c:  conv.i8
         IL_002d:  ldc.i4     0x86
         IL_0032:  conv.i8
-        IL_0033:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0033:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0038:  ldc.i4     0xcc
         IL_003d:  conv.i8
         IL_003e:  ldc.i4     0x583f
         IL_0043:  conv.i8
-        IL_0044:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0044:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0049:  ldc.i4     0xc9
         IL_004e:  conv.i8
         IL_004f:  ldc.i4     0xa94c
         IL_0054:  conv.i8
-        IL_0055:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0055:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_005a:  ldc.i4.s   84
         IL_005c:  conv.i8
         IL_005d:  ldc.i4     0x2d06
         IL_0062:  conv.i8
-        IL_0063:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0063:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0068:  ldc.i4.s   48
         IL_006a:  conv.i8
         IL_006b:  ldc.i4     0x9921
         IL_0070:  conv.i8
-        IL_0071:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0071:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0076:  ldc.i4.s   29
         IL_0078:  conv.i8
         IL_0079:  ldc.i4     0x450842
         IL_007e:  conv.i8
-        IL_007f:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_007f:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0084:  ldc.i4.s   42
         IL_0086:  conv.i8
         IL_0087:  ldc.i4     0x999f6c
         IL_008c:  conv.i8
-        IL_008d:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_008d:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0092:  ldc.i4     0xc5
         IL_0097:  conv.i8
         IL_0098:  ldc.i4     0x90faa7
         IL_009d:  conv.i8
-        IL_009e:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_009e:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_00a3:  ldc.i4.s   80
         IL_00a5:  conv.i8
         IL_00a6:  ldc.i4     0x69de08
         IL_00ab:  conv.i8
-        IL_00ac:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_00ac:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_00b1:  ldc.i4     0x9a
         IL_00b6:  conv.i8
         IL_00b7:  ldc.i4     0xcd715be
         IL_00bc:  conv.i8
-        IL_00bd:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_00bd:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_00c2:  ldc.i4.s   57
         IL_00c4:  conv.i8
         IL_00c5:  ldc.i4     0x16a61eb5
         IL_00ca:  conv.i8
-        IL_00cb:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_00cb:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_00d0:  ldc.i4     0xe0
         IL_00d5:  conv.i8
         IL_00d6:  ldc.i4     0x95575fef
         IL_00db:  conv.u8
-        IL_00dc:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_00dc:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_00e1:  ldc.i4     0x93
         IL_00e6:  conv.i8
         IL_00e7:  ldc.i4     0x209e58c5
         IL_00ec:  conv.i8
-        IL_00ed:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_00ed:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_00f2:  ldc.i4.s   59
         IL_00f4:  conv.i8
         IL_00f5:  ldc.i8     0xc3c34b48c
-        IL_00fe:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_00fe:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0103:  ldc.i4     0xc2
         IL_0108:  conv.i8
         IL_0109:  ldc.i8     0x6a671c470f
-        IL_0112:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0112:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0117:  ldc.i4.s   75
         IL_0119:  conv.i8
         IL_011a:  ldc.i8     0xf538cede2b
-        IL_0123:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0123:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0128:  ldc.i4     0x99
         IL_012d:  conv.i8
         IL_012e:  ldc.i8     0x5ba885d43b
-        IL_0137:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0137:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_013c:  ldc.i4.s   104
         IL_013e:  conv.i8
         IL_013f:  ldc.i8     0x9f692f98ac45
-        IL_0148:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0148:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_014d:  ldc.i4     0xd9
         IL_0152:  conv.i8
         IL_0153:  ldc.i8     0x8d5eaa7f0a8e
-        IL_015c:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_015c:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0161:  ldc.i4     0xac
         IL_0166:  conv.i8
         IL_0167:  ldc.i8     0xba1316512e4c
-        IL_0170:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0170:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0175:  ldc.i4.s   28
         IL_0177:  conv.i8
         IL_0178:  ldc.i8     0x8c4fbf2f14aa
-        IL_0181:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0181:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0186:  ldc.i4     0xc0
         IL_018b:  conv.i8
         IL_018c:  ldc.i8     0x69a9eb9a9bc822
-        IL_0195:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0195:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_019a:  ldc.i4.s   116
         IL_019c:  conv.i8
         IL_019d:  ldc.i8     0x3f8f5a893de200
-        IL_01a6:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_01a6:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_01ab:  ldc.i4.s   39
         IL_01ad:  conv.i8
         IL_01ae:  ldc.i8     0x650eb1747a5bc
-        IL_01b7:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_01b7:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_01bc:  ldc.i4     0xd9
         IL_01c1:  conv.i8
         IL_01c2:  ldc.i8     0xd3d50809c70fda
-        IL_01cb:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_01cb:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_01d0:  ldc.i4     0xc0
         IL_01d5:  conv.i8
         IL_01d6:  ldc.i8     0xac6556a4ca94513e
-        IL_01df:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_01df:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_01e4:  ldc.i4.s   32
         IL_01e6:  conv.i8
         IL_01e7:  ldc.i8     0xa697fcbfd6d232d1
-        IL_01f0:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_01f0:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_01f5:  ldc.i4     0x9c
         IL_01fa:  conv.i8
         IL_01fb:  ldc.i8     0xc4421a4f5147b9b8
-        IL_0204:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0204:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0209:  ldc.i4     0x9e
         IL_020e:  conv.i8
         IL_020f:  ldc.i8     0xc5ef494112a7b33f
-        IL_0218:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0218:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_021d:  ldc.i4     0xf7fa
         IL_0222:  conv.i8
         IL_0223:  ldc.i4     0xaf
         IL_0228:  conv.i8
-        IL_0229:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0229:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_022e:  ldc.i4     0xad17
         IL_0233:  conv.i8
         IL_0234:  ldc.i4     0xe8
         IL_0239:  conv.i8
-        IL_023a:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_023a:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_023f:  ldc.i4     0xc9c4
         IL_0244:  conv.i8
         IL_0245:  ldc.i4.s   69
         IL_0247:  conv.i8
-        IL_0248:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0248:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_024d:  ldc.i4     0xa704
         IL_0252:  conv.i8
         IL_0253:  ldc.i4.s   18
         IL_0255:  conv.i8
-        IL_0256:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0256:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_025b:  ldc.i4     0xc55b
         IL_0260:  conv.i8
         IL_0261:  ldc.i4     0xa33a
         IL_0266:  conv.i8
-        IL_0267:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0267:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_026c:  ldc.i4     0xab88
         IL_0271:  conv.i8
         IL_0272:  ldc.i4     0x9a3c
         IL_0277:  conv.i8
-        IL_0278:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0278:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_027d:  ldc.i4     0xa539
         IL_0282:  conv.i8
         IL_0283:  ldc.i4     0xcf3a
         IL_0288:  conv.i8
-        IL_0289:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0289:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_028e:  ldc.i4     0x5890
         IL_0293:  conv.i8
         IL_0294:  ldc.i4     0xeec8
         IL_0299:  conv.i8
-        IL_029a:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_029a:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_029f:  ldc.i4     0xe9e2
         IL_02a4:  conv.i8
         IL_02a5:  ldc.i4     0xfe7c46
         IL_02aa:  conv.i8
-        IL_02ab:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_02ab:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_02b0:  ldc.i4     0x7303
         IL_02b5:  conv.i8
         IL_02b6:  ldc.i4     0x419f2a
         IL_02bb:  conv.i8
-        IL_02bc:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_02bc:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_02c1:  ldc.i4     0xe105
         IL_02c6:  conv.i8
         IL_02c7:  ldc.i4     0x13f913
         IL_02cc:  conv.i8
-        IL_02cd:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_02cd:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_02d2:  ldc.i4     0x8191
         IL_02d7:  conv.i8
         IL_02d8:  ldc.i4     0xfa2458
         IL_02dd:  conv.i8
-        IL_02de:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_02de:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_02e3:  ldc.i4     0x6d9
         IL_02e8:  conv.i8
         IL_02e9:  ldc.i4     0x91cf14f7
         IL_02ee:  conv.u8
-        IL_02ef:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_02ef:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_02f4:  ldc.i4     0xbdb1
         IL_02f9:  conv.i8
         IL_02fa:  ldc.i4     0x86c2a97c
         IL_02ff:  conv.u8
-        IL_0300:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0300:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0305:  ldc.i4     0xe905
         IL_030a:  conv.i8
         IL_030b:  ldc.i4     0x64f702f4
         IL_0310:  conv.i8
-        IL_0311:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0311:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0316:  ldc.i4     0x2fdc
         IL_031b:  conv.i8
         IL_031c:  ldc.i4     0xf059caf6
         IL_0321:  conv.u8
-        IL_0322:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0322:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0327:  ldc.i4     0xf8fd
         IL_032c:  conv.i8
         IL_032d:  ldc.i8     0x13f0265b1e
-        IL_0336:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0336:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_033b:  ldc.i4     0xe8b8
         IL_0340:  conv.i8
         IL_0341:  ldc.i8     0xaa69a6308
-        IL_034a:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_034a:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_034f:  ldc.i4     0x3d00
         IL_0354:  conv.i8
         IL_0355:  ldc.i8     0xfbcb67879b
-        IL_035e:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_035e:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0363:  ldc.i4     0xaa46
         IL_0368:  conv.i8
         IL_0369:  ldc.i8     0x85c3d371d5
-        IL_0372:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0372:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0377:  ldc.i4     0x5f60
         IL_037c:  conv.i8
         IL_037d:  ldc.i8     0x8cde4a63203
-        IL_0386:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0386:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_038b:  ldc.i4     0x92b5
         IL_0390:  conv.i8
         IL_0391:  ldc.i8     0x7ca86ba2f30e
-        IL_039a:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_039a:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_039f:  ldc.i4     0x93c6
         IL_03a4:  conv.i8
         IL_03a5:  ldc.i8     0xa2d73fc4eac0
-        IL_03ae:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_03ae:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_03b3:  ldc.i4     0x4156
         IL_03b8:  conv.i8
         IL_03b9:  ldc.i8     0x6dbd08f2fda
-        IL_03c2:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_03c2:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_03c7:  ldc.i4     0x4597
         IL_03cc:  conv.i8
         IL_03cd:  ldc.i8     0x6cfb0ba5962826
-        IL_03d6:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_03d6:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_03db:  ldc.i4     0x6bac
         IL_03e0:  conv.i8
         IL_03e1:  ldc.i8     0x1e79315071480f
-        IL_03ea:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_03ea:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_03ef:  ldc.i4     0x2c3a
         IL_03f4:  conv.i8
         IL_03f5:  ldc.i8     0x92f12cbd82df69
-        IL_03fe:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_03fe:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0403:  ldc.i4     0x9859
         IL_0408:  conv.i8
         IL_0409:  ldc.i8     0xb0f0cd9dc019f2
-        IL_0412:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0412:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0417:  ldc.i4     0xb37f
         IL_041c:  conv.i8
         IL_041d:  ldc.i8     0x4966447d15850076
-        IL_0426:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0426:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_042b:  ldc.i4     0x5e34
         IL_0430:  conv.i8
         IL_0431:  ldc.i8     0x7c1869c9ed2cad38
-        IL_043a:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_043a:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_043f:  ldc.i4     0x5c54
         IL_0444:  conv.i8
         IL_0445:  ldc.i8     0x7cee70ee82837a08
-        IL_044e:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_044e:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0453:  ldc.i4     0x967f
         IL_0458:  conv.i8
         IL_0459:  ldc.i8     0x4eb98adf4b8b0d32
-        IL_0462:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0462:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0467:  ldc.i4     0xfd2919
         IL_046c:  conv.i8
         IL_046d:  ldc.i4.s   93
         IL_046f:  conv.i8
-        IL_0470:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0470:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0475:  ldc.i4     0xabd5b1
         IL_047a:  conv.i8
         IL_047b:  ldc.i4     0x98
         IL_0480:  conv.i8
-        IL_0481:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0481:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0486:  ldc.i4     0xab1887
         IL_048b:  conv.i8
         IL_048c:  ldc.i4     0xef
         IL_0491:  conv.i8
-        IL_0492:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0492:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0497:  ldc.i4     0x96034a
         IL_049c:  conv.i8
         IL_049d:  ldc.i4.s   47
         IL_049f:  conv.i8
-        IL_04a0:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_04a0:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_04a5:  ldc.i4     0xd5bb94
         IL_04aa:  conv.i8
         IL_04ab:  ldc.i4     0x57d2
         IL_04b0:  conv.i8
-        IL_04b1:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_04b1:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_04b6:  ldc.i4     0xd7b2cb
         IL_04bb:  conv.i8
         IL_04bc:  ldc.i4     0x80f5
         IL_04c1:  conv.i8
-        IL_04c2:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_04c2:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_04c7:  ldc.i4     0x4ccc6d
         IL_04cc:  conv.i8
         IL_04cd:  ldc.i4     0x87c
         IL_04d2:  conv.i8
-        IL_04d3:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_04d3:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_04d8:  ldc.i4     0xec0c50
         IL_04dd:  conv.i8
         IL_04de:  ldc.i4     0xbdff
         IL_04e3:  conv.i8
-        IL_04e4:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_04e4:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_04e9:  ldc.i4     0x8a6865
         IL_04ee:  conv.i8
         IL_04ef:  ldc.i4     0x76c014
         IL_04f4:  conv.i8
-        IL_04f5:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_04f5:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_04fa:  ldc.i4     0xac38dd
         IL_04ff:  conv.i8
         IL_0500:  ldc.i4     0xf12b09
         IL_0505:  conv.i8
-        IL_0506:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0506:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_050b:  ldc.i4     0x615e2a
         IL_0510:  conv.i8
         IL_0511:  ldc.i4     0xe7cbf8
         IL_0516:  conv.i8
-        IL_0517:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0517:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_051c:  ldc.i4     0xe214f
         IL_0521:  conv.i8
         IL_0522:  ldc.i4     0x5b8e2f
         IL_0527:  conv.i8
-        IL_0528:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0528:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_052d:  ldc.i4     0x3bd7c6
         IL_0532:  conv.i8
         IL_0533:  ldc.i4     0xc1db4e46
         IL_0538:  conv.u8
-        IL_0539:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0539:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_053e:  ldc.i4     0xae208d
         IL_0543:  conv.i8
         IL_0544:  ldc.i4     0x1c9aa7a
         IL_0549:  conv.i8
-        IL_054a:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_054a:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_054f:  ldc.i4     0x8a9cef
         IL_0554:  conv.i8
         IL_0555:  ldc.i4     0x3930b07
         IL_055a:  conv.i8
-        IL_055b:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_055b:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0560:  ldc.i4     0x36b866
         IL_0565:  conv.i8
         IL_0566:  ldc.i4     0xd64b7bef
         IL_056b:  conv.u8
-        IL_056c:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_056c:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0571:  ldc.i4     0xd337cd
         IL_0576:  conv.i8
         IL_0577:  ldc.i8     0xa2b45fb7de
-        IL_0580:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0580:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0585:  ldc.i4     0x24471
         IL_058a:  conv.i8
         IL_058b:  ldc.i8     0x5c5de3da89
-        IL_0594:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0594:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0599:  ldc.i4     0x12b15
         IL_059e:  conv.i8
         IL_059f:  ldc.i8     0x7cd40030fe
-        IL_05a8:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_05a8:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_05ad:  ldc.i4     0xd38af2
         IL_05b2:  conv.i8
         IL_05b3:  ldc.i8     0x5905921572
-        IL_05bc:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_05bc:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_05c1:  ldc.i4     0xaca0d7
         IL_05c6:  conv.i8
         IL_05c7:  ldc.i8     0xc632301abeb8
-        IL_05d0:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_05d0:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_05d5:  ldc.i4     0x4eadc2
         IL_05da:  conv.i8
         IL_05db:  ldc.i8     0x6a1ebf37403c
-        IL_05e4:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_05e4:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_05e9:  ldc.i4     0x5d909c
         IL_05ee:  conv.i8
         IL_05ef:  ldc.i8     0x4021bfa15862
-        IL_05f8:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_05f8:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_05fd:  ldc.i4     0x710e08
         IL_0602:  conv.i8
         IL_0603:  ldc.i8     0xe9a1a030b230
-        IL_060c:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_060c:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0611:  ldc.i4     0x478b9b
         IL_0616:  conv.i8
         IL_0617:  ldc.i8     0x804add8afc31d9
-        IL_0620:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0620:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0625:  ldc.i4     0x5754ed
         IL_062a:  conv.i8
         IL_062b:  ldc.i8     0xaf85e7ebb1ce33
-        IL_0634:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0634:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0639:  ldc.i4     0x3ab44e
         IL_063e:  conv.i8
         IL_063f:  ldc.i8     0xf41b9f70360f78
-        IL_0648:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0648:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_064d:  ldc.i4     0x7aa129
         IL_0652:  conv.i8
         IL_0653:  ldc.i8     0xeb6e4eddf7eb87
-        IL_065c:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_065c:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0661:  ldc.i4     0x3b036f
         IL_0666:  conv.i8
         IL_0667:  ldc.i8     0x333874e4330fbfa4
-        IL_0670:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0670:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0675:  ldc.i4     0xa33186
         IL_067a:  conv.i8
         IL_067b:  ldc.i8     0xec8607412503fc4c
-        IL_0684:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0684:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0689:  ldc.i4     0x9af471
         IL_068e:  conv.i8
         IL_068f:  ldc.i8     0xe7ad0935fdbff151
-        IL_0698:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0698:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_069d:  ldc.i4     0xc04e8c
         IL_06a2:  conv.i8
         IL_06a3:  ldc.i8     0x58ee406ab936ac24
-        IL_06ac:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_06ac:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_06b1:  ldc.i4     0x54fdd28b
         IL_06b6:  conv.i8
         IL_06b7:  ldc.i4.s   52
         IL_06b9:  conv.i8
-        IL_06ba:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_06ba:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_06bf:  ldc.i4     0x33736b36
         IL_06c4:  conv.i8
         IL_06c5:  ldc.i4     0xfd
         IL_06ca:  conv.i8
-        IL_06cb:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_06cb:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_06d0:  ldc.i4     0x69cfe4b7
         IL_06d5:  conv.i8
         IL_06d6:  ldc.i4.s   38
         IL_06d8:  conv.i8
-        IL_06d9:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_06d9:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_06de:  ldc.i4     0xfd078d36
         IL_06e3:  conv.u8
         IL_06e4:  ldc.i4     0xdc
         IL_06e9:  conv.i8
-        IL_06ea:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_06ea:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_06ef:  ldc.i4     0x75cc3f36
         IL_06f4:  conv.i8
         IL_06f5:  ldc.i4     0x1617
         IL_06fa:  conv.i8
-        IL_06fb:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_06fb:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0700:  ldc.i4     0x75d660e
         IL_0705:  conv.i8
         IL_0706:  ldc.i4     0x8511
         IL_070b:  conv.i8
-        IL_070c:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_070c:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0711:  ldc.i4     0x52acb037
         IL_0716:  conv.i8
         IL_0717:  ldc.i4     0x43cb
         IL_071c:  conv.i8
-        IL_071d:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_071d:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0722:  ldc.i4     0xa0db7bf5
         IL_0727:  conv.u8
         IL_0728:  ldc.i4     0x2c98
         IL_072d:  conv.i8
-        IL_072e:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_072e:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0733:  ldc.i4     0x83d4be11
         IL_0738:  conv.u8
         IL_0739:  ldc.i4     0xba37c9
         IL_073e:  conv.i8
-        IL_073f:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_073f:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0744:  ldc.i4     0x83d04f94
         IL_0749:  conv.u8
         IL_074a:  ldc.i4     0x3ddbd0
         IL_074f:  conv.i8
-        IL_0750:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0750:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0755:  ldc.i4     0x5ed41f6a
         IL_075a:  conv.i8
         IL_075b:  ldc.i4     0xeaf1d5
         IL_0760:  conv.i8
-        IL_0761:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0761:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0766:  ldc.i4     0xe364a9a
         IL_076b:  conv.i8
         IL_076c:  ldc.i4     0x85880c
         IL_0771:  conv.i8
-        IL_0772:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0772:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0777:  ldc.i4     0x12657ecb
         IL_077c:  conv.i8
         IL_077d:  ldc.i4     0xa88b8a68
         IL_0782:  conv.u8
-        IL_0783:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0783:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0788:  ldc.i4     0x9897a4ac
         IL_078d:  conv.u8
         IL_078e:  ldc.i4     0x76707981
         IL_0793:  conv.i8
-        IL_0794:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0794:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0799:  ldc.i4     0x469cd1cf
         IL_079e:  conv.i8
         IL_079f:  ldc.i4     0xcf40f67a
         IL_07a4:  conv.u8
-        IL_07a5:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_07a5:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_07aa:  ldc.i4     0xee7444c8
         IL_07af:  conv.u8
         IL_07b0:  ldc.i4     0xd1b0d7de
         IL_07b5:  conv.u8
-        IL_07b6:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_07b6:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_07bb:  ldc.i4     0xfbb6f547
         IL_07c0:  conv.u8
         IL_07c1:  ldc.i8     0xc1ef3c4d9b
-        IL_07ca:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_07ca:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_07cf:  ldc.i4     0xe20dd53
         IL_07d4:  conv.i8
         IL_07d5:  ldc.i8     0xb05833c7cf
-        IL_07de:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_07de:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_07e3:  ldc.i4     0xe5733fb8
         IL_07e8:  conv.u8
         IL_07e9:  ldc.i8     0x8eae18a855
-        IL_07f2:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_07f2:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_07f7:  ldc.i4     0x5db1c271
         IL_07fc:  conv.i8
         IL_07fd:  ldc.i8     0xc4a2f7c27d
-        IL_0806:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0806:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_080b:  ldc.i4     0x7add22a
         IL_0810:  conv.i8
         IL_0811:  ldc.i8     0xed9fd23dc3e
-        IL_081a:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_081a:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_081f:  ldc.i4     0x2239d1d5
         IL_0824:  conv.i8
         IL_0825:  ldc.i8     0xa1ae07a62635
-        IL_082e:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_082e:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0833:  ldc.i4     0x410d4d58
         IL_0838:  conv.i8
         IL_0839:  ldc.i8     0xc05c5205bed2
-        IL_0842:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0842:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0847:  ldc.i4     0x4c3c435e
         IL_084c:  conv.i8
         IL_084d:  ldc.i8     0x1e30c1bf628a
-        IL_0856:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0856:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_085b:  ldc.i4     0x96f44d5
         IL_0860:  conv.i8
         IL_0861:  ldc.i8     0x5488c521a6072b
-        IL_086a:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_086a:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_086f:  ldc.i4     0x17f28913
         IL_0874:  conv.i8
         IL_0875:  ldc.i8     0x796ff3891c44ff
-        IL_087e:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_087e:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0883:  ldc.i4     0x65be69cf
         IL_0888:  conv.i8
         IL_0889:  ldc.i8     0xdd5c6f9b3f3119
-        IL_0892:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0892:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0897:  ldc.i4     0x2200f221
         IL_089c:  conv.i8
         IL_089d:  ldc.i8     0xab6c98c90cfe9d
-        IL_08a6:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_08a6:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_08ab:  ldc.i4     0xd48bee1a
         IL_08b0:  conv.u8
         IL_08b1:  ldc.i8     0x64b76d7491a58799
-        IL_08ba:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_08ba:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_08bf:  ldc.i4     0x6cb93100
         IL_08c4:  conv.i8
         IL_08c5:  ldc.i8     0xa515fe27402dad45
-        IL_08ce:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_08ce:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_08d3:  ldc.i4     0xbed95abe
         IL_08d8:  conv.u8
         IL_08d9:  ldc.i8     0xc9924098acc74be9
-        IL_08e2:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_08e2:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_08e7:  ldc.i4     0x92781a2e
         IL_08ec:  conv.u8
         IL_08ed:  ldc.i8     0x67ada9ef3f9e39b7
-        IL_08f6:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_08f6:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_08fb:  ldc.i8     0xe3aafcdae2
         IL_0904:  ldc.i4     0x9c
         IL_0909:  conv.i8
-        IL_090a:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_090a:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_090f:  ldc.i8     0xd8dad80c34
         IL_0918:  ldc.i4     0x99
         IL_091d:  conv.i8
-        IL_091e:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_091e:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0923:  ldc.i8     0xaddcd074d6
         IL_092c:  ldc.i4     0xea
         IL_0931:  conv.i8
-        IL_0932:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0932:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0937:  ldc.i8     0x96735bc25a
         IL_0940:  ldc.i4     0xba
         IL_0945:  conv.i8
-        IL_0946:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0946:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_094b:  ldc.i8     0xf492ef7446
         IL_0954:  ldc.i4     0x39b1
         IL_0959:  conv.i8
-        IL_095a:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_095a:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_095f:  ldc.i8     0xbc86816119
         IL_0968:  ldc.i4     0x1520
         IL_096d:  conv.i8
-        IL_096e:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_096e:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0973:  ldc.i8     0x60a36818e7
         IL_097c:  ldc.i4     0xc5a8
         IL_0981:  conv.i8
-        IL_0982:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0982:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0987:  ldc.i8     0x317121d508
         IL_0990:  ldc.i4     0xac3d
         IL_0995:  conv.i8
-        IL_0996:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0996:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_099b:  ldc.i8     0x4abfdaf232
         IL_09a4:  ldc.i4     0x5cea57
         IL_09a9:  conv.i8
-        IL_09aa:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_09aa:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_09af:  ldc.i8     0xacc458f392
         IL_09b8:  ldc.i4     0xa9c3e3
         IL_09bd:  conv.i8
-        IL_09be:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_09be:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_09c3:  ldc.i8     0x1020993532
         IL_09cc:  ldc.i4     0xdf6042
         IL_09d1:  conv.i8
-        IL_09d2:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_09d2:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_09d7:  ldc.i8     0xad25b80abb
         IL_09e0:  ldc.i4     0xcec15b
         IL_09e5:  conv.i8
-        IL_09e6:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_09e6:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_09eb:  ldc.i8     0x2305d2c443
         IL_09f4:  ldc.i4     0x2a26131c
         IL_09f9:  conv.i8
-        IL_09fa:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_09fa:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_09ff:  ldc.i8     0x7c42e2ce0
         IL_0a08:  ldc.i4     0x9768024f
         IL_0a0d:  conv.u8
-        IL_0a0e:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0a0e:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0a13:  ldc.i8     0x76f674816c
         IL_0a1c:  ldc.i4     0x8d33c7b4
         IL_0a21:  conv.u8
-        IL_0a22:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0a22:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0a27:  ldc.i8     0xbf567b23bc
         IL_0a30:  ldc.i4     0xef264890
         IL_0a35:  conv.u8
-        IL_0a36:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0a36:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0a3b:  ldc.i8     0xe3283681a0
         IL_0a44:  ldc.i8     0x2e66850719
-        IL_0a4d:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0a4d:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0a52:  ldc.i8     0x11fe13754
         IL_0a5b:  ldc.i8     0x66fad0b407
-        IL_0a64:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0a64:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0a69:  ldc.i8     0x52f259009f
         IL_0a72:  ldc.i8     0xa2886ef414
-        IL_0a7b:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0a7b:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0a80:  ldc.i8     0xa9ebb540fc
         IL_0a89:  ldc.i8     0x9d27ba694f
-        IL_0a92:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0a92:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0a97:  ldc.i8     0x83af60d7eb
         IL_0aa0:  ldc.i8     0xb6f2a0f51f4c
-        IL_0aa9:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0aa9:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0aae:  ldc.i8     0xf2ec42d13a
         IL_0ab7:  ldc.i8     0x46855f279407
-        IL_0ac0:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0ac0:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0ac5:  ldc.i8     0x94e71cb562
         IL_0ace:  ldc.i8     0x2d9566618e56
-        IL_0ad7:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0ad7:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0adc:  ldc.i8     0xc0ee690ddc
         IL_0ae5:  ldc.i8     0x54295c8ca584
-        IL_0aee:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0aee:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0af3:  ldc.i8     0x2683cd5206
         IL_0afc:  ldc.i8     0xa5a2d269bcd188
-        IL_0b05:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0b05:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0b0a:  ldc.i8     0x2e77038305
         IL_0b13:  ldc.i8     0xc727f0f3787e22
-        IL_0b1c:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0b1c:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0b21:  ldc.i8     0x8323b9d026
         IL_0b2a:  ldc.i8     0xfed29f8575c120
-        IL_0b33:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0b33:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0b38:  ldc.i8     0x7b3231f0fc
         IL_0b41:  ldc.i8     0x91080854b27d3e
-        IL_0b4a:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0b4a:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0b4f:  ldc.i8     0x84522a7708
         IL_0b58:  ldc.i8     0x91ba8f22fccd6222
-        IL_0b61:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0b61:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0b66:  ldc.i8     0xafb1b50d90
         IL_0b6f:  ldc.i8     0x3261a532b65c7838
-        IL_0b78:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0b78:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0b7d:  ldc.i8     0x2c65e838c6
         IL_0b86:  ldc.i8     0x5b858452c9bf6f39
-        IL_0b8f:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0b8f:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0b94:  ldc.i8     0x219e837734
         IL_0b9d:  ldc.i8     0x97873bed5bb0a44b
-        IL_0ba6:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0ba6:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0bab:  ldc.i8     0x9f133e2f116f
         IL_0bb4:  ldc.i4.s   115
         IL_0bb6:  conv.i8
-        IL_0bb7:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0bb7:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0bbc:  ldc.i8     0x887577574766
         IL_0bc5:  ldc.i4.s   72
         IL_0bc7:  conv.i8
-        IL_0bc8:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0bc8:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0bcd:  ldc.i8     0xba4c778d4aa8
         IL_0bd6:  ldc.i4.s   58
         IL_0bd8:  conv.i8
-        IL_0bd9:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0bd9:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0bde:  ldc.i8     0x2683df421474
         IL_0be7:  ldc.i4.s   86
         IL_0be9:  conv.i8
-        IL_0bea:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0bea:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0bef:  ldc.i8     0x6ff76294c275
         IL_0bf8:  ldc.i4     0x89f7
         IL_0bfd:  conv.i8
-        IL_0bfe:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0bfe:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0c03:  ldc.i8     0xfdf053abefa2
         IL_0c0c:  ldc.i4     0xeb65
         IL_0c11:  conv.i8
-        IL_0c12:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0c12:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0c17:  ldc.i8     0xea4b254b24eb
         IL_0c20:  ldc.i4     0xba27
         IL_0c25:  conv.i8
-        IL_0c26:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0c26:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0c2b:  ldc.i8     0x9f7ce21b811
         IL_0c34:  ldc.i4     0xe8f6
         IL_0c39:  conv.i8
-        IL_0c3a:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0c3a:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0c3f:  ldc.i8     0x9cc645fa08a1
         IL_0c48:  ldc.i4     0xa29ea3
         IL_0c4d:  conv.i8
-        IL_0c4e:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0c4e:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0c53:  ldc.i8     0x726f9a9f816e
         IL_0c5c:  ldc.i4     0x70dce1
         IL_0c61:  conv.i8
-        IL_0c62:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0c62:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0c67:  ldc.i8     0xa4be34825ef6
         IL_0c70:  ldc.i4     0xbb2be7
         IL_0c75:  conv.i8
-        IL_0c76:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0c76:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0c7b:  ldc.i8     0x57ff147cb7c1
         IL_0c84:  ldc.i4     0xe255af
         IL_0c89:  conv.i8
-        IL_0c8a:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0c8a:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0c8f:  ldc.i8     0xab9d6f546dd4
         IL_0c98:  ldc.i4     0x7e2772a5
         IL_0c9d:  conv.i8
-        IL_0c9e:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0c9e:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0ca3:  ldc.i8     0xb148e3446e89
         IL_0cac:  ldc.i4     0x51ed3c28
         IL_0cb1:  conv.i8
-        IL_0cb2:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0cb2:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0cb7:  ldc.i8     0x1e3abfe9725e
         IL_0cc0:  ldc.i4     0xd4dec3f4
         IL_0cc5:  conv.u8
-        IL_0cc6:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0cc6:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0ccb:  ldc.i8     0xf61bcaba115e
         IL_0cd4:  ldc.i4     0xfade149f
         IL_0cd9:  conv.u8
-        IL_0cda:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0cda:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0cdf:  ldc.i8     0xae642b9a6626
         IL_0ce8:  ldc.i8     0xd8de0e0b9a
-        IL_0cf1:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0cf1:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0cf6:  ldc.i8     0x9d015a13c8ae
         IL_0cff:  ldc.i8     0xafc8827997
-        IL_0d08:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0d08:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0d0d:  ldc.i8     0xecc72cc2df89
         IL_0d16:  ldc.i8     0x70d47ec7c4
-        IL_0d1f:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0d1f:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0d24:  ldc.i8     0xfdbf05894fd2
         IL_0d2d:  ldc.i8     0x12aec393bd
-        IL_0d36:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0d36:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0d3b:  ldc.i8     0xcd7675a70874
         IL_0d44:  ldc.i8     0xd7d696a62cbc
-        IL_0d4d:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0d4d:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0d52:  ldc.i8     0xfad44a89216d
         IL_0d5b:  ldc.i8     0xcb8cfc8ada4c
-        IL_0d64:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0d64:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0d69:  ldc.i8     0xf41eb5363551
         IL_0d72:  ldc.i8     0x9c040aa7775e
-        IL_0d7b:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0d7b:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0d80:  ldc.i8     0x3c02d93e01f6
         IL_0d89:  ldc.i8     0xf1f4e68a14f8
-        IL_0d92:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0d92:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0d97:  ldc.i8     0xe0d99954b598
         IL_0da0:  ldc.i8     0xb2a2de4e453485
-        IL_0da9:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0da9:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0dae:  ldc.i8     0xa6081be866d9
         IL_0db7:  ldc.i8     0xf2a12e845e4f2e
-        IL_0dc0:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0dc0:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0dc5:  ldc.i8     0xae56a5680dfd
         IL_0dce:  ldc.i8     0xc96cd7c15d5bec
-        IL_0dd7:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0dd7:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0ddc:  ldc.i8     0x360363e37938
         IL_0de5:  ldc.i8     0xd4ed572e1937e0
-        IL_0dee:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0dee:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0df3:  ldc.i8     0x1f052aebf185
         IL_0dfc:  ldc.i8     0x3584e582d1c6db1a
-        IL_0e05:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0e05:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0e0a:  ldc.i8     0x3fac9c7b3d1b
         IL_0e13:  ldc.i8     0xa4b120f080d69113
-        IL_0e1c:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0e1c:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0e21:  ldc.i8     0x5330d51c3217
         IL_0e2a:  ldc.i8     0xc16dd32ffd822c0e
-        IL_0e33:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0e33:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0e38:  ldc.i8     0xcd0694ff5ab0
         IL_0e41:  ldc.i8     0x29673fe67245fbfc
-        IL_0e4a:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0e4a:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0e4f:  ldc.i8     0x98265e5a308523
         IL_0e58:  ldc.i4.s   125
         IL_0e5a:  conv.i8
-        IL_0e5b:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0e5b:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0e60:  ldc.i8     0x560863350df217
         IL_0e69:  ldc.i4     0xc8
         IL_0e6e:  conv.i8
-        IL_0e6f:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0e6f:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0e74:  ldc.i8     0x798ce804d829a1
         IL_0e7d:  ldc.i4     0xb1
         IL_0e82:  conv.i8
-        IL_0e83:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0e83:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0e88:  ldc.i8     0x7994c0051256fd
         IL_0e91:  ldc.i4.s   92
         IL_0e93:  conv.i8
-        IL_0e94:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0e94:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0e99:  ldc.i8     0xff1a2838e69f42
         IL_0ea2:  ldc.i4     0x3c16
         IL_0ea7:  conv.i8
-        IL_0ea8:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0ea8:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0ead:  ldc.i8     0x9e7e95ac5de2c7
         IL_0eb6:  ldc.i4     0xed49
         IL_0ebb:  conv.i8
-        IL_0ebc:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0ebc:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0ec1:  ldc.i8     0xfd6867eabba5c0
         IL_0eca:  ldc.i4     0xc689
         IL_0ecf:  conv.i8
-        IL_0ed0:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0ed0:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0ed5:  ldc.i8     0x9d1632daf20de0
         IL_0ede:  ldc.i4     0xb74f
         IL_0ee3:  conv.i8
-        IL_0ee4:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0ee4:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0ee9:  ldc.i8     0xee29d8f76d4e9c
         IL_0ef2:  ldc.i4     0x8020d4
         IL_0ef7:  conv.i8
-        IL_0ef8:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0ef8:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0efd:  ldc.i8     0x89e03ecf8daa0a
         IL_0f06:  ldc.i4     0x3e7587
         IL_0f0b:  conv.i8
-        IL_0f0c:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0f0c:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0f11:  ldc.i8     0x115763be4beb44
         IL_0f1a:  ldc.i4     0x88f762
         IL_0f1f:  conv.i8
-        IL_0f20:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0f20:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0f25:  ldc.i8     0x815cfc87c427d0
         IL_0f2e:  ldc.i4     0x9eec06
         IL_0f33:  conv.i8
-        IL_0f34:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0f34:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0f39:  ldc.i8     0x1d9c3c9ded0c1a
         IL_0f42:  ldc.i4     0xb9f6d331
         IL_0f47:  conv.u8
-        IL_0f48:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0f48:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0f4d:  ldc.i8     0x932225412f1222
         IL_0f56:  ldc.i4     0x130ff743
         IL_0f5b:  conv.i8
-        IL_0f5c:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0f5c:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0f61:  ldc.i8     0xfe82151e2e0bf3
         IL_0f6a:  ldc.i4     0x781cd6f9
         IL_0f6f:  conv.i8
-        IL_0f70:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0f70:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0f75:  ldc.i8     0x2222abb5061b12
         IL_0f7e:  ldc.i4     0x491f1df
         IL_0f83:  conv.i8
-        IL_0f84:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0f84:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0f89:  ldc.i8     0x12ce0cf0452748
         IL_0f92:  ldc.i8     0xa8566274aa
-        IL_0f9b:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0f9b:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0fa0:  ldc.i8     0xe570484e9937e1
         IL_0fa9:  ldc.i8     0xac81f171be
-        IL_0fb2:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0fb2:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0fb7:  ldc.i8     0xeb371f7f8f514e
         IL_0fc0:  ldc.i8     0xdf0248189c
-        IL_0fc9:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0fc9:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0fce:  ldc.i8     0x3777a7cc43dfd7
         IL_0fd7:  ldc.i8     0x3a7b8eaf40
-        IL_0fe0:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0fe0:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0fe5:  ldc.i8     0xe181db76238786
         IL_0fee:  ldc.i8     0x4126e572a568
-        IL_0ff7:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0ff7:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0ffc:  ldc.i8     0xac1df87977e122
         IL_1005:  ldc.i8     0xe1e8cfde6678
-        IL_100e:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_100e:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_1013:  ldc.i8     0x1c858763a2c23b
         IL_101c:  ldc.i8     0x4ef61f3964f
-        IL_1025:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_1025:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_102a:  ldc.i8     0xbd786bbb71ce46
         IL_1033:  ldc.i8     0x2cda097a464f
-        IL_103c:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_103c:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_1041:  ldc.i8     0xa7a6de21a46360
         IL_104a:  ldc.i8     0x7afda16f98c3
-        IL_1053:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_1053:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_1058:  ldc.i8     0x6fed70a6ccfdf2
         IL_1061:  ldc.i8     0x9771441e8e00e8
-        IL_106a:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_106a:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_106f:  ldc.i8     0x5ad2782dcd5e60
         IL_1078:  ldc.i8     0xd170d518385f6
-        IL_1081:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_1081:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_1086:  ldc.i8     0x1fd67b153bc9b9
         IL_108f:  ldc.i8     0x7b3366dff66c6c
-        IL_1098:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_1098:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_109d:  ldc.i8     0xbf00203beb73f4
         IL_10a6:  ldc.i8     0x693495fefab1c77e
-        IL_10af:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_10af:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_10b4:  ldc.i8     0x2faac1b1b068f8
         IL_10bd:  ldc.i8     0x1cb11cc5c3aaff86
-        IL_10c6:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_10c6:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_10cb:  ldc.i8     0xbb63cfbffe7648
         IL_10d4:  ldc.i8     0x84f5b0c583f9e77b
-        IL_10dd:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_10dd:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_10e2:  ldc.i8     0x615db89673241c
         IL_10eb:  ldc.i8     0x8de5f125247eba0f
-        IL_10f4:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_10f4:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_10f9:  ldc.i8     0x9be183a6b293dffe
         IL_1102:  ldc.i4.s   114
         IL_1104:  conv.i8
-        IL_1105:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_1105:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_110a:  ldc.i8     0xa3df9b76d8a51b19
         IL_1113:  ldc.i4     0xc4
         IL_1118:  conv.i8
-        IL_1119:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_1119:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_111e:  ldc.i8     0xb4cc300f0ea7566d
         IL_1127:  ldc.i4.s   126
         IL_1129:  conv.i8
-        IL_112a:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_112a:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_112f:  ldc.i8     0xfdac12a8e23e16e7
         IL_1138:  ldc.i4.s   21
         IL_113a:  conv.i8
-        IL_113b:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_113b:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_1140:  ldc.i8     0xc0805405aadc0f47
         IL_1149:  ldc.i4     0x19d4
         IL_114e:  conv.i8
-        IL_114f:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_114f:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_1154:  ldc.i8     0x843a391f8d9f8972
         IL_115d:  ldc.i4     0x317a
         IL_1162:  conv.i8
-        IL_1163:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_1163:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_1168:  ldc.i8     0x5a0d124c427ed453
         IL_1171:  ldc.i4     0x34fe
         IL_1176:  conv.i8
-        IL_1177:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_1177:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_117c:  ldc.i8     0x8631150f34008f1b
         IL_1185:  ldc.i4     0x2ecd
         IL_118a:  conv.i8
-        IL_118b:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_118b:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_1190:  ldc.i8     0x3ff4c18715ad3a76
         IL_1199:  ldc.i4     0x72d22a
         IL_119e:  conv.i8
-        IL_119f:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_119f:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_11a4:  ldc.i8     0x3ef93e5a649422bd
         IL_11ad:  ldc.i4     0xdb5c60
         IL_11b2:  conv.i8
-        IL_11b3:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_11b3:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_11b8:  ldc.i8     0x6bdd1056ae58fe0e
         IL_11c1:  ldc.i4     0x805c75
         IL_11c6:  conv.i8
-        IL_11c7:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_11c7:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_11cc:  ldc.i8     0xeff1fa30f3ad9ded
         IL_11d5:  ldc.i4     0xc83ca
         IL_11da:  conv.i8
-        IL_11db:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_11db:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_11e0:  ldc.i8     0xbbc143ac147e56a9
         IL_11e9:  ldc.i4     0x161179b7
         IL_11ee:  conv.i8
-        IL_11ef:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_11ef:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_11f4:  ldc.i8     0x829dde88caa2e45
         IL_11fd:  ldc.i4     0x1443ab62
         IL_1202:  conv.i8
-        IL_1203:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_1203:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_1208:  ldc.i8     0x97ac43ff797a4514
         IL_1211:  ldc.i4     0x33eef42b
         IL_1216:  conv.i8
-        IL_1217:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_1217:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_121c:  ldc.i8     0x703e9cdf96a148aa
         IL_1225:  ldc.i4     0x8e08f3d8
         IL_122a:  conv.u8
-        IL_122b:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_122b:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_1230:  ldc.i8     0x75cbb739b54e2ad6
         IL_1239:  ldc.i8     0x7a8b12628c
-        IL_1242:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_1242:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_1247:  ldc.i8     0x91e42fafe97d638f
         IL_1250:  ldc.i8     0xfbe867c51
-        IL_1259:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_1259:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_125e:  ldc.i8     0x9159d77deec116c1
         IL_1267:  ldc.i8     0x96c0c774fc
-        IL_1270:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_1270:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_1275:  ldc.i8     0xb59dbb4c15761d88
         IL_127e:  ldc.i8     0x4a033a73e7
-        IL_1287:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_1287:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_128c:  ldc.i8     0xab668e9783af9617
         IL_1295:  ldc.i8     0x5aa18404076c
-        IL_129e:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_129e:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_12a3:  ldc.i8     0x54c68e5b5c4127df
         IL_12ac:  ldc.i8     0xf2934fd8dd1f
-        IL_12b5:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_12b5:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_12ba:  ldc.i8     0xf490d3936184c9f9
         IL_12c3:  ldc.i8     0x4007477e2110
-        IL_12cc:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_12cc:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_12d1:  ldc.i8     0x349e577c9d5c44e2
         IL_12da:  ldc.i8     0xbdb2235af963
-        IL_12e3:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_12e3:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_12e8:  ldc.i8     0x58f3ac26cdafde28
         IL_12f1:  ldc.i8     0x17d4f4ade9ec35
-        IL_12fa:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_12fa:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_12ff:  ldc.i8     0xa4a263c316d21f4c
         IL_1308:  ldc.i8     0xa7ec1e6fda834b
-        IL_1311:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_1311:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_1316:  ldc.i8     0x6ab14771c448666f
         IL_131f:  ldc.i8     0x5b0f49593c3a27
-        IL_1328:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_1328:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_132d:  ldc.i8     0x15f392c3602aa4f7
         IL_1336:  ldc.i8     0x18af171045f88e
-        IL_133f:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_133f:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_1344:  ldc.i8     0xf17de69c0063f62c
         IL_134d:  ldc.i8     0xee2a164c2c3a46f8
-        IL_1356:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_1356:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_135b:  ldc.i8     0xf34b743eeff8e5c6
         IL_1364:  ldc.i8     0x4f4067f1a0e404ad
-        IL_136d:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_136d:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_1372:  ldc.i8     0xee0296f678756647
         IL_137b:  ldc.i8     0xf1bbfdc6f0280d36
-        IL_1384:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_1384:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_1389:  ldc.i8     0x65c33db0c952b829
         IL_1392:  ldc.i8     0xa7ab9c39dcffbcf3
-        IL_139b:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_139b:  call       void JitTest_addsub_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_13a0:  ldstr      "All tests passed."
         IL_13a5:  call       void [System.Console]System.Console::WriteLine(class System.String)
@@ -1468,6 +1468,6 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_addsub_unsigned_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/int64/unsigned/addsub_d.csproj b/src/tests/JIT/Methodical/int64/unsigned/addsub_d.csproj
index 228b5c9eb1e193..b19db0b5d63c8d 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/addsub_d.csproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/addsub_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/unsigned/addsub_do.csproj b/src/tests/JIT/Methodical/int64/unsigned/addsub_do.csproj
index af0062e5123469..a6ba6e79c1e4c1 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/addsub_do.csproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/addsub_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/unsigned/addsub_il_d.ilproj b/src/tests/JIT/Methodical/int64/unsigned/addsub_il_d.ilproj
index 1834510d032cec..618ae17c89d6a9 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/addsub_il_d.ilproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/addsub_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/unsigned/addsub_il_r.ilproj b/src/tests/JIT/Methodical/int64/unsigned/addsub_il_r.ilproj
index 3c3a8d5dbfe5cf..64480618a9bc1a 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/addsub_il_r.ilproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/addsub_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/unsigned/addsub_r.csproj b/src/tests/JIT/Methodical/int64/unsigned/addsub_r.csproj
index 3d21c787bd364b..22bd977c9fb972 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/addsub_r.csproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/addsub_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/unsigned/addsub_ro.csproj b/src/tests/JIT/Methodical/int64/unsigned/addsub_ro.csproj
index c00104d1f5648d..0c8fcc4f7e4be9 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/addsub_ro.csproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/addsub_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldc_mul.cs b/src/tests/JIT/Methodical/int64/unsigned/ldc_mul.cs
index df17c79c058572..dc479ef43ca17d 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldc_mul.cs
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldc_mul.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_ldc_mul_unsigned_cs
 {
-    internal class Test
+    public class Test
     {
         private static bool check(ulong op1, ulong op2, ulong product, bool overflow)
         {
@@ -24,7 +25,8 @@ private static bool check(ulong op1, ulong op2, ulong product, bool overflow)
             }
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             if (!check(0x00000000ffffffff, 0x00000000ffffffff, 0xfffffffe00000001, false))
                 goto fail;
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldc_mul.il b/src/tests/JIT/Methodical/int64/unsigned/ldc_mul.il
index 477b34b1810b3a..eb2ce4c044df22 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldc_mul.il
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldc_mul.il
@@ -18,9 +18,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {A15E1196-BF43-4EB9-B2C7-D32EC8A9CA8F}
-.namespace JitTest
+.namespace JitTest_ldc_mul_unsigned_il
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends ['mscorlib']System.Object
   {
     .method private hidebysig static bool 
@@ -74,7 +74,7 @@
       IL_003e:  ret
     } // end of method 'Test::check'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -90,7 +90,7 @@
       IL_0003:  conv.u8
       IL_0004:  ldc.i8     0xfffffffe00000001
       IL_000d:  ldc.i4.0
-      IL_000e:  call       bool JitTest.Test::check(unsigned int64,
+      IL_000e:  call       bool JitTest_ldc_mul_unsigned_il.Test::check(unsigned int64,
                                                     unsigned int64,
                                                     unsigned int64,
                                                     bool)
@@ -103,7 +103,7 @@
       IL_0024:  conv.u8
       IL_0025:  ldc.i8     0xffffffff00000000
       IL_002e:  ldc.i4.0
-      IL_002f:  call       bool JitTest.Test::check(unsigned int64,
+      IL_002f:  call       bool JitTest_ldc_mul_unsigned_il.Test::check(unsigned int64,
                                                     unsigned int64,
                                                     unsigned int64,
                                                     bool)
@@ -116,7 +116,7 @@
       IL_004a:  ldc.i4.0
       IL_004b:  conv.i8
       IL_004c:  ldc.i4.0
-      IL_004d:  call       bool JitTest.Test::check(unsigned int64,
+      IL_004d:  call       bool JitTest_ldc_mul_unsigned_il.Test::check(unsigned int64,
                                                     unsigned int64,
                                                     unsigned int64,
                                                     bool)
@@ -130,7 +130,7 @@
       IL_0061:  ldc.i4.s   -2
       IL_0063:  conv.i8
       IL_0064:  ldc.i4.0
-      IL_0065:  call       bool JitTest.Test::check(unsigned int64,
+      IL_0065:  call       bool JitTest_ldc_mul_unsigned_il.Test::check(unsigned int64,
                                                     unsigned int64,
                                                     unsigned int64,
                                                     bool)
@@ -144,7 +144,7 @@
       IL_0079:  ldc.i4.0
       IL_007a:  conv.i8
       IL_007b:  ldc.i4.0
-      IL_007c:  call       bool JitTest.Test::check(unsigned int64,
+      IL_007c:  call       bool JitTest_ldc_mul_unsigned_il.Test::check(unsigned int64,
                                                     unsigned int64,
                                                     unsigned int64,
                                                     bool)
@@ -157,7 +157,7 @@
       IL_008b:  ldc.i8     0x1000000000
       IL_0094:  ldc.i8     0x100000000000000
       IL_009d:  ldc.i4.0
-      IL_009e:  call       bool JitTest.Test::check(unsigned int64,
+      IL_009e:  call       bool JitTest_ldc_mul_unsigned_il.Test::check(unsigned int64,
                                                     unsigned int64,
                                                     unsigned int64,
                                                     bool)
@@ -193,6 +193,6 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_ldc_mul_unsigned_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldc_mul_d.csproj b/src/tests/JIT/Methodical/int64/unsigned/ldc_mul_d.csproj
index bdf3e5d0b8f7e0..47215e6c0fb79e 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldc_mul_d.csproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldc_mul_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldc_mul_do.csproj b/src/tests/JIT/Methodical/int64/unsigned/ldc_mul_do.csproj
index bb45992e268fe9..1ca4b9504f4077 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldc_mul_do.csproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldc_mul_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldc_mul_il_d.ilproj b/src/tests/JIT/Methodical/int64/unsigned/ldc_mul_il_d.ilproj
index 2360001b3dc4eb..2d103beb3f89e7 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldc_mul_il_d.ilproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldc_mul_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldc_mul_il_r.ilproj b/src/tests/JIT/Methodical/int64/unsigned/ldc_mul_il_r.ilproj
index c5a54b0ae0152f..03ef99a6411901 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldc_mul_il_r.ilproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldc_mul_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldc_mul_r.csproj b/src/tests/JIT/Methodical/int64/unsigned/ldc_mul_r.csproj
index c6a36d6a50f26f..5749796d6c9166 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldc_mul_r.csproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldc_mul_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldc_mul_ro.csproj b/src/tests/JIT/Methodical/int64/unsigned/ldc_mul_ro.csproj
index ca720c4c63b703..88545a23a3c260 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldc_mul_ro.csproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldc_mul_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldc_mulovf.cs b/src/tests/JIT/Methodical/int64/unsigned/ldc_mulovf.cs
index adbd2e7ff9c970..5406c65266af50 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldc_mulovf.cs
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldc_mulovf.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_ldc_mulovf_unsigned_cs
 {
-    internal class Test
+    public class Test
     {
         private static bool check(ulong op1, ulong op2, ulong product, bool overflow)
         {
@@ -24,7 +25,8 @@ private static bool check(ulong op1, ulong op2, ulong product, bool overflow)
             }
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             if (!check(0x00000000ffffffff, 0x00000000ffffffff, 0xfffffffe00000001, false))
                 goto fail;
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldc_mulovf.il b/src/tests/JIT/Methodical/int64/unsigned/ldc_mulovf.il
index 6898efe501df12..767d7e7f366dd3 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldc_mulovf.il
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldc_mulovf.il
@@ -18,9 +18,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {C6227192-F885-4DCA-9BE0-1B2B2204AB9E}
-.namespace JitTest
+.namespace JitTest_ldc_mulovf_unsigned_il
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends ['mscorlib']System.Object
   {
     .method private hidebysig static bool 
@@ -74,7 +74,7 @@
       IL_003e:  ret
     } // end of method 'Test::check'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -90,7 +90,7 @@
       IL_0003:  conv.u8
       IL_0004:  ldc.i8     0xfffffffe00000001
       IL_000d:  ldc.i4.0
-      IL_000e:  call       bool JitTest.Test::check(unsigned int64,
+      IL_000e:  call       bool JitTest_ldc_mulovf_unsigned_il.Test::check(unsigned int64,
                                                     unsigned int64,
                                                     unsigned int64,
                                                     bool)
@@ -103,7 +103,7 @@
       IL_0024:  conv.u8
       IL_0025:  ldc.i8     0xffffffff00000000
       IL_002e:  ldc.i4.0
-      IL_002f:  call       bool JitTest.Test::check(unsigned int64,
+      IL_002f:  call       bool JitTest_ldc_mulovf_unsigned_il.Test::check(unsigned int64,
                                                     unsigned int64,
                                                     unsigned int64,
                                                     bool)
@@ -116,7 +116,7 @@
       IL_004a:  ldc.i4.0
       IL_004b:  conv.i8
       IL_004c:  ldc.i4.1
-      IL_004d:  call       bool JitTest.Test::check(unsigned int64,
+      IL_004d:  call       bool JitTest_ldc_mulovf_unsigned_il.Test::check(unsigned int64,
                                                     unsigned int64,
                                                     unsigned int64,
                                                     bool)
@@ -130,7 +130,7 @@
       IL_0061:  ldc.i4.s   -2
       IL_0063:  conv.i8
       IL_0064:  ldc.i4.0
-      IL_0065:  call       bool JitTest.Test::check(unsigned int64,
+      IL_0065:  call       bool JitTest_ldc_mulovf_unsigned_il.Test::check(unsigned int64,
                                                     unsigned int64,
                                                     unsigned int64,
                                                     bool)
@@ -144,7 +144,7 @@
       IL_0079:  ldc.i4.0
       IL_007a:  conv.i8
       IL_007b:  ldc.i4.1
-      IL_007c:  call       bool JitTest.Test::check(unsigned int64,
+      IL_007c:  call       bool JitTest_ldc_mulovf_unsigned_il.Test::check(unsigned int64,
                                                     unsigned int64,
                                                     unsigned int64,
                                                     bool)
@@ -157,7 +157,7 @@
       IL_008b:  ldc.i8     0x1000000000
       IL_0094:  ldc.i8     0x100000000000000
       IL_009d:  ldc.i4.0
-      IL_009e:  call       bool JitTest.Test::check(unsigned int64,
+      IL_009e:  call       bool JitTest_ldc_mulovf_unsigned_il.Test::check(unsigned int64,
                                                     unsigned int64,
                                                     unsigned int64,
                                                     bool)
@@ -193,6 +193,6 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_ldc_mulovf_unsigned_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldc_mulovf_d.csproj b/src/tests/JIT/Methodical/int64/unsigned/ldc_mulovf_d.csproj
index 11e495810dd22e..322258695ce8a3 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldc_mulovf_d.csproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldc_mulovf_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldc_mulovf_do.csproj b/src/tests/JIT/Methodical/int64/unsigned/ldc_mulovf_do.csproj
index 5ed2f84a495c00..780f88d6f9de2f 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldc_mulovf_do.csproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldc_mulovf_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldc_mulovf_il_d.ilproj b/src/tests/JIT/Methodical/int64/unsigned/ldc_mulovf_il_d.ilproj
index 6cc5e55b5e1d35..a4982ef9d8d0ea 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldc_mulovf_il_d.ilproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldc_mulovf_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldc_mulovf_il_r.ilproj b/src/tests/JIT/Methodical/int64/unsigned/ldc_mulovf_il_r.ilproj
index 9a938e8fc6ad32..c534d05323799f 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldc_mulovf_il_r.ilproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldc_mulovf_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldc_mulovf_r.csproj b/src/tests/JIT/Methodical/int64/unsigned/ldc_mulovf_r.csproj
index 3230285501ab33..1be6bc13b1847c 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldc_mulovf_r.csproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldc_mulovf_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldc_mulovf_ro.csproj b/src/tests/JIT/Methodical/int64/unsigned/ldc_mulovf_ro.csproj
index 9449e7875b16fd..2f91dddcb8aa57 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldc_mulovf_ro.csproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldc_mulovf_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldfld_mul.cs b/src/tests/JIT/Methodical/int64/unsigned/ldfld_mul.cs
index 4c8029a861dfb5..6bc2932aacaefe 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldfld_mul.cs
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldfld_mul.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_ldfld_mul_unsigned_cs
 {
-    internal class Test
+    public class Test
     {
         private ulong _op1,_op2;
 
@@ -26,7 +27,8 @@ private bool check(ulong product, bool overflow)
             }
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             Test app = new Test();
             app._op1 = 0x00000000ffffffff;
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldfld_mul.il b/src/tests/JIT/Methodical/int64/unsigned/ldfld_mul.il
index deec6f9d8bf26d..e9e20387905928 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldfld_mul.il
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldfld_mul.il
@@ -18,9 +18,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {11B90F3C-E0C0-43E5-9E78-65FA3DCAAEF2}
-.namespace JitTest
+.namespace JitTest_ldfld_mul_unsigned_il
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends ['mscorlib']System.Object
   {
     .field private unsigned int64 op1
@@ -34,10 +34,10 @@
       .locals (bool V_0)
       IL_0000:  ldstr      "Multiplying {0} and {1}..."
       IL_0005:  ldarg.0
-      IL_0006:  ldfld     unsigned int64 JitTest.Test::op1
+      IL_0006:  ldfld     unsigned int64 JitTest_ldfld_mul_unsigned_il.Test::op1
       IL_000b:  box     ['mscorlib']System.UInt64
       IL_0010:  ldarg.0
-      IL_0011:  ldfld     unsigned int64 JitTest.Test::op2
+      IL_0011:  ldfld     unsigned int64 JitTest_ldfld_mul_unsigned_il.Test::op2
       IL_0016:  box     ['mscorlib']System.UInt64
       IL_001b:  call       void [System.Console]System.Console::Write(class System.String,
                                                                   class System.Object,
@@ -45,9 +45,9 @@
       .try
       {
         IL_0020:  ldarg.0
-        IL_0021:  ldfld      unsigned int64 JitTest.Test::op1
+        IL_0021:  ldfld      unsigned int64 JitTest_ldfld_mul_unsigned_il.Test::op1
         IL_0026:  ldarg.0
-        IL_0027:  ldfld      unsigned int64 JitTest.Test::op2
+        IL_0027:  ldfld      unsigned int64 JitTest_ldfld_mul_unsigned_il.Test::op2
         IL_002c:  mul
         IL_002d:  ldarg.1
         IL_002e:  beq.s      IL_0034
@@ -78,7 +78,7 @@
       IL_0050:  ret
     } // end of method 'Test::check'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -87,22 +87,22 @@
       .entrypoint
       // Code size       287 (0x11f)
       .maxstack  3
-      .locals (class JitTest.Test V_0,
+      .locals (class JitTest_ldfld_mul_unsigned_il.Test V_0,
                int32 V_1)
-      IL_0000:  newobj     instance void JitTest.Test::.ctor()
+      IL_0000:  newobj     instance void JitTest_ldfld_mul_unsigned_il.Test::.ctor()
       IL_0005:  stloc.0
       IL_0006:  ldloc.0
       IL_0007:  ldc.i4.m1
       IL_0008:  conv.u8
-      IL_0009:  stfld      unsigned int64 JitTest.Test::op1
+      IL_0009:  stfld      unsigned int64 JitTest_ldfld_mul_unsigned_il.Test::op1
       IL_000e:  ldloc.0
       IL_000f:  ldc.i4.m1
       IL_0010:  conv.u8
-      IL_0011:  stfld      unsigned int64 JitTest.Test::op2
+      IL_0011:  stfld      unsigned int64 JitTest_ldfld_mul_unsigned_il.Test::op2
       IL_0016:  ldloc.0
       IL_0017:  ldc.i8     0xfffffffe00000001
       IL_0020:  ldc.i4.0
-      IL_0021:  call       instance bool JitTest.Test::check(unsigned int64,
+      IL_0021:  call       instance bool JitTest_ldfld_mul_unsigned_il.Test::check(unsigned int64,
                                                              bool)
       IL_0026:  brtrue.s   IL_002d
 
@@ -110,15 +110,15 @@
 
       IL_002d:  ldloc.0
       IL_002e:  ldc.i8     0x100000000
-      IL_0037:  stfld      unsigned int64 JitTest.Test::op1
+      IL_0037:  stfld      unsigned int64 JitTest_ldfld_mul_unsigned_il.Test::op1
       IL_003c:  ldloc.0
       IL_003d:  ldc.i4.m1
       IL_003e:  conv.u8
-      IL_003f:  stfld      unsigned int64 JitTest.Test::op2
+      IL_003f:  stfld      unsigned int64 JitTest_ldfld_mul_unsigned_il.Test::op2
       IL_0044:  ldloc.0
       IL_0045:  ldc.i8     0xffffffff00000000
       IL_004e:  ldc.i4.0
-      IL_004f:  call       instance bool JitTest.Test::check(unsigned int64,
+      IL_004f:  call       instance bool JitTest_ldfld_mul_unsigned_il.Test::check(unsigned int64,
                                                              bool)
       IL_0054:  brtrue.s   IL_005b
 
@@ -126,15 +126,15 @@
 
       IL_005b:  ldloc.0
       IL_005c:  ldc.i8     0x100000000
-      IL_0065:  stfld      unsigned int64 JitTest.Test::op1
+      IL_0065:  stfld      unsigned int64 JitTest_ldfld_mul_unsigned_il.Test::op1
       IL_006a:  ldloc.0
       IL_006b:  ldc.i8     0x100000000
-      IL_0074:  stfld      unsigned int64 JitTest.Test::op2
+      IL_0074:  stfld      unsigned int64 JitTest_ldfld_mul_unsigned_il.Test::op2
       IL_0079:  ldloc.0
       IL_007a:  ldc.i4.0
       IL_007b:  conv.i8
       IL_007c:  ldc.i4.0
-      IL_007d:  call       instance bool JitTest.Test::check(unsigned int64,
+      IL_007d:  call       instance bool JitTest_ldfld_mul_unsigned_il.Test::check(unsigned int64,
                                                              bool)
       IL_0082:  brtrue.s   IL_0089
 
@@ -142,16 +142,16 @@
 
       IL_0089:  ldloc.0
       IL_008a:  ldc.i8     0x7fffffffffffffff
-      IL_0093:  stfld      unsigned int64 JitTest.Test::op1
+      IL_0093:  stfld      unsigned int64 JitTest_ldfld_mul_unsigned_il.Test::op1
       IL_0098:  ldloc.0
       IL_0099:  ldc.i4.2
       IL_009a:  conv.i8
-      IL_009b:  stfld      unsigned int64 JitTest.Test::op2
+      IL_009b:  stfld      unsigned int64 JitTest_ldfld_mul_unsigned_il.Test::op2
       IL_00a0:  ldloc.0
       IL_00a1:  ldc.i4.s   -2
       IL_00a3:  conv.i8
       IL_00a4:  ldc.i4.0
-      IL_00a5:  call       instance bool JitTest.Test::check(unsigned int64,
+      IL_00a5:  call       instance bool JitTest_ldfld_mul_unsigned_il.Test::check(unsigned int64,
                                                              bool)
       IL_00aa:  brtrue.s   IL_00ae
 
@@ -159,16 +159,16 @@
 
       IL_00ae:  ldloc.0
       IL_00af:  ldc.i8     0x8000000000000000
-      IL_00b8:  stfld      unsigned int64 JitTest.Test::op1
+      IL_00b8:  stfld      unsigned int64 JitTest_ldfld_mul_unsigned_il.Test::op1
       IL_00bd:  ldloc.0
       IL_00be:  ldc.i4.2
       IL_00bf:  conv.i8
-      IL_00c0:  stfld      unsigned int64 JitTest.Test::op2
+      IL_00c0:  stfld      unsigned int64 JitTest_ldfld_mul_unsigned_il.Test::op2
       IL_00c5:  ldloc.0
       IL_00c6:  ldc.i4.0
       IL_00c7:  conv.i8
       IL_00c8:  ldc.i4.0
-      IL_00c9:  call       instance bool JitTest.Test::check(unsigned int64,
+      IL_00c9:  call       instance bool JitTest_ldfld_mul_unsigned_il.Test::check(unsigned int64,
                                                              bool)
       IL_00ce:  brtrue.s   IL_00d2
 
@@ -177,14 +177,14 @@
       IL_00d2:  ldloc.0
       IL_00d3:  ldc.i4     0x100000
       IL_00d8:  conv.i8
-      IL_00d9:  stfld      unsigned int64 JitTest.Test::op1
+      IL_00d9:  stfld      unsigned int64 JitTest_ldfld_mul_unsigned_il.Test::op1
       IL_00de:  ldloc.0
       IL_00df:  ldc.i8     0x1000000000
-      IL_00e8:  stfld      unsigned int64 JitTest.Test::op2
+      IL_00e8:  stfld      unsigned int64 JitTest_ldfld_mul_unsigned_il.Test::op2
       IL_00ed:  ldloc.0
       IL_00ee:  ldc.i8     0x100000000000000
       IL_00f7:  ldc.i4.0
-      IL_00f8:  call       instance bool JitTest.Test::check(unsigned int64,
+      IL_00f8:  call       instance bool JitTest_ldfld_mul_unsigned_il.Test::check(unsigned int64,
                                                              bool)
       IL_00fd:  brtrue.s   IL_0101
 
@@ -218,6 +218,6 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_ldfld_mul_unsigned_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldfld_mul_d.csproj b/src/tests/JIT/Methodical/int64/unsigned/ldfld_mul_d.csproj
index 93b159d3a21060..c512c3649da055 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldfld_mul_d.csproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldfld_mul_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldfld_mul_do.csproj b/src/tests/JIT/Methodical/int64/unsigned/ldfld_mul_do.csproj
index e71b432432f89d..870fd84c600bd6 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldfld_mul_do.csproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldfld_mul_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldfld_mul_il_d.ilproj b/src/tests/JIT/Methodical/int64/unsigned/ldfld_mul_il_d.ilproj
index f4889f8ee36e19..f7a2c8f059f67f 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldfld_mul_il_d.ilproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldfld_mul_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldfld_mul_il_r.ilproj b/src/tests/JIT/Methodical/int64/unsigned/ldfld_mul_il_r.ilproj
index ba6925df261eae..64a5f3445d2ef2 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldfld_mul_il_r.ilproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldfld_mul_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldfld_mul_r.csproj b/src/tests/JIT/Methodical/int64/unsigned/ldfld_mul_r.csproj
index 66fe25c1fa356b..5cf7f1f1beac1a 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldfld_mul_r.csproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldfld_mul_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldfld_mul_ro.csproj b/src/tests/JIT/Methodical/int64/unsigned/ldfld_mul_ro.csproj
index 3fdb4778ac692e..ebf985ab40d215 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldfld_mul_ro.csproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldfld_mul_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldfld_mulovf.cs b/src/tests/JIT/Methodical/int64/unsigned/ldfld_mulovf.cs
index 70535de8aa85d8..e86f8fdbcca958 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldfld_mulovf.cs
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldfld_mulovf.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_ldfld_mulovf_unsigned_cs
 {
-    internal class Test
+    public class Test
     {
         private ulong _op1,_op2;
 
@@ -26,7 +27,8 @@ private bool check(ulong product, bool overflow)
             }
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             Test app = new Test();
             app._op1 = 0x00000000ffffffff;
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldfld_mulovf.il b/src/tests/JIT/Methodical/int64/unsigned/ldfld_mulovf.il
index 60b67e5ddc957c..f940f9a4abe6e1 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldfld_mulovf.il
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldfld_mulovf.il
@@ -17,9 +17,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {5E7A07A8-98C6-40F0-BD60-5BEF6B39E28B}
-.namespace JitTest
+.namespace JitTest_ldfld_mulovf_unsigned_il
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends ['mscorlib']System.Object
   {
     .field private unsigned int64 op1
@@ -33,10 +33,10 @@
       .locals (bool V_0)
       IL_0000:  ldstr      "Multiplying {0} and {1}..."
       IL_0005:  ldarg.0
-      IL_0006:  ldfld     unsigned int64 JitTest.Test::op1
+      IL_0006:  ldfld     unsigned int64 JitTest_ldfld_mulovf_unsigned_il.Test::op1
       IL_000b:  box     ['mscorlib']System.UInt64
       IL_0010:  ldarg.0
-      IL_0011:  ldfld     unsigned int64 JitTest.Test::op2
+      IL_0011:  ldfld     unsigned int64 JitTest_ldfld_mulovf_unsigned_il.Test::op2
       IL_0016:  box     ['mscorlib']System.UInt64
       IL_001b:  call       void [System.Console]System.Console::Write(class System.String,
                                                                   class System.Object,
@@ -44,9 +44,9 @@
       .try
       {
         IL_0020:  ldarg.0
-        IL_0021:  ldfld      unsigned int64 JitTest.Test::op1
+        IL_0021:  ldfld      unsigned int64 JitTest_ldfld_mulovf_unsigned_il.Test::op1
         IL_0026:  ldarg.0
-        IL_0027:  ldfld      unsigned int64 JitTest.Test::op2
+        IL_0027:  ldfld      unsigned int64 JitTest_ldfld_mulovf_unsigned_il.Test::op2
         IL_002c:  mul.ovf.un
         IL_002d:  ldarg.1
         IL_002e:  beq.s      IL_0034
@@ -77,7 +77,7 @@
       IL_0050:  ret
     } // end of method 'Test::check'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -86,22 +86,22 @@
       .entrypoint
       // Code size       287 (0x11f)
       .maxstack  3
-      .locals (class JitTest.Test V_0,
+      .locals (class JitTest_ldfld_mulovf_unsigned_il.Test V_0,
                int32 V_1)
-      IL_0000:  newobj     instance void JitTest.Test::.ctor()
+      IL_0000:  newobj     instance void JitTest_ldfld_mulovf_unsigned_il.Test::.ctor()
       IL_0005:  stloc.0
       IL_0006:  ldloc.0
       IL_0007:  ldc.i4.m1
       IL_0008:  conv.u8
-      IL_0009:  stfld      unsigned int64 JitTest.Test::op1
+      IL_0009:  stfld      unsigned int64 JitTest_ldfld_mulovf_unsigned_il.Test::op1
       IL_000e:  ldloc.0
       IL_000f:  ldc.i4.m1
       IL_0010:  conv.u8
-      IL_0011:  stfld      unsigned int64 JitTest.Test::op2
+      IL_0011:  stfld      unsigned int64 JitTest_ldfld_mulovf_unsigned_il.Test::op2
       IL_0016:  ldloc.0
       IL_0017:  ldc.i8     0xfffffffe00000001
       IL_0020:  ldc.i4.0
-      IL_0021:  call       instance bool JitTest.Test::check(unsigned int64,
+      IL_0021:  call       instance bool JitTest_ldfld_mulovf_unsigned_il.Test::check(unsigned int64,
                                                              bool)
       IL_0026:  brtrue.s   IL_002d
 
@@ -109,15 +109,15 @@
 
       IL_002d:  ldloc.0
       IL_002e:  ldc.i8     0x100000000
-      IL_0037:  stfld      unsigned int64 JitTest.Test::op1
+      IL_0037:  stfld      unsigned int64 JitTest_ldfld_mulovf_unsigned_il.Test::op1
       IL_003c:  ldloc.0
       IL_003d:  ldc.i4.m1
       IL_003e:  conv.u8
-      IL_003f:  stfld      unsigned int64 JitTest.Test::op2
+      IL_003f:  stfld      unsigned int64 JitTest_ldfld_mulovf_unsigned_il.Test::op2
       IL_0044:  ldloc.0
       IL_0045:  ldc.i8     0xffffffff00000000
       IL_004e:  ldc.i4.0
-      IL_004f:  call       instance bool JitTest.Test::check(unsigned int64,
+      IL_004f:  call       instance bool JitTest_ldfld_mulovf_unsigned_il.Test::check(unsigned int64,
                                                              bool)
       IL_0054:  brtrue.s   IL_005b
 
@@ -125,15 +125,15 @@
 
       IL_005b:  ldloc.0
       IL_005c:  ldc.i8     0x100000000
-      IL_0065:  stfld      unsigned int64 JitTest.Test::op1
+      IL_0065:  stfld      unsigned int64 JitTest_ldfld_mulovf_unsigned_il.Test::op1
       IL_006a:  ldloc.0
       IL_006b:  ldc.i8     0x100000000
-      IL_0074:  stfld      unsigned int64 JitTest.Test::op2
+      IL_0074:  stfld      unsigned int64 JitTest_ldfld_mulovf_unsigned_il.Test::op2
       IL_0079:  ldloc.0
       IL_007a:  ldc.i4.0
       IL_007b:  conv.i8
       IL_007c:  ldc.i4.1
-      IL_007d:  call       instance bool JitTest.Test::check(unsigned int64,
+      IL_007d:  call       instance bool JitTest_ldfld_mulovf_unsigned_il.Test::check(unsigned int64,
                                                              bool)
       IL_0082:  brtrue.s   IL_0089
 
@@ -141,16 +141,16 @@
 
       IL_0089:  ldloc.0
       IL_008a:  ldc.i8     0x7fffffffffffffff
-      IL_0093:  stfld      unsigned int64 JitTest.Test::op1
+      IL_0093:  stfld      unsigned int64 JitTest_ldfld_mulovf_unsigned_il.Test::op1
       IL_0098:  ldloc.0
       IL_0099:  ldc.i4.2
       IL_009a:  conv.i8
-      IL_009b:  stfld      unsigned int64 JitTest.Test::op2
+      IL_009b:  stfld      unsigned int64 JitTest_ldfld_mulovf_unsigned_il.Test::op2
       IL_00a0:  ldloc.0
       IL_00a1:  ldc.i4.s   -2
       IL_00a3:  conv.i8
       IL_00a4:  ldc.i4.0
-      IL_00a5:  call       instance bool JitTest.Test::check(unsigned int64,
+      IL_00a5:  call       instance bool JitTest_ldfld_mulovf_unsigned_il.Test::check(unsigned int64,
                                                              bool)
       IL_00aa:  brtrue.s   IL_00ae
 
@@ -158,16 +158,16 @@
 
       IL_00ae:  ldloc.0
       IL_00af:  ldc.i8     0x8000000000000000
-      IL_00b8:  stfld      unsigned int64 JitTest.Test::op1
+      IL_00b8:  stfld      unsigned int64 JitTest_ldfld_mulovf_unsigned_il.Test::op1
       IL_00bd:  ldloc.0
       IL_00be:  ldc.i4.2
       IL_00bf:  conv.i8
-      IL_00c0:  stfld      unsigned int64 JitTest.Test::op2
+      IL_00c0:  stfld      unsigned int64 JitTest_ldfld_mulovf_unsigned_il.Test::op2
       IL_00c5:  ldloc.0
       IL_00c6:  ldc.i4.0
       IL_00c7:  conv.i8
       IL_00c8:  ldc.i4.1
-      IL_00c9:  call       instance bool JitTest.Test::check(unsigned int64,
+      IL_00c9:  call       instance bool JitTest_ldfld_mulovf_unsigned_il.Test::check(unsigned int64,
                                                              bool)
       IL_00ce:  brtrue.s   IL_00d2
 
@@ -176,14 +176,14 @@
       IL_00d2:  ldloc.0
       IL_00d3:  ldc.i4     0x100000
       IL_00d8:  conv.i8
-      IL_00d9:  stfld      unsigned int64 JitTest.Test::op1
+      IL_00d9:  stfld      unsigned int64 JitTest_ldfld_mulovf_unsigned_il.Test::op1
       IL_00de:  ldloc.0
       IL_00df:  ldc.i8     0x1000000000
-      IL_00e8:  stfld      unsigned int64 JitTest.Test::op2
+      IL_00e8:  stfld      unsigned int64 JitTest_ldfld_mulovf_unsigned_il.Test::op2
       IL_00ed:  ldloc.0
       IL_00ee:  ldc.i8     0x100000000000000
       IL_00f7:  ldc.i4.0
-      IL_00f8:  call       instance bool JitTest.Test::check(unsigned int64,
+      IL_00f8:  call       instance bool JitTest_ldfld_mulovf_unsigned_il.Test::check(unsigned int64,
                                                              bool)
       IL_00fd:  brtrue.s   IL_0101
 
@@ -217,6 +217,6 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_ldfld_mulovf_unsigned_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldfld_mulovf_d.csproj b/src/tests/JIT/Methodical/int64/unsigned/ldfld_mulovf_d.csproj
index 28daa15f124697..78dfcd9fd38641 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldfld_mulovf_d.csproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldfld_mulovf_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldfld_mulovf_do.csproj b/src/tests/JIT/Methodical/int64/unsigned/ldfld_mulovf_do.csproj
index a32c47496297f9..940e59e4aa975d 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldfld_mulovf_do.csproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldfld_mulovf_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldfld_mulovf_il_d.ilproj b/src/tests/JIT/Methodical/int64/unsigned/ldfld_mulovf_il_d.ilproj
index b0d19310711c16..6a76fb5f996721 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldfld_mulovf_il_d.ilproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldfld_mulovf_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldfld_mulovf_il_r.ilproj b/src/tests/JIT/Methodical/int64/unsigned/ldfld_mulovf_il_r.ilproj
index 2e50fc198841f6..4a67efa77b7ebf 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldfld_mulovf_il_r.ilproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldfld_mulovf_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldfld_mulovf_r.csproj b/src/tests/JIT/Methodical/int64/unsigned/ldfld_mulovf_r.csproj
index aeacccbbb6ebc2..240d4e953a5b53 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldfld_mulovf_r.csproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldfld_mulovf_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldfld_mulovf_ro.csproj b/src/tests/JIT/Methodical/int64/unsigned/ldfld_mulovf_ro.csproj
index f7d4350eaa94e6..f447dd46b06c82 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldfld_mulovf_ro.csproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldfld_mulovf_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mul.cs b/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mul.cs
index e1c2868898719c..7105964a5d58af 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mul.cs
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mul.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_ldsfld_mul_unsigned_cs
 {
-    internal class Test
+    public class Test
     {
         private static ulong s_op1,s_op2;
 
@@ -26,7 +27,8 @@ private static bool check(ulong product, bool overflow)
             }
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             s_op1 = 0x00000000ffffffff;
             s_op2 = 0x00000000ffffffff;
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mul.il b/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mul.il
index 218829997d180f..18c2e00b0f8eeb 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mul.il
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mul.il
@@ -16,9 +16,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {B9439553-5220-4D6F-B7AA-E7754C5633EC}
-.namespace JitTest
+.namespace JitTest_ldsfld_mul_unsigned_il
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends ['mscorlib']System.Object
   {
     .field private static unsigned int64 op1
@@ -31,17 +31,17 @@
       .maxstack  3
       .locals (bool V_0)
       IL_0000:  ldstr      "Multiplying {0} and {1}..."
-      IL_0005:  ldsfld    unsigned int64 JitTest.Test::op1
+      IL_0005:  ldsfld    unsigned int64 JitTest_ldsfld_mul_unsigned_il.Test::op1
       IL_000a:  box     ['mscorlib']System.UInt64
-      IL_000f:  ldsfld    unsigned int64 JitTest.Test::op2
+      IL_000f:  ldsfld    unsigned int64 JitTest_ldsfld_mul_unsigned_il.Test::op2
       IL_0014:  box     ['mscorlib']System.UInt64
       IL_0019:  call       void [System.Console]System.Console::Write(class System.String,
                                                                   class System.Object,
                                                                   class System.Object)
       .try
       {
-        IL_001e:  ldsfld     unsigned int64 JitTest.Test::op1
-        IL_0023:  ldsfld     unsigned int64 JitTest.Test::op2
+        IL_001e:  ldsfld     unsigned int64 JitTest_ldsfld_mul_unsigned_il.Test::op1
+        IL_0023:  ldsfld     unsigned int64 JitTest_ldsfld_mul_unsigned_il.Test::op2
         IL_0028:  mul
         IL_0029:  ldarg.0
         IL_002a:  beq.s      IL_0030
@@ -72,7 +72,7 @@
       IL_004c:  ret
     } // end of method 'Test::check'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -84,67 +84,67 @@
       .locals (int32 V_0)
       IL_0000:  ldc.i4.m1
       IL_0001:  conv.u8
-      IL_0002:  stsfld     unsigned int64 JitTest.Test::op1
+      IL_0002:  stsfld     unsigned int64 JitTest_ldsfld_mul_unsigned_il.Test::op1
       IL_0007:  ldc.i4.m1
       IL_0008:  conv.u8
-      IL_0009:  stsfld     unsigned int64 JitTest.Test::op2
+      IL_0009:  stsfld     unsigned int64 JitTest_ldsfld_mul_unsigned_il.Test::op2
       IL_000e:  ldc.i8     0xfffffffe00000001
       IL_0017:  ldc.i4.0
-      IL_0018:  call       bool JitTest.Test::check(unsigned int64,
+      IL_0018:  call       bool JitTest_ldsfld_mul_unsigned_il.Test::check(unsigned int64,
                                                     bool)
       IL_001d:  brtrue.s   IL_0024
 
       IL_001f:  br         IL_00f4
 
       IL_0024:  ldc.i8     0x100000000
-      IL_002d:  stsfld     unsigned int64 JitTest.Test::op1
+      IL_002d:  stsfld     unsigned int64 JitTest_ldsfld_mul_unsigned_il.Test::op1
       IL_0032:  ldc.i4.m1
       IL_0033:  conv.u8
-      IL_0034:  stsfld     unsigned int64 JitTest.Test::op2
+      IL_0034:  stsfld     unsigned int64 JitTest_ldsfld_mul_unsigned_il.Test::op2
       IL_0039:  ldc.i8     0xffffffff00000000
       IL_0042:  ldc.i4.0
-      IL_0043:  call       bool JitTest.Test::check(unsigned int64,
+      IL_0043:  call       bool JitTest_ldsfld_mul_unsigned_il.Test::check(unsigned int64,
                                                     bool)
       IL_0048:  brtrue.s   IL_004f
 
       IL_004a:  br         IL_00f4
 
       IL_004f:  ldc.i8     0x100000000
-      IL_0058:  stsfld     unsigned int64 JitTest.Test::op1
+      IL_0058:  stsfld     unsigned int64 JitTest_ldsfld_mul_unsigned_il.Test::op1
       IL_005d:  ldc.i8     0x100000000
-      IL_0066:  stsfld     unsigned int64 JitTest.Test::op2
+      IL_0066:  stsfld     unsigned int64 JitTest_ldsfld_mul_unsigned_il.Test::op2
       IL_006b:  ldc.i4.0
       IL_006c:  conv.i8
       IL_006d:  ldc.i4.0
-      IL_006e:  call       bool JitTest.Test::check(unsigned int64,
+      IL_006e:  call       bool JitTest_ldsfld_mul_unsigned_il.Test::check(unsigned int64,
                                                     bool)
       IL_0073:  brtrue.s   IL_0077
 
       IL_0075:  br       IL_00f4
 
       IL_0077:  ldc.i8     0x7fffffffffffffff
-      IL_0080:  stsfld     unsigned int64 JitTest.Test::op1
+      IL_0080:  stsfld     unsigned int64 JitTest_ldsfld_mul_unsigned_il.Test::op1
       IL_0085:  ldc.i4.2
       IL_0086:  conv.i8
-      IL_0087:  stsfld     unsigned int64 JitTest.Test::op2
+      IL_0087:  stsfld     unsigned int64 JitTest_ldsfld_mul_unsigned_il.Test::op2
       IL_008c:  ldc.i4.s   -2
       IL_008e:  conv.i8
       IL_008f:  ldc.i4.0
-      IL_0090:  call       bool JitTest.Test::check(unsigned int64,
+      IL_0090:  call       bool JitTest_ldsfld_mul_unsigned_il.Test::check(unsigned int64,
                                                     bool)
       IL_0095:  brtrue.s   IL_0099
 
       IL_0097:  br       IL_00f4
 
       IL_0099:  ldc.i8     0x8000000000000000
-      IL_00a2:  stsfld     unsigned int64 JitTest.Test::op1
+      IL_00a2:  stsfld     unsigned int64 JitTest_ldsfld_mul_unsigned_il.Test::op1
       IL_00a7:  ldc.i4.2
       IL_00a8:  conv.i8
-      IL_00a9:  stsfld     unsigned int64 JitTest.Test::op2
+      IL_00a9:  stsfld     unsigned int64 JitTest_ldsfld_mul_unsigned_il.Test::op2
       IL_00ae:  ldc.i4.0
       IL_00af:  conv.i8
       IL_00b0:  ldc.i4.0
-      IL_00b1:  call       bool JitTest.Test::check(unsigned int64,
+      IL_00b1:  call       bool JitTest_ldsfld_mul_unsigned_il.Test::check(unsigned int64,
                                                     bool)
       IL_00b6:  brtrue.s   IL_00ba
 
@@ -152,12 +152,12 @@
 
       IL_00ba:  ldc.i4     0x100000
       IL_00bf:  conv.i8
-      IL_00c0:  stsfld     unsigned int64 JitTest.Test::op1
+      IL_00c0:  stsfld     unsigned int64 JitTest_ldsfld_mul_unsigned_il.Test::op1
       IL_00c5:  ldc.i8     0x1000000000
-      IL_00ce:  stsfld     unsigned int64 JitTest.Test::op2
+      IL_00ce:  stsfld     unsigned int64 JitTest_ldsfld_mul_unsigned_il.Test::op2
       IL_00d3:  ldc.i8     0x100000000000000
       IL_00dc:  ldc.i4.0
-      IL_00dd:  call       bool JitTest.Test::check(unsigned int64,
+      IL_00dd:  call       bool JitTest_ldsfld_mul_unsigned_il.Test::check(unsigned int64,
                                                     bool)
       IL_00e2:  brtrue.s   IL_00e6
 
@@ -191,6 +191,6 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_ldsfld_mul_unsigned_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mul_d.csproj b/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mul_d.csproj
index 6eec5847ce5276..b294c0abb429f3 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mul_d.csproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mul_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mul_do.csproj b/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mul_do.csproj
index 8b0b1a171a0b3b..10efd6b3f80b13 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mul_do.csproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mul_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mul_il_d.ilproj b/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mul_il_d.ilproj
index 4258f701a86c32..4b8973d47f799a 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mul_il_d.ilproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mul_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mul_il_r.ilproj b/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mul_il_r.ilproj
index d9fad54eae3e34..a1924e1fc983e8 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mul_il_r.ilproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mul_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mul_r.csproj b/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mul_r.csproj
index 2cd17c64819275..00a2834f992ed1 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mul_r.csproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mul_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mul_ro.csproj b/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mul_ro.csproj
index b90a4e608a337e..3215e8c741a819 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mul_ro.csproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mul_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mulovf.cs b/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mulovf.cs
index f6a91eb550c6f6..53702300cb7c30 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mulovf.cs
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mulovf.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_ldsfld_mulovf_unsigned_cs
 {
-    internal class Test
+    public class Test
     {
         private static ulong s_op1,s_op2;
 
@@ -26,7 +27,8 @@ private static bool check(ulong product, bool overflow)
             }
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             s_op1 = 0x00000000ffffffff;
             s_op2 = 0x00000000ffffffff;
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mulovf.il b/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mulovf.il
index b6fdcfb921f58d..0bf6177084c101 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mulovf.il
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mulovf.il
@@ -16,9 +16,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {F167E31C-7032-4D75-B802-EE8B8384CBD2}
-.namespace JitTest
+.namespace JitTest_ldsfld_mulovf_unsigned_il
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends ['mscorlib']System.Object
   {
     .field private static unsigned int64 op1
@@ -31,17 +31,17 @@
       .maxstack  3
       .locals (bool V_0)
       IL_0000:  ldstr      "Multiplying {0} and {1}..."
-      IL_0005:  ldsfld    unsigned int64 JitTest.Test::op1
+      IL_0005:  ldsfld    unsigned int64 JitTest_ldsfld_mulovf_unsigned_il.Test::op1
       IL_000a:  box     ['mscorlib']System.UInt64
-      IL_000f:  ldsfld    unsigned int64 JitTest.Test::op2
+      IL_000f:  ldsfld    unsigned int64 JitTest_ldsfld_mulovf_unsigned_il.Test::op2
       IL_0014:  box     ['mscorlib']System.UInt64
       IL_0019:  call       void [System.Console]System.Console::Write(class System.String,
                                                                   class System.Object,
                                                                   class System.Object)
       .try
       {
-        IL_001e:  ldsfld     unsigned int64 JitTest.Test::op1
-        IL_0023:  ldsfld     unsigned int64 JitTest.Test::op2
+        IL_001e:  ldsfld     unsigned int64 JitTest_ldsfld_mulovf_unsigned_il.Test::op1
+        IL_0023:  ldsfld     unsigned int64 JitTest_ldsfld_mulovf_unsigned_il.Test::op2
         IL_0028:  mul.ovf.un
         IL_0029:  ldarg.0
         IL_002a:  beq.s      IL_0030
@@ -72,7 +72,7 @@
       IL_004c:  ret
     } // end of method 'Test::check'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -84,67 +84,67 @@
       .locals (int32 V_0)
       IL_0000:  ldc.i4.m1
       IL_0001:  conv.u8
-      IL_0002:  stsfld     unsigned int64 JitTest.Test::op1
+      IL_0002:  stsfld     unsigned int64 JitTest_ldsfld_mulovf_unsigned_il.Test::op1
       IL_0007:  ldc.i4.m1
       IL_0008:  conv.u8
-      IL_0009:  stsfld     unsigned int64 JitTest.Test::op2
+      IL_0009:  stsfld     unsigned int64 JitTest_ldsfld_mulovf_unsigned_il.Test::op2
       IL_000e:  ldc.i8     0xfffffffe00000001
       IL_0017:  ldc.i4.0
-      IL_0018:  call       bool JitTest.Test::check(unsigned int64,
+      IL_0018:  call       bool JitTest_ldsfld_mulovf_unsigned_il.Test::check(unsigned int64,
                                                     bool)
       IL_001d:  brtrue.s   IL_0024
 
       IL_001f:  br         IL_00f4
 
       IL_0024:  ldc.i8     0x100000000
-      IL_002d:  stsfld     unsigned int64 JitTest.Test::op1
+      IL_002d:  stsfld     unsigned int64 JitTest_ldsfld_mulovf_unsigned_il.Test::op1
       IL_0032:  ldc.i4.m1
       IL_0033:  conv.u8
-      IL_0034:  stsfld     unsigned int64 JitTest.Test::op2
+      IL_0034:  stsfld     unsigned int64 JitTest_ldsfld_mulovf_unsigned_il.Test::op2
       IL_0039:  ldc.i8     0xffffffff00000000
       IL_0042:  ldc.i4.0
-      IL_0043:  call       bool JitTest.Test::check(unsigned int64,
+      IL_0043:  call       bool JitTest_ldsfld_mulovf_unsigned_il.Test::check(unsigned int64,
                                                     bool)
       IL_0048:  brtrue.s   IL_004f
 
       IL_004a:  br         IL_00f4
 
       IL_004f:  ldc.i8     0x100000000
-      IL_0058:  stsfld     unsigned int64 JitTest.Test::op1
+      IL_0058:  stsfld     unsigned int64 JitTest_ldsfld_mulovf_unsigned_il.Test::op1
       IL_005d:  ldc.i8     0x100000000
-      IL_0066:  stsfld     unsigned int64 JitTest.Test::op2
+      IL_0066:  stsfld     unsigned int64 JitTest_ldsfld_mulovf_unsigned_il.Test::op2
       IL_006b:  ldc.i4.0
       IL_006c:  conv.i8
       IL_006d:  ldc.i4.1
-      IL_006e:  call       bool JitTest.Test::check(unsigned int64,
+      IL_006e:  call       bool JitTest_ldsfld_mulovf_unsigned_il.Test::check(unsigned int64,
                                                     bool)
       IL_0073:  brtrue.s   IL_0077
 
       IL_0075:  br       IL_00f4
 
       IL_0077:  ldc.i8     0x7fffffffffffffff
-      IL_0080:  stsfld     unsigned int64 JitTest.Test::op1
+      IL_0080:  stsfld     unsigned int64 JitTest_ldsfld_mulovf_unsigned_il.Test::op1
       IL_0085:  ldc.i4.2
       IL_0086:  conv.i8
-      IL_0087:  stsfld     unsigned int64 JitTest.Test::op2
+      IL_0087:  stsfld     unsigned int64 JitTest_ldsfld_mulovf_unsigned_il.Test::op2
       IL_008c:  ldc.i4.s   -2
       IL_008e:  conv.i8
       IL_008f:  ldc.i4.0
-      IL_0090:  call       bool JitTest.Test::check(unsigned int64,
+      IL_0090:  call       bool JitTest_ldsfld_mulovf_unsigned_il.Test::check(unsigned int64,
                                                     bool)
       IL_0095:  brtrue.s   IL_0099
 
       IL_0097:  br       IL_00f4
 
       IL_0099:  ldc.i8     0x8000000000000000
-      IL_00a2:  stsfld     unsigned int64 JitTest.Test::op1
+      IL_00a2:  stsfld     unsigned int64 JitTest_ldsfld_mulovf_unsigned_il.Test::op1
       IL_00a7:  ldc.i4.2
       IL_00a8:  conv.i8
-      IL_00a9:  stsfld     unsigned int64 JitTest.Test::op2
+      IL_00a9:  stsfld     unsigned int64 JitTest_ldsfld_mulovf_unsigned_il.Test::op2
       IL_00ae:  ldc.i4.0
       IL_00af:  conv.i8
       IL_00b0:  ldc.i4.1
-      IL_00b1:  call       bool JitTest.Test::check(unsigned int64,
+      IL_00b1:  call       bool JitTest_ldsfld_mulovf_unsigned_il.Test::check(unsigned int64,
                                                     bool)
       IL_00b6:  brtrue.s   IL_00ba
 
@@ -152,12 +152,12 @@
 
       IL_00ba:  ldc.i4     0x100000
       IL_00bf:  conv.i8
-      IL_00c0:  stsfld     unsigned int64 JitTest.Test::op1
+      IL_00c0:  stsfld     unsigned int64 JitTest_ldsfld_mulovf_unsigned_il.Test::op1
       IL_00c5:  ldc.i8     0x1000000000
-      IL_00ce:  stsfld     unsigned int64 JitTest.Test::op2
+      IL_00ce:  stsfld     unsigned int64 JitTest_ldsfld_mulovf_unsigned_il.Test::op2
       IL_00d3:  ldc.i8     0x100000000000000
       IL_00dc:  ldc.i4.0
-      IL_00dd:  call       bool JitTest.Test::check(unsigned int64,
+      IL_00dd:  call       bool JitTest_ldsfld_mulovf_unsigned_il.Test::check(unsigned int64,
                                                     bool)
       IL_00e2:  brtrue.s   IL_00e6
 
@@ -191,6 +191,6 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_ldsfld_mulovf_unsigned_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mulovf_d.csproj b/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mulovf_d.csproj
index 36d0099ab377b8..69bc95e00c6fae 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mulovf_d.csproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mulovf_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mulovf_do.csproj b/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mulovf_do.csproj
index 802d631027bc1b..15b49581388774 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mulovf_do.csproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mulovf_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mulovf_il_d.ilproj b/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mulovf_il_d.ilproj
index b0964cc3e34d82..802a1f67ac4ee5 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mulovf_il_d.ilproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mulovf_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mulovf_il_r.ilproj b/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mulovf_il_r.ilproj
index 3adac9ac6e4ea3..d953e1990ca059 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mulovf_il_r.ilproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mulovf_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mulovf_r.csproj b/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mulovf_r.csproj
index dc9f55fdd7e7f2..ad5337fc1cbfe6 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mulovf_r.csproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mulovf_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mulovf_ro.csproj b/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mulovf_ro.csproj
index b9da5567fcb8e2..958b8466fdfc43 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mulovf_ro.csproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mulovf_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/unsigned/muldiv.cs b/src/tests/JIT/Methodical/int64/unsigned/muldiv.cs
index b593a5a68998cd..5a06de5c01373b 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/muldiv.cs
+++ b/src/tests/JIT/Methodical/int64/unsigned/muldiv.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_muldiv_unsigned_cs
 {
-    internal class Test
+    public class Test
     {
         private static ulong s_A,s_B;
 
@@ -64,7 +65,8 @@ private static void testNumbers(ulong a, ulong b)
             }
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             try
             {
diff --git a/src/tests/JIT/Methodical/int64/unsigned/muldiv.il b/src/tests/JIT/Methodical/int64/unsigned/muldiv.il
index d0f3dc20f93780..9592bbe7bf8aee 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/muldiv.il
+++ b/src/tests/JIT/Methodical/int64/unsigned/muldiv.il
@@ -16,9 +16,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {621361D3-6C15-4D03-BB44-4DCF8A6B7FA1}
-.namespace JitTest
+.namespace JitTest_muldiv_unsigned_il
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends ['mscorlib']System.Object
   {
     .field private static unsigned int64 A
@@ -36,9 +36,9 @@
                unsigned int64 V_4,
                unsigned int64 V_5)
       IL_0000:  ldarg.0
-      IL_0001:  stsfld     unsigned int64 JitTest.Test::A
+      IL_0001:  stsfld     unsigned int64 JitTest_muldiv_unsigned_il.Test::A
       IL_0006:  ldarg.1
-      IL_0007:  stsfld     unsigned int64 JitTest.Test::B
+      IL_0007:  stsfld     unsigned int64 JitTest_muldiv_unsigned_il.Test::B
       IL_000c:  ldc.i4.0
       IL_000d:  conv.i8
       IL_000e:  stloc.0
@@ -194,7 +194,7 @@
       IL_00d5:  ret
     } // end of method 'Test::testNumbers'
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -210,1281 +210,1281 @@
         IL_0002:  conv.i8
         IL_0003:  ldc.i4     0xb8
         IL_0008:  conv.i8
-        IL_0009:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0009:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_000e:  ldc.i4.s   9
         IL_0010:  conv.i8
         IL_0011:  ldc.i4     0xf9
         IL_0016:  conv.i8
-        IL_0017:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0017:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_001c:  ldc.i4.s   110
         IL_001e:  conv.i8
         IL_001f:  ldc.i4     0x93
         IL_0024:  conv.i8
-        IL_0025:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0025:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_002a:  ldc.i4.s   30
         IL_002c:  conv.i8
         IL_002d:  ldc.i4     0x86
         IL_0032:  conv.i8
-        IL_0033:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0033:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0038:  ldc.i4     0xcc
         IL_003d:  conv.i8
         IL_003e:  ldc.i4     0x583f
         IL_0043:  conv.i8
-        IL_0044:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0044:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0049:  ldc.i4     0xc9
         IL_004e:  conv.i8
         IL_004f:  ldc.i4     0xa94c
         IL_0054:  conv.i8
-        IL_0055:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0055:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_005a:  ldc.i4.s   84
         IL_005c:  conv.i8
         IL_005d:  ldc.i4     0x2d06
         IL_0062:  conv.i8
-        IL_0063:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0063:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0068:  ldc.i4.s   48
         IL_006a:  conv.i8
         IL_006b:  ldc.i4     0x9921
         IL_0070:  conv.i8
-        IL_0071:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0071:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0076:  ldc.i4.s   29
         IL_0078:  conv.i8
         IL_0079:  ldc.i4     0x450842
         IL_007e:  conv.i8
-        IL_007f:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_007f:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0084:  ldc.i4.s   42
         IL_0086:  conv.i8
         IL_0087:  ldc.i4     0x999f6c
         IL_008c:  conv.i8
-        IL_008d:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_008d:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0092:  ldc.i4     0xc5
         IL_0097:  conv.i8
         IL_0098:  ldc.i4     0x90faa7
         IL_009d:  conv.i8
-        IL_009e:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_009e:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_00a3:  ldc.i4.s   80
         IL_00a5:  conv.i8
         IL_00a6:  ldc.i4     0x69de08
         IL_00ab:  conv.i8
-        IL_00ac:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_00ac:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_00b1:  ldc.i4     0x9a
         IL_00b6:  conv.i8
         IL_00b7:  ldc.i4     0xcd715be
         IL_00bc:  conv.i8
-        IL_00bd:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_00bd:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_00c2:  ldc.i4.s   57
         IL_00c4:  conv.i8
         IL_00c5:  ldc.i4     0x16a61eb5
         IL_00ca:  conv.i8
-        IL_00cb:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_00cb:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_00d0:  ldc.i4     0xe0
         IL_00d5:  conv.i8
         IL_00d6:  ldc.i4     0x95575fef
         IL_00db:  conv.u8
-        IL_00dc:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_00dc:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_00e1:  ldc.i4     0x93
         IL_00e6:  conv.i8
         IL_00e7:  ldc.i4     0x209e58c5
         IL_00ec:  conv.i8
-        IL_00ed:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_00ed:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_00f2:  ldc.i4.s   59
         IL_00f4:  conv.i8
         IL_00f5:  ldc.i8     0xc3c34b48c
-        IL_00fe:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_00fe:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0103:  ldc.i4     0xc2
         IL_0108:  conv.i8
         IL_0109:  ldc.i8     0x6a671c470f
-        IL_0112:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0112:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0117:  ldc.i4.s   75
         IL_0119:  conv.i8
         IL_011a:  ldc.i8     0xf538cede2b
-        IL_0123:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0123:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0128:  ldc.i4     0x99
         IL_012d:  conv.i8
         IL_012e:  ldc.i8     0x5ba885d43b
-        IL_0137:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0137:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_013c:  ldc.i4.s   104
         IL_013e:  conv.i8
         IL_013f:  ldc.i8     0x9f692f98ac45
-        IL_0148:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0148:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_014d:  ldc.i4     0xd9
         IL_0152:  conv.i8
         IL_0153:  ldc.i8     0x8d5eaa7f0a8e
-        IL_015c:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_015c:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0161:  ldc.i4     0xac
         IL_0166:  conv.i8
         IL_0167:  ldc.i8     0xba1316512e4c
-        IL_0170:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0170:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0175:  ldc.i4.s   28
         IL_0177:  conv.i8
         IL_0178:  ldc.i8     0x8c4fbf2f14aa
-        IL_0181:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0181:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0186:  ldc.i4     0xc0
         IL_018b:  conv.i8
         IL_018c:  ldc.i8     0x69a9eb9a9bc822
-        IL_0195:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0195:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_019a:  ldc.i4.s   116
         IL_019c:  conv.i8
         IL_019d:  ldc.i8     0x3f8f5a893de200
-        IL_01a6:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_01a6:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_01ab:  ldc.i4.s   39
         IL_01ad:  conv.i8
         IL_01ae:  ldc.i8     0x650eb1747a5bc
-        IL_01b7:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_01b7:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_01bc:  ldc.i4     0xd9
         IL_01c1:  conv.i8
         IL_01c2:  ldc.i8     0xd3d50809c70fda
-        IL_01cb:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_01cb:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_01d0:  ldc.i4     0xc0
         IL_01d5:  conv.i8
         IL_01d6:  ldc.i8     0xac6556a4ca94513e
-        IL_01df:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_01df:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_01e4:  ldc.i4.s   32
         IL_01e6:  conv.i8
         IL_01e7:  ldc.i8     0xa697fcbfd6d232d1
-        IL_01f0:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_01f0:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_01f5:  ldc.i4     0x9c
         IL_01fa:  conv.i8
         IL_01fb:  ldc.i8     0xc4421a4f5147b9b8
-        IL_0204:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0204:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0209:  ldc.i4     0x9e
         IL_020e:  conv.i8
         IL_020f:  ldc.i8     0xc5ef494112a7b33f
-        IL_0218:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0218:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_021d:  ldc.i4     0xf7fa
         IL_0222:  conv.i8
         IL_0223:  ldc.i4     0xaf
         IL_0228:  conv.i8
-        IL_0229:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0229:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_022e:  ldc.i4     0xad17
         IL_0233:  conv.i8
         IL_0234:  ldc.i4     0xe8
         IL_0239:  conv.i8
-        IL_023a:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_023a:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_023f:  ldc.i4     0xc9c4
         IL_0244:  conv.i8
         IL_0245:  ldc.i4.s   69
         IL_0247:  conv.i8
-        IL_0248:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0248:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_024d:  ldc.i4     0xa704
         IL_0252:  conv.i8
         IL_0253:  ldc.i4.s   18
         IL_0255:  conv.i8
-        IL_0256:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0256:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_025b:  ldc.i4     0xc55b
         IL_0260:  conv.i8
         IL_0261:  ldc.i4     0xa33a
         IL_0266:  conv.i8
-        IL_0267:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0267:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_026c:  ldc.i4     0xab88
         IL_0271:  conv.i8
         IL_0272:  ldc.i4     0x9a3c
         IL_0277:  conv.i8
-        IL_0278:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0278:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_027d:  ldc.i4     0xa539
         IL_0282:  conv.i8
         IL_0283:  ldc.i4     0xcf3a
         IL_0288:  conv.i8
-        IL_0289:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0289:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_028e:  ldc.i4     0x5890
         IL_0293:  conv.i8
         IL_0294:  ldc.i4     0xeec8
         IL_0299:  conv.i8
-        IL_029a:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_029a:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_029f:  ldc.i4     0xe9e2
         IL_02a4:  conv.i8
         IL_02a5:  ldc.i4     0xfe7c46
         IL_02aa:  conv.i8
-        IL_02ab:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_02ab:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_02b0:  ldc.i4     0x7303
         IL_02b5:  conv.i8
         IL_02b6:  ldc.i4     0x419f2a
         IL_02bb:  conv.i8
-        IL_02bc:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_02bc:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_02c1:  ldc.i4     0xe105
         IL_02c6:  conv.i8
         IL_02c7:  ldc.i4     0x13f913
         IL_02cc:  conv.i8
-        IL_02cd:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_02cd:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_02d2:  ldc.i4     0x8191
         IL_02d7:  conv.i8
         IL_02d8:  ldc.i4     0xfa2458
         IL_02dd:  conv.i8
-        IL_02de:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_02de:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_02e3:  ldc.i4     0x6d9
         IL_02e8:  conv.i8
         IL_02e9:  ldc.i4     0x91cf14f7
         IL_02ee:  conv.u8
-        IL_02ef:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_02ef:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_02f4:  ldc.i4     0xbdb1
         IL_02f9:  conv.i8
         IL_02fa:  ldc.i4     0x86c2a97c
         IL_02ff:  conv.u8
-        IL_0300:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0300:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0305:  ldc.i4     0xe905
         IL_030a:  conv.i8
         IL_030b:  ldc.i4     0x64f702f4
         IL_0310:  conv.i8
-        IL_0311:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0311:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0316:  ldc.i4     0x2fdc
         IL_031b:  conv.i8
         IL_031c:  ldc.i4     0xf059caf6
         IL_0321:  conv.u8
-        IL_0322:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0322:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0327:  ldc.i4     0xf8fd
         IL_032c:  conv.i8
         IL_032d:  ldc.i8     0x13f0265b1e
-        IL_0336:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0336:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_033b:  ldc.i4     0xe8b8
         IL_0340:  conv.i8
         IL_0341:  ldc.i8     0xaa69a6308
-        IL_034a:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_034a:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_034f:  ldc.i4     0x3d00
         IL_0354:  conv.i8
         IL_0355:  ldc.i8     0xfbcb67879b
-        IL_035e:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_035e:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0363:  ldc.i4     0xaa46
         IL_0368:  conv.i8
         IL_0369:  ldc.i8     0x85c3d371d5
-        IL_0372:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0372:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0377:  ldc.i4     0x5f60
         IL_037c:  conv.i8
         IL_037d:  ldc.i8     0x8cde4a63203
-        IL_0386:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0386:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_038b:  ldc.i4     0x92b5
         IL_0390:  conv.i8
         IL_0391:  ldc.i8     0x7ca86ba2f30e
-        IL_039a:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_039a:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_039f:  ldc.i4     0x93c6
         IL_03a4:  conv.i8
         IL_03a5:  ldc.i8     0xa2d73fc4eac0
-        IL_03ae:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_03ae:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_03b3:  ldc.i4     0x4156
         IL_03b8:  conv.i8
         IL_03b9:  ldc.i8     0x6dbd08f2fda
-        IL_03c2:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_03c2:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_03c7:  ldc.i4     0x4597
         IL_03cc:  conv.i8
         IL_03cd:  ldc.i8     0x6cfb0ba5962826
-        IL_03d6:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_03d6:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_03db:  ldc.i4     0x6bac
         IL_03e0:  conv.i8
         IL_03e1:  ldc.i8     0x1e79315071480f
-        IL_03ea:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_03ea:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_03ef:  ldc.i4     0x2c3a
         IL_03f4:  conv.i8
         IL_03f5:  ldc.i8     0x92f12cbd82df69
-        IL_03fe:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_03fe:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0403:  ldc.i4     0x9859
         IL_0408:  conv.i8
         IL_0409:  ldc.i8     0xb0f0cd9dc019f2
-        IL_0412:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0412:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0417:  ldc.i4     0xb37f
         IL_041c:  conv.i8
         IL_041d:  ldc.i8     0x4966447d15850076
-        IL_0426:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0426:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_042b:  ldc.i4     0x5e34
         IL_0430:  conv.i8
         IL_0431:  ldc.i8     0x7c1869c9ed2cad38
-        IL_043a:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_043a:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_043f:  ldc.i4     0x5c54
         IL_0444:  conv.i8
         IL_0445:  ldc.i8     0x7cee70ee82837a08
-        IL_044e:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_044e:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0453:  ldc.i4     0x967f
         IL_0458:  conv.i8
         IL_0459:  ldc.i8     0x4eb98adf4b8b0d32
-        IL_0462:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0462:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0467:  ldc.i4     0xfd2919
         IL_046c:  conv.i8
         IL_046d:  ldc.i4.s   93
         IL_046f:  conv.i8
-        IL_0470:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0470:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0475:  ldc.i4     0xabd5b1
         IL_047a:  conv.i8
         IL_047b:  ldc.i4     0x98
         IL_0480:  conv.i8
-        IL_0481:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0481:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0486:  ldc.i4     0xab1887
         IL_048b:  conv.i8
         IL_048c:  ldc.i4     0xef
         IL_0491:  conv.i8
-        IL_0492:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0492:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0497:  ldc.i4     0x96034a
         IL_049c:  conv.i8
         IL_049d:  ldc.i4.s   47
         IL_049f:  conv.i8
-        IL_04a0:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_04a0:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_04a5:  ldc.i4     0xd5bb94
         IL_04aa:  conv.i8
         IL_04ab:  ldc.i4     0x57d2
         IL_04b0:  conv.i8
-        IL_04b1:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_04b1:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_04b6:  ldc.i4     0xd7b2cb
         IL_04bb:  conv.i8
         IL_04bc:  ldc.i4     0x80f5
         IL_04c1:  conv.i8
-        IL_04c2:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_04c2:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_04c7:  ldc.i4     0x4ccc6d
         IL_04cc:  conv.i8
         IL_04cd:  ldc.i4     0x87c
         IL_04d2:  conv.i8
-        IL_04d3:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_04d3:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_04d8:  ldc.i4     0xec0c50
         IL_04dd:  conv.i8
         IL_04de:  ldc.i4     0xbdff
         IL_04e3:  conv.i8
-        IL_04e4:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_04e4:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_04e9:  ldc.i4     0x8a6865
         IL_04ee:  conv.i8
         IL_04ef:  ldc.i4     0x76c014
         IL_04f4:  conv.i8
-        IL_04f5:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_04f5:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_04fa:  ldc.i4     0xac38dd
         IL_04ff:  conv.i8
         IL_0500:  ldc.i4     0xf12b09
         IL_0505:  conv.i8
-        IL_0506:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0506:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_050b:  ldc.i4     0x615e2a
         IL_0510:  conv.i8
         IL_0511:  ldc.i4     0xe7cbf8
         IL_0516:  conv.i8
-        IL_0517:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0517:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_051c:  ldc.i4     0xe214f
         IL_0521:  conv.i8
         IL_0522:  ldc.i4     0x5b8e2f
         IL_0527:  conv.i8
-        IL_0528:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0528:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_052d:  ldc.i4     0x3bd7c6
         IL_0532:  conv.i8
         IL_0533:  ldc.i4     0xc1db4e46
         IL_0538:  conv.u8
-        IL_0539:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0539:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_053e:  ldc.i4     0xae208d
         IL_0543:  conv.i8
         IL_0544:  ldc.i4     0x1c9aa7a
         IL_0549:  conv.i8
-        IL_054a:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_054a:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_054f:  ldc.i4     0x8a9cef
         IL_0554:  conv.i8
         IL_0555:  ldc.i4     0x3930b07
         IL_055a:  conv.i8
-        IL_055b:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_055b:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0560:  ldc.i4     0x36b866
         IL_0565:  conv.i8
         IL_0566:  ldc.i4     0xd64b7bef
         IL_056b:  conv.u8
-        IL_056c:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_056c:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0571:  ldc.i4     0xd337cd
         IL_0576:  conv.i8
         IL_0577:  ldc.i8     0xa2b45fb7de
-        IL_0580:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0580:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0585:  ldc.i4     0x24471
         IL_058a:  conv.i8
         IL_058b:  ldc.i8     0x5c5de3da89
-        IL_0594:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0594:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0599:  ldc.i4     0x12b15
         IL_059e:  conv.i8
         IL_059f:  ldc.i8     0x7cd40030fe
-        IL_05a8:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_05a8:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_05ad:  ldc.i4     0xd38af2
         IL_05b2:  conv.i8
         IL_05b3:  ldc.i8     0x5905921572
-        IL_05bc:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_05bc:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_05c1:  ldc.i4     0xaca0d7
         IL_05c6:  conv.i8
         IL_05c7:  ldc.i8     0xc632301abeb8
-        IL_05d0:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_05d0:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_05d5:  ldc.i4     0x4eadc2
         IL_05da:  conv.i8
         IL_05db:  ldc.i8     0x6a1ebf37403c
-        IL_05e4:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_05e4:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_05e9:  ldc.i4     0x5d909c
         IL_05ee:  conv.i8
         IL_05ef:  ldc.i8     0x4021bfa15862
-        IL_05f8:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_05f8:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_05fd:  ldc.i4     0x710e08
         IL_0602:  conv.i8
         IL_0603:  ldc.i8     0xe9a1a030b230
-        IL_060c:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_060c:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0611:  ldc.i4     0x478b9b
         IL_0616:  conv.i8
         IL_0617:  ldc.i8     0x804add8afc31d9
-        IL_0620:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0620:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0625:  ldc.i4     0x5754ed
         IL_062a:  conv.i8
         IL_062b:  ldc.i8     0xaf85e7ebb1ce33
-        IL_0634:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0634:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0639:  ldc.i4     0x3ab44e
         IL_063e:  conv.i8
         IL_063f:  ldc.i8     0xf41b9f70360f78
-        IL_0648:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0648:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_064d:  ldc.i4     0x7aa129
         IL_0652:  conv.i8
         IL_0653:  ldc.i8     0xeb6e4eddf7eb87
-        IL_065c:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_065c:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0661:  ldc.i4     0x3b036f
         IL_0666:  conv.i8
         IL_0667:  ldc.i8     0x333874e4330fbfa4
-        IL_0670:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0670:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0675:  ldc.i4     0xa33186
         IL_067a:  conv.i8
         IL_067b:  ldc.i8     0xec8607412503fc4c
-        IL_0684:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0684:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0689:  ldc.i4     0x9af471
         IL_068e:  conv.i8
         IL_068f:  ldc.i8     0xe7ad0935fdbff151
-        IL_0698:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0698:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_069d:  ldc.i4     0xc04e8c
         IL_06a2:  conv.i8
         IL_06a3:  ldc.i8     0x58ee406ab936ac24
-        IL_06ac:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_06ac:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_06b1:  ldc.i4     0x54fdd28b
         IL_06b6:  conv.i8
         IL_06b7:  ldc.i4.s   52
         IL_06b9:  conv.i8
-        IL_06ba:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_06ba:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_06bf:  ldc.i4     0x33736b36
         IL_06c4:  conv.i8
         IL_06c5:  ldc.i4     0xfd
         IL_06ca:  conv.i8
-        IL_06cb:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_06cb:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_06d0:  ldc.i4     0x69cfe4b7
         IL_06d5:  conv.i8
         IL_06d6:  ldc.i4.s   38
         IL_06d8:  conv.i8
-        IL_06d9:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_06d9:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_06de:  ldc.i4     0xfd078d36
         IL_06e3:  conv.u8
         IL_06e4:  ldc.i4     0xdc
         IL_06e9:  conv.i8
-        IL_06ea:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_06ea:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_06ef:  ldc.i4     0x75cc3f36
         IL_06f4:  conv.i8
         IL_06f5:  ldc.i4     0x1617
         IL_06fa:  conv.i8
-        IL_06fb:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_06fb:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0700:  ldc.i4     0x75d660e
         IL_0705:  conv.i8
         IL_0706:  ldc.i4     0x8511
         IL_070b:  conv.i8
-        IL_070c:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_070c:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0711:  ldc.i4     0x52acb037
         IL_0716:  conv.i8
         IL_0717:  ldc.i4     0x43cb
         IL_071c:  conv.i8
-        IL_071d:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_071d:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0722:  ldc.i4     0xa0db7bf5
         IL_0727:  conv.u8
         IL_0728:  ldc.i4     0x2c98
         IL_072d:  conv.i8
-        IL_072e:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_072e:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0733:  ldc.i4     0x83d4be11
         IL_0738:  conv.u8
         IL_0739:  ldc.i4     0xba37c9
         IL_073e:  conv.i8
-        IL_073f:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_073f:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0744:  ldc.i4     0x83d04f94
         IL_0749:  conv.u8
         IL_074a:  ldc.i4     0x3ddbd0
         IL_074f:  conv.i8
-        IL_0750:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0750:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0755:  ldc.i4     0x5ed41f6a
         IL_075a:  conv.i8
         IL_075b:  ldc.i4     0xeaf1d5
         IL_0760:  conv.i8
-        IL_0761:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0761:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0766:  ldc.i4     0xe364a9a
         IL_076b:  conv.i8
         IL_076c:  ldc.i4     0x85880c
         IL_0771:  conv.i8
-        IL_0772:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0772:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0777:  ldc.i4     0x12657ecb
         IL_077c:  conv.i8
         IL_077d:  ldc.i4     0xa88b8a68
         IL_0782:  conv.u8
-        IL_0783:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0783:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0788:  ldc.i4     0x9897a4ac
         IL_078d:  conv.u8
         IL_078e:  ldc.i4     0x76707981
         IL_0793:  conv.i8
-        IL_0794:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0794:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0799:  ldc.i4     0x469cd1cf
         IL_079e:  conv.i8
         IL_079f:  ldc.i4     0xcf40f67a
         IL_07a4:  conv.u8
-        IL_07a5:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_07a5:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_07aa:  ldc.i4     0xee7444c8
         IL_07af:  conv.u8
         IL_07b0:  ldc.i4     0xd1b0d7de
         IL_07b5:  conv.u8
-        IL_07b6:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_07b6:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_07bb:  ldc.i4     0xfbb6f547
         IL_07c0:  conv.u8
         IL_07c1:  ldc.i8     0xc1ef3c4d9b
-        IL_07ca:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_07ca:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_07cf:  ldc.i4     0xe20dd53
         IL_07d4:  conv.i8
         IL_07d5:  ldc.i8     0xb05833c7cf
-        IL_07de:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_07de:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_07e3:  ldc.i4     0xe5733fb8
         IL_07e8:  conv.u8
         IL_07e9:  ldc.i8     0x8eae18a855
-        IL_07f2:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_07f2:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_07f7:  ldc.i4     0x5db1c271
         IL_07fc:  conv.i8
         IL_07fd:  ldc.i8     0xc4a2f7c27d
-        IL_0806:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0806:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_080b:  ldc.i4     0x7add22a
         IL_0810:  conv.i8
         IL_0811:  ldc.i8     0xed9fd23dc3e
-        IL_081a:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_081a:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_081f:  ldc.i4     0x2239d1d5
         IL_0824:  conv.i8
         IL_0825:  ldc.i8     0xa1ae07a62635
-        IL_082e:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_082e:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0833:  ldc.i4     0x410d4d58
         IL_0838:  conv.i8
         IL_0839:  ldc.i8     0xc05c5205bed2
-        IL_0842:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0842:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0847:  ldc.i4     0x4c3c435e
         IL_084c:  conv.i8
         IL_084d:  ldc.i8     0x1e30c1bf628a
-        IL_0856:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0856:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_085b:  ldc.i4     0x96f44d5
         IL_0860:  conv.i8
         IL_0861:  ldc.i8     0x5488c521a6072b
-        IL_086a:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_086a:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_086f:  ldc.i4     0x17f28913
         IL_0874:  conv.i8
         IL_0875:  ldc.i8     0x796ff3891c44ff
-        IL_087e:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_087e:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0883:  ldc.i4     0x65be69cf
         IL_0888:  conv.i8
         IL_0889:  ldc.i8     0xdd5c6f9b3f3119
-        IL_0892:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0892:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0897:  ldc.i4     0x2200f221
         IL_089c:  conv.i8
         IL_089d:  ldc.i8     0xab6c98c90cfe9d
-        IL_08a6:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_08a6:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_08ab:  ldc.i4     0xd48bee1a
         IL_08b0:  conv.u8
         IL_08b1:  ldc.i8     0x64b76d7491a58799
-        IL_08ba:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_08ba:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_08bf:  ldc.i4     0x6cb93100
         IL_08c4:  conv.i8
         IL_08c5:  ldc.i8     0xa515fe27402dad45
-        IL_08ce:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_08ce:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_08d3:  ldc.i4     0xbed95abe
         IL_08d8:  conv.u8
         IL_08d9:  ldc.i8     0xc9924098acc74be9
-        IL_08e2:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_08e2:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_08e7:  ldc.i4     0x92781a2e
         IL_08ec:  conv.u8
         IL_08ed:  ldc.i8     0x67ada9ef3f9e39b7
-        IL_08f6:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_08f6:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_08fb:  ldc.i8     0xe3aafcdae2
         IL_0904:  ldc.i4     0x9c
         IL_0909:  conv.i8
-        IL_090a:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_090a:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_090f:  ldc.i8     0xd8dad80c34
         IL_0918:  ldc.i4     0x99
         IL_091d:  conv.i8
-        IL_091e:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_091e:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0923:  ldc.i8     0xaddcd074d6
         IL_092c:  ldc.i4     0xea
         IL_0931:  conv.i8
-        IL_0932:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0932:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0937:  ldc.i8     0x96735bc25a
         IL_0940:  ldc.i4     0xba
         IL_0945:  conv.i8
-        IL_0946:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0946:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_094b:  ldc.i8     0xf492ef7446
         IL_0954:  ldc.i4     0x39b1
         IL_0959:  conv.i8
-        IL_095a:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_095a:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_095f:  ldc.i8     0xbc86816119
         IL_0968:  ldc.i4     0x1520
         IL_096d:  conv.i8
-        IL_096e:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_096e:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0973:  ldc.i8     0x60a36818e7
         IL_097c:  ldc.i4     0xc5a8
         IL_0981:  conv.i8
-        IL_0982:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0982:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0987:  ldc.i8     0x317121d508
         IL_0990:  ldc.i4     0xac3d
         IL_0995:  conv.i8
-        IL_0996:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0996:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_099b:  ldc.i8     0x4abfdaf232
         IL_09a4:  ldc.i4     0x5cea57
         IL_09a9:  conv.i8
-        IL_09aa:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_09aa:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_09af:  ldc.i8     0xacc458f392
         IL_09b8:  ldc.i4     0xa9c3e3
         IL_09bd:  conv.i8
-        IL_09be:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_09be:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_09c3:  ldc.i8     0x1020993532
         IL_09cc:  ldc.i4     0xdf6042
         IL_09d1:  conv.i8
-        IL_09d2:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_09d2:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_09d7:  ldc.i8     0xad25b80abb
         IL_09e0:  ldc.i4     0xcec15b
         IL_09e5:  conv.i8
-        IL_09e6:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_09e6:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_09eb:  ldc.i8     0x2305d2c443
         IL_09f4:  ldc.i4     0x2a26131c
         IL_09f9:  conv.i8
-        IL_09fa:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_09fa:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_09ff:  ldc.i8     0x7c42e2ce0
         IL_0a08:  ldc.i4     0x9768024f
         IL_0a0d:  conv.u8
-        IL_0a0e:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0a0e:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0a13:  ldc.i8     0x76f674816c
         IL_0a1c:  ldc.i4     0x8d33c7b4
         IL_0a21:  conv.u8
-        IL_0a22:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0a22:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0a27:  ldc.i8     0xbf567b23bc
         IL_0a30:  ldc.i4     0xef264890
         IL_0a35:  conv.u8
-        IL_0a36:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0a36:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0a3b:  ldc.i8     0xe3283681a0
         IL_0a44:  ldc.i8     0x2e66850719
-        IL_0a4d:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0a4d:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0a52:  ldc.i8     0x11fe13754
         IL_0a5b:  ldc.i8     0x66fad0b407
-        IL_0a64:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0a64:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0a69:  ldc.i8     0x52f259009f
         IL_0a72:  ldc.i8     0xa2886ef414
-        IL_0a7b:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0a7b:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0a80:  ldc.i8     0xa9ebb540fc
         IL_0a89:  ldc.i8     0x9d27ba694f
-        IL_0a92:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0a92:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0a97:  ldc.i8     0x83af60d7eb
         IL_0aa0:  ldc.i8     0xb6f2a0f51f4c
-        IL_0aa9:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0aa9:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0aae:  ldc.i8     0xf2ec42d13a
         IL_0ab7:  ldc.i8     0x46855f279407
-        IL_0ac0:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0ac0:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0ac5:  ldc.i8     0x94e71cb562
         IL_0ace:  ldc.i8     0x2d9566618e56
-        IL_0ad7:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0ad7:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0adc:  ldc.i8     0xc0ee690ddc
         IL_0ae5:  ldc.i8     0x54295c8ca584
-        IL_0aee:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0aee:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0af3:  ldc.i8     0x2683cd5206
         IL_0afc:  ldc.i8     0xa5a2d269bcd188
-        IL_0b05:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0b05:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0b0a:  ldc.i8     0x2e77038305
         IL_0b13:  ldc.i8     0xc727f0f3787e22
-        IL_0b1c:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0b1c:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0b21:  ldc.i8     0x8323b9d026
         IL_0b2a:  ldc.i8     0xfed29f8575c120
-        IL_0b33:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0b33:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0b38:  ldc.i8     0x7b3231f0fc
         IL_0b41:  ldc.i8     0x91080854b27d3e
-        IL_0b4a:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0b4a:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0b4f:  ldc.i8     0x84522a7708
         IL_0b58:  ldc.i8     0x91ba8f22fccd6222
-        IL_0b61:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0b61:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0b66:  ldc.i8     0xafb1b50d90
         IL_0b6f:  ldc.i8     0x3261a532b65c7838
-        IL_0b78:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0b78:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0b7d:  ldc.i8     0x2c65e838c6
         IL_0b86:  ldc.i8     0x5b858452c9bf6f39
-        IL_0b8f:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0b8f:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0b94:  ldc.i8     0x219e837734
         IL_0b9d:  ldc.i8     0x97873bed5bb0a44b
-        IL_0ba6:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0ba6:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0bab:  ldc.i8     0x9f133e2f116f
         IL_0bb4:  ldc.i4.s   115
         IL_0bb6:  conv.i8
-        IL_0bb7:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0bb7:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0bbc:  ldc.i8     0x887577574766
         IL_0bc5:  ldc.i4.s   72
         IL_0bc7:  conv.i8
-        IL_0bc8:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0bc8:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0bcd:  ldc.i8     0xba4c778d4aa8
         IL_0bd6:  ldc.i4.s   58
         IL_0bd8:  conv.i8
-        IL_0bd9:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0bd9:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0bde:  ldc.i8     0x2683df421474
         IL_0be7:  ldc.i4.s   86
         IL_0be9:  conv.i8
-        IL_0bea:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0bea:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0bef:  ldc.i8     0x6ff76294c275
         IL_0bf8:  ldc.i4     0x89f7
         IL_0bfd:  conv.i8
-        IL_0bfe:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0bfe:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0c03:  ldc.i8     0xfdf053abefa2
         IL_0c0c:  ldc.i4     0xeb65
         IL_0c11:  conv.i8
-        IL_0c12:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0c12:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0c17:  ldc.i8     0xea4b254b24eb
         IL_0c20:  ldc.i4     0xba27
         IL_0c25:  conv.i8
-        IL_0c26:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0c26:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0c2b:  ldc.i8     0x9f7ce21b811
         IL_0c34:  ldc.i4     0xe8f6
         IL_0c39:  conv.i8
-        IL_0c3a:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0c3a:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0c3f:  ldc.i8     0x9cc645fa08a1
         IL_0c48:  ldc.i4     0xa29ea3
         IL_0c4d:  conv.i8
-        IL_0c4e:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0c4e:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0c53:  ldc.i8     0x726f9a9f816e
         IL_0c5c:  ldc.i4     0x70dce1
         IL_0c61:  conv.i8
-        IL_0c62:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0c62:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0c67:  ldc.i8     0xa4be34825ef6
         IL_0c70:  ldc.i4     0xbb2be7
         IL_0c75:  conv.i8
-        IL_0c76:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0c76:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0c7b:  ldc.i8     0x57ff147cb7c1
         IL_0c84:  ldc.i4     0xe255af
         IL_0c89:  conv.i8
-        IL_0c8a:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0c8a:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0c8f:  ldc.i8     0xab9d6f546dd4
         IL_0c98:  ldc.i4     0x7e2772a5
         IL_0c9d:  conv.i8
-        IL_0c9e:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0c9e:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0ca3:  ldc.i8     0xb148e3446e89
         IL_0cac:  ldc.i4     0x51ed3c28
         IL_0cb1:  conv.i8
-        IL_0cb2:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0cb2:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0cb7:  ldc.i8     0x1e3abfe9725e
         IL_0cc0:  ldc.i4     0xd4dec3f4
         IL_0cc5:  conv.u8
-        IL_0cc6:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0cc6:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0ccb:  ldc.i8     0xf61bcaba115e
         IL_0cd4:  ldc.i4     0xfade149f
         IL_0cd9:  conv.u8
-        IL_0cda:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0cda:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0cdf:  ldc.i8     0xae642b9a6626
         IL_0ce8:  ldc.i8     0xd8de0e0b9a
-        IL_0cf1:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0cf1:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0cf6:  ldc.i8     0x9d015a13c8ae
         IL_0cff:  ldc.i8     0xafc8827997
-        IL_0d08:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0d08:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0d0d:  ldc.i8     0xecc72cc2df89
         IL_0d16:  ldc.i8     0x70d47ec7c4
-        IL_0d1f:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0d1f:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0d24:  ldc.i8     0xfdbf05894fd2
         IL_0d2d:  ldc.i8     0x12aec393bd
-        IL_0d36:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0d36:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0d3b:  ldc.i8     0xcd7675a70874
         IL_0d44:  ldc.i8     0xd7d696a62cbc
-        IL_0d4d:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0d4d:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0d52:  ldc.i8     0xfad44a89216d
         IL_0d5b:  ldc.i8     0xcb8cfc8ada4c
-        IL_0d64:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0d64:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0d69:  ldc.i8     0xf41eb5363551
         IL_0d72:  ldc.i8     0x9c040aa7775e
-        IL_0d7b:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0d7b:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0d80:  ldc.i8     0x3c02d93e01f6
         IL_0d89:  ldc.i8     0xf1f4e68a14f8
-        IL_0d92:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0d92:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0d97:  ldc.i8     0xe0d99954b598
         IL_0da0:  ldc.i8     0xb2a2de4e453485
-        IL_0da9:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0da9:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0dae:  ldc.i8     0xa6081be866d9
         IL_0db7:  ldc.i8     0xf2a12e845e4f2e
-        IL_0dc0:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0dc0:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0dc5:  ldc.i8     0xae56a5680dfd
         IL_0dce:  ldc.i8     0xc96cd7c15d5bec
-        IL_0dd7:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0dd7:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0ddc:  ldc.i8     0x360363e37938
         IL_0de5:  ldc.i8     0xd4ed572e1937e0
-        IL_0dee:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0dee:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0df3:  ldc.i8     0x1f052aebf185
         IL_0dfc:  ldc.i8     0x3584e582d1c6db1a
-        IL_0e05:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0e05:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0e0a:  ldc.i8     0x3fac9c7b3d1b
         IL_0e13:  ldc.i8     0xa4b120f080d69113
-        IL_0e1c:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0e1c:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0e21:  ldc.i8     0x5330d51c3217
         IL_0e2a:  ldc.i8     0xc16dd32ffd822c0e
-        IL_0e33:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0e33:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0e38:  ldc.i8     0xcd0694ff5ab0
         IL_0e41:  ldc.i8     0x29673fe67245fbfc
-        IL_0e4a:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0e4a:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0e4f:  ldc.i8     0x98265e5a308523
         IL_0e58:  ldc.i4.s   125
         IL_0e5a:  conv.i8
-        IL_0e5b:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0e5b:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0e60:  ldc.i8     0x560863350df217
         IL_0e69:  ldc.i4     0xc8
         IL_0e6e:  conv.i8
-        IL_0e6f:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0e6f:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0e74:  ldc.i8     0x798ce804d829a1
         IL_0e7d:  ldc.i4     0xb1
         IL_0e82:  conv.i8
-        IL_0e83:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0e83:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0e88:  ldc.i8     0x7994c0051256fd
         IL_0e91:  ldc.i4.s   92
         IL_0e93:  conv.i8
-        IL_0e94:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0e94:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0e99:  ldc.i8     0xff1a2838e69f42
         IL_0ea2:  ldc.i4     0x3c16
         IL_0ea7:  conv.i8
-        IL_0ea8:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0ea8:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0ead:  ldc.i8     0x9e7e95ac5de2c7
         IL_0eb6:  ldc.i4     0xed49
         IL_0ebb:  conv.i8
-        IL_0ebc:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0ebc:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0ec1:  ldc.i8     0xfd6867eabba5c0
         IL_0eca:  ldc.i4     0xc689
         IL_0ecf:  conv.i8
-        IL_0ed0:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0ed0:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0ed5:  ldc.i8     0x9d1632daf20de0
         IL_0ede:  ldc.i4     0xb74f
         IL_0ee3:  conv.i8
-        IL_0ee4:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0ee4:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0ee9:  ldc.i8     0xee29d8f76d4e9c
         IL_0ef2:  ldc.i4     0x8020d4
         IL_0ef7:  conv.i8
-        IL_0ef8:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0ef8:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0efd:  ldc.i8     0x89e03ecf8daa0a
         IL_0f06:  ldc.i4     0x3e7587
         IL_0f0b:  conv.i8
-        IL_0f0c:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0f0c:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0f11:  ldc.i8     0x115763be4beb44
         IL_0f1a:  ldc.i4     0x88f762
         IL_0f1f:  conv.i8
-        IL_0f20:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0f20:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0f25:  ldc.i8     0x815cfc87c427d0
         IL_0f2e:  ldc.i4     0x9eec06
         IL_0f33:  conv.i8
-        IL_0f34:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0f34:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0f39:  ldc.i8     0x1d9c3c9ded0c1a
         IL_0f42:  ldc.i4     0xb9f6d331
         IL_0f47:  conv.u8
-        IL_0f48:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0f48:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0f4d:  ldc.i8     0x932225412f1222
         IL_0f56:  ldc.i4     0x130ff743
         IL_0f5b:  conv.i8
-        IL_0f5c:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0f5c:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0f61:  ldc.i8     0xfe82151e2e0bf3
         IL_0f6a:  ldc.i4     0x781cd6f9
         IL_0f6f:  conv.i8
-        IL_0f70:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0f70:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0f75:  ldc.i8     0x2222abb5061b12
         IL_0f7e:  ldc.i4     0x491f1df
         IL_0f83:  conv.i8
-        IL_0f84:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0f84:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0f89:  ldc.i8     0x12ce0cf0452748
         IL_0f92:  ldc.i8     0xa8566274aa
-        IL_0f9b:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0f9b:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0fa0:  ldc.i8     0xe570484e9937e1
         IL_0fa9:  ldc.i8     0xac81f171be
-        IL_0fb2:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0fb2:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0fb7:  ldc.i8     0xeb371f7f8f514e
         IL_0fc0:  ldc.i8     0xdf0248189c
-        IL_0fc9:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0fc9:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0fce:  ldc.i8     0x3777a7cc43dfd7
         IL_0fd7:  ldc.i8     0x3a7b8eaf40
-        IL_0fe0:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0fe0:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0fe5:  ldc.i8     0xe181db76238786
         IL_0fee:  ldc.i8     0x4126e572a568
-        IL_0ff7:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_0ff7:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_0ffc:  ldc.i8     0xac1df87977e122
         IL_1005:  ldc.i8     0xe1e8cfde6678
-        IL_100e:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_100e:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_1013:  ldc.i8     0x1c858763a2c23b
         IL_101c:  ldc.i8     0x4ef61f3964f
-        IL_1025:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_1025:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_102a:  ldc.i8     0xbd786bbb71ce46
         IL_1033:  ldc.i8     0x2cda097a464f
-        IL_103c:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_103c:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_1041:  ldc.i8     0xa7a6de21a46360
         IL_104a:  ldc.i8     0x7afda16f98c3
-        IL_1053:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_1053:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_1058:  ldc.i8     0x6fed70a6ccfdf2
         IL_1061:  ldc.i8     0x9771441e8e00e8
-        IL_106a:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_106a:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_106f:  ldc.i8     0x5ad2782dcd5e60
         IL_1078:  ldc.i8     0xd170d518385f6
-        IL_1081:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_1081:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_1086:  ldc.i8     0x1fd67b153bc9b9
         IL_108f:  ldc.i8     0x7b3366dff66c6c
-        IL_1098:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_1098:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_109d:  ldc.i8     0xbf00203beb73f4
         IL_10a6:  ldc.i8     0x693495fefab1c77e
-        IL_10af:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_10af:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_10b4:  ldc.i8     0x2faac1b1b068f8
         IL_10bd:  ldc.i8     0x1cb11cc5c3aaff86
-        IL_10c6:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_10c6:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_10cb:  ldc.i8     0xbb63cfbffe7648
         IL_10d4:  ldc.i8     0x84f5b0c583f9e77b
-        IL_10dd:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_10dd:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_10e2:  ldc.i8     0x615db89673241c
         IL_10eb:  ldc.i8     0x8de5f125247eba0f
-        IL_10f4:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_10f4:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_10f9:  ldc.i8     0x9be183a6b293dffe
         IL_1102:  ldc.i4.s   114
         IL_1104:  conv.i8
-        IL_1105:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_1105:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_110a:  ldc.i8     0xa3df9b76d8a51b19
         IL_1113:  ldc.i4     0xc4
         IL_1118:  conv.i8
-        IL_1119:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_1119:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_111e:  ldc.i8     0xb4cc300f0ea7566d
         IL_1127:  ldc.i4.s   126
         IL_1129:  conv.i8
-        IL_112a:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_112a:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_112f:  ldc.i8     0xfdac12a8e23e16e7
         IL_1138:  ldc.i4.s   21
         IL_113a:  conv.i8
-        IL_113b:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_113b:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_1140:  ldc.i8     0xc0805405aadc0f47
         IL_1149:  ldc.i4     0x19d4
         IL_114e:  conv.i8
-        IL_114f:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_114f:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_1154:  ldc.i8     0x843a391f8d9f8972
         IL_115d:  ldc.i4     0x317a
         IL_1162:  conv.i8
-        IL_1163:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_1163:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_1168:  ldc.i8     0x5a0d124c427ed453
         IL_1171:  ldc.i4     0x34fe
         IL_1176:  conv.i8
-        IL_1177:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_1177:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_117c:  ldc.i8     0x8631150f34008f1b
         IL_1185:  ldc.i4     0x2ecd
         IL_118a:  conv.i8
-        IL_118b:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_118b:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_1190:  ldc.i8     0x3ff4c18715ad3a76
         IL_1199:  ldc.i4     0x72d22a
         IL_119e:  conv.i8
-        IL_119f:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_119f:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_11a4:  ldc.i8     0x3ef93e5a649422bd
         IL_11ad:  ldc.i4     0xdb5c60
         IL_11b2:  conv.i8
-        IL_11b3:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_11b3:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_11b8:  ldc.i8     0x6bdd1056ae58fe0e
         IL_11c1:  ldc.i4     0x805c75
         IL_11c6:  conv.i8
-        IL_11c7:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_11c7:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_11cc:  ldc.i8     0xeff1fa30f3ad9ded
         IL_11d5:  ldc.i4     0xc83ca
         IL_11da:  conv.i8
-        IL_11db:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_11db:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_11e0:  ldc.i8     0xbbc143ac147e56a9
         IL_11e9:  ldc.i4     0x161179b7
         IL_11ee:  conv.i8
-        IL_11ef:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_11ef:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_11f4:  ldc.i8     0x829dde88caa2e45
         IL_11fd:  ldc.i4     0x1443ab62
         IL_1202:  conv.i8
-        IL_1203:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_1203:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_1208:  ldc.i8     0x97ac43ff797a4514
         IL_1211:  ldc.i4     0x33eef42b
         IL_1216:  conv.i8
-        IL_1217:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_1217:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_121c:  ldc.i8     0x703e9cdf96a148aa
         IL_1225:  ldc.i4     0x8e08f3d8
         IL_122a:  conv.u8
-        IL_122b:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_122b:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_1230:  ldc.i8     0x75cbb739b54e2ad6
         IL_1239:  ldc.i8     0x7a8b12628c
-        IL_1242:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_1242:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_1247:  ldc.i8     0x91e42fafe97d638f
         IL_1250:  ldc.i8     0xfbe867c51
-        IL_1259:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_1259:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_125e:  ldc.i8     0x9159d77deec116c1
         IL_1267:  ldc.i8     0x96c0c774fc
-        IL_1270:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_1270:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_1275:  ldc.i8     0xb59dbb4c15761d88
         IL_127e:  ldc.i8     0x4a033a73e7
-        IL_1287:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_1287:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_128c:  ldc.i8     0xab668e9783af9617
         IL_1295:  ldc.i8     0x5aa18404076c
-        IL_129e:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_129e:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_12a3:  ldc.i8     0x54c68e5b5c4127df
         IL_12ac:  ldc.i8     0xf2934fd8dd1f
-        IL_12b5:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_12b5:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_12ba:  ldc.i8     0xf490d3936184c9f9
         IL_12c3:  ldc.i8     0x4007477e2110
-        IL_12cc:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_12cc:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_12d1:  ldc.i8     0x349e577c9d5c44e2
         IL_12da:  ldc.i8     0xbdb2235af963
-        IL_12e3:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_12e3:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_12e8:  ldc.i8     0x58f3ac26cdafde28
         IL_12f1:  ldc.i8     0x17d4f4ade9ec35
-        IL_12fa:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_12fa:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_12ff:  ldc.i8     0xa4a263c316d21f4c
         IL_1308:  ldc.i8     0xa7ec1e6fda834b
-        IL_1311:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_1311:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_1316:  ldc.i8     0x6ab14771c448666f
         IL_131f:  ldc.i8     0x5b0f49593c3a27
-        IL_1328:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_1328:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_132d:  ldc.i8     0x15f392c3602aa4f7
         IL_1336:  ldc.i8     0x18af171045f88e
-        IL_133f:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_133f:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_1344:  ldc.i8     0xf17de69c0063f62c
         IL_134d:  ldc.i8     0xee2a164c2c3a46f8
-        IL_1356:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_1356:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_135b:  ldc.i8     0xf34b743eeff8e5c6
         IL_1364:  ldc.i8     0x4f4067f1a0e404ad
-        IL_136d:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_136d:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_1372:  ldc.i8     0xee0296f678756647
         IL_137b:  ldc.i8     0xf1bbfdc6f0280d36
-        IL_1384:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_1384:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_1389:  ldc.i8     0x65c33db0c952b829
         IL_1392:  ldc.i8     0xa7ab9c39dcffbcf3
-        IL_139b:  call       void JitTest.Test::testNumbers(unsigned int64,
+        IL_139b:  call       void JitTest_muldiv_unsigned_il.Test::testNumbers(unsigned int64,
                                                             unsigned int64)
         IL_13a0:  ldstr      "All tests passed."
         IL_13a5:  call       void [System.Console]System.Console::WriteLine(class System.String)
@@ -1517,6 +1517,6 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_muldiv_unsigned_il'
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/int64/unsigned/muldiv_d.csproj b/src/tests/JIT/Methodical/int64/unsigned/muldiv_d.csproj
index b6228bc12c4f7d..a1dee267f80756 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/muldiv_d.csproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/muldiv_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/unsigned/muldiv_do.csproj b/src/tests/JIT/Methodical/int64/unsigned/muldiv_do.csproj
index ed59f3f7eecfe9..258548c16cf5be 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/muldiv_do.csproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/muldiv_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/unsigned/muldiv_il_d.ilproj b/src/tests/JIT/Methodical/int64/unsigned/muldiv_il_d.ilproj
index 7826aaa260d567..beab4de2ce7152 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/muldiv_il_d.ilproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/muldiv_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/unsigned/muldiv_il_r.ilproj b/src/tests/JIT/Methodical/int64/unsigned/muldiv_il_r.ilproj
index 1b4413d62643d8..b7c6786ce53970 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/muldiv_il_r.ilproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/muldiv_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/unsigned/muldiv_r.csproj b/src/tests/JIT/Methodical/int64/unsigned/muldiv_r.csproj
index 19f2a2f180fd9e..72b256370e4785 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/muldiv_r.csproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/muldiv_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/int64/unsigned/muldiv_ro.csproj b/src/tests/JIT/Methodical/int64/unsigned/muldiv_ro.csproj
index fa764b64d7a602..919b7db311d7be 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/muldiv_ro.csproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/muldiv_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/jitinterface/bug603649.cs b/src/tests/JIT/Methodical/jitinterface/bug603649.cs
index 035e4d406870be..72f2afe822a97a 100644
--- a/src/tests/JIT/Methodical/jitinterface/bug603649.cs
+++ b/src/tests/JIT/Methodical/jitinterface/bug603649.cs
@@ -2,14 +2,19 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-internal class foo
+namespace Test_bug603649_cs
+{
+public class foo
 {
     private static object s_o = typeof(string);
-    private static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         bool f = typeof(string) == s_o as Type;
         Console.WriteLine(f);
         if (f) return 100; else return 101;
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/jitinterface/bug603649.csproj b/src/tests/JIT/Methodical/jitinterface/bug603649.csproj
index 8a4c0cee39e788..a91bee34631062 100644
--- a/src/tests/JIT/Methodical/jitinterface/bug603649.csproj
+++ b/src/tests/JIT/Methodical/jitinterface/bug603649.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/largeframes/basic/bigframes.cs b/src/tests/JIT/Methodical/largeframes/basic/bigframes.cs
index 134b566de9df23..c7b1622d601b8c 100644
--- a/src/tests/JIT/Methodical/largeframes/basic/bigframes.cs
+++ b/src/tests/JIT/Methodical/largeframes/basic/bigframes.cs
@@ -18,8 +18,9 @@
 using System;
 using System.Runtime.InteropServices;
 using System.Runtime.CompilerServices;
+using Xunit;
 
-namespace BigFrames
+namespace BigFrames_bigframes
 {
 
     [StructLayout(LayoutKind.Explicit)]
@@ -141,7 +142,8 @@ public static void Test5()
             TestWrite(ref s);
         }
 
-        public static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             Test1();
             Test2();
diff --git a/src/tests/JIT/Methodical/largeframes/basic/bigframes.csproj b/src/tests/JIT/Methodical/largeframes/basic/bigframes.csproj
index 9b051ce36ef759..a67d3655f35d15 100644
--- a/src/tests/JIT/Methodical/largeframes/basic/bigframes.csproj
+++ b/src/tests/JIT/Methodical/largeframes/basic/bigframes.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/largeframes/skip/skippage.cs b/src/tests/JIT/Methodical/largeframes/skip/skippage.cs
index adb47d9f42cdd5..aeb231df37e60c 100644
--- a/src/tests/JIT/Methodical/largeframes/skip/skippage.cs
+++ b/src/tests/JIT/Methodical/largeframes/skip/skippage.cs
@@ -13,8 +13,9 @@
 using System;
 using System.Runtime.InteropServices;
 using System.Runtime.CompilerServices;
+using Xunit;
 
-namespace BigFrames
+namespace BigFrames_skippage
 {
 
     [StructLayout(LayoutKind.Explicit)]
@@ -57,7 +58,8 @@ public static void Test1(bool call_struct_function)
             }
         }
 
-        public static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             TestWrite2(); // Make sure this is JITted first, so the call from Test1() is not to the prestub.
 
diff --git a/src/tests/JIT/Methodical/largeframes/skip/skippage.csproj b/src/tests/JIT/Methodical/largeframes/skip/skippage.csproj
index 5844d29f23d0df..4af52926760687 100644
--- a/src/tests/JIT/Methodical/largeframes/skip/skippage.csproj
+++ b/src/tests/JIT/Methodical/largeframes/skip/skippage.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/largeframes/skip2/skippage2.cs b/src/tests/JIT/Methodical/largeframes/skip2/skippage2.cs
index 60d14c2b449f65..889e2c9d017e96 100644
--- a/src/tests/JIT/Methodical/largeframes/skip2/skippage2.cs
+++ b/src/tests/JIT/Methodical/largeframes/skip2/skippage2.cs
@@ -14,8 +14,9 @@
 using System;
 using System.Runtime.InteropServices;
 using System.Runtime.CompilerServices;
+using Xunit;
 
-namespace BigFrames
+namespace BigFrames_skippage2
 {
 
     [StructLayout(LayoutKind.Explicit)]
@@ -219,7 +220,8 @@ public static void Test1(bool call_struct_function)
             }
         }
 
-        public static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             SmallFrameSize(); // Make sure this is JITted first, so the call from Test1() is not to the prestub.
 
diff --git a/src/tests/JIT/Methodical/largeframes/skip2/skippage2.csproj b/src/tests/JIT/Methodical/largeframes/skip2/skippage2.csproj
index 05ba02ee9136c4..58d5044193b630 100644
--- a/src/tests/JIT/Methodical/largeframes/skip2/skippage2.csproj
+++ b/src/tests/JIT/Methodical/largeframes/skip2/skippage2.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/largeframes/skip3/skippage3.cs b/src/tests/JIT/Methodical/largeframes/skip3/skippage3.cs
index f044b083cc0aab..861227dee2c88c 100644
--- a/src/tests/JIT/Methodical/largeframes/skip3/skippage3.cs
+++ b/src/tests/JIT/Methodical/largeframes/skip3/skippage3.cs
@@ -8,8 +8,9 @@
 using System;
 using System.Runtime.InteropServices;
 using System.Runtime.CompilerServices;
+using Xunit;
 
-namespace BigFrames
+namespace BigFrames_skippage3
 {
 
     [StructLayout(LayoutKind.Explicit)]
@@ -67,7 +68,8 @@ public static void EatStackThenTest1(int level = 0)
             }
         }
 
-        public static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             Test1(); // force JIT of this
 
diff --git a/src/tests/JIT/Methodical/largeframes/skip3/skippage3.csproj b/src/tests/JIT/Methodical/largeframes/skip3/skippage3.csproj
index 749c55c15d07a1..cc7708b554a4c7 100644
--- a/src/tests/JIT/Methodical/largeframes/skip3/skippage3.csproj
+++ b/src/tests/JIT/Methodical/largeframes/skip3/skippage3.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/largeframes/skip4/skippage4.cs b/src/tests/JIT/Methodical/largeframes/skip4/skippage4.cs
index cfd812a1bcc5b2..b35bab401f4061 100644
--- a/src/tests/JIT/Methodical/largeframes/skip4/skippage4.cs
+++ b/src/tests/JIT/Methodical/largeframes/skip4/skippage4.cs
@@ -8,8 +8,9 @@
 using System;
 using System.Runtime.InteropServices;
 using System.Runtime.CompilerServices;
+using Xunit;
 
-namespace BigFrames
+namespace BigFrames_skippage4
 {
 
     [StructLayout(LayoutKind.Explicit)]
@@ -42,7 +43,8 @@ public static void Test1()
             TestWrite(s);
         }
 
-        public static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             Test1();
 
diff --git a/src/tests/JIT/Methodical/largeframes/skip4/skippage4.csproj b/src/tests/JIT/Methodical/largeframes/skip4/skippage4.csproj
index 32364625a297cb..60c25e1f245e02 100644
--- a/src/tests/JIT/Methodical/largeframes/skip4/skippage4.csproj
+++ b/src/tests/JIT/Methodical/largeframes/skip4/skippage4.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/largeframes/skip5/skippage5.cs b/src/tests/JIT/Methodical/largeframes/skip5/skippage5.cs
index c6b0c5fbfe3e86..467f2f273abb2d 100644
--- a/src/tests/JIT/Methodical/largeframes/skip5/skippage5.cs
+++ b/src/tests/JIT/Methodical/largeframes/skip5/skippage5.cs
@@ -4,8 +4,11 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using Xunit;
 
-class Program
+namespace Test_skippage5_cs
+{
+public class Program
 {
     [StructLayout(LayoutKind.Sequential)]
     unsafe struct S
@@ -18,7 +21,8 @@ class C
         public S s;
     }
 
-    static int Main() => Test(new C());
+    [Fact]
+    public static int TestEntryPoint() => Test(new C());
 
     [MethodImpl(MethodImplOptions.NoInlining)]
     static void Call(int r0, int r1, int r2, int r3, int r4, int r5, int r6, S s)
@@ -33,3 +37,4 @@ static int Test(C c)
         return 100; // If we don't crash, we pass
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/largeframes/skip5/skippage5.csproj b/src/tests/JIT/Methodical/largeframes/skip5/skippage5.csproj
index 2a68e317780e1f..531c58f2a2a6b9 100644
--- a/src/tests/JIT/Methodical/largeframes/skip5/skippage5.csproj
+++ b/src/tests/JIT/Methodical/largeframes/skip5/skippage5.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/largeframes/skip6/skippage6.cs b/src/tests/JIT/Methodical/largeframes/skip6/skippage6.cs
index e7cdb1c5ee81a5..b25df301217f76 100644
--- a/src/tests/JIT/Methodical/largeframes/skip6/skippage6.cs
+++ b/src/tests/JIT/Methodical/largeframes/skip6/skippage6.cs
@@ -4,7 +4,10 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using Xunit;
 
+namespace Test_skippage6
+{
 // Exercise stack probing after localloc, on architectures with fixed outgoing argument
 // space. Some implementations did not probe after re-establishing the outgoing argument
 // space after a localloc.
@@ -12088,7 +12091,8 @@ public static void Escape(ref LargeStruct s)
         {
         }
 
-        public static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             Test1(1); // force JIT of this
             Test1(80);
@@ -12105,3 +12109,4 @@ public static int Main()
         }
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/largeframes/skip6/skippage6.csproj b/src/tests/JIT/Methodical/largeframes/skip6/skippage6.csproj
index 46ec5aa3cb6d3f..e00db2ddc8e385 100644
--- a/src/tests/JIT/Methodical/largeframes/skip6/skippage6.csproj
+++ b/src/tests/JIT/Methodical/largeframes/skip6/skippage6.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/largeframes/skip7/skippage7.cs b/src/tests/JIT/Methodical/largeframes/skip7/skippage7.cs
index ce8384b9dd2489..2b9c36b53ccd2d 100644
--- a/src/tests/JIT/Methodical/largeframes/skip7/skippage7.cs
+++ b/src/tests/JIT/Methodical/largeframes/skip7/skippage7.cs
@@ -4,7 +4,10 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using Xunit;
 
+namespace Test_skippage7
+{
 // Exercise stack probing after localloc, on architectures with fixed outgoing argument
 // space. Some implementations did not probe after re-establishing the outgoing argument
 // space after a localloc.
@@ -81,7 +84,8 @@ public static void Escape(ref LargeStruct s)
         {
         }
 
-        public static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             Test1(1); // force JIT of this
             Test1(80);
@@ -98,3 +102,4 @@ public static int Main()
         }
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/largeframes/skip7/skippage7.csproj b/src/tests/JIT/Methodical/largeframes/skip7/skippage7.csproj
index ec41d69f2c71c6..48cdf680a35d14 100644
--- a/src/tests/JIT/Methodical/largeframes/skip7/skippage7.csproj
+++ b/src/tests/JIT/Methodical/largeframes/skip7/skippage7.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/ldtoken/ldtoken.il b/src/tests/JIT/Methodical/ldtoken/ldtoken.il
index c4fa7c51749c2a..c5dbc73c6feffc 100644
--- a/src/tests/JIT/Methodical/ldtoken/ldtoken.il
+++ b/src/tests/JIT/Methodical/ldtoken/ldtoken.il
@@ -14,29 +14,29 @@
   
 }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_ldtoken_il
 {
-  .class private auto ansi beforefieldinit TestClass
+  .class public auto ansi beforefieldinit TestClass
          extends [mscorlib]System.Object
   {
-    .field family class JitTest.TestClass m_fld
-    .field public static class JitTest.TestClass s_fld
-    .method public hidebysig static class JitTest.TestClass 
-            StaticMethod(class JitTest.TestClass inst) cil managed
+    .field family class JitTest_ldtoken_il.TestClass m_fld
+    .field public static class JitTest_ldtoken_il.TestClass s_fld
+    .method public hidebysig static class JitTest_ldtoken_il.TestClass 
+            StaticMethod(class JitTest_ldtoken_il.TestClass inst) cil managed
     {
       .maxstack  1
-      .locals (class JitTest.TestClass V_0)
-      IL_0000:  newobj     instance void JitTest.TestClass::.ctor()
+      .locals (class JitTest_ldtoken_il.TestClass V_0)
+      IL_0000:  newobj     instance void JitTest_ldtoken_il.TestClass::.ctor()
       IL_0005:  stloc.0
       IL_0006:  br.s       IL_0008
       IL_0008:  ldloc.0
       IL_0009:  ret
     }
-    .method private hidebysig instance class JitTest.TestClass 
-            InstanceMethod(class JitTest.TestClass inst) cil managed
+    .method private hidebysig instance class JitTest_ldtoken_il.TestClass 
+            InstanceMethod(class JitTest_ldtoken_il.TestClass inst) cil managed
     {
       .maxstack  1
-      .locals (class JitTest.TestClass V_0)
+      .locals (class JitTest_ldtoken_il.TestClass V_0)
       IL_0000:  ldarg.0
       IL_0001:  stloc.0
       IL_0002:  br.s       IL_0004
@@ -44,18 +44,18 @@
       IL_0005:  ret
     }
     .method assembly hidebysig newslot virtual 
-            instance class JitTest.TestClass 
-            VirtualMethod(class JitTest.TestClass inst) cil managed
+            instance class JitTest_ldtoken_il.TestClass 
+            VirtualMethod(class JitTest_ldtoken_il.TestClass inst) cil managed
     {
       .maxstack  1
-      .locals (class JitTest.TestClass V_0)
+      .locals (class JitTest_ldtoken_il.TestClass V_0)
       IL_0000:  ldarg.0
       IL_0001:  stloc.0
       IL_0002:  br.s       IL_0004
       IL_0004:  ldloc.0
       IL_0005:  ret
     }
-    .method private hidebysig static int32 Main() cil managed
+    .method public hidebysig static int32 Main() cil managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
           01 00 00 00
@@ -72,23 +72,23 @@
       ldloca 0
       ldind.i4
       brfalse br1
-      ldtoken field class JitTest.TestClass JitTest.TestClass::m_fld
+      ldtoken field class JitTest_ldtoken_il.TestClass JitTest_ldtoken_il.TestClass::m_fld
       br mg1
 br1:
-      ldtoken field class JitTest.TestClass JitTest.TestClass::s_fld
+      ldtoken field class JitTest_ldtoken_il.TestClass JitTest_ldtoken_il.TestClass::s_fld
 mg1:
       stloc.1
       
       ldloca 0
       ldind.i4
       switch (br2a, br2b)
-      ldtoken method instance class JitTest.TestClass JitTest.TestClass::InstanceMethod(class JitTest.TestClass inst)
+      ldtoken method instance class JitTest_ldtoken_il.TestClass JitTest_ldtoken_il.TestClass::InstanceMethod(class JitTest_ldtoken_il.TestClass inst)
 	  br.s mg2
 br2a:
-      ldtoken method class JitTest.TestClass JitTest.TestClass::StaticMethod(class JitTest.TestClass inst)
+      ldtoken method class JitTest_ldtoken_il.TestClass JitTest_ldtoken_il.TestClass::StaticMethod(class JitTest_ldtoken_il.TestClass inst)
 	  br.s mg2
 br2b:
-      ldtoken method instance class JitTest.TestClass JitTest.TestClass::VirtualMethod(class JitTest.TestClass inst)
+      ldtoken method instance class JitTest_ldtoken_il.TestClass JitTest_ldtoken_il.TestClass::VirtualMethod(class JitTest_ldtoken_il.TestClass inst)
 mg2:
       stloc.2
 
@@ -98,11 +98,11 @@ mg2:
       ldtoken int32
       br mg3
 br3:
-      ldtoken class JitTest.TestClass
+      ldtoken class JitTest_ldtoken_il.TestClass
 mg3:
       stloc.3
 
-      ldtoken method instance class JitTest.TestClass JitTest.TestClass::InstanceMethod(class JitTest.TestClass inst)
+      ldtoken method instance class JitTest_ldtoken_il.TestClass JitTest_ldtoken_il.TestClass::InstanceMethod(class JitTest_ldtoken_il.TestClass inst)
       pop
       
       ldc.i4.s 100
diff --git a/src/tests/JIT/Methodical/ldtoken/ldtoken_il_d.ilproj b/src/tests/JIT/Methodical/ldtoken/ldtoken_il_d.ilproj
index caa1245c76366d..f5db96666bf5fa 100644
--- a/src/tests/JIT/Methodical/ldtoken/ldtoken_il_d.ilproj
+++ b/src/tests/JIT/Methodical/ldtoken/ldtoken_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/ldtoken/ldtoken_il_r.ilproj b/src/tests/JIT/Methodical/ldtoken/ldtoken_il_r.ilproj
index 574bad2c447fd2..0a1a065a33f3f0 100644
--- a/src/tests/JIT/Methodical/ldtoken/ldtoken_il_r.ilproj
+++ b/src/tests/JIT/Methodical/ldtoken/ldtoken_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/ldtoken/ldtokena.il b/src/tests/JIT/Methodical/ldtoken/ldtokena.il
index c859b62562ec8e..176de66190102a 100644
--- a/src/tests/JIT/Methodical/ldtoken/ldtokena.il
+++ b/src/tests/JIT/Methodical/ldtoken/ldtokena.il
@@ -14,29 +14,29 @@
   
 }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_ldtokena_il
 {
-  .class private auto ansi beforefieldinit TestClass
+  .class public auto ansi beforefieldinit TestClass
          extends [mscorlib]System.Object
   {
-    .field family class JitTest.TestClass m_fld
-    .field public static class JitTest.TestClass s_fld
-    .method public hidebysig static class JitTest.TestClass 
-            StaticMethod(class JitTest.TestClass inst) cil managed
+    .field family class JitTest_ldtokena_il.TestClass m_fld
+    .field public static class JitTest_ldtokena_il.TestClass s_fld
+    .method public hidebysig static class JitTest_ldtokena_il.TestClass 
+            StaticMethod(class JitTest_ldtokena_il.TestClass inst) cil managed
     {
       .maxstack  1
-      .locals (class JitTest.TestClass V_0)
-      IL_0000:  newobj     instance void JitTest.TestClass::.ctor()
+      .locals (class JitTest_ldtokena_il.TestClass V_0)
+      IL_0000:  newobj     instance void JitTest_ldtokena_il.TestClass::.ctor()
       IL_0005:  stloc.0
       IL_0006:  br.s       IL_0008
       IL_0008:  ldloc.0
       IL_0009:  ret
     }
-    .method private hidebysig instance class JitTest.TestClass 
-            InstanceMethod(class JitTest.TestClass inst) cil managed
+    .method private hidebysig instance class JitTest_ldtokena_il.TestClass 
+            InstanceMethod(class JitTest_ldtokena_il.TestClass inst) cil managed
     {
       .maxstack  1
-      .locals (class JitTest.TestClass V_0)
+      .locals (class JitTest_ldtokena_il.TestClass V_0)
       IL_0000:  ldarg.0
       IL_0001:  stloc.0
       IL_0002:  br.s       IL_0004
@@ -44,18 +44,18 @@
       IL_0005:  ret
     }
     .method assembly hidebysig newslot virtual 
-            instance class JitTest.TestClass 
-            VirtualMethod(class JitTest.TestClass inst) cil managed
+            instance class JitTest_ldtokena_il.TestClass 
+            VirtualMethod(class JitTest_ldtokena_il.TestClass inst) cil managed
     {
       .maxstack  1
-      .locals (class JitTest.TestClass V_0)
+      .locals (class JitTest_ldtokena_il.TestClass V_0)
       IL_0000:  ldarg.0
       IL_0001:  stloc.0
       IL_0002:  br.s       IL_0004
       IL_0004:  ldloc.0
       IL_0005:  ret
     }
-    .method private hidebysig static int32 Main() cil managed
+    .method public hidebysig static int32 Main() cil managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
           01 00 00 00
@@ -69,7 +69,7 @@
       ldc.i4.0
       stloc.0
 
-      ldtoken field class JitTest.TestClass JitTest.TestClass::m_fld
+      ldtoken field class JitTest_ldtokena_il.TestClass JitTest_ldtokena_il.TestClass::m_fld
       stloc.1
 
       ldloca 0
diff --git a/src/tests/JIT/Methodical/ldtoken/ldtokena_il_d.ilproj b/src/tests/JIT/Methodical/ldtoken/ldtokena_il_d.ilproj
index 4067fc6e2559b2..7e026072a8f9ef 100644
--- a/src/tests/JIT/Methodical/ldtoken/ldtokena_il_d.ilproj
+++ b/src/tests/JIT/Methodical/ldtoken/ldtokena_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/ldtoken/ldtokena_il_r.ilproj b/src/tests/JIT/Methodical/ldtoken/ldtokena_il_r.ilproj
index 9631c64c336e34..e4fb05c9723f28 100644
--- a/src/tests/JIT/Methodical/ldtoken/ldtokena_il_r.ilproj
+++ b/src/tests/JIT/Methodical/ldtoken/ldtokena_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/ldtoken/ptr_types.il b/src/tests/JIT/Methodical/ldtoken/ptr_types.il
index 3bfa955fef758a..548f9a90580f66 100644
--- a/src/tests/JIT/Methodical/ldtoken/ptr_types.il
+++ b/src/tests/JIT/Methodical/ldtoken/ptr_types.il
@@ -10,9 +10,9 @@
 }
 .assembly ptr_types { }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_ptr_types_ldtoken_il
 {
-  .class private auto ansi beforefieldinit Test
+  .class public auto ansi beforefieldinit Test
          extends [mscorlib]System.Object
   {
     .method private hidebysig static void 
@@ -26,7 +26,7 @@
       call       void [System.Console]System.Console::WriteLine(string)
       ret
     }
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() cil managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -35,40 +35,40 @@
       .entrypoint
       .maxstack  8
       ldtoken    int8*
-      call       void JitTest.Test::test_token(valuetype [mscorlib]System.RuntimeTypeHandle)
+      call       void JitTest_ptr_types_ldtoken_il.Test::test_token(valuetype [mscorlib]System.RuntimeTypeHandle)
 
       ldtoken    unsigned int8*
-      call       void JitTest.Test::test_token(valuetype [mscorlib]System.RuntimeTypeHandle)
+      call       void JitTest_ptr_types_ldtoken_il.Test::test_token(valuetype [mscorlib]System.RuntimeTypeHandle)
       
       ldtoken    int16*
-      call       void JitTest.Test::test_token(valuetype [mscorlib]System.RuntimeTypeHandle)
+      call       void JitTest_ptr_types_ldtoken_il.Test::test_token(valuetype [mscorlib]System.RuntimeTypeHandle)
       
       ldtoken    unsigned int16*
-      call       void JitTest.Test::test_token(valuetype [mscorlib]System.RuntimeTypeHandle)
+      call       void JitTest_ptr_types_ldtoken_il.Test::test_token(valuetype [mscorlib]System.RuntimeTypeHandle)
       
       ldtoken    int32*
-      call       void JitTest.Test::test_token(valuetype [mscorlib]System.RuntimeTypeHandle)
+      call       void JitTest_ptr_types_ldtoken_il.Test::test_token(valuetype [mscorlib]System.RuntimeTypeHandle)
       
       ldtoken    unsigned int32*
-      call       void JitTest.Test::test_token(valuetype [mscorlib]System.RuntimeTypeHandle)
+      call       void JitTest_ptr_types_ldtoken_il.Test::test_token(valuetype [mscorlib]System.RuntimeTypeHandle)
       
       ldtoken    int64*
-      call       void JitTest.Test::test_token(valuetype [mscorlib]System.RuntimeTypeHandle)
+      call       void JitTest_ptr_types_ldtoken_il.Test::test_token(valuetype [mscorlib]System.RuntimeTypeHandle)
       
       ldtoken    unsigned int64*
-      call       void JitTest.Test::test_token(valuetype [mscorlib]System.RuntimeTypeHandle)
+      call       void JitTest_ptr_types_ldtoken_il.Test::test_token(valuetype [mscorlib]System.RuntimeTypeHandle)
       
       ldtoken    native int*
-      call       void JitTest.Test::test_token(valuetype [mscorlib]System.RuntimeTypeHandle)
+      call       void JitTest_ptr_types_ldtoken_il.Test::test_token(valuetype [mscorlib]System.RuntimeTypeHandle)
       
       ldtoken    native unsigned int*
-      call       void JitTest.Test::test_token(valuetype [mscorlib]System.RuntimeTypeHandle)
+      call       void JitTest_ptr_types_ldtoken_il.Test::test_token(valuetype [mscorlib]System.RuntimeTypeHandle)
       
       ldtoken    float32*
-      call       void JitTest.Test::test_token(valuetype [mscorlib]System.RuntimeTypeHandle)
+      call       void JitTest_ptr_types_ldtoken_il.Test::test_token(valuetype [mscorlib]System.RuntimeTypeHandle)
       
       ldtoken    float64*
-      call       void JitTest.Test::test_token(valuetype [mscorlib]System.RuntimeTypeHandle)
+      call       void JitTest_ptr_types_ldtoken_il.Test::test_token(valuetype [mscorlib]System.RuntimeTypeHandle)
       
       ldstr      "Passed"
       call       void [System.Console]System.Console::WriteLine(string)
diff --git a/src/tests/JIT/Methodical/ldtoken/ptr_types_il_d.ilproj b/src/tests/JIT/Methodical/ldtoken/ptr_types_il_d.ilproj
index 4967d7fcf99f95..425955ef65d0b3 100644
--- a/src/tests/JIT/Methodical/ldtoken/ptr_types_il_d.ilproj
+++ b/src/tests/JIT/Methodical/ldtoken/ptr_types_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/ldtoken/ptr_types_il_r.ilproj b/src/tests/JIT/Methodical/ldtoken/ptr_types_il_r.ilproj
index b2d84d6224d4e4..b3acccf7fba4b5 100644
--- a/src/tests/JIT/Methodical/ldtoken/ptr_types_il_r.ilproj
+++ b/src/tests/JIT/Methodical/ldtoken/ptr_types_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/ldtoken/types.il b/src/tests/JIT/Methodical/ldtoken/types.il
index 8cecaee7b3560d..79f3b98d29c238 100644
--- a/src/tests/JIT/Methodical/ldtoken/types.il
+++ b/src/tests/JIT/Methodical/ldtoken/types.il
@@ -8,9 +8,9 @@
 
 .assembly types { }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_types_ldtoken_il
 {
-  .class private auto ansi beforefieldinit Test
+  .class public auto ansi beforefieldinit Test
          extends [mscorlib]System.Object
   {
     .field private static int32 s_exitCode;
@@ -35,11 +35,11 @@
       call       string [mscorlib]System.String::Concat(string, string)
       call       void [System.Console]System.Console::WriteLine(string)
       ldc.i4.s   101
-      stsfld     int32 JitTest.Test::s_exitCode
+      stsfld     int32 JitTest_types_ldtoken_il.Test::s_exitCode
       IL_EXIT:
       ret
     }
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() cil managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -48,158 +48,158 @@
       .entrypoint
       .maxstack  8
       ldc.i4     100
-      stsfld     int32 JitTest.Test::s_exitCode
+      stsfld     int32 JitTest_types_ldtoken_il.Test::s_exitCode
       ldc.i4.1
       box        [mscorlib]System.Byte
       ldtoken    [mscorlib]System.Byte
-      call       void JitTest.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
+      call       void JitTest_types_ldtoken_il.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
 
       ldc.i4.1
       box        [mscorlib]System.SByte
       ldtoken    [mscorlib]System.SByte
-      call       void JitTest.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
+      call       void JitTest_types_ldtoken_il.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
 
       ldc.i4.1
       box        [mscorlib]System.Int16
       ldtoken    [mscorlib]System.Int16
-      call       void JitTest.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
+      call       void JitTest_types_ldtoken_il.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
 
       ldc.i4.1
       box        [mscorlib]System.UInt16
       ldtoken    [mscorlib]System.UInt16
-      call       void JitTest.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
+      call       void JitTest_types_ldtoken_il.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
 
       ldc.i4.1
       box        [mscorlib]System.Int32
       ldtoken    [mscorlib]System.Int32
-      call       void JitTest.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
+      call       void JitTest_types_ldtoken_il.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
 
       ldc.i4.1
       box        [mscorlib]System.UInt32
       ldtoken    [mscorlib]System.UInt32
-      call       void JitTest.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
+      call       void JitTest_types_ldtoken_il.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
 
       ldc.i8 1
       box        [mscorlib]System.Int64
       ldtoken    [mscorlib]System.Int64
-      call       void JitTest.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
+      call       void JitTest_types_ldtoken_il.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
 
       ldc.i8 1
       box        [mscorlib]System.UInt64
       ldtoken    [mscorlib]System.UInt64
-      call       void JitTest.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
+      call       void JitTest_types_ldtoken_il.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
 
       ldc.r8 1
       box        [mscorlib]System.Single
       ldtoken    [mscorlib]System.Single
-      call       void JitTest.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
+      call       void JitTest_types_ldtoken_il.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
 
       ldc.r4 1
       box        [mscorlib]System.Double
       ldtoken    [mscorlib]System.Double
-      call       void JitTest.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
+      call       void JitTest_types_ldtoken_il.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
 
       ldc.i4.1
       box        [mscorlib]System.IntPtr
       ldtoken    [mscorlib]System.IntPtr
-      call       void JitTest.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
+      call       void JitTest_types_ldtoken_il.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
 
       ldc.i4.1
       box        [mscorlib]System.UIntPtr
       ldtoken    [mscorlib]System.UIntPtr
-      call       void JitTest.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
+      call       void JitTest_types_ldtoken_il.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
 
       ldc.i4.1
       box        [mscorlib]System.Boolean
       ldtoken    [mscorlib]System.Boolean
-      call       void JitTest.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
+      call       void JitTest_types_ldtoken_il.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
 
       ldc.i4.1
       box        [mscorlib]System.Char
       ldtoken    [mscorlib]System.Char
-      call       void JitTest.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
+      call       void JitTest_types_ldtoken_il.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
 
       ldstr      "moo"
       ldtoken    [mscorlib]System.String
-      call       void JitTest.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
+      call       void JitTest_types_ldtoken_il.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
 
       newobj     instance void [mscorlib]System.Object::.ctor()
       ldtoken    [mscorlib]System.Object
-      call       void JitTest.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
+      call       void JitTest_types_ldtoken_il.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
 
       ldc.i4 10
       newarr     int8
       ldtoken    int8[]
-      call       void JitTest.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
+      call       void JitTest_types_ldtoken_il.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
 
       ldc.i4 10
       newarr     uint8
       ldtoken    uint8[]
-      call       void JitTest.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
+      call       void JitTest_types_ldtoken_il.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
 
       ldc.i4 10
       newarr     int16
       ldtoken    int16[]
-      call       void JitTest.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
+      call       void JitTest_types_ldtoken_il.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
 
       ldc.i4 10
       newarr     uint16
       ldtoken    uint16[]
-      call       void JitTest.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
+      call       void JitTest_types_ldtoken_il.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
 
       ldc.i4 10
       newarr     int32
       ldtoken    int32[]
-      call       void JitTest.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
+      call       void JitTest_types_ldtoken_il.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
 
       ldc.i4 10
       newarr     uint32
       ldtoken    uint32[]
-      call       void JitTest.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
+      call       void JitTest_types_ldtoken_il.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
 
       ldc.i4 10
       newarr     int64
       ldtoken    int64[]
-      call       void JitTest.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
+      call       void JitTest_types_ldtoken_il.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
 
       ldc.i4 10
       newarr     uint64
       ldtoken    uint64[]
-      call       void JitTest.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
+      call       void JitTest_types_ldtoken_il.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
 
       ldc.i4 10
       newarr     native int
       ldtoken    native int[]
-      call       void JitTest.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
+      call       void JitTest_types_ldtoken_il.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
 
       ldc.i4 10
       newarr     valuetype [mscorlib]System.UIntPtr
       ldtoken    valuetype [mscorlib]System.UIntPtr[]
-      call       void JitTest.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
+      call       void JitTest_types_ldtoken_il.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
 
       ldc.i4 10
       newarr     bool
       ldtoken    bool[]
-      call       void JitTest.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
+      call       void JitTest_types_ldtoken_il.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
 
       ldc.i4 10
       newarr     char
       ldtoken    char[]
-      call       void JitTest.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
+      call       void JitTest_types_ldtoken_il.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
 
       ldc.i4 10
       newarr     object
       ldtoken    object[]
-      call       void JitTest.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
+      call       void JitTest_types_ldtoken_il.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
 
       ldc.i4 10
       newarr     string
       ldtoken    string[]
-      call       void JitTest.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
+      call       void JitTest_types_ldtoken_il.Test::test_token(object, valuetype [mscorlib]System.RuntimeTypeHandle)
 
       ldstr      "Passed"
       call       void [System.Console]System.Console::WriteLine(string)
-      ldsfld     int32 JitTest.Test::s_exitCode
+      ldsfld     int32 JitTest_types_ldtoken_il.Test::s_exitCode
       ret
     }
     .method public hidebysig specialname rtspecialname
diff --git a/src/tests/JIT/Methodical/ldtoken/types_il_d.ilproj b/src/tests/JIT/Methodical/ldtoken/types_il_d.ilproj
index e68906f1080094..5effeef20592ad 100644
--- a/src/tests/JIT/Methodical/ldtoken/types_il_d.ilproj
+++ b/src/tests/JIT/Methodical/ldtoken/types_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/ldtoken/types_il_r.ilproj b/src/tests/JIT/Methodical/ldtoken/types_il_r.ilproj
index 1a80629d9f7ed1..59849568fc4bd9 100644
--- a/src/tests/JIT/Methodical/ldtoken/types_il_r.ilproj
+++ b/src/tests/JIT/Methodical/ldtoken/types_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/localloc/call/call01.cs b/src/tests/JIT/Methodical/localloc/call/call01.cs
index 8966596b1378b5..ba2e625377e456 100644
--- a/src/tests/JIT/Methodical/localloc/call/call01.cs
+++ b/src/tests/JIT/Methodical/localloc/call/call01.cs
@@ -7,12 +7,16 @@
 
 using System;
 using LocallocTesting;
+using Xunit;
 
-internal class LocallocTest
+namespace Test_call01_cs
+{
+public class LocallocTest
 {
     private static int s_locallocSize = 0;
 
-    public static unsafe int Main()
+    [Fact]
+    public static unsafe int TestEntryPoint()
     {
         ulong local1 = Global.INITIAL_VALUE;
         ulong local2 = local1 + 1;
@@ -89,3 +93,4 @@ private static unsafe bool func1(int i1, int i2, int i3, int i4, int i5, int i6,
         return true;
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/localloc/call/call01_small.csproj b/src/tests/JIT/Methodical/localloc/call/call01_small.csproj
index 38c34800f67dc9..682f255af5ecb4 100644
--- a/src/tests/JIT/Methodical/localloc/call/call01_small.csproj
+++ b/src/tests/JIT/Methodical/localloc/call/call01_small.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/localloc/verify/verify01_dynamic.il b/src/tests/JIT/Methodical/localloc/verify/verify01_dynamic.il
index 6b62235fcb9af5..a11ef37be39542 100644
--- a/src/tests/JIT/Methodical/localloc/verify/verify01_dynamic.il
+++ b/src/tests/JIT/Methodical/localloc/verify/verify01_dynamic.il
@@ -12,7 +12,9 @@
 .assembly 'verify01_dynamic'{}
 .assembly extern xunit.core {}
 
-.class private auto ansi beforefieldinit LocallocTest
+.namespace Test_verify01_dynamic_il
+{
+.class public auto ansi beforefieldinit LocallocTest
        extends [mscorlib]System.Object
 {
   .field public static int32 stackAllocSize
@@ -26,10 +28,10 @@
     .maxstack  1
     .locals init(int32 V_0)
     ldc.i4	0x1000
-    stsfld	int32 LocallocTest::stackAllocSize
+    stsfld	int32 Test_verify01_dynamic_il.LocallocTest::stackAllocSize
     .try
     {
-      IL_0000:  call       void LocallocTest::func()
+      IL_0000:  call       void Test_verify01_dynamic_il.LocallocTest::func()
       IL_0005:  leave.s    IL_0027
 
     }  // end .try
@@ -61,7 +63,7 @@
 
     IL_0035:  ldloc.0
     IL_0036:  ret
-  } // end of method LocallocTest::Main
+  } // end of method Test_verify01_dynamic_il.LocallocTest::Main
 
   .method private hidebysig static void  func() cil managed
   {
@@ -70,17 +72,17 @@
     .locals init(int32* V_0,
              int32* V_1)
     IL_0000:  ldc.i4.4
-    IL_0001:  ldsfld     int32 LocallocTest::stackAllocSize
+    IL_0001:  ldsfld     int32 Test_verify01_dynamic_il.LocallocTest::stackAllocSize
     IL_0002:  mul
     IL_0006:  ldc.i4.4
-    IL_0007:  ldsfld     int32 LocallocTest::stackAllocSize
+    IL_0007:  ldsfld     int32 Test_verify01_dynamic_il.LocallocTest::stackAllocSize
     IL_0008:  mul
     IL_0009:  localloc
     IL_000b:  stloc.1
     IL_0003:  localloc
     IL_0005:  stloc.0
     IL_000c:  ret
-  } // end of method LocallocTest::func
+  } // end of method Test_verify01_dynamic_il.LocallocTest::func
 
   .method public hidebysig specialname rtspecialname 
           instance void  .ctor() cil managed
@@ -90,12 +92,13 @@
     IL_0000:  ldarg.0
     IL_0001:  call       instance void [mscorlib]System.Object::.ctor()
     IL_0006:  ret
-  } // end of method LocallocTest::.ctor
+  } // end of method Test_verify01_dynamic_il.LocallocTest::.ctor
 
-} // end of class LocallocTest
+} // end of class Test_verify01_dynamic_il.LocallocTest
 
 
 // =============================================================
 
 //*********** DISASSEMBLY COMPLETE ***********************
 // WARNING: Created Win32 resource file verify01_dynamic.res
+}
diff --git a/src/tests/JIT/Methodical/localloc/verify/verify01_dynamic.ilproj b/src/tests/JIT/Methodical/localloc/verify/verify01_dynamic.ilproj
index 12ca927d5da64b..6a7fc72ab6bfbd 100644
--- a/src/tests/JIT/Methodical/localloc/verify/verify01_dynamic.ilproj
+++ b/src/tests/JIT/Methodical/localloc/verify/verify01_dynamic.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/localloc/verify/verify01_large.il b/src/tests/JIT/Methodical/localloc/verify/verify01_large.il
index 8909f92cf9ddab..447e452508e573 100644
--- a/src/tests/JIT/Methodical/localloc/verify/verify01_large.il
+++ b/src/tests/JIT/Methodical/localloc/verify/verify01_large.il
@@ -12,7 +12,9 @@
 .assembly 'verify01_large'{}
 .assembly extern xunit.core {}
 
-.class private auto ansi beforefieldinit LocallocTest
+.namespace Test_verify01_large_il
+{
+.class public auto ansi beforefieldinit LocallocTest
        extends [mscorlib]System.Object
 {
   .method public hidebysig static int32  Main() cil managed
@@ -26,7 +28,7 @@
     .locals init(int32 V_0)
     .try
     {
-      IL_0000:  call       void LocallocTest::func()
+      IL_0000:  call       void Test_verify01_large_il.LocallocTest::func()
       IL_0005:  leave.s    IL_0027
 
     }  // end .try
@@ -58,7 +60,7 @@
 
     IL_0035:  ldloc.0
     IL_0036:  ret
-  } // end of method LocallocTest::Main
+  } // end of method Test_verify01_large_il.LocallocTest::Main
 
   .method private hidebysig static void  func() cil managed
   {
@@ -77,7 +79,7 @@
     IL_0003:  localloc
     IL_0005:  stloc.0
     IL_000c:  ret
-  } // end of method LocallocTest::func
+  } // end of method Test_verify01_large_il.LocallocTest::func
 
   .method public hidebysig specialname rtspecialname 
           instance void  .ctor() cil managed
@@ -87,12 +89,13 @@
     IL_0000:  ldarg.0
     IL_0001:  call       instance void [mscorlib]System.Object::.ctor()
     IL_0006:  ret
-  } // end of method LocallocTest::.ctor
+  } // end of method Test_verify01_large_il.LocallocTest::.ctor
 
-} // end of class LocallocTest
+} // end of class Test_verify01_large_il.LocallocTest
 
 
 // =============================================================
 
 //*********** DISASSEMBLY COMPLETE ***********************
 // WARNING: Created Win32 resource file verify01_dynamic.res
+}
diff --git a/src/tests/JIT/Methodical/localloc/verify/verify01_large.ilproj b/src/tests/JIT/Methodical/localloc/verify/verify01_large.ilproj
index d1379c544f1f15..9c0262d0604e4f 100644
--- a/src/tests/JIT/Methodical/localloc/verify/verify01_large.ilproj
+++ b/src/tests/JIT/Methodical/localloc/verify/verify01_large.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/localloc/verify/verify01_small.il b/src/tests/JIT/Methodical/localloc/verify/verify01_small.il
index ae9a42bd93d29f..b8ded2dc3683e9 100644
--- a/src/tests/JIT/Methodical/localloc/verify/verify01_small.il
+++ b/src/tests/JIT/Methodical/localloc/verify/verify01_small.il
@@ -12,7 +12,9 @@
 .assembly 'verify01_small'{}
 .assembly extern xunit.core {}
 
-.class private auto ansi beforefieldinit LocallocTest
+.namespace Test_verify01_small_il
+{
+.class public auto ansi beforefieldinit LocallocTest
        extends [mscorlib]System.Object
 {
   .method public hidebysig static int32  Main() cil managed
@@ -26,7 +28,7 @@
     .locals init(int32 V_0)
     .try
     {
-      IL_0000:  call       void LocallocTest::func()
+      IL_0000:  call       void Test_verify01_small_il.LocallocTest::func()
       IL_0005:  leave.s    IL_0027
 
     }  // end .try
@@ -58,7 +60,7 @@
 
     IL_0035:  ldloc.0
     IL_0036:  ret
-  } // end of method LocallocTest::Main
+  } // end of method Test_verify01_small_il.LocallocTest::Main
 
   .method private hidebysig static void  func() cil managed
   {
@@ -77,7 +79,7 @@
     IL_0003:  localloc
     IL_0005:  stloc.0
     IL_000c:  ret
-  } // end of method LocallocTest::func
+  } // end of method Test_verify01_small_il.LocallocTest::func
 
   .method public hidebysig specialname rtspecialname 
           instance void  .ctor() cil managed
@@ -87,12 +89,13 @@
     IL_0000:  ldarg.0
     IL_0001:  call       instance void [mscorlib]System.Object::.ctor()
     IL_0006:  ret
-  } // end of method LocallocTest::.ctor
+  } // end of method Test_verify01_small_il.LocallocTest::.ctor
 
-} // end of class LocallocTest
+} // end of class Test_verify01_small_il.LocallocTest
 
 
 // =============================================================
 
 //*********** DISASSEMBLY COMPLETE ***********************
 // WARNING: Created Win32 resource file verify01_dynamic.res
+}
diff --git a/src/tests/JIT/Methodical/localloc/verify/verify01_small.ilproj b/src/tests/JIT/Methodical/localloc/verify/verify01_small.ilproj
index 5d2b91292414ad..bff55f35c4efab 100644
--- a/src/tests/JIT/Methodical/localloc/verify/verify01_small.ilproj
+++ b/src/tests/JIT/Methodical/localloc/verify/verify01_small.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/localloc/zeroinit/zeroinit01_large.il b/src/tests/JIT/Methodical/localloc/zeroinit/zeroinit01_large.il
index 12da6c6429d313..d21da04c7faecd 100644
--- a/src/tests/JIT/Methodical/localloc/zeroinit/zeroinit01_large.il
+++ b/src/tests/JIT/Methodical/localloc/zeroinit/zeroinit01_large.il
@@ -12,7 +12,7 @@
 .assembly extern xunit.core {}
 
 .namespace Test_zeroinit01_large {
-.class private auto ansi beforefieldinit T
+.class public auto ansi beforefieldinit T
        extends [mscorlib]System.Object
 {
   .field public static int32 size_to_test
diff --git a/src/tests/JIT/Methodical/localloc/zeroinit/zeroinit01_large.ilproj b/src/tests/JIT/Methodical/localloc/zeroinit/zeroinit01_large.ilproj
index 3af1feefeebf7b..2b9a8fd1f2c1c7 100644
--- a/src/tests/JIT/Methodical/localloc/zeroinit/zeroinit01_large.ilproj
+++ b/src/tests/JIT/Methodical/localloc/zeroinit/zeroinit01_large.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/localloc/zeroinit/zeroinit01_small.il b/src/tests/JIT/Methodical/localloc/zeroinit/zeroinit01_small.il
index d2d1b3d8100af8..33e901cbf2fff6 100644
--- a/src/tests/JIT/Methodical/localloc/zeroinit/zeroinit01_small.il
+++ b/src/tests/JIT/Methodical/localloc/zeroinit/zeroinit01_small.il
@@ -12,7 +12,7 @@
 .assembly extern xunit.core {}
 
 .namespace Test_zeroinit01_small {
-.class private auto ansi beforefieldinit T
+.class public auto ansi beforefieldinit T
        extends [mscorlib]System.Object
 {
   .field public static int32 size_to_test
diff --git a/src/tests/JIT/Methodical/localloc/zeroinit/zeroinit01_small.ilproj b/src/tests/JIT/Methodical/localloc/zeroinit/zeroinit01_small.ilproj
index 38c17aece0ee99..d2f9d658dc4ce2 100644
--- a/src/tests/JIT/Methodical/localloc/zeroinit/zeroinit01_small.ilproj
+++ b/src/tests/JIT/Methodical/localloc/zeroinit/zeroinit01_small.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/classic.cs b/src/tests/JIT/Methodical/nonvirtualcall/classic.cs
index 4333df701fe184..d62e6d3ef676ab 100644
--- a/src/tests/JIT/Methodical/nonvirtualcall/classic.cs
+++ b/src/tests/JIT/Methodical/nonvirtualcall/classic.cs
@@ -4,7 +4,10 @@
 using System;
 using System.IO;
 using System.Runtime.CompilerServices;
+using Xunit;
 
+namespace Test_classic
+{
 class ApplicationException : Exception
 {
     public ApplicationException(string message) : base(message) { }
@@ -187,7 +190,8 @@ public static void CallFromInsideGrandChild()
             child.TestGrandChild();
         }
 
-        public static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             try
             {
@@ -223,3 +227,4 @@ public static void AreEqual(string left, string right)
         }
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/classic.csproj b/src/tests/JIT/Methodical/nonvirtualcall/classic.csproj
index d0f958c37b0047..5e260c8c77049e 100644
--- a/src/tests/JIT/Methodical/nonvirtualcall/classic.csproj
+++ b/src/tests/JIT/Methodical/nonvirtualcall/classic.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/classic_il_d.ilproj b/src/tests/JIT/Methodical/nonvirtualcall/classic_il_d.ilproj
index 9de45208409c45..1729e3cae721fa 100644
--- a/src/tests/JIT/Methodical/nonvirtualcall/classic_il_d.ilproj
+++ b/src/tests/JIT/Methodical/nonvirtualcall/classic_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/classic_il_r.ilproj b/src/tests/JIT/Methodical/nonvirtualcall/classic_il_r.ilproj
index 52b781c9672a8b..071e8d6f3fe631 100644
--- a/src/tests/JIT/Methodical/nonvirtualcall/classic_il_r.ilproj
+++ b/src/tests/JIT/Methodical/nonvirtualcall/classic_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/delegate.cs b/src/tests/JIT/Methodical/nonvirtualcall/delegate.cs
index a3b662920ce060..ca98089d6a2308 100644
--- a/src/tests/JIT/Methodical/nonvirtualcall/delegate.cs
+++ b/src/tests/JIT/Methodical/nonvirtualcall/delegate.cs
@@ -4,7 +4,10 @@
 using System;
 using System.IO;
 using System.Runtime.CompilerServices;
+using Xunit;
 
+namespace Test_delegate
+{
 class ApplicationException : Exception
 {
     public ApplicationException(string message) : base(message) { }
@@ -146,7 +149,8 @@ public static void CallDelegateFromGrandChild()
             Assert.AreEqual("GrandChild.VirtualOverrideFinal", new TestMethod(child.VirtualOverrideFinal));
         }
 
-        public static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             try
             {
@@ -185,3 +189,4 @@ public static void AreEqual(string left, string right)
         }
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/delegate.csproj b/src/tests/JIT/Methodical/nonvirtualcall/delegate.csproj
index cf74ea0bfdc3f3..528f79c7379c43 100644
--- a/src/tests/JIT/Methodical/nonvirtualcall/delegate.csproj
+++ b/src/tests/JIT/Methodical/nonvirtualcall/delegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/delegate_il_d.ilproj b/src/tests/JIT/Methodical/nonvirtualcall/delegate_il_d.ilproj
index c35b1bcaafc8a1..ef4189411d9591 100644
--- a/src/tests/JIT/Methodical/nonvirtualcall/delegate_il_d.ilproj
+++ b/src/tests/JIT/Methodical/nonvirtualcall/delegate_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/delegate_il_r.ilproj b/src/tests/JIT/Methodical/nonvirtualcall/delegate_il_r.ilproj
index 716b432fd7bd85..2d501f7ecd1e0f 100644
--- a/src/tests/JIT/Methodical/nonvirtualcall/delegate_il_r.ilproj
+++ b/src/tests/JIT/Methodical/nonvirtualcall/delegate_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/generics.cs b/src/tests/JIT/Methodical/nonvirtualcall/generics.cs
index 5146f443bbe1a6..a654bcbaf05679 100644
--- a/src/tests/JIT/Methodical/nonvirtualcall/generics.cs
+++ b/src/tests/JIT/Methodical/nonvirtualcall/generics.cs
@@ -4,7 +4,10 @@
 using System;
 using System.IO;
 using System.Runtime.CompilerServices;
+using Xunit;
 
+namespace Test_generics
+{
 class ApplicationException : Exception
 {
     public ApplicationException(string message) : base(message) { }
@@ -186,7 +189,8 @@ public static void CallFromInsideGrandChild()
             child.TestGrandChild();
         }
 
-        public static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             try
             {
@@ -222,3 +226,4 @@ public static void AreEqual(string left, string right)
         }
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/generics.csproj b/src/tests/JIT/Methodical/nonvirtualcall/generics.csproj
index 1545bcda320af1..b39e24bbe83fe1 100644
--- a/src/tests/JIT/Methodical/nonvirtualcall/generics.csproj
+++ b/src/tests/JIT/Methodical/nonvirtualcall/generics.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/generics2.cs b/src/tests/JIT/Methodical/nonvirtualcall/generics2.cs
index d889a55e2b9909..dc76f4a240b050 100644
--- a/src/tests/JIT/Methodical/nonvirtualcall/generics2.cs
+++ b/src/tests/JIT/Methodical/nonvirtualcall/generics2.cs
@@ -4,7 +4,10 @@
 using System;
 using System.IO;
 using System.Runtime.CompilerServices;
+using Xunit;
 
+namespace Test_generics2
+{
 class ApplicationException : Exception
 {
     public ApplicationException(string message) : base(message) { }
@@ -186,7 +189,8 @@ public static void CallFromInsideGrandChild()
             child.TestGrandChild();
         }
 
-        public static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             try
             {
@@ -222,3 +226,4 @@ public static void AreEqual(string left, string right)
         }
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/generics2.csproj b/src/tests/JIT/Methodical/nonvirtualcall/generics2.csproj
index 6972f263c3aa57..c1a79a4555037b 100644
--- a/src/tests/JIT/Methodical/nonvirtualcall/generics2.csproj
+++ b/src/tests/JIT/Methodical/nonvirtualcall/generics2.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/generics2_il_d.ilproj b/src/tests/JIT/Methodical/nonvirtualcall/generics2_il_d.ilproj
index 37fa6de4a23e62..f38835efec87f2 100644
--- a/src/tests/JIT/Methodical/nonvirtualcall/generics2_il_d.ilproj
+++ b/src/tests/JIT/Methodical/nonvirtualcall/generics2_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/generics2_il_r.ilproj b/src/tests/JIT/Methodical/nonvirtualcall/generics2_il_r.ilproj
index 66994d53381812..b24463a3b4e2d6 100644
--- a/src/tests/JIT/Methodical/nonvirtualcall/generics2_il_r.ilproj
+++ b/src/tests/JIT/Methodical/nonvirtualcall/generics2_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/generics_il_d.ilproj b/src/tests/JIT/Methodical/nonvirtualcall/generics_il_d.ilproj
index 215d5c40cdd9e6..0923a34d7892a9 100644
--- a/src/tests/JIT/Methodical/nonvirtualcall/generics_il_d.ilproj
+++ b/src/tests/JIT/Methodical/nonvirtualcall/generics_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/generics_il_r.ilproj b/src/tests/JIT/Methodical/nonvirtualcall/generics_il_r.ilproj
index 6cf6dda23551ab..93319f39fc6206 100644
--- a/src/tests/JIT/Methodical/nonvirtualcall/generics_il_r.ilproj
+++ b/src/tests/JIT/Methodical/nonvirtualcall/generics_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/tailcall.cs b/src/tests/JIT/Methodical/nonvirtualcall/tailcall.cs
index ee48c5bcf73808..eebe6892b580ab 100644
--- a/src/tests/JIT/Methodical/nonvirtualcall/tailcall.cs
+++ b/src/tests/JIT/Methodical/nonvirtualcall/tailcall.cs
@@ -4,7 +4,10 @@
 using System;
 using System.IO;
 using System.Runtime.CompilerServices;
+using Xunit;
 
+namespace Test_tailcall
+{
 class ApplicationException : Exception
 {
     public ApplicationException(string message) : base(message) { }
@@ -187,7 +190,8 @@ public static void CallFromInsideGrandChild()
             child.TestGrandChild();
         }
 
-        public static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             try
             {
@@ -221,3 +225,4 @@ public static void AreEqual(string left, string right)
         }
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/tailcall.csproj b/src/tests/JIT/Methodical/nonvirtualcall/tailcall.csproj
index 67f68e0311f6a2..91a89007096d17 100644
--- a/src/tests/JIT/Methodical/nonvirtualcall/tailcall.csproj
+++ b/src/tests/JIT/Methodical/nonvirtualcall/tailcall.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/tailcall_nonvirtualcall_il_d.ilproj b/src/tests/JIT/Methodical/nonvirtualcall/tailcall_nonvirtualcall_il_d.ilproj
index 90bdafb9463261..1c0683d1972004 100644
--- a/src/tests/JIT/Methodical/nonvirtualcall/tailcall_nonvirtualcall_il_d.ilproj
+++ b/src/tests/JIT/Methodical/nonvirtualcall/tailcall_nonvirtualcall_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/tailcall_nonvirtualcall_il_r.ilproj b/src/tests/JIT/Methodical/nonvirtualcall/tailcall_nonvirtualcall_il_r.ilproj
index d9b4bcbb7928ee..cf24f4f222aeee 100644
--- a/src/tests/JIT/Methodical/nonvirtualcall/tailcall_nonvirtualcall_il_r.ilproj
+++ b/src/tests/JIT/Methodical/nonvirtualcall/tailcall_nonvirtualcall_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/valuetype.cs b/src/tests/JIT/Methodical/nonvirtualcall/valuetype.cs
index 6e1b0c95660c0a..ed517239a6e616 100644
--- a/src/tests/JIT/Methodical/nonvirtualcall/valuetype.cs
+++ b/src/tests/JIT/Methodical/nonvirtualcall/valuetype.cs
@@ -4,7 +4,10 @@
 using System;
 using System.IO;
 using System.Runtime.CompilerServices;
+using Xunit;
 
+namespace Test_valuetype
+{
 class ApplicationException : Exception
 {
     public ApplicationException(string message) : base(message) { }
@@ -31,7 +34,8 @@ public static void CallDummy()
             Assert.AreEqual("Dummy.Virtual", new TestMethod(dummy.Virtual));
         }
 
-        public static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             try
             {
@@ -68,3 +72,4 @@ public static void AreEqual(string left, string right)
         }
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/valuetype.csproj b/src/tests/JIT/Methodical/nonvirtualcall/valuetype.csproj
index 0e36e93166fc9b..f8d7c37392706e 100644
--- a/src/tests/JIT/Methodical/nonvirtualcall/valuetype.csproj
+++ b/src/tests/JIT/Methodical/nonvirtualcall/valuetype.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/valuetype_il_d.ilproj b/src/tests/JIT/Methodical/nonvirtualcall/valuetype_il_d.ilproj
index 049b5346c81d7c..30da4e7bb00719 100644
--- a/src/tests/JIT/Methodical/nonvirtualcall/valuetype_il_d.ilproj
+++ b/src/tests/JIT/Methodical/nonvirtualcall/valuetype_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/valuetype_il_r.ilproj b/src/tests/JIT/Methodical/nonvirtualcall/valuetype_il_r.ilproj
index b1f870d8f83ef8..0abda7d67c0813 100644
--- a/src/tests/JIT/Methodical/nonvirtualcall/valuetype_il_r.ilproj
+++ b/src/tests/JIT/Methodical/nonvirtualcall/valuetype_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/refany/array1.cs b/src/tests/JIT/Methodical/refany/array1.cs
index ed80746186e61d..f14a662ec30d3d 100644
--- a/src/tests/JIT/Methodical/refany/array1.cs
+++ b/src/tests/JIT/Methodical/refany/array1.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_array1_refany_cs
 {
-    internal class Test
+    public class Test
     {
         private static void TestRef(TypedReference _ref)
         {
@@ -41,7 +42,8 @@ private static void TestRef(TypedReference _ref)
             }
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             Array genericArray = Array.CreateInstance(typeof(Test), 16);
             TestRef(__makeref(genericArray));
diff --git a/src/tests/JIT/Methodical/refany/array1.csproj b/src/tests/JIT/Methodical/refany/array1.csproj
index b0de09b396c8fd..a99edb8b6dd2df 100644
--- a/src/tests/JIT/Methodical/refany/array1.csproj
+++ b/src/tests/JIT/Methodical/refany/array1.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/refany/array1.il b/src/tests/JIT/Methodical/refany/array1.il
index f425d01a74fa62..3d0e36acae8835 100644
--- a/src/tests/JIT/Methodical/refany/array1.il
+++ b/src/tests/JIT/Methodical/refany/array1.il
@@ -16,9 +16,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {F8BFB824-C7D0-485F-A06E-07B6D1F1151B}
-.namespace JitTest
+.namespace JitTest_array1_refany_il
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends [mscorlib]System.Object
   {
     .method private hidebysig static void 
@@ -51,7 +51,7 @@
       IL_0018:  ldarg.0
       IL_0019:  refanyval  [mscorlib]System.Array
       IL_001e:  ldind.ref
-      IL_001f:  newobj     instance void JitTest.Test::.ctor()
+      IL_001f:  newobj     instance void JitTest_array1_refany_il.Test::.ctor()
       IL_0024:  ldloc.0
       IL_0025:  call       instance void [mscorlib]System.Array::SetValue(class [mscorlib]System.Object,
                                                                           int32)
@@ -208,7 +208,7 @@
       IL_011c:  ret
     } // end of method Test::TestRef
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -230,7 +230,7 @@
                unsigned int64[0...,0...] V_10,
                unsigned int64[][] V_11,
                unsigned int64[] V_12)
-      IL_0000:  ldtoken    JitTest.Test
+      IL_0000:  ldtoken    JitTest_array1_refany_il.Test
       IL_0005:  call       class [mscorlib]System.Type [mscorlib]System.Type::GetTypeFromHandle(value class [mscorlib]System.RuntimeTypeHandle)
       IL_000a:  ldc.i4.s   16
       IL_000c:  call       class [mscorlib]System.Array [mscorlib]System.Array::CreateInstance(class [mscorlib]System.Type,
@@ -238,7 +238,7 @@
       IL_0011:  stloc.0
       IL_0012:  ldloca.s   V_0
       IL_0014:  mkrefany   [mscorlib]System.Array
-      IL_0019:  call       void JitTest.Test::TestRef(typedref)
+      IL_0019:  call       void JitTest_array1_refany_il.Test::TestRef(typedref)
       IL_001e:  ldc.i4.0
       IL_001f:  stloc.1
       IL_0020:  br.s       IL_0049
@@ -252,7 +252,7 @@
       IL_002c:  ldloc.1
       IL_002d:  call       instance class [mscorlib]System.Object [mscorlib]System.Array::GetValue(int32)
       IL_0032:  call       instance class [mscorlib]System.Type [mscorlib]System.Object::GetType()
-      IL_0037:  ldtoken    JitTest.Test
+      IL_0037:  ldtoken    JitTest_array1_refany_il.Test
       IL_003c:  call       class [mscorlib]System.Type [mscorlib]System.Type::GetTypeFromHandle(value class [mscorlib]System.RuntimeTypeHandle)
       IL_0041:  beq.s      IL_0045
 
@@ -289,7 +289,7 @@
       IL_006a:  stloc.2
       IL_006b:  ldloca.s   V_2
       IL_006d:  mkrefany   int64[]
-      IL_0072:  call       void JitTest.Test::TestRef(typedref)
+      IL_0072:  call       void JitTest_array1_refany_il.Test::TestRef(typedref)
       IL_0077:  ldloc.2
       IL_0078:  ldc.i4.0
       IL_0079:  ldelem.i8
@@ -371,7 +371,7 @@
       IL_00db:  stloc.3
       IL_00dc:  ldloca.s   V_3
       IL_00de:  mkrefany   unsigned int64[0...,0...]
-      IL_00e3:  call       void JitTest.Test::TestRef(typedref)
+      IL_00e3:  call       void JitTest_array1_refany_il.Test::TestRef(typedref)
       IL_00e8:  ldc.i4.0
       IL_00e9:  stloc.s    V_4
       IL_00eb:  br.s       IL_0119
@@ -463,7 +463,7 @@
       IL_0168:  stloc.s    V_6
       IL_016a:  ldloca.s   V_6
       IL_016c:  mkrefany   unsigned int64[][]
-      IL_0171:  call       void JitTest.Test::TestRef(typedref)
+      IL_0171:  call       void JitTest_array1_refany_il.Test::TestRef(typedref)
       IL_0176:  ldc.i4.0
       IL_0177:  stloc.s    V_7
       IL_0179:  br.s       IL_01a5
@@ -522,6 +522,6 @@
 
   } // end of class Test
 
-} // end of namespace JitTest
+} // end of namespace JitTest_array1_refany_il
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/refany/array1_il_d.ilproj b/src/tests/JIT/Methodical/refany/array1_il_d.ilproj
index 17954441b39eea..02683ec625343a 100644
--- a/src/tests/JIT/Methodical/refany/array1_il_d.ilproj
+++ b/src/tests/JIT/Methodical/refany/array1_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/refany/array1_il_r.ilproj b/src/tests/JIT/Methodical/refany/array1_il_r.ilproj
index 04f50288c43d3e..6fcec02689b237 100644
--- a/src/tests/JIT/Methodical/refany/array1_il_r.ilproj
+++ b/src/tests/JIT/Methodical/refany/array1_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/refany/array2.cs b/src/tests/JIT/Methodical/refany/array2.cs
index 34a8039f4c2132..843130a2905586 100644
--- a/src/tests/JIT/Methodical/refany/array2.cs
+++ b/src/tests/JIT/Methodical/refany/array2.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_array2_refany_cs
 {
-    internal class Test
+    public class Test
     {
         private static void TestRef(TypedReference _ref)
         {
@@ -21,7 +22,8 @@ private static void TestRef(TypedReference _ref)
             }
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             ulong[,] aul2 = new ulong[,] { { 1, 2, 3 }, { 4, 5, 6 } };
             TestRef(__makeref(aul2));
diff --git a/src/tests/JIT/Methodical/refany/array2.csproj b/src/tests/JIT/Methodical/refany/array2.csproj
index c6ab3e5ba623a4..91b89ac317287f 100644
--- a/src/tests/JIT/Methodical/refany/array2.csproj
+++ b/src/tests/JIT/Methodical/refany/array2.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/refany/array2.il b/src/tests/JIT/Methodical/refany/array2.il
index 21fd254bf1593d..b593b4250ce663 100644
--- a/src/tests/JIT/Methodical/refany/array2.il
+++ b/src/tests/JIT/Methodical/refany/array2.il
@@ -16,9 +16,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {1781A471-82F3-4159-8D0F-B3B5A9FF1BB6}
-.namespace JitTest
+.namespace JitTest_array2_refany_il
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends [mscorlib]System.Object
   {
     .method private hidebysig static unsigned int64 MyGet(unsigned int64[1000...,1000...],int32,int32) il managed
@@ -91,14 +91,14 @@
       IL_002e:  ldloc.s    V_4
       
       
-      IL_0030:  call  unsigned int64 JitTest.Test::MyGet(	unsigned int64[1000...,1000...],
+      IL_0030:  call  unsigned int64 JitTest_array2_refany_il.Test::MyGet(	unsigned int64[1000...,1000...],
       														int32,
                                                             int32)
       IL_0035:  ldc.i4.1
       IL_0036:  conv.i8
       IL_0037:  sub
 
-      			call  void JitTest.Test::MySet(unsigned int64[1000...,1000...],int32,int32,unsigned int64)
+      			call  void JitTest_array2_refany_il.Test::MySet(unsigned int64[1000...,1000...],int32,int32,unsigned int64)
 
       IL_003d:  ldloc.1
       IL_003e:  ldc.i4.1
@@ -119,7 +119,7 @@
       IL_004d:  ret
     } // end of method Test::TestRef
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -194,7 +194,7 @@
       IL_004d:  stloc.0
       IL_004e:  ldloca.s   V_0
       IL_0050:  mkrefany   unsigned int64[1000...,1000...]
-      IL_0055:  call       void JitTest.Test::TestRef(typedref)
+      IL_0055:  call       void JitTest_array2_refany_il.Test::TestRef(typedref)
       IL_005a:  ldc.i4.0
       IL_005b:  stloc.1
       IL_005c:  br.s       IL_0082
@@ -262,6 +262,6 @@
 
   } // end of class Test
 
-} // end of namespace JitTest
+} // end of namespace JitTest_array2_refany_il
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/refany/array2_il_d.ilproj b/src/tests/JIT/Methodical/refany/array2_il_d.ilproj
index ac49899712b3ab..e25526c2b5ae8e 100644
--- a/src/tests/JIT/Methodical/refany/array2_il_d.ilproj
+++ b/src/tests/JIT/Methodical/refany/array2_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/refany/array2_il_r.ilproj b/src/tests/JIT/Methodical/refany/array2_il_r.ilproj
index 6302465c222e7b..98f56840ab472e 100644
--- a/src/tests/JIT/Methodical/refany/array2_il_r.ilproj
+++ b/src/tests/JIT/Methodical/refany/array2_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/refany/array3.il b/src/tests/JIT/Methodical/refany/array3.il
index 722c1df9367836..dc2e32b5a45b13 100644
--- a/src/tests/JIT/Methodical/refany/array3.il
+++ b/src/tests/JIT/Methodical/refany/array3.il
@@ -16,9 +16,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {1781A471-82F3-4159-8D0F-B3B5A9FF1BB6}
-.namespace JitTest
+.namespace JitTest_array3_refany_il
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends [mscorlib]System.Object
   {
     .method private hidebysig static unsigned int64 MyGet(refany,int32,int32) il managed
@@ -93,14 +93,14 @@
       IL_002e:  ldloc.s    V_4
       
       
-      IL_0030:  call  unsigned int64 JitTest.Test::MyGet(	refany,
+      IL_0030:  call  unsigned int64 JitTest_array3_refany_il.Test::MyGet(	refany,
       														int32,
                                                             int32)
       IL_0035:  ldc.i4.1
       IL_0036:  conv.i8
       IL_0037:  sub
 
-      			call  void JitTest.Test::MySet(refany,int32,int32,unsigned int64)
+      			call  void JitTest_array3_refany_il.Test::MySet(refany,int32,int32,unsigned int64)
 
       IL_003d:  ldloc.1
       IL_003e:  ldc.i4.1
@@ -121,7 +121,7 @@
       IL_004d:  ret
     } // end of method Test::TestRef
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -196,7 +196,7 @@
       IL_004d:  stloc.0
       IL_004e:  ldloca.s   V_0
       IL_0050:  mkrefany   unsigned int64[1000...,1000...]
-      IL_0055:  call       void JitTest.Test::TestRef(typedref)
+      IL_0055:  call       void JitTest_array3_refany_il.Test::TestRef(typedref)
       IL_005a:  ldc.i4.0
       IL_005b:  stloc.1
       IL_005c:  br.s       IL_0082
@@ -264,6 +264,6 @@
 
   } // end of class Test
 
-} // end of namespace JitTest
+} // end of namespace JitTest_array3_refany_il
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/refany/array3_il_d.ilproj b/src/tests/JIT/Methodical/refany/array3_il_d.ilproj
index 8d6ccf4240974d..a63c8328e13e51 100644
--- a/src/tests/JIT/Methodical/refany/array3_il_d.ilproj
+++ b/src/tests/JIT/Methodical/refany/array3_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/refany/array3_il_r.ilproj b/src/tests/JIT/Methodical/refany/array3_il_r.ilproj
index a64ef7df972235..5647e85ac916ce 100644
--- a/src/tests/JIT/Methodical/refany/array3_il_r.ilproj
+++ b/src/tests/JIT/Methodical/refany/array3_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/refany/format.cs b/src/tests/JIT/Methodical/refany/format.cs
index 7b36e8bec29a2e..269b751d64b1d2 100644
--- a/src/tests/JIT/Methodical/refany/format.cs
+++ b/src/tests/JIT/Methodical/refany/format.cs
@@ -2,8 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_format_cs
 {
     public enum PlatformID
     {
@@ -22,7 +23,7 @@ internal enum Mood
         worse
     }
 
-    internal class TestClass
+    public class TestClass
     {
         private static String Format(TypedReference format, TypedReference _ref)
         {
@@ -278,7 +279,8 @@ private static void TestArrayElem()
             Test("{%e}", __makeref(mood[0]), "{good}");
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             TestLocals();
             new TestClass().TestFields();
diff --git a/src/tests/JIT/Methodical/refany/format.csproj b/src/tests/JIT/Methodical/refany/format.csproj
index 2cce50321924bc..56f6ee2365b2b4 100644
--- a/src/tests/JIT/Methodical/refany/format.csproj
+++ b/src/tests/JIT/Methodical/refany/format.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/refany/format.il b/src/tests/JIT/Methodical/refany/format.il
index 2d2f71aa28c353..00e10dc40056ab 100644
--- a/src/tests/JIT/Methodical/refany/format.il
+++ b/src/tests/JIT/Methodical/refany/format.il
@@ -14,30 +14,30 @@
 {
 }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_format_il
 {
   .class public auto ansi sealed PlatformID
          extends [mscorlib]System.Enum
   {
     .field public specialname rtspecialname int32 value__
-    .field public static literal valuetype JitTest.PlatformID MacOSX = int32(0x00000006)
-    .field public static literal valuetype JitTest.PlatformID Unix = int32(0x00000004)
-    .field public static literal valuetype JitTest.PlatformID Win32NT = int32(0x00000002)
-    .field public static literal valuetype JitTest.PlatformID Win32S = int32(0x00000000)
-    .field public static literal valuetype JitTest.PlatformID Win32Windows = int32(0x00000001)
-    .field public static literal valuetype JitTest.PlatformID WinCE = int32(0x00000003)
-    .field public static literal valuetype JitTest.PlatformID Xbox = int32(0x00000005)
-  } // end of class JitTest.PlatformID
+    .field public static literal valuetype JitTest_format_il.PlatformID MacOSX = int32(0x00000006)
+    .field public static literal valuetype JitTest_format_il.PlatformID Unix = int32(0x00000004)
+    .field public static literal valuetype JitTest_format_il.PlatformID Win32NT = int32(0x00000002)
+    .field public static literal valuetype JitTest_format_il.PlatformID Win32S = int32(0x00000000)
+    .field public static literal valuetype JitTest_format_il.PlatformID Win32Windows = int32(0x00000001)
+    .field public static literal valuetype JitTest_format_il.PlatformID WinCE = int32(0x00000003)
+    .field public static literal valuetype JitTest_format_il.PlatformID Xbox = int32(0x00000005)
+  } // end of class JitTest_format_il.PlatformID
   .class value private auto ansi serializable sealed Mood
          extends [mscorlib]System.Enum
   {
     .field public specialname rtspecialname int32 value__
-    .field public static literal value class JitTest.Mood good = int32(0x00000000)
-    .field public static literal value class JitTest.Mood bad = int32(0x00000001)
-    .field public static literal value class JitTest.Mood worse = int32(0x00000002)
+    .field public static literal value class JitTest_format_il.Mood good = int32(0x00000000)
+    .field public static literal value class JitTest_format_il.Mood bad = int32(0x00000001)
+    .field public static literal value class JitTest_format_il.Mood worse = int32(0x00000002)
   } // end of class Mood
 
-  .class private auto ansi TestClass
+  .class public auto ansi TestClass
          extends [mscorlib]System.Object
   {
     .field private int32 m_d
@@ -48,8 +48,8 @@
     .field private float64 m_dbl
     .field private bool m_b
     .field private static value class [mscorlib]System.DateTime m_t
-    .field private value class JitTest.PlatformID m_pid
-    .field private value class JitTest.Mood m_mood
+    .field private value class JitTest_format_il.PlatformID m_pid
+    .field private value class JitTest_format_il.Mood m_mood
     .method private hidebysig static string 
             Format(typedref format,
                    typedref _ref) il managed
@@ -64,7 +64,7 @@
                bool V_6,
                typedref V_7,
                wchar V_8,
-               value class JitTest.Mood V_9)
+               value class JitTest_format_il.Mood V_9)
       IL_0000:  ldarg.0
       IL_0001:  refanyval  [mscorlib]System.String
       IL_0006:  ldind.ref
@@ -412,7 +412,7 @@
       IL_031d:  ldarg.1
       IL_031e:  refanytype
       IL_0320:  call       class [mscorlib]System.Type [mscorlib]System.Type::GetTypeFromHandle(value class [mscorlib]System.RuntimeTypeHandle)
-      IL_0325:  ldtoken    JitTest.PlatformID
+      IL_0325:  ldtoken    JitTest_format_il.PlatformID
       IL_032a:  call       class [mscorlib]System.Type [mscorlib]System.Type::GetTypeFromHandle(value class [mscorlib]System.RuntimeTypeHandle)
       IL_032f:  beq.s      IL_0337
 
@@ -421,9 +421,9 @@
 
       IL_0337:  ldloc.2
       IL_0338:  ldarg.1
-      IL_0339:  refanyval  JitTest.PlatformID
-	      	ldobj  JitTest.PlatformID
-      IL_033e:  box        JitTest.PlatformID
+      IL_0339:  refanyval  JitTest_format_il.PlatformID
+	      	ldobj  JitTest_format_il.PlatformID
+      IL_033e:  box        JitTest_format_il.PlatformID
       IL_0343:  call       instance string [mscorlib]System.Enum::ToString()
       IL_0348:  call       string [mscorlib]System.String::Concat(string,
                                                                                string)
@@ -441,7 +441,7 @@
       IL_0360:  ldarg.1
       IL_0361:  refanytype
       IL_0363:  call       class [mscorlib]System.Type [mscorlib]System.Type::GetTypeFromHandle(value class [mscorlib]System.RuntimeTypeHandle)
-      IL_0368:  ldtoken    JitTest.Mood
+      IL_0368:  ldtoken    JitTest_format_il.Mood
       IL_036d:  call       class [mscorlib]System.Type [mscorlib]System.Type::GetTypeFromHandle(value class [mscorlib]System.RuntimeTypeHandle)
       IL_0372:  beq.s      IL_037a
 
@@ -449,7 +449,7 @@
       IL_0379:  throw
 
       IL_037a:  ldarg.1
-      IL_037b:  refanyval  JitTest.Mood
+      IL_037b:  refanyval  JitTest_format_il.Mood
       IL_0380:  ldind.i4
       IL_0381:  stloc.s    V_9
       IL_0383:  ldloc.s    V_9
@@ -509,7 +509,7 @@
       IL_0000:  ldarga.s   format
       IL_0002:  mkrefany   [mscorlib]System.String
       IL_0007:  ldarg.1
-      IL_0008:  call       string JitTest.TestClass::Format(typedref,
+      IL_0008:  call       string JitTest_format_il.TestClass::Format(typedref,
                                                                          typedref)
       IL_000d:  stloc.0
       IL_000e:  ldloc.0
@@ -562,8 +562,8 @@
                float64 V_5,
                bool V_6,
                value class [mscorlib]System.DateTime V_7,
-               value class JitTest.PlatformID V_8,
-               value class JitTest.Mood V_9)
+               value class JitTest_format_il.PlatformID V_8,
+               value class JitTest_format_il.Mood V_9)
       IL_0000:  ldc.i4.s   10
       IL_0002:  stloc.0
       IL_0003:  ldc.i4.s   11
@@ -595,49 +595,49 @@
       IL_003a:  ldloca.s   V_0
       IL_003c:  mkrefany   [mscorlib]System.Int32
       IL_0041:  ldstr      "{10}"
-      IL_0046:  call       void JitTest.TestClass::Test(string,
+      IL_0046:  call       void JitTest_format_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_004b:  ldstr      "{%u}"
       IL_0050:  ldloca.s   V_1
       IL_0052:  mkrefany   [mscorlib]System.UInt32
       IL_0057:  ldstr      "{11}"
-      IL_005c:  call       void JitTest.TestClass::Test(string,
+      IL_005c:  call       void JitTest_format_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_0061:  ldstr      "{%ld}"
       IL_0066:  ldloca.s   V_2
       IL_0068:  mkrefany   [mscorlib]System.Int64
       IL_006d:  ldstr      "{12}"
-      IL_0072:  call       void JitTest.TestClass::Test(string,
+      IL_0072:  call       void JitTest_format_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_0077:  ldstr      "{%lu}"
       IL_007c:  ldloca.s   V_3
       IL_007e:  mkrefany   [mscorlib]System.UInt64
       IL_0083:  ldstr      "{13}"
-      IL_0088:  call       void JitTest.TestClass::Test(string,
+      IL_0088:  call       void JitTest_format_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_008d:  ldstr      "{%f}"
       IL_0092:  ldloca.s   V_4
       IL_0094:  mkrefany   [mscorlib]System.Single
       IL_0099:  ldstr      "{14}"
-      IL_009e:  call       void JitTest.TestClass::Test(string,
+      IL_009e:  call       void JitTest_format_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_00a3:  ldstr      "{%lf}"
       IL_00a8:  ldloca.s   V_5
       IL_00aa:  mkrefany   [mscorlib]System.Double
       IL_00af:  ldstr      "{15}"
-      IL_00b4:  call       void JitTest.TestClass::Test(string,
+      IL_00b4:  call       void JitTest_format_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_00b9:  ldstr      "{%b}"
       IL_00be:  ldloca.s   V_6
       IL_00c0:  mkrefany   [mscorlib]System.Boolean
       IL_00c5:  ldstr      "{true}"
-      IL_00ca:  call       void JitTest.TestClass::Test(string,
+      IL_00ca:  call       void JitTest_format_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_00cf:  ldstr      "{%t}"
@@ -650,21 +650,21 @@
       IL_00ec:  call       string [mscorlib]System.String::Concat(string,
                                                                                string,
                                                                                string)
-      IL_00f1:  call       void JitTest.TestClass::Test(string,
+      IL_00f1:  call       void JitTest_format_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_00f6:  ldstr      "{%p}"
       IL_00fb:  ldloca.s   V_8
-      IL_00fd:  mkrefany   JitTest.PlatformID
+      IL_00fd:  mkrefany   JitTest_format_il.PlatformID
       IL_0102:  ldstr      "{Win32NT}"
-      IL_0107:  call       void JitTest.TestClass::Test(string,
+      IL_0107:  call       void JitTest_format_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_010c:  ldstr      "{%e}"
       IL_0111:  ldloca.s   V_9
-      IL_0113:  mkrefany   JitTest.Mood
+      IL_0113:  mkrefany   JitTest_format_il.Mood
       IL_0118:  ldstr      "{good}"
-      IL_011d:  call       void JitTest.TestClass::Test(string,
+      IL_011d:  call       void JitTest_format_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_0122:  ret
@@ -676,85 +676,85 @@
       .maxstack  5
       IL_0000:  ldstr      "{%d}"
       IL_0005:  ldarg.0
-      IL_0006:  ldflda     int32 JitTest.TestClass::m_d
+      IL_0006:  ldflda     int32 JitTest_format_il.TestClass::m_d
       IL_000b:  mkrefany   [mscorlib]System.Int32
       IL_0010:  ldstr      "{20}"
-      IL_0015:  call       void JitTest.TestClass::Test(string,
+      IL_0015:  call       void JitTest_format_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_001a:  ldstr      "{%u}"
-      IL_001f:  ldsflda    unsigned int32 JitTest.TestClass::m_u
+      IL_001f:  ldsflda    unsigned int32 JitTest_format_il.TestClass::m_u
       IL_0024:  mkrefany   [mscorlib]System.UInt32
       IL_0029:  ldstr      "{21}"
-      IL_002e:  call       void JitTest.TestClass::Test(string,
+      IL_002e:  call       void JitTest_format_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_0033:  ldstr      "{%ld}"
       IL_0038:  ldarg.0
-      IL_0039:  ldflda     int64 JitTest.TestClass::m_l
+      IL_0039:  ldflda     int64 JitTest_format_il.TestClass::m_l
       IL_003e:  mkrefany   [mscorlib]System.Int64
       IL_0043:  ldstr      "{22}"
-      IL_0048:  call       void JitTest.TestClass::Test(string,
+      IL_0048:  call       void JitTest_format_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_004d:  ldstr      "{%lu}"
-      IL_0052:  ldsflda    unsigned int64 JitTest.TestClass::m_ul
+      IL_0052:  ldsflda    unsigned int64 JitTest_format_il.TestClass::m_ul
       IL_0057:  mkrefany   [mscorlib]System.UInt64
       IL_005c:  ldstr      "{23}"
-      IL_0061:  call       void JitTest.TestClass::Test(string,
+      IL_0061:  call       void JitTest_format_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_0066:  ldstr      "{%f}"
       IL_006b:  ldarg.0
-      IL_006c:  ldflda     float32 JitTest.TestClass::m_f
+      IL_006c:  ldflda     float32 JitTest_format_il.TestClass::m_f
       IL_0071:  mkrefany   [mscorlib]System.Single
       IL_0076:  ldstr      "{24}"
-      IL_007b:  call       void JitTest.TestClass::Test(string,
+      IL_007b:  call       void JitTest_format_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_0080:  ldstr      "{%lf}"
       IL_0085:  ldarg.0
-      IL_0086:  ldflda     float64 JitTest.TestClass::m_dbl
+      IL_0086:  ldflda     float64 JitTest_format_il.TestClass::m_dbl
       IL_008b:  mkrefany   [mscorlib]System.Double
       IL_0090:  ldstr      "{25}"
-      IL_0095:  call       void JitTest.TestClass::Test(string,
+      IL_0095:  call       void JitTest_format_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_009a:  ldstr      "{%b}"
       IL_009f:  ldarg.0
-      IL_00a0:  ldflda     bool JitTest.TestClass::m_b
+      IL_00a0:  ldflda     bool JitTest_format_il.TestClass::m_b
       IL_00a5:  mkrefany   [mscorlib]System.Boolean
       IL_00aa:  ldstr      "{false}"
-      IL_00af:  call       void JitTest.TestClass::Test(string,
+      IL_00af:  call       void JitTest_format_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_00b4:  ldstr      "{%t}"
-      IL_00b9:  ldsflda    value class [mscorlib]System.DateTime JitTest.TestClass::m_t
+      IL_00b9:  ldsflda    value class [mscorlib]System.DateTime JitTest_format_il.TestClass::m_t
       IL_00be:  mkrefany   [mscorlib]System.DateTime
       IL_00c3:  ldstr      "{"
-      IL_00c8:  ldsflda    value class [mscorlib]System.DateTime JitTest.TestClass::m_t
+      IL_00c8:  ldsflda    value class [mscorlib]System.DateTime JitTest_format_il.TestClass::m_t
       IL_00cd:  call       instance string [mscorlib]System.DateTime::ToString()
       IL_00d2:  ldstr      "}"
       IL_00d7:  call       string [mscorlib]System.String::Concat(string,
                                                                                string,
                                                                                string)
-      IL_00dc:  call       void JitTest.TestClass::Test(string,
+      IL_00dc:  call       void JitTest_format_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_00e1:  ldstr      "{%p}"
       IL_00e6:  ldarg.0
-      IL_00e7:  ldflda     value class JitTest.PlatformID JitTest.TestClass::m_pid
-      IL_00ec:  mkrefany   JitTest.PlatformID
+      IL_00e7:  ldflda     value class JitTest_format_il.PlatformID JitTest_format_il.TestClass::m_pid
+      IL_00ec:  mkrefany   JitTest_format_il.PlatformID
       IL_00f1:  ldstr      "{Win32NT}"
-      IL_00f6:  call       void JitTest.TestClass::Test(string,
+      IL_00f6:  call       void JitTest_format_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_00fb:  ldstr      "{%e}"
       IL_0100:  ldarg.0
-      IL_0101:  ldflda     value class JitTest.Mood JitTest.TestClass::m_mood
-      IL_0106:  mkrefany   JitTest.Mood
+      IL_0101:  ldflda     value class JitTest_format_il.Mood JitTest_format_il.TestClass::m_mood
+      IL_0106:  mkrefany   JitTest_format_il.Mood
       IL_010b:  ldstr      "{good}"
-      IL_0110:  call       void JitTest.TestClass::Test(string,
+      IL_0110:  call       void JitTest_format_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_0115:  ret
@@ -769,56 +769,56 @@
                            float64& dbl,
                            bool& b,
                            value class [mscorlib]System.DateTime& t,
-                           value class JitTest.PlatformID& pid) il managed
+                           value class JitTest_format_il.PlatformID& pid) il managed
     {
       .maxstack  5
       IL_0000:  ldstr      "{%d}"
       IL_0005:  ldarg.0
       IL_0006:  mkrefany   [mscorlib]System.Int32
       IL_000b:  ldstr      "{20}"
-      IL_0010:  call       void JitTest.TestClass::Test(string,
+      IL_0010:  call       void JitTest_format_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_0015:  ldstr      "{%u}"
       IL_001a:  ldarg.1
       IL_001b:  mkrefany   [mscorlib]System.UInt32
       IL_0020:  ldstr      "{21}"
-      IL_0025:  call       void JitTest.TestClass::Test(string,
+      IL_0025:  call       void JitTest_format_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_002a:  ldstr      "{%ld}"
       IL_002f:  ldarg.2
       IL_0030:  mkrefany   [mscorlib]System.Int64
       IL_0035:  ldstr      "{22}"
-      IL_003a:  call       void JitTest.TestClass::Test(string,
+      IL_003a:  call       void JitTest_format_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_003f:  ldstr      "{%lu}"
       IL_0044:  ldarg.3
       IL_0045:  mkrefany   [mscorlib]System.UInt64
       IL_004a:  ldstr      "{23}"
-      IL_004f:  call       void JitTest.TestClass::Test(string,
+      IL_004f:  call       void JitTest_format_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_0054:  ldstr      "{%f}"
       IL_0059:  ldarg.s    f
       IL_005b:  mkrefany   [mscorlib]System.Single
       IL_0060:  ldstr      "{24}"
-      IL_0065:  call       void JitTest.TestClass::Test(string,
+      IL_0065:  call       void JitTest_format_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_006a:  ldstr      "{%lf}"
       IL_006f:  ldarg.s    dbl
       IL_0071:  mkrefany   [mscorlib]System.Double
       IL_0076:  ldstr      "{25}"
-      IL_007b:  call       void JitTest.TestClass::Test(string,
+      IL_007b:  call       void JitTest_format_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_0080:  ldstr      "{%b}"
       IL_0085:  ldarg.s    b
       IL_0087:  mkrefany   [mscorlib]System.Boolean
       IL_008c:  ldstr      "{false}"
-      IL_0091:  call       void JitTest.TestClass::Test(string,
+      IL_0091:  call       void JitTest_format_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_0096:  ldstr      "{%t}"
@@ -831,14 +831,14 @@
       IL_00b3:  call       string [mscorlib]System.String::Concat(string,
                                                                                string,
                                                                                string)
-      IL_00b8:  call       void JitTest.TestClass::Test(string,
+      IL_00b8:  call       void JitTest_format_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_00bd:  ldstr      "{%p}"
       IL_00c2:  ldarg.s    pid
-      IL_00c4:  mkrefany   JitTest.PlatformID
+      IL_00c4:  mkrefany   JitTest_format_il.PlatformID
       IL_00c9:  ldstr      "{Win32NT}"
-      IL_00ce:  call       void JitTest.TestClass::Test(string,
+      IL_00ce:  call       void JitTest_format_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_00d3:  ret
@@ -856,7 +856,7 @@
                float64 V_5,
                bool V_6,
                value class [mscorlib]System.DateTime V_7,
-               value class JitTest.PlatformID V_8)
+               value class JitTest_format_il.PlatformID V_8)
       IL_0000:  ldc.i4.s   20
       IL_0002:  stloc.0
       IL_0003:  ldc.i4.s   21
@@ -891,7 +891,7 @@
       IL_003e:  ldloca.s   V_6
       IL_0040:  ldloca.s   V_7
       IL_0042:  ldloca.s   V_8
-      IL_0044:  call       void JitTest.TestClass::DoTestArgSlots(int32&,
+      IL_0044:  call       void JitTest_format_il.TestClass::DoTestArgSlots(int32&,
                                                                   unsigned int32&,
                                                                   int64&,
                                                                   unsigned int64&,
@@ -899,7 +899,7 @@
                                                                   float64&,
                                                                   bool&,
                                                                   value class [mscorlib]System.DateTime&,
-                                                                  value class JitTest.PlatformID&)
+                                                                  value class JitTest_format_il.PlatformID&)
       IL_0049:  ret
     } // end of method TestClass::TestArgSlots
 
@@ -915,8 +915,8 @@
                float64[] V_5,
                bool[] V_6,
                value class [mscorlib]System.DateTime[] V_7,
-               value class JitTest.PlatformID[] V_8,
-               value class JitTest.Mood[] V_9,
+               value class JitTest_format_il.PlatformID[] V_8,
+               value class JitTest_format_il.Mood[] V_9,
                int32[] V_10,
                unsigned int32[] V_11,
                int64[] V_12,
@@ -924,8 +924,8 @@
                float32[] V_14,
                float64[] V_15,
                bool[] V_16,
-               value class JitTest.PlatformID[] V_17,
-               value class JitTest.Mood[] V_18)
+               value class JitTest_format_il.PlatformID[] V_17,
+               value class JitTest_format_il.Mood[] V_18)
       IL_0000:  ldc.i4.1
       IL_0001:  newarr     [mscorlib]System.Int32
       IL_0006:  stloc.s    V_10
@@ -1004,7 +1004,7 @@
                                                                           int32,
                                                                           int32)
       IL_00a3:  ldc.i4.1
-      IL_00a4:  newarr     JitTest.PlatformID
+      IL_00a4:  newarr     JitTest_format_il.PlatformID
       IL_00a9:  stloc.s    V_17
       IL_00ab:  ldloc.s    V_17
       IL_00ad:  ldc.i4.0
@@ -1013,7 +1013,7 @@
       IL_00b0:  ldloc.s    V_17
       IL_00b2:  stloc.s    V_8
       IL_00b4:  ldc.i4.1
-      IL_00b5:  newarr     JitTest.Mood
+      IL_00b5:  newarr     JitTest_format_il.Mood
       IL_00ba:  stloc.s    V_18
       IL_00bc:  ldloc.s    V_18
       IL_00be:  stloc.s    V_9
@@ -1023,7 +1023,7 @@
       IL_00c7:  ldelema    [mscorlib]System.Int32
       IL_00cc:  mkrefany   [mscorlib]System.Int32
       IL_00d1:  ldstr      "{10}"
-      IL_00d6:  call       void JitTest.TestClass::Test(string,
+      IL_00d6:  call       void JitTest_format_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_00db:  ldstr      "{%u}"
@@ -1032,7 +1032,7 @@
       IL_00e2:  ldelema    [mscorlib]System.UInt32
       IL_00e7:  mkrefany   [mscorlib]System.UInt32
       IL_00ec:  ldstr      "{11}"
-      IL_00f1:  call       void JitTest.TestClass::Test(string,
+      IL_00f1:  call       void JitTest_format_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_00f6:  ldstr      "{%ld}"
@@ -1041,7 +1041,7 @@
       IL_00fd:  ldelema    [mscorlib]System.Int64
       IL_0102:  mkrefany   [mscorlib]System.Int64
       IL_0107:  ldstr      "{12}"
-      IL_010c:  call       void JitTest.TestClass::Test(string,
+      IL_010c:  call       void JitTest_format_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_0111:  ldstr      "{%lu}"
@@ -1050,7 +1050,7 @@
       IL_0118:  ldelema    [mscorlib]System.UInt64
       IL_011d:  mkrefany   [mscorlib]System.UInt64
       IL_0122:  ldstr      "{13}"
-      IL_0127:  call       void JitTest.TestClass::Test(string,
+      IL_0127:  call       void JitTest_format_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_012c:  ldstr      "{%f}"
@@ -1059,7 +1059,7 @@
       IL_0134:  ldelema    [mscorlib]System.Single
       IL_0139:  mkrefany   [mscorlib]System.Single
       IL_013e:  ldstr      "{14}"
-      IL_0143:  call       void JitTest.TestClass::Test(string,
+      IL_0143:  call       void JitTest_format_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_0148:  ldstr      "{%lf}"
@@ -1068,7 +1068,7 @@
       IL_0150:  ldelema    [mscorlib]System.Double
       IL_0155:  mkrefany   [mscorlib]System.Double
       IL_015a:  ldstr      "{15}"
-      IL_015f:  call       void JitTest.TestClass::Test(string,
+      IL_015f:  call       void JitTest_format_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_0164:  ldstr      "{%b}"
@@ -1077,7 +1077,7 @@
       IL_016c:  ldelema    [mscorlib]System.Boolean
       IL_0171:  mkrefany   [mscorlib]System.Boolean
       IL_0176:  ldstr      "{true}"
-      IL_017b:  call       void JitTest.TestClass::Test(string,
+      IL_017b:  call       void JitTest_format_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_0180:  ldstr      "{%t}"
@@ -1094,31 +1094,31 @@
       IL_01a9:  call       string [mscorlib]System.String::Concat(string,
                                                                                string,
                                                                                string)
-      IL_01ae:  call       void JitTest.TestClass::Test(string,
+      IL_01ae:  call       void JitTest_format_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_01b3:  ldstr      "{%p}"
       IL_01b8:  ldloc.s    V_8
       IL_01ba:  ldc.i4.0
-      IL_01bb:  ldelema    JitTest.PlatformID
-      IL_01c0:  mkrefany   JitTest.PlatformID
+      IL_01bb:  ldelema    JitTest_format_il.PlatformID
+      IL_01c0:  mkrefany   JitTest_format_il.PlatformID
       IL_01c5:  ldstr      "{Win32NT}"
-      IL_01ca:  call       void JitTest.TestClass::Test(string,
+      IL_01ca:  call       void JitTest_format_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_01cf:  ldstr      "{%e}"
       IL_01d4:  ldloc.s    V_9
       IL_01d6:  ldc.i4.0
-      IL_01d7:  ldelema    JitTest.Mood
-      IL_01dc:  mkrefany   JitTest.Mood
+      IL_01d7:  ldelema    JitTest_format_il.Mood
+      IL_01dc:  mkrefany   JitTest_format_il.Mood
       IL_01e1:  ldstr      "{good}"
-      IL_01e6:  call       void JitTest.TestClass::Test(string,
+      IL_01e6:  call       void JitTest_format_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_01eb:  ret
     } // end of method TestClass::TestArrayElem
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -1126,10 +1126,10 @@
       )
       .entrypoint
       .maxstack  8
-      IL_0000:  call       void JitTest.TestClass::TestLocals()
-      IL_0005:  newobj     instance void JitTest.TestClass::.ctor()
-      IL_000a:  call       instance void JitTest.TestClass::TestFields()
-      IL_000f:  call       void JitTest.TestClass::TestArrayElem()
+      IL_0000:  call       void JitTest_format_il.TestClass::TestLocals()
+      IL_0005:  newobj     instance void JitTest_format_il.TestClass::.ctor()
+      IL_000a:  call       instance void JitTest_format_il.TestClass::TestFields()
+      IL_000f:  call       void JitTest_format_il.TestClass::TestArrayElem()
       IL_0014:  ldstr      "*** passed ***"
       IL_0019:  call       void [System.Console]System.Console::WriteLine(string)
       IL_001e:  ldc.i4 100
@@ -1141,11 +1141,11 @@
     {
       .maxstack  8
       IL_0000:  ldc.i4.s   21
-      IL_0002:  stsfld     unsigned int32 JitTest.TestClass::m_u
+      IL_0002:  stsfld     unsigned int32 JitTest_format_il.TestClass::m_u
       IL_0007:  ldc.i4.s   23
       IL_0009:  conv.i8
-      IL_000a:  stsfld     unsigned int64 JitTest.TestClass::m_ul
-      IL_000f:  ldsflda    value class [mscorlib]System.DateTime JitTest.TestClass::m_t
+      IL_000a:  stsfld     unsigned int64 JitTest_format_il.TestClass::m_ul
+      IL_000f:  ldsflda    value class [mscorlib]System.DateTime JitTest_format_il.TestClass::m_t
       IL_0014:  ldc.i4.s   100
       IL_0016:  ldc.i4.s   10
       IL_0018:  ldc.i4.1
@@ -1161,26 +1161,26 @@
       .maxstack  2
       IL_0000:  ldarg.0
       IL_0001:  ldc.i4.s   20
-      IL_0003:  stfld      int32 JitTest.TestClass::m_d
+      IL_0003:  stfld      int32 JitTest_format_il.TestClass::m_d
       IL_0008:  ldarg.0
       IL_0009:  ldc.i4.s   22
       IL_000b:  conv.i8
-      IL_000c:  stfld      int64 JitTest.TestClass::m_l
+      IL_000c:  stfld      int64 JitTest_format_il.TestClass::m_l
       IL_0011:  ldarg.0
       IL_0012:  ldc.r4     24.
-      IL_0017:  stfld      float32 JitTest.TestClass::m_f
+      IL_0017:  stfld      float32 JitTest_format_il.TestClass::m_f
       IL_001c:  ldarg.0
       IL_001d:  ldc.r8     25.
-      IL_0026:  stfld      float64 JitTest.TestClass::m_dbl
+      IL_0026:  stfld      float64 JitTest_format_il.TestClass::m_dbl
       IL_002b:  ldarg.0
       IL_002c:  ldc.i4.0
-      IL_002d:  stfld      bool JitTest.TestClass::m_b
+      IL_002d:  stfld      bool JitTest_format_il.TestClass::m_b
       IL_0032:  ldarg.0
       IL_0033:  ldc.i4.2
-      IL_0034:  stfld      value class JitTest.PlatformID JitTest.TestClass::m_pid
+      IL_0034:  stfld      value class JitTest_format_il.PlatformID JitTest_format_il.TestClass::m_pid
       IL_0039:  ldarg.0
       IL_003a:  ldc.i4.0
-      IL_003b:  stfld      value class JitTest.Mood JitTest.TestClass::m_mood
+      IL_003b:  stfld      value class JitTest_format_il.Mood JitTest_format_il.TestClass::m_mood
       IL_0040:  ldarg.0
       IL_0041:  call       instance void [mscorlib]System.Object::.ctor()
       IL_0046:  ret
@@ -1188,5 +1188,5 @@
 
   } // end of class TestClass
 
-} // end of namespace JitTest
+} // end of namespace JitTest_format_il
 
diff --git a/src/tests/JIT/Methodical/refany/format_il_d.ilproj b/src/tests/JIT/Methodical/refany/format_il_d.ilproj
index 7452fad7e71186..4e797afb117fdc 100644
--- a/src/tests/JIT/Methodical/refany/format_il_d.ilproj
+++ b/src/tests/JIT/Methodical/refany/format_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/refany/format_il_r.ilproj b/src/tests/JIT/Methodical/refany/format_il_r.ilproj
index 38bad25544901a..b8f2212176f7b2 100644
--- a/src/tests/JIT/Methodical/refany/format_il_r.ilproj
+++ b/src/tests/JIT/Methodical/refany/format_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/refany/gcreport.cs b/src/tests/JIT/Methodical/refany/gcreport.cs
index a6ebe806b20a23..f2a43c981f0ff6 100644
--- a/src/tests/JIT/Methodical/refany/gcreport.cs
+++ b/src/tests/JIT/Methodical/refany/gcreport.cs
@@ -2,8 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_gcreport_cs
 {
     internal class StressTest2
     {
@@ -11,7 +12,7 @@ internal class StressTest2
         public StressTest m_parent = null;
     }
 
-    internal class StressTest
+    public class StressTest
     {
         private StressTest2 _m_internal;
 
@@ -47,7 +48,8 @@ private static bool Scenario2()
             return __refvalue(R, StressTest2).m_parent._m_internal == __refvalue(R, StressTest2);
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             if (!Scenario1())
             {
diff --git a/src/tests/JIT/Methodical/refany/gcreport_d.csproj b/src/tests/JIT/Methodical/refany/gcreport_d.csproj
index a168f1982c49c5..36cf222ae00984 100644
--- a/src/tests/JIT/Methodical/refany/gcreport_d.csproj
+++ b/src/tests/JIT/Methodical/refany/gcreport_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/refany/gcreport_do.csproj b/src/tests/JIT/Methodical/refany/gcreport_do.csproj
index 79ed522380180f..19254e125dc652 100644
--- a/src/tests/JIT/Methodical/refany/gcreport_do.csproj
+++ b/src/tests/JIT/Methodical/refany/gcreport_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/refany/gcreport_r.csproj b/src/tests/JIT/Methodical/refany/gcreport_r.csproj
index d18b72c546f573..d54daedad74c25 100644
--- a/src/tests/JIT/Methodical/refany/gcreport_r.csproj
+++ b/src/tests/JIT/Methodical/refany/gcreport_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/refany/gcreport_ro.csproj b/src/tests/JIT/Methodical/refany/gcreport_ro.csproj
index 055ce3685052f5..7230b78113e0b5 100644
--- a/src/tests/JIT/Methodical/refany/gcreport_ro.csproj
+++ b/src/tests/JIT/Methodical/refany/gcreport_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/refany/indcall.il b/src/tests/JIT/Methodical/refany/indcall.il
index 68d3d967b56a8d..6ffc8d78d2cdd1 100644
--- a/src/tests/JIT/Methodical/refany/indcall.il
+++ b/src/tests/JIT/Methodical/refany/indcall.il
@@ -14,9 +14,9 @@
   
 }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_indcall_refany_il
 {
-  .class private auto ansi Test extends ['mscorlib']System.Object
+  .class public auto ansi Test extends ['mscorlib']System.Object
   {
     .method private hidebysig instance int32 DoStuff(method instance int32 *(refany)) il managed
     {
@@ -54,7 +54,7 @@
 			ret
     } // end of method 'Test::DoStuff'
 
-    .method private hidebysig static int32 Main() il managed
+    .method public hidebysig static int32 Main() il managed
     {
 			.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
 			    01 00 00 00
@@ -62,9 +62,9 @@
 			.entrypoint
 			.maxstack  6
 			.locals (int32 V_0, int32)
-			newobj		instance void JitTest.Test::.ctor()
-			ldftn 		instance int32 JitTest.Test::DummyMethod(refany)
-			ldftn		instance int32 JitTest.Test::DoStuff(method instance int32 *(refany))
+			newobj		instance void JitTest_indcall_refany_il.Test::.ctor()
+			ldftn 		instance int32 JitTest_indcall_refany_il.Test::DummyMethod(refany)
+			ldftn		instance int32 JitTest_indcall_refany_il.Test::DoStuff(method instance int32 *(refany))
 			tail. calli		instance int32 (method instance int32 *(refany))
 			ret
     } // end of method 'Test::Main'
@@ -79,4 +79,4 @@
 
   } // end of class 'Test'
 
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_indcall_refany_il'
diff --git a/src/tests/JIT/Methodical/refany/indcall_il_d.ilproj b/src/tests/JIT/Methodical/refany/indcall_il_d.ilproj
index 3d959f42981083..f5b7b930530b95 100644
--- a/src/tests/JIT/Methodical/refany/indcall_il_d.ilproj
+++ b/src/tests/JIT/Methodical/refany/indcall_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/refany/indcall_il_r.ilproj b/src/tests/JIT/Methodical/refany/indcall_il_r.ilproj
index 9b8b5a6e295838..4673b153a91ede 100644
--- a/src/tests/JIT/Methodical/refany/indcall_il_r.ilproj
+++ b/src/tests/JIT/Methodical/refany/indcall_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/refany/lcs.cs b/src/tests/JIT/Methodical/refany/lcs.cs
index 3d0e9fdbd35c19..4aa60a26797d19 100644
--- a/src/tests/JIT/Methodical/refany/lcs.cs
+++ b/src/tests/JIT/Methodical/refany/lcs.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_lcs_refany_cs
 {
-    internal class LCS
+    public class LCS
     {
         private const int RANK = 4;
 
@@ -97,7 +98,8 @@ private static void findLCS(    /*int[,,,]*/ TypedReference _c,
             }
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             String[] str = new String[RANK] {
                 "The Sun has left",
diff --git a/src/tests/JIT/Methodical/refany/lcs.csproj b/src/tests/JIT/Methodical/refany/lcs.csproj
index 5bbd9d21654ea7..1cf5fa05ed4e81 100644
--- a/src/tests/JIT/Methodical/refany/lcs.csproj
+++ b/src/tests/JIT/Methodical/refany/lcs.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/refany/lcs.il b/src/tests/JIT/Methodical/refany/lcs.il
index c536dff1986c47..cc4b5286a470de 100644
--- a/src/tests/JIT/Methodical/refany/lcs.il
+++ b/src/tests/JIT/Methodical/refany/lcs.il
@@ -18,9 +18,9 @@
 {
 }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_lcs_refany_il
 {
-  .class private auto ansi LCS
+  .class public auto ansi LCS
          extends [mscorlib]System.Object
   {
     .field private static literal int32 RANK = int32(0x00000004)
@@ -140,7 +140,7 @@
       IL_00a7:  ldarg.0
       IL_00a8:  ldarg.1
       IL_00a9:  ldarg.2
-      IL_00aa:  call       string JitTest.LCS::buildLCS(typedref,
+      IL_00aa:  call       string JitTest_lcs_refany_il.LCS::buildLCS(typedref,
                                                                      typedref,
                                                                      typedref)
       IL_00af:  ldarg.1
@@ -178,7 +178,7 @@
       IL_00e6:  ldarg.0
       IL_00e7:  ldarg.1
       IL_00e8:  ldarg.2
-      IL_00e9:  call       string JitTest.LCS::buildLCS(typedref,
+      IL_00e9:  call       string JitTest_lcs_refany_il.LCS::buildLCS(typedref,
                                                                      typedref,
                                                                      typedref)
       IL_00ee:  ret
@@ -585,7 +585,7 @@
       IL_01e2:  ret
     } // end of method LCS::findLCS
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -703,7 +703,7 @@
       IL_00a1:  mkrefany   wchar[][]
       IL_00a6:  ldloca.s   V_1
       IL_00a8:  mkrefany   int32[]
-      IL_00ad:  call       void JitTest.LCS::findLCS(typedref,
+      IL_00ad:  call       void JitTest_lcs_refany_il.LCS::findLCS(typedref,
                                                      typedref,
                                                      typedref,
                                                      typedref)
@@ -740,7 +740,7 @@
       IL_00e6:  mkrefany   wchar[]
       IL_00eb:  ldloca.s   V_1
       IL_00ed:  mkrefany   int32[]
-      IL_00f2:  call       string JitTest.LCS::buildLCS(typedref,
+      IL_00f2:  call       string JitTest_lcs_refany_il.LCS::buildLCS(typedref,
                                                                      typedref,
                                                                      typedref)
       IL_00f7:  call       bool [mscorlib]System.String::Equals(string,
@@ -769,5 +769,5 @@
 
   } // end of class LCS
 
-} // end of namespace JitTest
+} // end of namespace JitTest_lcs_refany_il
 
diff --git a/src/tests/JIT/Methodical/refany/lcs_il_d.ilproj b/src/tests/JIT/Methodical/refany/lcs_il_d.ilproj
index a5e3731e66a960..57b153ec9224e6 100644
--- a/src/tests/JIT/Methodical/refany/lcs_il_d.ilproj
+++ b/src/tests/JIT/Methodical/refany/lcs_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/refany/lcs_il_r.ilproj b/src/tests/JIT/Methodical/refany/lcs_il_r.ilproj
index 6853623fd63552..757c44937318f7 100644
--- a/src/tests/JIT/Methodical/refany/lcs_il_r.ilproj
+++ b/src/tests/JIT/Methodical/refany/lcs_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/refany/longsig.il b/src/tests/JIT/Methodical/refany/longsig.il
index 38dfb34906379f..0590b191351441 100644
--- a/src/tests/JIT/Methodical/refany/longsig.il
+++ b/src/tests/JIT/Methodical/refany/longsig.il
@@ -14,30 +14,30 @@
 {
 }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_longsig_il
 {
   .class public auto ansi sealed PlatformID
          extends [mscorlib]System.Enum
   {
     .field public specialname rtspecialname int32 value__
-    .field public static literal valuetype JitTest.PlatformID MacOSX = int32(0x00000006)
-    .field public static literal valuetype JitTest.PlatformID Unix = int32(0x00000004)
-    .field public static literal valuetype JitTest.PlatformID Win32NT = int32(0x00000002)
-    .field public static literal valuetype JitTest.PlatformID Win32S = int32(0x00000000)
-    .field public static literal valuetype JitTest.PlatformID Win32Windows = int32(0x00000001)
-    .field public static literal valuetype JitTest.PlatformID WinCE = int32(0x00000003)
-    .field public static literal valuetype JitTest.PlatformID Xbox = int32(0x00000005)
-  } // end of class JitTest.PlatformID
+    .field public static literal valuetype JitTest_longsig_il.PlatformID MacOSX = int32(0x00000006)
+    .field public static literal valuetype JitTest_longsig_il.PlatformID Unix = int32(0x00000004)
+    .field public static literal valuetype JitTest_longsig_il.PlatformID Win32NT = int32(0x00000002)
+    .field public static literal valuetype JitTest_longsig_il.PlatformID Win32S = int32(0x00000000)
+    .field public static literal valuetype JitTest_longsig_il.PlatformID Win32Windows = int32(0x00000001)
+    .field public static literal valuetype JitTest_longsig_il.PlatformID WinCE = int32(0x00000003)
+    .field public static literal valuetype JitTest_longsig_il.PlatformID Xbox = int32(0x00000005)
+  } // end of class JitTest_longsig_il.PlatformID
   .class value private auto ansi serializable sealed Mood
          extends [mscorlib]System.Enum
   {
     .field public specialname rtspecialname int32 value__
-    .field public static literal value class JitTest.Mood good = int32(0x00000000)
-    .field public static literal value class JitTest.Mood bad = int32(0x00000001)
-    .field public static literal value class JitTest.Mood worse = int32(0x00000002)
+    .field public static literal value class JitTest_longsig_il.Mood good = int32(0x00000000)
+    .field public static literal value class JitTest_longsig_il.Mood bad = int32(0x00000001)
+    .field public static literal value class JitTest_longsig_il.Mood worse = int32(0x00000002)
   } // end of class Mood
 
-  .class private auto ansi TestClass
+  .class public auto ansi TestClass
          extends [mscorlib]System.Object
   {
     .field private int32 m_d
@@ -48,8 +48,8 @@
     .field private float64 m_dbl
     .field private bool m_b
     .field private static value class [mscorlib]System.DateTime m_t
-    .field private value class JitTest.PlatformID m_pid
-    .field private value class JitTest.Mood m_mood
+    .field private value class JitTest_longsig_il.PlatformID m_pid
+    .field private value class JitTest_longsig_il.Mood m_mood
     .method private hidebysig static string 
             Format(typedref format,
                    typedref _ref) il managed
@@ -64,7 +64,7 @@
                [6] bool V_6,
                [7] typedref V_7,
                [8] wchar V_8,
-               [9] value class JitTest.Mood V_9)
+               [9] value class JitTest_longsig_il.Mood V_9)
       IL_0000:  ldarg.0
       IL_0001:  refanyval  [mscorlib]System.String
       IL_0006:  ldind.ref
@@ -412,7 +412,7 @@
       IL_031d:  ldarg.1
       IL_031e:  refanytype
       IL_0320:  call       class [mscorlib]System.Type [mscorlib]System.Type::GetTypeFromHandle(value class [mscorlib]System.RuntimeTypeHandle)
-      IL_0325:  ldtoken    JitTest.PlatformID
+      IL_0325:  ldtoken    JitTest_longsig_il.PlatformID
       IL_032a:  call       class [mscorlib]System.Type [mscorlib]System.Type::GetTypeFromHandle(value class [mscorlib]System.RuntimeTypeHandle)
       IL_032f:  beq.s      IL_0337
 
@@ -421,9 +421,9 @@
 
       IL_0337:  ldloc.2
       IL_0338:  ldarg.1
-      IL_0339:  refanyval  JitTest.PlatformID
-      		ldobj JitTest.PlatformID
-      IL_033e:  box        JitTest.PlatformID
+      IL_0339:  refanyval  JitTest_longsig_il.PlatformID
+      		ldobj JitTest_longsig_il.PlatformID
+      IL_033e:  box        JitTest_longsig_il.PlatformID
       IL_0343:  call       instance string [mscorlib]System.Enum::ToString()
       IL_0348:  call       string [mscorlib]System.String::Concat(string,
                                                                                string)
@@ -441,7 +441,7 @@
       IL_0360:  ldarg.1
       IL_0361:  refanytype
       IL_0363:  call       class [mscorlib]System.Type [mscorlib]System.Type::GetTypeFromHandle(value class [mscorlib]System.RuntimeTypeHandle)
-      IL_0368:  ldtoken    JitTest.Mood
+      IL_0368:  ldtoken    JitTest_longsig_il.Mood
       IL_036d:  call       class [mscorlib]System.Type [mscorlib]System.Type::GetTypeFromHandle(value class [mscorlib]System.RuntimeTypeHandle)
       IL_0372:  beq.s      IL_037a
 
@@ -449,8 +449,8 @@
       IL_0379:  throw
 
       IL_037a:  ldarg.1
-      IL_037b:  refanyval  JitTest.Mood
-      IL_0380:  ldobj 	JitTest.Mood
+      IL_037b:  refanyval  JitTest_longsig_il.Mood
+      IL_0380:  ldobj 	JitTest_longsig_il.Mood
       IL_0381:  stloc.s    V_9
       IL_0383:  ldloc.s    V_9
       IL_0385:  switch     ( 
@@ -509,7 +509,7 @@
       IL_0000:  ldarga.s   format
       IL_0002:  mkrefany   [mscorlib]System.String
       IL_0007:  ldarg.1
-      IL_0008:  call       string JitTest.TestClass::Format(typedref,
+      IL_0008:  call       string JitTest_longsig_il.TestClass::Format(typedref,
                                                                          typedref)
       IL_000d:  stloc.0
       IL_000e:  ldloc.0
@@ -562,8 +562,8 @@
                [5] float64 V_5,
                [6] bool V_6,
                [7] value class [mscorlib]System.DateTime V_7,
-               [8] value class JitTest.PlatformID V_8,
-               [9] value class JitTest.Mood V_9)
+               [8] value class JitTest_longsig_il.PlatformID V_8,
+               [9] value class JitTest_longsig_il.Mood V_9)
       IL_0000:  ldc.i4.s   10
       IL_0002:  stloc.0
       IL_0003:  ldc.i4.s   11
@@ -595,49 +595,49 @@
       IL_003a:  ldloca.s   V_0
       IL_003c:  mkrefany   [mscorlib]System.Int32
       IL_0041:  ldstr      "{10}"
-      IL_0046:  call       void JitTest.TestClass::Test(string,
+      IL_0046:  call       void JitTest_longsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_004b:  ldstr      "{%u}"
       IL_0050:  ldloca.s   V_1
       IL_0052:  mkrefany   [mscorlib]System.UInt32
       IL_0057:  ldstr      "{11}"
-      IL_005c:  call       void JitTest.TestClass::Test(string,
+      IL_005c:  call       void JitTest_longsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_0061:  ldstr      "{%ld}"
       IL_0066:  ldloca.s   V_2
       IL_0068:  mkrefany   [mscorlib]System.Int64
       IL_006d:  ldstr      "{12}"
-      IL_0072:  call       void JitTest.TestClass::Test(string,
+      IL_0072:  call       void JitTest_longsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_0077:  ldstr      "{%lu}"
       IL_007c:  ldloca.s   V_3
       IL_007e:  mkrefany   [mscorlib]System.UInt64
       IL_0083:  ldstr      "{13}"
-      IL_0088:  call       void JitTest.TestClass::Test(string,
+      IL_0088:  call       void JitTest_longsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_008d:  ldstr      "{%f}"
       IL_0092:  ldloca.s   V_4
       IL_0094:  mkrefany   [mscorlib]System.Single
       IL_0099:  ldstr      "{14}"
-      IL_009e:  call       void JitTest.TestClass::Test(string,
+      IL_009e:  call       void JitTest_longsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_00a3:  ldstr      "{%lf}"
       IL_00a8:  ldloca.s   V_5
       IL_00aa:  mkrefany   [mscorlib]System.Double
       IL_00af:  ldstr      "{15}"
-      IL_00b4:  call       void JitTest.TestClass::Test(string,
+      IL_00b4:  call       void JitTest_longsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_00b9:  ldstr      "{%b}"
       IL_00be:  ldloca.s   V_6
       IL_00c0:  mkrefany   [mscorlib]System.Boolean
       IL_00c5:  ldstr      "{true}"
-      IL_00ca:  call       void JitTest.TestClass::Test(string,
+      IL_00ca:  call       void JitTest_longsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_00cf:  ldstr      "{%t}"
@@ -650,21 +650,21 @@
       IL_00ec:  call       string [mscorlib]System.String::Concat(string,
                                                                                string,
                                                                                string)
-      IL_00f1:  call       void JitTest.TestClass::Test(string,
+      IL_00f1:  call       void JitTest_longsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_00f6:  ldstr      "{%p}"
       IL_00fb:  ldloca.s   V_8
-      IL_00fd:  mkrefany   JitTest.PlatformID
+      IL_00fd:  mkrefany   JitTest_longsig_il.PlatformID
       IL_0102:  ldstr      "{Win32NT}"
-      IL_0107:  call       void JitTest.TestClass::Test(string,
+      IL_0107:  call       void JitTest_longsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_010c:  ldstr      "{%e}"
       IL_0111:  ldloca.s   V_9
-      IL_0113:  mkrefany   JitTest.Mood
+      IL_0113:  mkrefany   JitTest_longsig_il.Mood
       IL_0118:  ldstr      "{good}"
-      IL_011d:  call       void JitTest.TestClass::Test(string,
+      IL_011d:  call       void JitTest_longsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_0122:  ret
@@ -676,85 +676,85 @@
       .maxstack  5
       IL_0000:  ldstr      "{%d}"
       IL_0005:  ldarg.0
-      IL_0006:  ldflda     int32 JitTest.TestClass::m_d
+      IL_0006:  ldflda     int32 JitTest_longsig_il.TestClass::m_d
       IL_000b:  mkrefany   [mscorlib]System.Int32
       IL_0010:  ldstr      "{20}"
-      IL_0015:  call       void JitTest.TestClass::Test(string,
+      IL_0015:  call       void JitTest_longsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_001a:  ldstr      "{%u}"
-      IL_001f:  ldsflda    unsigned int32 JitTest.TestClass::m_u
+      IL_001f:  ldsflda    unsigned int32 JitTest_longsig_il.TestClass::m_u
       IL_0024:  mkrefany   [mscorlib]System.UInt32
       IL_0029:  ldstr      "{21}"
-      IL_002e:  call       void JitTest.TestClass::Test(string,
+      IL_002e:  call       void JitTest_longsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_0033:  ldstr      "{%ld}"
       IL_0038:  ldarg.0
-      IL_0039:  ldflda     int64 JitTest.TestClass::m_l
+      IL_0039:  ldflda     int64 JitTest_longsig_il.TestClass::m_l
       IL_003e:  mkrefany   [mscorlib]System.Int64
       IL_0043:  ldstr      "{22}"
-      IL_0048:  call       void JitTest.TestClass::Test(string,
+      IL_0048:  call       void JitTest_longsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_004d:  ldstr      "{%lu}"
-      IL_0052:  ldsflda    unsigned int64 JitTest.TestClass::m_ul
+      IL_0052:  ldsflda    unsigned int64 JitTest_longsig_il.TestClass::m_ul
       IL_0057:  mkrefany   [mscorlib]System.UInt64
       IL_005c:  ldstr      "{23}"
-      IL_0061:  call       void JitTest.TestClass::Test(string,
+      IL_0061:  call       void JitTest_longsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_0066:  ldstr      "{%f}"
       IL_006b:  ldarg.0
-      IL_006c:  ldflda     float32 JitTest.TestClass::m_f
+      IL_006c:  ldflda     float32 JitTest_longsig_il.TestClass::m_f
       IL_0071:  mkrefany   [mscorlib]System.Single
       IL_0076:  ldstr      "{24}"
-      IL_007b:  call       void JitTest.TestClass::Test(string,
+      IL_007b:  call       void JitTest_longsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_0080:  ldstr      "{%lf}"
       IL_0085:  ldarg.0
-      IL_0086:  ldflda     float64 JitTest.TestClass::m_dbl
+      IL_0086:  ldflda     float64 JitTest_longsig_il.TestClass::m_dbl
       IL_008b:  mkrefany   [mscorlib]System.Double
       IL_0090:  ldstr      "{25}"
-      IL_0095:  call       void JitTest.TestClass::Test(string,
+      IL_0095:  call       void JitTest_longsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_009a:  ldstr      "{%b}"
       IL_009f:  ldarg.0
-      IL_00a0:  ldflda     bool JitTest.TestClass::m_b
+      IL_00a0:  ldflda     bool JitTest_longsig_il.TestClass::m_b
       IL_00a5:  mkrefany   [mscorlib]System.Boolean
       IL_00aa:  ldstr      "{false}"
-      IL_00af:  call       void JitTest.TestClass::Test(string,
+      IL_00af:  call       void JitTest_longsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_00b4:  ldstr      "{%t}"
-      IL_00b9:  ldsflda    value class [mscorlib]System.DateTime JitTest.TestClass::m_t
+      IL_00b9:  ldsflda    value class [mscorlib]System.DateTime JitTest_longsig_il.TestClass::m_t
       IL_00be:  mkrefany   [mscorlib]System.DateTime
       IL_00c3:  ldstr      "{"
-      IL_00c8:  ldsflda    value class [mscorlib]System.DateTime JitTest.TestClass::m_t
+      IL_00c8:  ldsflda    value class [mscorlib]System.DateTime JitTest_longsig_il.TestClass::m_t
       IL_00cd:  call       instance string [mscorlib]System.DateTime::ToString()
       IL_00d2:  ldstr      "}"
       IL_00d7:  call       string [mscorlib]System.String::Concat(string,
                                                                                string,
                                                                                string)
-      IL_00dc:  call       void JitTest.TestClass::Test(string,
+      IL_00dc:  call       void JitTest_longsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_00e1:  ldstr      "{%p}"
       IL_00e6:  ldarg.0
-      IL_00e7:  ldflda     value class JitTest.PlatformID JitTest.TestClass::m_pid
-      IL_00ec:  mkrefany   JitTest.PlatformID
+      IL_00e7:  ldflda     value class JitTest_longsig_il.PlatformID JitTest_longsig_il.TestClass::m_pid
+      IL_00ec:  mkrefany   JitTest_longsig_il.PlatformID
       IL_00f1:  ldstr      "{Win32NT}"
-      IL_00f6:  call       void JitTest.TestClass::Test(string,
+      IL_00f6:  call       void JitTest_longsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_00fb:  ldstr      "{%e}"
       IL_0100:  ldarg.0
-      IL_0101:  ldflda     value class JitTest.Mood JitTest.TestClass::m_mood
-      IL_0106:  mkrefany   JitTest.Mood
+      IL_0101:  ldflda     value class JitTest_longsig_il.Mood JitTest_longsig_il.TestClass::m_mood
+      IL_0106:  mkrefany   JitTest_longsig_il.Mood
       IL_010b:  ldstr      "{good}"
-      IL_0110:  call       void JitTest.TestClass::Test(string,
+      IL_0110:  call       void JitTest_longsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_0115:  ret
@@ -769,56 +769,56 @@
                            float64& dbl,
                            bool& b,
                            value class [mscorlib]System.DateTime& t,
-                           value class JitTest.PlatformID& pid) il managed
+                           value class JitTest_longsig_il.PlatformID& pid) il managed
     {
       .maxstack  5
       IL_0000:  ldstr      "{%d}"
       IL_0005:  ldarg.0
       IL_0006:  mkrefany   [mscorlib]System.Int32
       IL_000b:  ldstr      "{20}"
-      IL_0010:  call       void JitTest.TestClass::Test(string,
+      IL_0010:  call       void JitTest_longsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_0015:  ldstr      "{%u}"
       IL_001a:  ldarg.1
       IL_001b:  mkrefany   [mscorlib]System.UInt32
       IL_0020:  ldstr      "{21}"
-      IL_0025:  call       void JitTest.TestClass::Test(string,
+      IL_0025:  call       void JitTest_longsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_002a:  ldstr      "{%ld}"
       IL_002f:  ldarg.2
       IL_0030:  mkrefany   [mscorlib]System.Int64
       IL_0035:  ldstr      "{22}"
-      IL_003a:  call       void JitTest.TestClass::Test(string,
+      IL_003a:  call       void JitTest_longsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_003f:  ldstr      "{%lu}"
       IL_0044:  ldarg.3
       IL_0045:  mkrefany   [mscorlib]System.UInt64
       IL_004a:  ldstr      "{23}"
-      IL_004f:  call       void JitTest.TestClass::Test(string,
+      IL_004f:  call       void JitTest_longsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_0054:  ldstr      "{%f}"
       IL_0059:  ldarg.s    f
       IL_005b:  mkrefany   [mscorlib]System.Single
       IL_0060:  ldstr      "{24}"
-      IL_0065:  call       void JitTest.TestClass::Test(string,
+      IL_0065:  call       void JitTest_longsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_006a:  ldstr      "{%lf}"
       IL_006f:  ldarg.s    dbl
       IL_0071:  mkrefany   [mscorlib]System.Double
       IL_0076:  ldstr      "{25}"
-      IL_007b:  call       void JitTest.TestClass::Test(string,
+      IL_007b:  call       void JitTest_longsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_0080:  ldstr      "{%b}"
       IL_0085:  ldarg.s    b
       IL_0087:  mkrefany   [mscorlib]System.Boolean
       IL_008c:  ldstr      "{false}"
-      IL_0091:  call       void JitTest.TestClass::Test(string,
+      IL_0091:  call       void JitTest_longsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_0096:  ldstr      "{%t}"
@@ -831,14 +831,14 @@
       IL_00b3:  call       string [mscorlib]System.String::Concat(string,
                                                                                string,
                                                                                string)
-      IL_00b8:  call       void JitTest.TestClass::Test(string,
+      IL_00b8:  call       void JitTest_longsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_00bd:  ldstr      "{%p}"
       IL_00c2:  ldarg.s    pid
-      IL_00c4:  mkrefany   JitTest.PlatformID
+      IL_00c4:  mkrefany   JitTest_longsig_il.PlatformID
       IL_00c9:  ldstr      "{Win32NT}"
-      IL_00ce:  call       void JitTest.TestClass::Test(string,
+      IL_00ce:  call       void JitTest_longsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_00d3:  ret
@@ -856,7 +856,7 @@
                [5] float64 V_5,
                [6] bool V_6,
                [7] value class [mscorlib]System.DateTime V_7,
-               [8] value class JitTest.PlatformID V_8)
+               [8] value class JitTest_longsig_il.PlatformID V_8)
       IL_0000:  ldc.i4.s   20
       IL_0002:  stloc.0
       IL_0003:  ldc.i4.s   21
@@ -891,7 +891,7 @@
       IL_003e:  ldloca.s   V_6
       IL_0040:  ldloca.s   V_7
       IL_0042:  ldloca.s   V_8
-      IL_0044:  call       void JitTest.TestClass::DoTestArgSlots(int32&,
+      IL_0044:  call       void JitTest_longsig_il.TestClass::DoTestArgSlots(int32&,
                                                                   unsigned int32&,
                                                                   int64&,
                                                                   unsigned int64&,
@@ -899,7 +899,7 @@
                                                                   float64&,
                                                                   bool&,
                                                                   value class [mscorlib]System.DateTime&,
-                                                                  value class JitTest.PlatformID&)
+                                                                  value class JitTest_longsig_il.PlatformID&)
       IL_0049:  ret
     } // end of method TestClass::TestArgSlots
 
@@ -915,8 +915,8 @@
                [5] float64[] V_5,
                [6] bool[] V_6,
                [7] value class [mscorlib]System.DateTime[] V_7,
-               [8] value class JitTest.PlatformID[] V_8,
-               [9] value class JitTest.Mood[] V_9,
+               [8] value class JitTest_longsig_il.PlatformID[] V_8,
+               [9] value class JitTest_longsig_il.Mood[] V_9,
                [10] int32[] V_10,
                [11] unsigned int32[] V_11,
                [12] int64[] V_12,
@@ -924,8 +924,8 @@
                [14] float32[] V_14,
                [15] float64[] V_15,
                [16] bool[] V_16,
-               [17] value class JitTest.PlatformID[] V_17,
-               [18] value class JitTest.Mood[] V_18)
+               [17] value class JitTest_longsig_il.PlatformID[] V_17,
+               [18] value class JitTest_longsig_il.Mood[] V_18)
       IL_0000:  ldc.i4.1
       IL_0001:  newarr     [mscorlib]System.Int32
       IL_0006:  stloc.s    V_10
@@ -1004,7 +1004,7 @@
                                                                           int32,
                                                                           int32)
       IL_00a3:  ldc.i4.1
-      IL_00a4:  newarr     JitTest.PlatformID
+      IL_00a4:  newarr     JitTest_longsig_il.PlatformID
       IL_00a9:  stloc.s    V_17
       IL_00ab:  ldloc.s    V_17
       IL_00ad:  ldc.i4.0
@@ -1013,7 +1013,7 @@
       IL_00b0:  ldloc.s    V_17
       IL_00b2:  stloc.s    V_8
       IL_00b4:  ldc.i4.1
-      IL_00b5:  newarr     JitTest.Mood
+      IL_00b5:  newarr     JitTest_longsig_il.Mood
       IL_00ba:  stloc.s    V_18
       IL_00bc:  ldloc.s    V_18
       IL_00be:  stloc.s    V_9
@@ -1023,7 +1023,7 @@
       IL_00c7:  ldelema    [mscorlib]System.Int32
       IL_00cc:  mkrefany   [mscorlib]System.Int32
       IL_00d1:  ldstr      "{10}"
-      IL_00d6:  call       void JitTest.TestClass::Test(string,
+      IL_00d6:  call       void JitTest_longsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_00db:  ldstr      "{%u}"
@@ -1032,7 +1032,7 @@
       IL_00e2:  ldelema    [mscorlib]System.UInt32
       IL_00e7:  mkrefany   [mscorlib]System.UInt32
       IL_00ec:  ldstr      "{11}"
-      IL_00f1:  call       void JitTest.TestClass::Test(string,
+      IL_00f1:  call       void JitTest_longsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_00f6:  ldstr      "{%ld}"
@@ -1041,7 +1041,7 @@
       IL_00fd:  ldelema    [mscorlib]System.Int64
       IL_0102:  mkrefany   [mscorlib]System.Int64
       IL_0107:  ldstr      "{12}"
-      IL_010c:  call       void JitTest.TestClass::Test(string,
+      IL_010c:  call       void JitTest_longsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_0111:  ldstr      "{%lu}"
@@ -1050,7 +1050,7 @@
       IL_0118:  ldelema    [mscorlib]System.UInt64
       IL_011d:  mkrefany   [mscorlib]System.UInt64
       IL_0122:  ldstr      "{13}"
-      IL_0127:  call       void JitTest.TestClass::Test(string,
+      IL_0127:  call       void JitTest_longsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_012c:  ldstr      "{%f}"
@@ -1059,7 +1059,7 @@
       IL_0134:  ldelema    [mscorlib]System.Single
       IL_0139:  mkrefany   [mscorlib]System.Single
       IL_013e:  ldstr      "{14}"
-      IL_0143:  call       void JitTest.TestClass::Test(string,
+      IL_0143:  call       void JitTest_longsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_0148:  ldstr      "{%lf}"
@@ -1068,7 +1068,7 @@
       IL_0150:  ldelema    [mscorlib]System.Double
       IL_0155:  mkrefany   [mscorlib]System.Double
       IL_015a:  ldstr      "{15}"
-      IL_015f:  call       void JitTest.TestClass::Test(string,
+      IL_015f:  call       void JitTest_longsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_0164:  ldstr      "{%b}"
@@ -1077,7 +1077,7 @@
       IL_016c:  ldelema    [mscorlib]System.Boolean
       IL_0171:  mkrefany   [mscorlib]System.Boolean
       IL_0176:  ldstr      "{true}"
-      IL_017b:  call       void JitTest.TestClass::Test(string,
+      IL_017b:  call       void JitTest_longsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_0180:  ldstr      "{%t}"
@@ -1094,31 +1094,31 @@
       IL_01a9:  call       string [mscorlib]System.String::Concat(string,
                                                                                string,
                                                                                string)
-      IL_01ae:  call       void JitTest.TestClass::Test(string,
+      IL_01ae:  call       void JitTest_longsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_01b3:  ldstr      "{%p}"
       IL_01b8:  ldloc.s    V_8
       IL_01ba:  ldc.i4.0
-      IL_01bb:  ldelema    JitTest.PlatformID
-      IL_01c0:  mkrefany   JitTest.PlatformID
+      IL_01bb:  ldelema    JitTest_longsig_il.PlatformID
+      IL_01c0:  mkrefany   JitTest_longsig_il.PlatformID
       IL_01c5:  ldstr      "{Win32NT}"
-      IL_01ca:  call       void JitTest.TestClass::Test(string,
+      IL_01ca:  call       void JitTest_longsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_01cf:  ldstr      "{%e}"
       IL_01d4:  ldloc.s    V_9
       IL_01d6:  ldc.i4.0
-      IL_01d7:  ldelema    JitTest.Mood
-      IL_01dc:  mkrefany   JitTest.Mood
+      IL_01d7:  ldelema    JitTest_longsig_il.Mood
+      IL_01dc:  mkrefany   JitTest_longsig_il.Mood
       IL_01e1:  ldstr      "{good}"
-      IL_01e6:  call       void JitTest.TestClass::Test(string,
+      IL_01e6:  call       void JitTest_longsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_01eb:  ret
     } // end of method TestClass::TestArrayElem
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -1126,10 +1126,10 @@
       )
       .entrypoint
       .maxstack  8
-      IL_0000:  call       void JitTest.TestClass::TestLocals()
-      IL_0005:  newobj     instance void JitTest.TestClass::.ctor()
-      IL_000a:  call       instance void JitTest.TestClass::TestFields()
-      IL_000f:  call       void JitTest.TestClass::TestArrayElem()
+      IL_0000:  call       void JitTest_longsig_il.TestClass::TestLocals()
+      IL_0005:  newobj     instance void JitTest_longsig_il.TestClass::.ctor()
+      IL_000a:  call       instance void JitTest_longsig_il.TestClass::TestFields()
+      IL_000f:  call       void JitTest_longsig_il.TestClass::TestArrayElem()
       IL_0014:  ldstr      "*** passed ***"
       IL_0019:  call       void [System.Console]System.Console::WriteLine(string)
       IL_001e:  ldc.i4 100
@@ -1141,11 +1141,11 @@
     {
       .maxstack  8
       IL_0000:  ldc.i4.s   21
-      IL_0002:  stsfld     unsigned int32 JitTest.TestClass::m_u
+      IL_0002:  stsfld     unsigned int32 JitTest_longsig_il.TestClass::m_u
       IL_0007:  ldc.i4.s   23
       IL_0009:  conv.i8
-      IL_000a:  stsfld     unsigned int64 JitTest.TestClass::m_ul
-      IL_000f:  ldsflda    value class [mscorlib]System.DateTime JitTest.TestClass::m_t
+      IL_000a:  stsfld     unsigned int64 JitTest_longsig_il.TestClass::m_ul
+      IL_000f:  ldsflda    value class [mscorlib]System.DateTime JitTest_longsig_il.TestClass::m_t
       IL_0014:  ldc.i4.s   100
       IL_0016:  ldc.i4.s   10
       IL_0018:  ldc.i4.1
@@ -1161,26 +1161,26 @@
       .maxstack  2
       IL_0000:  ldarg.0
       IL_0001:  ldc.i4.s   20
-      IL_0003:  stfld      int32 JitTest.TestClass::m_d
+      IL_0003:  stfld      int32 JitTest_longsig_il.TestClass::m_d
       IL_0008:  ldarg.0
       IL_0009:  ldc.i4.s   22
       IL_000b:  conv.i8
-      IL_000c:  stfld      int64 JitTest.TestClass::m_l
+      IL_000c:  stfld      int64 JitTest_longsig_il.TestClass::m_l
       IL_0011:  ldarg.0
       IL_0012:  ldc.r4     24.
-      IL_0017:  stfld      float32 JitTest.TestClass::m_f
+      IL_0017:  stfld      float32 JitTest_longsig_il.TestClass::m_f
       IL_001c:  ldarg.0
       IL_001d:  ldc.r8     25.
-      IL_0026:  stfld      float64 JitTest.TestClass::m_dbl
+      IL_0026:  stfld      float64 JitTest_longsig_il.TestClass::m_dbl
       IL_002b:  ldarg.0
       IL_002c:  ldc.i4.0
-      IL_002d:  stfld      bool JitTest.TestClass::m_b
+      IL_002d:  stfld      bool JitTest_longsig_il.TestClass::m_b
       IL_0032:  ldarg.0
       IL_0033:  ldc.i4.2
-      IL_0034:  stfld      value class JitTest.PlatformID JitTest.TestClass::m_pid
+      IL_0034:  stfld      value class JitTest_longsig_il.PlatformID JitTest_longsig_il.TestClass::m_pid
       IL_0039:  ldarg.0
       IL_003a:  ldc.i4.0
-      IL_003b:  stfld      value class JitTest.Mood JitTest.TestClass::m_mood
+      IL_003b:  stfld      value class JitTest_longsig_il.Mood JitTest_longsig_il.TestClass::m_mood
       IL_0040:  ldarg.0
       IL_0041:  call       instance void [mscorlib]System.Object::.ctor()
       IL_0046:  ret
@@ -1188,5 +1188,5 @@
 
   } // end of class TestClass
 
-} // end of namespace JitTest
+} // end of namespace JitTest_longsig_il
 
diff --git a/src/tests/JIT/Methodical/refany/longsig_il_d.ilproj b/src/tests/JIT/Methodical/refany/longsig_il_d.ilproj
index 1c6ce7a7332f7c..661ece118298fe 100644
--- a/src/tests/JIT/Methodical/refany/longsig_il_d.ilproj
+++ b/src/tests/JIT/Methodical/refany/longsig_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/refany/longsig_il_r.ilproj b/src/tests/JIT/Methodical/refany/longsig_il_r.ilproj
index 11e881b0239ff2..6594f5cfbeec54 100644
--- a/src/tests/JIT/Methodical/refany/longsig_il_r.ilproj
+++ b/src/tests/JIT/Methodical/refany/longsig_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/refany/native.cs b/src/tests/JIT/Methodical/refany/native.cs
index 649c8043e8a9e6..70c37cf15c36c8 100644
--- a/src/tests/JIT/Methodical/refany/native.cs
+++ b/src/tests/JIT/Methodical/refany/native.cs
@@ -2,13 +2,17 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
+namespace Test_native
+{
 //THIS IS NOT A TEST
 
 namespace JitTest
 {
-    internal class Test
+    public class Test
     {
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             int N = 0x1492;
             TypedReference _ref = __makeref(N);
@@ -24,3 +28,4 @@ private static int Main()
         }
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/refany/native.il b/src/tests/JIT/Methodical/refany/native.il
index 47e2557d3844c5..073ae8d6f796e5 100644
--- a/src/tests/JIT/Methodical/refany/native.il
+++ b/src/tests/JIT/Methodical/refany/native.il
@@ -16,12 +16,12 @@
 }
 .assembly extern xunit.core {}
 // MVID: {C18F1061-8239-420B-AC69-D4CB0BB38F2B}
-.namespace JitTest
+.namespace JitTest_native_refany_il
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends [mscorlib]System.Object
   {
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -85,6 +85,6 @@
 
   } // end of class Test
 
-} // end of namespace JitTest
+} // end of namespace JitTest_native_refany_il
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/refany/native_d.csproj b/src/tests/JIT/Methodical/refany/native_d.csproj
index 7eed37b9f0d1c9..08c0a46f3fb858 100644
--- a/src/tests/JIT/Methodical/refany/native_d.csproj
+++ b/src/tests/JIT/Methodical/refany/native_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/refany/native_do.csproj b/src/tests/JIT/Methodical/refany/native_do.csproj
index 5b50e2a26c8fb3..6adb8c4c120c97 100644
--- a/src/tests/JIT/Methodical/refany/native_do.csproj
+++ b/src/tests/JIT/Methodical/refany/native_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/refany/native_il_d.ilproj b/src/tests/JIT/Methodical/refany/native_il_d.ilproj
index ead573e051b537..655b244a7bad33 100644
--- a/src/tests/JIT/Methodical/refany/native_il_d.ilproj
+++ b/src/tests/JIT/Methodical/refany/native_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/refany/native_il_r.ilproj b/src/tests/JIT/Methodical/refany/native_il_r.ilproj
index 965e7e1a6820e2..e8c2ff93b99087 100644
--- a/src/tests/JIT/Methodical/refany/native_il_r.ilproj
+++ b/src/tests/JIT/Methodical/refany/native_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/refany/native_r.csproj b/src/tests/JIT/Methodical/refany/native_r.csproj
index c999d0b32b44b2..3dff54000215df 100644
--- a/src/tests/JIT/Methodical/refany/native_r.csproj
+++ b/src/tests/JIT/Methodical/refany/native_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/refany/native_ro.csproj b/src/tests/JIT/Methodical/refany/native_ro.csproj
index ede653030173bc..48eaa8815aa402 100644
--- a/src/tests/JIT/Methodical/refany/native_ro.csproj
+++ b/src/tests/JIT/Methodical/refany/native_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/refany/seq.il b/src/tests/JIT/Methodical/refany/seq.il
index 2bf4a2fbb853e6..107c09b991d1d9 100644
--- a/src/tests/JIT/Methodical/refany/seq.il
+++ b/src/tests/JIT/Methodical/refany/seq.il
@@ -16,9 +16,9 @@
 }
 .assembly extern xunit.core {}
 // MVID: {C18F1061-8239-420B-AC69-D4CB0BB38F2B}
-.namespace JitTest
+.namespace JitTest_seq_refany_il
 {
-  .class private auto ansi Test extends [mscorlib]System.Object
+  .class public auto ansi Test extends [mscorlib]System.Object
   {
   	.field private static unsigned int64 m_fld
     .method private hidebysig static vararg native unsigned int TestFunc(unsigned int64 FIXEDARG) il managed
@@ -112,7 +112,7 @@
     	ret
     }
 
-    .method private hidebysig static int32 Main() il managed
+    .method public hidebysig static int32 Main() il managed
     {
 		.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
 		    01 00 00 00
@@ -123,7 +123,7 @@
 		ldc.i4.0
 		conv.i8
 		dup
-		tail. call vararg native unsigned int JitTest.Test::TestFunc(unsigned int64, ..., unsigned int64)
+		tail. call vararg native unsigned int JitTest_seq_refany_il.Test::TestFunc(unsigned int64, ..., unsigned int64)
 		ret
     } // end of method Test::Main
 
@@ -137,6 +137,6 @@
 
   } // end of class Test
 
-} // end of namespace JitTest
+} // end of namespace JitTest_seq_refany_il
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/refany/seq_il_d.ilproj b/src/tests/JIT/Methodical/refany/seq_il_d.ilproj
index 02e2436095562b..fce01ad0489517 100644
--- a/src/tests/JIT/Methodical/refany/seq_il_d.ilproj
+++ b/src/tests/JIT/Methodical/refany/seq_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/refany/seq_il_r.ilproj b/src/tests/JIT/Methodical/refany/seq_il_r.ilproj
index 673048ff929a34..379df1b17c4542 100644
--- a/src/tests/JIT/Methodical/refany/seq_il_r.ilproj
+++ b/src/tests/JIT/Methodical/refany/seq_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/refany/shortsig.il b/src/tests/JIT/Methodical/refany/shortsig.il
index 5bf25c76301e65..7c3271f8f18a26 100644
--- a/src/tests/JIT/Methodical/refany/shortsig.il
+++ b/src/tests/JIT/Methodical/refany/shortsig.il
@@ -14,30 +14,30 @@
 {
 }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_shortsig_il
 {
   .class public auto ansi sealed PlatformID
          extends [mscorlib]System.Enum
   {
     .field public specialname rtspecialname int32 value__
-    .field public static literal valuetype JitTest.PlatformID MacOSX = int32(0x00000006)
-    .field public static literal valuetype JitTest.PlatformID Unix = int32(0x00000004)
-    .field public static literal valuetype JitTest.PlatformID Win32NT = int32(0x00000002)
-    .field public static literal valuetype JitTest.PlatformID Win32S = int32(0x00000000)
-    .field public static literal valuetype JitTest.PlatformID Win32Windows = int32(0x00000001)
-    .field public static literal valuetype JitTest.PlatformID WinCE = int32(0x00000003)
-    .field public static literal valuetype JitTest.PlatformID Xbox = int32(0x00000005)
-  } // end of class JitTest.PlatformID
+    .field public static literal valuetype JitTest_shortsig_il.PlatformID MacOSX = int32(0x00000006)
+    .field public static literal valuetype JitTest_shortsig_il.PlatformID Unix = int32(0x00000004)
+    .field public static literal valuetype JitTest_shortsig_il.PlatformID Win32NT = int32(0x00000002)
+    .field public static literal valuetype JitTest_shortsig_il.PlatformID Win32S = int32(0x00000000)
+    .field public static literal valuetype JitTest_shortsig_il.PlatformID Win32Windows = int32(0x00000001)
+    .field public static literal valuetype JitTest_shortsig_il.PlatformID WinCE = int32(0x00000003)
+    .field public static literal valuetype JitTest_shortsig_il.PlatformID Xbox = int32(0x00000005)
+  } // end of class JitTest_shortsig_il.PlatformID
   .class value private auto ansi serializable sealed Mood
          extends [mscorlib]System.Enum
   {
     .field public specialname rtspecialname int32 value__
-    .field public static literal value class JitTest.Mood good = int32(0x00000000)
-    .field public static literal value class JitTest.Mood bad = int32(0x00000001)
-    .field public static literal value class JitTest.Mood worse = int32(0x00000002)
+    .field public static literal value class JitTest_shortsig_il.Mood good = int32(0x00000000)
+    .field public static literal value class JitTest_shortsig_il.Mood bad = int32(0x00000001)
+    .field public static literal value class JitTest_shortsig_il.Mood worse = int32(0x00000002)
   } // end of class Mood
 
-  .class private auto ansi TestClass
+  .class public auto ansi TestClass
          extends [mscorlib]System.Object
   {
     .field private int32 m_d
@@ -48,8 +48,8 @@
     .field private float64 m_dbl
     .field private bool m_b
     .field private static value class [mscorlib]System.DateTime m_t
-    .field private value class JitTest.PlatformID m_pid
-    .field private value class JitTest.Mood m_mood
+    .field private value class JitTest_shortsig_il.PlatformID m_pid
+    .field private value class JitTest_shortsig_il.Mood m_mood
     .method private hidebysig static string 
             Format(typedref format,
                    typedref _ref) il managed
@@ -64,7 +64,7 @@
                [6] bool V_6,
                [7] typedref V_7,
                [8] wchar V_8,
-               [9] value class JitTest.Mood V_9)
+               [9] value class JitTest_shortsig_il.Mood V_9)
       IL_0000:  ldarg.0
       IL_0001:  refanyval  [mscorlib]System.String
       IL_0006:  ldind.ref
@@ -412,7 +412,7 @@
       IL_031d:  ldarg.1
       IL_031e:  refanytype
       IL_0320:  call       class [mscorlib]System.Type [mscorlib]System.Type::GetTypeFromHandle(value class [mscorlib]System.RuntimeTypeHandle)
-      IL_0325:  ldtoken    JitTest.PlatformID
+      IL_0325:  ldtoken    JitTest_shortsig_il.PlatformID
       IL_032a:  call       class [mscorlib]System.Type [mscorlib]System.Type::GetTypeFromHandle(value class [mscorlib]System.RuntimeTypeHandle)
       IL_032f:  beq.s      IL_0337
 
@@ -421,9 +421,9 @@
 
       IL_0337:  ldloc.2
       IL_0338:  ldarg.1
-      IL_0339:  refanyval  JitTest.PlatformID
-      		ldobj JitTest.PlatformID
-      IL_033e:  box        JitTest.PlatformID
+      IL_0339:  refanyval  JitTest_shortsig_il.PlatformID
+      		ldobj JitTest_shortsig_il.PlatformID
+      IL_033e:  box        JitTest_shortsig_il.PlatformID
       IL_0343:  call       instance string [mscorlib]System.Enum::ToString()
       IL_0348:  call       string [mscorlib]System.String::Concat(string,
                                                                                string)
@@ -441,7 +441,7 @@
       IL_0360:  ldarg.1
       IL_0361:  refanytype
       IL_0363:  call       class [mscorlib]System.Type [mscorlib]System.Type::GetTypeFromHandle(value class [mscorlib]System.RuntimeTypeHandle)
-      IL_0368:  ldtoken    JitTest.Mood
+      IL_0368:  ldtoken    JitTest_shortsig_il.Mood
       IL_036d:  call       class [mscorlib]System.Type [mscorlib]System.Type::GetTypeFromHandle(value class [mscorlib]System.RuntimeTypeHandle)
       IL_0372:  beq.s      IL_037a
 
@@ -449,7 +449,7 @@
       IL_0379:  throw
 
       IL_037a:  ldarg.1
-      IL_037b:  refanyval  JitTest.Mood
+      IL_037b:  refanyval  JitTest_shortsig_il.Mood
       IL_0380:  ldind.i4
       IL_0381:  stloc.s    V_9
       IL_0383:  ldloc.s    V_9
@@ -509,7 +509,7 @@
       IL_0000:  ldarga.s   format
       IL_0002:  mkrefany   [mscorlib]System.String
       IL_0007:  ldarg.1
-      IL_0008:  call       string JitTest.TestClass::Format(typedref,
+      IL_0008:  call       string JitTest_shortsig_il.TestClass::Format(typedref,
                                                                          typedref)
       IL_000d:  stloc.0
       IL_000e:  ldloc.0
@@ -562,8 +562,8 @@
                [5] float64 V_5,
                [6] bool V_6,
                [7] value class [mscorlib]System.DateTime V_7,
-               [8] value class JitTest.PlatformID V_8,
-               [9] value class JitTest.Mood V_9)
+               [8] value class JitTest_shortsig_il.PlatformID V_8,
+               [9] value class JitTest_shortsig_il.Mood V_9)
       IL_0000:  ldc.i4.s   10
       IL_0002:  stloc.0
       IL_0003:  ldc.i4.s   11
@@ -595,49 +595,49 @@
       IL_003a:  ldloca.s   V_0
       IL_003c:  mkrefany   [mscorlib]System.Int32
       IL_0041:  ldstr      "{10}"
-      IL_0046:  call       void JitTest.TestClass::Test(string,
+      IL_0046:  call       void JitTest_shortsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_004b:  ldstr      "{%u}"
       IL_0050:  ldloca.s   V_1
       IL_0052:  mkrefany   [mscorlib]System.UInt32
       IL_0057:  ldstr      "{11}"
-      IL_005c:  call       void JitTest.TestClass::Test(string,
+      IL_005c:  call       void JitTest_shortsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_0061:  ldstr      "{%ld}"
       IL_0066:  ldloca.s   V_2
       IL_0068:  mkrefany   [mscorlib]System.Int64
       IL_006d:  ldstr      "{12}"
-      IL_0072:  call       void JitTest.TestClass::Test(string,
+      IL_0072:  call       void JitTest_shortsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_0077:  ldstr      "{%lu}"
       IL_007c:  ldloca.s   V_3
       IL_007e:  mkrefany   [mscorlib]System.UInt64
       IL_0083:  ldstr      "{13}"
-      IL_0088:  call       void JitTest.TestClass::Test(string,
+      IL_0088:  call       void JitTest_shortsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_008d:  ldstr      "{%f}"
       IL_0092:  ldloca.s   V_4
       IL_0094:  mkrefany   [mscorlib]System.Single
       IL_0099:  ldstr      "{14}"
-      IL_009e:  call       void JitTest.TestClass::Test(string,
+      IL_009e:  call       void JitTest_shortsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_00a3:  ldstr      "{%lf}"
       IL_00a8:  ldloca.s   V_5
       IL_00aa:  mkrefany   [mscorlib]System.Double
       IL_00af:  ldstr      "{15}"
-      IL_00b4:  call       void JitTest.TestClass::Test(string,
+      IL_00b4:  call       void JitTest_shortsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_00b9:  ldstr      "{%b}"
       IL_00be:  ldloca.s   V_6
       IL_00c0:  mkrefany   [mscorlib]System.Boolean
       IL_00c5:  ldstr      "{true}"
-      IL_00ca:  call       void JitTest.TestClass::Test(string,
+      IL_00ca:  call       void JitTest_shortsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_00cf:  ldstr      "{%t}"
@@ -650,21 +650,21 @@
       IL_00ec:  call       string [mscorlib]System.String::Concat(string,
                                                                                string,
                                                                                string)
-      IL_00f1:  call       void JitTest.TestClass::Test(string,
+      IL_00f1:  call       void JitTest_shortsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_00f6:  ldstr      "{%p}"
       IL_00fb:  ldloca.s   V_8
-      IL_00fd:  mkrefany   JitTest.PlatformID
+      IL_00fd:  mkrefany   JitTest_shortsig_il.PlatformID
       IL_0102:  ldstr      "{Win32NT}"
-      IL_0107:  call       void JitTest.TestClass::Test(string,
+      IL_0107:  call       void JitTest_shortsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_010c:  ldstr      "{%e}"
       IL_0111:  ldloca.s   V_9
-      IL_0113:  mkrefany   JitTest.Mood
+      IL_0113:  mkrefany   JitTest_shortsig_il.Mood
       IL_0118:  ldstr      "{good}"
-      IL_011d:  call       void JitTest.TestClass::Test(string,
+      IL_011d:  call       void JitTest_shortsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_0122:  ret
@@ -676,85 +676,85 @@
       .maxstack  5
       IL_0000:  ldstr      "{%d}"
       IL_0005:  ldarg.0
-      IL_0006:  ldflda     int32 JitTest.TestClass::m_d
+      IL_0006:  ldflda     int32 JitTest_shortsig_il.TestClass::m_d
       IL_000b:  mkrefany   [mscorlib]System.Int32
       IL_0010:  ldstr      "{20}"
-      IL_0015:  call       void JitTest.TestClass::Test(string,
+      IL_0015:  call       void JitTest_shortsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_001a:  ldstr      "{%u}"
-      IL_001f:  ldsflda    unsigned int32 JitTest.TestClass::m_u
+      IL_001f:  ldsflda    unsigned int32 JitTest_shortsig_il.TestClass::m_u
       IL_0024:  mkrefany   [mscorlib]System.UInt32
       IL_0029:  ldstr      "{21}"
-      IL_002e:  call       void JitTest.TestClass::Test(string,
+      IL_002e:  call       void JitTest_shortsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_0033:  ldstr      "{%ld}"
       IL_0038:  ldarg.0
-      IL_0039:  ldflda     int64 JitTest.TestClass::m_l
+      IL_0039:  ldflda     int64 JitTest_shortsig_il.TestClass::m_l
       IL_003e:  mkrefany   [mscorlib]System.Int64
       IL_0043:  ldstr      "{22}"
-      IL_0048:  call       void JitTest.TestClass::Test(string,
+      IL_0048:  call       void JitTest_shortsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_004d:  ldstr      "{%lu}"
-      IL_0052:  ldsflda    unsigned int64 JitTest.TestClass::m_ul
+      IL_0052:  ldsflda    unsigned int64 JitTest_shortsig_il.TestClass::m_ul
       IL_0057:  mkrefany   [mscorlib]System.UInt64
       IL_005c:  ldstr      "{23}"
-      IL_0061:  call       void JitTest.TestClass::Test(string,
+      IL_0061:  call       void JitTest_shortsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_0066:  ldstr      "{%f}"
       IL_006b:  ldarg.0
-      IL_006c:  ldflda     float32 JitTest.TestClass::m_f
+      IL_006c:  ldflda     float32 JitTest_shortsig_il.TestClass::m_f
       IL_0071:  mkrefany   [mscorlib]System.Single
       IL_0076:  ldstr      "{24}"
-      IL_007b:  call       void JitTest.TestClass::Test(string,
+      IL_007b:  call       void JitTest_shortsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_0080:  ldstr      "{%lf}"
       IL_0085:  ldarg.0
-      IL_0086:  ldflda     float64 JitTest.TestClass::m_dbl
+      IL_0086:  ldflda     float64 JitTest_shortsig_il.TestClass::m_dbl
       IL_008b:  mkrefany   [mscorlib]System.Double
       IL_0090:  ldstr      "{25}"
-      IL_0095:  call       void JitTest.TestClass::Test(string,
+      IL_0095:  call       void JitTest_shortsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_009a:  ldstr      "{%b}"
       IL_009f:  ldarg.0
-      IL_00a0:  ldflda     bool JitTest.TestClass::m_b
+      IL_00a0:  ldflda     bool JitTest_shortsig_il.TestClass::m_b
       IL_00a5:  mkrefany   [mscorlib]System.Boolean
       IL_00aa:  ldstr      "{false}"
-      IL_00af:  call       void JitTest.TestClass::Test(string,
+      IL_00af:  call       void JitTest_shortsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_00b4:  ldstr      "{%t}"
-      IL_00b9:  ldsflda    value class [mscorlib]System.DateTime JitTest.TestClass::m_t
+      IL_00b9:  ldsflda    value class [mscorlib]System.DateTime JitTest_shortsig_il.TestClass::m_t
       IL_00be:  mkrefany   [mscorlib]System.DateTime
       IL_00c3:  ldstr      "{"
-      IL_00c8:  ldsflda    value class [mscorlib]System.DateTime JitTest.TestClass::m_t
+      IL_00c8:  ldsflda    value class [mscorlib]System.DateTime JitTest_shortsig_il.TestClass::m_t
       IL_00cd:  call       instance string [mscorlib]System.DateTime::ToString()
       IL_00d2:  ldstr      "}"
       IL_00d7:  call       string [mscorlib]System.String::Concat(string,
                                                                                string,
                                                                                string)
-      IL_00dc:  call       void JitTest.TestClass::Test(string,
+      IL_00dc:  call       void JitTest_shortsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_00e1:  ldstr      "{%p}"
       IL_00e6:  ldarg.0
-      IL_00e7:  ldflda     value class JitTest.PlatformID JitTest.TestClass::m_pid
-      IL_00ec:  mkrefany   JitTest.PlatformID
+      IL_00e7:  ldflda     value class JitTest_shortsig_il.PlatformID JitTest_shortsig_il.TestClass::m_pid
+      IL_00ec:  mkrefany   JitTest_shortsig_il.PlatformID
       IL_00f1:  ldstr      "{Win32NT}"
-      IL_00f6:  call       void JitTest.TestClass::Test(string,
+      IL_00f6:  call       void JitTest_shortsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_00fb:  ldstr      "{%e}"
       IL_0100:  ldarg.0
-      IL_0101:  ldflda     value class JitTest.Mood JitTest.TestClass::m_mood
-      IL_0106:  mkrefany   JitTest.Mood
+      IL_0101:  ldflda     value class JitTest_shortsig_il.Mood JitTest_shortsig_il.TestClass::m_mood
+      IL_0106:  mkrefany   JitTest_shortsig_il.Mood
       IL_010b:  ldstr      "{good}"
-      IL_0110:  call       void JitTest.TestClass::Test(string,
+      IL_0110:  call       void JitTest_shortsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_0115:  ret
@@ -769,56 +769,56 @@
                            float64& dbl,
                            bool& b,
                            value class [mscorlib]System.DateTime& t,
-                           value class JitTest.PlatformID& pid) il managed
+                           value class JitTest_shortsig_il.PlatformID& pid) il managed
     {
       .maxstack  5
       IL_0000:  ldstr      "{%d}"
       IL_0005:  ldarg.0
       IL_0006:  mkrefany   [mscorlib]System.Int32
       IL_000b:  ldstr      "{20}"
-      IL_0010:  call       void JitTest.TestClass::Test(string,
+      IL_0010:  call       void JitTest_shortsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_0015:  ldstr      "{%u}"
       IL_001a:  ldarg.1
       IL_001b:  mkrefany   [mscorlib]System.UInt32
       IL_0020:  ldstr      "{21}"
-      IL_0025:  call       void JitTest.TestClass::Test(string,
+      IL_0025:  call       void JitTest_shortsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_002a:  ldstr      "{%ld}"
       IL_002f:  ldarg.2
       IL_0030:  mkrefany   [mscorlib]System.Int64
       IL_0035:  ldstr      "{22}"
-      IL_003a:  call       void JitTest.TestClass::Test(string,
+      IL_003a:  call       void JitTest_shortsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_003f:  ldstr      "{%lu}"
       IL_0044:  ldarg.3
       IL_0045:  mkrefany   [mscorlib]System.UInt64
       IL_004a:  ldstr      "{23}"
-      IL_004f:  call       void JitTest.TestClass::Test(string,
+      IL_004f:  call       void JitTest_shortsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_0054:  ldstr      "{%f}"
       IL_0059:  ldarg.s    f
       IL_005b:  mkrefany   [mscorlib]System.Single
       IL_0060:  ldstr      "{24}"
-      IL_0065:  call       void JitTest.TestClass::Test(string,
+      IL_0065:  call       void JitTest_shortsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_006a:  ldstr      "{%lf}"
       IL_006f:  ldarg.s    dbl
       IL_0071:  mkrefany   [mscorlib]System.Double
       IL_0076:  ldstr      "{25}"
-      IL_007b:  call       void JitTest.TestClass::Test(string,
+      IL_007b:  call       void JitTest_shortsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_0080:  ldstr      "{%b}"
       IL_0085:  ldarg.s    b
       IL_0087:  mkrefany   [mscorlib]System.Boolean
       IL_008c:  ldstr      "{false}"
-      IL_0091:  call       void JitTest.TestClass::Test(string,
+      IL_0091:  call       void JitTest_shortsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_0096:  ldstr      "{%t}"
@@ -831,14 +831,14 @@
       IL_00b3:  call       string [mscorlib]System.String::Concat(string,
                                                                                string,
                                                                                string)
-      IL_00b8:  call       void JitTest.TestClass::Test(string,
+      IL_00b8:  call       void JitTest_shortsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_00bd:  ldstr      "{%p}"
       IL_00c2:  ldarg.s    pid
-      IL_00c4:  mkrefany   JitTest.PlatformID
+      IL_00c4:  mkrefany   JitTest_shortsig_il.PlatformID
       IL_00c9:  ldstr      "{Win32NT}"
-      IL_00ce:  call       void JitTest.TestClass::Test(string,
+      IL_00ce:  call       void JitTest_shortsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_00d3:  ret
@@ -856,7 +856,7 @@
                [5] float64 V_5,
                [6] bool V_6,
                [7] value class [mscorlib]System.DateTime V_7,
-               [8] value class JitTest.PlatformID V_8)
+               [8] value class JitTest_shortsig_il.PlatformID V_8)
       IL_0000:  ldc.i4.s   20
       IL_0002:  stloc.0
       IL_0003:  ldc.i4.s   21
@@ -891,7 +891,7 @@
       IL_003e:  ldloca.s   V_6
       IL_0040:  ldloca.s   V_7
       IL_0042:  ldloca.s   V_8
-      IL_0044:  call       void JitTest.TestClass::DoTestArgSlots(int32&,
+      IL_0044:  call       void JitTest_shortsig_il.TestClass::DoTestArgSlots(int32&,
                                                                   unsigned int32&,
                                                                   int64&,
                                                                   unsigned int64&,
@@ -899,7 +899,7 @@
                                                                   float64&,
                                                                   bool&,
                                                                   value class [mscorlib]System.DateTime&,
-                                                                  value class JitTest.PlatformID&)
+                                                                  value class JitTest_shortsig_il.PlatformID&)
       IL_0049:  ret
     } // end of method TestClass::TestArgSlots
 
@@ -915,8 +915,8 @@
                [5] float64[] V_5,
                [6] bool[] V_6,
                [7] value class [mscorlib]System.DateTime[] V_7,
-               [8] value class JitTest.PlatformID[] V_8,
-               [9] value class JitTest.Mood[] V_9,
+               [8] value class JitTest_shortsig_il.PlatformID[] V_8,
+               [9] value class JitTest_shortsig_il.Mood[] V_9,
                [10] int32[] V_10,
                [11] unsigned int32[] V_11,
                [12] int64[] V_12,
@@ -924,8 +924,8 @@
                [14] float32[] V_14,
                [15] float64[] V_15,
                [16] bool[] V_16,
-               [17] value class JitTest.PlatformID[] V_17,
-               [18] value class JitTest.Mood[] V_18)
+               [17] value class JitTest_shortsig_il.PlatformID[] V_17,
+               [18] value class JitTest_shortsig_il.Mood[] V_18)
       IL_0000:  ldc.i4.1
       IL_0001:  newarr     [mscorlib]System.Int32
       IL_0006:  stloc.s    V_10
@@ -1004,7 +1004,7 @@
                                                                           int32,
                                                                           int32)
       IL_00a3:  ldc.i4.1
-      IL_00a4:  newarr     JitTest.PlatformID
+      IL_00a4:  newarr     JitTest_shortsig_il.PlatformID
       IL_00a9:  stloc.s    V_17
       IL_00ab:  ldloc.s    V_17
       IL_00ad:  ldc.i4.0
@@ -1013,7 +1013,7 @@
       IL_00b0:  ldloc.s    V_17
       IL_00b2:  stloc.s    V_8
       IL_00b4:  ldc.i4.1
-      IL_00b5:  newarr     JitTest.Mood
+      IL_00b5:  newarr     JitTest_shortsig_il.Mood
       IL_00ba:  stloc.s    V_18
       IL_00bc:  ldloc.s    V_18
       IL_00be:  stloc.s    V_9
@@ -1023,7 +1023,7 @@
       IL_00c7:  ldelema    [mscorlib]System.Int32
       IL_00cc:  mkrefany   [mscorlib]System.Int32
       IL_00d1:  ldstr      "{10}"
-      IL_00d6:  call       void JitTest.TestClass::Test(string,
+      IL_00d6:  call       void JitTest_shortsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_00db:  ldstr      "{%u}"
@@ -1032,7 +1032,7 @@
       IL_00e2:  ldelema    [mscorlib]System.UInt32
       IL_00e7:  mkrefany   [mscorlib]System.UInt32
       IL_00ec:  ldstr      "{11}"
-      IL_00f1:  call       void JitTest.TestClass::Test(string,
+      IL_00f1:  call       void JitTest_shortsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_00f6:  ldstr      "{%ld}"
@@ -1041,7 +1041,7 @@
       IL_00fd:  ldelema    [mscorlib]System.Int64
       IL_0102:  mkrefany   [mscorlib]System.Int64
       IL_0107:  ldstr      "{12}"
-      IL_010c:  call       void JitTest.TestClass::Test(string,
+      IL_010c:  call       void JitTest_shortsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_0111:  ldstr      "{%lu}"
@@ -1050,7 +1050,7 @@
       IL_0118:  ldelema    [mscorlib]System.UInt64
       IL_011d:  mkrefany   [mscorlib]System.UInt64
       IL_0122:  ldstr      "{13}"
-      IL_0127:  call       void JitTest.TestClass::Test(string,
+      IL_0127:  call       void JitTest_shortsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_012c:  ldstr      "{%f}"
@@ -1059,7 +1059,7 @@
       IL_0134:  ldelema    [mscorlib]System.Single
       IL_0139:  mkrefany   [mscorlib]System.Single
       IL_013e:  ldstr      "{14}"
-      IL_0143:  call       void JitTest.TestClass::Test(string,
+      IL_0143:  call       void JitTest_shortsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_0148:  ldstr      "{%lf}"
@@ -1068,7 +1068,7 @@
       IL_0150:  ldelema    [mscorlib]System.Double
       IL_0155:  mkrefany   [mscorlib]System.Double
       IL_015a:  ldstr      "{15}"
-      IL_015f:  call       void JitTest.TestClass::Test(string,
+      IL_015f:  call       void JitTest_shortsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_0164:  ldstr      "{%b}"
@@ -1077,7 +1077,7 @@
       IL_016c:  ldelema    [mscorlib]System.Boolean
       IL_0171:  mkrefany   [mscorlib]System.Boolean
       IL_0176:  ldstr      "{true}"
-      IL_017b:  call       void JitTest.TestClass::Test(string,
+      IL_017b:  call       void JitTest_shortsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_0180:  ldstr      "{%t}"
@@ -1094,31 +1094,31 @@
       IL_01a9:  call       string [mscorlib]System.String::Concat(string,
                                                                                string,
                                                                                string)
-      IL_01ae:  call       void JitTest.TestClass::Test(string,
+      IL_01ae:  call       void JitTest_shortsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_01b3:  ldstr      "{%p}"
       IL_01b8:  ldloc.s    V_8
       IL_01ba:  ldc.i4.0
-      IL_01bb:  ldelema    JitTest.PlatformID
-      IL_01c0:  mkrefany   JitTest.PlatformID
+      IL_01bb:  ldelema    JitTest_shortsig_il.PlatformID
+      IL_01c0:  mkrefany   JitTest_shortsig_il.PlatformID
       IL_01c5:  ldstr      "{Win32NT}"
-      IL_01ca:  call       void JitTest.TestClass::Test(string,
+      IL_01ca:  call       void JitTest_shortsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_01cf:  ldstr      "{%e}"
       IL_01d4:  ldloc.s    V_9
       IL_01d6:  ldc.i4.0
-      IL_01d7:  ldelema    JitTest.Mood
-      IL_01dc:  mkrefany   JitTest.Mood
+      IL_01d7:  ldelema    JitTest_shortsig_il.Mood
+      IL_01dc:  mkrefany   JitTest_shortsig_il.Mood
       IL_01e1:  ldstr      "{good}"
-      IL_01e6:  call       void JitTest.TestClass::Test(string,
+      IL_01e6:  call       void JitTest_shortsig_il.TestClass::Test(string,
                                                         typedref,
                                                         string)
       IL_01eb:  ret
     } // end of method TestClass::TestArrayElem
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -1126,10 +1126,10 @@
       )
       .entrypoint
       .maxstack  8
-      IL_0000:  call       void JitTest.TestClass::TestLocals()
-      IL_0005:  newobj     instance void JitTest.TestClass::.ctor()
-      IL_000a:  call       instance void JitTest.TestClass::TestFields()
-      IL_000f:  call       void JitTest.TestClass::TestArrayElem()
+      IL_0000:  call       void JitTest_shortsig_il.TestClass::TestLocals()
+      IL_0005:  newobj     instance void JitTest_shortsig_il.TestClass::.ctor()
+      IL_000a:  call       instance void JitTest_shortsig_il.TestClass::TestFields()
+      IL_000f:  call       void JitTest_shortsig_il.TestClass::TestArrayElem()
       IL_0014:  ldstr      "*** passed ***"
       IL_0019:  call       void [System.Console]System.Console::WriteLine(string)
       IL_001e:  ldc.i4 100
@@ -1141,11 +1141,11 @@
     {
       .maxstack  8
       IL_0000:  ldc.i4.s   21
-      IL_0002:  stsfld     unsigned int32 JitTest.TestClass::m_u
+      IL_0002:  stsfld     unsigned int32 JitTest_shortsig_il.TestClass::m_u
       IL_0007:  ldc.i4.s   23
       IL_0009:  conv.i8
-      IL_000a:  stsfld     unsigned int64 JitTest.TestClass::m_ul
-      IL_000f:  ldsflda    value class [mscorlib]System.DateTime JitTest.TestClass::m_t
+      IL_000a:  stsfld     unsigned int64 JitTest_shortsig_il.TestClass::m_ul
+      IL_000f:  ldsflda    value class [mscorlib]System.DateTime JitTest_shortsig_il.TestClass::m_t
       IL_0014:  ldc.i4.s   100
       IL_0016:  ldc.i4.s   10
       IL_0018:  ldc.i4.1
@@ -1161,26 +1161,26 @@
       .maxstack  2
       IL_0000:  ldarg.0
       IL_0001:  ldc.i4.s   20
-      IL_0003:  stfld      int32 JitTest.TestClass::m_d
+      IL_0003:  stfld      int32 JitTest_shortsig_il.TestClass::m_d
       IL_0008:  ldarg.0
       IL_0009:  ldc.i4.s   22
       IL_000b:  conv.i8
-      IL_000c:  stfld      int64 JitTest.TestClass::m_l
+      IL_000c:  stfld      int64 JitTest_shortsig_il.TestClass::m_l
       IL_0011:  ldarg.0
       IL_0012:  ldc.r4     24.
-      IL_0017:  stfld      float32 JitTest.TestClass::m_f
+      IL_0017:  stfld      float32 JitTest_shortsig_il.TestClass::m_f
       IL_001c:  ldarg.0
       IL_001d:  ldc.r8     25.
-      IL_0026:  stfld      float64 JitTest.TestClass::m_dbl
+      IL_0026:  stfld      float64 JitTest_shortsig_il.TestClass::m_dbl
       IL_002b:  ldarg.0
       IL_002c:  ldc.i4.0
-      IL_002d:  stfld      bool JitTest.TestClass::m_b
+      IL_002d:  stfld      bool JitTest_shortsig_il.TestClass::m_b
       IL_0032:  ldarg.0
       IL_0033:  ldc.i4.2
-      IL_0034:  stfld      value class JitTest.PlatformID JitTest.TestClass::m_pid
+      IL_0034:  stfld      value class JitTest_shortsig_il.PlatformID JitTest_shortsig_il.TestClass::m_pid
       IL_0039:  ldarg.0
       IL_003a:  ldc.i4.0
-      IL_003b:  stfld      value class JitTest.Mood JitTest.TestClass::m_mood
+      IL_003b:  stfld      value class JitTest_shortsig_il.Mood JitTest_shortsig_il.TestClass::m_mood
       IL_0040:  ldarg.0
       IL_0041:  call       instance void [mscorlib]System.Object::.ctor()
       IL_0046:  ret
@@ -1188,5 +1188,5 @@
 
   } // end of class TestClass
 
-} // end of namespace JitTest
+} // end of namespace JitTest_shortsig_il
 
diff --git a/src/tests/JIT/Methodical/refany/shortsig_il_d.ilproj b/src/tests/JIT/Methodical/refany/shortsig_il_d.ilproj
index 16348c4376692a..2e73cb8f13b3ce 100644
--- a/src/tests/JIT/Methodical/refany/shortsig_il_d.ilproj
+++ b/src/tests/JIT/Methodical/refany/shortsig_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/refany/shortsig_il_r.ilproj b/src/tests/JIT/Methodical/refany/shortsig_il_r.ilproj
index 26e08eda1f8855..46c263e17cc276 100644
--- a/src/tests/JIT/Methodical/refany/shortsig_il_r.ilproj
+++ b/src/tests/JIT/Methodical/refany/shortsig_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/refany/stress1.cs b/src/tests/JIT/Methodical/refany/stress1.cs
index 971c8ab05d8284..3cb80c2aeeb1a1 100644
--- a/src/tests/JIT/Methodical/refany/stress1.cs
+++ b/src/tests/JIT/Methodical/refany/stress1.cs
@@ -1,11 +1,14 @@
 // Licensed to the .NET Foundation under one or more agreements.
+using Xunit;
+namespace Test_stress1
+{
 // The .NET Foundation licenses this file to you under the MIT license.
 
 namespace JitTest
 {
     using System;
 
-    internal class StressTest
+    public class StressTest
     {
         private const int ITERATIONS = 2000;
         private const ulong MAGIC = 0x7700001492000077;
@@ -44,7 +47,8 @@ private static void PackRef(TypedReference _ref, int iterCount)
             }
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             try
             {
@@ -63,3 +67,4 @@ private static int Main()
         }
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/refany/stress1_d.csproj b/src/tests/JIT/Methodical/refany/stress1_d.csproj
index 0497150fc0467d..c883bf847d17d0 100644
--- a/src/tests/JIT/Methodical/refany/stress1_d.csproj
+++ b/src/tests/JIT/Methodical/refany/stress1_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/refany/stress1_do.csproj b/src/tests/JIT/Methodical/refany/stress1_do.csproj
index 145bcc0cd198ef..977311b4a0215f 100644
--- a/src/tests/JIT/Methodical/refany/stress1_do.csproj
+++ b/src/tests/JIT/Methodical/refany/stress1_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/refany/stress1_r.csproj b/src/tests/JIT/Methodical/refany/stress1_r.csproj
index 5a3bab08bacf90..469af293cda581 100644
--- a/src/tests/JIT/Methodical/refany/stress1_r.csproj
+++ b/src/tests/JIT/Methodical/refany/stress1_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/refany/stress1_ro.csproj b/src/tests/JIT/Methodical/refany/stress1_ro.csproj
index d58cad78e9d332..320de8f247d752 100644
--- a/src/tests/JIT/Methodical/refany/stress1_ro.csproj
+++ b/src/tests/JIT/Methodical/refany/stress1_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/refany/stress2.il b/src/tests/JIT/Methodical/refany/stress2.il
index b25ee851708545..686d4317397c99 100644
--- a/src/tests/JIT/Methodical/refany/stress2.il
+++ b/src/tests/JIT/Methodical/refany/stress2.il
@@ -16,12 +16,12 @@
 }
 .assembly extern xunit.core {}
 // MVID: {5A1483AA-BABB-44FA-9E05-6A081C8BFE56}
-.namespace JitTest
+.namespace JitTest_stress2_il
 {
-  .class private auto ansi StressTest
+  .class public auto ansi StressTest
          extends [mscorlib]System.Object
   {
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -68,6 +68,6 @@
 
   } // end of class StressTest
 
-} // end of namespace JitTest
+} // end of namespace JitTest_stress2_il
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/refany/stress2_il_d.ilproj b/src/tests/JIT/Methodical/refany/stress2_il_d.ilproj
index bfcdd805621ad3..960cf9c2b3a21f 100644
--- a/src/tests/JIT/Methodical/refany/stress2_il_d.ilproj
+++ b/src/tests/JIT/Methodical/refany/stress2_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/refany/stress2_il_r.ilproj b/src/tests/JIT/Methodical/refany/stress2_il_r.ilproj
index c1fc6c40b2de5e..901d2451a23cde 100644
--- a/src/tests/JIT/Methodical/refany/stress2_il_r.ilproj
+++ b/src/tests/JIT/Methodical/refany/stress2_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/refany/stress3-64bit.cs b/src/tests/JIT/Methodical/refany/stress3-64bit.cs
index 21953ed46587f4..4aa0b261fdeb02 100644
--- a/src/tests/JIT/Methodical/refany/stress3-64bit.cs
+++ b/src/tests/JIT/Methodical/refany/stress3-64bit.cs
@@ -1,11 +1,14 @@
 // Licensed to the .NET Foundation under one or more agreements.
+using Xunit;
+namespace Test_stress3_64bit
+{
 // The .NET Foundation licenses this file to you under the MIT license.
 
 namespace JitTest
 {
     using System;
 
-    internal class StressTest
+    public class StressTest
     {
         private const int ITERATIONS = 4500;
 
@@ -25,7 +28,8 @@ private static void PackRef(ref String refee, int iterCount)
             }
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             try
             {
@@ -40,3 +44,4 @@ private static int Main()
         }
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/refany/stress3_d.csproj b/src/tests/JIT/Methodical/refany/stress3_d.csproj
index 08a7542cfde9dc..ae244aa8cb4809 100644
--- a/src/tests/JIT/Methodical/refany/stress3_d.csproj
+++ b/src/tests/JIT/Methodical/refany/stress3_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/refany/stress3_do.csproj b/src/tests/JIT/Methodical/refany/stress3_do.csproj
index 6f2f3251e572bf..5654ea15a645ae 100644
--- a/src/tests/JIT/Methodical/refany/stress3_do.csproj
+++ b/src/tests/JIT/Methodical/refany/stress3_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/refany/stress3_r.csproj b/src/tests/JIT/Methodical/refany/stress3_r.csproj
index 310e6a8c3555ff..033bc6848d3a3d 100644
--- a/src/tests/JIT/Methodical/refany/stress3_r.csproj
+++ b/src/tests/JIT/Methodical/refany/stress3_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/refany/stress3_ro.csproj b/src/tests/JIT/Methodical/refany/stress3_ro.csproj
index 12d6721d85fd2d..c681ac6255502f 100644
--- a/src/tests/JIT/Methodical/refany/stress3_ro.csproj
+++ b/src/tests/JIT/Methodical/refany/stress3_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/refany/u_native.il b/src/tests/JIT/Methodical/refany/u_native.il
index fd732040deb506..a7b0690a4827df 100644
--- a/src/tests/JIT/Methodical/refany/u_native.il
+++ b/src/tests/JIT/Methodical/refany/u_native.il
@@ -16,12 +16,12 @@
 }
 .assembly extern xunit.core {}
 // MVID: {C18F1061-8239-420B-AC69-D4CB0BB38F2B}
-.namespace JitTest
+.namespace JitTest_u_native_refany_il
 {
-  .class private auto ansi Test
+  .class public auto ansi Test
          extends [mscorlib]System.Object
   {
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -85,6 +85,6 @@
 
   } // end of class Test
 
-} // end of namespace JitTest
+} // end of namespace JitTest_u_native_refany_il
 
 //*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/refany/u_native_il_d.ilproj b/src/tests/JIT/Methodical/refany/u_native_il_d.ilproj
index 5de46877377134..ad9ad59b7f4cbe 100644
--- a/src/tests/JIT/Methodical/refany/u_native_il_d.ilproj
+++ b/src/tests/JIT/Methodical/refany/u_native_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/refany/u_native_il_r.ilproj b/src/tests/JIT/Methodical/refany/u_native_il_r.ilproj
index 22bc32a729f6dc..c8c08484784cc3 100644
--- a/src/tests/JIT/Methodical/refany/u_native_il_r.ilproj
+++ b/src/tests/JIT/Methodical/refany/u_native_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/refany/virtcall.cs b/src/tests/JIT/Methodical/refany/virtcall.cs
index 44b3470bb73ec5..6ec0cfc5d23dfe 100644
--- a/src/tests/JIT/Methodical/refany/virtcall.cs
+++ b/src/tests/JIT/Methodical/refany/virtcall.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_virtcall_cs
 {
-    internal class StressTest
+    public class StressTest
     {
         private const int ITERATIONS = 2000;
         private const ulong MAGIC = 0x7700001492000077;
@@ -40,7 +41,8 @@ public virtual void PackRef(TypedReference _ref, int iterCount)
             }
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             try
             {
diff --git a/src/tests/JIT/Methodical/refany/virtcall_d.csproj b/src/tests/JIT/Methodical/refany/virtcall_d.csproj
index a38e7a515935e0..b6f2756817caf4 100644
--- a/src/tests/JIT/Methodical/refany/virtcall_d.csproj
+++ b/src/tests/JIT/Methodical/refany/virtcall_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/refany/virtcall_do.csproj b/src/tests/JIT/Methodical/refany/virtcall_do.csproj
index d118078ea2b083..ecb6a96f81dc28 100644
--- a/src/tests/JIT/Methodical/refany/virtcall_do.csproj
+++ b/src/tests/JIT/Methodical/refany/virtcall_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/refany/virtcall_r.csproj b/src/tests/JIT/Methodical/refany/virtcall_r.csproj
index 25ae1a0340d9e0..66acd5a6d00ca3 100644
--- a/src/tests/JIT/Methodical/refany/virtcall_r.csproj
+++ b/src/tests/JIT/Methodical/refany/virtcall_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/refany/virtcall_ro.csproj b/src/tests/JIT/Methodical/refany/virtcall_ro.csproj
index 58623d0d1005e4..1d6a413f51bcea 100644
--- a/src/tests/JIT/Methodical/refany/virtcall_ro.csproj
+++ b/src/tests/JIT/Methodical/refany/virtcall_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/stringintern/_Simpleb207621.csproj b/src/tests/JIT/Methodical/stringintern/_Simpleb207621.csproj
index 5d0fdf0d3383b4..e95053cbff6dbf 100644
--- a/src/tests/JIT/Methodical/stringintern/_Simpleb207621.csproj
+++ b/src/tests/JIT/Methodical/stringintern/_Simpleb207621.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/stringintern/_Simpletest1.csproj b/src/tests/JIT/Methodical/stringintern/_Simpletest1.csproj
index 4935a6741e4d18..885d8b964e7636 100644
--- a/src/tests/JIT/Methodical/stringintern/_Simpletest1.csproj
+++ b/src/tests/JIT/Methodical/stringintern/_Simpletest1.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/stringintern/_Simpletest2.csproj b/src/tests/JIT/Methodical/stringintern/_Simpletest2.csproj
index 8a83d700928a2d..294bc5404e97b1 100644
--- a/src/tests/JIT/Methodical/stringintern/_Simpletest2.csproj
+++ b/src/tests/JIT/Methodical/stringintern/_Simpletest2.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/stringintern/_Simpletest4.csproj b/src/tests/JIT/Methodical/stringintern/_Simpletest4.csproj
index 410be604e06a8d..91751b2974994a 100644
--- a/src/tests/JIT/Methodical/stringintern/_Simpletest4.csproj
+++ b/src/tests/JIT/Methodical/stringintern/_Simpletest4.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/stringintern/b207621.cs b/src/tests/JIT/Methodical/stringintern/b207621.cs
index 9267a729929304..9422d372b138f9 100644
--- a/src/tests/JIT/Methodical/stringintern/b207621.cs
+++ b/src/tests/JIT/Methodical/stringintern/b207621.cs
@@ -3,8 +3,9 @@
 
 using System;
 using System.Runtime.CompilerServices;
+using Xunit;
 
-internal class Test_b207621
+public class Test_b207621
 {
     [MethodImplAttribute(MethodImplOptions.NoInlining)]
     private static string FooBar()
@@ -12,7 +13,8 @@ private static string FooBar()
         return "Hello World";
     }
 
-    static public int Main()
+    [Fact]
+    static public int TestEntryPoint()
     {
         string a = null;
         string b = null;
diff --git a/src/tests/JIT/Methodical/stringintern/test1-xassem.csproj b/src/tests/JIT/Methodical/stringintern/test1-xassem.csproj
index d13649957b9548..4ccd4eedc6167e 100644
--- a/src/tests/JIT/Methodical/stringintern/test1-xassem.csproj
+++ b/src/tests/JIT/Methodical/stringintern/test1-xassem.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
     <DefineConstants>$(DefineConstants);XASSEM</DefineConstants>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/stringintern/test1.cs b/src/tests/JIT/Methodical/stringintern/test1.cs
index ac995ec48d5711..ee8d7dd59692da 100644
--- a/src/tests/JIT/Methodical/stringintern/test1.cs
+++ b/src/tests/JIT/Methodical/stringintern/test1.cs
@@ -5,6 +5,7 @@
 
 using System;
 using System.Runtime.CompilerServices;
+using Xunit;
 
 public class
 #if XASSEM
@@ -97,7 +98,8 @@ public static bool TestSameObjRef()
         return passed;
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         if (TestSameObjRef())
         {
diff --git a/src/tests/JIT/Methodical/stringintern/test2-xassem.csproj b/src/tests/JIT/Methodical/stringintern/test2-xassem.csproj
index 3cc83343c7ea99..0086d93465873c 100644
--- a/src/tests/JIT/Methodical/stringintern/test2-xassem.csproj
+++ b/src/tests/JIT/Methodical/stringintern/test2-xassem.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
     <DefineConstants>$(DefineConstants);XASSEM</DefineConstants>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/stringintern/test2.cs b/src/tests/JIT/Methodical/stringintern/test2.cs
index ee9fa57dd8719a..4c616a72c1fe9c 100644
--- a/src/tests/JIT/Methodical/stringintern/test2.cs
+++ b/src/tests/JIT/Methodical/stringintern/test2.cs
@@ -5,6 +5,7 @@
 
 using System;
 using System.Runtime.CompilerServices;
+using Xunit;
 
 public class
 #if XASSEM
@@ -123,7 +124,8 @@ public static bool TestSameObjRef()
         return passed;
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         if (TestSameObjRef())
         {
diff --git a/src/tests/JIT/Methodical/stringintern/test4-xassem.csproj b/src/tests/JIT/Methodical/stringintern/test4-xassem.csproj
index 6434c9b70af1d3..1f059ec1117dfc 100644
--- a/src/tests/JIT/Methodical/stringintern/test4-xassem.csproj
+++ b/src/tests/JIT/Methodical/stringintern/test4-xassem.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
     <DefineConstants>$(DefineConstants);XASSEM</DefineConstants>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/stringintern/test4.cs b/src/tests/JIT/Methodical/stringintern/test4.cs
index d83f9aec8f9e26..14771c2179f1fb 100644
--- a/src/tests/JIT/Methodical/stringintern/test4.cs
+++ b/src/tests/JIT/Methodical/stringintern/test4.cs
@@ -5,6 +5,7 @@
 
 using System;
 using System.Runtime.CompilerServices;
+using Xunit;
 
 public class
 #if XASSEM
@@ -248,7 +249,8 @@ public static bool TestSameObjRef()
         return passed;
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         if (TestSameObjRef())
         {
diff --git a/src/tests/JIT/Methodical/structs/ExplicitLayout.csproj b/src/tests/JIT/Methodical/structs/ExplicitLayout.csproj
index e6be1072215cd3..50f1b02366fc3e 100644
--- a/src/tests/JIT/Methodical/structs/ExplicitLayout.csproj
+++ b/src/tests/JIT/Methodical/structs/ExplicitLayout.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/structs/StructStackParams.cs b/src/tests/JIT/Methodical/structs/StructStackParams.cs
index ad6ffcc89cb945..c0af4647f4b3a1 100644
--- a/src/tests/JIT/Methodical/structs/StructStackParams.cs
+++ b/src/tests/JIT/Methodical/structs/StructStackParams.cs
@@ -9,6 +9,7 @@
 
 using System;
 using System.Runtime.CompilerServices;
+using Xunit;
 
 // Struct that's greater than 32-bits, but not a multiple of 32-bits.
 public struct MyStruct1
@@ -162,7 +163,8 @@ public static int TestStruct4()
         return Check4(w, 1, 2, 3, 4, 5, 6, 7, s4);
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         int retVal = Pass;
         if (TestStruct1() != Pass)
diff --git a/src/tests/JIT/Methodical/structs/StructStackParams.csproj b/src/tests/JIT/Methodical/structs/StructStackParams.csproj
index 986494e092b5aa..bf85249eecbec9 100644
--- a/src/tests/JIT/Methodical/structs/StructStackParams.csproj
+++ b/src/tests/JIT/Methodical/structs/StructStackParams.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType />
diff --git a/src/tests/JIT/Methodical/structs/StructWithSingleFloat.cs b/src/tests/JIT/Methodical/structs/StructWithSingleFloat.cs
index 2e6473bfc6e92a..efb41c0ff0b24f 100644
--- a/src/tests/JIT/Methodical/structs/StructWithSingleFloat.cs
+++ b/src/tests/JIT/Methodical/structs/StructWithSingleFloat.cs
@@ -6,6 +6,9 @@
 using System;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
+using Xunit;
+namespace Test_StructWithSingleFloat
+{
 public class TestClass
 {
     public struct S2
@@ -35,9 +38,11 @@ public void Method0()
             return;
         }
     }
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         new TestClass().Method0();
         return s_s2_16.float_2 == 1.5f ? 100 : 0;
     }
-}
\ No newline at end of file
+}
+}
diff --git a/src/tests/JIT/Methodical/structs/StructWithSingleFloat.csproj b/src/tests/JIT/Methodical/structs/StructWithSingleFloat.csproj
index 0d49ad21f445ce..14a6b64107d492 100644
--- a/src/tests/JIT/Methodical/structs/StructWithSingleFloat.csproj
+++ b/src/tests/JIT/Methodical/structs/StructWithSingleFloat.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
@@ -11,4 +10,4 @@
   <ItemGroup>
     <Compile Include="StructWithSingleFloat.cs" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/tests/JIT/Methodical/structs/systemvbringup/structinregs.csproj b/src/tests/JIT/Methodical/structs/systemvbringup/structinregs.csproj
index dbf175e35632d7..211ecef89f561e 100644
--- a/src/tests/JIT/Methodical/structs/systemvbringup/structinregs.csproj
+++ b/src/tests/JIT/Methodical/structs/systemvbringup/structinregs.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/JIT/Methodical/structs/systemvbringup/structpasstest.cs b/src/tests/JIT/Methodical/structs/systemvbringup/structpasstest.cs
index 94379ecbc2b9c5..009835efdbdf59 100644
--- a/src/tests/JIT/Methodical/structs/systemvbringup/structpasstest.cs
+++ b/src/tests/JIT/Methodical/structs/systemvbringup/structpasstest.cs
@@ -2,11 +2,13 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Runtime.CompilerServices;
+using Xunit;
 namespace structinreg
 {
     public class Program
     {
-        public static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             try
             {
diff --git a/src/tests/JIT/Methodical/structs/valuetuple.cs b/src/tests/JIT/Methodical/structs/valuetuple.cs
index 510b1ce1d982e3..84a9e82544f400 100644
--- a/src/tests/JIT/Methodical/structs/valuetuple.cs
+++ b/src/tests/JIT/Methodical/structs/valuetuple.cs
@@ -10,6 +10,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
+using Xunit;
 
 [StructLayout(LayoutKind.Auto)]
 public struct ValueTuple<T1, T2, T3>
@@ -77,7 +78,8 @@ public static int ConvertToRef3()
         return Pass;
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         int returnVal = Fail;
         try
diff --git a/src/tests/JIT/Methodical/structs/valuetuple.csproj b/src/tests/JIT/Methodical/structs/valuetuple.csproj
index e7c9f817f0441c..897e36092ef99b 100644
--- a/src/tests/JIT/Methodical/structs/valuetuple.csproj
+++ b/src/tests/JIT/Methodical/structs/valuetuple.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/switch/switch1.ilproj b/src/tests/JIT/Methodical/switch/switch1.ilproj
index 21f7a207eda1e6..72f84de5731526 100644
--- a/src/tests/JIT/Methodical/switch/switch1.ilproj
+++ b/src/tests/JIT/Methodical/switch/switch1.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/switch/switch10.ilproj b/src/tests/JIT/Methodical/switch/switch10.ilproj
index 87798a7f957db7..b2e353b95fab08 100644
--- a/src/tests/JIT/Methodical/switch/switch10.ilproj
+++ b/src/tests/JIT/Methodical/switch/switch10.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/switch/switch11.ilproj b/src/tests/JIT/Methodical/switch/switch11.ilproj
index 548979ce31b63d..6b124c8f9f4cef 100644
--- a/src/tests/JIT/Methodical/switch/switch11.ilproj
+++ b/src/tests/JIT/Methodical/switch/switch11.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/switch/switch2.ilproj b/src/tests/JIT/Methodical/switch/switch2.ilproj
index aa10de2de2a25c..da95768689c15f 100644
--- a/src/tests/JIT/Methodical/switch/switch2.ilproj
+++ b/src/tests/JIT/Methodical/switch/switch2.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/switch/switch3.ilproj b/src/tests/JIT/Methodical/switch/switch3.ilproj
index fbb169e155b0a0..758ee3a372fc9e 100644
--- a/src/tests/JIT/Methodical/switch/switch3.ilproj
+++ b/src/tests/JIT/Methodical/switch/switch3.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/switch/switch4.ilproj b/src/tests/JIT/Methodical/switch/switch4.ilproj
index 029bd1c6e4e219..5be668613f7d5c 100644
--- a/src/tests/JIT/Methodical/switch/switch4.ilproj
+++ b/src/tests/JIT/Methodical/switch/switch4.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/switch/switch5.ilproj b/src/tests/JIT/Methodical/switch/switch5.ilproj
index b80ca3729cf8d1..ed80318893005d 100644
--- a/src/tests/JIT/Methodical/switch/switch5.ilproj
+++ b/src/tests/JIT/Methodical/switch/switch5.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/switch/switch6.ilproj b/src/tests/JIT/Methodical/switch/switch6.ilproj
index 83a5e2f0daf186..d66f50073249aa 100644
--- a/src/tests/JIT/Methodical/switch/switch6.ilproj
+++ b/src/tests/JIT/Methodical/switch/switch6.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/switch/switch7.ilproj b/src/tests/JIT/Methodical/switch/switch7.ilproj
index 70579bec033441..0f54353443d645 100644
--- a/src/tests/JIT/Methodical/switch/switch7.ilproj
+++ b/src/tests/JIT/Methodical/switch/switch7.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/switch/switch8.ilproj b/src/tests/JIT/Methodical/switch/switch8.ilproj
index 5f2c966826280a..3b8c91ee3eb333 100644
--- a/src/tests/JIT/Methodical/switch/switch8.ilproj
+++ b/src/tests/JIT/Methodical/switch/switch8.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/switch/switch9.ilproj b/src/tests/JIT/Methodical/switch/switch9.ilproj
index ee9a40164f5008..5064f4d29fe440 100644
--- a/src/tests/JIT/Methodical/switch/switch9.ilproj
+++ b/src/tests/JIT/Methodical/switch/switch9.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/tailcall/test_implicit.il b/src/tests/JIT/Methodical/tailcall/test_implicit.il
index e24bfe5a0b0ce5..54b60e79998025 100644
--- a/src/tests/JIT/Methodical/tailcall/test_implicit.il
+++ b/src/tests/JIT/Methodical/tailcall/test_implicit.il
@@ -23,6 +23,8 @@
 
 
 
+.namespace Test_test_implicit_il
+{
 .class public auto ansi beforefieldinit Class1
        extends [mscorlib]System.Object
 {
@@ -34,23 +36,23 @@
   {
     .maxstack  5
     .locals init (int32 V_0)
-              ldsfld     bool Class1::s_failure
+              ldsfld     bool Test_test_implicit_il.Class1::s_failure
               brtrue.s   IL_0003
 
     IL_0000:  ldarg.1
     IL_0001:  brtrue.s   IL_000c
 
     IL_0003:  ldarg.0
-    IL_0004:  ldfld      int32 Class1::'value'
+    IL_0004:  ldfld      int32 Test_test_implicit_il.Class1::'value'
     IL_0009:  stloc.0
     IL_000a:  br.s       IL_004b
 
     IL_000c:  ldarg.0
     IL_000d:  dup
-    IL_000e:  ldfld      int32 Class1::'value'
+    IL_000e:  ldfld      int32 Test_test_implicit_il.Class1::'value'
     IL_0013:  ldarg.1
     IL_0014:  add
-    IL_0015:  stfld      int32 Class1::'value'
+    IL_0015:  stfld      int32 Test_test_implicit_il.Class1::'value'
     IL_001a:  ldarg.1
     IL_001b:  ldc.i4     0x80
     IL_0020:  rem
@@ -61,7 +63,7 @@
     IL_0026:  ldarg.1
     IL_0027:  ldc.i4.1
     IL_0028:  sub
-    IL_0029:  tail. callvirt   instance int32 Class1::Recurse3(int32)
+    IL_0029:  tail. callvirt   instance int32 Test_test_implicit_il.Class1::Recurse3(int32)
 ret
     IL_002e:  stloc.0
     IL_002f:  br.s       IL_004b
@@ -76,7 +78,7 @@ ret
     IL_003c:  ldc.i4.1
     IL_003d:  add
     IL_003e:  box        [mscorlib]System.Int32
-    IL_0043:  tail. call       instance int32 Class1::Recurse2(int32,
+    IL_0043:  tail. call       instance int32 Test_test_implicit_il.Class1::Recurse2(int32,
                                                          object,
                                                          object)
 ret
@@ -95,19 +97,19 @@ ret
     .maxstack  4
     .locals init (string V_0,
              int32 V_1)
-              ldsfld     bool Class1::s_failure
+              ldsfld     bool Test_test_implicit_il.Class1::s_failure
               brtrue.s   IL_0003
 
     IL_0000:  ldarg.1
     IL_0001:  brtrue.s   IL_000c
 
     IL_0003:  ldarg.0
-    IL_0004:  ldfld      int32 Class1::'value'
+    IL_0004:  ldfld      int32 Test_test_implicit_il.Class1::'value'
     IL_0009:  stloc.1
     IL_000a:  br.s       IL_007b
 
     IL_000c:  ldarg.1
-    IL_000d:  ldsfld     int32 Class1::MaxDepth
+    IL_000d:  ldsfld     int32 Test_test_implicit_il.Class1::MaxDepth
     IL_0012:  ldc.i4.s   10
     IL_0014:  div
     IL_0015:  rem
@@ -130,13 +132,13 @@ ret
     IL_003e:  ldstr      "Test Failed"
     IL_0043:  call       void [System.Console]System.Console::WriteLine(string)
     IL_0048:  ldc.i4.1
-              stsfld     bool Class1::s_failure
+              stsfld     bool Test_test_implicit_il.Class1::s_failure
               br.s       IL_0003
 
     IL_004e:  call       void [mscorlib]System.GC::Collect()
     IL_0053:  ldarg.0
     IL_0054:  dup
-    IL_0055:  ldfld      int32 Class1::'value'
+    IL_0055:  ldfld      int32 Test_test_implicit_il.Class1::'value'
     IL_005a:  ldarg.2
     IL_005b:  unbox      [mscorlib]System.Int32
     IL_0060:  ldind.i4
@@ -145,12 +147,12 @@ ret
     IL_0067:  ldind.i4
     IL_0068:  add
     IL_0069:  add
-    IL_006a:  stfld      int32 Class1::'value'
+    IL_006a:  stfld      int32 Test_test_implicit_il.Class1::'value'
     IL_006f:  ldarg.0
     IL_0070:  ldarg.1
     IL_0071:  ldc.i4.1
     IL_0072:  sub
-    IL_0073:  tail. callvirt   instance int32 Class1::Recurse3(int32)
+    IL_0073:  tail. callvirt   instance int32 Test_test_implicit_il.Class1::Recurse3(int32)
 ret
     IL_0078:  stloc.1
     IL_0079:  br.s       IL_007b
@@ -164,14 +166,14 @@ ret
   {
     .maxstack  5
     .locals init (int32 V_0)
-              ldsfld     bool Class1::s_failure
+              ldsfld     bool Test_test_implicit_il.Class1::s_failure
               brtrue.s   IL_0003
 
     IL_0000:  ldarg.1
     IL_0001:  brtrue.s   IL_000c
 
     IL_0003:  ldarg.0
-    IL_0004:  ldfld      int32 Class1::'value'
+    IL_0004:  ldfld      int32 Test_test_implicit_il.Class1::'value'
     IL_0009:  stloc.0
     IL_000a:  br.s       IL_003f
 
@@ -185,7 +187,7 @@ ret
     IL_0018:  ldarg.1
     IL_0019:  ldc.i4.1
     IL_001a:  sub
-    IL_001b:  tail. call       instance int32 Class1::Recurse1(int32)
+    IL_001b:  tail. call       instance int32 Test_test_implicit_il.Class1::Recurse1(int32)
 ret
     IL_0020:  stloc.0
     IL_0021:  br.s       IL_003f
@@ -202,7 +204,7 @@ ret
     IL_0030:  ldc.i4.2
     IL_0031:  add
     IL_0032:  box        [mscorlib]System.Int32
-    IL_0037:  tail. callvirt   instance int32 Class1::Recurse4(int32,
+    IL_0037:  tail. callvirt   instance int32 Test_test_implicit_il.Class1::Recurse4(int32,
                                                          object,
                                                          object)
 ret
@@ -221,19 +223,19 @@ ret
     .maxstack  4
     .locals init (string V_0,
              int32 V_1)
-              ldsfld     bool Class1::s_failure
+              ldsfld     bool Test_test_implicit_il.Class1::s_failure
               brtrue.s   IL_0003
 
     IL_0000:  ldarg.1
     IL_0001:  brtrue.s   IL_000c
 
     IL_0003:  ldarg.0
-    IL_0004:  ldfld      int32 Class1::'value'
+    IL_0004:  ldfld      int32 Test_test_implicit_il.Class1::'value'
     IL_0009:  stloc.1
     IL_000a:  br.s       IL_007e
 
     IL_000c:  ldarg.1
-    IL_000d:  ldsfld     int32 Class1::MaxDepth
+    IL_000d:  ldsfld     int32 Test_test_implicit_il.Class1::MaxDepth
     IL_0012:  ldc.i4.s   10
     IL_0014:  div
     IL_0015:  rem
@@ -257,12 +259,12 @@ ret
     IL_0046:  ldstr      "Test Failed"
     IL_004b:  call       void [System.Console]System.Console::WriteLine(string)
     IL_0050:  ldc.i4.1
-              stsfld     bool Class1::s_failure
+              stsfld     bool Test_test_implicit_il.Class1::s_failure
               br.s       IL_0003
 
     IL_0056:  ldarg.0
     IL_0057:  dup
-    IL_0058:  ldfld      int32 Class1::'value'
+    IL_0058:  ldfld      int32 Test_test_implicit_il.Class1::'value'
     IL_005d:  ldarg.2
     IL_005e:  unbox      [mscorlib]System.Int32
     IL_0063:  ldind.i4
@@ -271,12 +273,12 @@ ret
     IL_006a:  ldind.i4
     IL_006b:  add
     IL_006c:  add
-    IL_006d:  stfld      int32 Class1::'value'
+    IL_006d:  stfld      int32 Test_test_implicit_il.Class1::'value'
     IL_0072:  ldarg.0
     IL_0073:  ldarg.1
     IL_0074:  ldc.i4.1
     IL_0075:  sub
-    IL_0076:  tail. call       instance int32 Class1::Recurse1(int32)
+    IL_0076:  tail. call       instance int32 Test_test_implicit_il.Class1::Recurse1(int32)
 ret
     IL_007b:  stloc.1
     IL_007c:  br.s       IL_007e
@@ -292,25 +294,25 @@ ret
     )
     .entrypoint
     .maxstack  3
-    .locals init (class Class1 V_0,
+    .locals init (class Test_test_implicit_il.Class1 V_0,
              int32 V_1,
              int32 V_2,
              object[] V_3)
     IL_0000:  ldstr      "Test Start"
     IL_0005:  call       void [System.Console]System.Console::WriteLine(string)
-    IL_000a:  newobj     instance void Class1::.ctor()
+    IL_000a:  newobj     instance void Test_test_implicit_il.Class1::.ctor()
     IL_000f:  stloc.0
     IL_0010:  ldloc.0
-    IL_0011:  ldsfld     int32 Class1::MaxDepth
-    IL_0016:  callvirt   instance int32 Class1::Recurse1(int32)
+    IL_0011:  ldsfld     int32 Test_test_implicit_il.Class1::MaxDepth
+    IL_0016:  callvirt   instance int32 Test_test_implicit_il.Class1::Recurse1(int32)
     IL_001b:  pop
-              ldsfld     bool Class1::s_failure
+              ldsfld     bool Test_test_implicit_il.Class1::s_failure
               brtrue.s   IL_0060
 
     IL_001c:  ldc.i4     41963520
     IL_001d:  stloc.1
     IL_001e:  ldloc.0
-    IL_001f:  ldfld      int32 Class1::'value'
+    IL_001f:  ldfld      int32 Test_test_implicit_il.Class1::'value'
     IL_0024:  ldloc.1
     IL_0025:  beq.s      IL_006e
 
@@ -333,7 +335,7 @@ ret
     IL_0047:  ldloc.3
     IL_0048:  ldc.i4.3
     IL_0049:  ldloc.0
-    IL_004a:  ldfld      int32 Class1::'value'
+    IL_004a:  ldfld      int32 Test_test_implicit_il.Class1::'value'
     IL_004f:  box        [mscorlib]System.Int32
     IL_0054:  stelem.ref
     IL_0055:  ldloc.3
@@ -360,7 +362,7 @@ ret
   {
     .maxstack  8
     IL_0000:  ldc.i4     0x2000
-    IL_0005:  stsfld     int32 Class1::MaxDepth
+    IL_0005:  stsfld     int32 Test_test_implicit_il.Class1::MaxDepth
     IL_000a:  ret
   }
 
@@ -374,3 +376,4 @@ ret
   }
 
 }
+}
diff --git a/src/tests/JIT/Methodical/tailcall_v4/delegateParamCallTarget.cs b/src/tests/JIT/Methodical/tailcall_v4/delegateParamCallTarget.cs
index f864436b7e3b7a..903261901c1223 100644
--- a/src/tests/JIT/Methodical/tailcall_v4/delegateParamCallTarget.cs
+++ b/src/tests/JIT/Methodical/tailcall_v4/delegateParamCallTarget.cs
@@ -16,10 +16,13 @@
  */
 
 using System;
+using Xunit;
 
+namespace Test_delegateParamCallTarget_cs
+{
 public delegate int DoIt(int a, int b, int c, DoIt d);
 
-internal class Repro
+public class Repro
 {
     private int DoItWrong(int a, int b, int c, DoIt d)
     {
@@ -40,10 +43,12 @@ private int Accomplice(int a, int b, int c, DoIt d)
         return d(a, b, c, d2);
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         Repro r = new Repro();
         DoIt d = r.DoItRight;
         return r.Accomplice(1, 2, 3, d);
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/tailcall_v4/delegateParamCallTarget.csproj b/src/tests/JIT/Methodical/tailcall_v4/delegateParamCallTarget.csproj
index 1f765427ef73cb..bb32e20eb3ca4a 100644
--- a/src/tests/JIT/Methodical/tailcall_v4/delegateParamCallTarget.csproj
+++ b/src/tests/JIT/Methodical/tailcall_v4/delegateParamCallTarget.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/tailcall_v4/delegateTail.il b/src/tests/JIT/Methodical/tailcall_v4/delegateTail.il
index 7984b5dff783cb..ed307fbb995b57 100644
--- a/src/tests/JIT/Methodical/tailcall_v4/delegateTail.il
+++ b/src/tests/JIT/Methodical/tailcall_v4/delegateTail.il
@@ -22,6 +22,8 @@
 
 
 
+.namespace Test_delegateTail_il
+{
 .class public auto ansi sealed beforefieldinit Closure
        extends [mscorlib]System.Object
 {
@@ -36,10 +38,10 @@
     IL_0001:  call       instance void [mscorlib]System.Object::.ctor()
     IL_0006:  ldarg.0
     IL_0007:  ldarg.1
-    IL_0008:  stfld      object[] Closure::Constants
+    IL_0008:  stfld      object[] Test_delegateTail_il.Closure::Constants
     IL_000d:  ldarg.0
     IL_000e:  ldarg.2
-    IL_000f:  stfld      object[] Closure::Locals
+    IL_000f:  stfld      object[] Test_delegateTail_il.Closure::Locals
     IL_0014:  ret
   } 
 
@@ -56,7 +58,7 @@
   {
     .maxstack  8
     IL_0000:  ldarg.0
-    IL_0001:  ldfld      object[] Closure::Constants
+    IL_0001:  ldfld      object[] Test_delegateTail_il.Closure::Constants
     IL_0006:  ldc.i4.0
     IL_0007:  ldelem.ref
     IL_0008:  castclass  string[]
@@ -76,7 +78,7 @@
   {
     .maxstack  10
     IL_0000:  ldarg.0
-    IL_0001:  ldfld      object[] Closure::Constants
+    IL_0001:  ldfld      object[] Test_delegateTail_il.Closure::Constants
     IL_0006:  ldc.i4.0
     IL_0007:  ldelem.ref
     IL_0008:  castclass  class [System.Runtime]System.Func`10<object,object,object,object,object,object,object,object,object,object>
@@ -113,10 +115,10 @@
 
 } 
 
-.class private abstract auto ansi sealed beforefieldinit Repro
+.class public abstract auto ansi sealed beforefieldinit Repro
        extends [mscorlib]System.Object
 {
-  .method private hidebysig static int32 Main() cil managed
+  .method public hidebysig static int32 Main() cil managed
   {
     .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
         01 00 00 00
@@ -144,9 +146,9 @@
     IL_0019:  stelem.ref
     IL_001a:  ldloc.2
     IL_001b:  ldnull
-    IL_001c:  newobj     instance void Closure::.ctor(object[],
+    IL_001c:  newobj     instance void Test_delegateTail_il.Closure::.ctor(object[],
                                                       object[])
-    IL_0021:  ldftn      instance object Closure::FImpl(object,
+    IL_0021:  ldftn      instance object Test_delegateTail_il.Closure::FImpl(object,
                                                         object,
                                                         object,
                                                         object,
@@ -167,9 +169,9 @@
     IL_0039:  stelem.ref
     IL_003a:  ldloc.s    V_4
     IL_003c:  ldnull
-    IL_003d:  newobj     instance void Closure::.ctor(object[],
+    IL_003d:  newobj     instance void Test_delegateTail_il.Closure::.ctor(object[],
                                                       object[])
-    IL_0042:  ldftn      instance object Closure::GImpl(int32,
+    IL_0042:  ldftn      instance object Test_delegateTail_il.Closure::GImpl(int32,
                                                         int32,
                                                         int32,
                                                         int32,
@@ -206,3 +208,4 @@ ldc.i4 100
   } 
 
 } 
+}
diff --git a/src/tests/JIT/Methodical/tailcall_v4/delegateTail.ilproj b/src/tests/JIT/Methodical/tailcall_v4/delegateTail.ilproj
index 95665668977210..44c2d1e6fab81d 100644
--- a/src/tests/JIT/Methodical/tailcall_v4/delegateTail.ilproj
+++ b/src/tests/JIT/Methodical/tailcall_v4/delegateTail.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/tailcall_v4/hijacking.il b/src/tests/JIT/Methodical/tailcall_v4/hijacking.il
index ad5b18aa264b74..f5b4b04737e1ee 100644
--- a/src/tests/JIT/Methodical/tailcall_v4/hijacking.il
+++ b/src/tests/JIT/Methodical/tailcall_v4/hijacking.il
@@ -46,15 +46,17 @@
 
 // =============== CLASS MEMBERS DECLARATION ===================
 
+.namespace Test_hijacking_il
+{
 .class private sequential ansi sealed beforefieldinit ForceHelper
        extends [System.Runtime]System.ValueType
 {
-  .field public valuetype ForceHelper* me1
-  .field public valuetype ForceHelper* me2
+  .field public valuetype Test_hijacking_il.ForceHelper* me1
+  .field public valuetype Test_hijacking_il.ForceHelper* me2
   .field public int64 counter
-} // end of class ForceHelper
+} // end of class Test_hijacking_il.ForceHelper
 
-.class private auto ansi beforefieldinit Repro
+.class public auto ansi beforefieldinit Repro
        extends [System.Runtime]System.Object
 {
   .field private bool modreq([System.Runtime]System.Runtime.CompilerServices.IsVolatile) stop
@@ -62,26 +64,26 @@
   .field private int64 counts
   .field private int64 gc
   .method private hidebysig instance void 
-          TailHelper1(valuetype ForceHelper h) cil managed
+          TailHelper1(valuetype Test_hijacking_il.ForceHelper h) cil managed
   {
     // Code size       123 (0x7b)
     .maxstack  3
     IL_0000:  ldarga.s   h
     IL_0002:  dup
-    IL_0003:  ldfld      int64 ForceHelper::counter
+    IL_0003:  ldfld      int64 Test_hijacking_il.ForceHelper::counter
     IL_0008:  ldc.i4.1
     IL_0009:  conv.i8
     IL_000a:  add
-    IL_000b:  stfld      int64 ForceHelper::counter
+    IL_000b:  stfld      int64 Test_hijacking_il.ForceHelper::counter
     IL_0010:  ldarg.0
     IL_0011:  volatile.
-    IL_0013:  ldfld      bool modreq([System.Runtime]System.Runtime.CompilerServices.IsVolatile) Repro::stop
+    IL_0013:  ldfld      bool modreq([System.Runtime]System.Runtime.CompilerServices.IsVolatile) Test_hijacking_il.Repro::stop
     IL_0018:  brfalse.s  IL_002e
 
     IL_001a:  ldarg.0
-    IL_001b:  ldflda     int64 Repro::counts
+    IL_001b:  ldflda     int64 Test_hijacking_il.Repro::counts
     IL_0020:  ldarga.s   h
-    IL_0022:  ldfld      int64 ForceHelper::counter
+    IL_0022:  ldfld      int64 Test_hijacking_il.ForceHelper::counter
     IL_0027:  call       int64 [System.Threading]System.Threading.Interlocked::Add(int64&,
                                                                            int64)
     IL_002c:  pop
@@ -90,26 +92,26 @@
     IL_002e:  ldarga.s   h
     IL_0030:  conv.u
     IL_0031:  ldarga.s   h
-    IL_0033:  ldfld      valuetype ForceHelper* ForceHelper::me1
+    IL_0033:  ldfld      valuetype Test_hijacking_il.ForceHelper* Test_hijacking_il.ForceHelper::me1
     IL_0038:  beq.s      IL_0073
 
     IL_003a:  ldarga.s   h
-    IL_003c:  ldfld      int64 ForceHelper::counter
+    IL_003c:  ldfld      int64 Test_hijacking_il.ForceHelper::counter
     IL_0041:  ldc.i4.3
     IL_0042:  conv.i8
     IL_0043:  ble.s      IL_0069
 
     IL_0045:  ldarg.0
     IL_0046:  ldc.i4.1
-    IL_0047:  stfld      bool Repro::failed
+    IL_0047:  stfld      bool Test_hijacking_il.Repro::failed
     IL_004c:  ldarg.0
     IL_004d:  ldc.i4.1
     IL_004e:  volatile.
-    IL_0050:  stfld      bool modreq([System.Runtime]System.Runtime.CompilerServices.IsVolatile) Repro::stop
+    IL_0050:  stfld      bool modreq([System.Runtime]System.Runtime.CompilerServices.IsVolatile) Test_hijacking_il.Repro::stop
     IL_0055:  ldarg.0
-    IL_0056:  ldflda     int64 Repro::counts
+    IL_0056:  ldflda     int64 Test_hijacking_il.Repro::counts
     IL_005b:  ldarga.s   h
-    IL_005d:  ldfld      int64 ForceHelper::counter
+    IL_005d:  ldfld      int64 Test_hijacking_il.ForceHelper::counter
     IL_0062:  call       int64 [System.Threading]System.Threading.Interlocked::Add(int64&,
                                                                            int64)
     IL_0067:  pop
@@ -118,35 +120,35 @@
     IL_0069:  ldarga.s   h
     IL_006b:  ldarga.s   h
     IL_006d:  conv.u
-    IL_006e:  stfld      valuetype ForceHelper* ForceHelper::me1
+    IL_006e:  stfld      valuetype Test_hijacking_il.ForceHelper* Test_hijacking_il.ForceHelper::me1
     IL_0073:  ldarg.0
     IL_0074:  ldarg.1
     IL_0075:  ldarg.1
-    IL_0076:  tail. call       instance void Repro::TailHelper2(valuetype ForceHelper, valuetype ForceHelper)
+    IL_0076:  tail. call       instance void Test_hijacking_il.Repro::TailHelper2(valuetype Test_hijacking_il.ForceHelper, valuetype Test_hijacking_il.ForceHelper)
     IL_007b:  ret
-  } // end of method Repro::TailHelper1
+  } // end of method Test_hijacking_il.Repro::TailHelper1
 
   .method private hidebysig instance void 
-          TailHelper2(valuetype ForceHelper h, valuetype ForceHelper h2) cil managed
+          TailHelper2(valuetype Test_hijacking_il.ForceHelper h, valuetype Test_hijacking_il.ForceHelper h2) cil managed
   {
     // Code size       123 (0x7b)
     .maxstack  3
     IL_0000:  ldarga.s   h
     IL_0002:  dup
-    IL_0003:  ldfld      int64 ForceHelper::counter
+    IL_0003:  ldfld      int64 Test_hijacking_il.ForceHelper::counter
     IL_0008:  ldc.i4.1
     IL_0009:  conv.i8
     IL_000a:  add
-    IL_000b:  stfld      int64 ForceHelper::counter
+    IL_000b:  stfld      int64 Test_hijacking_il.ForceHelper::counter
     IL_0010:  ldarg.0
     IL_0011:  volatile.
-    IL_0013:  ldfld      bool modreq([System.Runtime]System.Runtime.CompilerServices.IsVolatile) Repro::stop
+    IL_0013:  ldfld      bool modreq([System.Runtime]System.Runtime.CompilerServices.IsVolatile) Test_hijacking_il.Repro::stop
     IL_0018:  brfalse.s  IL_002e
 
     IL_001a:  ldarg.0
-    IL_001b:  ldflda     int64 Repro::counts
+    IL_001b:  ldflda     int64 Test_hijacking_il.Repro::counts
     IL_0020:  ldarga.s   h
-    IL_0022:  ldfld      int64 ForceHelper::counter
+    IL_0022:  ldfld      int64 Test_hijacking_il.ForceHelper::counter
     IL_0027:  call       int64 [System.Threading]System.Threading.Interlocked::Add(int64&,
                                                                            int64)
     IL_002c:  pop
@@ -155,26 +157,26 @@
     IL_002e:  ldarga.s   h
     IL_0030:  conv.u
     IL_0031:  ldarga.s   h
-    IL_0033:  ldfld      valuetype ForceHelper* ForceHelper::me2
+    IL_0033:  ldfld      valuetype Test_hijacking_il.ForceHelper* Test_hijacking_il.ForceHelper::me2
     IL_0038:  beq.s      IL_0073
 
     IL_003a:  ldarga.s   h
-    IL_003c:  ldfld      int64 ForceHelper::counter
+    IL_003c:  ldfld      int64 Test_hijacking_il.ForceHelper::counter
     IL_0041:  ldc.i4.3
     IL_0042:  conv.i8
     IL_0043:  ble.s      IL_0069
 
     IL_0045:  ldarg.0
     IL_0046:  ldc.i4.1
-    IL_0047:  stfld      bool Repro::failed
+    IL_0047:  stfld      bool Test_hijacking_il.Repro::failed
     IL_004c:  ldarg.0
     IL_004d:  ldc.i4.1
     IL_004e:  volatile.
-    IL_0050:  stfld      bool modreq([System.Runtime]System.Runtime.CompilerServices.IsVolatile) Repro::stop
+    IL_0050:  stfld      bool modreq([System.Runtime]System.Runtime.CompilerServices.IsVolatile) Test_hijacking_il.Repro::stop
     IL_0055:  ldarg.0
-    IL_0056:  ldflda     int64 Repro::counts
+    IL_0056:  ldflda     int64 Test_hijacking_il.Repro::counts
     IL_005b:  ldarga.s   h
-    IL_005d:  ldfld      int64 ForceHelper::counter
+    IL_005d:  ldfld      int64 Test_hijacking_il.ForceHelper::counter
     IL_0062:  call       int64 [System.Threading]System.Threading.Interlocked::Add(int64&,
                                                                            int64)
     IL_0067:  pop
@@ -183,26 +185,26 @@
     IL_0069:  ldarga.s   h
     IL_006b:  ldarga.s   h
     IL_006d:  conv.u
-    IL_006e:  stfld      valuetype ForceHelper* ForceHelper::me2
+    IL_006e:  stfld      valuetype Test_hijacking_il.ForceHelper* Test_hijacking_il.ForceHelper::me2
     IL_0073:  ldarg.0
     IL_0074:  ldarg.1
-    IL_0075:  tail. call       instance void Repro::TailHelper1(valuetype ForceHelper)
+    IL_0075:  tail. call       instance void Test_hijacking_il.Repro::TailHelper1(valuetype Test_hijacking_il.ForceHelper)
     IL_007a:  ret
-  } // end of method Repro::TailHelper2
+  } // end of method Test_hijacking_il.Repro::TailHelper2
 
   .method private hidebysig instance void 
           TailCallThread() cil managed
   {
     // Code size       16 (0x10)
     .maxstack  2
-    .locals init (valuetype ForceHelper V_0)
+    .locals init (valuetype Test_hijacking_il.ForceHelper V_0)
     IL_0000:  ldloca.s   V_0
-    IL_0002:  initobj    ForceHelper
+    IL_0002:  initobj    Test_hijacking_il.ForceHelper
     IL_0008:  ldarg.0
     IL_0009:  ldloc.0
-    IL_000a:  tail. call       instance void Repro::TailHelper1(valuetype ForceHelper)
+    IL_000a:  tail. call       instance void Test_hijacking_il.Repro::TailHelper1(valuetype Test_hijacking_il.ForceHelper)
     IL_000f:  ret
-  } // end of method Repro::TailCallThread
+  } // end of method Test_hijacking_il.Repro::TailCallThread
 
   .method private hidebysig instance void 
           Collector() cil managed
@@ -214,22 +216,22 @@
     IL_0002:  call       void [System.Runtime]System.GC::Collect()
     IL_0007:  ldarg.0
     IL_0008:  dup
-    IL_0009:  ldfld      int64 Repro::gc
+    IL_0009:  ldfld      int64 Test_hijacking_il.Repro::gc
     IL_000e:  ldc.i4.1
     IL_000f:  conv.i8
     IL_0010:  add
-    IL_0011:  stfld      int64 Repro::gc
+    IL_0011:  stfld      int64 Test_hijacking_il.Repro::gc
               ldc.i4.1
               call       void [System.Threading.Thread]System.Threading.Thread::Sleep(int32)
     IL_0016:  ldarg.0
     IL_0017:  volatile.
-    IL_0019:  ldfld      bool modreq([System.Runtime]System.Runtime.CompilerServices.IsVolatile) Repro::stop
+    IL_0019:  ldfld      bool modreq([System.Runtime]System.Runtime.CompilerServices.IsVolatile) Test_hijacking_il.Repro::stop
     IL_001e:  brfalse.s  IL_0002
 
     IL_0020:  ret
-  } // end of method Repro::Collector
+  } // end of method Test_hijacking_il.Repro::Collector
 
-  .method private hidebysig static int32 
+  .method public hidebysig static int32 
           Main() cil managed
   {
     .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -238,7 +240,7 @@
     .entrypoint
     // Code size       300 (0x12c)
     .maxstack  5
-    .locals init (class Repro V_0,
+    .locals init (class Test_hijacking_il.Repro V_0,
              class [System.Threading.Thread]System.Threading.Thread[] V_1,
              class [System.Threading.Thread]System.Threading.Thread V_2,
              int32 V_3,
@@ -248,7 +250,7 @@
              int32 V_7,
              class [System.Threading.Thread]System.Threading.Thread[] V_8,
              int32 V_9)
-    IL_0000:  newobj     instance void Repro::.ctor()
+    IL_0000:  newobj     instance void Test_hijacking_il.Repro::.ctor()
     IL_0005:  stloc.0
     IL_0006:  ldc.i4.2
     IL_0007:  newarr     [System.Threading.Thread]System.Threading.Thread
@@ -256,7 +258,7 @@
     IL_000e:  ldloc.s    V_5
     IL_0010:  ldc.i4.0
     IL_0011:  ldloc.0
-    IL_0012:  ldftn      instance void Repro::Collector()
+    IL_0012:  ldftn      instance void Test_hijacking_il.Repro::Collector()
     IL_0018:  newobj     instance void [System.Threading.Thread]System.Threading.ThreadStart::.ctor(object,
                                                                                      native int)
     IL_001d:  newobj     instance void [System.Threading.Thread]System.Threading.Thread::.ctor(class [System.Threading.Thread]System.Threading.ThreadStart)
@@ -264,7 +266,7 @@
     IL_0023:  ldloc.s    V_5
     IL_0025:  ldc.i4.1
     IL_0026:  ldloc.0
-    IL_0027:  ldftn      instance void Repro::TailCallThread()
+    IL_0027:  ldftn      instance void Test_hijacking_il.Repro::TailCallThread()
     IL_002d:  newobj     instance void [System.Threading.Thread]System.Threading.ThreadStart::.ctor(object,
                                                                                      native int)
     IL_0032:  newobj     instance void [System.Threading.Thread]System.Threading.Thread::.ctor(class [System.Threading.Thread]System.Threading.ThreadStart)
@@ -301,7 +303,7 @@
     IL_0090:  call       void [System.Threading.Thread]System.Threading.Thread::Sleep(int32)
     IL_0095:  ldloc.0
     IL_0096:  volatile.
-    IL_0098:  ldfld      bool modreq([System.Runtime]System.Runtime.CompilerServices.IsVolatile) Repro::stop
+    IL_0098:  ldfld      bool modreq([System.Runtime]System.Runtime.CompilerServices.IsVolatile) Test_hijacking_il.Repro::stop
     IL_009d:  brtrue.s   IL_00a8
 
     IL_009f:  ldloc.3
@@ -315,7 +317,7 @@
     IL_00a8:  ldloc.0
     IL_00a9:  ldc.i4.1
     IL_00aa:  volatile.
-    IL_00ac:  stfld      bool modreq([System.Runtime]System.Runtime.CompilerServices.IsVolatile) Repro::stop
+    IL_00ac:  stfld      bool modreq([System.Runtime]System.Runtime.CompilerServices.IsVolatile) Test_hijacking_il.Repro::stop
     IL_00b1:  ldloc.1
     IL_00b2:  stloc.s    V_8
     IL_00b4:  ldc.i4.0
@@ -340,17 +342,17 @@
 
     IL_00d5:  ldstr      "Executed {0} GCs"
     IL_00da:  ldloc.0
-    IL_00db:  ldfld      int64 Repro::gc
+    IL_00db:  ldfld      int64 Test_hijacking_il.Repro::gc
     IL_00e0:  box        [System.Runtime]System.Int64
     IL_00e5:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
     IL_00ea:  ldloc.0
-    IL_00eb:  ldfld      bool Repro::failed
+    IL_00eb:  ldfld      bool Test_hijacking_il.Repro::failed
     IL_00f0:  brfalse.s  IL_010a
 
     IL_00f2:  ldstr      "Executed {0} tail calls before failing"
     IL_00f7:  ldloc.0
-    IL_00f8:  ldfld      int64 Repro::counts
+    IL_00f8:  ldfld      int64 Test_hijacking_il.Repro::counts
     IL_00fd:  box        [System.Runtime]System.Int64
     IL_0102:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
@@ -359,7 +361,7 @@
 
     IL_010a:  ldstr      "Executed {0} tail calls"
     IL_010f:  ldloc.0
-    IL_0110:  ldfld      int64 Repro::counts
+    IL_0110:  ldfld      int64 Test_hijacking_il.Repro::counts
     IL_0115:  box        [System.Runtime]System.Int64
     IL_011a:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
@@ -367,7 +369,7 @@
     IL_0124:  call       void [System.Console]System.Console::WriteLine(string)
     IL_0129:  ldc.i4.s   100
     IL_012b:  ret
-  } // end of method Repro::Main
+  } // end of method Test_hijacking_il.Repro::Main
 
   .method public hidebysig specialname rtspecialname 
           instance void  .ctor() cil managed
@@ -377,12 +379,13 @@
     IL_0000:  ldarg.0
     IL_0001:  call       instance void [System.Runtime]System.Object::.ctor()
     IL_0006:  ret
-  } // end of method Repro::.ctor
+  } // end of method Test_hijacking_il.Repro::.ctor
 
-} // end of class Repro
+} // end of class Test_hijacking_il.Repro
 
 
 // =============================================================
 
 // *********** DISASSEMBLY COMPLETE ***********************
 // WARNING: Created Win32 resource file hijacking.res
+}
diff --git a/src/tests/JIT/Methodical/tailcall_v4/hijacking.ilproj b/src/tests/JIT/Methodical/tailcall_v4/hijacking.ilproj
index 64efa456331e19..a84fe6bfd8ce13 100644
--- a/src/tests/JIT/Methodical/tailcall_v4/hijacking.ilproj
+++ b/src/tests/JIT/Methodical/tailcall_v4/hijacking.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <GCStressIncompatible Condition="'$(TargetArchitecture)' == 'x86'">true</GCStressIncompatible>
     <!-- Issue https://github.com/dotnet/runtime/issues/50381 -->
     <GCStressIncompatible Condition="'$(TargetArchitecture)' == 'arm64' and '$(TargetOS)' == 'OSX'">true</GCStressIncompatible>
diff --git a/src/tests/JIT/Methodical/tailcall_v4/smallFrame.il b/src/tests/JIT/Methodical/tailcall_v4/smallFrame.il
index a0ad0eec6ae2e3..2d82accd25f74c 100644
--- a/src/tests/JIT/Methodical/tailcall_v4/smallFrame.il
+++ b/src/tests/JIT/Methodical/tailcall_v4/smallFrame.il
@@ -48,7 +48,7 @@
   .field public uint64 l2
 } // end of class RetBuff
 
-.class private abstract auto ansi sealed beforefieldinit RetBufferBug
+.class public abstract auto ansi sealed beforefieldinit RetBufferBug
        extends [mscorlib]System.Object
 {
   .field private static int32 s_i
@@ -59,7 +59,7 @@
   .field private static int32 s_n
   .field private static int32 s_o
   .field private static int32 s_p
-  .method private hidebysig static int32 
+  .method public hidebysig static int32 
           Main() cil managed
   {
     .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
diff --git a/src/tests/JIT/Methodical/tailcall_v4/smallFrame.ilproj b/src/tests/JIT/Methodical/tailcall_v4/smallFrame.ilproj
index 4ea65d59c86e24..6c7d039964fb6d 100644
--- a/src/tests/JIT/Methodical/tailcall_v4/smallFrame.ilproj
+++ b/src/tests/JIT/Methodical/tailcall_v4/smallFrame.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/unsafecsharp/unsafe-0.cs b/src/tests/JIT/Methodical/unsafecsharp/unsafe-0.cs
index fda99224f4a137..ca9247909434fd 100644
--- a/src/tests/JIT/Methodical/unsafecsharp/unsafe-0.cs
+++ b/src/tests/JIT/Methodical/unsafecsharp/unsafe-0.cs
@@ -3,8 +3,11 @@
 
 using System;
 using UnsafeCSharp;
+using Xunit;
 
-internal class TestApp
+namespace Test_unsafe_0
+{
+public class TestApp
 {
     private static unsafe long test_7(B[] ab)
     {
@@ -271,7 +274,8 @@ private static unsafe long test_392(B* pb1, B* pb2)
         long[] e = { 100, 101 };
         return e[pb1 >= pb2 ? 0 : 1];
     }
-    private static unsafe int Main()
+    [Fact]
+    public static unsafe int TestEntryPoint()
     {
         AA loc_x = new AA(0, 100);
         AA.init_all(0);
@@ -670,3 +674,4 @@ private static unsafe int Main()
         return 100;
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/unsafecsharp/unsafe-0_d.csproj b/src/tests/JIT/Methodical/unsafecsharp/unsafe-0_d.csproj
index a72ad2c0e63357..1719cfcfc59fa5 100644
--- a/src/tests/JIT/Methodical/unsafecsharp/unsafe-0_d.csproj
+++ b/src/tests/JIT/Methodical/unsafecsharp/unsafe-0_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/unsafecsharp/unsafe-0_do.csproj b/src/tests/JIT/Methodical/unsafecsharp/unsafe-0_do.csproj
index 17f64365dccf12..a412e3ed8249d2 100644
--- a/src/tests/JIT/Methodical/unsafecsharp/unsafe-0_do.csproj
+++ b/src/tests/JIT/Methodical/unsafecsharp/unsafe-0_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/unsafecsharp/unsafe-0_r.csproj b/src/tests/JIT/Methodical/unsafecsharp/unsafe-0_r.csproj
index f2df0c7b0468fe..2fe91124b22a38 100644
--- a/src/tests/JIT/Methodical/unsafecsharp/unsafe-0_r.csproj
+++ b/src/tests/JIT/Methodical/unsafecsharp/unsafe-0_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/unsafecsharp/unsafe-0_ro.csproj b/src/tests/JIT/Methodical/unsafecsharp/unsafe-0_ro.csproj
index 14506fdd38ac51..3302474bc91ff3 100644
--- a/src/tests/JIT/Methodical/unsafecsharp/unsafe-0_ro.csproj
+++ b/src/tests/JIT/Methodical/unsafecsharp/unsafe-0_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/unsafecsharp/unsafe-1.cs b/src/tests/JIT/Methodical/unsafecsharp/unsafe-1.cs
index f6d1aad196d55d..a592ee8ec62c78 100644
--- a/src/tests/JIT/Methodical/unsafecsharp/unsafe-1.cs
+++ b/src/tests/JIT/Methodical/unsafecsharp/unsafe-1.cs
@@ -3,8 +3,11 @@
 
 using System;
 using UnsafeCSharp;
+using Xunit;
 
-internal class TestApp
+namespace Test_unsafe_1
+{
+public class TestApp
 {
     private static unsafe long test_1(B* pb)
     {
@@ -274,7 +277,8 @@ private static unsafe long test_393(B* pb)
     {
         return pb + 1 > pb ? 100 : 101;
     }
-    private static unsafe int Main()
+    [Fact]
+    public static unsafe int TestEntryPoint()
     {
         AA loc_x = new AA(0, 100);
         AA.init_all(0);
@@ -680,3 +684,4 @@ private static unsafe int Main()
         return 100;
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/unsafecsharp/unsafe-1_d.csproj b/src/tests/JIT/Methodical/unsafecsharp/unsafe-1_d.csproj
index 31e66736412b8b..b4613009dc6db1 100644
--- a/src/tests/JIT/Methodical/unsafecsharp/unsafe-1_d.csproj
+++ b/src/tests/JIT/Methodical/unsafecsharp/unsafe-1_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/unsafecsharp/unsafe-1_do.csproj b/src/tests/JIT/Methodical/unsafecsharp/unsafe-1_do.csproj
index ac6401fbe8419e..96c38e5903e56f 100644
--- a/src/tests/JIT/Methodical/unsafecsharp/unsafe-1_do.csproj
+++ b/src/tests/JIT/Methodical/unsafecsharp/unsafe-1_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/unsafecsharp/unsafe-1_r.csproj b/src/tests/JIT/Methodical/unsafecsharp/unsafe-1_r.csproj
index 1ffa2ed19de4d5..ad988d6ff70900 100644
--- a/src/tests/JIT/Methodical/unsafecsharp/unsafe-1_r.csproj
+++ b/src/tests/JIT/Methodical/unsafecsharp/unsafe-1_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/unsafecsharp/unsafe-1_ro.csproj b/src/tests/JIT/Methodical/unsafecsharp/unsafe-1_ro.csproj
index 4f2bb36aa76971..91c3a48f7ffd56 100644
--- a/src/tests/JIT/Methodical/unsafecsharp/unsafe-1_ro.csproj
+++ b/src/tests/JIT/Methodical/unsafecsharp/unsafe-1_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/unsafecsharp/unsafe-2.cs b/src/tests/JIT/Methodical/unsafecsharp/unsafe-2.cs
index 649b1a50f9dc39..0343874b7cc4a1 100644
--- a/src/tests/JIT/Methodical/unsafecsharp/unsafe-2.cs
+++ b/src/tests/JIT/Methodical/unsafecsharp/unsafe-2.cs
@@ -3,8 +3,11 @@
 
 using System;
 using UnsafeCSharp;
+using Xunit;
 
-internal class TestApp
+namespace Test_unsafe_2
+{
+public class TestApp
 {
     private static unsafe long test_2(B* pb)
     {
@@ -276,7 +279,8 @@ private static unsafe long test_394(B* pb1, B* pb2)
     {
         return pb1 >= pb2 ? 100 : 101;
     }
-    private static unsafe int Main()
+    [Fact]
+    public static unsafe int TestEntryPoint()
     {
         AA loc_x = new AA(0, 100);
         AA.init_all(0);
@@ -682,3 +686,4 @@ private static unsafe int Main()
         return 100;
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/unsafecsharp/unsafe-2_d.csproj b/src/tests/JIT/Methodical/unsafecsharp/unsafe-2_d.csproj
index 815574b697c304..f61a840ad967f8 100644
--- a/src/tests/JIT/Methodical/unsafecsharp/unsafe-2_d.csproj
+++ b/src/tests/JIT/Methodical/unsafecsharp/unsafe-2_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/unsafecsharp/unsafe-2_do.csproj b/src/tests/JIT/Methodical/unsafecsharp/unsafe-2_do.csproj
index 5b678e94a873ea..b11ec156eb4a40 100644
--- a/src/tests/JIT/Methodical/unsafecsharp/unsafe-2_do.csproj
+++ b/src/tests/JIT/Methodical/unsafecsharp/unsafe-2_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/unsafecsharp/unsafe-2_r.csproj b/src/tests/JIT/Methodical/unsafecsharp/unsafe-2_r.csproj
index 798dfc3f4118ff..175b2c51bca3e4 100644
--- a/src/tests/JIT/Methodical/unsafecsharp/unsafe-2_r.csproj
+++ b/src/tests/JIT/Methodical/unsafecsharp/unsafe-2_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/unsafecsharp/unsafe-2_ro.csproj b/src/tests/JIT/Methodical/unsafecsharp/unsafe-2_ro.csproj
index c25b54d84b581e..b12dd2b73089c3 100644
--- a/src/tests/JIT/Methodical/unsafecsharp/unsafe-2_ro.csproj
+++ b/src/tests/JIT/Methodical/unsafecsharp/unsafe-2_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/unsafecsharp/unsafe-3.cs b/src/tests/JIT/Methodical/unsafecsharp/unsafe-3.cs
index 09d3c592d21606..b4ee43618ab41b 100644
--- a/src/tests/JIT/Methodical/unsafecsharp/unsafe-3.cs
+++ b/src/tests/JIT/Methodical/unsafecsharp/unsafe-3.cs
@@ -3,8 +3,11 @@
 
 using System;
 using UnsafeCSharp;
+using Xunit;
 
-internal class TestApp
+namespace Test_unsafe_3
+{
+public class TestApp
 {
     private static unsafe long test_3(B* pb)
     {
@@ -279,7 +282,8 @@ private static unsafe long test_395(B* pb)
         if (pb + 1 > pb) return 100;
         throw new Exception();
     }
-    private static unsafe int Main()
+    [Fact]
+    public static unsafe int TestEntryPoint()
     {
         AA loc_x = new AA(0, 100);
         AA.init_all(0);
@@ -685,3 +689,4 @@ private static unsafe int Main()
         return 100;
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/unsafecsharp/unsafe-3_d.csproj b/src/tests/JIT/Methodical/unsafecsharp/unsafe-3_d.csproj
index ac9449ac40bdd6..1834eb69ed2ce2 100644
--- a/src/tests/JIT/Methodical/unsafecsharp/unsafe-3_d.csproj
+++ b/src/tests/JIT/Methodical/unsafecsharp/unsafe-3_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/unsafecsharp/unsafe-3_do.csproj b/src/tests/JIT/Methodical/unsafecsharp/unsafe-3_do.csproj
index c42d6f0c4d99f9..d7686552989797 100644
--- a/src/tests/JIT/Methodical/unsafecsharp/unsafe-3_do.csproj
+++ b/src/tests/JIT/Methodical/unsafecsharp/unsafe-3_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/unsafecsharp/unsafe-3_r.csproj b/src/tests/JIT/Methodical/unsafecsharp/unsafe-3_r.csproj
index 901aad276dceda..ce20d09ef7725a 100644
--- a/src/tests/JIT/Methodical/unsafecsharp/unsafe-3_r.csproj
+++ b/src/tests/JIT/Methodical/unsafecsharp/unsafe-3_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/unsafecsharp/unsafe-3_ro.csproj b/src/tests/JIT/Methodical/unsafecsharp/unsafe-3_ro.csproj
index 6a63088e8a912e..9885884b89bd2c 100644
--- a/src/tests/JIT/Methodical/unsafecsharp/unsafe-3_ro.csproj
+++ b/src/tests/JIT/Methodical/unsafecsharp/unsafe-3_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/Methodical/unsafecsharp/unsafe-4.cs b/src/tests/JIT/Methodical/unsafecsharp/unsafe-4.cs
index b2618489a4a4e3..3cb1e9a76749e7 100644
--- a/src/tests/JIT/Methodical/unsafecsharp/unsafe-4.cs
+++ b/src/tests/JIT/Methodical/unsafecsharp/unsafe-4.cs
@@ -3,8 +3,11 @@
 
 using System;
 using UnsafeCSharp;
+using Xunit;
 
-internal class TestApp
+namespace Test_unsafe_4
+{
+public class TestApp
 {
     private static unsafe long test_4()
     {
@@ -277,7 +280,8 @@ private static unsafe long test_396(B* pb1, B* pb2)
         if (pb1 >= pb2) return 100;
         throw new Exception();
     }
-    private static unsafe int Main()
+    [Fact]
+    public static unsafe int TestEntryPoint()
     {
         AA loc_x = new AA(0, 100);
         AA.init_all(0);
@@ -683,3 +687,4 @@ private static unsafe int Main()
         return 100;
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/unsafecsharp/unsafe-4_d.csproj b/src/tests/JIT/Methodical/unsafecsharp/unsafe-4_d.csproj
index bf2feaff0a7e5b..b7b994adf533c2 100644
--- a/src/tests/JIT/Methodical/unsafecsharp/unsafe-4_d.csproj
+++ b/src/tests/JIT/Methodical/unsafecsharp/unsafe-4_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/unsafecsharp/unsafe-4_do.csproj b/src/tests/JIT/Methodical/unsafecsharp/unsafe-4_do.csproj
index 3359ad3b4a6d84..c8a92b3bb37145 100644
--- a/src/tests/JIT/Methodical/unsafecsharp/unsafe-4_do.csproj
+++ b/src/tests/JIT/Methodical/unsafecsharp/unsafe-4_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/unsafecsharp/unsafe-4_r.csproj b/src/tests/JIT/Methodical/unsafecsharp/unsafe-4_r.csproj
index 47c75389fc01ec..1abae9f643ab3c 100644
--- a/src/tests/JIT/Methodical/unsafecsharp/unsafe-4_r.csproj
+++ b/src/tests/JIT/Methodical/unsafecsharp/unsafe-4_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/unsafecsharp/unsafe-4_ro.csproj b/src/tests/JIT/Methodical/unsafecsharp/unsafe-4_ro.csproj
index 2d50950fa1040c..be9bd77feb58fb 100644
--- a/src/tests/JIT/Methodical/unsafecsharp/unsafe-4_ro.csproj
+++ b/src/tests/JIT/Methodical/unsafecsharp/unsafe-4_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/unsafecsharp/unsafe-5.cs b/src/tests/JIT/Methodical/unsafecsharp/unsafe-5.cs
index 8a34da8dd55487..0ae9c80addf2f7 100644
--- a/src/tests/JIT/Methodical/unsafecsharp/unsafe-5.cs
+++ b/src/tests/JIT/Methodical/unsafecsharp/unsafe-5.cs
@@ -3,8 +3,11 @@
 
 using System;
 using UnsafeCSharp;
+using Xunit;
 
-internal class TestApp
+namespace Test_unsafe_5
+{
+public class TestApp
 {
     private static unsafe long test_5(B b)
     {
@@ -270,7 +273,8 @@ private static unsafe long test_390(long p, long s)
     {
         return AA.get_bv1(((B*)((p >> 4) | s))) != 100 ? 99 : 100;
     }
-    private static unsafe int Main()
+    [Fact]
+    public static unsafe int TestEntryPoint()
     {
         AA loc_x = new AA(0, 100);
         AA.init_all(0);
@@ -669,3 +673,4 @@ private static unsafe int Main()
         return 100;
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/unsafecsharp/unsafe-5_d.csproj b/src/tests/JIT/Methodical/unsafecsharp/unsafe-5_d.csproj
index 52381dfa8d38a9..9ab6c221654014 100644
--- a/src/tests/JIT/Methodical/unsafecsharp/unsafe-5_d.csproj
+++ b/src/tests/JIT/Methodical/unsafecsharp/unsafe-5_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/unsafecsharp/unsafe-5_do.csproj b/src/tests/JIT/Methodical/unsafecsharp/unsafe-5_do.csproj
index 997917bca9abed..e5bd6952ffaaa6 100644
--- a/src/tests/JIT/Methodical/unsafecsharp/unsafe-5_do.csproj
+++ b/src/tests/JIT/Methodical/unsafecsharp/unsafe-5_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/unsafecsharp/unsafe-5_r.csproj b/src/tests/JIT/Methodical/unsafecsharp/unsafe-5_r.csproj
index 8388592a18a5dc..937f34feec88c8 100644
--- a/src/tests/JIT/Methodical/unsafecsharp/unsafe-5_r.csproj
+++ b/src/tests/JIT/Methodical/unsafecsharp/unsafe-5_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/unsafecsharp/unsafe-5_ro.csproj b/src/tests/JIT/Methodical/unsafecsharp/unsafe-5_ro.csproj
index 7fead64192f8ec..e9563d26855fa5 100644
--- a/src/tests/JIT/Methodical/unsafecsharp/unsafe-5_ro.csproj
+++ b/src/tests/JIT/Methodical/unsafecsharp/unsafe-5_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/unsafecsharp/unsafe-6.cs b/src/tests/JIT/Methodical/unsafecsharp/unsafe-6.cs
index 53aed39d972f62..11e777a16de4b0 100644
--- a/src/tests/JIT/Methodical/unsafecsharp/unsafe-6.cs
+++ b/src/tests/JIT/Methodical/unsafecsharp/unsafe-6.cs
@@ -3,8 +3,11 @@
 
 using System;
 using UnsafeCSharp;
+using Xunit;
 
-internal class TestApp
+namespace Test_unsafe_6
+{
+public class TestApp
 {
     private static unsafe long test_6(ref B b)
     {
@@ -273,7 +276,8 @@ private static unsafe long test_391(B* pb)
         long[] e = { 100, 101 };
         return e[pb + 1 > pb ? 0 : 1];
     }
-    private static unsafe int Main()
+    [Fact]
+    public static unsafe int TestEntryPoint()
     {
         AA loc_x = new AA(0, 100);
         AA.init_all(0);
@@ -672,3 +676,4 @@ private static unsafe int Main()
         return 100;
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/unsafecsharp/unsafe-6_d.csproj b/src/tests/JIT/Methodical/unsafecsharp/unsafe-6_d.csproj
index 35f2fcf7680acd..f3f03daa0c9979 100644
--- a/src/tests/JIT/Methodical/unsafecsharp/unsafe-6_d.csproj
+++ b/src/tests/JIT/Methodical/unsafecsharp/unsafe-6_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/unsafecsharp/unsafe-6_do.csproj b/src/tests/JIT/Methodical/unsafecsharp/unsafe-6_do.csproj
index dea7d03596e188..1c4edc05859a1f 100644
--- a/src/tests/JIT/Methodical/unsafecsharp/unsafe-6_do.csproj
+++ b/src/tests/JIT/Methodical/unsafecsharp/unsafe-6_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/unsafecsharp/unsafe-6_r.csproj b/src/tests/JIT/Methodical/unsafecsharp/unsafe-6_r.csproj
index 778a2687bc9ab5..12bff34d57ff66 100644
--- a/src/tests/JIT/Methodical/unsafecsharp/unsafe-6_r.csproj
+++ b/src/tests/JIT/Methodical/unsafecsharp/unsafe-6_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/unsafecsharp/unsafe-6_ro.csproj b/src/tests/JIT/Methodical/unsafecsharp/unsafe-6_ro.csproj
index 9da7019502f231..d72331dd6a59c6 100644
--- a/src/tests/JIT/Methodical/unsafecsharp/unsafe-6_ro.csproj
+++ b/src/tests/JIT/Methodical/unsafecsharp/unsafe-6_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/xxblk/cpblk3.il b/src/tests/JIT/Methodical/xxblk/cpblk3.il
index 8f6255949fdb64..caa62abeb0e124 100644
--- a/src/tests/JIT/Methodical/xxblk/cpblk3.il
+++ b/src/tests/JIT/Methodical/xxblk/cpblk3.il
@@ -4,11 +4,14 @@
 //"plain", volatile., unaligned. cpblk
 //transient, managed, unmanaged pointer
 .assembly extern legacy library mscorlib {}
+.assembly extern xunit.core {}
 .assembly extern System.Console
 {
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
+.namespace Test_cpblk3
+{
 .assembly 'cpblk3' {}
 .class public explicit ansi sealed $MultiByte$size$34
        extends [mscorlib]System.ValueType
@@ -16,7 +19,7 @@
   .pack 1
   .size 34
 //  .custom instance void .ctor() = ( 01 00 00 00 ) 
-} // end of class $MultiByte$size$34
+} // end of class Test_cpblk3.$MultiByte$size$34
 
 .class public explicit sealed $MultiByte$size$7
        extends [mscorlib]System.ValueType
@@ -24,20 +27,23 @@
   .pack 1
   .size 7
 //  .custom instance void .ctor() = ( 01 00 00 00 ) 
-} // end of class $MultiByte$size$7
+} // end of class Test_cpblk3.$MultiByte$size$7
 
 //Global fields
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.field static privatescope valuetype $MultiByte$size$34 'unnamed-global-0$PST04000001' at D_00008030
-.field static privatescope valuetype $MultiByte$size$34 'unnamed-global-1$PST04000002' at D_00008054
+.field static privatescope valuetype Test_cpblk3.$MultiByte$size$34 'unnamed-global-0$PST04000001' at D_00008030
+.field static privatescope valuetype Test_cpblk3.$MultiByte$size$34 'unnamed-global-1$PST04000002' at D_00008054
 //Global methods
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.class private initblk2 extends [mscorlib]System.Object
+.class public initblk2 extends [mscorlib]System.Object
 {
 .method public static int32
         main()
 {
+  .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+      01 00 00 00
+  )
   .entrypoint
   // Code size       177 (0xb1)
   .maxstack  3
@@ -45,10 +51,10 @@
            string V_1,
            int8 * V_2,
            int8 & V_3,
-           valuetype $MultiByte$size$34 V_4,
-           valuetype $MultiByte$size$34 V_5,
-           valuetype $MultiByte$size$34 V_6,
-           valuetype $MultiByte$size$34 V_7)
+           valuetype Test_cpblk3.$MultiByte$size$34 V_4,
+           valuetype Test_cpblk3.$MultiByte$size$34 V_5,
+           valuetype Test_cpblk3.$MultiByte$size$34 V_6,
+           valuetype Test_cpblk3.$MultiByte$size$34 V_7)
   ldnull
   stloc.1
   ldc.i4.1
@@ -57,12 +63,12 @@
   //*** "plain" cpblk ***
   //test1: transient pointer
   ldloca.s   V_4
-  ldsflda    valuetype $MultiByte$size$34 'unnamed-global-0$PST04000001'
+  ldsflda    valuetype Test_cpblk3.$MultiByte$size$34 'unnamed-global-0$PST04000001'
   ldc.i4.s   34
   cpblk
   ldloc.s    V_4
   stloc.s    V_7
-  ldsflda    valuetype $MultiByte$size$34 'unnamed-global-1$PST04000002'
+  ldsflda    valuetype Test_cpblk3.$MultiByte$size$34 'unnamed-global-1$PST04000002'
   newobj     instance void string::.ctor(int8*)
   stloc.1
   ldloc.1
@@ -123,12 +129,12 @@
   //*** volatile. cpblk ***
   //test1: transient pointer
   ldloca.s   V_4
-  ldsflda    valuetype $MultiByte$size$34 'unnamed-global-0$PST04000001'
+  ldsflda    valuetype Test_cpblk3.$MultiByte$size$34 'unnamed-global-0$PST04000001'
   ldc.i4.s   34
   volatile. cpblk
   ldloc.s    V_4
   stloc.s    V_7
-  ldsflda    valuetype $MultiByte$size$34 'unnamed-global-1$PST04000002'
+  ldsflda    valuetype Test_cpblk3.$MultiByte$size$34 'unnamed-global-1$PST04000002'
   newobj     instance void string::.ctor(int8*)
   stloc.1
   ldloc.1
@@ -189,13 +195,13 @@
   //*** unaligned. 0x1 volatile. cpblk ***
   //test1: transient pointer
   ldloca.s   V_4
-  ldsflda    valuetype $MultiByte$size$34 'unnamed-global-0$PST04000001'
+  ldsflda    valuetype Test_cpblk3.$MultiByte$size$34 'unnamed-global-0$PST04000001'
   ldc.i4.s   34
   unaligned. 0x1
   volatile. cpblk
   ldloc.s    V_4
   stloc.s    V_7
-  ldsflda    valuetype $MultiByte$size$34 'unnamed-global-1$PST04000002'
+  ldsflda    valuetype Test_cpblk3.$MultiByte$size$34 'unnamed-global-1$PST04000002'
   newobj     instance void string::.ctor(int8*)
   stloc.1
   ldloc.1
@@ -258,13 +264,13 @@
   //*** unaligned. 0x2 volatile. cpblk ***
   //test1: transient pointer
   ldloca.s   V_4
-  ldsflda    valuetype $MultiByte$size$34 'unnamed-global-0$PST04000001'
+  ldsflda    valuetype Test_cpblk3.$MultiByte$size$34 'unnamed-global-0$PST04000001'
   ldc.i4.s   34
   unaligned. 0x2
   volatile. cpblk
   ldloc.s    V_4
   stloc.s    V_7
-  ldsflda    valuetype $MultiByte$size$34 'unnamed-global-1$PST04000002'
+  ldsflda    valuetype Test_cpblk3.$MultiByte$size$34 'unnamed-global-1$PST04000002'
   newobj     instance void string::.ctor(int8*)
   stloc.1
   ldloc.1
@@ -349,3 +355,4 @@
                  57 65 6C 63 6F 6D 65 20 74 6F 20 74 68 65 20 2E  // Welcome to the .
                  4E 45 54 20 4D 61 6E 61 67 65 64 20 57 6F 72 6C  // NET Managed Worl
                  64 00 00 00)                                     // d...
+}
diff --git a/src/tests/JIT/Methodical/xxblk/cpblk3_il_d.ilproj b/src/tests/JIT/Methodical/xxblk/cpblk3_il_d.ilproj
index 84647a816c4894..2fac298af4db20 100644
--- a/src/tests/JIT/Methodical/xxblk/cpblk3_il_d.ilproj
+++ b/src/tests/JIT/Methodical/xxblk/cpblk3_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/xxblk/cpblk3_il_r.ilproj b/src/tests/JIT/Methodical/xxblk/cpblk3_il_r.ilproj
index 768cb4be203b9c..1ffb0cc581de4f 100644
--- a/src/tests/JIT/Methodical/xxblk/cpblk3_il_r.ilproj
+++ b/src/tests/JIT/Methodical/xxblk/cpblk3_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/xxblk/dynblk.il b/src/tests/JIT/Methodical/xxblk/dynblk.il
index 71b69ac6b23f2c..40ab179a181576 100644
--- a/src/tests/JIT/Methodical/xxblk/dynblk.il
+++ b/src/tests/JIT/Methodical/xxblk/dynblk.il
@@ -14,41 +14,43 @@
 .assembly dynblk {}
 .assembly extern xunit.core {}
 
+.namespace Test_dynblk_il
+{
 .class public sequential ansi sealed beforefieldinit S8
        extends [mscorlib]System.ValueType
 {
   .field public uint64 val
-} // end of class S8
+} // end of class Test_dynblk_il.S8
 
-.class private auto ansi beforefieldinit Program
+.class public auto ansi beforefieldinit Program
        extends [mscorlib]System.Object
 {
   .method public hidebysig static int32  GetSize3() cil managed noinlining
   {
           ldc.i4     3
           ret
-  } // end of method Program::Init
+  } // end of method Test_dynblk_il.Program::Init
 
   .method public hidebysig static int32  GetSize5() cil managed noinlining
   {
           ldc.i4     5
           ret
-  } // end of method Program::Init
+  } // end of method Test_dynblk_il.Program::Init
 
-  .method private hidebysig static int32 
+  .method public hidebysig static int32 
           Main() cil managed
   {
     .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
         01 00 00 00
     )
     .entrypoint
-    .locals init (valuetype S8 S, int32 retVal, int32 size)
+    .locals init (valuetype Test_dynblk_il.S8 S, int32 retVal, int32 size)
               ldloca.s   S
               ldc.i4     0
               ldc.i4     8
               initblk
 
-              call       int32 Program::GetSize5()
+              call       int32 Test_dynblk_il.Program::GetSize5()
               stloc.s    size
 
               ldloca.s   S
@@ -56,7 +58,7 @@
               ldloc.s    size
               initblk
 
-              call       int32 Program::GetSize3()
+              call       int32 Test_dynblk_il.Program::GetSize3()
               stloc.s    size
 
               ldloca.s   S
@@ -65,7 +67,7 @@
               initblk
 
               ldloca.s   S
-              ldfld      uint64 S8::val
+              ldfld      uint64 Test_dynblk_il.S8::val
               ldc.i8     0x5555333333
               ceq
               brtrue.s  L1
@@ -85,7 +87,7 @@
 
     L2:       ldloc.s    retVal
               ret
-  } // end of method Program::Main
+  } // end of method Test_dynblk_il.Program::Main
 
   .method public hidebysig specialname rtspecialname 
           instance void  .ctor() cil managed
@@ -96,7 +98,8 @@
               call       instance void [mscorlib]System.Object::.ctor()
               nop
               ret
-  } // end of method Program::.ctor
+  } // end of method Test_dynblk_il.Program::.ctor
 
-} // end of class Program
+} // end of class Test_dynblk_il.Program
 
+}
diff --git a/src/tests/JIT/Methodical/xxblk/dynblk_il_d.ilproj b/src/tests/JIT/Methodical/xxblk/dynblk_il_d.ilproj
index d37f9c5f838b86..3ddb6cc303b435 100644
--- a/src/tests/JIT/Methodical/xxblk/dynblk_il_d.ilproj
+++ b/src/tests/JIT/Methodical/xxblk/dynblk_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/xxblk/dynblk_il_r.ilproj b/src/tests/JIT/Methodical/xxblk/dynblk_il_r.ilproj
index 844a94d533f2d1..c309f750b92b95 100644
--- a/src/tests/JIT/Methodical/xxblk/dynblk_il_r.ilproj
+++ b/src/tests/JIT/Methodical/xxblk/dynblk_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/xxblk/dynblk_order.il b/src/tests/JIT/Methodical/xxblk/dynblk_order.il
index 30f1f024eca2f6..7355ba4e54b501 100644
--- a/src/tests/JIT/Methodical/xxblk/dynblk_order.il
+++ b/src/tests/JIT/Methodical/xxblk/dynblk_order.il
@@ -12,9 +12,9 @@
 .typedef [System.Runtime]System.OverflowException as OverflowException
 .typedef [System.Runtime]System.IndexOutOfRangeException as IndexOutOfRangeException
 
-.class DynBlkOrder extends [System.Runtime]System.Object
+.class public DynBlkOrder extends [System.Runtime]System.Object
 {
-    .method static int32 Main()
+    .method public static int32 Main()
     {
         .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
             01 00 00 00
diff --git a/src/tests/JIT/Methodical/xxblk/dynblk_order_il_d.ilproj b/src/tests/JIT/Methodical/xxblk/dynblk_order_il_d.ilproj
index 7a8255ed9d1e6f..a8225057d8499c 100644
--- a/src/tests/JIT/Methodical/xxblk/dynblk_order_il_d.ilproj
+++ b/src/tests/JIT/Methodical/xxblk/dynblk_order_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/xxblk/dynblk_order_il_r.ilproj b/src/tests/JIT/Methodical/xxblk/dynblk_order_il_r.ilproj
index 1a281b5960752d..036aa3a3748830 100644
--- a/src/tests/JIT/Methodical/xxblk/dynblk_order_il_r.ilproj
+++ b/src/tests/JIT/Methodical/xxblk/dynblk_order_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/xxblk/initblk3.il b/src/tests/JIT/Methodical/xxblk/initblk3.il
index dbd4c09bb4a295..3063b1531f4f50 100644
--- a/src/tests/JIT/Methodical/xxblk/initblk3.il
+++ b/src/tests/JIT/Methodical/xxblk/initblk3.il
@@ -4,23 +4,29 @@
 //transient, managed, unmanaged pointer
 //"plain", volatile., unaligned. initblk
 .assembly extern legacy library mscorlib {}
+.assembly extern xunit.core {}
 .assembly extern System.Console
 {
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
 .assembly 'initblk3' {}
+.namespace Test_initblk3
+{
 
 .class public explicit ansi sealed $MultiByte$size$5000 extends [mscorlib]System.ValueType
 {
   .pack 1
   .size 5000
-} // end of class $MultiByte$size$5000
+} // end of class Test_initblk3.$MultiByte$size$5000
 
-.class private initblk2 extends [mscorlib]System.Object
+.class public initblk2 extends [mscorlib]System.Object
 {
 .method public static int32 main() 
 {
+  .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+      01 00 00 00
+  )
   .entrypoint
   .maxstack  3
   .locals (int32 V_0,
@@ -29,7 +35,7 @@
            bool V_3,
            int8* V_4,
            int8& V_5,
-           valuetype $MultiByte$size$5000 V_6)
+           valuetype Test_initblk3.$MultiByte$size$5000 V_6)
   ldc.i4.1
   stloc.3
 
@@ -603,3 +609,4 @@
   BL_00a9:  ret
 }
 }
+}
diff --git a/src/tests/JIT/Methodical/xxblk/initblk3_il_d.ilproj b/src/tests/JIT/Methodical/xxblk/initblk3_il_d.ilproj
index c7314a7f9cf980..7224725c83fd10 100644
--- a/src/tests/JIT/Methodical/xxblk/initblk3_il_d.ilproj
+++ b/src/tests/JIT/Methodical/xxblk/initblk3_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/xxblk/initblk3_il_r.ilproj b/src/tests/JIT/Methodical/xxblk/initblk3_il_r.ilproj
index 22421213b5f6d7..94517390f1bb1a 100644
--- a/src/tests/JIT/Methodical/xxblk/initblk3_il_r.ilproj
+++ b/src/tests/JIT/Methodical/xxblk/initblk3_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I.il b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I.il
index 06a591be4b9025..b2959b932788e1 100644
--- a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I.il
+++ b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I.il
@@ -10,7 +10,7 @@
 }
 .assembly ldobj_I { }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_ldobj_I_ldobj_il
 {
   .class public auto ansi beforefieldinit Test
          extends [mscorlib]System.Object
@@ -59,7 +59,7 @@ stloc.s V
 
 ldloca.s V
 ldobj [mscorlib]System.IntPtr
-stsfld native int JitTest.Test::m_v
+stsfld native int JitTest_ldobj_I_ldobj_il.Test::m_v
 ldloc.s V
 ret
 }
@@ -72,7 +72,7 @@ stloc.s V
 
 ldloca.s V
 ldobj [mscorlib]System.IntPtr
-call void JitTest.Test::Func(native int)
+call void JitTest_ldobj_I_ldobj_il.Test::Func(native int)
 ldloc.s V
 ret
 }
@@ -122,10 +122,10 @@ ret
 .locals (native int V)
 ldc.i4 0
 stloc.s V
-newobj instance void JitTest.Test::.ctor()
+newobj instance void JitTest_ldobj_I_ldobj_il.Test::.ctor()
 ldloca.s V
 ldobj [mscorlib]System.IntPtr
-stfld native int JitTest.Test::m_vv
+stfld native int JitTest_ldobj_I_ldobj_il.Test::m_vv
 ldloc.s V
 ret
 }
@@ -180,7 +180,7 @@ ret
 ldc.i4 0
 stloc.s V
 
-ldsflda native int JitTest.Test::m_v
+ldsflda native int JitTest_ldobj_I_ldobj_il.Test::m_v
 ldobj [mscorlib]System.IntPtr
 pop
 ldloc.s V
@@ -193,7 +193,7 @@ ret
 ldc.i4 0
 stloc.s V
 
-ldsflda native int JitTest.Test::m_v
+ldsflda native int JitTest_ldobj_I_ldobj_il.Test::m_v
 ldobj [mscorlib]System.IntPtr
 stloc.s V
 ldloc.s V
@@ -206,9 +206,9 @@ ret
 ldc.i4 0
 stloc.s V
 
-ldsflda native int JitTest.Test::m_v
+ldsflda native int JitTest_ldobj_I_ldobj_il.Test::m_v
 ldobj [mscorlib]System.IntPtr
-stsfld native int JitTest.Test::m_v
+stsfld native int JitTest_ldobj_I_ldobj_il.Test::m_v
 ldloc.s V
 ret
 }
@@ -219,9 +219,9 @@ ret
 ldc.i4 0
 stloc.s V
 
-ldsflda native int JitTest.Test::m_v
+ldsflda native int JitTest_ldobj_I_ldobj_il.Test::m_v
 ldobj [mscorlib]System.IntPtr
-call void JitTest.Test::Func(native int)
+call void JitTest_ldobj_I_ldobj_il.Test::Func(native int)
 ldloc.s V
 ret
 }
@@ -232,7 +232,7 @@ ret
 ldc.i4 0
 stloc.s V
 
-ldsflda native int JitTest.Test::m_v
+ldsflda native int JitTest_ldobj_I_ldobj_il.Test::m_v
 ldobj [mscorlib]System.IntPtr
 box [mscorlib]System.IntPtr
 pop
@@ -246,7 +246,7 @@ ret
 ldc.i4 0
 stloc.s V
 ldloca.s V
-ldsflda native int JitTest.Test::m_v
+ldsflda native int JitTest_ldobj_I_ldobj_il.Test::m_v
 ldobj [mscorlib]System.IntPtr
 stobj [mscorlib]System.IntPtr
 ldloc.s V
@@ -259,7 +259,7 @@ ret
 ldc.i4 0
 stloc.s V
 
-ldsflda native int JitTest.Test::m_v
+ldsflda native int JitTest_ldobj_I_ldobj_il.Test::m_v
 ldobj [mscorlib]System.IntPtr
 starg.s ARG
 ldloc.s V
@@ -271,10 +271,10 @@ ret
 .locals (native int V)
 ldc.i4 0
 stloc.s V
-newobj instance void JitTest.Test::.ctor()
-ldsflda native int JitTest.Test::m_v
+newobj instance void JitTest_ldobj_I_ldobj_il.Test::.ctor()
+ldsflda native int JitTest_ldobj_I_ldobj_il.Test::m_v
 ldobj [mscorlib]System.IntPtr
-stfld native int JitTest.Test::m_vv
+stfld native int JitTest_ldobj_I_ldobj_il.Test::m_vv
 ldloc.s V
 ret
 }
@@ -285,7 +285,7 @@ ret
 ldc.i4 0
 stloc.s V
 
-ldsflda native int JitTest.Test::m_v
+ldsflda native int JitTest_ldobj_I_ldobj_il.Test::m_v
 ldobj [mscorlib]System.IntPtr
 ret
 }
@@ -296,7 +296,7 @@ ret
 ldc.i4 0
 stloc.s V
 
-ldsflda native int JitTest.Test::m_v
+ldsflda native int JitTest_ldobj_I_ldobj_il.Test::m_v
 ldobj [mscorlib]System.IntPtr
 ret
 }
@@ -307,7 +307,7 @@ ret
 ldc.i4 0
 stloc.s V
 
-ldsflda native int JitTest.Test::m_v
+ldsflda native int JitTest_ldobj_I_ldobj_il.Test::m_v
 ldobj [mscorlib]System.IntPtr
 ret
 }
@@ -318,7 +318,7 @@ ret
 ldc.i4 0
 stloc.s V
 
-ldsflda native int JitTest.Test::m_v
+ldsflda native int JitTest_ldobj_I_ldobj_il.Test::m_v
 ldobj [mscorlib]System.IntPtr
 ret
 }
@@ -357,7 +357,7 @@ stloc.s V
 
 ldarga.s ARG
 ldobj [mscorlib]System.IntPtr
-stsfld native int JitTest.Test::m_v
+stsfld native int JitTest_ldobj_I_ldobj_il.Test::m_v
 ldloc.s V
 ret
 }
@@ -370,7 +370,7 @@ stloc.s V
 
 ldarga.s ARG
 ldobj [mscorlib]System.IntPtr
-call void JitTest.Test::Func(native int)
+call void JitTest_ldobj_I_ldobj_il.Test::Func(native int)
 ldloc.s V
 ret
 }
@@ -420,10 +420,10 @@ ret
 .locals (native int V)
 ldc.i4 0
 stloc.s V
-newobj instance void JitTest.Test::.ctor()
+newobj instance void JitTest_ldobj_I_ldobj_il.Test::.ctor()
 ldarga.s ARG
 ldobj [mscorlib]System.IntPtr
-stfld native int JitTest.Test::m_vv
+stfld native int JitTest_ldobj_I_ldobj_il.Test::m_vv
 ldloc.s V
 ret
 }
@@ -478,8 +478,8 @@ ret
 ldc.i4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda native int JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_I_ldobj_il.Test::.ctor()
+ldflda native int JitTest_ldobj_I_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.IntPtr
 pop
 ldloc.s V
@@ -492,8 +492,8 @@ ret
 ldc.i4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda native int JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_I_ldobj_il.Test::.ctor()
+ldflda native int JitTest_ldobj_I_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.IntPtr
 stloc.s V
 ldloc.s V
@@ -506,10 +506,10 @@ ret
 ldc.i4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda native int JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_I_ldobj_il.Test::.ctor()
+ldflda native int JitTest_ldobj_I_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.IntPtr
-stsfld native int JitTest.Test::m_v
+stsfld native int JitTest_ldobj_I_ldobj_il.Test::m_v
 ldloc.s V
 ret
 }
@@ -520,10 +520,10 @@ ret
 ldc.i4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda native int JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_I_ldobj_il.Test::.ctor()
+ldflda native int JitTest_ldobj_I_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.IntPtr
-call void JitTest.Test::Func(native int)
+call void JitTest_ldobj_I_ldobj_il.Test::Func(native int)
 ldloc.s V
 ret
 }
@@ -534,8 +534,8 @@ ret
 ldc.i4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda native int JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_I_ldobj_il.Test::.ctor()
+ldflda native int JitTest_ldobj_I_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.IntPtr
 box [mscorlib]System.IntPtr
 pop
@@ -549,8 +549,8 @@ ret
 ldc.i4 0
 stloc.s V
 ldloca.s V
-newobj instance void JitTest.Test::.ctor()
-ldflda native int JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_I_ldobj_il.Test::.ctor()
+ldflda native int JitTest_ldobj_I_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.IntPtr
 stobj [mscorlib]System.IntPtr
 ldloc.s V
@@ -563,8 +563,8 @@ ret
 ldc.i4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda native int JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_I_ldobj_il.Test::.ctor()
+ldflda native int JitTest_ldobj_I_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.IntPtr
 starg.s ARG
 ldloc.s V
@@ -576,11 +576,11 @@ ret
 .locals (native int V)
 ldc.i4 0
 stloc.s V
-newobj instance void JitTest.Test::.ctor()
-newobj instance void JitTest.Test::.ctor()
-ldflda native int JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_I_ldobj_il.Test::.ctor()
+newobj instance void JitTest_ldobj_I_ldobj_il.Test::.ctor()
+ldflda native int JitTest_ldobj_I_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.IntPtr
-stfld native int JitTest.Test::m_vv
+stfld native int JitTest_ldobj_I_ldobj_il.Test::m_vv
 ldloc.s V
 ret
 }
@@ -591,8 +591,8 @@ ret
 ldc.i4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda native int JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_I_ldobj_il.Test::.ctor()
+ldflda native int JitTest_ldobj_I_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.IntPtr
 ret
 }
@@ -603,8 +603,8 @@ ret
 ldc.i4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda native int JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_I_ldobj_il.Test::.ctor()
+ldflda native int JitTest_ldobj_I_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.IntPtr
 ret
 }
@@ -615,8 +615,8 @@ ret
 ldc.i4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda native int JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_I_ldobj_il.Test::.ctor()
+ldflda native int JitTest_ldobj_I_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.IntPtr
 ret
 }
@@ -627,8 +627,8 @@ ret
 ldc.i4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda native int JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_I_ldobj_il.Test::.ctor()
+ldflda native int JitTest_ldobj_I_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.IntPtr
 ret
 }
@@ -676,7 +676,7 @@ newarr [mscorlib]System.IntPtr
 ldc.i4.1
 ldelema [mscorlib]System.IntPtr
 ldobj [mscorlib]System.IntPtr
-stsfld native int JitTest.Test::m_v
+stsfld native int JitTest_ldobj_I_ldobj_il.Test::m_v
 ldloc.s V
 ret
 }
@@ -692,7 +692,7 @@ newarr [mscorlib]System.IntPtr
 ldc.i4.1
 ldelema [mscorlib]System.IntPtr
 ldobj [mscorlib]System.IntPtr
-call void JitTest.Test::Func(native int)
+call void JitTest_ldobj_I_ldobj_il.Test::Func(native int)
 ldloc.s V
 ret
 }
@@ -751,13 +751,13 @@ ret
 .locals (native int V)
 ldc.i4 0
 stloc.s V
-newobj instance void JitTest.Test::.ctor()
+newobj instance void JitTest_ldobj_I_ldobj_il.Test::.ctor()
 ldc.i4.2
 newarr [mscorlib]System.IntPtr
 ldc.i4.1
 ldelema [mscorlib]System.IntPtr
 ldobj [mscorlib]System.IntPtr
-stfld native int JitTest.Test::m_vv
+stfld native int JitTest_ldobj_I_ldobj_il.Test::m_vv
 ldloc.s V
 ret
 }
@@ -824,8 +824,8 @@ ret
 ldc.i4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda native int JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_I_ldobj_il.Test::.ctor()
+ldflda native int JitTest_ldobj_I_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.IntPtr
 pop
 ldloc.s V
@@ -838,8 +838,8 @@ ret
 ldc.i4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda native int JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_I_ldobj_il.Test::.ctor()
+ldflda native int JitTest_ldobj_I_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.IntPtr
 stloc.s V
 ldloc.s V
@@ -852,10 +852,10 @@ ret
 ldc.i4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda native int JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_I_ldobj_il.Test::.ctor()
+ldflda native int JitTest_ldobj_I_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.IntPtr
-stsfld native int JitTest.Test::m_v
+stsfld native int JitTest_ldobj_I_ldobj_il.Test::m_v
 ldloc.s V
 ret
 }
@@ -866,10 +866,10 @@ ret
 ldc.i4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda native int JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_I_ldobj_il.Test::.ctor()
+ldflda native int JitTest_ldobj_I_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.IntPtr
-call void JitTest.Test::Func(native int)
+call void JitTest_ldobj_I_ldobj_il.Test::Func(native int)
 ldloc.s V
 ret
 }
@@ -880,8 +880,8 @@ ret
 ldc.i4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda native int JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_I_ldobj_il.Test::.ctor()
+ldflda native int JitTest_ldobj_I_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.IntPtr
 box [mscorlib]System.IntPtr
 pop
@@ -895,8 +895,8 @@ ret
 ldc.i4 0
 stloc.s V
 ldloca.s V
-newobj instance void JitTest.Test::.ctor()
-ldflda native int JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_I_ldobj_il.Test::.ctor()
+ldflda native int JitTest_ldobj_I_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.IntPtr
 stobj [mscorlib]System.IntPtr
 ldloc.s V
@@ -909,8 +909,8 @@ ret
 ldc.i4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda native int JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_I_ldobj_il.Test::.ctor()
+ldflda native int JitTest_ldobj_I_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.IntPtr
 starg.s ARG
 ldloc.s V
@@ -922,11 +922,11 @@ ret
 .locals (native int V)
 ldc.i4 0
 stloc.s V
-newobj instance void JitTest.Test::.ctor()
-newobj instance void JitTest.Test::.ctor()
-ldflda native int JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_I_ldobj_il.Test::.ctor()
+newobj instance void JitTest_ldobj_I_ldobj_il.Test::.ctor()
+ldflda native int JitTest_ldobj_I_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.IntPtr
-stfld native int JitTest.Test::m_vv
+stfld native int JitTest_ldobj_I_ldobj_il.Test::m_vv
 ldloc.s V
 ret
 }
@@ -937,8 +937,8 @@ ret
 ldc.i4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda native int JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_I_ldobj_il.Test::.ctor()
+ldflda native int JitTest_ldobj_I_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.IntPtr
 ret
 }
@@ -949,8 +949,8 @@ ret
 ldc.i4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda native int JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_I_ldobj_il.Test::.ctor()
+ldflda native int JitTest_ldobj_I_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.IntPtr
 ret
 }
@@ -961,8 +961,8 @@ ret
 ldc.i4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda native int JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_I_ldobj_il.Test::.ctor()
+ldflda native int JitTest_ldobj_I_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.IntPtr
 ret
 }
@@ -973,8 +973,8 @@ ret
 ldc.i4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda native int JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_I_ldobj_il.Test::.ctor()
+ldflda native int JitTest_ldobj_I_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.IntPtr
 ret
 }
@@ -1019,7 +1019,7 @@ ldloca.s V
 mkrefany [mscorlib]System.IntPtr
 refanyval [mscorlib]System.IntPtr
 ldobj [mscorlib]System.IntPtr
-stsfld native int JitTest.Test::m_v
+stsfld native int JitTest_ldobj_I_ldobj_il.Test::m_v
 ldloc.s V
 ret
 }
@@ -1034,7 +1034,7 @@ ldloca.s V
 mkrefany [mscorlib]System.IntPtr
 refanyval [mscorlib]System.IntPtr
 ldobj [mscorlib]System.IntPtr
-call void JitTest.Test::Func(native int)
+call void JitTest_ldobj_I_ldobj_il.Test::Func(native int)
 ldloc.s V
 ret
 }
@@ -1090,12 +1090,12 @@ ret
 .locals (native int V)
 ldc.i4 0
 stloc.s V
-newobj instance void JitTest.Test::.ctor()
+newobj instance void JitTest_ldobj_I_ldobj_il.Test::.ctor()
 ldloca.s V
 mkrefany [mscorlib]System.IntPtr
 refanyval [mscorlib]System.IntPtr
 ldobj [mscorlib]System.IntPtr
-stfld native int JitTest.Test::m_vv
+stfld native int JitTest_ldobj_I_ldobj_il.Test::m_vv
 ldloc.s V
 ret
 }
@@ -1165,90 +1165,90 @@ ret
 ldc.i4 0
 stloc.s V
 ldloc.s V
-call native int JitTest.Test::method_0_0(native int)
-call native int JitTest.Test::method_0_1(native int)
-call native int JitTest.Test::method_0_2(native int)
-call native int JitTest.Test::method_0_3(native int)
-call native int JitTest.Test::method_0_4(native int)
-call native int JitTest.Test::method_0_5(native int)
-call native int JitTest.Test::method_0_6(native int)
-call native int JitTest.Test::method_0_7(native int)
-call native int JitTest.Test::method_0_8(native int)
-call native int JitTest.Test::method_0_9(native int)
-call native int JitTest.Test::method_0_10(native int)
-call native int JitTest.Test::method_0_11(native int)
-call native int JitTest.Test::method_1_0(native int)
-call native int JitTest.Test::method_1_1(native int)
-call native int JitTest.Test::method_1_2(native int)
-call native int JitTest.Test::method_1_3(native int)
-call native int JitTest.Test::method_1_4(native int)
-call native int JitTest.Test::method_1_5(native int)
-call native int JitTest.Test::method_1_6(native int)
-call native int JitTest.Test::method_1_7(native int)
-call native int JitTest.Test::method_1_8(native int)
-call native int JitTest.Test::method_1_9(native int)
-call native int JitTest.Test::method_1_10(native int)
-call native int JitTest.Test::method_1_11(native int)
-call native int JitTest.Test::method_2_0(native int)
-call native int JitTest.Test::method_2_1(native int)
-call native int JitTest.Test::method_2_2(native int)
-call native int JitTest.Test::method_2_3(native int)
-call native int JitTest.Test::method_2_4(native int)
-call native int JitTest.Test::method_2_5(native int)
-call native int JitTest.Test::method_2_6(native int)
-call native int JitTest.Test::method_2_7(native int)
-call native int JitTest.Test::method_2_8(native int)
-call native int JitTest.Test::method_2_9(native int)
-call native int JitTest.Test::method_2_10(native int)
-call native int JitTest.Test::method_2_11(native int)
-call native int JitTest.Test::method_3_0(native int)
-call native int JitTest.Test::method_3_1(native int)
-call native int JitTest.Test::method_3_2(native int)
-call native int JitTest.Test::method_3_3(native int)
-call native int JitTest.Test::method_3_4(native int)
-call native int JitTest.Test::method_3_5(native int)
-call native int JitTest.Test::method_3_6(native int)
-call native int JitTest.Test::method_3_7(native int)
-call native int JitTest.Test::method_3_8(native int)
-call native int JitTest.Test::method_3_9(native int)
-call native int JitTest.Test::method_3_10(native int)
-call native int JitTest.Test::method_3_11(native int)
-call native int JitTest.Test::method_4_0(native int)
-call native int JitTest.Test::method_4_1(native int)
-call native int JitTest.Test::method_4_2(native int)
-call native int JitTest.Test::method_4_3(native int)
-call native int JitTest.Test::method_4_4(native int)
-call native int JitTest.Test::method_4_5(native int)
-call native int JitTest.Test::method_4_6(native int)
-call native int JitTest.Test::method_4_7(native int)
-call native int JitTest.Test::method_4_8(native int)
-call native int JitTest.Test::method_4_9(native int)
-call native int JitTest.Test::method_4_10(native int)
-call native int JitTest.Test::method_4_11(native int)
-call native int JitTest.Test::method_5_0(native int)
-call native int JitTest.Test::method_5_1(native int)
-call native int JitTest.Test::method_5_2(native int)
-call native int JitTest.Test::method_5_3(native int)
-call native int JitTest.Test::method_5_4(native int)
-call native int JitTest.Test::method_5_5(native int)
-call native int JitTest.Test::method_5_6(native int)
-call native int JitTest.Test::method_5_7(native int)
-call native int JitTest.Test::method_5_8(native int)
-call native int JitTest.Test::method_5_9(native int)
-call native int JitTest.Test::method_5_10(native int)
-call native int JitTest.Test::method_5_11(native int)
-call native int JitTest.Test::method_6_0(native int)
-call native int JitTest.Test::method_6_1(native int)
-call native int JitTest.Test::method_6_2(native int)
-call native int JitTest.Test::method_6_3(native int)
-call native int JitTest.Test::method_6_4(native int)
-call native int JitTest.Test::method_6_5(native int)
-call native int JitTest.Test::method_6_6(native int)
-call native int JitTest.Test::method_6_7(native int)
-call native int JitTest.Test::method_6_8(native int)
-call native int JitTest.Test::method_6_9(native int)
-call native int JitTest.Test::method_6_10(native int)
-call native int JitTest.Test::method_6_11(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_0_0(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_0_1(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_0_2(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_0_3(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_0_4(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_0_5(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_0_6(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_0_7(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_0_8(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_0_9(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_0_10(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_0_11(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_1_0(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_1_1(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_1_2(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_1_3(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_1_4(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_1_5(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_1_6(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_1_7(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_1_8(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_1_9(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_1_10(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_1_11(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_2_0(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_2_1(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_2_2(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_2_3(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_2_4(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_2_5(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_2_6(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_2_7(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_2_8(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_2_9(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_2_10(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_2_11(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_3_0(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_3_1(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_3_2(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_3_3(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_3_4(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_3_5(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_3_6(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_3_7(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_3_8(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_3_9(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_3_10(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_3_11(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_4_0(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_4_1(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_4_2(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_4_3(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_4_4(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_4_5(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_4_6(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_4_7(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_4_8(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_4_9(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_4_10(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_4_11(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_5_0(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_5_1(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_5_2(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_5_3(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_5_4(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_5_5(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_5_6(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_5_7(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_5_8(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_5_9(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_5_10(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_5_11(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_6_0(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_6_1(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_6_2(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_6_3(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_6_4(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_6_5(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_6_6(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_6_7(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_6_8(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_6_9(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_6_10(native int)
+call native int JitTest_ldobj_I_ldobj_il.Test::method_6_11(native int)
 pop
 
       ldstr      "Passed"
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I8.il b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I8.il
index 24b248af565fbe..bea55ae5b142b8 100644
--- a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I8.il
+++ b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I8.il
@@ -10,7 +10,7 @@
 }
 .assembly ldobj_I8 { }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_ldobj_I8_ldobj_il
 {
   .class public auto ansi beforefieldinit Test
          extends [mscorlib]System.Object
@@ -59,7 +59,7 @@ stloc.s V
 
 ldloca.s V
 ldobj [mscorlib]System.Int64
-stsfld int64 JitTest.Test::m_v
+stsfld int64 JitTest_ldobj_I8_ldobj_il.Test::m_v
 ldloc.s V
 ret
 }
@@ -72,7 +72,7 @@ stloc.s V
 
 ldloca.s V
 ldobj [mscorlib]System.Int64
-call void JitTest.Test::Func(int64)
+call void JitTest_ldobj_I8_ldobj_il.Test::Func(int64)
 ldloc.s V
 ret
 }
@@ -122,10 +122,10 @@ ret
 .locals (int64 V)
 ldc.i8 0
 stloc.s V
-newobj instance void JitTest.Test::.ctor()
+newobj instance void JitTest_ldobj_I8_ldobj_il.Test::.ctor()
 ldloca.s V
 ldobj [mscorlib]System.Int64
-stfld int64 JitTest.Test::m_vv
+stfld int64 JitTest_ldobj_I8_ldobj_il.Test::m_vv
 ldloc.s V
 ret
 }
@@ -180,7 +180,7 @@ ret
 ldc.i8 0
 stloc.s V
 
-ldsflda int64 JitTest.Test::m_v
+ldsflda int64 JitTest_ldobj_I8_ldobj_il.Test::m_v
 ldobj [mscorlib]System.Int64
 pop
 ldloc.s V
@@ -193,7 +193,7 @@ ret
 ldc.i8 0
 stloc.s V
 
-ldsflda int64 JitTest.Test::m_v
+ldsflda int64 JitTest_ldobj_I8_ldobj_il.Test::m_v
 ldobj [mscorlib]System.Int64
 stloc.s V
 ldloc.s V
@@ -206,9 +206,9 @@ ret
 ldc.i8 0
 stloc.s V
 
-ldsflda int64 JitTest.Test::m_v
+ldsflda int64 JitTest_ldobj_I8_ldobj_il.Test::m_v
 ldobj [mscorlib]System.Int64
-stsfld int64 JitTest.Test::m_v
+stsfld int64 JitTest_ldobj_I8_ldobj_il.Test::m_v
 ldloc.s V
 ret
 }
@@ -219,9 +219,9 @@ ret
 ldc.i8 0
 stloc.s V
 
-ldsflda int64 JitTest.Test::m_v
+ldsflda int64 JitTest_ldobj_I8_ldobj_il.Test::m_v
 ldobj [mscorlib]System.Int64
-call void JitTest.Test::Func(int64)
+call void JitTest_ldobj_I8_ldobj_il.Test::Func(int64)
 ldloc.s V
 ret
 }
@@ -232,7 +232,7 @@ ret
 ldc.i8 0
 stloc.s V
 
-ldsflda int64 JitTest.Test::m_v
+ldsflda int64 JitTest_ldobj_I8_ldobj_il.Test::m_v
 ldobj [mscorlib]System.Int64
 box [mscorlib]System.Int64
 pop
@@ -246,7 +246,7 @@ ret
 ldc.i8 0
 stloc.s V
 ldloca.s V
-ldsflda int64 JitTest.Test::m_v
+ldsflda int64 JitTest_ldobj_I8_ldobj_il.Test::m_v
 ldobj [mscorlib]System.Int64
 stobj [mscorlib]System.Int64
 ldloc.s V
@@ -259,7 +259,7 @@ ret
 ldc.i8 0
 stloc.s V
 
-ldsflda int64 JitTest.Test::m_v
+ldsflda int64 JitTest_ldobj_I8_ldobj_il.Test::m_v
 ldobj [mscorlib]System.Int64
 starg.s ARG
 ldloc.s V
@@ -271,10 +271,10 @@ ret
 .locals (int64 V)
 ldc.i8 0
 stloc.s V
-newobj instance void JitTest.Test::.ctor()
-ldsflda int64 JitTest.Test::m_v
+newobj instance void JitTest_ldobj_I8_ldobj_il.Test::.ctor()
+ldsflda int64 JitTest_ldobj_I8_ldobj_il.Test::m_v
 ldobj [mscorlib]System.Int64
-stfld int64 JitTest.Test::m_vv
+stfld int64 JitTest_ldobj_I8_ldobj_il.Test::m_vv
 ldloc.s V
 ret
 }
@@ -285,7 +285,7 @@ ret
 ldc.i8 0
 stloc.s V
 
-ldsflda int64 JitTest.Test::m_v
+ldsflda int64 JitTest_ldobj_I8_ldobj_il.Test::m_v
 ldobj [mscorlib]System.Int64
 ret
 }
@@ -296,7 +296,7 @@ ret
 ldc.i8 0
 stloc.s V
 
-ldsflda int64 JitTest.Test::m_v
+ldsflda int64 JitTest_ldobj_I8_ldobj_il.Test::m_v
 ldobj [mscorlib]System.Int64
 ret
 }
@@ -307,7 +307,7 @@ ret
 ldc.i8 0
 stloc.s V
 
-ldsflda int64 JitTest.Test::m_v
+ldsflda int64 JitTest_ldobj_I8_ldobj_il.Test::m_v
 ldobj [mscorlib]System.Int64
 ret
 }
@@ -318,7 +318,7 @@ ret
 ldc.i8 0
 stloc.s V
 
-ldsflda int64 JitTest.Test::m_v
+ldsflda int64 JitTest_ldobj_I8_ldobj_il.Test::m_v
 ldobj [mscorlib]System.Int64
 ret
 }
@@ -357,7 +357,7 @@ stloc.s V
 
 ldarga.s ARG
 ldobj [mscorlib]System.Int64
-stsfld int64 JitTest.Test::m_v
+stsfld int64 JitTest_ldobj_I8_ldobj_il.Test::m_v
 ldloc.s V
 ret
 }
@@ -370,7 +370,7 @@ stloc.s V
 
 ldarga.s ARG
 ldobj [mscorlib]System.Int64
-call void JitTest.Test::Func(int64)
+call void JitTest_ldobj_I8_ldobj_il.Test::Func(int64)
 ldloc.s V
 ret
 }
@@ -420,10 +420,10 @@ ret
 .locals (int64 V)
 ldc.i8 0
 stloc.s V
-newobj instance void JitTest.Test::.ctor()
+newobj instance void JitTest_ldobj_I8_ldobj_il.Test::.ctor()
 ldarga.s ARG
 ldobj [mscorlib]System.Int64
-stfld int64 JitTest.Test::m_vv
+stfld int64 JitTest_ldobj_I8_ldobj_il.Test::m_vv
 ldloc.s V
 ret
 }
@@ -478,8 +478,8 @@ ret
 ldc.i8 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda int64 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_I8_ldobj_il.Test::.ctor()
+ldflda int64 JitTest_ldobj_I8_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Int64
 pop
 ldloc.s V
@@ -492,8 +492,8 @@ ret
 ldc.i8 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda int64 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_I8_ldobj_il.Test::.ctor()
+ldflda int64 JitTest_ldobj_I8_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Int64
 stloc.s V
 ldloc.s V
@@ -506,10 +506,10 @@ ret
 ldc.i8 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda int64 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_I8_ldobj_il.Test::.ctor()
+ldflda int64 JitTest_ldobj_I8_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Int64
-stsfld int64 JitTest.Test::m_v
+stsfld int64 JitTest_ldobj_I8_ldobj_il.Test::m_v
 ldloc.s V
 ret
 }
@@ -520,10 +520,10 @@ ret
 ldc.i8 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda int64 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_I8_ldobj_il.Test::.ctor()
+ldflda int64 JitTest_ldobj_I8_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Int64
-call void JitTest.Test::Func(int64)
+call void JitTest_ldobj_I8_ldobj_il.Test::Func(int64)
 ldloc.s V
 ret
 }
@@ -534,8 +534,8 @@ ret
 ldc.i8 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda int64 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_I8_ldobj_il.Test::.ctor()
+ldflda int64 JitTest_ldobj_I8_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Int64
 box [mscorlib]System.Int64
 pop
@@ -549,8 +549,8 @@ ret
 ldc.i8 0
 stloc.s V
 ldloca.s V
-newobj instance void JitTest.Test::.ctor()
-ldflda int64 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_I8_ldobj_il.Test::.ctor()
+ldflda int64 JitTest_ldobj_I8_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Int64
 stobj [mscorlib]System.Int64
 ldloc.s V
@@ -563,8 +563,8 @@ ret
 ldc.i8 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda int64 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_I8_ldobj_il.Test::.ctor()
+ldflda int64 JitTest_ldobj_I8_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Int64
 starg.s ARG
 ldloc.s V
@@ -576,11 +576,11 @@ ret
 .locals (int64 V)
 ldc.i8 0
 stloc.s V
-newobj instance void JitTest.Test::.ctor()
-newobj instance void JitTest.Test::.ctor()
-ldflda int64 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_I8_ldobj_il.Test::.ctor()
+newobj instance void JitTest_ldobj_I8_ldobj_il.Test::.ctor()
+ldflda int64 JitTest_ldobj_I8_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Int64
-stfld int64 JitTest.Test::m_vv
+stfld int64 JitTest_ldobj_I8_ldobj_il.Test::m_vv
 ldloc.s V
 ret
 }
@@ -591,8 +591,8 @@ ret
 ldc.i8 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda int64 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_I8_ldobj_il.Test::.ctor()
+ldflda int64 JitTest_ldobj_I8_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Int64
 ret
 }
@@ -603,8 +603,8 @@ ret
 ldc.i8 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda int64 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_I8_ldobj_il.Test::.ctor()
+ldflda int64 JitTest_ldobj_I8_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Int64
 ret
 }
@@ -615,8 +615,8 @@ ret
 ldc.i8 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda int64 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_I8_ldobj_il.Test::.ctor()
+ldflda int64 JitTest_ldobj_I8_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Int64
 ret
 }
@@ -627,8 +627,8 @@ ret
 ldc.i8 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda int64 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_I8_ldobj_il.Test::.ctor()
+ldflda int64 JitTest_ldobj_I8_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Int64
 ret
 }
@@ -676,7 +676,7 @@ newarr [mscorlib]System.Int64
 ldc.i4.1
 ldelema [mscorlib]System.Int64
 ldobj [mscorlib]System.Int64
-stsfld int64 JitTest.Test::m_v
+stsfld int64 JitTest_ldobj_I8_ldobj_il.Test::m_v
 ldloc.s V
 ret
 }
@@ -692,7 +692,7 @@ newarr [mscorlib]System.Int64
 ldc.i4.1
 ldelema [mscorlib]System.Int64
 ldobj [mscorlib]System.Int64
-call void JitTest.Test::Func(int64)
+call void JitTest_ldobj_I8_ldobj_il.Test::Func(int64)
 ldloc.s V
 ret
 }
@@ -751,13 +751,13 @@ ret
 .locals (int64 V)
 ldc.i8 0
 stloc.s V
-newobj instance void JitTest.Test::.ctor()
+newobj instance void JitTest_ldobj_I8_ldobj_il.Test::.ctor()
 ldc.i4.2
 newarr [mscorlib]System.Int64
 ldc.i4.1
 ldelema [mscorlib]System.Int64
 ldobj [mscorlib]System.Int64
-stfld int64 JitTest.Test::m_vv
+stfld int64 JitTest_ldobj_I8_ldobj_il.Test::m_vv
 ldloc.s V
 ret
 }
@@ -824,8 +824,8 @@ ret
 ldc.i8 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda int64 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_I8_ldobj_il.Test::.ctor()
+ldflda int64 JitTest_ldobj_I8_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Int64
 pop
 ldloc.s V
@@ -838,8 +838,8 @@ ret
 ldc.i8 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda int64 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_I8_ldobj_il.Test::.ctor()
+ldflda int64 JitTest_ldobj_I8_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Int64
 stloc.s V
 ldloc.s V
@@ -852,10 +852,10 @@ ret
 ldc.i8 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda int64 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_I8_ldobj_il.Test::.ctor()
+ldflda int64 JitTest_ldobj_I8_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Int64
-stsfld int64 JitTest.Test::m_v
+stsfld int64 JitTest_ldobj_I8_ldobj_il.Test::m_v
 ldloc.s V
 ret
 }
@@ -866,10 +866,10 @@ ret
 ldc.i8 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda int64 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_I8_ldobj_il.Test::.ctor()
+ldflda int64 JitTest_ldobj_I8_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Int64
-call void JitTest.Test::Func(int64)
+call void JitTest_ldobj_I8_ldobj_il.Test::Func(int64)
 ldloc.s V
 ret
 }
@@ -880,8 +880,8 @@ ret
 ldc.i8 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda int64 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_I8_ldobj_il.Test::.ctor()
+ldflda int64 JitTest_ldobj_I8_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Int64
 box [mscorlib]System.Int64
 pop
@@ -895,8 +895,8 @@ ret
 ldc.i8 0
 stloc.s V
 ldloca.s V
-newobj instance void JitTest.Test::.ctor()
-ldflda int64 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_I8_ldobj_il.Test::.ctor()
+ldflda int64 JitTest_ldobj_I8_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Int64
 stobj [mscorlib]System.Int64
 ldloc.s V
@@ -909,8 +909,8 @@ ret
 ldc.i8 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda int64 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_I8_ldobj_il.Test::.ctor()
+ldflda int64 JitTest_ldobj_I8_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Int64
 starg.s ARG
 ldloc.s V
@@ -922,11 +922,11 @@ ret
 .locals (int64 V)
 ldc.i8 0
 stloc.s V
-newobj instance void JitTest.Test::.ctor()
-newobj instance void JitTest.Test::.ctor()
-ldflda int64 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_I8_ldobj_il.Test::.ctor()
+newobj instance void JitTest_ldobj_I8_ldobj_il.Test::.ctor()
+ldflda int64 JitTest_ldobj_I8_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Int64
-stfld int64 JitTest.Test::m_vv
+stfld int64 JitTest_ldobj_I8_ldobj_il.Test::m_vv
 ldloc.s V
 ret
 }
@@ -937,8 +937,8 @@ ret
 ldc.i8 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda int64 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_I8_ldobj_il.Test::.ctor()
+ldflda int64 JitTest_ldobj_I8_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Int64
 ret
 }
@@ -949,8 +949,8 @@ ret
 ldc.i8 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda int64 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_I8_ldobj_il.Test::.ctor()
+ldflda int64 JitTest_ldobj_I8_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Int64
 ret
 }
@@ -961,8 +961,8 @@ ret
 ldc.i8 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda int64 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_I8_ldobj_il.Test::.ctor()
+ldflda int64 JitTest_ldobj_I8_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Int64
 ret
 }
@@ -973,8 +973,8 @@ ret
 ldc.i8 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda int64 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_I8_ldobj_il.Test::.ctor()
+ldflda int64 JitTest_ldobj_I8_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Int64
 ret
 }
@@ -1019,7 +1019,7 @@ ldloca.s V
 mkrefany [mscorlib]System.Int64
 refanyval [mscorlib]System.Int64
 ldobj [mscorlib]System.Int64
-stsfld int64 JitTest.Test::m_v
+stsfld int64 JitTest_ldobj_I8_ldobj_il.Test::m_v
 ldloc.s V
 ret
 }
@@ -1034,7 +1034,7 @@ ldloca.s V
 mkrefany [mscorlib]System.Int64
 refanyval [mscorlib]System.Int64
 ldobj [mscorlib]System.Int64
-call void JitTest.Test::Func(int64)
+call void JitTest_ldobj_I8_ldobj_il.Test::Func(int64)
 ldloc.s V
 ret
 }
@@ -1090,12 +1090,12 @@ ret
 .locals (int64 V)
 ldc.i8 0
 stloc.s V
-newobj instance void JitTest.Test::.ctor()
+newobj instance void JitTest_ldobj_I8_ldobj_il.Test::.ctor()
 ldloca.s V
 mkrefany [mscorlib]System.Int64
 refanyval [mscorlib]System.Int64
 ldobj [mscorlib]System.Int64
-stfld int64 JitTest.Test::m_vv
+stfld int64 JitTest_ldobj_I8_ldobj_il.Test::m_vv
 ldloc.s V
 ret
 }
@@ -1165,90 +1165,90 @@ ret
 ldc.i8 0
 stloc.s V
 ldloc.s V
-call int64 JitTest.Test::method_0_0(int64)
-call int64 JitTest.Test::method_0_1(int64)
-call int64 JitTest.Test::method_0_2(int64)
-call int64 JitTest.Test::method_0_3(int64)
-call int64 JitTest.Test::method_0_4(int64)
-call int64 JitTest.Test::method_0_5(int64)
-call int64 JitTest.Test::method_0_6(int64)
-call int64 JitTest.Test::method_0_7(int64)
-call int64 JitTest.Test::method_0_8(int64)
-call int64 JitTest.Test::method_0_9(int64)
-call int64 JitTest.Test::method_0_10(int64)
-call int64 JitTest.Test::method_0_11(int64)
-call int64 JitTest.Test::method_1_0(int64)
-call int64 JitTest.Test::method_1_1(int64)
-call int64 JitTest.Test::method_1_2(int64)
-call int64 JitTest.Test::method_1_3(int64)
-call int64 JitTest.Test::method_1_4(int64)
-call int64 JitTest.Test::method_1_5(int64)
-call int64 JitTest.Test::method_1_6(int64)
-call int64 JitTest.Test::method_1_7(int64)
-call int64 JitTest.Test::method_1_8(int64)
-call int64 JitTest.Test::method_1_9(int64)
-call int64 JitTest.Test::method_1_10(int64)
-call int64 JitTest.Test::method_1_11(int64)
-call int64 JitTest.Test::method_2_0(int64)
-call int64 JitTest.Test::method_2_1(int64)
-call int64 JitTest.Test::method_2_2(int64)
-call int64 JitTest.Test::method_2_3(int64)
-call int64 JitTest.Test::method_2_4(int64)
-call int64 JitTest.Test::method_2_5(int64)
-call int64 JitTest.Test::method_2_6(int64)
-call int64 JitTest.Test::method_2_7(int64)
-call int64 JitTest.Test::method_2_8(int64)
-call int64 JitTest.Test::method_2_9(int64)
-call int64 JitTest.Test::method_2_10(int64)
-call int64 JitTest.Test::method_2_11(int64)
-call int64 JitTest.Test::method_3_0(int64)
-call int64 JitTest.Test::method_3_1(int64)
-call int64 JitTest.Test::method_3_2(int64)
-call int64 JitTest.Test::method_3_3(int64)
-call int64 JitTest.Test::method_3_4(int64)
-call int64 JitTest.Test::method_3_5(int64)
-call int64 JitTest.Test::method_3_6(int64)
-call int64 JitTest.Test::method_3_7(int64)
-call int64 JitTest.Test::method_3_8(int64)
-call int64 JitTest.Test::method_3_9(int64)
-call int64 JitTest.Test::method_3_10(int64)
-call int64 JitTest.Test::method_3_11(int64)
-call int64 JitTest.Test::method_4_0(int64)
-call int64 JitTest.Test::method_4_1(int64)
-call int64 JitTest.Test::method_4_2(int64)
-call int64 JitTest.Test::method_4_3(int64)
-call int64 JitTest.Test::method_4_4(int64)
-call int64 JitTest.Test::method_4_5(int64)
-call int64 JitTest.Test::method_4_6(int64)
-call int64 JitTest.Test::method_4_7(int64)
-call int64 JitTest.Test::method_4_8(int64)
-call int64 JitTest.Test::method_4_9(int64)
-call int64 JitTest.Test::method_4_10(int64)
-call int64 JitTest.Test::method_4_11(int64)
-call int64 JitTest.Test::method_5_0(int64)
-call int64 JitTest.Test::method_5_1(int64)
-call int64 JitTest.Test::method_5_2(int64)
-call int64 JitTest.Test::method_5_3(int64)
-call int64 JitTest.Test::method_5_4(int64)
-call int64 JitTest.Test::method_5_5(int64)
-call int64 JitTest.Test::method_5_6(int64)
-call int64 JitTest.Test::method_5_7(int64)
-call int64 JitTest.Test::method_5_8(int64)
-call int64 JitTest.Test::method_5_9(int64)
-call int64 JitTest.Test::method_5_10(int64)
-call int64 JitTest.Test::method_5_11(int64)
-call int64 JitTest.Test::method_6_0(int64)
-call int64 JitTest.Test::method_6_1(int64)
-call int64 JitTest.Test::method_6_2(int64)
-call int64 JitTest.Test::method_6_3(int64)
-call int64 JitTest.Test::method_6_4(int64)
-call int64 JitTest.Test::method_6_5(int64)
-call int64 JitTest.Test::method_6_6(int64)
-call int64 JitTest.Test::method_6_7(int64)
-call int64 JitTest.Test::method_6_8(int64)
-call int64 JitTest.Test::method_6_9(int64)
-call int64 JitTest.Test::method_6_10(int64)
-call int64 JitTest.Test::method_6_11(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_0_0(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_0_1(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_0_2(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_0_3(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_0_4(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_0_5(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_0_6(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_0_7(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_0_8(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_0_9(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_0_10(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_0_11(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_1_0(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_1_1(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_1_2(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_1_3(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_1_4(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_1_5(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_1_6(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_1_7(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_1_8(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_1_9(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_1_10(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_1_11(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_2_0(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_2_1(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_2_2(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_2_3(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_2_4(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_2_5(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_2_6(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_2_7(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_2_8(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_2_9(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_2_10(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_2_11(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_3_0(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_3_1(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_3_2(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_3_3(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_3_4(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_3_5(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_3_6(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_3_7(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_3_8(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_3_9(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_3_10(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_3_11(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_4_0(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_4_1(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_4_2(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_4_3(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_4_4(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_4_5(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_4_6(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_4_7(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_4_8(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_4_9(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_4_10(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_4_11(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_5_0(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_5_1(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_5_2(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_5_3(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_5_4(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_5_5(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_5_6(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_5_7(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_5_8(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_5_9(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_5_10(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_5_11(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_6_0(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_6_1(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_6_2(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_6_3(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_6_4(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_6_5(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_6_6(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_6_7(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_6_8(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_6_9(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_6_10(int64)
+call int64 JitTest_ldobj_I8_ldobj_il.Test::method_6_11(int64)
 pop
 
       ldstr      "Passed"
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I8_il_d.ilproj b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I8_il_d.ilproj
index e26aec20d944b1..0caeb6481f33a1 100644
--- a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I8_il_d.ilproj
+++ b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I8_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I8_il_r.ilproj b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I8_il_r.ilproj
index 9bc221768cbd84..73185c9e21d947 100644
--- a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I8_il_r.ilproj
+++ b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I8_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I_il_d.ilproj b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I_il_d.ilproj
index 90e2d8b5ffa44b..7fa2e3ccd38550 100644
--- a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I_il_d.ilproj
+++ b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I_il_r.ilproj b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I_il_r.ilproj
index e9f9e8a99b40f8..25a96803b8591a 100644
--- a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I_il_r.ilproj
+++ b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R4.il b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R4.il
index ef99bd44b330fa..0c3524af222529 100644
--- a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R4.il
+++ b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R4.il
@@ -10,7 +10,7 @@
 }
 .assembly ldobj_R4 { }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_ldobj_R4_ldobj_il
 {
   .class public auto ansi beforefieldinit Test
          extends [mscorlib]System.Object
@@ -59,7 +59,7 @@ stloc.s V
 
 ldloca.s V
 ldobj [mscorlib]System.Single
-stsfld float32 JitTest.Test::m_v
+stsfld float32 JitTest_ldobj_R4_ldobj_il.Test::m_v
 ldloc.s V
 ret
 }
@@ -72,7 +72,7 @@ stloc.s V
 
 ldloca.s V
 ldobj [mscorlib]System.Single
-call void JitTest.Test::Func(float32)
+call void JitTest_ldobj_R4_ldobj_il.Test::Func(float32)
 ldloc.s V
 ret
 }
@@ -122,10 +122,10 @@ ret
 .locals (float32 V)
 ldc.r4 0
 stloc.s V
-newobj instance void JitTest.Test::.ctor()
+newobj instance void JitTest_ldobj_R4_ldobj_il.Test::.ctor()
 ldloca.s V
 ldobj [mscorlib]System.Single
-stfld float32 JitTest.Test::m_vv
+stfld float32 JitTest_ldobj_R4_ldobj_il.Test::m_vv
 ldloc.s V
 ret
 }
@@ -180,7 +180,7 @@ ret
 ldc.r4 0
 stloc.s V
 
-ldsflda float32 JitTest.Test::m_v
+ldsflda float32 JitTest_ldobj_R4_ldobj_il.Test::m_v
 ldobj [mscorlib]System.Single
 pop
 ldloc.s V
@@ -193,7 +193,7 @@ ret
 ldc.r4 0
 stloc.s V
 
-ldsflda float32 JitTest.Test::m_v
+ldsflda float32 JitTest_ldobj_R4_ldobj_il.Test::m_v
 ldobj [mscorlib]System.Single
 stloc.s V
 ldloc.s V
@@ -206,9 +206,9 @@ ret
 ldc.r4 0
 stloc.s V
 
-ldsflda float32 JitTest.Test::m_v
+ldsflda float32 JitTest_ldobj_R4_ldobj_il.Test::m_v
 ldobj [mscorlib]System.Single
-stsfld float32 JitTest.Test::m_v
+stsfld float32 JitTest_ldobj_R4_ldobj_il.Test::m_v
 ldloc.s V
 ret
 }
@@ -219,9 +219,9 @@ ret
 ldc.r4 0
 stloc.s V
 
-ldsflda float32 JitTest.Test::m_v
+ldsflda float32 JitTest_ldobj_R4_ldobj_il.Test::m_v
 ldobj [mscorlib]System.Single
-call void JitTest.Test::Func(float32)
+call void JitTest_ldobj_R4_ldobj_il.Test::Func(float32)
 ldloc.s V
 ret
 }
@@ -232,7 +232,7 @@ ret
 ldc.r4 0
 stloc.s V
 
-ldsflda float32 JitTest.Test::m_v
+ldsflda float32 JitTest_ldobj_R4_ldobj_il.Test::m_v
 ldobj [mscorlib]System.Single
 box [mscorlib]System.Single
 pop
@@ -246,7 +246,7 @@ ret
 ldc.r4 0
 stloc.s V
 ldloca.s V
-ldsflda float32 JitTest.Test::m_v
+ldsflda float32 JitTest_ldobj_R4_ldobj_il.Test::m_v
 ldobj [mscorlib]System.Single
 stobj [mscorlib]System.Single
 ldloc.s V
@@ -259,7 +259,7 @@ ret
 ldc.r4 0
 stloc.s V
 
-ldsflda float32 JitTest.Test::m_v
+ldsflda float32 JitTest_ldobj_R4_ldobj_il.Test::m_v
 ldobj [mscorlib]System.Single
 starg.s ARG
 ldloc.s V
@@ -271,10 +271,10 @@ ret
 .locals (float32 V)
 ldc.r4 0
 stloc.s V
-newobj instance void JitTest.Test::.ctor()
-ldsflda float32 JitTest.Test::m_v
+newobj instance void JitTest_ldobj_R4_ldobj_il.Test::.ctor()
+ldsflda float32 JitTest_ldobj_R4_ldobj_il.Test::m_v
 ldobj [mscorlib]System.Single
-stfld float32 JitTest.Test::m_vv
+stfld float32 JitTest_ldobj_R4_ldobj_il.Test::m_vv
 ldloc.s V
 ret
 }
@@ -285,7 +285,7 @@ ret
 ldc.r4 0
 stloc.s V
 
-ldsflda float32 JitTest.Test::m_v
+ldsflda float32 JitTest_ldobj_R4_ldobj_il.Test::m_v
 ldobj [mscorlib]System.Single
 ret
 }
@@ -296,7 +296,7 @@ ret
 ldc.r4 0
 stloc.s V
 
-ldsflda float32 JitTest.Test::m_v
+ldsflda float32 JitTest_ldobj_R4_ldobj_il.Test::m_v
 ldobj [mscorlib]System.Single
 ret
 }
@@ -307,7 +307,7 @@ ret
 ldc.r4 0
 stloc.s V
 
-ldsflda float32 JitTest.Test::m_v
+ldsflda float32 JitTest_ldobj_R4_ldobj_il.Test::m_v
 ldobj [mscorlib]System.Single
 ret
 }
@@ -318,7 +318,7 @@ ret
 ldc.r4 0
 stloc.s V
 
-ldsflda float32 JitTest.Test::m_v
+ldsflda float32 JitTest_ldobj_R4_ldobj_il.Test::m_v
 ldobj [mscorlib]System.Single
 ret
 }
@@ -357,7 +357,7 @@ stloc.s V
 
 ldarga.s ARG
 ldobj [mscorlib]System.Single
-stsfld float32 JitTest.Test::m_v
+stsfld float32 JitTest_ldobj_R4_ldobj_il.Test::m_v
 ldloc.s V
 ret
 }
@@ -370,7 +370,7 @@ stloc.s V
 
 ldarga.s ARG
 ldobj [mscorlib]System.Single
-call void JitTest.Test::Func(float32)
+call void JitTest_ldobj_R4_ldobj_il.Test::Func(float32)
 ldloc.s V
 ret
 }
@@ -420,10 +420,10 @@ ret
 .locals (float32 V)
 ldc.r4 0
 stloc.s V
-newobj instance void JitTest.Test::.ctor()
+newobj instance void JitTest_ldobj_R4_ldobj_il.Test::.ctor()
 ldarga.s ARG
 ldobj [mscorlib]System.Single
-stfld float32 JitTest.Test::m_vv
+stfld float32 JitTest_ldobj_R4_ldobj_il.Test::m_vv
 ldloc.s V
 ret
 }
@@ -478,8 +478,8 @@ ret
 ldc.r4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda float32 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_R4_ldobj_il.Test::.ctor()
+ldflda float32 JitTest_ldobj_R4_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Single
 pop
 ldloc.s V
@@ -492,8 +492,8 @@ ret
 ldc.r4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda float32 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_R4_ldobj_il.Test::.ctor()
+ldflda float32 JitTest_ldobj_R4_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Single
 stloc.s V
 ldloc.s V
@@ -506,10 +506,10 @@ ret
 ldc.r4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda float32 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_R4_ldobj_il.Test::.ctor()
+ldflda float32 JitTest_ldobj_R4_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Single
-stsfld float32 JitTest.Test::m_v
+stsfld float32 JitTest_ldobj_R4_ldobj_il.Test::m_v
 ldloc.s V
 ret
 }
@@ -520,10 +520,10 @@ ret
 ldc.r4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda float32 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_R4_ldobj_il.Test::.ctor()
+ldflda float32 JitTest_ldobj_R4_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Single
-call void JitTest.Test::Func(float32)
+call void JitTest_ldobj_R4_ldobj_il.Test::Func(float32)
 ldloc.s V
 ret
 }
@@ -534,8 +534,8 @@ ret
 ldc.r4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda float32 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_R4_ldobj_il.Test::.ctor()
+ldflda float32 JitTest_ldobj_R4_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Single
 box [mscorlib]System.Single
 pop
@@ -549,8 +549,8 @@ ret
 ldc.r4 0
 stloc.s V
 ldloca.s V
-newobj instance void JitTest.Test::.ctor()
-ldflda float32 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_R4_ldobj_il.Test::.ctor()
+ldflda float32 JitTest_ldobj_R4_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Single
 stobj [mscorlib]System.Single
 ldloc.s V
@@ -563,8 +563,8 @@ ret
 ldc.r4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda float32 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_R4_ldobj_il.Test::.ctor()
+ldflda float32 JitTest_ldobj_R4_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Single
 starg.s ARG
 ldloc.s V
@@ -576,11 +576,11 @@ ret
 .locals (float32 V)
 ldc.r4 0
 stloc.s V
-newobj instance void JitTest.Test::.ctor()
-newobj instance void JitTest.Test::.ctor()
-ldflda float32 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_R4_ldobj_il.Test::.ctor()
+newobj instance void JitTest_ldobj_R4_ldobj_il.Test::.ctor()
+ldflda float32 JitTest_ldobj_R4_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Single
-stfld float32 JitTest.Test::m_vv
+stfld float32 JitTest_ldobj_R4_ldobj_il.Test::m_vv
 ldloc.s V
 ret
 }
@@ -591,8 +591,8 @@ ret
 ldc.r4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda float32 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_R4_ldobj_il.Test::.ctor()
+ldflda float32 JitTest_ldobj_R4_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Single
 ret
 }
@@ -603,8 +603,8 @@ ret
 ldc.r4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda float32 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_R4_ldobj_il.Test::.ctor()
+ldflda float32 JitTest_ldobj_R4_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Single
 ret
 }
@@ -615,8 +615,8 @@ ret
 ldc.r4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda float32 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_R4_ldobj_il.Test::.ctor()
+ldflda float32 JitTest_ldobj_R4_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Single
 ret
 }
@@ -627,8 +627,8 @@ ret
 ldc.r4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda float32 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_R4_ldobj_il.Test::.ctor()
+ldflda float32 JitTest_ldobj_R4_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Single
 ret
 }
@@ -676,7 +676,7 @@ newarr [mscorlib]System.Single
 ldc.i4.1
 ldelema [mscorlib]System.Single
 ldobj [mscorlib]System.Single
-stsfld float32 JitTest.Test::m_v
+stsfld float32 JitTest_ldobj_R4_ldobj_il.Test::m_v
 ldloc.s V
 ret
 }
@@ -692,7 +692,7 @@ newarr [mscorlib]System.Single
 ldc.i4.1
 ldelema [mscorlib]System.Single
 ldobj [mscorlib]System.Single
-call void JitTest.Test::Func(float32)
+call void JitTest_ldobj_R4_ldobj_il.Test::Func(float32)
 ldloc.s V
 ret
 }
@@ -751,13 +751,13 @@ ret
 .locals (float32 V)
 ldc.r4 0
 stloc.s V
-newobj instance void JitTest.Test::.ctor()
+newobj instance void JitTest_ldobj_R4_ldobj_il.Test::.ctor()
 ldc.i4.2
 newarr [mscorlib]System.Single
 ldc.i4.1
 ldelema [mscorlib]System.Single
 ldobj [mscorlib]System.Single
-stfld float32 JitTest.Test::m_vv
+stfld float32 JitTest_ldobj_R4_ldobj_il.Test::m_vv
 ldloc.s V
 ret
 }
@@ -824,8 +824,8 @@ ret
 ldc.r4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda float32 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_R4_ldobj_il.Test::.ctor()
+ldflda float32 JitTest_ldobj_R4_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Single
 pop
 ldloc.s V
@@ -838,8 +838,8 @@ ret
 ldc.r4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda float32 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_R4_ldobj_il.Test::.ctor()
+ldflda float32 JitTest_ldobj_R4_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Single
 stloc.s V
 ldloc.s V
@@ -852,10 +852,10 @@ ret
 ldc.r4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda float32 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_R4_ldobj_il.Test::.ctor()
+ldflda float32 JitTest_ldobj_R4_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Single
-stsfld float32 JitTest.Test::m_v
+stsfld float32 JitTest_ldobj_R4_ldobj_il.Test::m_v
 ldloc.s V
 ret
 }
@@ -866,10 +866,10 @@ ret
 ldc.r4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda float32 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_R4_ldobj_il.Test::.ctor()
+ldflda float32 JitTest_ldobj_R4_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Single
-call void JitTest.Test::Func(float32)
+call void JitTest_ldobj_R4_ldobj_il.Test::Func(float32)
 ldloc.s V
 ret
 }
@@ -880,8 +880,8 @@ ret
 ldc.r4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda float32 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_R4_ldobj_il.Test::.ctor()
+ldflda float32 JitTest_ldobj_R4_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Single
 box [mscorlib]System.Single
 pop
@@ -895,8 +895,8 @@ ret
 ldc.r4 0
 stloc.s V
 ldloca.s V
-newobj instance void JitTest.Test::.ctor()
-ldflda float32 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_R4_ldobj_il.Test::.ctor()
+ldflda float32 JitTest_ldobj_R4_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Single
 stobj [mscorlib]System.Single
 ldloc.s V
@@ -909,8 +909,8 @@ ret
 ldc.r4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda float32 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_R4_ldobj_il.Test::.ctor()
+ldflda float32 JitTest_ldobj_R4_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Single
 starg.s ARG
 ldloc.s V
@@ -922,11 +922,11 @@ ret
 .locals (float32 V)
 ldc.r4 0
 stloc.s V
-newobj instance void JitTest.Test::.ctor()
-newobj instance void JitTest.Test::.ctor()
-ldflda float32 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_R4_ldobj_il.Test::.ctor()
+newobj instance void JitTest_ldobj_R4_ldobj_il.Test::.ctor()
+ldflda float32 JitTest_ldobj_R4_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Single
-stfld float32 JitTest.Test::m_vv
+stfld float32 JitTest_ldobj_R4_ldobj_il.Test::m_vv
 ldloc.s V
 ret
 }
@@ -937,8 +937,8 @@ ret
 ldc.r4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda float32 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_R4_ldobj_il.Test::.ctor()
+ldflda float32 JitTest_ldobj_R4_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Single
 ret
 }
@@ -949,8 +949,8 @@ ret
 ldc.r4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda float32 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_R4_ldobj_il.Test::.ctor()
+ldflda float32 JitTest_ldobj_R4_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Single
 ret
 }
@@ -961,8 +961,8 @@ ret
 ldc.r4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda float32 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_R4_ldobj_il.Test::.ctor()
+ldflda float32 JitTest_ldobj_R4_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Single
 ret
 }
@@ -973,8 +973,8 @@ ret
 ldc.r4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda float32 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_R4_ldobj_il.Test::.ctor()
+ldflda float32 JitTest_ldobj_R4_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Single
 ret
 }
@@ -1019,7 +1019,7 @@ ldloca.s V
 mkrefany [mscorlib]System.Single
 refanyval [mscorlib]System.Single
 ldobj [mscorlib]System.Single
-stsfld float32 JitTest.Test::m_v
+stsfld float32 JitTest_ldobj_R4_ldobj_il.Test::m_v
 ldloc.s V
 ret
 }
@@ -1034,7 +1034,7 @@ ldloca.s V
 mkrefany [mscorlib]System.Single
 refanyval [mscorlib]System.Single
 ldobj [mscorlib]System.Single
-call void JitTest.Test::Func(float32)
+call void JitTest_ldobj_R4_ldobj_il.Test::Func(float32)
 ldloc.s V
 ret
 }
@@ -1090,12 +1090,12 @@ ret
 .locals (float32 V)
 ldc.r4 0
 stloc.s V
-newobj instance void JitTest.Test::.ctor()
+newobj instance void JitTest_ldobj_R4_ldobj_il.Test::.ctor()
 ldloca.s V
 mkrefany [mscorlib]System.Single
 refanyval [mscorlib]System.Single
 ldobj [mscorlib]System.Single
-stfld float32 JitTest.Test::m_vv
+stfld float32 JitTest_ldobj_R4_ldobj_il.Test::m_vv
 ldloc.s V
 ret
 }
@@ -1165,90 +1165,90 @@ ret
 ldc.r4 0
 stloc.s V
 ldloc.s V
-call float32 JitTest.Test::method_0_0(float32)
-call float32 JitTest.Test::method_0_1(float32)
-call float32 JitTest.Test::method_0_2(float32)
-call float32 JitTest.Test::method_0_3(float32)
-call float32 JitTest.Test::method_0_4(float32)
-call float32 JitTest.Test::method_0_5(float32)
-call float32 JitTest.Test::method_0_6(float32)
-call float32 JitTest.Test::method_0_7(float32)
-call float32 JitTest.Test::method_0_8(float32)
-call float32 JitTest.Test::method_0_9(float32)
-call float32 JitTest.Test::method_0_10(float32)
-call float32 JitTest.Test::method_0_11(float32)
-call float32 JitTest.Test::method_1_0(float32)
-call float32 JitTest.Test::method_1_1(float32)
-call float32 JitTest.Test::method_1_2(float32)
-call float32 JitTest.Test::method_1_3(float32)
-call float32 JitTest.Test::method_1_4(float32)
-call float32 JitTest.Test::method_1_5(float32)
-call float32 JitTest.Test::method_1_6(float32)
-call float32 JitTest.Test::method_1_7(float32)
-call float32 JitTest.Test::method_1_8(float32)
-call float32 JitTest.Test::method_1_9(float32)
-call float32 JitTest.Test::method_1_10(float32)
-call float32 JitTest.Test::method_1_11(float32)
-call float32 JitTest.Test::method_2_0(float32)
-call float32 JitTest.Test::method_2_1(float32)
-call float32 JitTest.Test::method_2_2(float32)
-call float32 JitTest.Test::method_2_3(float32)
-call float32 JitTest.Test::method_2_4(float32)
-call float32 JitTest.Test::method_2_5(float32)
-call float32 JitTest.Test::method_2_6(float32)
-call float32 JitTest.Test::method_2_7(float32)
-call float32 JitTest.Test::method_2_8(float32)
-call float32 JitTest.Test::method_2_9(float32)
-call float32 JitTest.Test::method_2_10(float32)
-call float32 JitTest.Test::method_2_11(float32)
-call float32 JitTest.Test::method_3_0(float32)
-call float32 JitTest.Test::method_3_1(float32)
-call float32 JitTest.Test::method_3_2(float32)
-call float32 JitTest.Test::method_3_3(float32)
-call float32 JitTest.Test::method_3_4(float32)
-call float32 JitTest.Test::method_3_5(float32)
-call float32 JitTest.Test::method_3_6(float32)
-call float32 JitTest.Test::method_3_7(float32)
-call float32 JitTest.Test::method_3_8(float32)
-call float32 JitTest.Test::method_3_9(float32)
-call float32 JitTest.Test::method_3_10(float32)
-call float32 JitTest.Test::method_3_11(float32)
-call float32 JitTest.Test::method_4_0(float32)
-call float32 JitTest.Test::method_4_1(float32)
-call float32 JitTest.Test::method_4_2(float32)
-call float32 JitTest.Test::method_4_3(float32)
-call float32 JitTest.Test::method_4_4(float32)
-call float32 JitTest.Test::method_4_5(float32)
-call float32 JitTest.Test::method_4_6(float32)
-call float32 JitTest.Test::method_4_7(float32)
-call float32 JitTest.Test::method_4_8(float32)
-call float32 JitTest.Test::method_4_9(float32)
-call float32 JitTest.Test::method_4_10(float32)
-call float32 JitTest.Test::method_4_11(float32)
-call float32 JitTest.Test::method_5_0(float32)
-call float32 JitTest.Test::method_5_1(float32)
-call float32 JitTest.Test::method_5_2(float32)
-call float32 JitTest.Test::method_5_3(float32)
-call float32 JitTest.Test::method_5_4(float32)
-call float32 JitTest.Test::method_5_5(float32)
-call float32 JitTest.Test::method_5_6(float32)
-call float32 JitTest.Test::method_5_7(float32)
-call float32 JitTest.Test::method_5_8(float32)
-call float32 JitTest.Test::method_5_9(float32)
-call float32 JitTest.Test::method_5_10(float32)
-call float32 JitTest.Test::method_5_11(float32)
-call float32 JitTest.Test::method_6_0(float32)
-call float32 JitTest.Test::method_6_1(float32)
-call float32 JitTest.Test::method_6_2(float32)
-call float32 JitTest.Test::method_6_3(float32)
-call float32 JitTest.Test::method_6_4(float32)
-call float32 JitTest.Test::method_6_5(float32)
-call float32 JitTest.Test::method_6_6(float32)
-call float32 JitTest.Test::method_6_7(float32)
-call float32 JitTest.Test::method_6_8(float32)
-call float32 JitTest.Test::method_6_9(float32)
-call float32 JitTest.Test::method_6_10(float32)
-call float32 JitTest.Test::method_6_11(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_0_0(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_0_1(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_0_2(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_0_3(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_0_4(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_0_5(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_0_6(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_0_7(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_0_8(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_0_9(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_0_10(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_0_11(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_1_0(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_1_1(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_1_2(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_1_3(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_1_4(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_1_5(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_1_6(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_1_7(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_1_8(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_1_9(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_1_10(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_1_11(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_2_0(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_2_1(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_2_2(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_2_3(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_2_4(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_2_5(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_2_6(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_2_7(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_2_8(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_2_9(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_2_10(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_2_11(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_3_0(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_3_1(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_3_2(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_3_3(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_3_4(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_3_5(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_3_6(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_3_7(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_3_8(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_3_9(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_3_10(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_3_11(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_4_0(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_4_1(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_4_2(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_4_3(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_4_4(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_4_5(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_4_6(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_4_7(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_4_8(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_4_9(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_4_10(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_4_11(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_5_0(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_5_1(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_5_2(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_5_3(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_5_4(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_5_5(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_5_6(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_5_7(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_5_8(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_5_9(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_5_10(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_5_11(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_6_0(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_6_1(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_6_2(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_6_3(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_6_4(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_6_5(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_6_6(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_6_7(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_6_8(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_6_9(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_6_10(float32)
+call float32 JitTest_ldobj_R4_ldobj_il.Test::method_6_11(float32)
 pop
 
       ldstr      "Passed"
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R4_il_d.ilproj b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R4_il_d.ilproj
index b4b3470e4a0ec0..9e88e90cbe4c54 100644
--- a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R4_il_d.ilproj
+++ b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R4_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R4_il_r.ilproj b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R4_il_r.ilproj
index 03f199f5ee699f..d81a62bfb5e8bf 100644
--- a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R4_il_r.ilproj
+++ b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R4_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R8.il b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R8.il
index 246f929f61b56e..724f11553fa6b2 100644
--- a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R8.il
+++ b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R8.il
@@ -10,7 +10,7 @@
 }
 .assembly ldobj_R8 { }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_ldobj_R8_ldobj_il
 {
   .class public auto ansi beforefieldinit Test
          extends [mscorlib]System.Object
@@ -59,7 +59,7 @@ stloc.s V
 
 ldloca.s V
 ldobj [mscorlib]System.Double
-stsfld float64 JitTest.Test::m_v
+stsfld float64 JitTest_ldobj_R8_ldobj_il.Test::m_v
 ldloc.s V
 ret
 }
@@ -72,7 +72,7 @@ stloc.s V
 
 ldloca.s V
 ldobj [mscorlib]System.Double
-call void JitTest.Test::Func(float64)
+call void JitTest_ldobj_R8_ldobj_il.Test::Func(float64)
 ldloc.s V
 ret
 }
@@ -122,10 +122,10 @@ ret
 .locals (float64 V)
 ldc.r8 0
 stloc.s V
-newobj instance void JitTest.Test::.ctor()
+newobj instance void JitTest_ldobj_R8_ldobj_il.Test::.ctor()
 ldloca.s V
 ldobj [mscorlib]System.Double
-stfld float64 JitTest.Test::m_vv
+stfld float64 JitTest_ldobj_R8_ldobj_il.Test::m_vv
 ldloc.s V
 ret
 }
@@ -180,7 +180,7 @@ ret
 ldc.r8 0
 stloc.s V
 
-ldsflda float64 JitTest.Test::m_v
+ldsflda float64 JitTest_ldobj_R8_ldobj_il.Test::m_v
 ldobj [mscorlib]System.Double
 pop
 ldloc.s V
@@ -193,7 +193,7 @@ ret
 ldc.r8 0
 stloc.s V
 
-ldsflda float64 JitTest.Test::m_v
+ldsflda float64 JitTest_ldobj_R8_ldobj_il.Test::m_v
 ldobj [mscorlib]System.Double
 stloc.s V
 ldloc.s V
@@ -206,9 +206,9 @@ ret
 ldc.r8 0
 stloc.s V
 
-ldsflda float64 JitTest.Test::m_v
+ldsflda float64 JitTest_ldobj_R8_ldobj_il.Test::m_v
 ldobj [mscorlib]System.Double
-stsfld float64 JitTest.Test::m_v
+stsfld float64 JitTest_ldobj_R8_ldobj_il.Test::m_v
 ldloc.s V
 ret
 }
@@ -219,9 +219,9 @@ ret
 ldc.r8 0
 stloc.s V
 
-ldsflda float64 JitTest.Test::m_v
+ldsflda float64 JitTest_ldobj_R8_ldobj_il.Test::m_v
 ldobj [mscorlib]System.Double
-call void JitTest.Test::Func(float64)
+call void JitTest_ldobj_R8_ldobj_il.Test::Func(float64)
 ldloc.s V
 ret
 }
@@ -232,7 +232,7 @@ ret
 ldc.r8 0
 stloc.s V
 
-ldsflda float64 JitTest.Test::m_v
+ldsflda float64 JitTest_ldobj_R8_ldobj_il.Test::m_v
 ldobj [mscorlib]System.Double
 box [mscorlib]System.Double
 pop
@@ -246,7 +246,7 @@ ret
 ldc.r8 0
 stloc.s V
 ldloca.s V
-ldsflda float64 JitTest.Test::m_v
+ldsflda float64 JitTest_ldobj_R8_ldobj_il.Test::m_v
 ldobj [mscorlib]System.Double
 stobj [mscorlib]System.Double
 ldloc.s V
@@ -259,7 +259,7 @@ ret
 ldc.r8 0
 stloc.s V
 
-ldsflda float64 JitTest.Test::m_v
+ldsflda float64 JitTest_ldobj_R8_ldobj_il.Test::m_v
 ldobj [mscorlib]System.Double
 starg.s ARG
 ldloc.s V
@@ -271,10 +271,10 @@ ret
 .locals (float64 V)
 ldc.r8 0
 stloc.s V
-newobj instance void JitTest.Test::.ctor()
-ldsflda float64 JitTest.Test::m_v
+newobj instance void JitTest_ldobj_R8_ldobj_il.Test::.ctor()
+ldsflda float64 JitTest_ldobj_R8_ldobj_il.Test::m_v
 ldobj [mscorlib]System.Double
-stfld float64 JitTest.Test::m_vv
+stfld float64 JitTest_ldobj_R8_ldobj_il.Test::m_vv
 ldloc.s V
 ret
 }
@@ -285,7 +285,7 @@ ret
 ldc.r8 0
 stloc.s V
 
-ldsflda float64 JitTest.Test::m_v
+ldsflda float64 JitTest_ldobj_R8_ldobj_il.Test::m_v
 ldobj [mscorlib]System.Double
 ret
 }
@@ -296,7 +296,7 @@ ret
 ldc.r8 0
 stloc.s V
 
-ldsflda float64 JitTest.Test::m_v
+ldsflda float64 JitTest_ldobj_R8_ldobj_il.Test::m_v
 ldobj [mscorlib]System.Double
 ret
 }
@@ -307,7 +307,7 @@ ret
 ldc.r8 0
 stloc.s V
 
-ldsflda float64 JitTest.Test::m_v
+ldsflda float64 JitTest_ldobj_R8_ldobj_il.Test::m_v
 ldobj [mscorlib]System.Double
 ret
 }
@@ -318,7 +318,7 @@ ret
 ldc.r8 0
 stloc.s V
 
-ldsflda float64 JitTest.Test::m_v
+ldsflda float64 JitTest_ldobj_R8_ldobj_il.Test::m_v
 ldobj [mscorlib]System.Double
 ret
 }
@@ -357,7 +357,7 @@ stloc.s V
 
 ldarga.s ARG
 ldobj [mscorlib]System.Double
-stsfld float64 JitTest.Test::m_v
+stsfld float64 JitTest_ldobj_R8_ldobj_il.Test::m_v
 ldloc.s V
 ret
 }
@@ -370,7 +370,7 @@ stloc.s V
 
 ldarga.s ARG
 ldobj [mscorlib]System.Double
-call void JitTest.Test::Func(float64)
+call void JitTest_ldobj_R8_ldobj_il.Test::Func(float64)
 ldloc.s V
 ret
 }
@@ -420,10 +420,10 @@ ret
 .locals (float64 V)
 ldc.r8 0
 stloc.s V
-newobj instance void JitTest.Test::.ctor()
+newobj instance void JitTest_ldobj_R8_ldobj_il.Test::.ctor()
 ldarga.s ARG
 ldobj [mscorlib]System.Double
-stfld float64 JitTest.Test::m_vv
+stfld float64 JitTest_ldobj_R8_ldobj_il.Test::m_vv
 ldloc.s V
 ret
 }
@@ -478,8 +478,8 @@ ret
 ldc.r8 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda float64 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_R8_ldobj_il.Test::.ctor()
+ldflda float64 JitTest_ldobj_R8_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Double
 pop
 ldloc.s V
@@ -492,8 +492,8 @@ ret
 ldc.r8 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda float64 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_R8_ldobj_il.Test::.ctor()
+ldflda float64 JitTest_ldobj_R8_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Double
 stloc.s V
 ldloc.s V
@@ -506,10 +506,10 @@ ret
 ldc.r8 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda float64 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_R8_ldobj_il.Test::.ctor()
+ldflda float64 JitTest_ldobj_R8_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Double
-stsfld float64 JitTest.Test::m_v
+stsfld float64 JitTest_ldobj_R8_ldobj_il.Test::m_v
 ldloc.s V
 ret
 }
@@ -520,10 +520,10 @@ ret
 ldc.r8 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda float64 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_R8_ldobj_il.Test::.ctor()
+ldflda float64 JitTest_ldobj_R8_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Double
-call void JitTest.Test::Func(float64)
+call void JitTest_ldobj_R8_ldobj_il.Test::Func(float64)
 ldloc.s V
 ret
 }
@@ -534,8 +534,8 @@ ret
 ldc.r8 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda float64 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_R8_ldobj_il.Test::.ctor()
+ldflda float64 JitTest_ldobj_R8_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Double
 box [mscorlib]System.Double
 pop
@@ -549,8 +549,8 @@ ret
 ldc.r8 0
 stloc.s V
 ldloca.s V
-newobj instance void JitTest.Test::.ctor()
-ldflda float64 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_R8_ldobj_il.Test::.ctor()
+ldflda float64 JitTest_ldobj_R8_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Double
 stobj [mscorlib]System.Double
 ldloc.s V
@@ -563,8 +563,8 @@ ret
 ldc.r8 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda float64 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_R8_ldobj_il.Test::.ctor()
+ldflda float64 JitTest_ldobj_R8_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Double
 starg.s ARG
 ldloc.s V
@@ -576,11 +576,11 @@ ret
 .locals (float64 V)
 ldc.r8 0
 stloc.s V
-newobj instance void JitTest.Test::.ctor()
-newobj instance void JitTest.Test::.ctor()
-ldflda float64 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_R8_ldobj_il.Test::.ctor()
+newobj instance void JitTest_ldobj_R8_ldobj_il.Test::.ctor()
+ldflda float64 JitTest_ldobj_R8_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Double
-stfld float64 JitTest.Test::m_vv
+stfld float64 JitTest_ldobj_R8_ldobj_il.Test::m_vv
 ldloc.s V
 ret
 }
@@ -591,8 +591,8 @@ ret
 ldc.r8 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda float64 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_R8_ldobj_il.Test::.ctor()
+ldflda float64 JitTest_ldobj_R8_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Double
 ret
 }
@@ -603,8 +603,8 @@ ret
 ldc.r8 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda float64 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_R8_ldobj_il.Test::.ctor()
+ldflda float64 JitTest_ldobj_R8_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Double
 ret
 }
@@ -615,8 +615,8 @@ ret
 ldc.r8 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda float64 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_R8_ldobj_il.Test::.ctor()
+ldflda float64 JitTest_ldobj_R8_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Double
 ret
 }
@@ -627,8 +627,8 @@ ret
 ldc.r8 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda float64 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_R8_ldobj_il.Test::.ctor()
+ldflda float64 JitTest_ldobj_R8_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Double
 ret
 }
@@ -676,7 +676,7 @@ newarr [mscorlib]System.Double
 ldc.i4.1
 ldelema [mscorlib]System.Double
 ldobj [mscorlib]System.Double
-stsfld float64 JitTest.Test::m_v
+stsfld float64 JitTest_ldobj_R8_ldobj_il.Test::m_v
 ldloc.s V
 ret
 }
@@ -692,7 +692,7 @@ newarr [mscorlib]System.Double
 ldc.i4.1
 ldelema [mscorlib]System.Double
 ldobj [mscorlib]System.Double
-call void JitTest.Test::Func(float64)
+call void JitTest_ldobj_R8_ldobj_il.Test::Func(float64)
 ldloc.s V
 ret
 }
@@ -751,13 +751,13 @@ ret
 .locals (float64 V)
 ldc.r8 0
 stloc.s V
-newobj instance void JitTest.Test::.ctor()
+newobj instance void JitTest_ldobj_R8_ldobj_il.Test::.ctor()
 ldc.i4.2
 newarr [mscorlib]System.Double
 ldc.i4.1
 ldelema [mscorlib]System.Double
 ldobj [mscorlib]System.Double
-stfld float64 JitTest.Test::m_vv
+stfld float64 JitTest_ldobj_R8_ldobj_il.Test::m_vv
 ldloc.s V
 ret
 }
@@ -824,8 +824,8 @@ ret
 ldc.r8 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda float64 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_R8_ldobj_il.Test::.ctor()
+ldflda float64 JitTest_ldobj_R8_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Double
 pop
 ldloc.s V
@@ -838,8 +838,8 @@ ret
 ldc.r8 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda float64 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_R8_ldobj_il.Test::.ctor()
+ldflda float64 JitTest_ldobj_R8_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Double
 stloc.s V
 ldloc.s V
@@ -852,10 +852,10 @@ ret
 ldc.r8 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda float64 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_R8_ldobj_il.Test::.ctor()
+ldflda float64 JitTest_ldobj_R8_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Double
-stsfld float64 JitTest.Test::m_v
+stsfld float64 JitTest_ldobj_R8_ldobj_il.Test::m_v
 ldloc.s V
 ret
 }
@@ -866,10 +866,10 @@ ret
 ldc.r8 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda float64 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_R8_ldobj_il.Test::.ctor()
+ldflda float64 JitTest_ldobj_R8_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Double
-call void JitTest.Test::Func(float64)
+call void JitTest_ldobj_R8_ldobj_il.Test::Func(float64)
 ldloc.s V
 ret
 }
@@ -880,8 +880,8 @@ ret
 ldc.r8 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda float64 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_R8_ldobj_il.Test::.ctor()
+ldflda float64 JitTest_ldobj_R8_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Double
 box [mscorlib]System.Double
 pop
@@ -895,8 +895,8 @@ ret
 ldc.r8 0
 stloc.s V
 ldloca.s V
-newobj instance void JitTest.Test::.ctor()
-ldflda float64 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_R8_ldobj_il.Test::.ctor()
+ldflda float64 JitTest_ldobj_R8_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Double
 stobj [mscorlib]System.Double
 ldloc.s V
@@ -909,8 +909,8 @@ ret
 ldc.r8 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda float64 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_R8_ldobj_il.Test::.ctor()
+ldflda float64 JitTest_ldobj_R8_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Double
 starg.s ARG
 ldloc.s V
@@ -922,11 +922,11 @@ ret
 .locals (float64 V)
 ldc.r8 0
 stloc.s V
-newobj instance void JitTest.Test::.ctor()
-newobj instance void JitTest.Test::.ctor()
-ldflda float64 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_R8_ldobj_il.Test::.ctor()
+newobj instance void JitTest_ldobj_R8_ldobj_il.Test::.ctor()
+ldflda float64 JitTest_ldobj_R8_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Double
-stfld float64 JitTest.Test::m_vv
+stfld float64 JitTest_ldobj_R8_ldobj_il.Test::m_vv
 ldloc.s V
 ret
 }
@@ -937,8 +937,8 @@ ret
 ldc.r8 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda float64 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_R8_ldobj_il.Test::.ctor()
+ldflda float64 JitTest_ldobj_R8_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Double
 ret
 }
@@ -949,8 +949,8 @@ ret
 ldc.r8 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda float64 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_R8_ldobj_il.Test::.ctor()
+ldflda float64 JitTest_ldobj_R8_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Double
 ret
 }
@@ -961,8 +961,8 @@ ret
 ldc.r8 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda float64 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_R8_ldobj_il.Test::.ctor()
+ldflda float64 JitTest_ldobj_R8_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Double
 ret
 }
@@ -973,8 +973,8 @@ ret
 ldc.r8 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda float64 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_R8_ldobj_il.Test::.ctor()
+ldflda float64 JitTest_ldobj_R8_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.Double
 ret
 }
@@ -1019,7 +1019,7 @@ ldloca.s V
 mkrefany [mscorlib]System.Double
 refanyval [mscorlib]System.Double
 ldobj [mscorlib]System.Double
-stsfld float64 JitTest.Test::m_v
+stsfld float64 JitTest_ldobj_R8_ldobj_il.Test::m_v
 ldloc.s V
 ret
 }
@@ -1034,7 +1034,7 @@ ldloca.s V
 mkrefany [mscorlib]System.Double
 refanyval [mscorlib]System.Double
 ldobj [mscorlib]System.Double
-call void JitTest.Test::Func(float64)
+call void JitTest_ldobj_R8_ldobj_il.Test::Func(float64)
 ldloc.s V
 ret
 }
@@ -1090,12 +1090,12 @@ ret
 .locals (float64 V)
 ldc.r8 0
 stloc.s V
-newobj instance void JitTest.Test::.ctor()
+newobj instance void JitTest_ldobj_R8_ldobj_il.Test::.ctor()
 ldloca.s V
 mkrefany [mscorlib]System.Double
 refanyval [mscorlib]System.Double
 ldobj [mscorlib]System.Double
-stfld float64 JitTest.Test::m_vv
+stfld float64 JitTest_ldobj_R8_ldobj_il.Test::m_vv
 ldloc.s V
 ret
 }
@@ -1165,90 +1165,90 @@ ret
 ldc.r8 0
 stloc.s V
 ldloc.s V
-call float64 JitTest.Test::method_0_0(float64)
-call float64 JitTest.Test::method_0_1(float64)
-call float64 JitTest.Test::method_0_2(float64)
-call float64 JitTest.Test::method_0_3(float64)
-call float64 JitTest.Test::method_0_4(float64)
-call float64 JitTest.Test::method_0_5(float64)
-call float64 JitTest.Test::method_0_6(float64)
-call float64 JitTest.Test::method_0_7(float64)
-call float64 JitTest.Test::method_0_8(float64)
-call float64 JitTest.Test::method_0_9(float64)
-call float64 JitTest.Test::method_0_10(float64)
-call float64 JitTest.Test::method_0_11(float64)
-call float64 JitTest.Test::method_1_0(float64)
-call float64 JitTest.Test::method_1_1(float64)
-call float64 JitTest.Test::method_1_2(float64)
-call float64 JitTest.Test::method_1_3(float64)
-call float64 JitTest.Test::method_1_4(float64)
-call float64 JitTest.Test::method_1_5(float64)
-call float64 JitTest.Test::method_1_6(float64)
-call float64 JitTest.Test::method_1_7(float64)
-call float64 JitTest.Test::method_1_8(float64)
-call float64 JitTest.Test::method_1_9(float64)
-call float64 JitTest.Test::method_1_10(float64)
-call float64 JitTest.Test::method_1_11(float64)
-call float64 JitTest.Test::method_2_0(float64)
-call float64 JitTest.Test::method_2_1(float64)
-call float64 JitTest.Test::method_2_2(float64)
-call float64 JitTest.Test::method_2_3(float64)
-call float64 JitTest.Test::method_2_4(float64)
-call float64 JitTest.Test::method_2_5(float64)
-call float64 JitTest.Test::method_2_6(float64)
-call float64 JitTest.Test::method_2_7(float64)
-call float64 JitTest.Test::method_2_8(float64)
-call float64 JitTest.Test::method_2_9(float64)
-call float64 JitTest.Test::method_2_10(float64)
-call float64 JitTest.Test::method_2_11(float64)
-call float64 JitTest.Test::method_3_0(float64)
-call float64 JitTest.Test::method_3_1(float64)
-call float64 JitTest.Test::method_3_2(float64)
-call float64 JitTest.Test::method_3_3(float64)
-call float64 JitTest.Test::method_3_4(float64)
-call float64 JitTest.Test::method_3_5(float64)
-call float64 JitTest.Test::method_3_6(float64)
-call float64 JitTest.Test::method_3_7(float64)
-call float64 JitTest.Test::method_3_8(float64)
-call float64 JitTest.Test::method_3_9(float64)
-call float64 JitTest.Test::method_3_10(float64)
-call float64 JitTest.Test::method_3_11(float64)
-call float64 JitTest.Test::method_4_0(float64)
-call float64 JitTest.Test::method_4_1(float64)
-call float64 JitTest.Test::method_4_2(float64)
-call float64 JitTest.Test::method_4_3(float64)
-call float64 JitTest.Test::method_4_4(float64)
-call float64 JitTest.Test::method_4_5(float64)
-call float64 JitTest.Test::method_4_6(float64)
-call float64 JitTest.Test::method_4_7(float64)
-call float64 JitTest.Test::method_4_8(float64)
-call float64 JitTest.Test::method_4_9(float64)
-call float64 JitTest.Test::method_4_10(float64)
-call float64 JitTest.Test::method_4_11(float64)
-call float64 JitTest.Test::method_5_0(float64)
-call float64 JitTest.Test::method_5_1(float64)
-call float64 JitTest.Test::method_5_2(float64)
-call float64 JitTest.Test::method_5_3(float64)
-call float64 JitTest.Test::method_5_4(float64)
-call float64 JitTest.Test::method_5_5(float64)
-call float64 JitTest.Test::method_5_6(float64)
-call float64 JitTest.Test::method_5_7(float64)
-call float64 JitTest.Test::method_5_8(float64)
-call float64 JitTest.Test::method_5_9(float64)
-call float64 JitTest.Test::method_5_10(float64)
-call float64 JitTest.Test::method_5_11(float64)
-call float64 JitTest.Test::method_6_0(float64)
-call float64 JitTest.Test::method_6_1(float64)
-call float64 JitTest.Test::method_6_2(float64)
-call float64 JitTest.Test::method_6_3(float64)
-call float64 JitTest.Test::method_6_4(float64)
-call float64 JitTest.Test::method_6_5(float64)
-call float64 JitTest.Test::method_6_6(float64)
-call float64 JitTest.Test::method_6_7(float64)
-call float64 JitTest.Test::method_6_8(float64)
-call float64 JitTest.Test::method_6_9(float64)
-call float64 JitTest.Test::method_6_10(float64)
-call float64 JitTest.Test::method_6_11(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_0_0(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_0_1(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_0_2(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_0_3(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_0_4(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_0_5(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_0_6(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_0_7(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_0_8(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_0_9(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_0_10(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_0_11(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_1_0(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_1_1(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_1_2(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_1_3(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_1_4(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_1_5(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_1_6(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_1_7(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_1_8(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_1_9(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_1_10(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_1_11(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_2_0(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_2_1(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_2_2(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_2_3(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_2_4(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_2_5(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_2_6(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_2_7(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_2_8(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_2_9(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_2_10(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_2_11(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_3_0(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_3_1(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_3_2(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_3_3(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_3_4(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_3_5(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_3_6(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_3_7(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_3_8(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_3_9(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_3_10(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_3_11(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_4_0(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_4_1(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_4_2(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_4_3(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_4_4(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_4_5(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_4_6(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_4_7(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_4_8(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_4_9(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_4_10(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_4_11(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_5_0(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_5_1(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_5_2(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_5_3(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_5_4(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_5_5(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_5_6(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_5_7(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_5_8(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_5_9(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_5_10(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_5_11(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_6_0(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_6_1(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_6_2(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_6_3(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_6_4(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_6_5(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_6_6(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_6_7(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_6_8(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_6_9(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_6_10(float64)
+call float64 JitTest_ldobj_R8_ldobj_il.Test::method_6_11(float64)
 pop
 
       ldstr      "Passed"
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R8_il_d.ilproj b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R8_il_d.ilproj
index 37debcffa08c79..4a5581962d95de 100644
--- a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R8_il_d.ilproj
+++ b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R8_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R8_il_r.ilproj b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R8_il_r.ilproj
index 7b096640fa7f80..c3a7be1fb45ed5 100644
--- a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R8_il_r.ilproj
+++ b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R8_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_U2.il b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_U2.il
index db705d274f0913..5f7e554636531b 100644
--- a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_U2.il
+++ b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_U2.il
@@ -10,7 +10,7 @@
 }
 .assembly ldobj_U2 { }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_ldobj_U2_ldobj_il
 {
   .class public auto ansi beforefieldinit Test
          extends [mscorlib]System.Object
@@ -59,7 +59,7 @@ stloc.s V
 
 ldloca.s V
 ldobj [mscorlib]System.UInt16
-stsfld unsigned int16 JitTest.Test::m_v
+stsfld unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::m_v
 ldloc.s V
 ret
 }
@@ -72,7 +72,7 @@ stloc.s V
 
 ldloca.s V
 ldobj [mscorlib]System.UInt16
-call void JitTest.Test::Func(unsigned int16)
+call void JitTest_ldobj_U2_ldobj_il.Test::Func(unsigned int16)
 ldloc.s V
 ret
 }
@@ -122,10 +122,10 @@ ret
 .locals (unsigned int16 V)
 ldc.i4 0
 stloc.s V
-newobj instance void JitTest.Test::.ctor()
+newobj instance void JitTest_ldobj_U2_ldobj_il.Test::.ctor()
 ldloca.s V
 ldobj [mscorlib]System.UInt16
-stfld unsigned int16 JitTest.Test::m_vv
+stfld unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::m_vv
 ldloc.s V
 ret
 }
@@ -180,7 +180,7 @@ ret
 ldc.i4 0
 stloc.s V
 
-ldsflda unsigned int16 JitTest.Test::m_v
+ldsflda unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::m_v
 ldobj [mscorlib]System.UInt16
 pop
 ldloc.s V
@@ -193,7 +193,7 @@ ret
 ldc.i4 0
 stloc.s V
 
-ldsflda unsigned int16 JitTest.Test::m_v
+ldsflda unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::m_v
 ldobj [mscorlib]System.UInt16
 stloc.s V
 ldloc.s V
@@ -206,9 +206,9 @@ ret
 ldc.i4 0
 stloc.s V
 
-ldsflda unsigned int16 JitTest.Test::m_v
+ldsflda unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::m_v
 ldobj [mscorlib]System.UInt16
-stsfld unsigned int16 JitTest.Test::m_v
+stsfld unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::m_v
 ldloc.s V
 ret
 }
@@ -219,9 +219,9 @@ ret
 ldc.i4 0
 stloc.s V
 
-ldsflda unsigned int16 JitTest.Test::m_v
+ldsflda unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::m_v
 ldobj [mscorlib]System.UInt16
-call void JitTest.Test::Func(unsigned int16)
+call void JitTest_ldobj_U2_ldobj_il.Test::Func(unsigned int16)
 ldloc.s V
 ret
 }
@@ -232,7 +232,7 @@ ret
 ldc.i4 0
 stloc.s V
 
-ldsflda unsigned int16 JitTest.Test::m_v
+ldsflda unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::m_v
 ldobj [mscorlib]System.UInt16
 box [mscorlib]System.UInt16
 pop
@@ -246,7 +246,7 @@ ret
 ldc.i4 0
 stloc.s V
 ldloca.s V
-ldsflda unsigned int16 JitTest.Test::m_v
+ldsflda unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::m_v
 ldobj [mscorlib]System.UInt16
 stobj [mscorlib]System.UInt16
 ldloc.s V
@@ -259,7 +259,7 @@ ret
 ldc.i4 0
 stloc.s V
 
-ldsflda unsigned int16 JitTest.Test::m_v
+ldsflda unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::m_v
 ldobj [mscorlib]System.UInt16
 starg.s ARG
 ldloc.s V
@@ -271,10 +271,10 @@ ret
 .locals (unsigned int16 V)
 ldc.i4 0
 stloc.s V
-newobj instance void JitTest.Test::.ctor()
-ldsflda unsigned int16 JitTest.Test::m_v
+newobj instance void JitTest_ldobj_U2_ldobj_il.Test::.ctor()
+ldsflda unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::m_v
 ldobj [mscorlib]System.UInt16
-stfld unsigned int16 JitTest.Test::m_vv
+stfld unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::m_vv
 ldloc.s V
 ret
 }
@@ -285,7 +285,7 @@ ret
 ldc.i4 0
 stloc.s V
 
-ldsflda unsigned int16 JitTest.Test::m_v
+ldsflda unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::m_v
 ldobj [mscorlib]System.UInt16
 ret
 }
@@ -296,7 +296,7 @@ ret
 ldc.i4 0
 stloc.s V
 
-ldsflda unsigned int16 JitTest.Test::m_v
+ldsflda unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::m_v
 ldobj [mscorlib]System.UInt16
 ret
 }
@@ -307,7 +307,7 @@ ret
 ldc.i4 0
 stloc.s V
 
-ldsflda unsigned int16 JitTest.Test::m_v
+ldsflda unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::m_v
 ldobj [mscorlib]System.UInt16
 ret
 }
@@ -318,7 +318,7 @@ ret
 ldc.i4 0
 stloc.s V
 
-ldsflda unsigned int16 JitTest.Test::m_v
+ldsflda unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::m_v
 ldobj [mscorlib]System.UInt16
 ret
 }
@@ -357,7 +357,7 @@ stloc.s V
 
 ldarga.s ARG
 ldobj [mscorlib]System.UInt16
-stsfld unsigned int16 JitTest.Test::m_v
+stsfld unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::m_v
 ldloc.s V
 ret
 }
@@ -370,7 +370,7 @@ stloc.s V
 
 ldarga.s ARG
 ldobj [mscorlib]System.UInt16
-call void JitTest.Test::Func(unsigned int16)
+call void JitTest_ldobj_U2_ldobj_il.Test::Func(unsigned int16)
 ldloc.s V
 ret
 }
@@ -420,10 +420,10 @@ ret
 .locals (unsigned int16 V)
 ldc.i4 0
 stloc.s V
-newobj instance void JitTest.Test::.ctor()
+newobj instance void JitTest_ldobj_U2_ldobj_il.Test::.ctor()
 ldarga.s ARG
 ldobj [mscorlib]System.UInt16
-stfld unsigned int16 JitTest.Test::m_vv
+stfld unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::m_vv
 ldloc.s V
 ret
 }
@@ -478,8 +478,8 @@ ret
 ldc.i4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda unsigned int16 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_U2_ldobj_il.Test::.ctor()
+ldflda unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.UInt16
 pop
 ldloc.s V
@@ -492,8 +492,8 @@ ret
 ldc.i4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda unsigned int16 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_U2_ldobj_il.Test::.ctor()
+ldflda unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.UInt16
 stloc.s V
 ldloc.s V
@@ -506,10 +506,10 @@ ret
 ldc.i4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda unsigned int16 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_U2_ldobj_il.Test::.ctor()
+ldflda unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.UInt16
-stsfld unsigned int16 JitTest.Test::m_v
+stsfld unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::m_v
 ldloc.s V
 ret
 }
@@ -520,10 +520,10 @@ ret
 ldc.i4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda unsigned int16 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_U2_ldobj_il.Test::.ctor()
+ldflda unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.UInt16
-call void JitTest.Test::Func(unsigned int16)
+call void JitTest_ldobj_U2_ldobj_il.Test::Func(unsigned int16)
 ldloc.s V
 ret
 }
@@ -534,8 +534,8 @@ ret
 ldc.i4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda unsigned int16 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_U2_ldobj_il.Test::.ctor()
+ldflda unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.UInt16
 box [mscorlib]System.UInt16
 pop
@@ -549,8 +549,8 @@ ret
 ldc.i4 0
 stloc.s V
 ldloca.s V
-newobj instance void JitTest.Test::.ctor()
-ldflda unsigned int16 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_U2_ldobj_il.Test::.ctor()
+ldflda unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.UInt16
 stobj [mscorlib]System.UInt16
 ldloc.s V
@@ -563,8 +563,8 @@ ret
 ldc.i4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda unsigned int16 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_U2_ldobj_il.Test::.ctor()
+ldflda unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.UInt16
 starg.s ARG
 ldloc.s V
@@ -576,11 +576,11 @@ ret
 .locals (unsigned int16 V)
 ldc.i4 0
 stloc.s V
-newobj instance void JitTest.Test::.ctor()
-newobj instance void JitTest.Test::.ctor()
-ldflda unsigned int16 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_U2_ldobj_il.Test::.ctor()
+newobj instance void JitTest_ldobj_U2_ldobj_il.Test::.ctor()
+ldflda unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.UInt16
-stfld unsigned int16 JitTest.Test::m_vv
+stfld unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::m_vv
 ldloc.s V
 ret
 }
@@ -591,8 +591,8 @@ ret
 ldc.i4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda unsigned int16 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_U2_ldobj_il.Test::.ctor()
+ldflda unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.UInt16
 ret
 }
@@ -603,8 +603,8 @@ ret
 ldc.i4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda unsigned int16 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_U2_ldobj_il.Test::.ctor()
+ldflda unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.UInt16
 ret
 }
@@ -615,8 +615,8 @@ ret
 ldc.i4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda unsigned int16 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_U2_ldobj_il.Test::.ctor()
+ldflda unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.UInt16
 ret
 }
@@ -627,8 +627,8 @@ ret
 ldc.i4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda unsigned int16 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_U2_ldobj_il.Test::.ctor()
+ldflda unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.UInt16
 ret
 }
@@ -676,7 +676,7 @@ newarr [mscorlib]System.UInt16
 ldc.i4.1
 ldelema [mscorlib]System.UInt16
 ldobj [mscorlib]System.UInt16
-stsfld unsigned int16 JitTest.Test::m_v
+stsfld unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::m_v
 ldloc.s V
 ret
 }
@@ -692,7 +692,7 @@ newarr [mscorlib]System.UInt16
 ldc.i4.1
 ldelema [mscorlib]System.UInt16
 ldobj [mscorlib]System.UInt16
-call void JitTest.Test::Func(unsigned int16)
+call void JitTest_ldobj_U2_ldobj_il.Test::Func(unsigned int16)
 ldloc.s V
 ret
 }
@@ -751,13 +751,13 @@ ret
 .locals (unsigned int16 V)
 ldc.i4 0
 stloc.s V
-newobj instance void JitTest.Test::.ctor()
+newobj instance void JitTest_ldobj_U2_ldobj_il.Test::.ctor()
 ldc.i4.2
 newarr [mscorlib]System.UInt16
 ldc.i4.1
 ldelema [mscorlib]System.UInt16
 ldobj [mscorlib]System.UInt16
-stfld unsigned int16 JitTest.Test::m_vv
+stfld unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::m_vv
 ldloc.s V
 ret
 }
@@ -824,8 +824,8 @@ ret
 ldc.i4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda unsigned int16 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_U2_ldobj_il.Test::.ctor()
+ldflda unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.UInt16
 pop
 ldloc.s V
@@ -838,8 +838,8 @@ ret
 ldc.i4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda unsigned int16 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_U2_ldobj_il.Test::.ctor()
+ldflda unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.UInt16
 stloc.s V
 ldloc.s V
@@ -852,10 +852,10 @@ ret
 ldc.i4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda unsigned int16 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_U2_ldobj_il.Test::.ctor()
+ldflda unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.UInt16
-stsfld unsigned int16 JitTest.Test::m_v
+stsfld unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::m_v
 ldloc.s V
 ret
 }
@@ -866,10 +866,10 @@ ret
 ldc.i4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda unsigned int16 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_U2_ldobj_il.Test::.ctor()
+ldflda unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.UInt16
-call void JitTest.Test::Func(unsigned int16)
+call void JitTest_ldobj_U2_ldobj_il.Test::Func(unsigned int16)
 ldloc.s V
 ret
 }
@@ -880,8 +880,8 @@ ret
 ldc.i4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda unsigned int16 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_U2_ldobj_il.Test::.ctor()
+ldflda unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.UInt16
 box [mscorlib]System.UInt16
 pop
@@ -895,8 +895,8 @@ ret
 ldc.i4 0
 stloc.s V
 ldloca.s V
-newobj instance void JitTest.Test::.ctor()
-ldflda unsigned int16 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_U2_ldobj_il.Test::.ctor()
+ldflda unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.UInt16
 stobj [mscorlib]System.UInt16
 ldloc.s V
@@ -909,8 +909,8 @@ ret
 ldc.i4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda unsigned int16 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_U2_ldobj_il.Test::.ctor()
+ldflda unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.UInt16
 starg.s ARG
 ldloc.s V
@@ -922,11 +922,11 @@ ret
 .locals (unsigned int16 V)
 ldc.i4 0
 stloc.s V
-newobj instance void JitTest.Test::.ctor()
-newobj instance void JitTest.Test::.ctor()
-ldflda unsigned int16 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_U2_ldobj_il.Test::.ctor()
+newobj instance void JitTest_ldobj_U2_ldobj_il.Test::.ctor()
+ldflda unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.UInt16
-stfld unsigned int16 JitTest.Test::m_vv
+stfld unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::m_vv
 ldloc.s V
 ret
 }
@@ -937,8 +937,8 @@ ret
 ldc.i4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda unsigned int16 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_U2_ldobj_il.Test::.ctor()
+ldflda unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.UInt16
 ret
 }
@@ -949,8 +949,8 @@ ret
 ldc.i4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda unsigned int16 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_U2_ldobj_il.Test::.ctor()
+ldflda unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.UInt16
 ret
 }
@@ -961,8 +961,8 @@ ret
 ldc.i4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda unsigned int16 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_U2_ldobj_il.Test::.ctor()
+ldflda unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.UInt16
 ret
 }
@@ -973,8 +973,8 @@ ret
 ldc.i4 0
 stloc.s V
 
-newobj instance void JitTest.Test::.ctor()
-ldflda unsigned int16 JitTest.Test::m_vv
+newobj instance void JitTest_ldobj_U2_ldobj_il.Test::.ctor()
+ldflda unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::m_vv
 ldobj [mscorlib]System.UInt16
 ret
 }
@@ -1019,7 +1019,7 @@ ldloca.s V
 mkrefany [mscorlib]System.UInt16
 refanyval [mscorlib]System.UInt16
 ldobj [mscorlib]System.UInt16
-stsfld unsigned int16 JitTest.Test::m_v
+stsfld unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::m_v
 ldloc.s V
 ret
 }
@@ -1034,7 +1034,7 @@ ldloca.s V
 mkrefany [mscorlib]System.UInt16
 refanyval [mscorlib]System.UInt16
 ldobj [mscorlib]System.UInt16
-call void JitTest.Test::Func(unsigned int16)
+call void JitTest_ldobj_U2_ldobj_il.Test::Func(unsigned int16)
 ldloc.s V
 ret
 }
@@ -1090,12 +1090,12 @@ ret
 .locals (unsigned int16 V)
 ldc.i4 0
 stloc.s V
-newobj instance void JitTest.Test::.ctor()
+newobj instance void JitTest_ldobj_U2_ldobj_il.Test::.ctor()
 ldloca.s V
 mkrefany [mscorlib]System.UInt16
 refanyval [mscorlib]System.UInt16
 ldobj [mscorlib]System.UInt16
-stfld unsigned int16 JitTest.Test::m_vv
+stfld unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::m_vv
 ldloc.s V
 ret
 }
@@ -1165,90 +1165,90 @@ ret
 ldc.i4 0
 stloc.s V
 ldloc.s V
-call unsigned int16 JitTest.Test::method_0_0(unsigned int16)
-call unsigned int16 JitTest.Test::method_0_1(unsigned int16)
-call unsigned int16 JitTest.Test::method_0_2(unsigned int16)
-call unsigned int16 JitTest.Test::method_0_3(unsigned int16)
-call unsigned int16 JitTest.Test::method_0_4(unsigned int16)
-call unsigned int16 JitTest.Test::method_0_5(unsigned int16)
-call unsigned int16 JitTest.Test::method_0_6(unsigned int16)
-call unsigned int16 JitTest.Test::method_0_7(unsigned int16)
-call unsigned int16 JitTest.Test::method_0_8(unsigned int16)
-call unsigned int16 JitTest.Test::method_0_9(unsigned int16)
-call unsigned int16 JitTest.Test::method_0_10(unsigned int16)
-call unsigned int16 JitTest.Test::method_0_11(unsigned int16)
-call unsigned int16 JitTest.Test::method_1_0(unsigned int16)
-call unsigned int16 JitTest.Test::method_1_1(unsigned int16)
-call unsigned int16 JitTest.Test::method_1_2(unsigned int16)
-call unsigned int16 JitTest.Test::method_1_3(unsigned int16)
-call unsigned int16 JitTest.Test::method_1_4(unsigned int16)
-call unsigned int16 JitTest.Test::method_1_5(unsigned int16)
-call unsigned int16 JitTest.Test::method_1_6(unsigned int16)
-call unsigned int16 JitTest.Test::method_1_7(unsigned int16)
-call unsigned int16 JitTest.Test::method_1_8(unsigned int16)
-call unsigned int16 JitTest.Test::method_1_9(unsigned int16)
-call unsigned int16 JitTest.Test::method_1_10(unsigned int16)
-call unsigned int16 JitTest.Test::method_1_11(unsigned int16)
-call unsigned int16 JitTest.Test::method_2_0(unsigned int16)
-call unsigned int16 JitTest.Test::method_2_1(unsigned int16)
-call unsigned int16 JitTest.Test::method_2_2(unsigned int16)
-call unsigned int16 JitTest.Test::method_2_3(unsigned int16)
-call unsigned int16 JitTest.Test::method_2_4(unsigned int16)
-call unsigned int16 JitTest.Test::method_2_5(unsigned int16)
-call unsigned int16 JitTest.Test::method_2_6(unsigned int16)
-call unsigned int16 JitTest.Test::method_2_7(unsigned int16)
-call unsigned int16 JitTest.Test::method_2_8(unsigned int16)
-call unsigned int16 JitTest.Test::method_2_9(unsigned int16)
-call unsigned int16 JitTest.Test::method_2_10(unsigned int16)
-call unsigned int16 JitTest.Test::method_2_11(unsigned int16)
-call unsigned int16 JitTest.Test::method_3_0(unsigned int16)
-call unsigned int16 JitTest.Test::method_3_1(unsigned int16)
-call unsigned int16 JitTest.Test::method_3_2(unsigned int16)
-call unsigned int16 JitTest.Test::method_3_3(unsigned int16)
-call unsigned int16 JitTest.Test::method_3_4(unsigned int16)
-call unsigned int16 JitTest.Test::method_3_5(unsigned int16)
-call unsigned int16 JitTest.Test::method_3_6(unsigned int16)
-call unsigned int16 JitTest.Test::method_3_7(unsigned int16)
-call unsigned int16 JitTest.Test::method_3_8(unsigned int16)
-call unsigned int16 JitTest.Test::method_3_9(unsigned int16)
-call unsigned int16 JitTest.Test::method_3_10(unsigned int16)
-call unsigned int16 JitTest.Test::method_3_11(unsigned int16)
-call unsigned int16 JitTest.Test::method_4_0(unsigned int16)
-call unsigned int16 JitTest.Test::method_4_1(unsigned int16)
-call unsigned int16 JitTest.Test::method_4_2(unsigned int16)
-call unsigned int16 JitTest.Test::method_4_3(unsigned int16)
-call unsigned int16 JitTest.Test::method_4_4(unsigned int16)
-call unsigned int16 JitTest.Test::method_4_5(unsigned int16)
-call unsigned int16 JitTest.Test::method_4_6(unsigned int16)
-call unsigned int16 JitTest.Test::method_4_7(unsigned int16)
-call unsigned int16 JitTest.Test::method_4_8(unsigned int16)
-call unsigned int16 JitTest.Test::method_4_9(unsigned int16)
-call unsigned int16 JitTest.Test::method_4_10(unsigned int16)
-call unsigned int16 JitTest.Test::method_4_11(unsigned int16)
-call unsigned int16 JitTest.Test::method_5_0(unsigned int16)
-call unsigned int16 JitTest.Test::method_5_1(unsigned int16)
-call unsigned int16 JitTest.Test::method_5_2(unsigned int16)
-call unsigned int16 JitTest.Test::method_5_3(unsigned int16)
-call unsigned int16 JitTest.Test::method_5_4(unsigned int16)
-call unsigned int16 JitTest.Test::method_5_5(unsigned int16)
-call unsigned int16 JitTest.Test::method_5_6(unsigned int16)
-call unsigned int16 JitTest.Test::method_5_7(unsigned int16)
-call unsigned int16 JitTest.Test::method_5_8(unsigned int16)
-call unsigned int16 JitTest.Test::method_5_9(unsigned int16)
-call unsigned int16 JitTest.Test::method_5_10(unsigned int16)
-call unsigned int16 JitTest.Test::method_5_11(unsigned int16)
-call unsigned int16 JitTest.Test::method_6_0(unsigned int16)
-call unsigned int16 JitTest.Test::method_6_1(unsigned int16)
-call unsigned int16 JitTest.Test::method_6_2(unsigned int16)
-call unsigned int16 JitTest.Test::method_6_3(unsigned int16)
-call unsigned int16 JitTest.Test::method_6_4(unsigned int16)
-call unsigned int16 JitTest.Test::method_6_5(unsigned int16)
-call unsigned int16 JitTest.Test::method_6_6(unsigned int16)
-call unsigned int16 JitTest.Test::method_6_7(unsigned int16)
-call unsigned int16 JitTest.Test::method_6_8(unsigned int16)
-call unsigned int16 JitTest.Test::method_6_9(unsigned int16)
-call unsigned int16 JitTest.Test::method_6_10(unsigned int16)
-call unsigned int16 JitTest.Test::method_6_11(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_0_0(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_0_1(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_0_2(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_0_3(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_0_4(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_0_5(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_0_6(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_0_7(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_0_8(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_0_9(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_0_10(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_0_11(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_1_0(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_1_1(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_1_2(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_1_3(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_1_4(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_1_5(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_1_6(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_1_7(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_1_8(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_1_9(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_1_10(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_1_11(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_2_0(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_2_1(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_2_2(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_2_3(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_2_4(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_2_5(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_2_6(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_2_7(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_2_8(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_2_9(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_2_10(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_2_11(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_3_0(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_3_1(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_3_2(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_3_3(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_3_4(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_3_5(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_3_6(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_3_7(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_3_8(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_3_9(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_3_10(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_3_11(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_4_0(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_4_1(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_4_2(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_4_3(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_4_4(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_4_5(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_4_6(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_4_7(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_4_8(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_4_9(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_4_10(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_4_11(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_5_0(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_5_1(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_5_2(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_5_3(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_5_4(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_5_5(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_5_6(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_5_7(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_5_8(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_5_9(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_5_10(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_5_11(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_6_0(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_6_1(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_6_2(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_6_3(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_6_4(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_6_5(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_6_6(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_6_7(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_6_8(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_6_9(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_6_10(unsigned int16)
+call unsigned int16 JitTest_ldobj_U2_ldobj_il.Test::method_6_11(unsigned int16)
 pop
 
       ldstr      "Passed"
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_U2_il_d.ilproj b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_U2_il_d.ilproj
index 03515e5a8d6281..83d4bf4d25c874 100644
--- a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_U2_il_d.ilproj
+++ b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_U2_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_U2_il_r.ilproj b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_U2_il_r.ilproj
index ac32c51a5b7e02..a29648900895fc 100644
--- a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_U2_il_r.ilproj
+++ b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_U2_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_V.il b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_V.il
index 29f63457106391..8d96872019e689 100644
--- a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_V.il
+++ b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_V.il
@@ -10,7 +10,7 @@
 }
 .assembly ldobj_V { }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_ldobj_V_ldobj_il
 {
   .class public sequential ansi sealed beforefieldinit ValueClass
          extends [mscorlib]System.ValueType
@@ -20,887 +20,887 @@
   .class public auto ansi beforefieldinit Test
          extends [mscorlib]System.Object
   {
-    .field public static valuetype JitTest.ValueClass m_v
-    .field public valuetype JitTest.ValueClass m_vv
+    .field public static valuetype JitTest_ldobj_V_ldobj_il.ValueClass m_v
+    .field public valuetype JitTest_ldobj_V_ldobj_il.ValueClass m_vv
     .method public hidebysig static void 
-            Func(valuetype JitTest.ValueClass v) cil managed
+            Func(valuetype JitTest_ldobj_V_ldobj_il.ValueClass v) cil managed
     {
       .maxstack  8
       IL_0000:  ret
     }
-	.method private hidebysig static valuetype JitTest.ValueClass method_0_0(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_0_0(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
 	
 	ldloca.s V
-	ldobj JitTest.ValueClass
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
 	pop
 	ldloc.s V
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_0_1(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_0_1(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
 	
 	ldloca.s V
-	ldobj JitTest.ValueClass
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
 	stloc.s V
 	ldloc.s V
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_0_2(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_0_2(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
 	
 	ldloca.s V
-	ldobj JitTest.ValueClass
-	stsfld valuetype JitTest.ValueClass JitTest.Test::m_v
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
+	stsfld valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::m_v
 	ldloc.s V
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_0_3(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_0_3(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
 	
 	ldloca.s V
-	ldobj JitTest.ValueClass
-	call void JitTest.Test::Func(valuetype JitTest.ValueClass)
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
+	call void JitTest_ldobj_V_ldobj_il.Test::Func(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
 	ldloc.s V
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_0_4(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_0_4(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
 	
 	ldloca.s V
-	ldobj JitTest.ValueClass
-	box JitTest.ValueClass
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
+	box JitTest_ldobj_V_ldobj_il.ValueClass
 	pop
 	ldloc.s V
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_0_5(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_0_5(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
 	ldloca.s V
 	ldloca.s V
-	ldobj JitTest.ValueClass
-	stobj JitTest.ValueClass
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
+	stobj JitTest_ldobj_V_ldobj_il.ValueClass
 	ldloc.s V
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_0_6(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_0_6(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
 	
 	ldloca.s V
-	ldobj JitTest.ValueClass
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
 	starg.s ARG
 	ldloc.s V
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_0_7(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_0_7(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
-	newobj instance void JitTest.Test::.ctor()
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
+	newobj instance void JitTest_ldobj_V_ldobj_il.Test::.ctor()
 	ldloca.s V
-	ldobj JitTest.ValueClass
-	stfld valuetype JitTest.ValueClass JitTest.Test::m_vv
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
+	stfld valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::m_vv
 	ldloc.s V
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_0_8(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_0_8(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
 	
 	ldloca.s V
-	ldobj JitTest.ValueClass
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_1_0(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_1_0(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
 	
-	ldsflda valuetype JitTest.ValueClass JitTest.Test::m_v
-	ldobj JitTest.ValueClass
+	ldsflda valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::m_v
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
 	pop
 	ldloc.s V
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_1_1(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_1_1(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
 	
-	ldsflda valuetype JitTest.ValueClass JitTest.Test::m_v
-	ldobj JitTest.ValueClass
+	ldsflda valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::m_v
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
 	stloc.s V
 	ldloc.s V
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_1_2(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_1_2(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
 	
-	ldsflda valuetype JitTest.ValueClass JitTest.Test::m_v
-	ldobj JitTest.ValueClass
-	stsfld valuetype JitTest.ValueClass JitTest.Test::m_v
+	ldsflda valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::m_v
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
+	stsfld valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::m_v
 	ldloc.s V
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_1_3(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_1_3(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
 	
-	ldsflda valuetype JitTest.ValueClass JitTest.Test::m_v
-	ldobj JitTest.ValueClass
-	call void JitTest.Test::Func(valuetype JitTest.ValueClass)
+	ldsflda valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::m_v
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
+	call void JitTest_ldobj_V_ldobj_il.Test::Func(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
 	ldloc.s V
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_1_4(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_1_4(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
 	
-	ldsflda valuetype JitTest.ValueClass JitTest.Test::m_v
-	ldobj JitTest.ValueClass
-	box JitTest.ValueClass
+	ldsflda valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::m_v
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
+	box JitTest_ldobj_V_ldobj_il.ValueClass
 	pop
 	ldloc.s V
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_1_5(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_1_5(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
 	ldloca.s V
-	ldsflda valuetype JitTest.ValueClass JitTest.Test::m_v
-	ldobj JitTest.ValueClass
-	stobj JitTest.ValueClass
+	ldsflda valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::m_v
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
+	stobj JitTest_ldobj_V_ldobj_il.ValueClass
 	ldloc.s V
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_1_6(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_1_6(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
 	
-	ldsflda valuetype JitTest.ValueClass JitTest.Test::m_v
-	ldobj JitTest.ValueClass
+	ldsflda valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::m_v
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
 	starg.s ARG
 	ldloc.s V
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_1_7(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_1_7(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
-	newobj instance void JitTest.Test::.ctor()
-	ldsflda valuetype JitTest.ValueClass JitTest.Test::m_v
-	ldobj JitTest.ValueClass
-	stfld valuetype JitTest.ValueClass JitTest.Test::m_vv
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
+	newobj instance void JitTest_ldobj_V_ldobj_il.Test::.ctor()
+	ldsflda valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::m_v
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
+	stfld valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::m_vv
 	ldloc.s V
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_1_8(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_1_8(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
 	
-	ldsflda valuetype JitTest.ValueClass JitTest.Test::m_v
-	ldobj JitTest.ValueClass
+	ldsflda valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::m_v
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_2_0(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_2_0(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
 	
 	ldarga.s ARG
-	ldobj JitTest.ValueClass
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
 	pop
 	ldloc.s V
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_2_1(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_2_1(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
 	
 	ldarga.s ARG
-	ldobj JitTest.ValueClass
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
 	stloc.s V
 	ldloc.s V
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_2_2(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_2_2(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
 	
 	ldarga.s ARG
-	ldobj JitTest.ValueClass
-	stsfld valuetype JitTest.ValueClass JitTest.Test::m_v
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
+	stsfld valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::m_v
 	ldloc.s V
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_2_3(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_2_3(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
 	
 	ldarga.s ARG
-	ldobj JitTest.ValueClass
-	call void JitTest.Test::Func(valuetype JitTest.ValueClass)
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
+	call void JitTest_ldobj_V_ldobj_il.Test::Func(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
 	ldloc.s V
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_2_4(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_2_4(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
 	
 	ldarga.s ARG
-	ldobj JitTest.ValueClass
-	box JitTest.ValueClass
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
+	box JitTest_ldobj_V_ldobj_il.ValueClass
 	pop
 	ldloc.s V
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_2_5(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_2_5(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
 	ldloca.s V
 	ldarga.s ARG
-	ldobj JitTest.ValueClass
-	stobj JitTest.ValueClass
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
+	stobj JitTest_ldobj_V_ldobj_il.ValueClass
 	ldloc.s V
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_2_6(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_2_6(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
 	
 	ldarga.s ARG
-	ldobj JitTest.ValueClass
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
 	starg.s ARG
 	ldloc.s V
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_2_7(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_2_7(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
-	newobj instance void JitTest.Test::.ctor()
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
+	newobj instance void JitTest_ldobj_V_ldobj_il.Test::.ctor()
 	ldarga.s ARG
-	ldobj JitTest.ValueClass
-	stfld valuetype JitTest.ValueClass JitTest.Test::m_vv
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
+	stfld valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::m_vv
 	ldloc.s V
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_2_8(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_2_8(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
 	
 	ldarga.s ARG
-	ldobj JitTest.ValueClass
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_3_0(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_3_0(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
 	
-	newobj instance void JitTest.Test::.ctor()
-	ldflda valuetype JitTest.ValueClass JitTest.Test::m_vv
-	ldobj JitTest.ValueClass
+	newobj instance void JitTest_ldobj_V_ldobj_il.Test::.ctor()
+	ldflda valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::m_vv
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
 	pop
 	ldloc.s V
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_3_1(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_3_1(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
 	
-	newobj instance void JitTest.Test::.ctor()
-	ldflda valuetype JitTest.ValueClass JitTest.Test::m_vv
-	ldobj JitTest.ValueClass
+	newobj instance void JitTest_ldobj_V_ldobj_il.Test::.ctor()
+	ldflda valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::m_vv
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
 	stloc.s V
 	ldloc.s V
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_3_2(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_3_2(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
 	
-	newobj instance void JitTest.Test::.ctor()
-	ldflda valuetype JitTest.ValueClass JitTest.Test::m_vv
-	ldobj JitTest.ValueClass
-	stsfld valuetype JitTest.ValueClass JitTest.Test::m_v
+	newobj instance void JitTest_ldobj_V_ldobj_il.Test::.ctor()
+	ldflda valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::m_vv
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
+	stsfld valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::m_v
 	ldloc.s V
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_3_3(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_3_3(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
 	
-	newobj instance void JitTest.Test::.ctor()
-	ldflda valuetype JitTest.ValueClass JitTest.Test::m_vv
-	ldobj JitTest.ValueClass
-	call void JitTest.Test::Func(valuetype JitTest.ValueClass)
+	newobj instance void JitTest_ldobj_V_ldobj_il.Test::.ctor()
+	ldflda valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::m_vv
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
+	call void JitTest_ldobj_V_ldobj_il.Test::Func(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
 	ldloc.s V
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_3_4(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_3_4(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
 	
-	newobj instance void JitTest.Test::.ctor()
-	ldflda valuetype JitTest.ValueClass JitTest.Test::m_vv
-	ldobj JitTest.ValueClass
-	box JitTest.ValueClass
+	newobj instance void JitTest_ldobj_V_ldobj_il.Test::.ctor()
+	ldflda valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::m_vv
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
+	box JitTest_ldobj_V_ldobj_il.ValueClass
 	pop
 	ldloc.s V
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_3_5(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_3_5(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
 	ldloca.s V
-	newobj instance void JitTest.Test::.ctor()
-	ldflda valuetype JitTest.ValueClass JitTest.Test::m_vv
-	ldobj JitTest.ValueClass
-	stobj JitTest.ValueClass
+	newobj instance void JitTest_ldobj_V_ldobj_il.Test::.ctor()
+	ldflda valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::m_vv
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
+	stobj JitTest_ldobj_V_ldobj_il.ValueClass
 	ldloc.s V
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_3_6(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_3_6(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
 	
-	newobj instance void JitTest.Test::.ctor()
-	ldflda valuetype JitTest.ValueClass JitTest.Test::m_vv
-	ldobj JitTest.ValueClass
+	newobj instance void JitTest_ldobj_V_ldobj_il.Test::.ctor()
+	ldflda valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::m_vv
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
 	starg.s ARG
 	ldloc.s V
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_3_7(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_3_7(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
-	newobj instance void JitTest.Test::.ctor()
-	newobj instance void JitTest.Test::.ctor()
-	ldflda valuetype JitTest.ValueClass JitTest.Test::m_vv
-	ldobj JitTest.ValueClass
-	stfld valuetype JitTest.ValueClass JitTest.Test::m_vv
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
+	newobj instance void JitTest_ldobj_V_ldobj_il.Test::.ctor()
+	newobj instance void JitTest_ldobj_V_ldobj_il.Test::.ctor()
+	ldflda valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::m_vv
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
+	stfld valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::m_vv
 	ldloc.s V
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_3_8(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_3_8(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
 	
-	newobj instance void JitTest.Test::.ctor()
-	ldflda valuetype JitTest.ValueClass JitTest.Test::m_vv
-	ldobj JitTest.ValueClass
+	newobj instance void JitTest_ldobj_V_ldobj_il.Test::.ctor()
+	ldflda valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::m_vv
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_4_0(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_4_0(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
 	
 	ldc.i4.2
-	newarr JitTest.ValueClass
+	newarr JitTest_ldobj_V_ldobj_il.ValueClass
 	ldc.i4.1
-	ldelema JitTest.ValueClass
-	ldobj JitTest.ValueClass
+	ldelema JitTest_ldobj_V_ldobj_il.ValueClass
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
 	pop
 	ldloc.s V
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_4_1(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_4_1(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
 	
 	ldc.i4.2
-	newarr JitTest.ValueClass
+	newarr JitTest_ldobj_V_ldobj_il.ValueClass
 	ldc.i4.1
-	ldelema JitTest.ValueClass
-	ldobj JitTest.ValueClass
+	ldelema JitTest_ldobj_V_ldobj_il.ValueClass
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
 	stloc.s V
 	ldloc.s V
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_4_2(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_4_2(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
 	
 	ldc.i4.2
-	newarr JitTest.ValueClass
+	newarr JitTest_ldobj_V_ldobj_il.ValueClass
 	ldc.i4.1
-	ldelema JitTest.ValueClass
-	ldobj JitTest.ValueClass
-	stsfld valuetype JitTest.ValueClass JitTest.Test::m_v
+	ldelema JitTest_ldobj_V_ldobj_il.ValueClass
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
+	stsfld valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::m_v
 	ldloc.s V
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_4_3(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_4_3(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
 	
 	ldc.i4.2
-	newarr JitTest.ValueClass
+	newarr JitTest_ldobj_V_ldobj_il.ValueClass
 	ldc.i4.1
-	ldelema JitTest.ValueClass
-	ldobj JitTest.ValueClass
-	call void JitTest.Test::Func(valuetype JitTest.ValueClass)
+	ldelema JitTest_ldobj_V_ldobj_il.ValueClass
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
+	call void JitTest_ldobj_V_ldobj_il.Test::Func(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
 	ldloc.s V
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_4_4(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_4_4(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
 	
 	ldc.i4.2
-	newarr JitTest.ValueClass
+	newarr JitTest_ldobj_V_ldobj_il.ValueClass
 	ldc.i4.1
-	ldelema JitTest.ValueClass
-	ldobj JitTest.ValueClass
-	box JitTest.ValueClass
+	ldelema JitTest_ldobj_V_ldobj_il.ValueClass
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
+	box JitTest_ldobj_V_ldobj_il.ValueClass
 	pop
 	ldloc.s V
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_4_5(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_4_5(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
 	ldloca.s V
 	ldc.i4.2
-	newarr JitTest.ValueClass
+	newarr JitTest_ldobj_V_ldobj_il.ValueClass
 	ldc.i4.1
-	ldelema JitTest.ValueClass
-	ldobj JitTest.ValueClass
-	stobj JitTest.ValueClass
+	ldelema JitTest_ldobj_V_ldobj_il.ValueClass
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
+	stobj JitTest_ldobj_V_ldobj_il.ValueClass
 	ldloc.s V
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_4_6(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_4_6(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
 	
 	ldc.i4.2
-	newarr JitTest.ValueClass
+	newarr JitTest_ldobj_V_ldobj_il.ValueClass
 	ldc.i4.1
-	ldelema JitTest.ValueClass
-	ldobj JitTest.ValueClass
+	ldelema JitTest_ldobj_V_ldobj_il.ValueClass
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
 	starg.s ARG
 	ldloc.s V
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_4_7(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_4_7(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
-	newobj instance void JitTest.Test::.ctor()
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
+	newobj instance void JitTest_ldobj_V_ldobj_il.Test::.ctor()
 	ldc.i4.2
-	newarr JitTest.ValueClass
+	newarr JitTest_ldobj_V_ldobj_il.ValueClass
 	ldc.i4.1
-	ldelema JitTest.ValueClass
-	ldobj JitTest.ValueClass
-	stfld valuetype JitTest.ValueClass JitTest.Test::m_vv
+	ldelema JitTest_ldobj_V_ldobj_il.ValueClass
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
+	stfld valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::m_vv
 	ldloc.s V
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_4_8(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_4_8(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
 	
 	ldc.i4.2
-	newarr JitTest.ValueClass
+	newarr JitTest_ldobj_V_ldobj_il.ValueClass
 	ldc.i4.1
-	ldelema JitTest.ValueClass
-	ldobj JitTest.ValueClass
+	ldelema JitTest_ldobj_V_ldobj_il.ValueClass
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_5_0(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_5_0(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
 	
-	newobj instance void JitTest.Test::.ctor()
-	ldflda valuetype JitTest.ValueClass JitTest.Test::m_vv
-	ldobj JitTest.ValueClass
+	newobj instance void JitTest_ldobj_V_ldobj_il.Test::.ctor()
+	ldflda valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::m_vv
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
 	pop
 	ldloc.s V
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_5_1(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_5_1(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
 	
-	newobj instance void JitTest.Test::.ctor()
-	ldflda valuetype JitTest.ValueClass JitTest.Test::m_vv
-	ldobj JitTest.ValueClass
+	newobj instance void JitTest_ldobj_V_ldobj_il.Test::.ctor()
+	ldflda valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::m_vv
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
 	stloc.s V
 	ldloc.s V
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_5_2(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_5_2(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
 	
-	newobj instance void JitTest.Test::.ctor()
-	ldflda valuetype JitTest.ValueClass JitTest.Test::m_vv
-	ldobj JitTest.ValueClass
-	stsfld valuetype JitTest.ValueClass JitTest.Test::m_v
+	newobj instance void JitTest_ldobj_V_ldobj_il.Test::.ctor()
+	ldflda valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::m_vv
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
+	stsfld valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::m_v
 	ldloc.s V
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_5_3(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_5_3(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
 	
-	newobj instance void JitTest.Test::.ctor()
-	ldflda valuetype JitTest.ValueClass JitTest.Test::m_vv
-	ldobj JitTest.ValueClass
-	call void JitTest.Test::Func(valuetype JitTest.ValueClass)
+	newobj instance void JitTest_ldobj_V_ldobj_il.Test::.ctor()
+	ldflda valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::m_vv
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
+	call void JitTest_ldobj_V_ldobj_il.Test::Func(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
 	ldloc.s V
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_5_4(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_5_4(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
 	
-	newobj instance void JitTest.Test::.ctor()
-	ldflda valuetype JitTest.ValueClass JitTest.Test::m_vv
-	ldobj JitTest.ValueClass
-	box JitTest.ValueClass
+	newobj instance void JitTest_ldobj_V_ldobj_il.Test::.ctor()
+	ldflda valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::m_vv
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
+	box JitTest_ldobj_V_ldobj_il.ValueClass
 	pop
 	ldloc.s V
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_5_5(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_5_5(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
 	ldloca.s V
-	newobj instance void JitTest.Test::.ctor()
-	ldflda valuetype JitTest.ValueClass JitTest.Test::m_vv
-	ldobj JitTest.ValueClass
-	stobj JitTest.ValueClass
+	newobj instance void JitTest_ldobj_V_ldobj_il.Test::.ctor()
+	ldflda valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::m_vv
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
+	stobj JitTest_ldobj_V_ldobj_il.ValueClass
 	ldloc.s V
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_5_6(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_5_6(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
 	
-	newobj instance void JitTest.Test::.ctor()
-	ldflda valuetype JitTest.ValueClass JitTest.Test::m_vv
-	ldobj JitTest.ValueClass
+	newobj instance void JitTest_ldobj_V_ldobj_il.Test::.ctor()
+	ldflda valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::m_vv
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
 	starg.s ARG
 	ldloc.s V
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_5_7(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_5_7(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
-	newobj instance void JitTest.Test::.ctor()
-	newobj instance void JitTest.Test::.ctor()
-	ldflda valuetype JitTest.ValueClass JitTest.Test::m_vv
-	ldobj JitTest.ValueClass
-	stfld valuetype JitTest.ValueClass JitTest.Test::m_vv
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
+	newobj instance void JitTest_ldobj_V_ldobj_il.Test::.ctor()
+	newobj instance void JitTest_ldobj_V_ldobj_il.Test::.ctor()
+	ldflda valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::m_vv
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
+	stfld valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::m_vv
 	ldloc.s V
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_5_8(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_5_8(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
 	
-	newobj instance void JitTest.Test::.ctor()
-	ldflda valuetype JitTest.ValueClass JitTest.Test::m_vv
-	ldobj JitTest.ValueClass
+	newobj instance void JitTest_ldobj_V_ldobj_il.Test::.ctor()
+	ldflda valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::m_vv
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_6_0(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_6_0(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
 	
 	ldloca.s V
-	mkrefany JitTest.ValueClass
-	refanyval JitTest.ValueClass
-	ldobj JitTest.ValueClass
+	mkrefany JitTest_ldobj_V_ldobj_il.ValueClass
+	refanyval JitTest_ldobj_V_ldobj_il.ValueClass
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
 	pop
 	ldloc.s V
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_6_1(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_6_1(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
 	
 	ldloca.s V
-	mkrefany JitTest.ValueClass
-	refanyval JitTest.ValueClass
-	ldobj JitTest.ValueClass
+	mkrefany JitTest_ldobj_V_ldobj_il.ValueClass
+	refanyval JitTest_ldobj_V_ldobj_il.ValueClass
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
 	stloc.s V
 	ldloc.s V
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_6_2(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_6_2(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
 	
 	ldloca.s V
-	mkrefany JitTest.ValueClass
-	refanyval JitTest.ValueClass
-	ldobj JitTest.ValueClass
-	stsfld valuetype JitTest.ValueClass JitTest.Test::m_v
+	mkrefany JitTest_ldobj_V_ldobj_il.ValueClass
+	refanyval JitTest_ldobj_V_ldobj_il.ValueClass
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
+	stsfld valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::m_v
 	ldloc.s V
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_6_3(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_6_3(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
 	
 	ldloca.s V
-	mkrefany JitTest.ValueClass
-	refanyval JitTest.ValueClass
-	ldobj JitTest.ValueClass
-	call void JitTest.Test::Func(valuetype JitTest.ValueClass)
+	mkrefany JitTest_ldobj_V_ldobj_il.ValueClass
+	refanyval JitTest_ldobj_V_ldobj_il.ValueClass
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
+	call void JitTest_ldobj_V_ldobj_il.Test::Func(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
 	ldloc.s V
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_6_4(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_6_4(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
 	
 	ldloca.s V
-	mkrefany JitTest.ValueClass
-	refanyval JitTest.ValueClass
-	ldobj JitTest.ValueClass
-	box JitTest.ValueClass
+	mkrefany JitTest_ldobj_V_ldobj_il.ValueClass
+	refanyval JitTest_ldobj_V_ldobj_il.ValueClass
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
+	box JitTest_ldobj_V_ldobj_il.ValueClass
 	pop
 	ldloc.s V
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_6_5(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_6_5(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
 	ldloca.s V
 	ldloca.s V
-	mkrefany JitTest.ValueClass
-	refanyval JitTest.ValueClass
-	ldobj JitTest.ValueClass
-	stobj JitTest.ValueClass
+	mkrefany JitTest_ldobj_V_ldobj_il.ValueClass
+	refanyval JitTest_ldobj_V_ldobj_il.ValueClass
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
+	stobj JitTest_ldobj_V_ldobj_il.ValueClass
 	ldloc.s V
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_6_6(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_6_6(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
 	
 	ldloca.s V
-	mkrefany JitTest.ValueClass
-	refanyval JitTest.ValueClass
-	ldobj JitTest.ValueClass
+	mkrefany JitTest_ldobj_V_ldobj_il.ValueClass
+	refanyval JitTest_ldobj_V_ldobj_il.ValueClass
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
 	starg.s ARG
 	ldloc.s V
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_6_7(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_6_7(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
-	newobj instance void JitTest.Test::.ctor()
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
+	newobj instance void JitTest_ldobj_V_ldobj_il.Test::.ctor()
 	ldloca.s V
-	mkrefany JitTest.ValueClass
-	refanyval JitTest.ValueClass
-	ldobj JitTest.ValueClass
-	stfld valuetype JitTest.ValueClass JitTest.Test::m_vv
+	mkrefany JitTest_ldobj_V_ldobj_il.ValueClass
+	refanyval JitTest_ldobj_V_ldobj_il.ValueClass
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
+	stfld valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::m_vv
 	ldloc.s V
 	ret
 	}
-	.method private hidebysig static valuetype JitTest.ValueClass method_6_8(valuetype JitTest.ValueClass ARG) cil managed
+	.method private hidebysig static valuetype JitTest_ldobj_V_ldobj_il.ValueClass method_6_8(valuetype JitTest_ldobj_V_ldobj_il.ValueClass ARG) cil managed
 	{
 	.maxstack  8
-	.locals (valuetype JitTest.ValueClass V)
+	.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 	ldloca.s V
-	initobj JitTest.ValueClass
+	initobj JitTest_ldobj_V_ldobj_il.ValueClass
 	
 	ldloca.s V
-	mkrefany JitTest.ValueClass
-	refanyval JitTest.ValueClass
-	ldobj JitTest.ValueClass
+	mkrefany JitTest_ldobj_V_ldobj_il.ValueClass
+	refanyval JitTest_ldobj_V_ldobj_il.ValueClass
+	ldobj JitTest_ldobj_V_ldobj_il.ValueClass
 	ret
 	}
     .method public hidebysig static int32
@@ -911,73 +911,73 @@
       )
       .entrypoint
       .maxstack  1
-		.locals (valuetype JitTest.ValueClass V)
+		.locals (valuetype JitTest_ldobj_V_ldobj_il.ValueClass V)
 		ldloca.s V
-		initobj JitTest.ValueClass
+		initobj JitTest_ldobj_V_ldobj_il.ValueClass
 		ldloc.s V
-		call valuetype JitTest.ValueClass JitTest.Test::method_0_0(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_0_1(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_0_2(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_0_3(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_0_4(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_0_5(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_0_6(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_0_7(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_0_8(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_1_0(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_1_1(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_1_2(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_1_3(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_1_4(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_1_5(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_1_6(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_1_7(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_1_8(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_2_0(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_2_1(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_2_2(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_2_3(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_2_4(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_2_5(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_2_6(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_2_7(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_2_8(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_3_0(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_3_1(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_3_2(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_3_3(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_3_4(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_3_5(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_3_6(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_3_7(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_3_8(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_4_0(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_4_1(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_4_2(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_4_3(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_4_4(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_4_5(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_4_6(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_4_7(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_4_8(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_5_0(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_5_1(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_5_2(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_5_3(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_5_4(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_5_5(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_5_6(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_5_7(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_5_8(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_6_0(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_6_1(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_6_2(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_6_3(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_6_4(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_6_5(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_6_6(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_6_7(valuetype JitTest.ValueClass)
-		call valuetype JitTest.ValueClass JitTest.Test::method_6_8(valuetype JitTest.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_0_0(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_0_1(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_0_2(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_0_3(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_0_4(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_0_5(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_0_6(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_0_7(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_0_8(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_1_0(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_1_1(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_1_2(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_1_3(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_1_4(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_1_5(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_1_6(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_1_7(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_1_8(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_2_0(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_2_1(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_2_2(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_2_3(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_2_4(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_2_5(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_2_6(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_2_7(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_2_8(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_3_0(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_3_1(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_3_2(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_3_3(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_3_4(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_3_5(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_3_6(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_3_7(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_3_8(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_4_0(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_4_1(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_4_2(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_4_3(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_4_4(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_4_5(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_4_6(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_4_7(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_4_8(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_5_0(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_5_1(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_5_2(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_5_3(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_5_4(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_5_5(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_5_6(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_5_7(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_5_8(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_6_0(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_6_1(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_6_2(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_6_3(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_6_4(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_6_5(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_6_6(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_6_7(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
+		call valuetype JitTest_ldobj_V_ldobj_il.ValueClass JitTest_ldobj_V_ldobj_il.Test::method_6_8(valuetype JitTest_ldobj_V_ldobj_il.ValueClass)
 		pop
       ldstr      "Passed"
       call       void [System.Console]System.Console::WriteLine(string)
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_V_il_d.ilproj b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_V_il_d.ilproj
index a70cf3c238cec2..0e284de73631b9 100644
--- a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_V_il_d.ilproj
+++ b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_V_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_V_il_r.ilproj b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_V_il_r.ilproj
index 00f4af88c13c32..3dd3a4ffe301db 100644
--- a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_V_il_r.ilproj
+++ b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_V_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/xxobj/operand/const.il b/src/tests/JIT/Methodical/xxobj/operand/const.il
index 6cd407b4d3f7f7..29a806e8fcc729 100644
--- a/src/tests/JIT/Methodical/xxobj/operand/const.il
+++ b/src/tests/JIT/Methodical/xxobj/operand/const.il
@@ -12,9 +12,9 @@
 {
 }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_const_operand_il
 {
-  .class private sequential ansi sealed beforefieldinit Test
+  .class public sequential ansi sealed beforefieldinit Test
          extends [mscorlib]System.ValueType
   {
     .field private int32 m_v
@@ -55,7 +55,7 @@
       ldc.i4.0
       ret
     }
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() cil managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -71,21 +71,21 @@
 
 	ldloca.s V_1
 	conv.u
-      IL_0000:  call       int32 JitTest.Test::const_ldobj(int8*)
+      IL_0000:  call       int32 JitTest_const_operand_il.Test::const_ldobj(int8*)
       IL_0005:  brfalse.s  IL_0016
       IL_0007:  ldstr      "const_ldobj() failed."
       IL_000c:  call       void [System.Console]System.Console::WriteLine(string)
       IL_0011:  ldc.i4.s   101
       IL_0013:  stloc.0
       IL_0014:  br.s       IL_0067
-      IL_0016:  call       int32 JitTest.Test::const_initobj()
+      IL_0016:  call       int32 JitTest_const_operand_il.Test::const_initobj()
       IL_001b:  brfalse.s  IL_002c
       IL_001d:  ldstr      "const_initobj() failed."
       IL_0022:  call       void [System.Console]System.Console::WriteLine(string)
       IL_0027:  ldc.i4.s   102
       IL_0029:  stloc.0
       IL_002a:  br.s       IL_0067
-      IL_002c:  call       int32 JitTest.Test::const_stobj()
+      IL_002c:  call       int32 JitTest_const_operand_il.Test::const_stobj()
       IL_0031:  brfalse.s  IL_0042
       IL_0033:  ldstr      "const_stobj() failed."
       IL_0038:  call       void [System.Console]System.Console::WriteLine(string)
@@ -95,7 +95,7 @@
       IL_0042:  
 		ldloca.s V_1
 		conv.u		
-		call       int32 JitTest.Test::const_cpobj(int8*)
+		call       int32 JitTest_const_operand_il.Test::const_cpobj(int8*)
       IL_0047:  brfalse.s  IL_0058
       IL_0049:  ldstr      "const_cpobj() failed."
       IL_004e:  call       void [System.Console]System.Console::WriteLine(string)
diff --git a/src/tests/JIT/Methodical/xxobj/operand/const_il_d.ilproj b/src/tests/JIT/Methodical/xxobj/operand/const_il_d.ilproj
index fe3eb7848d4628..423bb95d4fdb2f 100644
--- a/src/tests/JIT/Methodical/xxobj/operand/const_il_d.ilproj
+++ b/src/tests/JIT/Methodical/xxobj/operand/const_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/xxobj/operand/const_il_r.ilproj b/src/tests/JIT/Methodical/xxobj/operand/const_il_r.ilproj
index 68857945c06708..9e75fdfaa008ce 100644
--- a/src/tests/JIT/Methodical/xxobj/operand/const_il_r.ilproj
+++ b/src/tests/JIT/Methodical/xxobj/operand/const_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/xxobj/operand/ldelema.il b/src/tests/JIT/Methodical/xxobj/operand/ldelema.il
index aba96e52a6d012..3cc8a4364bf309 100644
--- a/src/tests/JIT/Methodical/xxobj/operand/ldelema.il
+++ b/src/tests/JIT/Methodical/xxobj/operand/ldelema.il
@@ -10,9 +10,9 @@
 }
 .assembly 'ldelema' { }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_ldelema_operand_il
 {
-  .class private sequential ansi sealed beforefieldinit Test
+  .class public sequential ansi sealed beforefieldinit Test
          extends [mscorlib]System.ValueType
   {
     .field private int32 m_v
@@ -20,28 +20,28 @@
             mdarray_ldobj() cil managed
     {
       .maxstack  8
-      .locals (value class JitTest.Test[] arr, value class JitTest.Test elem)
+      .locals (value class JitTest_ldelema_operand_il.Test[] arr, value class JitTest_ldelema_operand_il.Test elem)
       ldc.i4 11
-      newarr JitTest.Test
+      newarr JitTest_ldelema_operand_il.Test
       stloc.s arr
 
       // arr[5].m_v = 1234;
       ldloc.s arr
       ldc.i4.5
-      ldelema JitTest.Test
+      ldelema JitTest_ldelema_operand_il.Test
       ldc.i4 1234
-      stfld int32 JitTest.Test::m_v
+      stfld int32 JitTest_ldelema_operand_il.Test::m_v
       
       // elem = arr[5];
       ldloc.s arr
       ldc.i4.5
-      ldelema JitTest.Test
-      ldobj JitTest.Test
+      ldelema JitTest_ldelema_operand_il.Test
+      ldobj JitTest_ldelema_operand_il.Test
       stloc.s elem
 
       // return elem.m_v - 1234;
       ldloca.s elem
-      ldfld int32 JitTest.Test::m_v
+      ldfld int32 JitTest_ldelema_operand_il.Test::m_v
       ldc.i4 1234
       xor
       ret
@@ -50,26 +50,26 @@
             mdarray_initobj() cil managed
     {
       .maxstack  8
-      .locals (value class JitTest.Test[] arr)
+      .locals (value class JitTest_ldelema_operand_il.Test[] arr)
       ldc.i4 11
-      newarr JitTest.Test
+      newarr JitTest_ldelema_operand_il.Test
       stloc.s arr
 
       ldloc.s arr
       ldc.i4.5
-      ldelema JitTest.Test
+      ldelema JitTest_ldelema_operand_il.Test
       ldc.i4 1234
-      stfld int32 JitTest.Test::m_v
+      stfld int32 JitTest_ldelema_operand_il.Test::m_v
 
       ldloc.s arr
       ldc.i4.5
-      ldelema JitTest.Test
-      initobj JitTest.Test
+      ldelema JitTest_ldelema_operand_il.Test
+      initobj JitTest_ldelema_operand_il.Test
 
       ldloc.s arr
       ldc.i4.5
-      ldelema JitTest.Test
-      ldfld int32 JitTest.Test::m_v
+      ldelema JitTest_ldelema_operand_il.Test
+      ldfld int32 JitTest_ldelema_operand_il.Test::m_v
       ret
     }
 
@@ -77,48 +77,48 @@
             mdarray_cpobj() cil managed
     {
       .maxstack  8
-      .locals (value class JitTest.Test[] arr, value class JitTest.Test elem)
+      .locals (value class JitTest_ldelema_operand_il.Test[] arr, value class JitTest_ldelema_operand_il.Test elem)
       ldloca.s elem
-      initobj JitTest.Test
+      initobj JitTest_ldelema_operand_il.Test
 
       ldc.i4 11
-      newarr JitTest.Test
+      newarr JitTest_ldelema_operand_il.Test
       stloc.s arr
 
       ldloc.s arr
       ldc.i4.5
-      ldelema JitTest.Test
+      ldelema JitTest_ldelema_operand_il.Test
       ldc.i4 1234
-      stfld int32 JitTest.Test::m_v
+      stfld int32 JitTest_ldelema_operand_il.Test::m_v
 
       ldloc.s arr
       ldc.i4.5
-      ldelema JitTest.Test
+      ldelema JitTest_ldelema_operand_il.Test
       ldloca.s elem
-      cpobj JitTest.Test
+      cpobj JitTest_ldelema_operand_il.Test
 
       ldloc.s arr
       ldc.i4.5
-      ldelema JitTest.Test
-      ldfld int32 JitTest.Test::m_v
+      ldelema JitTest_ldelema_operand_il.Test
+      ldfld int32 JitTest_ldelema_operand_il.Test::m_v
       dup
       brtrue RET
       pop
       
       ldloc.s arr
       ldc.i4.7
-      ldelema JitTest.Test
+      ldelema JitTest_ldelema_operand_il.Test
       ldc.i4 4321
-      stfld int32 JitTest.Test::m_v
+      stfld int32 JitTest_ldelema_operand_il.Test::m_v
       
       ldloca.s elem
       ldloc.s arr
       ldc.i4.7
-      ldelema JitTest.Test
-      cpobj JitTest.Test
+      ldelema JitTest_ldelema_operand_il.Test
+      cpobj JitTest_ldelema_operand_il.Test
 
       ldloca.s elem
-      ldfld int32 JitTest.Test::m_v
+      ldfld int32 JitTest_ldelema_operand_il.Test::m_v
       ldc.i4 4321
       xor
 
@@ -130,33 +130,33 @@
             mdarray_stobj() cil managed
     {
       .maxstack  8
-      .locals (value class JitTest.Test[] arr, value class JitTest.Test elem)
+      .locals (value class JitTest_ldelema_operand_il.Test[] arr, value class JitTest_ldelema_operand_il.Test elem)
       ldloca.s elem
-      initobj JitTest.Test
+      initobj JitTest_ldelema_operand_il.Test
       
       ldc.i4 11
-      newarr JitTest.Test
+      newarr JitTest_ldelema_operand_il.Test
       stloc.s arr
 
       ldloc.s arr
       ldc.i4.5
-      ldelema JitTest.Test
+      ldelema JitTest_ldelema_operand_il.Test
       ldc.i4 1234
-      stfld int32 JitTest.Test::m_v
+      stfld int32 JitTest_ldelema_operand_il.Test::m_v
       
       ldloc.s arr
       ldc.i4.5
-      ldelema JitTest.Test
+      ldelema JitTest_ldelema_operand_il.Test
       ldloc.s elem
-      stobj JitTest.Test
+      stobj JitTest_ldelema_operand_il.Test
       
       ldloc.s arr
       ldc.i4.5
-      ldelema JitTest.Test
-      ldfld int32 JitTest.Test::m_v
+      ldelema JitTest_ldelema_operand_il.Test
+      ldfld int32 JitTest_ldelema_operand_il.Test::m_v
       ret
     }
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() cil managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -165,28 +165,28 @@
       .entrypoint
       .maxstack  1
       .locals (int32 V_0)
-      IL_0000:  call       int32 JitTest.Test::mdarray_ldobj()
+      IL_0000:  call       int32 JitTest_ldelema_operand_il.Test::mdarray_ldobj()
       IL_0005:  brfalse.s  IL_0016
       IL_0007:  ldstr      "mdarray_ldobj() failed."
       IL_000c:  call       void [System.Console]System.Console::WriteLine(string)
       IL_0011:  ldc.i4.s   101
       IL_0013:  stloc.0
       IL_0014:  br.s       IL_0067
-      IL_0016:  call       int32 JitTest.Test::mdarray_initobj()
+      IL_0016:  call       int32 JitTest_ldelema_operand_il.Test::mdarray_initobj()
       IL_001b:  brfalse.s  IL_002c
       IL_001d:  ldstr      "mdarray_initobj() failed."
       IL_0022:  call       void [System.Console]System.Console::WriteLine(string)
       IL_0027:  ldc.i4.s   102
       IL_0029:  stloc.0
       IL_002a:  br.s       IL_0067
-      IL_002c:  call       int32 JitTest.Test::mdarray_stobj()
+      IL_002c:  call       int32 JitTest_ldelema_operand_il.Test::mdarray_stobj()
       IL_0031:  brfalse.s  IL_0042
       IL_0033:  ldstr      "mdarray_stobj() failed."
       IL_0038:  call       void [System.Console]System.Console::WriteLine(string)
       IL_003d:  ldc.i4.s   103
       IL_003f:  stloc.0
       IL_0040:  br.s       IL_0067
-      IL_0042:  call       int32 JitTest.Test::mdarray_cpobj()
+      IL_0042:  call       int32 JitTest_ldelema_operand_il.Test::mdarray_cpobj()
       IL_0047:  brfalse.s  IL_0058
       IL_0049:  ldstr      "mdarray_cpobj() failed."
       IL_004e:  call       void [System.Console]System.Console::WriteLine(string)
diff --git a/src/tests/JIT/Methodical/xxobj/operand/ldelema_il_d.ilproj b/src/tests/JIT/Methodical/xxobj/operand/ldelema_il_d.ilproj
index 25ad4d4f51cf5a..0dae92823e88e4 100644
--- a/src/tests/JIT/Methodical/xxobj/operand/ldelema_il_d.ilproj
+++ b/src/tests/JIT/Methodical/xxobj/operand/ldelema_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/xxobj/operand/ldelema_il_r.ilproj b/src/tests/JIT/Methodical/xxobj/operand/ldelema_il_r.ilproj
index 32525ac134d896..b153ba435235ac 100644
--- a/src/tests/JIT/Methodical/xxobj/operand/ldelema_il_r.ilproj
+++ b/src/tests/JIT/Methodical/xxobj/operand/ldelema_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/xxobj/operand/localloc.il b/src/tests/JIT/Methodical/xxobj/operand/localloc.il
index 40cdc2966b2bfa..8273e299684775 100644
--- a/src/tests/JIT/Methodical/xxobj/operand/localloc.il
+++ b/src/tests/JIT/Methodical/xxobj/operand/localloc.il
@@ -10,9 +10,9 @@
 .assembly 'localloc_operand' {
 }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_localloc_operand_il
 {
-  .class private sequential ansi sealed beforefieldinit Test
+  .class public sequential ansi sealed beforefieldinit Test
          extends [mscorlib]System.ValueType
   {
     .field private int32 m_v
@@ -20,20 +20,20 @@
             localloc_ldobj() cil managed
     {
       .maxstack  8
-      .locals (native int ptr, value class JitTest.Test elem, int32 dummy)
+      .locals (native int ptr, value class JitTest_localloc_operand_il.Test elem, int32 dummy)
       sizeof int32
       localloc
       ldobj int32
       stloc.s dummy
 
       ldloca.s elem
-      initobj JitTest.Test
+      initobj JitTest_localloc_operand_il.Test
 
-      sizeof JitTest.Test
+      sizeof JitTest_localloc_operand_il.Test
       ldc.i4.2
       mul
       localloc
-      sizeof JitTest.Test
+      sizeof JitTest_localloc_operand_il.Test
       ldc.i4.2
       div
       add
@@ -42,15 +42,15 @@
       ldloc.s ptr
       ldc.i4 1234
       unaligned. 1
-      stfld int32 JitTest.Test::m_v
+      stfld int32 JitTest_localloc_operand_il.Test::m_v
 
       ldloc.s ptr
       unaligned. 1
-      ldobj JitTest.Test
+      ldobj JitTest_localloc_operand_il.Test
 
       stloc.s elem
       ldloca.s elem
-      ldfld int32 JitTest.Test::m_v
+      ldfld int32 JitTest_localloc_operand_il.Test::m_v
       ldc.i4 1234
       sub
       ret
@@ -59,34 +59,34 @@
             localloc_initobj() cil managed
     {
       .maxstack  8
-      .locals (native int ptr, value class JitTest.Test elem, int32 dummy)
-      sizeof JitTest.Test
+      .locals (native int ptr, value class JitTest_localloc_operand_il.Test elem, int32 dummy)
+      sizeof JitTest_localloc_operand_il.Test
       localloc
-      initobj JitTest.Test
+      initobj JitTest_localloc_operand_il.Test
 
-      sizeof JitTest.Test
+      sizeof JitTest_localloc_operand_il.Test
       localloc
       dup
-      initobj JitTest.Test
-      ldfld int32 JitTest.Test::m_v
+      initobj JitTest_localloc_operand_il.Test
+      ldfld int32 JitTest_localloc_operand_il.Test::m_v
       dup
       brtrue RET
       pop
 
-      sizeof JitTest.Test
+      sizeof JitTest_localloc_operand_il.Test
       ldc.i4.2
       mul
       localloc
-      sizeof JitTest.Test
+      sizeof JitTest_localloc_operand_il.Test
       ldc.i4.2
       div
       add
 
       dup
       unaligned. 1
-      initobj JitTest.Test
+      initobj JitTest_localloc_operand_il.Test
       unaligned. 1
-      ldfld int32 JitTest.Test::m_v
+      ldfld int32 JitTest_localloc_operand_il.Test::m_v
 
     RET:
       ret
@@ -96,20 +96,20 @@
             localloc_cpobj() cil managed
     {
       .maxstack  8
-      .locals (native int ptr, value class JitTest.Test elem, int32 dummy)
+      .locals (native int ptr, value class JitTest_localloc_operand_il.Test elem, int32 dummy)
       sizeof int32
       localloc
       ldobj int32
       stloc.s dummy
 
       ldloca.s elem
-      initobj JitTest.Test
+      initobj JitTest_localloc_operand_il.Test
 
-      sizeof JitTest.Test
+      sizeof JitTest_localloc_operand_il.Test
       ldc.i4.2
       mul
       localloc
-      sizeof JitTest.Test
+      sizeof JitTest_localloc_operand_il.Test
       ldc.i4.2
       div
       add
@@ -118,15 +118,15 @@
       ldloc.s ptr
       ldc.i4 1234
       unaligned. 1
-      stfld int32 JitTest.Test::m_v
+      stfld int32 JitTest_localloc_operand_il.Test::m_v
 
       ldloca.s elem
       ldloc.s ptr
       unaligned. 1
-      cpobj JitTest.Test
+      cpobj JitTest_localloc_operand_il.Test
 
       ldloca.s elem
-      ldfld int32 JitTest.Test::m_v
+      ldfld int32 JitTest_localloc_operand_il.Test::m_v
       ldc.i4 1234
       sub
       ret
@@ -136,22 +136,22 @@
             localloc_stobj() cil managed
     {
       .maxstack  8
-      .locals (value class JitTest.Test[0...10] arr, value class JitTest.Test elem)
+      .locals (value class JitTest_localloc_operand_il.Test[0...10] arr, value class JitTest_localloc_operand_il.Test elem)
       .maxstack  8
-      .locals (native int ptr, value class JitTest.Test elem, int32 dummy)
+      .locals (native int ptr, value class JitTest_localloc_operand_il.Test elem, int32 dummy)
       sizeof int32
       localloc
       ldobj int32
       stloc.s dummy
 
       ldloca.s elem
-      initobj JitTest.Test
+      initobj JitTest_localloc_operand_il.Test
 
-      sizeof JitTest.Test
+      sizeof JitTest_localloc_operand_il.Test
       ldc.i4.2
       mul
       localloc
-      sizeof JitTest.Test
+      sizeof JitTest_localloc_operand_il.Test
       ldc.i4.2
       div
       add
@@ -160,19 +160,19 @@
       ldloc.s ptr
       ldc.i4 1234
       unaligned. 1
-      stfld int32 JitTest.Test::m_v
+      stfld int32 JitTest_localloc_operand_il.Test::m_v
 
       ldloc.s ptr
       ldloc.s elem
       unaligned. 1
-      stobj JitTest.Test
+      stobj JitTest_localloc_operand_il.Test
 
       ldloca.s elem
-      ldfld int32 JitTest.Test::m_v
+      ldfld int32 JitTest_localloc_operand_il.Test::m_v
       ret
     }
 
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() cil managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -181,28 +181,28 @@
       .entrypoint
       .maxstack  1
       .locals (int32 V_0)
-      IL_0000:  call       int32 JitTest.Test::localloc_ldobj()
+      IL_0000:  call       int32 JitTest_localloc_operand_il.Test::localloc_ldobj()
       IL_0005:  brfalse.s  IL_0016
       IL_0007:  ldstr      "localloc_ldobj() failed."
       IL_000c:  call       void [System.Console]System.Console::WriteLine(string)
       IL_0011:  ldc.i4.s   101
       IL_0013:  stloc.0
       IL_0014:  br.s       IL_0067
-      IL_0016:  call       int32 JitTest.Test::localloc_initobj()
+      IL_0016:  call       int32 JitTest_localloc_operand_il.Test::localloc_initobj()
       IL_001b:  brfalse.s  IL_002c
       IL_001d:  ldstr      "localloc_initobj() failed."
       IL_0022:  call       void [System.Console]System.Console::WriteLine(string)
       IL_0027:  ldc.i4.s   102
       IL_0029:  stloc.0
       IL_002a:  br.s       IL_0067
-      IL_002c:  call       int32 JitTest.Test::localloc_stobj()
+      IL_002c:  call       int32 JitTest_localloc_operand_il.Test::localloc_stobj()
       IL_0031:  brfalse.s  IL_0042
       IL_0033:  ldstr      "localloc_stobj() failed."
       IL_0038:  call       void [System.Console]System.Console::WriteLine(string)
       IL_003d:  ldc.i4.s   103
       IL_003f:  stloc.0
       IL_0040:  br.s       IL_0067
-      IL_0042:  call       int32 JitTest.Test::localloc_cpobj()
+      IL_0042:  call       int32 JitTest_localloc_operand_il.Test::localloc_cpobj()
       IL_0047:  brfalse.s  IL_0058
       IL_0049:  ldstr      "localloc_cpobj() failed."
       IL_004e:  call       void [System.Console]System.Console::WriteLine(string)
diff --git a/src/tests/JIT/Methodical/xxobj/operand/localloc_operand_il_d.ilproj b/src/tests/JIT/Methodical/xxobj/operand/localloc_operand_il_d.ilproj
index 69145976a49232..0c61e9426fce32 100644
--- a/src/tests/JIT/Methodical/xxobj/operand/localloc_operand_il_d.ilproj
+++ b/src/tests/JIT/Methodical/xxobj/operand/localloc_operand_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
     <!-- #2444 -->
     <DisableProjectBuild>true</DisableProjectBuild>
diff --git a/src/tests/JIT/Methodical/xxobj/operand/localloc_operand_il_r.ilproj b/src/tests/JIT/Methodical/xxobj/operand/localloc_operand_il_r.ilproj
index 7db7f09d35305b..63013e0fe9a7d1 100644
--- a/src/tests/JIT/Methodical/xxobj/operand/localloc_operand_il_r.ilproj
+++ b/src/tests/JIT/Methodical/xxobj/operand/localloc_operand_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
     <!-- #2444 -->
     <DisableProjectBuild>true</DisableProjectBuild>
diff --git a/src/tests/JIT/Methodical/xxobj/operand/mdarray.il b/src/tests/JIT/Methodical/xxobj/operand/mdarray.il
index e93967783f2c40..ce49f174af7a6f 100644
--- a/src/tests/JIT/Methodical/xxobj/operand/mdarray.il
+++ b/src/tests/JIT/Methodical/xxobj/operand/mdarray.il
@@ -10,9 +10,9 @@
 }
 .assembly mdarray { }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_mdarray_operand_il
 {
-  .class private sequential ansi sealed beforefieldinit Test
+  .class public sequential ansi sealed beforefieldinit Test
          extends [mscorlib]System.ValueType
   {
     .field private int32 m_v
@@ -20,29 +20,29 @@
             mdarray_ldobj() cil managed
     {
       .maxstack  8
-      .locals (value class JitTest.Test[0...10] arr, value class JitTest.Test elem)
+      .locals (value class JitTest_mdarray_operand_il.Test[0...10] arr, value class JitTest_mdarray_operand_il.Test elem)
       // arr = new Test[0...10];
       ldc.i4 11
-      newobj instance void value class JitTest.Test[0...10]::.ctor(int32)
+      newobj instance void value class JitTest_mdarray_operand_il.Test[0...10]::.ctor(int32)
       stloc.s arr
 
       // arr[5].m_v = 1234;
       ldloc.s arr
       ldc.i4.5
-      call instance value class JitTest.Test& value class JitTest.Test[0...10]::Address(int32)
+      call instance value class JitTest_mdarray_operand_il.Test& value class JitTest_mdarray_operand_il.Test[0...10]::Address(int32)
       ldc.i4 1234
-      stfld int32 JitTest.Test::m_v
+      stfld int32 JitTest_mdarray_operand_il.Test::m_v
       
       // elem = arr[5];
       ldloc.s arr
       ldc.i4.5
-      call instance value class JitTest.Test& value class JitTest.Test[0...10]::Address(int32)
-      ldobj JitTest.Test
+      call instance value class JitTest_mdarray_operand_il.Test& value class JitTest_mdarray_operand_il.Test[0...10]::Address(int32)
+      ldobj JitTest_mdarray_operand_il.Test
       stloc.s elem
 
       // return elem.m_v - 1234;
       ldloca.s elem
-      ldfld int32 JitTest.Test::m_v
+      ldfld int32 JitTest_mdarray_operand_il.Test::m_v
       ldc.i4 1234
       xor
       ret
@@ -51,26 +51,26 @@
             mdarray_initobj() cil managed
     {
       .maxstack  8
-      .locals (value class JitTest.Test[0...10] arr)
+      .locals (value class JitTest_mdarray_operand_il.Test[0...10] arr)
       ldc.i4 11
-      newobj instance void value class JitTest.Test[0...10]::.ctor(int32)
+      newobj instance void value class JitTest_mdarray_operand_il.Test[0...10]::.ctor(int32)
       stloc.s arr
 
       ldloc.s arr
       ldc.i4.5
-      call instance value class JitTest.Test& value class JitTest.Test[0...10]::Address(int32)
+      call instance value class JitTest_mdarray_operand_il.Test& value class JitTest_mdarray_operand_il.Test[0...10]::Address(int32)
       ldc.i4 1234
-      stfld int32 JitTest.Test::m_v
+      stfld int32 JitTest_mdarray_operand_il.Test::m_v
 
       ldloc.s arr
       ldc.i4.5
-      call instance value class JitTest.Test& value class JitTest.Test[0...10]::Address(int32)
-      initobj JitTest.Test
+      call instance value class JitTest_mdarray_operand_il.Test& value class JitTest_mdarray_operand_il.Test[0...10]::Address(int32)
+      initobj JitTest_mdarray_operand_il.Test
 
       ldloc.s arr
       ldc.i4.5
-      call instance value class JitTest.Test& value class JitTest.Test[0...10]::Address(int32)
-      ldfld int32 JitTest.Test::m_v
+      call instance value class JitTest_mdarray_operand_il.Test& value class JitTest_mdarray_operand_il.Test[0...10]::Address(int32)
+      ldfld int32 JitTest_mdarray_operand_il.Test::m_v
       ret
     }
 
@@ -78,48 +78,48 @@
             mdarray_cpobj() cil managed
     {
       .maxstack  8
-      .locals (value class JitTest.Test[0...10] arr, value class JitTest.Test elem)
+      .locals (value class JitTest_mdarray_operand_il.Test[0...10] arr, value class JitTest_mdarray_operand_il.Test elem)
       ldloca.s elem
-      initobj JitTest.Test
+      initobj JitTest_mdarray_operand_il.Test
 
       ldc.i4 11
-      newobj instance void value class JitTest.Test[0...10]::.ctor(int32)
+      newobj instance void value class JitTest_mdarray_operand_il.Test[0...10]::.ctor(int32)
       stloc.s arr
 
       ldloc.s arr
       ldc.i4.5
-      call instance value class JitTest.Test& value class JitTest.Test[0...10]::Address(int32)
+      call instance value class JitTest_mdarray_operand_il.Test& value class JitTest_mdarray_operand_il.Test[0...10]::Address(int32)
       ldc.i4 1234
-      stfld int32 JitTest.Test::m_v
+      stfld int32 JitTest_mdarray_operand_il.Test::m_v
 
       ldloc.s arr
       ldc.i4.5
-      call instance value class JitTest.Test& value class JitTest.Test[0...10]::Address(int32)
+      call instance value class JitTest_mdarray_operand_il.Test& value class JitTest_mdarray_operand_il.Test[0...10]::Address(int32)
       ldloca.s elem
-      cpobj JitTest.Test
+      cpobj JitTest_mdarray_operand_il.Test
 
       ldloc.s arr
       ldc.i4.5
-      call instance value class JitTest.Test& value class JitTest.Test[0...10]::Address(int32)
-      ldfld int32 JitTest.Test::m_v
+      call instance value class JitTest_mdarray_operand_il.Test& value class JitTest_mdarray_operand_il.Test[0...10]::Address(int32)
+      ldfld int32 JitTest_mdarray_operand_il.Test::m_v
       dup
       brtrue RET
       pop
       
       ldloc.s arr
       ldc.i4.7
-      call instance value class JitTest.Test& value class JitTest.Test[0...10]::Address(int32)
+      call instance value class JitTest_mdarray_operand_il.Test& value class JitTest_mdarray_operand_il.Test[0...10]::Address(int32)
       ldc.i4 4321
-      stfld int32 JitTest.Test::m_v
+      stfld int32 JitTest_mdarray_operand_il.Test::m_v
       
       ldloca.s elem
       ldloc.s arr
       ldc.i4.7
-      call instance value class JitTest.Test& value class JitTest.Test[0...10]::Address(int32)
-      cpobj JitTest.Test
+      call instance value class JitTest_mdarray_operand_il.Test& value class JitTest_mdarray_operand_il.Test[0...10]::Address(int32)
+      cpobj JitTest_mdarray_operand_il.Test
 
       ldloca.s elem
-      ldfld int32 JitTest.Test::m_v
+      ldfld int32 JitTest_mdarray_operand_il.Test::m_v
       ldc.i4 4321
       xor
 
@@ -131,33 +131,33 @@
             mdarray_stobj() cil managed
     {
       .maxstack  8
-      .locals (value class JitTest.Test[0...10] arr, value class JitTest.Test elem)
+      .locals (value class JitTest_mdarray_operand_il.Test[0...10] arr, value class JitTest_mdarray_operand_il.Test elem)
       ldloca.s elem
-      initobj JitTest.Test
+      initobj JitTest_mdarray_operand_il.Test
       
       ldc.i4 11
-      newobj instance void value class JitTest.Test[0...10]::.ctor(int32)
+      newobj instance void value class JitTest_mdarray_operand_il.Test[0...10]::.ctor(int32)
       stloc.s arr
 
       ldloc.s arr
       ldc.i4.5
-      call instance value class JitTest.Test& value class JitTest.Test[0...10]::Address(int32)
+      call instance value class JitTest_mdarray_operand_il.Test& value class JitTest_mdarray_operand_il.Test[0...10]::Address(int32)
       ldc.i4 1234
-      stfld int32 JitTest.Test::m_v
+      stfld int32 JitTest_mdarray_operand_il.Test::m_v
       
       ldloc.s arr
       ldc.i4.5
-      call instance value class JitTest.Test& value class JitTest.Test[0...10]::Address(int32)
+      call instance value class JitTest_mdarray_operand_il.Test& value class JitTest_mdarray_operand_il.Test[0...10]::Address(int32)
       ldloc.s elem
-      stobj JitTest.Test
+      stobj JitTest_mdarray_operand_il.Test
       
       ldloc.s arr
       ldc.i4.5
-      call instance value class JitTest.Test& value class JitTest.Test[0...10]::Address(int32)
-      ldfld int32 JitTest.Test::m_v
+      call instance value class JitTest_mdarray_operand_il.Test& value class JitTest_mdarray_operand_il.Test[0...10]::Address(int32)
+      ldfld int32 JitTest_mdarray_operand_il.Test::m_v
       ret
     }
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() cil managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -166,28 +166,28 @@
       .entrypoint
       .maxstack  1
       .locals (int32 V_0)
-      IL_0000:  call       int32 JitTest.Test::mdarray_ldobj()
+      IL_0000:  call       int32 JitTest_mdarray_operand_il.Test::mdarray_ldobj()
       IL_0005:  brfalse.s  IL_0016
       IL_0007:  ldstr      "mdarray_ldobj() failed."
       IL_000c:  call       void [System.Console]System.Console::WriteLine(string)
       IL_0011:  ldc.i4.s   101
       IL_0013:  stloc.0
       IL_0014:  br.s       IL_0067
-      IL_0016:  call       int32 JitTest.Test::mdarray_initobj()
+      IL_0016:  call       int32 JitTest_mdarray_operand_il.Test::mdarray_initobj()
       IL_001b:  brfalse.s  IL_002c
       IL_001d:  ldstr      "mdarray_initobj() failed."
       IL_0022:  call       void [System.Console]System.Console::WriteLine(string)
       IL_0027:  ldc.i4.s   102
       IL_0029:  stloc.0
       IL_002a:  br.s       IL_0067
-      IL_002c:  call       int32 JitTest.Test::mdarray_stobj()
+      IL_002c:  call       int32 JitTest_mdarray_operand_il.Test::mdarray_stobj()
       IL_0031:  brfalse.s  IL_0042
       IL_0033:  ldstr      "mdarray_stobj() failed."
       IL_0038:  call       void [System.Console]System.Console::WriteLine(string)
       IL_003d:  ldc.i4.s   103
       IL_003f:  stloc.0
       IL_0040:  br.s       IL_0067
-      IL_0042:  call       int32 JitTest.Test::mdarray_cpobj()
+      IL_0042:  call       int32 JitTest_mdarray_operand_il.Test::mdarray_cpobj()
       IL_0047:  brfalse.s  IL_0058
       IL_0049:  ldstr      "mdarray_cpobj() failed."
       IL_004e:  call       void [System.Console]System.Console::WriteLine(string)
diff --git a/src/tests/JIT/Methodical/xxobj/operand/mdarray_il_d.ilproj b/src/tests/JIT/Methodical/xxobj/operand/mdarray_il_d.ilproj
index cb498b0145db0d..506344b8ead303 100644
--- a/src/tests/JIT/Methodical/xxobj/operand/mdarray_il_d.ilproj
+++ b/src/tests/JIT/Methodical/xxobj/operand/mdarray_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/xxobj/operand/mdarray_il_r.ilproj b/src/tests/JIT/Methodical/xxobj/operand/mdarray_il_r.ilproj
index 70ca15f9e5a220..302a93715a18fd 100644
--- a/src/tests/JIT/Methodical/xxobj/operand/mdarray_il_r.ilproj
+++ b/src/tests/JIT/Methodical/xxobj/operand/mdarray_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/xxobj/operand/refanyval.cs b/src/tests/JIT/Methodical/xxobj/operand/refanyval.cs
index d37d1f7e78ae35..cfbf68c10e7fdb 100644
--- a/src/tests/JIT/Methodical/xxobj/operand/refanyval.cs
+++ b/src/tests/JIT/Methodical/xxobj/operand/refanyval.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_refanyval_operand_cs
 {
-    internal struct Test
+    public struct Test
     {
         private int _m_v;
 
@@ -46,7 +47,8 @@ private static int refanyval_stobj()
             return T._m_v;
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             if (refanyval_ldobj() != 0)
             {
diff --git a/src/tests/JIT/Methodical/xxobj/operand/refanyval.il b/src/tests/JIT/Methodical/xxobj/operand/refanyval.il
index 97e23eca9ce8e6..d76f297ddb7d51 100644
--- a/src/tests/JIT/Methodical/xxobj/operand/refanyval.il
+++ b/src/tests/JIT/Methodical/xxobj/operand/refanyval.il
@@ -14,9 +14,9 @@
   
 }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_refanyval_operand_il
 {
-  .class private sequential ansi sealed beforefieldinit Test
+  .class public sequential ansi sealed beforefieldinit Test
          extends [mscorlib]System.ValueType
   {
     .field private int32 m_v
@@ -24,20 +24,20 @@
             refanyval_ldobj() cil managed
     {
       .maxstack  2
-      .locals (valuetype JitTest.Test V_0,
+      .locals (valuetype JitTest_refanyval_operand_il.Test V_0,
                typedref V_1,
                int32 V_2)
       IL_0000:  ldloca.s   V_0
-      IL_0002:  initobj    JitTest.Test
+      IL_0002:  initobj    JitTest_refanyval_operand_il.Test
       IL_0008:  ldloca.s   V_0
       IL_000a:  ldc.i4.1
-      IL_000b:  stfld      int32 JitTest.Test::m_v
+      IL_000b:  stfld      int32 JitTest_refanyval_operand_il.Test::m_v
       IL_0010:  ldloca.s   V_0
-      IL_0012:  mkrefany   JitTest.Test
+      IL_0012:  mkrefany   JitTest_refanyval_operand_il.Test
       IL_0017:  stloc.1
       IL_0018:  ldloc.1
-      IL_0019:  refanyval  JitTest.Test
-      IL_001e:  ldfld      int32 JitTest.Test::m_v
+      IL_0019:  refanyval  JitTest_refanyval_operand_il.Test
+      IL_001e:  ldfld      int32 JitTest_refanyval_operand_il.Test::m_v
       IL_0023:  ldc.i4.1
       IL_0024:  sub
       IL_0025:  stloc.2
@@ -49,22 +49,22 @@
             refanyval_initobj() cil managed
     {
       .maxstack  2
-      .locals (valuetype JitTest.Test V_0,
+      .locals (valuetype JitTest_refanyval_operand_il.Test V_0,
                typedref V_1,
                int32 V_2)
       IL_0000:  ldloca.s   V_0
-      IL_0002:  initobj    JitTest.Test
+      IL_0002:  initobj    JitTest_refanyval_operand_il.Test
       IL_0008:  ldloca.s   V_0
       IL_000a:  ldc.i4.1
-      IL_000b:  stfld      int32 JitTest.Test::m_v
+      IL_000b:  stfld      int32 JitTest_refanyval_operand_il.Test::m_v
       IL_0010:  ldloca.s   V_0
-      IL_0012:  mkrefany   JitTest.Test
+      IL_0012:  mkrefany   JitTest_refanyval_operand_il.Test
       IL_0017:  stloc.1
       IL_0018:  ldloc.1
-      IL_0019:  refanyval  JitTest.Test
-      IL_001e:  initobj    JitTest.Test
+      IL_0019:  refanyval  JitTest_refanyval_operand_il.Test
+      IL_001e:  initobj    JitTest_refanyval_operand_il.Test
       IL_0024:  ldloca.s   V_0
-      IL_0026:  ldfld      int32 JitTest.Test::m_v
+      IL_0026:  ldfld      int32 JitTest_refanyval_operand_il.Test::m_v
       IL_002b:  stloc.2
       IL_002c:  br.s       IL_002e
       IL_002e:  ldloc.2
@@ -74,28 +74,28 @@
             refanyval_cpobj() cil managed
     {
       .maxstack  2
-      .locals (valuetype JitTest.Test V_0,
-               valuetype JitTest.Test V_1,
+      .locals (valuetype JitTest_refanyval_operand_il.Test V_0,
+               valuetype JitTest_refanyval_operand_il.Test V_1,
                typedref V_2,
                int32 V_3)
       IL_0000:  ldloca.s   V_0
-      IL_0002:  initobj    JitTest.Test
+      IL_0002:  initobj    JitTest_refanyval_operand_il.Test
       IL_0008:  ldloca.s   V_0
       IL_000a:  ldc.i4.1
-      IL_000b:  stfld      int32 JitTest.Test::m_v
+      IL_000b:  stfld      int32 JitTest_refanyval_operand_il.Test::m_v
       IL_0010:  ldloca.s   V_1
-      IL_0012:  initobj    JitTest.Test
+      IL_0012:  initobj    JitTest_refanyval_operand_il.Test
       IL_0018:  ldloca.s   V_0
-      IL_001a:  mkrefany   JitTest.Test
+      IL_001a:  mkrefany   JitTest_refanyval_operand_il.Test
       IL_001f:  stloc.2
       IL_0020:  ldloc.2
-      IL_0021:  refanyval  JitTest.Test
+      IL_0021:  refanyval  JitTest_refanyval_operand_il.Test
       
       IL_0026:  ldloca 1
-      IL_0027:  cpobj      JitTest.Test
+      IL_0027:  cpobj      JitTest_refanyval_operand_il.Test
       
       IL_002c:  ldloca.s   V_0
-      IL_002e:  ldfld      int32 JitTest.Test::m_v
+      IL_002e:  ldfld      int32 JitTest_refanyval_operand_il.Test::m_v
       IL_0033:  stloc.3
       IL_0034:  br.s       IL_0036
       IL_0036:  ldloc.3
@@ -105,32 +105,32 @@
             refanyval_stobj() cil managed
     {
       .maxstack  2
-      .locals (valuetype JitTest.Test V_0,
-               valuetype JitTest.Test V_1,
+      .locals (valuetype JitTest_refanyval_operand_il.Test V_0,
+               valuetype JitTest_refanyval_operand_il.Test V_1,
                typedref V_2,
                int32 V_3)
       IL_0000:  ldloca.s   V_0
-      IL_0002:  initobj    JitTest.Test
+      IL_0002:  initobj    JitTest_refanyval_operand_il.Test
       IL_0008:  ldloca.s   V_0
       IL_000a:  ldc.i4.1
-      IL_000b:  stfld      int32 JitTest.Test::m_v
+      IL_000b:  stfld      int32 JitTest_refanyval_operand_il.Test::m_v
       IL_0010:  ldloca.s   V_1
-      IL_0012:  initobj    JitTest.Test
+      IL_0012:  initobj    JitTest_refanyval_operand_il.Test
       IL_0018:  ldloca.s   V_0
-      IL_001a:  mkrefany   JitTest.Test
+      IL_001a:  mkrefany   JitTest_refanyval_operand_il.Test
       IL_001f:  stloc.2
       IL_0020:  ldloc.2
-      IL_0021:  refanyval  JitTest.Test
+      IL_0021:  refanyval  JitTest_refanyval_operand_il.Test
       IL_0026:  ldloc.1
-      IL_0027:  stobj      JitTest.Test
+      IL_0027:  stobj      JitTest_refanyval_operand_il.Test
       IL_002c:  ldloca.s   V_0
-      IL_002e:  ldfld      int32 JitTest.Test::m_v
+      IL_002e:  ldfld      int32 JitTest_refanyval_operand_il.Test::m_v
       IL_0033:  stloc.3
       IL_0034:  br.s       IL_0036
       IL_0036:  ldloc.3
       IL_0037:  ret
     }
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() cil managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -139,40 +139,40 @@
       .entrypoint
       .maxstack  1
       .locals (object V_0,
-               valuetype JitTest.Test V_1,
+               valuetype JitTest_refanyval_operand_il.Test V_1,
                int32 V_2,
-               valuetype JitTest.Test V_3)
+               valuetype JitTest_refanyval_operand_il.Test V_3)
       IL_0000:  ldloca.s   V_3
-      IL_0002:  initobj    JitTest.Test
+      IL_0002:  initobj    JitTest_refanyval_operand_il.Test
       IL_0008:  ldloc.3
-      IL_0009:  box        JitTest.Test
+      IL_0009:  box        JitTest_refanyval_operand_il.Test
       IL_000e:  stloc.0
       IL_000f:  ldloc.0
-      IL_0010:  unbox      JitTest.Test
-      IL_0015:  ldobj      JitTest.Test
+      IL_0010:  unbox      JitTest_refanyval_operand_il.Test
+      IL_0015:  ldobj      JitTest_refanyval_operand_il.Test
       IL_001a:  stloc.1
-      IL_001b:  call       int32 JitTest.Test::refanyval_ldobj()
+      IL_001b:  call       int32 JitTest_refanyval_operand_il.Test::refanyval_ldobj()
       IL_0020:  brfalse.s  IL_0031
       IL_0022:  ldstr      "refanyval_ldobj() failed."
       IL_0027:  call       void [System.Console]System.Console::WriteLine(string)
       IL_002c:  ldc.i4.s   101
       IL_002e:  stloc.2
       IL_002f:  br.s       IL_0082
-      IL_0031:  call       int32 JitTest.Test::refanyval_initobj()
+      IL_0031:  call       int32 JitTest_refanyval_operand_il.Test::refanyval_initobj()
       IL_0036:  brfalse.s  IL_0047
       IL_0038:  ldstr      "refanyval_initobj() failed."
       IL_003d:  call       void [System.Console]System.Console::WriteLine(string)
       IL_0042:  ldc.i4.s   102
       IL_0044:  stloc.2
       IL_0045:  br.s       IL_0082
-      IL_0047:  call       int32 JitTest.Test::refanyval_stobj()
+      IL_0047:  call       int32 JitTest_refanyval_operand_il.Test::refanyval_stobj()
       IL_004c:  brfalse.s  IL_005d
       IL_004e:  ldstr      "refanyval_stobj() failed."
       IL_0053:  call       void [System.Console]System.Console::WriteLine(string)
       IL_0058:  ldc.i4.s   103
       IL_005a:  stloc.2
       IL_005b:  br.s       IL_0082
-      IL_005d:  call       int32 JitTest.Test::refanyval_cpobj()
+      IL_005d:  call       int32 JitTest_refanyval_operand_il.Test::refanyval_cpobj()
       IL_0062:  brfalse.s  IL_0073
       IL_0064:  ldstr      "refanyval_cpobj() failed."
       IL_0069:  call       void [System.Console]System.Console::WriteLine(string)
diff --git a/src/tests/JIT/Methodical/xxobj/operand/refanyval_d.csproj b/src/tests/JIT/Methodical/xxobj/operand/refanyval_d.csproj
index 2b7caabb234309..df5950fd450046 100644
--- a/src/tests/JIT/Methodical/xxobj/operand/refanyval_d.csproj
+++ b/src/tests/JIT/Methodical/xxobj/operand/refanyval_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/xxobj/operand/refanyval_do.csproj b/src/tests/JIT/Methodical/xxobj/operand/refanyval_do.csproj
index a49a042d3f7cdf..dae9ab27ba14c1 100644
--- a/src/tests/JIT/Methodical/xxobj/operand/refanyval_do.csproj
+++ b/src/tests/JIT/Methodical/xxobj/operand/refanyval_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/xxobj/operand/refanyval_il_d.ilproj b/src/tests/JIT/Methodical/xxobj/operand/refanyval_il_d.ilproj
index 3b15d6982b2e01..e2d6cd2fe578c3 100644
--- a/src/tests/JIT/Methodical/xxobj/operand/refanyval_il_d.ilproj
+++ b/src/tests/JIT/Methodical/xxobj/operand/refanyval_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/xxobj/operand/refanyval_il_r.ilproj b/src/tests/JIT/Methodical/xxobj/operand/refanyval_il_r.ilproj
index 55f9b003a838f1..561010e7cd5df5 100644
--- a/src/tests/JIT/Methodical/xxobj/operand/refanyval_il_r.ilproj
+++ b/src/tests/JIT/Methodical/xxobj/operand/refanyval_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/xxobj/operand/refanyval_r.csproj b/src/tests/JIT/Methodical/xxobj/operand/refanyval_r.csproj
index eec2c4e8a23dda..6eff06539d423e 100644
--- a/src/tests/JIT/Methodical/xxobj/operand/refanyval_r.csproj
+++ b/src/tests/JIT/Methodical/xxobj/operand/refanyval_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/xxobj/operand/refanyval_ro.csproj b/src/tests/JIT/Methodical/xxobj/operand/refanyval_ro.csproj
index d2c9f8942cfa30..aeb44d944523c0 100644
--- a/src/tests/JIT/Methodical/xxobj/operand/refanyval_ro.csproj
+++ b/src/tests/JIT/Methodical/xxobj/operand/refanyval_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/xxobj/operand/unbox.cs b/src/tests/JIT/Methodical/xxobj/operand/unbox.cs
index 1680efa3c822a5..ea8ef88fd9e4ae 100644
--- a/src/tests/JIT/Methodical/xxobj/operand/unbox.cs
+++ b/src/tests/JIT/Methodical/xxobj/operand/unbox.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-namespace JitTest
+namespace JitTest_unbox_operand_cs
 {
-    internal struct Test
+    public struct Test
     {
         private int _m_v;
 
@@ -46,7 +47,8 @@ private static int unbox_stobj()
             return ((Test)R)._m_v;
         }
 
-        private static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             if (unbox_ldobj() != 0)
             {
diff --git a/src/tests/JIT/Methodical/xxobj/operand/unbox.il b/src/tests/JIT/Methodical/xxobj/operand/unbox.il
index 47f3ebacb7ae14..cbad046ba6fa19 100644
--- a/src/tests/JIT/Methodical/xxobj/operand/unbox.il
+++ b/src/tests/JIT/Methodical/xxobj/operand/unbox.il
@@ -14,9 +14,9 @@
   
 }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_unbox_operand_il
 {
-  .class private sequential ansi sealed beforefieldinit Test
+  .class public sequential ansi sealed beforefieldinit Test
          extends [mscorlib]System.ValueType
   {
     .field private int32 m_v
@@ -24,24 +24,24 @@
             unbox_ldobj() cil managed
     {
       .maxstack  2
-      .locals (valuetype JitTest.Test V_0,
+      .locals (valuetype JitTest_unbox_operand_il.Test V_0,
                object V_1,
                int32 V_2,
-               valuetype JitTest.Test V_3)
+               valuetype JitTest_unbox_operand_il.Test V_3)
       IL_0000:  ldloca.s   V_0
-      IL_0002:  initobj    JitTest.Test
+      IL_0002:  initobj    JitTest_unbox_operand_il.Test
       IL_0008:  ldloca.s   V_0
       IL_000a:  ldc.i4.1
-      IL_000b:  stfld      int32 JitTest.Test::m_v
+      IL_000b:  stfld      int32 JitTest_unbox_operand_il.Test::m_v
       IL_0010:  ldloc.0
-      IL_0011:  box        JitTest.Test
+      IL_0011:  box        JitTest_unbox_operand_il.Test
       IL_0016:  stloc.1
       IL_0017:  ldloc.1
-      IL_0018:  unbox      JitTest.Test
-      IL_001d:  ldobj      JitTest.Test
+      IL_0018:  unbox      JitTest_unbox_operand_il.Test
+      IL_001d:  ldobj      JitTest_unbox_operand_il.Test
       IL_0022:  stloc.3
       IL_0023:  ldloca.s   V_3
-      IL_0025:  ldfld      int32 JitTest.Test::m_v
+      IL_0025:  ldfld      int32 JitTest_unbox_operand_il.Test::m_v
       IL_002a:  ldc.i4.1
       IL_002b:  sub
       IL_002c:  stloc.2
@@ -53,29 +53,29 @@
             unbox_initobj() cil managed
     {
       .maxstack  2
-      .locals (valuetype JitTest.Test V_0,
+      .locals (valuetype JitTest_unbox_operand_il.Test V_0,
                object V_1,
                int32 V_2,
-               valuetype JitTest.Test V_3)
+               valuetype JitTest_unbox_operand_il.Test V_3)
       IL_0000:  ldloca.s   V_0
-      IL_0002:  initobj    JitTest.Test
+      IL_0002:  initobj    JitTest_unbox_operand_il.Test
       IL_0008:  ldloca.s   V_0
       IL_000a:  ldc.i4.1
-      IL_000b:  stfld      int32 JitTest.Test::m_v
+      IL_000b:  stfld      int32 JitTest_unbox_operand_il.Test::m_v
       IL_0010:  ldloc.0
-      IL_0011:  box        JitTest.Test
+      IL_0011:  box        JitTest_unbox_operand_il.Test
       IL_0016:  stloc.1
 
       			ldloc.1
-      			unbox		JitTest.Test
-      			initobj		JitTest.Test
+      			unbox		JitTest_unbox_operand_il.Test
+      			initobj		JitTest_unbox_operand_il.Test
 
       IL_0026:  ldloc.1
-      IL_0027:  unbox      JitTest.Test
-      IL_002c:  ldobj      JitTest.Test
+      IL_0027:  unbox      JitTest_unbox_operand_il.Test
+      IL_002c:  ldobj      JitTest_unbox_operand_il.Test
       IL_0031:  stloc.3
       IL_0032:  ldloca.s   V_3
-      IL_0034:  ldfld      int32 JitTest.Test::m_v
+      IL_0034:  ldfld      int32 JitTest_unbox_operand_il.Test::m_v
       IL_0039:  stloc.2
       IL_003a:  br.s       IL_003c
       IL_003c:  ldloc.2
@@ -85,33 +85,33 @@
             unbox_cpobj() cil managed
     {
       .maxstack  2
-      .locals (valuetype JitTest.Test V_0,
-               valuetype JitTest.Test V_1,
+      .locals (valuetype JitTest_unbox_operand_il.Test V_0,
+               valuetype JitTest_unbox_operand_il.Test V_1,
                object V_2,
                int32 V_3,
-               valuetype JitTest.Test V_4)
+               valuetype JitTest_unbox_operand_il.Test V_4)
       IL_0000:  ldloca.s   V_0
-      IL_0002:  initobj    JitTest.Test
+      IL_0002:  initobj    JitTest_unbox_operand_il.Test
       IL_0008:  ldloca.s   V_0
       IL_000a:  ldc.i4.1
-      IL_000b:  stfld      int32 JitTest.Test::m_v
+      IL_000b:  stfld      int32 JitTest_unbox_operand_il.Test::m_v
       IL_0010:  ldloca.s   V_1
-      IL_0012:  initobj    JitTest.Test
+      IL_0012:  initobj    JitTest_unbox_operand_il.Test
       IL_0018:  ldloc.0
-      IL_0019:  box        JitTest.Test
+      IL_0019:  box        JitTest_unbox_operand_il.Test
       IL_001e:  stloc.2
       
       			ldloc.2
-      			unbox		JitTest.Test
+      			unbox		JitTest_unbox_operand_il.Test
       			ldloca.s 1
-      			cpobj		JitTest.Test
+      			cpobj		JitTest_unbox_operand_il.Test
       
       IL_0026:  ldloc.2
-      IL_0027:  unbox      JitTest.Test
-      IL_002c:  ldobj      JitTest.Test
+      IL_0027:  unbox      JitTest_unbox_operand_il.Test
+      IL_002c:  ldobj      JitTest_unbox_operand_il.Test
       IL_0031:  stloc.s    V_4
       IL_0033:  ldloca.s   V_4
-      IL_0035:  ldfld      int32 JitTest.Test::m_v
+      IL_0035:  ldfld      int32 JitTest_unbox_operand_il.Test::m_v
       IL_003a:  stloc.3
       IL_003b:  br.s       IL_003d
       IL_003d:  ldloc.3
@@ -121,39 +121,39 @@
             unbox_stobj() cil managed
     {
       .maxstack  2
-      .locals (valuetype JitTest.Test V_0,
-               valuetype JitTest.Test V_1,
+      .locals (valuetype JitTest_unbox_operand_il.Test V_0,
+               valuetype JitTest_unbox_operand_il.Test V_1,
                object V_2,
                int32 V_3,
-               valuetype JitTest.Test V_4)
+               valuetype JitTest_unbox_operand_il.Test V_4)
       IL_0000:  ldloca.s   V_0
-      IL_0002:  initobj    JitTest.Test
+      IL_0002:  initobj    JitTest_unbox_operand_il.Test
       IL_0008:  ldloca.s   V_0
       IL_000a:  ldc.i4.1
-      IL_000b:  stfld      int32 JitTest.Test::m_v
+      IL_000b:  stfld      int32 JitTest_unbox_operand_il.Test::m_v
       IL_0010:  ldloca.s   V_1
-      IL_0012:  initobj    JitTest.Test
+      IL_0012:  initobj    JitTest_unbox_operand_il.Test
       IL_0018:  ldloc.0
-      IL_0019:  box        JitTest.Test
+      IL_0019:  box        JitTest_unbox_operand_il.Test
       IL_001e:  stloc.2
       
       			ldloc.2
-      			unbox		JitTest.Test
+      			unbox		JitTest_unbox_operand_il.Test
       			ldloc.1
-      			stobj		JitTest.Test
+      			stobj		JitTest_unbox_operand_il.Test
       
       IL_0026:  ldloc.2
-      IL_0027:  unbox      JitTest.Test
-      IL_002c:  ldobj      JitTest.Test
+      IL_0027:  unbox      JitTest_unbox_operand_il.Test
+      IL_002c:  ldobj      JitTest_unbox_operand_il.Test
       IL_0031:  stloc.s    V_4
       IL_0033:  ldloca.s   V_4
-      IL_0035:  ldfld      int32 JitTest.Test::m_v
+      IL_0035:  ldfld      int32 JitTest_unbox_operand_il.Test::m_v
       IL_003a:  stloc.3
       IL_003b:  br.s       IL_003d
       IL_003d:  ldloc.3
       IL_003e:  ret
     }
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() cil managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -162,28 +162,28 @@
       .entrypoint
       .maxstack  1
       .locals (int32 V_0)
-      IL_0000:  call       int32 JitTest.Test::unbox_ldobj()
+      IL_0000:  call       int32 JitTest_unbox_operand_il.Test::unbox_ldobj()
       IL_0005:  brfalse.s  IL_0016
       IL_0007:  ldstr      "unbox_ldobj() failed."
       IL_000c:  call       void [System.Console]System.Console::WriteLine(string)
       IL_0011:  ldc.i4.s   101
       IL_0013:  stloc.0
       IL_0014:  br.s       IL_0067
-      IL_0016:  call       int32 JitTest.Test::unbox_initobj()
+      IL_0016:  call       int32 JitTest_unbox_operand_il.Test::unbox_initobj()
       IL_001b:  brfalse.s  IL_002c
       IL_001d:  ldstr      "unbox_initobj() failed."
       IL_0022:  call       void [System.Console]System.Console::WriteLine(string)
       IL_0027:  ldc.i4.s   102
       IL_0029:  stloc.0
       IL_002a:  br.s       IL_0067
-      IL_002c:  call       int32 JitTest.Test::unbox_stobj()
+      IL_002c:  call       int32 JitTest_unbox_operand_il.Test::unbox_stobj()
       IL_0031:  brfalse.s  IL_0042
       IL_0033:  ldstr      "unbox_stobj() failed."
       IL_0038:  call       void [System.Console]System.Console::WriteLine(string)
       IL_003d:  ldc.i4.s   103
       IL_003f:  stloc.0
       IL_0040:  br.s       IL_0067
-      IL_0042:  call       int32 JitTest.Test::unbox_cpobj()
+      IL_0042:  call       int32 JitTest_unbox_operand_il.Test::unbox_cpobj()
       IL_0047:  brfalse.s  IL_0058
       IL_0049:  ldstr      "unbox_cpobj() failed."
       IL_004e:  call       void [System.Console]System.Console::WriteLine(string)
diff --git a/src/tests/JIT/Methodical/xxobj/operand/unbox_d.csproj b/src/tests/JIT/Methodical/xxobj/operand/unbox_d.csproj
index 1be0d841debeb8..c862911be386f9 100644
--- a/src/tests/JIT/Methodical/xxobj/operand/unbox_d.csproj
+++ b/src/tests/JIT/Methodical/xxobj/operand/unbox_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/xxobj/operand/unbox_do.csproj b/src/tests/JIT/Methodical/xxobj/operand/unbox_do.csproj
index 36dfe31c5870d2..854a071f9ef685 100644
--- a/src/tests/JIT/Methodical/xxobj/operand/unbox_do.csproj
+++ b/src/tests/JIT/Methodical/xxobj/operand/unbox_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/xxobj/operand/unbox_il_d.ilproj b/src/tests/JIT/Methodical/xxobj/operand/unbox_il_d.ilproj
index abadd44924547a..e80807c8efa80f 100644
--- a/src/tests/JIT/Methodical/xxobj/operand/unbox_il_d.ilproj
+++ b/src/tests/JIT/Methodical/xxobj/operand/unbox_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/xxobj/operand/unbox_il_r.ilproj b/src/tests/JIT/Methodical/xxobj/operand/unbox_il_r.ilproj
index 126c5c9e82e96b..276825cd8ebcf3 100644
--- a/src/tests/JIT/Methodical/xxobj/operand/unbox_il_r.ilproj
+++ b/src/tests/JIT/Methodical/xxobj/operand/unbox_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/xxobj/operand/unbox_r.csproj b/src/tests/JIT/Methodical/xxobj/operand/unbox_r.csproj
index 90fd9f8026166f..7e1f510f093015 100644
--- a/src/tests/JIT/Methodical/xxobj/operand/unbox_r.csproj
+++ b/src/tests/JIT/Methodical/xxobj/operand/unbox_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/xxobj/operand/unbox_ro.csproj b/src/tests/JIT/Methodical/xxobj/operand/unbox_ro.csproj
index cde69499573817..eb5120668f7c4c 100644
--- a/src/tests/JIT/Methodical/xxobj/operand/unbox_ro.csproj
+++ b/src/tests/JIT/Methodical/xxobj/operand/unbox_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof.cs b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof.cs
index d358521e9d4ab5..065083dcdd8d96 100644
--- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof.cs
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof.cs
@@ -1,4 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
+using Xunit;
+namespace Test_sizeof
+{
 // The .NET Foundation licenses this file to you under the MIT license.
 
 namespace JitTest
@@ -46,9 +49,10 @@ struct ComplexStruct2
 		ComplexStruct x18;
 	}
 
-	struct Test
+	public struct Test
 	{
-		static unsafe int Main()
+		[Fact]
+		public static unsafe int TestEntryPoint()
 		{
 			if (sizeof(SimpleStruct) != 32)
 			{
@@ -70,3 +74,4 @@ static unsafe int Main()
 		}
 	}
 }
+}
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32.cs b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32.cs
index 212ac6a1e68f0d..31e653e5b429db 100644
--- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32.cs
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32.cs
@@ -3,9 +3,10 @@
 
 
 using System;
+using Xunit;
 
 
-namespace JitTest
+namespace JitTest_sizeof32_sizeof_cs
 {
     internal struct SimpleStruct
     {
@@ -26,9 +27,10 @@ internal struct RefComplexStruct
         public SimpleStruct ss2;
     }
 
-    internal struct Test
+    public struct Test
     {
-        private static unsafe int Main()
+        [Fact]
+        public static unsafe int TestEntryPoint()
         {
             int l = (sbyte)sizeof(RefComplexStruct);
             l += sizeof(RefComplexStruct) + new RefComplexStruct().ss1.m_sbyte;
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_32Bit_x86.il b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_32Bit_x86.il
index 4d12bbed115c8a..2fbaa727289806 100644
--- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_32Bit_x86.il
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_32Bit_x86.il
@@ -31,12 +31,12 @@
     .field public valuetype JitTest_sizeof32_Target_32Bit_x86_il.SimpleStruct[0...] ss_array
     .field public valuetype JitTest_sizeof32_Target_32Bit_x86_il.SimpleStruct ss2
   }
-  .class private sequential ansi sealed beforefieldinit Test
+  .class public sequential ansi sealed beforefieldinit Test
          extends [mscorlib]System.ValueType
   {
     .pack 1
     .size 1
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() cil managed
     {
       // [ConditionalFact(typeof(TestLibrary.PlatformDetection), nameof(TestLibrary.PlatformDetection.IsX86Process))]
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_32Bit_x86_il_d.ilproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_32Bit_x86_il_d.ilproj
index 73f23e77533ee6..dd59cbf2046851 100644
--- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_32Bit_x86_il_d.ilproj
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_32Bit_x86_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
     <!-- There are arch-specific versions of this test to allow it to be compiled for all targets -->
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_32Bit_x86_il_r.ilproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_32Bit_x86_il_r.ilproj
index 4676cebec95477..fc766b0ac5a357 100644
--- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_32Bit_x86_il_r.ilproj
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_32Bit_x86_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
     <!-- There are arch-specific versions of this test to allow it to be compiled for all targets -->
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_64Bit_and_arm.il b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_64Bit_and_arm.il
index a217a364016049..2ddab3adba0abf 100644
--- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_64Bit_and_arm.il
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_64Bit_and_arm.il
@@ -30,12 +30,12 @@
     .field public valuetype JitTest_sizeof32_Target_64Bit_and_arm_il.SimpleStruct[0...] ss_array
     .field public valuetype JitTest_sizeof32_Target_64Bit_and_arm_il.SimpleStruct ss2
   }
-  .class private sequential ansi sealed beforefieldinit Test
+  .class public sequential ansi sealed beforefieldinit Test
          extends [mscorlib]System.ValueType
   {
     .pack 1
     .size 1
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() cil managed
     {
       // [ConditionalFact(typeof(TestLibrary.PlatformDetection), nameof(TestLibrary.PlatformDetection.IsNotX86Process))]
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_64Bit_and_arm_il_d.ilproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_64Bit_and_arm_il_d.ilproj
index 053d5b0398b380..ccd03c57ca0b57 100644
--- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_64Bit_and_arm_il_d.ilproj
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_64Bit_and_arm_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
     <!-- There is a 32 and 64 version of this test to allow it to be compiled for all targets -->
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_64Bit_and_arm_il_r.ilproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_64Bit_and_arm_il_r.ilproj
index 85ff004b9fc031..3360ec5db98b14 100644
--- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_64Bit_and_arm_il_r.ilproj
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_64Bit_and_arm_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
     <!-- There is a 32 and 64 version of this test to allow it to be compiled for all targets -->
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_d.csproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_d.csproj
index f2d11cbbb04943..9e0472b6df0090 100644
--- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_d.csproj
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_do.csproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_do.csproj
index cd99139e9fea67..121b314588f44c 100644
--- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_do.csproj
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_r.csproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_r.csproj
index 196451e076fc18..e5cb51ff3407a1 100644
--- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_r.csproj
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_ro.csproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_ro.csproj
index eefb1f88cd17dc..8f9ccff7daa480 100644
--- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_ro.csproj
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64.cs b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64.cs
index e0c46deb2dc8ab..47f518234cdf46 100644
--- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64.cs
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64.cs
@@ -3,8 +3,11 @@
 
 
 using System;
+using Xunit;
 
 
+namespace Test_sizeof64
+{
 // sizeof converted to I8 and used with arithmetic operations
 
 namespace JitTest
@@ -28,9 +31,10 @@ internal struct RefComplexStruct
         public SimpleStruct ss2;
     }
 
-    internal struct Test
+    public struct Test
     {
-        private static unsafe int Main()
+        [Fact]
+        public static unsafe int TestEntryPoint()
         {
             long l = (sbyte)sizeof(RefComplexStruct);
             l += sizeof(RefComplexStruct) + new RefComplexStruct().ss1.m_sbyte;
@@ -43,3 +47,4 @@ private static unsafe int Main()
         }
     }
 }
+}
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_32Bit_x86.il b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_32Bit_x86.il
index ef28ecd4e073da..737abf38b62f4d 100644
--- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_32Bit_x86.il
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_32Bit_x86.il
@@ -32,12 +32,12 @@
     .field public valuetype JitTest_sizeof64_Target_32Bit_x86_il.SimpleStruct[0...] ss_array
     .field public valuetype JitTest_sizeof64_Target_32Bit_x86_il.SimpleStruct ss2
   }
-  .class private sequential ansi sealed beforefieldinit Test
+  .class public sequential ansi sealed beforefieldinit Test
          extends [mscorlib]System.ValueType
   {
     .pack 1
     .size 1
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() cil managed
     {
       // [ConditionalFact(typeof(TestLibrary.PlatformDetection), nameof(TestLibrary.PlatformDetection.IsX86Process))]
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_32Bit_x86_il_d.ilproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_32Bit_x86_il_d.ilproj
index 6a9f8a28aec81f..343facc09824f3 100644
--- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_32Bit_x86_il_d.ilproj
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_32Bit_x86_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_32Bit_x86_il_r.ilproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_32Bit_x86_il_r.ilproj
index 181cdb57a50160..005f3f3e079828 100644
--- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_32Bit_x86_il_r.ilproj
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_32Bit_x86_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
     <!-- There are arch-specific versions of this test to allow it to be compiled for all targets -->
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_64Bit_and_arm.il b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_64Bit_and_arm.il
index 97e244c846b028..64796a342514ab 100644
--- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_64Bit_and_arm.il
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_64Bit_and_arm.il
@@ -31,12 +31,12 @@
     .field public valuetype JitTest_sizeof64_Target_64Bit_and_arm_il.SimpleStruct[0...] ss_array
     .field public valuetype JitTest_sizeof64_Target_64Bit_and_arm_il.SimpleStruct ss2
   }
-  .class private sequential ansi sealed beforefieldinit Test
+  .class public sequential ansi sealed beforefieldinit Test
          extends [mscorlib]System.ValueType
   {
     .pack 1
     .size 1
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() cil managed
     {
       // [ConditionalFact(typeof(TestLibrary.PlatformDetection), nameof(TestLibrary.PlatformDetection.IsNotX86Process))]
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_64Bit_and_arm_il_d.ilproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_64Bit_and_arm_il_d.ilproj
index 52c40a9b7ed67d..de9dc21bf63b7f 100644
--- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_64Bit_and_arm_il_d.ilproj
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_64Bit_and_arm_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_64Bit_and_arm_il_r.ilproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_64Bit_and_arm_il_r.ilproj
index e5ff838343d2aa..9573078c396e37 100644
--- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_64Bit_and_arm_il_r.ilproj
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_64Bit_and_arm_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
     <!-- There is a 32 and 64 version of this test to allow it to be compiled for all targets -->
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_d.csproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_d.csproj
index d91c59a0638451..7c66e75306ae59 100644
--- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_d.csproj
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_do.csproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_do.csproj
index 82757175a68aea..2641e09ad51455 100644
--- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_do.csproj
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_r.csproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_r.csproj
index fc2f49d28208d4..a3949cbd0117bb 100644
--- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_r.csproj
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_ro.csproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_ro.csproj
index ce11cb9c387494..d1893cc62c076f 100644
--- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_ro.csproj
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_32Bit_x86.il b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_32Bit_x86.il
index f78812edebb5ef..7131f8b3c4419a 100644
--- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_32Bit_x86.il
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_32Bit_x86.il
@@ -73,12 +73,12 @@
     .field private class [mscorlib]System.AppDomain ad
     .field private valuetype JitTest_sizeof_Target_32Bit_x86_il.ComplexStruct2 ss2
   }
-  .class private sequential ansi sealed beforefieldinit Test
+  .class public sequential ansi sealed beforefieldinit Test
          extends [mscorlib]System.ValueType
   {
     .pack 1
     .size 1
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() cil managed
     {
       // [ConditionalFact(typeof(TestLibrary.PlatformDetection), nameof(TestLibrary.PlatformDetection.IsX86Process))]
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_32Bit_x86_il_d.ilproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_32Bit_x86_il_d.ilproj
index 50e34de84e3823..8d4b6b306c1889 100644
--- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_32Bit_x86_il_d.ilproj
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_32Bit_x86_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
     <!-- There are arch-specific versions of this test to allow it to be compiled for all targets -->
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_32Bit_x86_il_r.ilproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_32Bit_x86_il_r.ilproj
index a3c3fb2f99f9c6..3e8c8c98357c62 100644
--- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_32Bit_x86_il_r.ilproj
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_32Bit_x86_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
     <!-- There are arch-specific versions of this test to allow it to be compiled for all targets -->
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_64Bit_and_arm.il b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_64Bit_and_arm.il
index 80c67c700ef4e1..87bcc2fe9361fa 100644
--- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_64Bit_and_arm.il
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_64Bit_and_arm.il
@@ -73,12 +73,12 @@
     .field private class [mscorlib]System.AppDomain ad
     .field private valuetype JitTest_sizeof_Target_64Bit_and_arm_il.ComplexStruct2 ss2
   }
-  .class private sequential ansi sealed beforefieldinit Test
+  .class public sequential ansi sealed beforefieldinit Test
          extends [mscorlib]System.ValueType
   {
     .pack 1
     .size 1
-    .method private hidebysig static int32
+    .method public hidebysig static int32
             Main() cil managed
     {
       // [ConditionalFact(typeof(TestLibrary.PlatformDetection), nameof(TestLibrary.PlatformDetection.IsNotX86Process))]
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_64Bit_and_arm_il_d.ilproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_64Bit_and_arm_il_d.ilproj
index c6b1dcdcc75161..e0a0ae7c29439e 100644
--- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_64Bit_and_arm_il_d.ilproj
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_64Bit_and_arm_il_d.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
     <!-- There is a 32 and 64 version of this test to allow it to be compiled for all targets -->
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_64Bit_and_arm_il_r.ilproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_64Bit_and_arm_il_r.ilproj
index 1f288e66c5ecfb..503bd76e6b52fb 100644
--- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_64Bit_and_arm_il_r.ilproj
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_64Bit_and_arm_il_r.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
     <!-- There is a 32 and 64 version of this test to allow it to be compiled for all targets -->
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_d.csproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_d.csproj
index 9af49846bebab2..b6230d5bf530f7 100644
--- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_d.csproj
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_d.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_do.csproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_do.csproj
index ea29ae05ebf094..312d72174783ed 100644
--- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_do.csproj
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_do.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_r.csproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_r.csproj
index 8d1bea7449c8c1..4ec30ece03f8c9 100644
--- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_r.csproj
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_ro.csproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_ro.csproj
index 7d6b0e1b39832e..cc1666c47bc37d 100644
--- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_ro.csproj
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>

From 756e4641a46aac723ff990f980062dfa4f0bb783 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jekoritz@microsoft.com>
Date: Wed, 30 Mar 2022 14:22:49 -0700
Subject: [PATCH 09/22] Lazy-load assemblies for LLVM AOT test runs for merged
 tests

---
 src/tests/Common/helixpublishwitharcade.proj | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/tests/Common/helixpublishwitharcade.proj b/src/tests/Common/helixpublishwitharcade.proj
index 4bf0fbd0604682..c6c1894a8773a5 100644
--- a/src/tests/Common/helixpublishwitharcade.proj
+++ b/src/tests/Common/helixpublishwitharcade.proj
@@ -299,6 +299,8 @@
       <_MergedWrapperParentDirectory>$([System.IO.Path]::GetDirectoryName('$(_MergedWrapperDirectory)'))</_MergedWrapperParentDirectory>
       <_MergedWrapperName>%(_MergedWrapperRunScript.FileName)</_MergedWrapperName>
       <_MergedWrapperRunScriptRelative Condition="'%(_MergedWrapperRunScript.Identity)' != ''">$([System.IO.Path]::GetRelativePath($(TestBinDir), %(_MergedWrapperRunScript.FullPath)))</_MergedWrapperRunScriptRelative>
+      <!-- Force assemblies to lazy-load for LLVM AOT test runs to enable using tests that fail at AOT time (and as a result can't be AOTd) -->
+      <_MergedWrapperRunScriptRelative Condition="'$(RuntimeVariant)' == 'llvmfullaot'">$(_MergedWrapperRunScriptRelative) --aot-lazy-assembly-load</_MergedWrapperRunScriptRelative>
     </PropertyGroup>
     <ItemGroup>
       <_MergedWrapperOutOfProcessTestMarkers Include="$(_MergedWrapperParentDirectory)/**/*.OutOfProcessTest" />

From ed6aba52ec1060ae9a9516232811b01619a21ca9 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jekoritz@microsoft.com>
Date: Thu, 31 Mar 2022 09:20:36 -0700
Subject: [PATCH 10/22] Forward all the properties down for the merged payload
 construction

---
 src/tests/Common/helixpublishwitharcade.proj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tests/Common/helixpublishwitharcade.proj b/src/tests/Common/helixpublishwitharcade.proj
index c6c1894a8773a5..266227aaf63aec 100644
--- a/src/tests/Common/helixpublishwitharcade.proj
+++ b/src/tests/Common/helixpublishwitharcade.proj
@@ -69,7 +69,7 @@
     <Delete Files="@(CleanPreexistingPayloads)" />
 
     <MSBuild Projects="$(MSBuildProjectFile)" Targets="PrepareCorrelationPayloadDirectory" />
-    <MSBuild Projects="$(MSBuildProjectFile)" Targets="PreparePayloadDirectories" Properties="Scenarios=$(_Scenarios)" StopOnFirstFailure="true" />
+    <MSBuild Projects="$(MSBuildProjectFile)" Targets="PreparePayloadDirectories" Properties="$(_PropertiesToPass)" StopOnFirstFailure="true" />
     <MSBuild Projects="$(MSBuildProjectFile)" Targets="PreparePALTestArchive" Properties="$(_PropertiesToPass)" StopOnFirstFailure="true" />
 
     <ItemGroup>

From a0f5c457f1ef548678db234f12efd45ae3e84fca Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jekoritz@microsoft.com>
Date: Thu, 31 Mar 2022 15:50:07 -0700
Subject: [PATCH 11/22] Enable passing the issues.targets exclusion list to
 XHarness-based test runners.

---
 Directory.Build.props                         |  2 +
 .../android-runtime-and-send-to-helix.yml     |  4 +-
 .../templates/runtimes/build-test-job.yml     |  6 +-
 .../templates/runtimes/run-test-job.yml       |  8 +--
 .../templates/runtimes/send-to-helix-step.yml |  4 +-
 .../wasm-runtime-and-send-to-helix.yml        |  4 +-
 eng/pipelines/common/xplat-setup.yml          |  4 +-
 .../coreclr/templates/helix-queues-setup.yml  |  4 +-
 .../libraries/helix-queues-setup.yml          |  4 +-
 src/tasks/Base64Tasks/Base64Tasks.csproj      | 16 ++++++
 src/tasks/Base64Tasks/EncodeUnicodeBase64.cs  | 23 ++++++++
 .../XHarnessRunnerLibrary/RunnerEntryPoint.cs |  5 ++
 .../Common/XUnitWrapperLibrary/TestFilter.cs  | 40 ++++++++++++++
 src/tests/Common/helixpublishwitharcade.proj  | 55 +++++++++++++++++--
 src/tests/build.proj                          |  8 +--
 src/tests/issues.targets                      |  8 +++
 16 files changed, 163 insertions(+), 32 deletions(-)
 create mode 100644 src/tasks/Base64Tasks/Base64Tasks.csproj
 create mode 100644 src/tasks/Base64Tasks/EncodeUnicodeBase64.cs

diff --git a/Directory.Build.props b/Directory.Build.props
index 5104b073389d74..fb643fe0e290a7 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -93,6 +93,7 @@
     <WorkloadBuildTasksDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'WorkloadBuildTasks', 'Debug', '$(NetCoreAppToolCurrent)', 'publish'))</WorkloadBuildTasksDir>
     <MonoAOTCompilerDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'MonoAOTCompiler', 'Debug', '$(NetCoreAppToolCurrent)'))</MonoAOTCompilerDir>
     <MonoTargetsTasksDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'MonoTargetsTasks', 'Debug', '$(NetCoreAppToolCurrent)'))</MonoTargetsTasksDir>
+    <Base64TasksDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'Base64Tasks', 'Debug', '$(NetCoreAppToolCurrent)'))</Base64TasksDir>
     <InstallerTasksAssemblyPath Condition="'$(MSBuildRuntimeType)' == 'Core'">$([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'installer.tasks', 'Debug', '$(NetCoreAppToolCurrent)', 'installer.tasks.dll'))</InstallerTasksAssemblyPath>
     <InstallerTasksAssemblyPath Condition="'$(MSBuildRuntimeType)' != 'Core'">$([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'installer.tasks', 'Debug', '$(NetFrameworkToolCurrent)', 'installer.tasks.dll'))</InstallerTasksAssemblyPath>
     <Crossgen2SdkOverridePropsPath Condition="'$(MSBuildRuntimeType)' == 'Core'">$([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'Crossgen2Tasks', 'Debug', '$(NetCoreAppToolCurrent)', 'Microsoft.NET.CrossGen.props'))</Crossgen2SdkOverridePropsPath>
@@ -104,6 +105,7 @@
     <WorkloadBuildTasksAssemblyPath>$([MSBuild]::NormalizePath('$(WorkloadBuildTasksDir)', 'WorkloadBuildTasks.dll'))</WorkloadBuildTasksAssemblyPath>
     <MonoAOTCompilerTasksAssemblyPath>$([MSBuild]::NormalizePath('$(MonoAOTCompilerDir)', 'MonoAOTCompiler.dll'))</MonoAOTCompilerTasksAssemblyPath>
     <MonoTargetsTasksAssemblyPath>$([MSBuild]::NormalizePath('$(MonoTargetsTasksDir)', 'MonoTargetsTasks.dll'))</MonoTargetsTasksAssemblyPath>
+    <Base64TasksAssemblyPath>$([MSBuild]::NormalizePath('$(Base64TasksDir)', 'Base64Tasks.dll'))</Base64TasksAssemblyPath>
     <ILAsmToolPath Condition="'$(DotNetBuildFromSource)' == 'true'">$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'coreclr', '$(TargetOS).$(TargetArchitecture).$(Configuration)'))</ILAsmToolPath>
   </PropertyGroup>
 
diff --git a/eng/pipelines/common/templates/runtimes/android-runtime-and-send-to-helix.yml b/eng/pipelines/common/templates/runtimes/android-runtime-and-send-to-helix.yml
index 2e883dc9a6c6ef..0134692000f4d3 100644
--- a/eng/pipelines/common/templates/runtimes/android-runtime-and-send-to-helix.yml
+++ b/eng/pipelines/common/templates/runtimes/android-runtime-and-send-to-helix.yml
@@ -13,7 +13,7 @@ parameters:
   runtimeVariant: ''
   variables: {}
   pool: ''
-  runtimeFlavorDisplayName: 'Mono'
+  runtimeFlavor: 'Mono'
   dependsOn: []
   #arcade-specific parameters
   condition: always()
@@ -38,7 +38,7 @@ steps:
       osGroup: ${{ parameters.osGroup }}
       osSubgroup: ${{ parameters.osSubgroup}}
       coreClrRepoRoot: $(Build.SourcesDirectory)/src/coreclr
-      runtimeFlavorDisplayName: ${{ parameters.runtimeFlavorDisplayName }}
+      runtimeFlavor: ${{ parameters.runtimeFlavor }}
       shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
       runtimeVariant: ${{ parameters.runtimeVariant }}
 
diff --git a/eng/pipelines/common/templates/runtimes/build-test-job.yml b/eng/pipelines/common/templates/runtimes/build-test-job.yml
index b1bc6a78bb3fab..bddb6ccd3b669f 100644
--- a/eng/pipelines/common/templates/runtimes/build-test-job.yml
+++ b/eng/pipelines/common/templates/runtimes/build-test-job.yml
@@ -11,7 +11,7 @@ parameters:
   variables: {}
   pool: ''
   runtimeFlavor: 'coreclr'
-  runtimeFlavorDisplayName: 'CoreCLR'
+  runtimeFlavor: 'CoreCLR'
   runtimeVariant: ''
   dependsOn: []
   dependOnEvaluatePaths: false
@@ -52,10 +52,10 @@ jobs:
     # Compute job name from template parameters
     ${{ if in(parameters.testGroup, 'innerloop', 'clrinterpreter') }}:
       name: '${{ parameters.runtimeFlavor }}_common_test_build_p0_AnyOS_AnyCPU_${{ parameters.buildConfig }}'
-      displayName: '${{ parameters.runtimeFlavorDisplayName }} Common Pri0 Test Build AnyOS AnyCPU ${{ parameters.buildConfig }}'
+      displayName: '${{ parameters.runtimeFlavor }} Common Pri0 Test Build AnyOS AnyCPU ${{ parameters.buildConfig }}'
     ${{ if notIn(parameters.testGroup, 'innerloop', 'clrinterpreter') }}:
       name: '${{ parameters.runtimeFlavor }}_common_test_build_p1_AnyOS_AnyCPU_${{ parameters.buildConfig }}'
-      displayName: '${{ parameters.runtimeFlavorDisplayName }} Common Pri1 Test Build AnyOS AnyCPU ${{ parameters.buildConfig }}'
+      displayName: '${{ parameters.runtimeFlavor }} Common Pri1 Test Build AnyOS AnyCPU ${{ parameters.buildConfig }}'
 
     # Since the condition is being altered, merge the default with the additional conditions.
     # See https://docs.microsoft.com/azure/devops/pipelines/process/conditions
diff --git a/eng/pipelines/common/templates/runtimes/run-test-job.yml b/eng/pipelines/common/templates/runtimes/run-test-job.yml
index 03288003d85f02..9a6e1d51342265 100644
--- a/eng/pipelines/common/templates/runtimes/run-test-job.yml
+++ b/eng/pipelines/common/templates/runtimes/run-test-job.yml
@@ -21,7 +21,7 @@ parameters:
   variables: {}
   pool: ''
   runtimeFlavor: 'coreclr'
-  runtimeFlavorDisplayName: 'CoreCLR'
+  runtimeFlavor: 'CoreCLR'
   shouldContinueOnError: false
   dependsOn: []
   dependOnEvaluatePaths: false
@@ -81,10 +81,10 @@ jobs:
     # Compute job name from template parameters
     ${{ if in(parameters.testGroup, 'innerloop', 'clrinterpreter') }}:
       name: 'run_test_p0_${{ parameters.runtimeFlavor }}${{ parameters.runtimeVariant }}_${{ parameters.displayNameArgs }}_${{ parameters.osGroup }}${{ parameters.osSubgroup }}_${{ parameters.archType }}_${{ parameters.buildConfig }}'
-      displayName: '${{ parameters.runtimeFlavorDisplayName }} ${{ parameters.runtimeVariant}} Pri0 Runtime Tests Run ${{ parameters.displayNameArgs }} ${{ parameters.osGroup }}${{ parameters.osSubgroup }} ${{ parameters.archType }} ${{ parameters.buildConfig }}'
+      displayName: '${{ parameters.runtimeFlavor }} ${{ parameters.runtimeVariant}} Pri0 Runtime Tests Run ${{ parameters.displayNameArgs }} ${{ parameters.osGroup }}${{ parameters.osSubgroup }} ${{ parameters.archType }} ${{ parameters.buildConfig }}'
     ${{ if notIn(parameters.testGroup, 'innerloop', 'clrinterpreter') }}:
       name: 'run_test_p1_${{ parameters.displayNameArgs }}_${{ parameters.osGroup }}${{ parameters.osSubgroup }}_${{ parameters.archType }}_${{ parameters.buildConfig }}'
-      displayName: '${{ parameters.runtimeFlavorDisplayName }} ${{ parameters.runtimeVariant }} Pri1 Runtime Tests Run ${{ parameters.displayNameArgs }} ${{ parameters.osGroup }}${{ parameters.osSubgroup }} ${{ parameters.archType }} ${{ parameters.buildConfig }}'
+      displayName: '${{ parameters.runtimeFlavor }} ${{ parameters.runtimeVariant }} Pri1 Runtime Tests Run ${{ parameters.displayNameArgs }} ${{ parameters.osGroup }}${{ parameters.osSubgroup }} ${{ parameters.archType }} ${{ parameters.buildConfig }}'
 
     variables:
 
@@ -335,7 +335,7 @@ jobs:
         archType: ${{ parameters.archType }}
         osGroup: ${{ parameters.osGroup }}
         osSubgroup: ${{ parameters.osSubgroup}}
-        runtimeFlavorDisplayName: ${{ parameters.runtimeFlavorDisplayName }}
+        runtimeFlavor: ${{ parameters.runtimeFlavor }}
         shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
         runtimeVariant: ${{ parameters.runtimeVariant }}
 
diff --git a/eng/pipelines/common/templates/runtimes/send-to-helix-step.yml b/eng/pipelines/common/templates/runtimes/send-to-helix-step.yml
index fe67ff83772244..99a3de5196ac14 100644
--- a/eng/pipelines/common/templates/runtimes/send-to-helix-step.yml
+++ b/eng/pipelines/common/templates/runtimes/send-to-helix-step.yml
@@ -24,7 +24,7 @@ parameters:
   tieringTest: ''
   longRunningGcTests: ''
   gcSimulatorTests: ''
-  runtimeFlavorDisplayName: 'CoreCLR'
+  runtimeFlavor: 'CoreCLR'
   runtimeVariant: ''
   shouldContinueOnError: false
 
@@ -57,7 +57,7 @@ steps:
       _PALTestsDir: ${{ parameters.runPALTestsDir }}
       _TimeoutPerTestCollectionInMinutes: ${{ parameters.timeoutPerTestCollectionInMinutes }}
       _TimeoutPerTestInMinutes: ${{ parameters.timeoutPerTestInMinutes }}
-      runtimeFlavorDisplayName: ${{ parameters.runtimeFlavorDisplayName }}
+      RuntimeFlavor: ${{ parameters.runtimeFlavor }}
       _RuntimeVariant: ${{ parameters.runtimeVariant }}
       ${{ if eq(parameters.publishTestResults, 'true') }}:
         SYSTEM_ACCESSTOKEN: $(System.AccessToken)
diff --git a/eng/pipelines/common/templates/runtimes/wasm-runtime-and-send-to-helix.yml b/eng/pipelines/common/templates/runtimes/wasm-runtime-and-send-to-helix.yml
index 6dd5f6b858b3c7..8cee4e34bbdbe7 100644
--- a/eng/pipelines/common/templates/runtimes/wasm-runtime-and-send-to-helix.yml
+++ b/eng/pipelines/common/templates/runtimes/wasm-runtime-and-send-to-helix.yml
@@ -19,7 +19,7 @@ parameters:
   variables: {}
   pool: ''
   runtimeFlavor: 'mono'
-  runtimeFlavorDisplayName: 'Mono'
+  runtimeFlavor: 'Mono'
   dependsOn: []
   #arcade-specific parameters
   condition: always()
@@ -44,7 +44,7 @@ steps:
       osGroup: ${{ parameters.osGroup }}
       osSubgroup: ${{ parameters.osSubgroup}}
       coreClrRepoRoot: $(Build.SourcesDirectory)/src/coreclr
-      runtimeFlavorDisplayName: ${{ parameters.runtimeFlavorDisplayName }}
+      runtimeFlavor: ${{ parameters.runtimeFlavor }}
       shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
 
       ${{ if eq(variables['System.TeamProject'], 'public') }}:
diff --git a/eng/pipelines/common/xplat-setup.yml b/eng/pipelines/common/xplat-setup.yml
index 6ea24574d3a768..d9db2ada89dbd8 100644
--- a/eng/pipelines/common/xplat-setup.yml
+++ b/eng/pipelines/common/xplat-setup.yml
@@ -15,9 +15,9 @@ jobs:
 - template: ${{ coalesce(parameters.helixQueuesTemplate, parameters.jobTemplate) }}
   parameters:
     ${{ if eq(parameters.jobParameters.runtimeFlavor, 'coreclr') }}:
-      runtimeFlavorDisplayName: 'CoreCLR'
+      runtimeFlavor: 'CoreCLR'
     ${{ if eq(parameters.jobParameters.runtimeFlavor, 'mono') }}:
-      runtimeFlavorDisplayName: 'Mono'
+      runtimeFlavor: 'Mono'
 
     shouldContinueOnError: ${{ and(endsWith(variables['Build.DefinitionName'], 'staging'), eq(variables['Build.Reason'], 'PullRequest')) }}
 
diff --git a/eng/pipelines/coreclr/templates/helix-queues-setup.yml b/eng/pipelines/coreclr/templates/helix-queues-setup.yml
index 45ac52c4dcd920..3a3646d0619de7 100644
--- a/eng/pipelines/coreclr/templates/helix-queues-setup.yml
+++ b/eng/pipelines/coreclr/templates/helix-queues-setup.yml
@@ -7,7 +7,7 @@ parameters:
   container: ''
   pool: ''
   platform: ''
-  runtimeFlavorDisplayName: ''
+  runtimeFlavor: ''
   shouldContinueOnError: false
   dependOnEvaluatePaths: false
   jobParameters: {}
@@ -24,7 +24,7 @@ jobs:
     platform: ${{ parameters.platform }}
     shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
     dependOnEvaluatePaths: ${{ parameters.dependOnEvaluatePaths}}
-    runtimeFlavorDisplayName: ${{ parameters.runtimeFlavorDisplayName }}
+    runtimeFlavor: ${{ parameters.runtimeFlavor }}
     helixQueues:
 
     # iOS/tvOS simulator x64/x86
diff --git a/eng/pipelines/libraries/helix-queues-setup.yml b/eng/pipelines/libraries/helix-queues-setup.yml
index d67e4cec12332b..bf3a5d3002f7aa 100644
--- a/eng/pipelines/libraries/helix-queues-setup.yml
+++ b/eng/pipelines/libraries/helix-queues-setup.yml
@@ -7,7 +7,7 @@ parameters:
   container: ''
   pool: ''
   platform: ''
-  runtimeFlavorDisplayName: ''
+  runtimeFlavor: ''
   shouldContinueOnError: false
   dependOnEvaluatePaths: false
   jobParameters: {}
@@ -24,7 +24,7 @@ jobs:
     platform: ${{ parameters.platform }}
     shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
     dependOnEvaluatePaths: ${{ parameters.dependOnEvaluatePaths}}
-    runtimeFlavorDisplayName: ${{ parameters.runtimeFlavorDisplayName }}
+    runtimeFlavor: ${{ parameters.runtimeFlavor }}
     helixQueues:
 
     # Linux arm
diff --git a/src/tasks/Base64Tasks/Base64Tasks.csproj b/src/tasks/Base64Tasks/Base64Tasks.csproj
new file mode 100644
index 00000000000000..1be5c82426fee7
--- /dev/null
+++ b/src/tasks/Base64Tasks/Base64Tasks.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>$(TargetFrameworkForNETCoreTasks)</TargetFramework>
+    <OutputType>Library</OutputType>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="EncodeUnicodeBase64.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" />
+  </ItemGroup>
+</Project>
diff --git a/src/tasks/Base64Tasks/EncodeUnicodeBase64.cs b/src/tasks/Base64Tasks/EncodeUnicodeBase64.cs
new file mode 100644
index 00000000000000..ad12213a25ad02
--- /dev/null
+++ b/src/tasks/Base64Tasks/EncodeUnicodeBase64.cs
@@ -0,0 +1,23 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Text;
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+namespace Base64Tasks;
+
+public class EncodeUnicodeBase64 : Task
+{
+    [Required]
+    public string? Input { get; set; }
+
+    [Output]
+    public string? Base64 { get; set; }
+
+    public override bool Execute()
+    {
+        Base64 = Convert.ToBase64String(Encoding.Unicode.GetBytes(Input!));
+        return true;
+    }
+}
diff --git a/src/tests/Common/XHarnessRunnerLibrary/RunnerEntryPoint.cs b/src/tests/Common/XHarnessRunnerLibrary/RunnerEntryPoint.cs
index b1b1f4e44e72ef..daf22773002ef7 100644
--- a/src/tests/Common/XHarnessRunnerLibrary/RunnerEntryPoint.cs
+++ b/src/tests/Common/XHarnessRunnerLibrary/RunnerEntryPoint.cs
@@ -16,6 +16,11 @@ public static async Task<int> RunTests(
         string? filter,
         HashSet<string> testExclusionList)
     {
+        // If an exclusion list is passed as a filter, treat it as though no filter is provided here.
+        if (filter?.StartsWith("--exclusion-list=") == true)
+        {
+            filter = null;
+        }
         ApplicationEntryPoint? entryPoint = null;
         if (OperatingSystem.IsAndroid())
         {
diff --git a/src/tests/Common/XUnitWrapperLibrary/TestFilter.cs b/src/tests/Common/XUnitWrapperLibrary/TestFilter.cs
index a2cf5f0c70418d..fd6a1d7faa5f95 100644
--- a/src/tests/Common/XUnitWrapperLibrary/TestFilter.cs
+++ b/src/tests/Common/XUnitWrapperLibrary/TestFilter.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Text;
 namespace XUnitWrapperLibrary;
 
@@ -47,6 +48,11 @@ public bool IsMatch(string fullyQualifiedName, string displayName, string[] trai
             }
             return stringToSearch == Filter;
         }
+            
+        public override string ToString()
+        {
+            return $"{Kind}{(Substring ? "~" : "=")}{Filter}";
+        }
     }
 
     public sealed class AndClause : ISearchClause
@@ -61,6 +67,11 @@ public AndClause(ISearchClause left, ISearchClause right)
         }
 
         public bool IsMatch(string fullyQualifiedName, string displayName, string[] traits) => _left.IsMatch(fullyQualifiedName, displayName, traits) && _right.IsMatch(fullyQualifiedName, displayName, traits);
+  
+        public override string ToString()
+        {
+            return $"({_left}) && ({_right})";
+        }
     }
 
     public sealed class OrClause : ISearchClause
@@ -75,6 +86,11 @@ public OrClause(ISearchClause left, ISearchClause right)
         }
 
         public bool IsMatch(string fullyQualifiedName, string displayName, string[] traits) => _left.IsMatch(fullyQualifiedName, displayName, traits) || _right.IsMatch(fullyQualifiedName, displayName, traits);
+    
+        public override string ToString()
+        {
+            return $"({_left}) || ({_right})";
+        }
     }
 
     public sealed class NotClause : ISearchClause
@@ -87,6 +103,11 @@ public NotClause(ISearchClause inner)
         }
 
         public bool IsMatch(string fullyQualifiedName, string displayName, string[] traits) => !_inner.IsMatch(fullyQualifiedName, displayName, traits);
+    
+        public override string ToString()
+        {
+            return $"!({_inner})";
+        }
     }
 
     private readonly ISearchClause? _filter;
@@ -133,6 +154,25 @@ public bool ShouldRunTest(string fullyQualifiedName, string displayName, string[
     public static HashSet<string> LoadTestExclusionList()
     {
         HashSet<string> output = new ();
+
+        // Try reading the exclusion list as a base64-encoded semicolon-delimited string as a commmand-line arg.
+        string[] arguments = Environment.GetCommandLineArgs();
+        string? testExclusionListArg = arguments.FirstOrDefault(arg => arg.StartsWith("--exclusion-list="));
+        if (testExclusionListArg is not null)
+        {
+            string[] excludedTests = Encoding.Unicode.GetString(Convert.FromBase64String(testExclusionListArg.Substring("--exclusion-list=".Length))).Split(';');
+            output.UnionWith(excludedTests);
+        }
+        
+        // Try reading the exclusion list as a base64-encoded semicolon-delimited string as an environment variable.
+        string? testExclusionList = Environment.GetEnvironmentVariable("TestExclusionList");
+        if (testExclusionList is not null)
+        {
+            string[] excludedTests = Encoding.Unicode.GetString(Convert.FromBase64String(testExclusionList)).Split(';');
+            output.UnionWith(excludedTests);
+        }
+
+        // Try reading the exclusion list as a line-delimited file.
         string? testExclusionListPath = Environment.GetEnvironmentVariable("TestExclusionListPath");
         if (!string.IsNullOrEmpty(testExclusionListPath))
         {
diff --git a/src/tests/Common/helixpublishwitharcade.proj b/src/tests/Common/helixpublishwitharcade.proj
index 266227aaf63aec..326f83e3e3cb09 100644
--- a/src/tests/Common/helixpublishwitharcade.proj
+++ b/src/tests/Common/helixpublishwitharcade.proj
@@ -15,10 +15,16 @@
     <MergedPayloadsRootDirectory>$([MSBuild]::NormalizeDirectory($(MergedPayloadsRootDirectory)))</MergedPayloadsRootDirectory>
   </PropertyGroup>
 
+  <UsingTask TaskName="EncodeUnicodeBase64" AssemblyFile="$(Base64TasksAssemblyPath)" />
+
+  <!-- We need to get a Base64 representation of the test exclusion list for mobile platforms -->
+  <Target Name="GetTestExclusionListAsBase64" Returns="$(Base64TestExclusionList)" Condition="'$(TargetsMobile)' == 'true'">
+  </Target>
+
   <!-- This target runs once and creates several instances of this project (one for each scenario)
        that will run in parallel. -->
 
-  <Target Name="RunInParallelForEachScenario">
+  <Target Name="RunInParallelForEachScenario" DependsOnTargets="GetTestExclusionListAsBase64">
     <PropertyGroup>
       <!-- This specifies what properties are needed to be passed down as global properties to a child project. -->
 
@@ -56,6 +62,27 @@
         DotNetCliVersion=$(DotNetCliVersion)
       </_PropertiesToPass>
     </PropertyGroup>
+    <ItemGroup Condition="'$(TargetsMobile)' == 'true'">
+      <_ExcludeListProject Include="$(RepoRoot)src/tests/issues.targets">
+        <AdditionalProperties>XunitTestBinBase=$(TestBinDir);$(_PropertiesToPass)</AdditionalProperties>
+      </_ExcludeListProject>
+    </ItemGroup>
+    <MSBuild Projects="@(_ExcludeListProject)"
+             Targets="GetFilteredExcludeList"
+             Condition="'$(TargetsMobile)' == 'true'">
+      <Output TaskParameter="TargetOutputs" ItemName="FilteredTestExclusionList" />
+    </MSBuild>
+    <EncodeUnicodeBase64  
+      Condition="'$(TargetsMobile)' == 'true'"
+      Input="@(FilteredTestExclusionList)">
+      <Output TaskParameter="Base64" PropertyName="Base64TestExclusionList" />
+    </EncodeUnicodeBase64>
+    <PropertyGroup>
+      <_PropertiesToPass Condition="'$(TargetsMobile)' == 'true'">
+        $(_PropertiesToPass);
+        Base64TestExclusionList=$(Base64TestExclusionList)
+      </_PropertiesToPass>
+    </PropertyGroup>
     <Message Text="DotNetCliVersion: $(DotNetCliVersion)" Importance="High" />
     <Message Text="DotNetCliPackageType: $(DotNetCliPackageType)" Importance="High" />
     <Message Text="HelixRuntimeRid: $(HelixRuntimeRid)" Importance="High" />
@@ -371,8 +398,15 @@
       </_MergedPayloadFiles>
     </ItemGroup>
 
+    <ItemGroup>
+      <HelixCommandLines Condition="'$(TestWrapperTargetsWindows)' != 'true'" Include="export WasmTestAppArgs=&quot;$WasmTestAppArgs --exclusion-list=$(Base64TestExclusionList)&quot;" />
+      <HelixCommandLines Condition="'$(TestWrapperTargetsWindows)' == 'true'" Include="set WasmTestAppArgs=%WasmTestAppArgs% --exclusion-list=$(Base64TestExclusionList)" />
+      <HelixCommandLines Condition="'$(TestWrapperTargetsWindows)' != 'true'" Include="chmod +x $(_MergedWrapperRunScriptRelative)" />
+      <HelixCommandLines Include="$(_MergedWrapperRunScriptRelative)" />
+    </ItemGroup>
+
     <Copy SourceFiles="@(_MergedPayloadFiles)" DestinationFiles="@(_MergedPayloadFiles->'$(MergedPayloadsRootDirectory)\$(_MergedWrapperName)\%(FileRelativeToPayloadsRootDirectory)')" />
-    <WriteLinesToFile File="$(MergedPayloadsRootDirectory)\$(_MergedWrapperName)\HelixCommand.txt" Lines="$(_MergedWrapperRunScriptRelative)" />
+    <WriteLinesToFile File="$(MergedPayloadsRootDirectory)\$(_MergedWrapperName)\HelixCommand.txt" Lines="@(HelixCommandLines)" />
   </Target>
 
   <Target Name="PrepareMergedTestPayloadDirectoryForAppleMobile"
@@ -418,7 +452,10 @@
       </LegacyPayloads>
     </ItemGroup>
 
-    <ZipDirectory SourceDirectory="@(LegacyPayloads->Metadata('PayloadDirectory'))" DestinationFile="$(LegacyPayloadsRootDirectory)\%(LegacyPayloads.PayloadGroup).zip" />
+    <ZipDirectory
+      Condition="'@(LegacyPayloads)' != ''"
+      SourceDirectory="@(LegacyPayloads->Metadata('PayloadDirectory'))"
+      DestinationFile="$(LegacyPayloadsRootDirectory)\%(LegacyPayloads.PayloadGroup).zip" />
   </Target>
 
   <Target Name="ZipMergedPayloadDirectory" AfterTargets="PrepareMergedTestPayloadDirectories" Condition="'$(TargetsBrowser)' == 'true'">
@@ -430,7 +467,10 @@
       </MergedPayloads>
     </ItemGroup>
 
-    <ZipDirectory SourceDirectory="@(MergedPayloads->Metadata('PayloadDirectory'))" DestinationFile="$(MergedPayloadsRootDirectory)\%(MergedPayloads.PayloadGroup).zip" />
+    <ZipDirectory
+      Condition="'@(MergedPayloads)' != ''"
+      SourceDirectory="@(MergedPayloads->Metadata('PayloadDirectory'))"
+      DestinationFile="$(MergedPayloadsRootDirectory)\%(MergedPayloads.PayloadGroup).zip" />
   </Target>
 
   <PropertyGroup>
@@ -445,7 +485,7 @@
     <RunCrossGen2 Condition=" '$(RunCrossGen2)' != 'true' ">false</RunCrossGen2>
     <LongRunningGCTests Condition=" '$(LongRunningGCTests)' != 'true' ">false</LongRunningGCTests>
     <GcSimulatorTests Condition=" '$(GcSimulatorTests)' != 'true' ">false</GcSimulatorTests>
-    <TestRunNamePrefix Condition="'$(RuntimeFlavorDisplayName)' != ''">$(RuntimeFlavorDisplayName) </TestRunNamePrefix>
+    <TestRunNamePrefix Condition="'$(RuntimeFlavor)' != ''">$(RuntimeFlavor) </TestRunNamePrefix>
     <TestRunNamePrefix Condition=" '$(RunCrossGen)' == 'true' ">R2R </TestRunNamePrefix>
     <TestRunNamePrefix Condition=" '$(RunCrossGen2)' == 'true' ">R2R-CG2 </TestRunNamePrefix>
     <TestRunNamePrefix Condition=" '$(Scenario)' == 'normal' ">$(TestRunNamePrefix)$(TargetOS) $(TargetArchitecture) $(Configuration) @ </TestRunNamePrefix>
@@ -562,7 +602,8 @@
     </MergedPayloads>
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetHasHelixXHarnessSdkSupport)' != 'true'">
+  <!-- When targeting Mobile platforms, we ensure that the script has the right permissions beforehand. -->
+  <ItemGroup Condition="'$(TargetsMobile)' != 'true'">
     <MergedPayloads Update="@(MergedPayloads)" Condition="'$(TestWrapperTargetsWindows)' != 'true'">
       <MergedTestHelixCommand>chmod +x %(MergedPayloads.MergedTestHelixCommand)%0A%(MergedPayloads.MergedTestHelixCommand)</MergedTestHelixCommand>
     </MergedPayloads>
@@ -597,6 +638,7 @@
     </XHarnessApkToTest>
     
     <XHarnessApkToTest Include="@(MergedPayloads->Metadata('PayloadGroup'))" Condition="'$(TargetsAndroid)' == 'true'">
+      <Arguments>--arg=env:TestExclusionList=$(Base64TestExclusionList)</Arguments>
       <AndroidPackageName>net.dot.%(PayloadGroup)</AndroidPackageName>
       <AndroidInstrumentationName>net.dot.MonoRunner</AndroidInstrumentationName>
       <TestTimeout Condition=" '$(TimeoutPerTestCollectionInMinutes)' != '' ">$([System.TimeSpan]::FromMinutes($(TimeoutPerTestCollectionInMinutes)))</TestTimeout>
@@ -611,6 +653,7 @@
     </XHarnessAppBundleToTest>
 
     <XHarnessAppBundleToTest Include="@(MergedPayloads->Metadata('PayloadGroup'))" Condition="'$(TargetsAppleMobile)' == 'true'">
+      <Arguments>--set-env=TestExclusionList=$(Base64TestExclusionList)</Arguments>
       <TestTarget Condition="'$(TargetArchitecture)' == 'arm64'">ios-simulator-64</TestTarget>
       <TestTarget Condition="'$(TargetArchitecture)' == 'x64'">ios-simulator-64</TestTarget>
       <TestTimeout Condition=" '$(TimeoutPerTestCollectionInMinutes)' != '' ">$([System.TimeSpan]::FromMinutes($(TimeoutPerTestCollectionInMinutes)))</TestTimeout>
diff --git a/src/tests/build.proj b/src/tests/build.proj
index c292d42fe4cf12..78700b40b7c7f2 100644
--- a/src/tests/build.proj
+++ b/src/tests/build.proj
@@ -597,17 +597,11 @@
       Properties="@(CreateLibProperty)" />
   </Target>
 
-  <Target Name="EmitTestExclusionList">
+  <Target Name="EmitTestExclusionList" DependsOnTargets="GetFilteredExcludeList">
     <PropertyGroup>
       <TestExclusionListPath>$(CORE_ROOT)\TestExclusionList.txt</TestExclusionListPath>
     </PropertyGroup>
 
-    <ItemGroup>
-      <FilteredExcludeList
-        Include="$([System.IO.Path]::GetRelativePath('$(XunitTestBinBase)', '%(ExcludeList.FullPath)'))"
-        Condition="'%(ExcludeList.Extension)' == '.dll'" />
-    </ItemGroup>
-
     <WriteLinesToFile
         File="$(TestExclusionListPath)"
         Lines="@(FilteredExcludeList)"
diff --git a/src/tests/issues.targets b/src/tests/issues.targets
index f8c0d3b91a5ee6..caaae135a4f87a 100644
--- a/src/tests/issues.targets
+++ b/src/tests/issues.targets
@@ -4001,4 +4001,12 @@
             <Issue>mobile and wasm don't support tests with native libraries.  wasm also needs static linking</Issue>
         </ExcludeList>
     </ItemGroup>
+
+    <Target Name="GetFilteredExcludeList" Returns="@(FilteredExcludeList)">
+        <ItemGroup>
+            <FilteredExcludeList
+                Include="$([System.IO.Path]::GetRelativePath('$(XunitTestBinBase)', '%(ExcludeList.FullPath)'))"
+                Condition="'%(ExcludeList.Extension)' == '.dll'" />
+      </ItemGroup>
+    </Target>
 </Project>

From 9349757d40de8274781f727154ad2249e4f576a4 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jekoritz@microsoft.com>
Date: Thu, 31 Mar 2022 15:57:30 -0700
Subject: [PATCH 12/22] Remove some duplicate parameters

---
 eng/pipelines/common/templates/runtimes/build-test-job.yml | 1 -
 eng/pipelines/common/templates/runtimes/run-test-job.yml   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/eng/pipelines/common/templates/runtimes/build-test-job.yml b/eng/pipelines/common/templates/runtimes/build-test-job.yml
index bddb6ccd3b669f..d32ca3b66137fe 100644
--- a/eng/pipelines/common/templates/runtimes/build-test-job.yml
+++ b/eng/pipelines/common/templates/runtimes/build-test-job.yml
@@ -11,7 +11,6 @@ parameters:
   variables: {}
   pool: ''
   runtimeFlavor: 'coreclr'
-  runtimeFlavor: 'CoreCLR'
   runtimeVariant: ''
   dependsOn: []
   dependOnEvaluatePaths: false
diff --git a/eng/pipelines/common/templates/runtimes/run-test-job.yml b/eng/pipelines/common/templates/runtimes/run-test-job.yml
index 9a6e1d51342265..c553827ab39c1b 100644
--- a/eng/pipelines/common/templates/runtimes/run-test-job.yml
+++ b/eng/pipelines/common/templates/runtimes/run-test-job.yml
@@ -21,7 +21,6 @@ parameters:
   variables: {}
   pool: ''
   runtimeFlavor: 'coreclr'
-  runtimeFlavor: 'CoreCLR'
   shouldContinueOnError: false
   dependsOn: []
   dependOnEvaluatePaths: false

From 0c262270e0b95d9ae48c094231a348a11c08806b Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jekoritz@microsoft.com>
Date: Thu, 31 Mar 2022 16:02:01 -0700
Subject: [PATCH 13/22] Remove duplicate in xplat-setup

---
 eng/pipelines/common/xplat-setup.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/eng/pipelines/common/xplat-setup.yml b/eng/pipelines/common/xplat-setup.yml
index d9db2ada89dbd8..e6ac905afb0648 100644
--- a/eng/pipelines/common/xplat-setup.yml
+++ b/eng/pipelines/common/xplat-setup.yml
@@ -14,11 +14,6 @@ parameters:
 jobs:
 - template: ${{ coalesce(parameters.helixQueuesTemplate, parameters.jobTemplate) }}
   parameters:
-    ${{ if eq(parameters.jobParameters.runtimeFlavor, 'coreclr') }}:
-      runtimeFlavor: 'CoreCLR'
-    ${{ if eq(parameters.jobParameters.runtimeFlavor, 'mono') }}:
-      runtimeFlavor: 'Mono'
-
     shouldContinueOnError: ${{ and(endsWith(variables['Build.DefinitionName'], 'staging'), eq(variables['Build.Reason'], 'PullRequest')) }}
 
     # keep in sync with /eng/pipelines/common/variables.yml

From eb17eea335a5462361d2cab161d3619e0f694d7f Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jekoritz@microsoft.com>
Date: Thu, 31 Mar 2022 16:06:39 -0700
Subject: [PATCH 14/22] Remove another duplicate from the rename

---
 eng/pipelines/coreclr/templates/helix-queues-setup.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/eng/pipelines/coreclr/templates/helix-queues-setup.yml b/eng/pipelines/coreclr/templates/helix-queues-setup.yml
index 3a3646d0619de7..43b78cee145dc9 100644
--- a/eng/pipelines/coreclr/templates/helix-queues-setup.yml
+++ b/eng/pipelines/coreclr/templates/helix-queues-setup.yml
@@ -7,7 +7,6 @@ parameters:
   container: ''
   pool: ''
   platform: ''
-  runtimeFlavor: ''
   shouldContinueOnError: false
   dependOnEvaluatePaths: false
   jobParameters: {}
@@ -23,8 +22,7 @@ jobs:
     pool: ${{ parameters.pool }}
     platform: ${{ parameters.platform }}
     shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
-    dependOnEvaluatePaths: ${{ parameters.dependOnEvaluatePaths}}
-    runtimeFlavor: ${{ parameters.runtimeFlavor }}
+    dependOnEvaluatePaths: ${{ parameters.dependOnEvaluatePaths }}
     helixQueues:
 
     # iOS/tvOS simulator x64/x86

From d0be7735a1bcd2f75f96f2f0249305598385d7ca Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jekoritz@microsoft.com>
Date: Thu, 31 Mar 2022 16:16:29 -0700
Subject: [PATCH 15/22] Clean up some more duplicates from the rename

---
 .../templates/runtimes/android-runtime-and-send-to-helix.yml    | 2 --
 .../templates/runtimes/wasm-runtime-and-send-to-helix.yml       | 2 --
 eng/pipelines/libraries/helix-queues-setup.yml                  | 2 --
 3 files changed, 6 deletions(-)

diff --git a/eng/pipelines/common/templates/runtimes/android-runtime-and-send-to-helix.yml b/eng/pipelines/common/templates/runtimes/android-runtime-and-send-to-helix.yml
index 0134692000f4d3..71b6b5343970db 100644
--- a/eng/pipelines/common/templates/runtimes/android-runtime-and-send-to-helix.yml
+++ b/eng/pipelines/common/templates/runtimes/android-runtime-and-send-to-helix.yml
@@ -13,7 +13,6 @@ parameters:
   runtimeVariant: ''
   variables: {}
   pool: ''
-  runtimeFlavor: 'Mono'
   dependsOn: []
   #arcade-specific parameters
   condition: always()
@@ -38,7 +37,6 @@ steps:
       osGroup: ${{ parameters.osGroup }}
       osSubgroup: ${{ parameters.osSubgroup}}
       coreClrRepoRoot: $(Build.SourcesDirectory)/src/coreclr
-      runtimeFlavor: ${{ parameters.runtimeFlavor }}
       shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
       runtimeVariant: ${{ parameters.runtimeVariant }}
 
diff --git a/eng/pipelines/common/templates/runtimes/wasm-runtime-and-send-to-helix.yml b/eng/pipelines/common/templates/runtimes/wasm-runtime-and-send-to-helix.yml
index 8cee4e34bbdbe7..7c871c4731bcec 100644
--- a/eng/pipelines/common/templates/runtimes/wasm-runtime-and-send-to-helix.yml
+++ b/eng/pipelines/common/templates/runtimes/wasm-runtime-and-send-to-helix.yml
@@ -19,7 +19,6 @@ parameters:
   variables: {}
   pool: ''
   runtimeFlavor: 'mono'
-  runtimeFlavor: 'Mono'
   dependsOn: []
   #arcade-specific parameters
   condition: always()
@@ -44,7 +43,6 @@ steps:
       osGroup: ${{ parameters.osGroup }}
       osSubgroup: ${{ parameters.osSubgroup}}
       coreClrRepoRoot: $(Build.SourcesDirectory)/src/coreclr
-      runtimeFlavor: ${{ parameters.runtimeFlavor }}
       shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
 
       ${{ if eq(variables['System.TeamProject'], 'public') }}:
diff --git a/eng/pipelines/libraries/helix-queues-setup.yml b/eng/pipelines/libraries/helix-queues-setup.yml
index bf3a5d3002f7aa..ecca458ba59323 100644
--- a/eng/pipelines/libraries/helix-queues-setup.yml
+++ b/eng/pipelines/libraries/helix-queues-setup.yml
@@ -7,7 +7,6 @@ parameters:
   container: ''
   pool: ''
   platform: ''
-  runtimeFlavor: ''
   shouldContinueOnError: false
   dependOnEvaluatePaths: false
   jobParameters: {}
@@ -24,7 +23,6 @@ jobs:
     platform: ${{ parameters.platform }}
     shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
     dependOnEvaluatePaths: ${{ parameters.dependOnEvaluatePaths}}
-    runtimeFlavor: ${{ parameters.runtimeFlavor }}
     helixQueues:
 
     # Linux arm

From a3db382f4030e61301689cfbd2e05ee1d7cdedb4 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jekoritz@microsoft.com>
Date: Fri, 1 Apr 2022 09:10:59 -0700
Subject: [PATCH 16/22] Handle making the test run script executable in the
 Desktop target so we can easily pass the additional parameter

---
 src/tests/Common/helixpublishwitharcade.proj | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/tests/Common/helixpublishwitharcade.proj b/src/tests/Common/helixpublishwitharcade.proj
index 326f83e3e3cb09..1c971380ab9172 100644
--- a/src/tests/Common/helixpublishwitharcade.proj
+++ b/src/tests/Common/helixpublishwitharcade.proj
@@ -326,8 +326,6 @@
       <_MergedWrapperParentDirectory>$([System.IO.Path]::GetDirectoryName('$(_MergedWrapperDirectory)'))</_MergedWrapperParentDirectory>
       <_MergedWrapperName>%(_MergedWrapperRunScript.FileName)</_MergedWrapperName>
       <_MergedWrapperRunScriptRelative Condition="'%(_MergedWrapperRunScript.Identity)' != ''">$([System.IO.Path]::GetRelativePath($(TestBinDir), %(_MergedWrapperRunScript.FullPath)))</_MergedWrapperRunScriptRelative>
-      <!-- Force assemblies to lazy-load for LLVM AOT test runs to enable using tests that fail at AOT time (and as a result can't be AOTd) -->
-      <_MergedWrapperRunScriptRelative Condition="'$(RuntimeVariant)' == 'llvmfullaot'">$(_MergedWrapperRunScriptRelative) --aot-lazy-assembly-load</_MergedWrapperRunScriptRelative>
     </PropertyGroup>
     <ItemGroup>
       <_MergedWrapperOutOfProcessTestMarkers Include="$(_MergedWrapperParentDirectory)/**/*.OutOfProcessTest" />
@@ -353,8 +351,16 @@
       <ReducedMergedPayloadFilesFinal Include="@(_MergedPayloadFiles)" Condition=" '%(Extension)' != '.pdb' and '%(Extension)' != '.OutOfProcessTest' " />
     </ItemGroup>
 
+    <ItemGroup>
+      <!-- We need to ensure that the test run script is marked as executable. -->
+      <HelixCommandLines Condition="'$(TestWrapperTargetsWindows)' != 'true'" Include="chmod +x $(_MergedWrapperRunScriptRelative)" />
+      <!-- Force assemblies to lazy-load for LLVM AOT test runs to enable using tests that fail at AOT time (and as a result can't be AOTd) -->
+      <HelixCommandLines Condition="'$(RuntimeVariant)' == 'llvmfullaot'" Include="$(_MergedWrapperRunScriptRelative) --aot-lazy-assembly-load" />
+      <HelixCommandLines Condition="'$(RuntimeVariant)' != 'llvmfullaot'" Include="$(_MergedWrapperRunScriptRelative)" />
+    </ItemGroup>
+
     <Copy SourceFiles="@(ReducedMergedPayloadFilesFinal)" DestinationFiles="@(ReducedMergedPayloadFilesFinal->'$(MergedPayloadsRootDirectory)\$(_MergedWrapperName)\%(FileRelativeToPayloadsRootDirectory)')" />
-    <WriteLinesToFile File="$(MergedPayloadsRootDirectory)\$(_MergedWrapperName)\HelixCommand.txt" Lines="$(_MergedWrapperRunScriptRelative)" />
+    <WriteLinesToFile File="$(MergedPayloadsRootDirectory)\$(_MergedWrapperName)\HelixCommand.txt" Lines="@(HelixCommandLines)" />
   </Target>
 
   <Target Name="PrepareMergedTestPayloadDirectoryForAndroid"
@@ -602,13 +608,6 @@
     </MergedPayloads>
   </ItemGroup>
 
-  <!-- When targeting Mobile platforms, we ensure that the script has the right permissions beforehand. -->
-  <ItemGroup Condition="'$(TargetsMobile)' != 'true'">
-    <MergedPayloads Update="@(MergedPayloads)" Condition="'$(TestWrapperTargetsWindows)' != 'true'">
-      <MergedTestHelixCommand>chmod +x %(MergedPayloads.MergedTestHelixCommand)%0A%(MergedPayloads.MergedTestHelixCommand)</MergedTestHelixCommand>
-    </MergedPayloads>
-  </ItemGroup>
-
   <ItemGroup Condition="'$(TargetHasHelixXHarnessSdkSupport)' == 'true'">
     <MergedPayloads Update="@(MergedPayloads)">
       <PayloadGroup>%(FileName)%(Extension)</PayloadGroup>

From f664f9f3ead5551f503af8160f50063128edd7c3 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jekoritz@microsoft.com>
Date: Fri, 1 Apr 2022 09:46:50 -0700
Subject: [PATCH 17/22] Automatically skip out-of-proc tests on unsupported
 platforms.

---
 src/tests/Common/CoreCLRTestLibrary/OutOfProcessTest.cs | 6 ++++++
 src/tests/Common/XUnitWrapperGenerator/ITestInfo.cs     | 7 ++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/tests/Common/CoreCLRTestLibrary/OutOfProcessTest.cs b/src/tests/Common/CoreCLRTestLibrary/OutOfProcessTest.cs
index 83a07c41f806d9..ad68f35537b92c 100644
--- a/src/tests/Common/CoreCLRTestLibrary/OutOfProcessTest.cs
+++ b/src/tests/Common/CoreCLRTestLibrary/OutOfProcessTest.cs
@@ -42,6 +42,12 @@ static OutOfProcessTest()
             }
         }
 
+        public static bool OutOfProcessTestsSupported =>
+            !OperatingSystem.IsIOS()
+            && !OperatingSystem.IsTvOS()
+            && !OperatingSystem.IsAndroid()
+            && !OperatingSystem.IsBrowser();
+
         public static void RunOutOfProcessTest(string basePath, string assemblyPath)
         {
             int ret = -100;
diff --git a/src/tests/Common/XUnitWrapperGenerator/ITestInfo.cs b/src/tests/Common/XUnitWrapperGenerator/ITestInfo.cs
index 6559a6db44f5d5..d0db16db340b53 100644
--- a/src/tests/Common/XUnitWrapperGenerator/ITestInfo.cs
+++ b/src/tests/Common/XUnitWrapperGenerator/ITestInfo.cs
@@ -249,7 +249,12 @@ public OutOfProcessTest(string displayName, string relativeAssemblyPath)
         Method = displayName;
         DisplayNameForFiltering = displayName;
         TestNameExpression = $"@\"{displayName}\"";
-        ExecutionStatement = $@"TestLibrary.OutOfProcessTest.RunOutOfProcessTest(typeof(Program).Assembly.Location, @""{relativeAssemblyPath}"");";
+        ExecutionStatement = $@"
+if (TestLibrary.OutOfProcessTest.OutOfProcessTestsSupported)
+{{
+TestLibrary.OutOfProcessTest.RunOutOfProcessTest(typeof(Program).Assembly.Location, @""{relativeAssemblyPath}"");
+}}
+";
     }
 
     public string TestNameExpression { get; }

From 930dd0da0426e0d92f7e26d2c8673225b1551eb4 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jekoritz@microsoft.com>
Date: Fri, 1 Apr 2022 09:58:52 -0700
Subject: [PATCH 18/22] Pass runtime flavor and variant to the
 send-to-helix-step for Android and Wasm

---
 .../templates/runtimes/android-runtime-and-send-to-helix.yml   | 1 +
 .../templates/runtimes/wasm-runtime-and-send-to-helix.yml      | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/eng/pipelines/common/templates/runtimes/android-runtime-and-send-to-helix.yml b/eng/pipelines/common/templates/runtimes/android-runtime-and-send-to-helix.yml
index 71b6b5343970db..0868ffb1ac1742 100644
--- a/eng/pipelines/common/templates/runtimes/android-runtime-and-send-to-helix.yml
+++ b/eng/pipelines/common/templates/runtimes/android-runtime-and-send-to-helix.yml
@@ -38,6 +38,7 @@ steps:
       osSubgroup: ${{ parameters.osSubgroup}}
       coreClrRepoRoot: $(Build.SourcesDirectory)/src/coreclr
       shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
+      runtimeFlavor: ${{ parameters.runtimeFlavor }}
       runtimeVariant: ${{ parameters.runtimeVariant }}
 
       ${{ if eq(variables['System.TeamProject'], 'public') }}:
diff --git a/eng/pipelines/common/templates/runtimes/wasm-runtime-and-send-to-helix.yml b/eng/pipelines/common/templates/runtimes/wasm-runtime-and-send-to-helix.yml
index 7c871c4731bcec..efa07e98720f2e 100644
--- a/eng/pipelines/common/templates/runtimes/wasm-runtime-and-send-to-helix.yml
+++ b/eng/pipelines/common/templates/runtimes/wasm-runtime-and-send-to-helix.yml
@@ -18,7 +18,6 @@ parameters:
   runtimeVariant: ''
   variables: {}
   pool: ''
-  runtimeFlavor: 'mono'
   dependsOn: []
   #arcade-specific parameters
   condition: always()
@@ -44,6 +43,8 @@ steps:
       osSubgroup: ${{ parameters.osSubgroup}}
       coreClrRepoRoot: $(Build.SourcesDirectory)/src/coreclr
       shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
+      runtimeFlavor: ${{ parameters.runtimeFlavor }}
+      runtimeVariant: ${{ parameters.runtimeVariant }}
 
       ${{ if eq(variables['System.TeamProject'], 'public') }}:
         creator: $(Build.DefinitionName)

From b06cdfc54fce8026c3b3765832ba8d81e40bc4a0 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jekoritz@microsoft.com>
Date: Fri, 1 Apr 2022 13:56:19 -0700
Subject: [PATCH 19/22] Fix merged payload name

---
 src/tests/Common/helixpublishwitharcade.proj | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/tests/Common/helixpublishwitharcade.proj b/src/tests/Common/helixpublishwitharcade.proj
index 1c971380ab9172..2af20f68aa1d9b 100644
--- a/src/tests/Common/helixpublishwitharcade.proj
+++ b/src/tests/Common/helixpublishwitharcade.proj
@@ -590,16 +590,7 @@
     </MergedPayloads>
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetsMobile)' != 'true'">
-    <MergedPayloads Update="@(MergedPayloads)">
-      <PayloadHelixCommandFile>$(MergedPayloadsRootDirectory)%(FileName)%(Extension)\HelixCommand.txt</PayloadHelixCommandFile>
-      <MergedTestHelixCommand>$([System.IO.File]::ReadAllText('%(PayloadHelixCommandFile)'))</MergedTestHelixCommand>
-      <PayloadGroup>$([System.IO.Path]::GetDirectoryName('%(MergedTestHelixCommand)').Replace('/', '-').Replace('\', '-'))</PayloadGroup>
-      <PayloadZipFile>$(MergedPayloadsRootDirectory)%(PayloadGroup).zip</PayloadZipFile>
-    </MergedPayloads>
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetsBrowser)' == 'true'">
+  <ItemGroup Condition="'$(TargetHasHelixXHarnessSdkSupport)' != 'true'">
     <MergedPayloads Update="@(MergedPayloads)">
       <PayloadHelixCommandFile>$(MergedPayloadsRootDirectory)%(FileName)%(Extension)\HelixCommand.txt</PayloadHelixCommandFile>
       <MergedTestHelixCommand>$([System.IO.File]::ReadAllText('%(PayloadHelixCommandFile)'))</MergedTestHelixCommand>

From c9a8c7ba20f42c4f9b983d2963312dce618f9df5 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jekoritz@microsoft.com>
Date: Fri, 1 Apr 2022 14:05:05 -0700
Subject: [PATCH 20/22] Pass runtimeVariant down for the wasm tests

---
 .../templates/runtimes/wasm-runtime-and-send-to-helix.yml       | 2 +-
 eng/pipelines/common/templates/wasm-runtime-tests.yml           | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/eng/pipelines/common/templates/runtimes/wasm-runtime-and-send-to-helix.yml b/eng/pipelines/common/templates/runtimes/wasm-runtime-and-send-to-helix.yml
index efa07e98720f2e..f1b3bbe955a7c9 100644
--- a/eng/pipelines/common/templates/runtimes/wasm-runtime-and-send-to-helix.yml
+++ b/eng/pipelines/common/templates/runtimes/wasm-runtime-and-send-to-helix.yml
@@ -30,7 +30,7 @@ parameters:
 
 
 steps:
-  - script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) /p:RuntimeVariant=monointerpreter /p:LibrariesConfiguration=${{ parameters.buildConfig }} -ci -mono os Browser wasm $(buildConfigUpper)
+  - script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) /p:RuntimeVariant=${{ parameters.runtimeVariant }} /p:LibrariesConfiguration=${{ parameters.buildConfig }} -ci -mono os Browser wasm $(buildConfigUpper)
     displayName: Build Tests
 
   #  Send tests to Helix
diff --git a/eng/pipelines/common/templates/wasm-runtime-tests.yml b/eng/pipelines/common/templates/wasm-runtime-tests.yml
index aa7e4257764bde..e6bb45d98887ce 100644
--- a/eng/pipelines/common/templates/wasm-runtime-tests.yml
+++ b/eng/pipelines/common/templates/wasm-runtime-tests.yml
@@ -28,6 +28,7 @@ jobs:
       testGroup: innerloop
       isExtraPlatforms: ${{ parameters.isExtraPlatformsBuild }}
       nameSuffix: AllSubsets_Mono_RuntimeTests
+      runtimeVariant: monointerpreter
       buildArgs: -s mono+libs -c $(_BuildConfig)
       timeoutInMinutes: 180
       condition: >-

From 901ef1f6043a5111e48faf9cff03b24f2aa3cd07 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jekoritz@microsoft.com>
Date: Tue, 5 Apr 2022 11:57:45 -0700
Subject: [PATCH 21/22] Inject the exclusion list as a file in the mobile test
 apps to avoid command-line length limitations.

---
 Directory.Build.props                         |  4 +-
 src/tasks/Base64Tasks/EncodeUnicodeBase64.cs  | 23 ------
 .../PatchExclusionListInApks.cs               | 37 +++++++++
 .../TestExclusionListTasks.csproj}            |  2 +-
 .../Common/XUnitWrapperLibrary/TestFilter.cs  | 12 +--
 src/tests/Common/helixpublishwitharcade.proj  | 75 ++++++++++---------
 src/tests/Common/mergedrunnermobile.targets   | 18 +++++
 7 files changed, 99 insertions(+), 72 deletions(-)
 delete mode 100644 src/tasks/Base64Tasks/EncodeUnicodeBase64.cs
 create mode 100644 src/tasks/TestExclusionListTasks/PatchExclusionListInApks.cs
 rename src/tasks/{Base64Tasks/Base64Tasks.csproj => TestExclusionListTasks/TestExclusionListTasks.csproj} (90%)

diff --git a/Directory.Build.props b/Directory.Build.props
index fb643fe0e290a7..ea12ca71919bc1 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -93,7 +93,7 @@
     <WorkloadBuildTasksDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'WorkloadBuildTasks', 'Debug', '$(NetCoreAppToolCurrent)', 'publish'))</WorkloadBuildTasksDir>
     <MonoAOTCompilerDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'MonoAOTCompiler', 'Debug', '$(NetCoreAppToolCurrent)'))</MonoAOTCompilerDir>
     <MonoTargetsTasksDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'MonoTargetsTasks', 'Debug', '$(NetCoreAppToolCurrent)'))</MonoTargetsTasksDir>
-    <Base64TasksDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'Base64Tasks', 'Debug', '$(NetCoreAppToolCurrent)'))</Base64TasksDir>
+    <TestExclusionListTasksDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'TestExclusionListTasks', 'Debug', '$(NetCoreAppToolCurrent)'))</TestExclusionListTasksDir>
     <InstallerTasksAssemblyPath Condition="'$(MSBuildRuntimeType)' == 'Core'">$([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'installer.tasks', 'Debug', '$(NetCoreAppToolCurrent)', 'installer.tasks.dll'))</InstallerTasksAssemblyPath>
     <InstallerTasksAssemblyPath Condition="'$(MSBuildRuntimeType)' != 'Core'">$([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'installer.tasks', 'Debug', '$(NetFrameworkToolCurrent)', 'installer.tasks.dll'))</InstallerTasksAssemblyPath>
     <Crossgen2SdkOverridePropsPath Condition="'$(MSBuildRuntimeType)' == 'Core'">$([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'Crossgen2Tasks', 'Debug', '$(NetCoreAppToolCurrent)', 'Microsoft.NET.CrossGen.props'))</Crossgen2SdkOverridePropsPath>
@@ -105,7 +105,7 @@
     <WorkloadBuildTasksAssemblyPath>$([MSBuild]::NormalizePath('$(WorkloadBuildTasksDir)', 'WorkloadBuildTasks.dll'))</WorkloadBuildTasksAssemblyPath>
     <MonoAOTCompilerTasksAssemblyPath>$([MSBuild]::NormalizePath('$(MonoAOTCompilerDir)', 'MonoAOTCompiler.dll'))</MonoAOTCompilerTasksAssemblyPath>
     <MonoTargetsTasksAssemblyPath>$([MSBuild]::NormalizePath('$(MonoTargetsTasksDir)', 'MonoTargetsTasks.dll'))</MonoTargetsTasksAssemblyPath>
-    <Base64TasksAssemblyPath>$([MSBuild]::NormalizePath('$(Base64TasksDir)', 'Base64Tasks.dll'))</Base64TasksAssemblyPath>
+    <TestExclusionListTasksAssemblyPath>$([MSBuild]::NormalizePath('$(TestExclusionListTasksDir)', 'TestExclusionListTasks.dll'))</TestExclusionListTasksAssemblyPath>
     <ILAsmToolPath Condition="'$(DotNetBuildFromSource)' == 'true'">$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'coreclr', '$(TargetOS).$(TargetArchitecture).$(Configuration)'))</ILAsmToolPath>
   </PropertyGroup>
 
diff --git a/src/tasks/Base64Tasks/EncodeUnicodeBase64.cs b/src/tasks/Base64Tasks/EncodeUnicodeBase64.cs
deleted file mode 100644
index ad12213a25ad02..00000000000000
--- a/src/tasks/Base64Tasks/EncodeUnicodeBase64.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System;
-using System.Text;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-namespace Base64Tasks;
-
-public class EncodeUnicodeBase64 : Task
-{
-    [Required]
-    public string? Input { get; set; }
-
-    [Output]
-    public string? Base64 { get; set; }
-
-    public override bool Execute()
-    {
-        Base64 = Convert.ToBase64String(Encoding.Unicode.GetBytes(Input!));
-        return true;
-    }
-}
diff --git a/src/tasks/TestExclusionListTasks/PatchExclusionListInApks.cs b/src/tasks/TestExclusionListTasks/PatchExclusionListInApks.cs
new file mode 100644
index 00000000000000..8ccbea4cc72bfe
--- /dev/null
+++ b/src/tasks/TestExclusionListTasks/PatchExclusionListInApks.cs
@@ -0,0 +1,37 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.IO;
+using System.IO.Compression;
+using System.Linq;
+using System.Text;
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+namespace TestExclusionListTasks;
+
+public class PatchExclusionListInApks : Task
+{
+    [Required]
+    public ITaskItem[]? ApkPaths { get; set; }
+
+    [Required]
+    public ITaskItem[]? ExcludedTests { get; set; }
+
+    public override bool Execute()
+    {
+        string testExclusionList = string.Join(
+            '\n',
+            (ExcludedTests ?? Enumerable.Empty<ITaskItem>()).Select(t => t.ItemSpec));
+        foreach (ITaskItem apk in ApkPaths ?? Enumerable.Empty<ITaskItem>())
+        {
+            using ZipArchive apkArchive = ZipFile.Open(apk.GetMetadata("FullPath"), ZipArchiveMode.Update);
+            ZipArchiveEntry assetsZipEntry = apkArchive.GetEntry("assets/assets.zip")!;
+            using ZipArchive assetsArchive = new ZipArchive(assetsZipEntry.Open(), ZipArchiveMode.Update);
+            ZipArchiveEntry testExclusionListEntry = assetsArchive.GetEntry("TestExclusionList.txt")!;
+            using StreamWriter textExclusionListWriter = new StreamWriter(testExclusionListEntry.Open());
+            textExclusionListWriter.WriteLine(testExclusionList);
+        }
+        return true;
+    }
+}
diff --git a/src/tasks/Base64Tasks/Base64Tasks.csproj b/src/tasks/TestExclusionListTasks/TestExclusionListTasks.csproj
similarity index 90%
rename from src/tasks/Base64Tasks/Base64Tasks.csproj
rename to src/tasks/TestExclusionListTasks/TestExclusionListTasks.csproj
index 1be5c82426fee7..665a4866dacf05 100644
--- a/src/tasks/Base64Tasks/Base64Tasks.csproj
+++ b/src/tasks/TestExclusionListTasks/TestExclusionListTasks.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="EncodeUnicodeBase64.cs" />
+    <Compile Include="PatchExclusionListInApks.cs" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" />
diff --git a/src/tests/Common/XUnitWrapperLibrary/TestFilter.cs b/src/tests/Common/XUnitWrapperLibrary/TestFilter.cs
index fd6a1d7faa5f95..6c4c4f6b57b1b2 100644
--- a/src/tests/Common/XUnitWrapperLibrary/TestFilter.cs
+++ b/src/tests/Common/XUnitWrapperLibrary/TestFilter.cs
@@ -160,16 +160,8 @@ public static HashSet<string> LoadTestExclusionList()
         string? testExclusionListArg = arguments.FirstOrDefault(arg => arg.StartsWith("--exclusion-list="));
         if (testExclusionListArg is not null)
         {
-            string[] excludedTests = Encoding.Unicode.GetString(Convert.FromBase64String(testExclusionListArg.Substring("--exclusion-list=".Length))).Split(';');
-            output.UnionWith(excludedTests);
-        }
-        
-        // Try reading the exclusion list as a base64-encoded semicolon-delimited string as an environment variable.
-        string? testExclusionList = Environment.GetEnvironmentVariable("TestExclusionList");
-        if (testExclusionList is not null)
-        {
-            string[] excludedTests = Encoding.Unicode.GetString(Convert.FromBase64String(testExclusionList)).Split(';');
-            output.UnionWith(excludedTests);
+            string testExclusionListPathFromCommandLine = testExclusionListArg.Substring("--exclusion-list=".Length);
+            output.UnionWith(File.ReadAllLines(testExclusionListPathFromCommandLine));
         }
 
         // Try reading the exclusion list as a line-delimited file.
diff --git a/src/tests/Common/helixpublishwitharcade.proj b/src/tests/Common/helixpublishwitharcade.proj
index 2af20f68aa1d9b..f518dc6dc0ffbc 100644
--- a/src/tests/Common/helixpublishwitharcade.proj
+++ b/src/tests/Common/helixpublishwitharcade.proj
@@ -15,16 +15,10 @@
     <MergedPayloadsRootDirectory>$([MSBuild]::NormalizeDirectory($(MergedPayloadsRootDirectory)))</MergedPayloadsRootDirectory>
   </PropertyGroup>
 
-  <UsingTask TaskName="EncodeUnicodeBase64" AssemblyFile="$(Base64TasksAssemblyPath)" />
-
-  <!-- We need to get a Base64 representation of the test exclusion list for mobile platforms -->
-  <Target Name="GetTestExclusionListAsBase64" Returns="$(Base64TestExclusionList)" Condition="'$(TargetsMobile)' == 'true'">
-  </Target>
-
   <!-- This target runs once and creates several instances of this project (one for each scenario)
        that will run in parallel. -->
 
-  <Target Name="RunInParallelForEachScenario" DependsOnTargets="GetTestExclusionListAsBase64">
+  <Target Name="RunInParallelForEachScenario">
     <PropertyGroup>
       <!-- This specifies what properties are needed to be passed down as global properties to a child project. -->
 
@@ -62,27 +56,6 @@
         DotNetCliVersion=$(DotNetCliVersion)
       </_PropertiesToPass>
     </PropertyGroup>
-    <ItemGroup Condition="'$(TargetsMobile)' == 'true'">
-      <_ExcludeListProject Include="$(RepoRoot)src/tests/issues.targets">
-        <AdditionalProperties>XunitTestBinBase=$(TestBinDir);$(_PropertiesToPass)</AdditionalProperties>
-      </_ExcludeListProject>
-    </ItemGroup>
-    <MSBuild Projects="@(_ExcludeListProject)"
-             Targets="GetFilteredExcludeList"
-             Condition="'$(TargetsMobile)' == 'true'">
-      <Output TaskParameter="TargetOutputs" ItemName="FilteredTestExclusionList" />
-    </MSBuild>
-    <EncodeUnicodeBase64  
-      Condition="'$(TargetsMobile)' == 'true'"
-      Input="@(FilteredTestExclusionList)">
-      <Output TaskParameter="Base64" PropertyName="Base64TestExclusionList" />
-    </EncodeUnicodeBase64>
-    <PropertyGroup>
-      <_PropertiesToPass Condition="'$(TargetsMobile)' == 'true'">
-        $(_PropertiesToPass);
-        Base64TestExclusionList=$(Base64TestExclusionList)
-      </_PropertiesToPass>
-    </PropertyGroup>
     <Message Text="DotNetCliVersion: $(DotNetCliVersion)" Importance="High" />
     <Message Text="DotNetCliPackageType: $(DotNetCliPackageType)" Importance="High" />
     <Message Text="HelixRuntimeRid: $(HelixRuntimeRid)" Importance="High" />
@@ -363,10 +336,25 @@
     <WriteLinesToFile File="$(MergedPayloadsRootDirectory)\$(_MergedWrapperName)\HelixCommand.txt" Lines="@(HelixCommandLines)" />
   </Target>
 
+  <!-- We need to get a Base64 representation of the test exclusion list for mobile platforms -->
+  <Target Name="GetTestExclusionList" Returns="@(FilteredTestExclusionList)" Condition="'$(TargetsMobile)' == 'true'">
+    <ItemGroup>
+      <_ExcludeListProject Include="$(RepoRoot)src/tests/issues.targets">
+        <AdditionalProperties>XunitTestBinBase=$(TestBinDir);$(_PropertiesToPass)</AdditionalProperties>
+      </_ExcludeListProject>
+    </ItemGroup>
+    <MSBuild Projects="@(_ExcludeListProject)"
+             Targets="GetFilteredExcludeList">
+      <Output TaskParameter="TargetOutputs" ItemName="FilteredTestExclusionList" />
+    </MSBuild>
+  </Target>
+
+  <UsingTask TaskName="PatchExclusionListInApks" AssemblyFile="$(TestExclusionListTasksAssemblyPath)" />
+
   <Target Name="PrepareMergedTestPayloadDirectoryForAndroid"
       Condition="'$(TargetsAndroid)' == 'true'"
       Outputs="%(_MergedWrapperMarker.FileName)"
-      DependsOnTargets="DiscoverMergedTestWrappers">
+      DependsOnTargets="DiscoverMergedTestWrappers;GetTestExclusionList">
     <PropertyGroup>
       <_MergedWrapperDirectory>%(_MergedWrapperMarker.RootDir)%(Directory)</_MergedWrapperDirectory>
       <_MergedWrapperName>%(_MergedWrapperMarker.FileName)</_MergedWrapperName>
@@ -378,12 +366,15 @@
     </ItemGroup>
 
     <Copy SourceFiles="@(_MergedPayloadFiles)" DestinationFiles="@(_MergedPayloadFiles->'$(MergedPayloadsRootDirectory)\$(_MergedWrapperName)\%(FileName)%(Extension)')" />
+    <PatchExclusionListInApks
+      ApkPaths="@(_MergedPayloadFiles->'$(MergedPayloadsRootDirectory)\$(_MergedWrapperName)\%(FileName)%(Extension)')"
+      ExcludedTests="@(FilteredTestExclusionList)" />
   </Target>
 
   <Target Name="PrepareMergedTestPayloadDirectoryForWasm"
       Condition="'$(TargetsBrowser)' == 'true'"
       Outputs="%(_MergedWrapperMarker.FileName)"
-      DependsOnTargets="DiscoverMergedTestWrappers">
+      DependsOnTargets="DiscoverMergedTestWrappers;GetTestExclusionList">
     <ItemGroup>
       <_MergedWrapperRunScript Include="@(_MergedWrapperMarker->'%(RootDir)%(Directory)AppBundle/RunTests.$(TestScriptExtension)')" />
     </ItemGroup>
@@ -402,23 +393,29 @@
              MakeRelative function calls Escape function internally that replaces all the Unicode characters with %<xx>. -->
         <FileRelativeToPayloadsRootDirectory>$([System.IO.Path]::GetRelativePath('$(_MergedWrapperDirectory)AppBundle', %(FullPath)))</FileRelativeToPayloadsRootDirectory>
       </_MergedPayloadFiles>
+      <!-- Remove the placeholder test exclusion list here -->
+      <_TestExclusionListPlaceholder Include="@(_MergedPayloadFiles)" Condition="$([System.String]::new('%(FileName)').EndsWith('TestExclusionList'))" />
+      <_MergedPayloadFiles Remove="@(_TestExclusionListPlaceholder)" />
     </ItemGroup>
 
     <ItemGroup>
-      <HelixCommandLines Condition="'$(TestWrapperTargetsWindows)' != 'true'" Include="export WasmTestAppArgs=&quot;$WasmTestAppArgs --exclusion-list=$(Base64TestExclusionList)&quot;" />
-      <HelixCommandLines Condition="'$(TestWrapperTargetsWindows)' == 'true'" Include="set WasmTestAppArgs=%WasmTestAppArgs% --exclusion-list=$(Base64TestExclusionList)" />
+      <HelixCommandLines Condition="'$(TestWrapperTargetsWindows)' != 'true'" Include="export WasmTestAppArgs=&quot;$WasmTestAppArgs --exclusion-list=TestExclusionList.txt&quot;" />
+      <HelixCommandLines Condition="'$(TestWrapperTargetsWindows)' == 'true'" Include="set WasmTestAppArgs=%WasmTestAppArgs% --exclusion-list=TestExclusionList.txt" />
       <HelixCommandLines Condition="'$(TestWrapperTargetsWindows)' != 'true'" Include="chmod +x $(_MergedWrapperRunScriptRelative)" />
       <HelixCommandLines Include="$(_MergedWrapperRunScriptRelative)" />
     </ItemGroup>
 
     <Copy SourceFiles="@(_MergedPayloadFiles)" DestinationFiles="@(_MergedPayloadFiles->'$(MergedPayloadsRootDirectory)\$(_MergedWrapperName)\%(FileRelativeToPayloadsRootDirectory)')" />
     <WriteLinesToFile File="$(MergedPayloadsRootDirectory)\$(_MergedWrapperName)\HelixCommand.txt" Lines="@(HelixCommandLines)" />
+    <!-- Write the real test exclusion list instead of the placeholder. -->
+    <WriteLinesToFile File="@(_TestExclusionListPlaceholder->'$(MergedPayloadsRootDirectory)\$(_MergedWrapperName)\%(FileRelativeToPayloadsRootDirectory)')"
+                      Lines="@(FilteredTestExclusionList)" />
   </Target>
 
   <Target Name="PrepareMergedTestPayloadDirectoryForAppleMobile"
       Condition="'$(TargetsAppleMobile)' == 'true'"
       Outputs="%(_MergedWrapperMarker.FileName)"
-      DependsOnTargets="DiscoverMergedTestWrappers">
+      DependsOnTargets="DiscoverMergedTestWrappers;GetTestExclusionList">
     <PropertyGroup>
       <_MergedWrapperDirectory>%(_MergedWrapperMarker.RootDir)%(Directory)</_MergedWrapperDirectory>
       <_MergedWrapperName>%(_MergedWrapperMarker.FileName)</_MergedWrapperName>
@@ -442,10 +439,16 @@
              MakeRelative function calls Escape function internally that replaces all the Unicode characters with %<xx>. -->
         <FileRelativeToPayloadsRootDirectory>$([System.IO.Path]::GetRelativePath('$(_MergedWrapperDirectory)AppBundle/$(_MergedWrapperName)/$(Configuration)-$(XCodeSdk)', %(FullPath)))</FileRelativeToPayloadsRootDirectory>
       </_MergedPayloadFiles>
+      <!-- Remove the placeholder test exclusion list here -->
+      <_TestExclusionListPlaceholder Include="@(_MergedPayloadFiles)" Condition="$([System.String]::new('%(FileName)').EndsWith('TestExclusionList'))" />
+      <_MergedPayloadFiles Remove="@(_TestExclusionListPlaceholder)" />
     </ItemGroup>
 
     <Copy SourceFiles="@(_MergedPayloadFiles)" DestinationFiles="@(_MergedPayloadFiles->'$(MergedPayloadsRootDirectory)\$(_MergedWrapperName)\%(FileRelativeToPayloadsRootDirectory)')" />
-  </Target>
+    <!-- Write the real test exclusion list instead of the placeholder. -->
+    <WriteLinesToFile File="@(_TestExclusionListPlaceholder->'$(MergedPayloadsRootDirectory)\$(_MergedWrapperName)\%(FileRelativeToPayloadsRootDirectory)')"
+      Lines="@(FilteredTestExclusionList)" />
+    </Target>
 
   <Target Name="PrepareMergedTestPayloadDirectory" DependsOnTargets="DiscoverMergedTestWrappers;PrepareMergedTestPayloadDirectoryForDesktop;PrepareMergedTestPayloadDirectoryForAndroid;PrepareMergedTestPayloadDirectoryForWasm;PrepareMergedTestPayloadDirectoryForAppleMobile" />
 
@@ -628,7 +631,7 @@
     </XHarnessApkToTest>
     
     <XHarnessApkToTest Include="@(MergedPayloads->Metadata('PayloadGroup'))" Condition="'$(TargetsAndroid)' == 'true'">
-      <Arguments>--arg=env:TestExclusionList=$(Base64TestExclusionList)</Arguments>
+      <Arguments>--arg=env:TestExclusionListPath=TestExclusionList.txt</Arguments>
       <AndroidPackageName>net.dot.%(PayloadGroup)</AndroidPackageName>
       <AndroidInstrumentationName>net.dot.MonoRunner</AndroidInstrumentationName>
       <TestTimeout Condition=" '$(TimeoutPerTestCollectionInMinutes)' != '' ">$([System.TimeSpan]::FromMinutes($(TimeoutPerTestCollectionInMinutes)))</TestTimeout>
@@ -643,7 +646,7 @@
     </XHarnessAppBundleToTest>
 
     <XHarnessAppBundleToTest Include="@(MergedPayloads->Metadata('PayloadGroup'))" Condition="'$(TargetsAppleMobile)' == 'true'">
-      <Arguments>--set-env=TestExclusionList=$(Base64TestExclusionList)</Arguments>
+      <Arguments>--set-env=TestExclusionListPath=TestExclusionList.txt</Arguments>
       <TestTarget Condition="'$(TargetArchitecture)' == 'arm64'">ios-simulator-64</TestTarget>
       <TestTarget Condition="'$(TargetArchitecture)' == 'x64'">ios-simulator-64</TestTarget>
       <TestTimeout Condition=" '$(TimeoutPerTestCollectionInMinutes)' != '' ">$([System.TimeSpan]::FromMinutes($(TimeoutPerTestCollectionInMinutes)))</TestTimeout>
diff --git a/src/tests/Common/mergedrunnermobile.targets b/src/tests/Common/mergedrunnermobile.targets
index f595bb35745b11..7371cdc702c5a0 100644
--- a/src/tests/Common/mergedrunnermobile.targets
+++ b/src/tests/Common/mergedrunnermobile.targets
@@ -21,6 +21,24 @@
     <ProjectReference Include="$(RepoRoot)/src/tests/Common/XHarnessRunnerLibrary/XHarnessRunnerLibrary.csproj" />
   </ItemGroup>
 
+  <!--
+    We can't publish the test exclusion list at test build time as we don't know the full test run configuration
+    until we're about to send the test runs to Helix. Here we'll include a dummy text exclusion list into the app bundle
+    that we will patch with the actual test exclusion list later.
+    Adding the exclusion list here allows us to avoid having to manually patch the various metadata files for each app type
+    and allows us to only have to replace this file.
+  -->
+  <Target Name="_AddDummyTestExclusionListToAssets" BeforeTargets="AssignTargetPaths">
+    <ItemGroup>
+      <_PlaceholderExclusionList Include="$(IntermediateOutputPath)/PlaceholderTestExclusionList.txt" />
+      <Content Include="@(_PlaceholderExclusionList)" TargetPath="TestExclusionList.txt" CopyToOutputDirectory="PreserveNewest"/>
+    </ItemGroup>
+    <WriteLinesToFile File="@(_PlaceholderExclusionList)"
+                      Lines=""
+                      Overwrite="true"
+                      WriteOnlyWhenDifferent="true" />
+  </Target>
+
   <!-- Don't use the usual script generation, the scripts it generates are not useful for these tests. -->
   <Target Name="GenerateExecutionScriptsInternal" />
   <Target Name="GenerateLocalRunnerScript" DependsOnTargets="GenerateRunScript" AfterTargets="PublishTestAsSelfContained" />

From 0fd5fef04ee697fd0347c1cda12b70a0e07047e9 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jekoritz@microsoft.com>
Date: Tue, 5 Apr 2022 18:03:04 -0700
Subject: [PATCH 22/22] Use Android SDK tools to fix up APK after patching.

---
 src/tasks/AndroidAppBuilder/ApkBuilder.cs     | 32 ++++++++++++++++++-
 .../PatchExclusionListInApks.cs               | 31 ++++++++++++++----
 .../TestExclusionListTasks.csproj             |  3 ++
 3 files changed, 59 insertions(+), 7 deletions(-)

diff --git a/src/tasks/AndroidAppBuilder/ApkBuilder.cs b/src/tasks/AndroidAppBuilder/ApkBuilder.cs
index b6acdc48592f1c..2d54e5192f8996 100644
--- a/src/tasks/AndroidAppBuilder/ApkBuilder.cs
+++ b/src/tasks/AndroidAppBuilder/ApkBuilder.cs
@@ -463,7 +463,7 @@ public ApkBuilder(TaskLoggingHelper logger)
         // 4. Align APK
 
         string alignedApk = Path.Combine(OutputDir, "bin", $"{ProjectName}.apk");
-        Utils.RunProcess(logger, zipalign, $"-v 4 {apkFile} {alignedApk}", workingDir: OutputDir);
+        AlignApk(apkFile, alignedApk, zipalign);
         // we don't need the unaligned one any more
         File.Delete(apkFile);
 
@@ -475,6 +475,11 @@ public ApkBuilder(TaskLoggingHelper logger)
         return (alignedApk, packageId);
     }
 
+    private void AlignApk(string unalignedApkPath, string apkOutPath, string zipalign)
+    {
+        Utils.RunProcess(logger, zipalign, $"-v 4 {unalignedApkPath} {apkOutPath}", workingDir: OutputDir);
+    }
+
     private void SignApk(string apkPath, string apksigner)
     {
         string defaultKey = Path.Combine(OutputDir, "debug.keystore");
@@ -495,6 +500,31 @@ private void SignApk(string apkPath, string apksigner)
             $"--ks-pass pass:android --key-pass pass:android {apkPath}", workingDir: OutputDir);
     }
 
+    public void ZipAndSignApk(string apkPath)
+    {
+        if (string.IsNullOrEmpty(AndroidSdk))
+            AndroidSdk = Environment.GetEnvironmentVariable("ANDROID_SDK_ROOT");
+
+        if (string.IsNullOrEmpty(AndroidSdk) || !Directory.Exists(AndroidSdk))
+            throw new ArgumentException($"Android SDK='{AndroidSdk}' was not found or incorrect (can be set via ANDROID_SDK_ROOT envvar).");
+
+        if (string.IsNullOrEmpty(BuildToolsVersion))
+            BuildToolsVersion = GetLatestBuildTools(AndroidSdk);
+
+        if (string.IsNullOrEmpty(MinApiLevel))
+            MinApiLevel = DefaultMinApiLevel;
+
+        string buildToolsFolder = Path.Combine(AndroidSdk, "build-tools", BuildToolsVersion);
+        string zipalign = Path.Combine(buildToolsFolder, "zipalign");
+        string apksigner = Path.Combine(buildToolsFolder, "apksigner");
+
+        string alignedApkPath = $"{apkPath}.aligned";
+        AlignApk(apkPath, alignedApkPath, zipalign);
+        logger.LogMessage(MessageImportance.High, $"\nMoving '{alignedApkPath}' to '{apkPath}'.\n");
+        File.Move(alignedApkPath, apkPath, overwrite: true);
+        SignApk(apkPath, apksigner);
+    }
+
     public void ReplaceFileInApk(string file)
     {
         if (string.IsNullOrEmpty(AndroidSdk))
diff --git a/src/tasks/TestExclusionListTasks/PatchExclusionListInApks.cs b/src/tasks/TestExclusionListTasks/PatchExclusionListInApks.cs
index 8ccbea4cc72bfe..254bef87ef6274 100644
--- a/src/tasks/TestExclusionListTasks/PatchExclusionListInApks.cs
+++ b/src/tasks/TestExclusionListTasks/PatchExclusionListInApks.cs
@@ -18,19 +18,38 @@ public class PatchExclusionListInApks : Task
     [Required]
     public ITaskItem[]? ExcludedTests { get; set; }
 
+    public string? AndroidSdk { get; set; }
+
+    public string? MinApiLevel { get; set; }
+
+    public string? BuildToolsVersion { get; set; }
+
+    public string? KeyStorePath { get; set; }
+
     public override bool Execute()
     {
+        var apkBuilder = new ApkBuilder(Log);
+        apkBuilder.AndroidSdk = AndroidSdk;
+        apkBuilder.MinApiLevel = MinApiLevel;
+        apkBuilder.BuildToolsVersion = BuildToolsVersion;
+        apkBuilder.KeyStorePath = KeyStorePath;
+
         string testExclusionList = string.Join(
             '\n',
             (ExcludedTests ?? Enumerable.Empty<ITaskItem>()).Select(t => t.ItemSpec));
         foreach (ITaskItem apk in ApkPaths ?? Enumerable.Empty<ITaskItem>())
         {
-            using ZipArchive apkArchive = ZipFile.Open(apk.GetMetadata("FullPath"), ZipArchiveMode.Update);
-            ZipArchiveEntry assetsZipEntry = apkArchive.GetEntry("assets/assets.zip")!;
-            using ZipArchive assetsArchive = new ZipArchive(assetsZipEntry.Open(), ZipArchiveMode.Update);
-            ZipArchiveEntry testExclusionListEntry = assetsArchive.GetEntry("TestExclusionList.txt")!;
-            using StreamWriter textExclusionListWriter = new StreamWriter(testExclusionListEntry.Open());
-            textExclusionListWriter.WriteLine(testExclusionList);
+            string apkPath = apk.GetMetadata("FullPath")!;
+            apkBuilder.OutputDir = Path.GetDirectoryName(apkPath)!;
+            using (ZipArchive apkArchive = ZipFile.Open(apkPath, ZipArchiveMode.Update))
+            {
+                ZipArchiveEntry assetsZipEntry = apkArchive.GetEntry("assets/assets.zip")!;
+                using ZipArchive assetsArchive = new ZipArchive(assetsZipEntry.Open(), ZipArchiveMode.Update);
+                ZipArchiveEntry testExclusionListEntry = assetsArchive.GetEntry("TestExclusionList.txt")!;
+                using StreamWriter textExclusionListWriter = new StreamWriter(testExclusionListEntry.Open());
+                textExclusionListWriter.WriteLine(testExclusionList);
+            }
+            apkBuilder.ZipAndSignApk(apkPath);
         }
         return true;
     }
diff --git a/src/tasks/TestExclusionListTasks/TestExclusionListTasks.csproj b/src/tasks/TestExclusionListTasks/TestExclusionListTasks.csproj
index 665a4866dacf05..d17dc95c41af62 100644
--- a/src/tasks/TestExclusionListTasks/TestExclusionListTasks.csproj
+++ b/src/tasks/TestExclusionListTasks/TestExclusionListTasks.csproj
@@ -5,10 +5,13 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <Nullable>enable</Nullable>
+    <NoWarn>$(NoWarn),CA1050</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
     <Compile Include="PatchExclusionListInApks.cs" />
+    <Compile Include="../AndroidAppBuilder/ApkBuilder.cs" />
+    <Compile Include="../Common/Utils.cs" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" />