diff --git a/Directory.Packages.props b/Directory.Packages.props
index 655b608889..8f621845e4 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -4,9 +4,7 @@
 		<PackageVersion Include="DotNetAnalyzers.DocumentationAnalyzers" Version="1.0.0-beta.59" />
 		<PackageVersion Include="Google.FlatBuffers" Version="22.9.24" />
 		<PackageVersion Include="JunitXml.TestLogger" Version="3.0.124" />
-		<PackageVersion Include="MSTest.TestAdapter" Version="2.2.9" />
-		<PackageVersion Include="MSTest.TestFramework" Version="2.2.9" />
-		<PackageVersion Include="Magick.NET-Q8-AnyCPU" Version="13.0.1" />
+		<PackageVersion Include="Magick.NET-Q8-AnyCPU" Version="13.6.0" />
 		<PackageVersion Include="Menees.Analyzers" Version="3.0.10" />
 		<PackageVersion Include="Meziantou.Analyzer" Version="2.0.33" />
 		<PackageVersion Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
@@ -14,8 +12,10 @@
 		<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.0" />
 		<PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
 		<PackageVersion Include="Microsoft.Data.Sqlite.Core" Version="8.0.1" />
-		<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+		<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
 		<PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
+		<PackageVersion Include="MSTest.TestAdapter" Version="3.2.2" />
+		<PackageVersion Include="MSTest.TestFramework" Version="3.2.2" />
 		<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
 		<PackageVersion Include="Nullable" Version="1.3.1" />
 		<PackageVersion Include="PolySharp" Version="1.14.1" />
diff --git a/src/BizHawk.Tests.Testroms.GB.GambatteSuite/GambatteSuite.cs b/src/BizHawk.Tests.Testroms.GB.GambatteSuite/GambatteSuite.cs
index eee510a828..d6eeeb4805 100644
--- a/src/BizHawk.Tests.Testroms.GB.GambatteSuite/GambatteSuite.cs
+++ b/src/BizHawk.Tests.Testroms.GB.GambatteSuite/GambatteSuite.cs
@@ -33,8 +33,8 @@ namespace BizHawk.Tests.Testroms.GB.GambatteSuite
 					.Select(static testCase => new object?[] { testCase });
 			}
 
-			public string GetDisplayName(MethodInfo methodInfo, object?[] data)
-				=> $"{methodInfo.Name}({((GambatteHexStrTestCase) data[0]!).DisplayName()})";
+			public string? GetDisplayName(MethodInfo methodInfo, object?[]? data)
+				=> $"{methodInfo.Name}({((GambatteHexStrTestCase) data![0]!).DisplayName()})";
 		}
 
 		[AttributeUsage(AttributeTargets.Method)]
@@ -50,8 +50,8 @@ namespace BizHawk.Tests.Testroms.GB.GambatteSuite
 					.Select(static testCase => new object?[] { testCase });
 			}
 
-			public string GetDisplayName(MethodInfo methodInfo, object?[] data)
-				=> $"{methodInfo.Name}({((GambatteRefImageTestCase) data[0]!).DisplayName()})";
+			public string? GetDisplayName(MethodInfo methodInfo, object?[]? data)
+				=> $"{methodInfo.Name}({((GambatteRefImageTestCase) data![0]!).DisplayName()})";
 		}
 
 		private static readonly byte[,] GLYPHS = {
diff --git a/src/BizHawk.Tests.Testroms.GB/GB_GBC/AcidTestroms.cs b/src/BizHawk.Tests.Testroms.GB/GB_GBC/AcidTestroms.cs
index 58d1994e98..7a1bc0fbd8 100644
--- a/src/BizHawk.Tests.Testroms.GB/GB_GBC/AcidTestroms.cs
+++ b/src/BizHawk.Tests.Testroms.GB/GB_GBC/AcidTestroms.cs
@@ -68,8 +68,8 @@ namespace BizHawk.Tests.Testroms.GB
 					.Select(static testCase => new object?[] { testCase });
 			}
 
-			public string GetDisplayName(MethodInfo methodInfo, object?[] data)
-				=> $"{methodInfo.Name}({((AcidTestCase) data[0]!).DisplayName()})";
+			public string? GetDisplayName(MethodInfo methodInfo, object?[]? data)
+				=> $"{methodInfo.Name}({((AcidTestCase) data![0]!).DisplayName()})";
 		}
 
 		private const string SUITE_ID = "AcidTestroms";
diff --git a/src/BizHawk.Tests.Testroms.GB/GB_GBC/BullyGB.cs b/src/BizHawk.Tests.Testroms.GB/GB_GBC/BullyGB.cs
index 7e1fefa63f..e9d3e3d4ac 100644
--- a/src/BizHawk.Tests.Testroms.GB/GB_GBC/BullyGB.cs
+++ b/src/BizHawk.Tests.Testroms.GB/GB_GBC/BullyGB.cs
@@ -26,8 +26,8 @@ namespace BizHawk.Tests.Testroms.GB
 					.Select(static setup => new object?[] { setup });
 			}
 
-			public string GetDisplayName(MethodInfo methodInfo, object?[] data)
-				=> $"{methodInfo.Name}({(CoreSetup) data[0]!})";
+			public string? GetDisplayName(MethodInfo methodInfo, object?[]? data)
+				=> $"{methodInfo.Name}({(CoreSetup) data![0]!})";
 		}
 
 		private const string ROM_EMBED_PATH = "res.BullyGB_artifact.bully.gb";
diff --git a/src/BizHawk.Tests.Testroms.GB/GB_GBC/CPPTestroms.cs b/src/BizHawk.Tests.Testroms.GB/GB_GBC/CPPTestroms.cs
index 0f0ccd5ff2..cb1ad79a7b 100644
--- a/src/BizHawk.Tests.Testroms.GB/GB_GBC/CPPTestroms.cs
+++ b/src/BizHawk.Tests.Testroms.GB/GB_GBC/CPPTestroms.cs
@@ -139,8 +139,8 @@ namespace BizHawk.Tests.Testroms.GB.CPPTestroms
 					.Select(static testCase => new object?[] { testCase });
 			}
 
-			public string GetDisplayName(MethodInfo methodInfo, object?[] data)
-				=> $"{methodInfo.Name}({((CPPTestromsHexStrTestCase) data[0]!).DisplayName()})";
+			public string? GetDisplayName(MethodInfo methodInfo, object?[]? data)
+				=> $"{methodInfo.Name}({((CPPTestromsHexStrTestCase) data![0]!).DisplayName()})";
 		}
 
 		private static readonly byte[,] GLYPHS = {
diff --git a/src/BizHawk.Tests.Testroms.GB/GB_GBC/MealybugTearoomTests.cs b/src/BizHawk.Tests.Testroms.GB/GB_GBC/MealybugTearoomTests.cs
index c35968c378..ca25b44ef6 100644
--- a/src/BizHawk.Tests.Testroms.GB/GB_GBC/MealybugTearoomTests.cs
+++ b/src/BizHawk.Tests.Testroms.GB/GB_GBC/MealybugTearoomTests.cs
@@ -230,8 +230,8 @@ namespace BizHawk.Tests.Testroms.GB
 					.Select(static testCase => new object?[] { testCase });
 			}
 
-			public string GetDisplayName(MethodInfo methodInfo, object?[] data)
-				=> $"{methodInfo.Name}({((MealybugTestCase) data[0]!).DisplayName()})";
+			public string? GetDisplayName(MethodInfo methodInfo, object?[]? data)
+				=> $"{methodInfo.Name}({((MealybugTestCase) data![0]!).DisplayName()})";
 		}
 
 		private const string SUITE_ID = "Mealybug";
diff --git a/src/BizHawk.Tests.Testroms.GB/GB_GBC/RTC3Test.cs b/src/BizHawk.Tests.Testroms.GB/GB_GBC/RTC3Test.cs
index 0e4e001e86..efb8bc7e6b 100644
--- a/src/BizHawk.Tests.Testroms.GB/GB_GBC/RTC3Test.cs
+++ b/src/BizHawk.Tests.Testroms.GB/GB_GBC/RTC3Test.cs
@@ -31,8 +31,8 @@ namespace BizHawk.Tests.Testroms.GB
 					.Select(static setup => new object?[] { setup });
 			}
 
-			public string GetDisplayName(MethodInfo methodInfo, object?[] data)
-				=> $"{methodInfo.Name}({(CoreSetup) data[0]!})";
+			public string? GetDisplayName(MethodInfo methodInfo, object?[]? data)
+				=> $"{methodInfo.Name}({(CoreSetup) data![0]!})";
 		}
 
 		private const string ROM_EMBED_PATH = "res.rtc3test_artifact.rtc3test.gb";