diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml
index 3c92c7854..26507c2b0 100644
--- a/.github/workflows/dotnet-core.yml
+++ b/.github/workflows/dotnet-core.yml
@@ -35,7 +35,8 @@ jobs:
     - name: Test
       run: |
         sed -i 's/"stopOnFail": false/"stopOnFail": true/g' UnitTests/xunit.runner.json
-        dotnet test --no-restore --verbosity normal --collect:"XPlat Code Coverage"  --settings UnitTests/coverlet.runsettings --blame
+        dotnet test --verbosity normal --blame-hang --blame-hang-dump-type full --blame-hang-timeout 5s
+        #dotnet test --no-restore --verbosity normal --collect:"XPlat Code Coverage" --settings UnitTests/coverlet.runsettings --blame
         mv -v UnitTests/TestResults/*/*.* UnitTests/TestResults/
 
     # Note: this step is currently not writing to the gist for some reason
diff --git a/UnitTests/UnitTests.sln b/UnitTests/UnitTests.sln
new file mode 100644
index 000000000..0d950924c
--- /dev/null
+++ b/UnitTests/UnitTests.sln
@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.5.002.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests", "UnitTests.csproj", "{A29633F2-B26E-48B2-997A-1733286E3C13}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{A29633F2-B26E-48B2-997A-1733286E3C13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A29633F2-B26E-48B2-997A-1733286E3C13}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A29633F2-B26E-48B2-997A-1733286E3C13}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A29633F2-B26E-48B2-997A-1733286E3C13}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {86ED8EAD-F1D5-4F95-A0E6-6D73DFC8442F}
+	EndGlobalSection
+EndGlobal