diff --git a/PkmnLib.Tests/DataTests/MoveDataTests.cs b/PkmnLib.Tests/DataTests/MoveDataTests.cs
index fab884a..e6ab2ee 100644
--- a/PkmnLib.Tests/DataTests/MoveDataTests.cs
+++ b/PkmnLib.Tests/DataTests/MoveDataTests.cs
@@ -13,7 +13,7 @@ public class MoveDataTests
         public override string ToString() => Move.Name + " has valid scripts";
     }
 
-    public static IEnumerable<TestCaseData> AllMovesHaveValidScriptsData()
+    public static IEnumerable<Func<TestCaseData>> AllMovesHaveValidScriptsData()
     {
         var library = LibraryHelpers.LoadLibrary();
         var moveLibrary = library.StaticLibrary.Moves;
@@ -21,7 +21,7 @@ public class MoveDataTests
         {
             if (move.SecondaryEffect == null)
                 continue;
-            yield return new TestCaseData(library, move);
+            yield return () => new TestCaseData(library, move);
         }
     }
 
diff --git a/PkmnLib.Tests/Dataloader/AbilityDataLoaderTests.cs b/PkmnLib.Tests/Dataloader/AbilityDataLoaderTests.cs
index 696d7c7..3a7a61c 100644
--- a/PkmnLib.Tests/Dataloader/AbilityDataLoaderTests.cs
+++ b/PkmnLib.Tests/Dataloader/AbilityDataLoaderTests.cs
@@ -7,7 +7,7 @@ public class AbilityDataLoaderTests
     [Test]
     public async Task TestPrimaryAbilityFile()
     {
-        using var stream = File.OpenRead("Data/Abilities.json");
+        await using var stream = File.OpenRead("Data/Abilities.json");
         var library = AbilityDataLoader.LoadAbilities(stream);
         await Assert.That(library).IsNotNull();
     }
diff --git a/PkmnLib.Tests/Dataloader/GrowthRateDataLoaderTests.cs b/PkmnLib.Tests/Dataloader/GrowthRateDataLoaderTests.cs
index a7d0161..846547f 100644
--- a/PkmnLib.Tests/Dataloader/GrowthRateDataLoaderTests.cs
+++ b/PkmnLib.Tests/Dataloader/GrowthRateDataLoaderTests.cs
@@ -7,7 +7,7 @@ public class GrowthRateDataLoaderTests
     [Test]
     public async Task TestPrimaryGrowthRateFile()
     {
-        using var file = File.Open("Data/GrowthRates.json", FileMode.Open, FileAccess.Read, FileShare.Read);
+        await using var file = File.Open("Data/GrowthRates.json", FileMode.Open, FileAccess.Read, FileShare.Read);
         var library = GrowthRateDataLoader.LoadGrowthRates(file);
         await Assert.That(library).IsNotNull();
     }
diff --git a/PkmnLib.Tests/Dataloader/ItemDataLoaderTests.cs b/PkmnLib.Tests/Dataloader/ItemDataLoaderTests.cs
index 11fa79a..ac65f82 100644
--- a/PkmnLib.Tests/Dataloader/ItemDataLoaderTests.cs
+++ b/PkmnLib.Tests/Dataloader/ItemDataLoaderTests.cs
@@ -7,7 +7,7 @@ public class ItemDataLoaderTests
     [Test]
     public async Task TestPrimaryItemFile()
     {
-        using var stream = File.OpenRead("Data/Items.json");
+        await using var stream = File.OpenRead("Data/Items.json");
         var library = ItemDataLoader.LoadItems(stream);
         await Assert.That(library).IsNotNull();
     }
diff --git a/PkmnLib.Tests/Dataloader/NatureDataloaderTests.cs b/PkmnLib.Tests/Dataloader/NatureDataloaderTests.cs
index 5efdaa8..7b14d8f 100644
--- a/PkmnLib.Tests/Dataloader/NatureDataloaderTests.cs
+++ b/PkmnLib.Tests/Dataloader/NatureDataloaderTests.cs
@@ -7,7 +7,7 @@ public class NatureDataloaderTests
     [Test]
     public async Task TestPrimaryNatureFile()
     {
-        using var file = File.Open("Data/Natures.csv", FileMode.Open, FileAccess.Read, FileShare.Read);
+        await using var file = File.Open("Data/Natures.csv", FileMode.Open, FileAccess.Read, FileShare.Read);
         var library = NatureDataLoader.LoadNatureLibrary(file);
         await Assert.That(library).IsNotNull();
     }
diff --git a/PkmnLib.Tests/Dataloader/SpeciesDataloaderTests.cs b/PkmnLib.Tests/Dataloader/SpeciesDataloaderTests.cs
index 43c2227..6c57181 100644
--- a/PkmnLib.Tests/Dataloader/SpeciesDataloaderTests.cs
+++ b/PkmnLib.Tests/Dataloader/SpeciesDataloaderTests.cs
@@ -8,7 +8,7 @@ public class SpeciesDataloaderTests
     [Test]
     public async Task TestPrimarySpeciesFile()
     {
-        using var file = File.Open("Data/Pokemon.json", FileMode.Open, FileAccess.Read, FileShare.Read);
+        await using var file = File.Open("Data/Pokemon.json", FileMode.Open, FileAccess.Read, FileShare.Read);
         var typeLibrary = new TypeLibrary();
         typeLibrary.RegisterType("Normal");
         typeLibrary.RegisterType("Fire");
diff --git a/PkmnLib.Tests/Integration/IntegrationTestRunner.cs b/PkmnLib.Tests/Integration/IntegrationTestRunner.cs
index 3c32623..5c42971 100644
--- a/PkmnLib.Tests/Integration/IntegrationTestRunner.cs
+++ b/PkmnLib.Tests/Integration/IntegrationTestRunner.cs
@@ -1,4 +1,3 @@
-using System.Collections;
 using System.Text.Json;
 using EnumerableAsyncProcessor.Extensions;
 using PkmnLib.Dynamic.Models;
@@ -9,7 +8,7 @@ namespace PkmnLib.Tests.Integration;
 
 public class IntegrationTestRunner
 {
-    public static IEnumerable<IntegrationTestModel> TestCases()
+    public static IEnumerable<Func<IntegrationTestModel>> TestCases()
     {
         var files = Directory.GetFiles("Integration/Tests", "*.json");
         var serializerOptions = new JsonSerializerOptions
@@ -20,9 +19,11 @@ public class IntegrationTestRunner
         };
         foreach (var file in files)
         {
-            var json = File.ReadAllText(file);
-            var test = JsonSerializer.Deserialize<IntegrationTestModel>(json, serializerOptions)!;
-            yield return test;
+            yield return () =>
+            {
+                var json = File.ReadAllText(file);
+                return JsonSerializer.Deserialize<IntegrationTestModel>(json, serializerOptions)!;
+            };
         }
     }
 
diff --git a/PkmnLib.Tests/Integration/Models/IntegrationTestAction.cs b/PkmnLib.Tests/Integration/Models/IntegrationTestAction.cs
index e86536f..4f4daf3 100644
--- a/PkmnLib.Tests/Integration/Models/IntegrationTestAction.cs
+++ b/PkmnLib.Tests/Integration/Models/IntegrationTestAction.cs
@@ -38,9 +38,9 @@ public class SetMoveChoiceAction : IntegrationTestAction
     {
         var user = battle.Sides[Place[0]].Pokemon[Place[1]];
         await Assert.That(user).IsNotNull();
-        var move = user.Moves.First(m => m?.MoveData.Name == Move);
+        var move = user!.Moves.First(m => m?.MoveData.Name == Move);
         await Assert.That(move).IsNotNull();
-        var res = battle.TrySetChoice(new MoveChoice(user, move, Target[0], Target[1]));
+        var res = battle.TrySetChoice(new MoveChoice(user, move!, Target[0], Target[1]));
         await Assert.That(res).IsTrue();
     }
 }
@@ -54,7 +54,7 @@ public class SetPassChoiceAction : IntegrationTestAction
     {
         var user = battle.Sides[Place[0]].Pokemon[Place[1]];
         await Assert.That(user).IsNotNull();
-        var res = battle.TrySetChoice(new PassChoice(user));
+        var res = battle.TrySetChoice(new PassChoice(user!));
         await Assert.That(res).IsTrue();
     }
 }
diff --git a/Plugins/PkmnLib.Plugin.Gen7.Tests/BattleStatCalculatorTests.cs b/Plugins/PkmnLib.Plugin.Gen7.Tests/BattleStatCalculatorTests.cs
deleted file mode 100644
index a40e2a5..0000000
--- a/Plugins/PkmnLib.Plugin.Gen7.Tests/BattleStatCalculatorTests.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace PkmnLib.Plugin.Gen7.Tests;
-
-public class BattleStatCalculatorTests
-{
-    [Test]
-    public async Task Test1()
-    {
-    }
-}
\ No newline at end of file