diff --git a/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModNoScope.cs b/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModNoScope.cs
index d18529309325..828e47e187fd 100644
--- a/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModNoScope.cs
+++ b/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModNoScope.cs
@@ -29,7 +29,7 @@ public void TestAlwaysHidden()
                 },
                 Autoplay = true,
                 PassCondition = () => Player.ScoreProcessor.Combo.Value == 2,
-                Beatmap = () => new Beatmap
+                CreateBeatmap = () => new Beatmap
                 {
                     HitObjects = new List<HitObject>
                     {
@@ -59,7 +59,7 @@ public void TestVisibleDuringBreak()
                 },
                 Autoplay = true,
                 PassCondition = () => true,
-                Beatmap = () => new Beatmap
+                CreateBeatmap = () => new Beatmap
                 {
                     HitObjects = new List<HitObject>
                     {
@@ -99,7 +99,7 @@ public void TestVisibleAfterComboBreak()
                 },
                 Autoplay = true,
                 PassCondition = () => true,
-                Beatmap = () => new Beatmap
+                CreateBeatmap = () => new Beatmap
                 {
                     HitObjects = new List<HitObject>
                     {
diff --git a/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModRelax.cs b/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModRelax.cs
index 6114c9ce6fc6..92f79601833e 100644
--- a/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModRelax.cs
+++ b/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModRelax.cs
@@ -28,7 +28,7 @@ public void TestModRelax() => CreateModTest(new ModTestData
             Mod = new CatchModRelax(),
             Autoplay = false,
             PassCondition = passCondition,
-            Beatmap = () => new Beatmap
+            CreateBeatmap = () => new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModHidden.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModHidden.cs
index 1f32a4531b0e..9365659f79e8 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModHidden.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModHidden.cs
@@ -24,7 +24,7 @@ public void TestJuiceStream()
         {
             CreateModTest(new ModTestData
             {
-                Beatmap = () => new Beatmap
+                CreateBeatmap = () => new Beatmap
                 {
                     HitObjects = new List<HitObject>
                     {
diff --git a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModAutoplay.cs b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModAutoplay.cs
index 4871f5b585a6..d644ef359d8e 100644
--- a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModAutoplay.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModAutoplay.cs
@@ -19,7 +19,7 @@ public void TestPerfectScoreOnShortHoldNote()
             CreateModTest(new ModTestData
             {
                 Autoplay = true,
-                Beatmap = () => new ManiaBeatmap(new StageDefinition(1))
+                CreateBeatmap = () => new ManiaBeatmap(new StageDefinition(1))
                 {
                     HitObjects = new List<ManiaHitObject>
                     {
diff --git a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModDoubleTime.cs b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModDoubleTime.cs
index a492c53456ff..50ec119e4d4f 100644
--- a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModDoubleTime.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModDoubleTime.cs
@@ -29,7 +29,7 @@ public void TestHitWindowWithoutDoubleTime() => CreateModTest(new ModTestData
                                   && Precision.AlmostEquals(Player.ScoreProcessor.Accuracy.Value, 0.9836, 0.01)
                                   && Player.ScoreProcessor.TotalScore.Value == 946_049,
             Autoplay = false,
-            Beatmap = () => new Beatmap
+            CreateBeatmap = () => new Beatmap
             {
                 BeatmapInfo = { Ruleset = new ManiaRuleset().RulesetInfo },
                 Difficulty = { OverallDifficulty = 10 },
@@ -56,7 +56,7 @@ public void TestHitWindowWithDoubleTime()
                                       && Player.ScoreProcessor.Accuracy.Value == 1
                                       && Player.ScoreProcessor.TotalScore.Value == (long)(1_000_000 * doubleTime.ScoreMultiplier),
                 Autoplay = false,
-                Beatmap = () => new Beatmap
+                CreateBeatmap = () => new Beatmap
                 {
                     BeatmapInfo = { Ruleset = new ManiaRuleset().RulesetInfo },
                     Difficulty = { OverallDifficulty = 10 },
diff --git a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModFadeIn.cs b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModFadeIn.cs
index c425bb05c766..f403d673777e 100644
--- a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModFadeIn.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModFadeIn.cs
@@ -74,7 +74,7 @@ public void TestNoCoverageDuringBreak()
             CreateModTest(new ModTestData
             {
                 Mod = new ManiaModHidden(),
-                Beatmap = () => new Beatmap
+                CreateBeatmap = () => new Beatmap
                 {
                     HitObjects = Enumerable.Range(1, 100).Select(i => (HitObject)new Note { StartTime = 1000 + 200 * i }).ToList(),
                     Breaks = { new BreakPeriod(2000, 28000) }
diff --git a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModHidden.cs b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModHidden.cs
index 98cceefaf579..e7e1cf3c7c6a 100644
--- a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModHidden.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModHidden.cs
@@ -74,7 +74,7 @@ public void TestNoCoverageDuringBreak()
             CreateModTest(new ModTestData
             {
                 Mod = new ManiaModHidden(),
-                Beatmap = () => new Beatmap
+                CreateBeatmap = () => new Beatmap
                 {
                     HitObjects = Enumerable.Range(1, 100).Select(i => (HitObject)new Note { StartTime = 1000 + 200 * i }).ToList(),
                     Breaks = { new BreakPeriod(2000, 28000) }
diff --git a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModPerfect.cs b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModPerfect.cs
index 7e2a0a4dd7c9..b7a9b31dcc75 100644
--- a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModPerfect.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModPerfect.cs
@@ -36,7 +36,7 @@ public void TestGreatHit() => CreateModTest(new ModTestData
             Mod = new ManiaModPerfect(),
             PassCondition = () => ((ModFailConditionTestPlayer)Player).CheckFailed(false),
             Autoplay = false,
-            Beatmap = () => new Beatmap
+            CreateBeatmap = () => new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
@@ -59,7 +59,7 @@ public void TestBreakOnHoldNote() => CreateModTest(new ModTestData
             Mod = new ManiaModPerfect(),
             PassCondition = () => ((ModFailConditionTestPlayer)Player).CheckFailed(true) && Player.Results.Count == 2,
             Autoplay = false,
-            Beatmap = () => new Beatmap
+            CreateBeatmap = () => new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
diff --git a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModSuddenDeath.cs b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModSuddenDeath.cs
index c22057883364..15c49ab0a066 100644
--- a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModSuddenDeath.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModSuddenDeath.cs
@@ -28,7 +28,7 @@ public void TestGreatHit() => CreateModTest(new ModTestData
             Mod = new ManiaModSuddenDeath(),
             PassCondition = () => ((ModFailConditionTestPlayer)Player).CheckFailed(false),
             Autoplay = false,
-            Beatmap = () => new Beatmap
+            CreateBeatmap = () => new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
@@ -51,7 +51,7 @@ public void TestBreakOnHoldNote() => CreateModTest(new ModTestData
             Mod = new ManiaModSuddenDeath(),
             PassCondition = () => ((ModFailConditionTestPlayer)Player).CheckFailed(true) && Player.Results.Count == 2,
             Autoplay = false,
-            Beatmap = () => new Beatmap
+            CreateBeatmap = () => new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAlternate.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAlternate.cs
index 2192184eefca..27ff26b43865 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAlternate.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAlternate.cs
@@ -23,7 +23,7 @@ public void TestInputAlternating() => CreateModTest(new ModTestData
             Mod = new OsuModAlternate(),
             PassCondition = () => Player.ScoreProcessor.Combo.Value == 4,
             Autoplay = false,
-            Beatmap = () => new Beatmap
+            CreateBeatmap = () => new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
@@ -68,7 +68,7 @@ public void TestInputSingular() => CreateModTest(new ModTestData
             Mod = new OsuModAlternate(),
             PassCondition = () => Player.ScoreProcessor.Combo.Value == 0 && Player.ScoreProcessor.HighestCombo.Value == 1,
             Autoplay = false,
-            Beatmap = () => new Beatmap
+            CreateBeatmap = () => new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
@@ -101,7 +101,7 @@ public void TestInputSingularAtIntro() => CreateModTest(new ModTestData
             Mod = new OsuModAlternate(),
             PassCondition = () => Player.ScoreProcessor.Combo.Value == 1,
             Autoplay = false,
-            Beatmap = () => new Beatmap
+            CreateBeatmap = () => new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
@@ -131,7 +131,7 @@ public void TestInputSingularWithBreak([Values] bool pressBeforeSecondObject) =>
             Mod = new OsuModAlternate(),
             PassCondition = () => Player.ScoreProcessor.Combo.Value == 0 && Player.ScoreProcessor.HighestCombo.Value == 2,
             Autoplay = false,
-            Beatmap = () => new Beatmap
+            CreateBeatmap = () => new Beatmap
             {
                 Breaks =
                 {
diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAutoplay.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAutoplay.cs
index 5baafb4f7963..8786b17b92c3 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAutoplay.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAutoplay.cs
@@ -60,7 +60,7 @@ public void TestPerfectScoreOnShortSliderWithRepeat(float pathLength)
             CreateModTest(new ModTestData
             {
                 Autoplay = true,
-                Beatmap = () => new Beatmap
+                CreateBeatmap = () => new Beatmap
                 {
                     HitObjects = new List<HitObject>
                     {
@@ -90,7 +90,7 @@ private void runSpmTest(Mod mod)
             {
                 Autoplay = true,
                 Mod = mod,
-                Beatmap = () => new Beatmap
+                CreateBeatmap = () => new Beatmap
                 {
                     HitObjects =
                     {
diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
index 0a97933df62f..ca752fe918a1 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
@@ -21,7 +21,7 @@ public partial class TestSceneOsuModDifficultyAdjust : OsuModTestScene
         public void TestNoAdjustment() => CreateModTest(new ModTestData
         {
             Mod = new OsuModDifficultyAdjust(),
-            Beatmap = () => new Beatmap
+            CreateBeatmap = () => new Beatmap
             {
                 BeatmapInfo = new BeatmapInfo
                 {
diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModFlashlight.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModFlashlight.cs
index e413606a3d50..6bd3f25bdbe6 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModFlashlight.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModFlashlight.cs
@@ -68,7 +68,7 @@ public void TestSliderDimsOnlyAfterStartTime()
                         Player.GameplayClockContainer.CurrentTime < 1000 && Player.ChildrenOfType<ModFlashlight<OsuHitObject>.Flashlight>().Single().FlashlightDim > 0;
                     return Player.GameplayState.HasPassed && !sliderDimmedBeforeStartTime;
                 },
-                Beatmap = () => new OsuBeatmap
+                CreateBeatmap = () => new OsuBeatmap
                 {
                     HitObjects = new List<OsuHitObject>
                     {
@@ -114,7 +114,7 @@ public void TestSliderDoesDimAfterStartTimeIfHitEarly()
                         Player.GameplayClockContainer.CurrentTime >= 1000 && Player.ChildrenOfType<ModFlashlight<OsuHitObject>.Flashlight>().Single().FlashlightDim > 0;
                     return Player.GameplayState.HasPassed && sliderDimmed;
                 },
-                Beatmap = () => new OsuBeatmap
+                CreateBeatmap = () => new OsuBeatmap
                 {
                     HitObjects = new List<OsuHitObject>
                     {
@@ -153,7 +153,7 @@ public void TestSliderDoesDimAfterStartTimeIfHitLate()
                         Player.GameplayClockContainer.CurrentTime >= 1000 && Player.ChildrenOfType<ModFlashlight<OsuHitObject>.Flashlight>().Single().FlashlightDim > 0;
                     return Player.GameplayState.HasPassed && sliderDimmed;
                 },
-                Beatmap = () => new OsuBeatmap
+                CreateBeatmap = () => new OsuBeatmap
                 {
                     HitObjects = new List<OsuHitObject>
                     {
diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModHidden.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModHidden.cs
index fec4a748d3ee..c513f98f211f 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModHidden.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModHidden.cs
@@ -28,7 +28,7 @@ public void FirstCircleAfterTwoSpinners() => CreateModTest(new ModTestData
         {
             Mod = new TestOsuModHidden(),
             Autoplay = true,
-            Beatmap = () => new Beatmap
+            CreateBeatmap = () => new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
@@ -63,7 +63,7 @@ public void FirstSliderAfterTwoSpinners() => CreateModTest(new ModTestData
         {
             Mod = new TestOsuModHidden(),
             Autoplay = true,
-            Beatmap = () => new Beatmap
+            CreateBeatmap = () => new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
@@ -98,7 +98,7 @@ public void TestWithSliderReuse() => CreateModTest(new ModTestData
         {
             Mod = new TestOsuModHidden(),
             Autoplay = true,
-            Beatmap = () => new Beatmap
+            CreateBeatmap = () => new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
@@ -122,7 +122,7 @@ public void TestApproachCirclesOnly() => CreateModTest(new ModTestData
         {
             Mod = new OsuModHidden { OnlyFadeApproachCircles = { Value = true } },
             Autoplay = true,
-            Beatmap = () => new Beatmap
+            CreateBeatmap = () => new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModMirror.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModMirror.cs
index c8e706141690..076cb9ae1556 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModMirror.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModMirror.cs
@@ -21,7 +21,7 @@ public partial class TestSceneOsuModMirror : OsuModTestScene
         public void TestCorrectReflections([Values] OsuModMirror.MirrorType type, [Values] bool withStrictTracking) => CreateModTest(new ModTestData
         {
             Autoplay = true,
-            Beatmap = () => new OsuBeatmap
+            CreateBeatmap = () => new OsuBeatmap
             {
                 HitObjects =
                 {
diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModNoScope.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModNoScope.cs
index d7922f8ba70b..b9559aeba357 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModNoScope.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModNoScope.cs
@@ -31,7 +31,7 @@ public void TestVisibleDuringBreak()
                 },
                 Autoplay = true,
                 PassCondition = () => true,
-                Beatmap = () => new Beatmap
+                CreateBeatmap = () => new Beatmap
                 {
                     HitObjects = new List<HitObject>
                     {
@@ -71,7 +71,7 @@ public void TestVisibleDuringSpinner()
                 },
                 Autoplay = true,
                 PassCondition = () => true,
-                Beatmap = () => new Beatmap
+                CreateBeatmap = () => new Beatmap
                 {
                     HitObjects = new List<HitObject>
                     {
@@ -113,7 +113,7 @@ public void TestVisibleAfterComboBreak()
                 },
                 Autoplay = true,
                 PassCondition = () => true,
-                Beatmap = () => new Beatmap
+                CreateBeatmap = () => new Beatmap
                 {
                     HitObjects = new List<HitObject>
                     {
diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModPerfect.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModPerfect.cs
index a9a94cfd724f..8498e53bf0d4 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModPerfect.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModPerfect.cs
@@ -61,7 +61,7 @@ public void TestMissSliderTail() => CreateModTest(new ModTestData
             Mod = new OsuModPerfect(),
             PassCondition = () => ((ModFailConditionTestPlayer)Player).CheckFailed(true),
             Autoplay = false,
-            Beatmap = () => new Beatmap
+            CreateBeatmap = () => new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModRandom.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModRandom.cs
index 81d753fd2d7b..3456fcbe845e 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModRandom.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModRandom.cs
@@ -36,7 +36,7 @@ public void TestJumpBeatmap(float angleSharpness) => CreateModTest(new ModTestDa
             {
                 AngleSharpness = { Value = angleSharpness }
             },
-            Beatmap = jumpBeatmap,
+            CreateBeatmap = jumpBeatmap,
             Autoplay = true,
             PassCondition = () => true
         });
@@ -50,7 +50,7 @@ public void TestStreamBeatmap(float angleSharpness) => CreateModTest(new ModTest
             {
                 AngleSharpness = { Value = angleSharpness }
             },
-            Beatmap = streamBeatmap,
+            CreateBeatmap = streamBeatmap,
             Autoplay = true,
             PassCondition = () => true
         });
diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSingleTap.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSingleTap.cs
index 3d553fa051ea..b0be70e85e63 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSingleTap.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSingleTap.cs
@@ -22,7 +22,7 @@ public void TestInputSingular() => CreateModTest(new ModTestData
             Mod = new OsuModSingleTap(),
             PassCondition = () => Player.ScoreProcessor.Combo.Value == 2,
             Autoplay = false,
-            Beatmap = () => new Beatmap
+            CreateBeatmap = () => new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
@@ -62,7 +62,7 @@ public void TestInputAlternating() => CreateModTest(new ModTestData
             Mod = new OsuModSingleTap(),
             PassCondition = () => Player.ScoreProcessor.Combo.Value == 0 && Player.ScoreProcessor.HighestCombo.Value == 1,
             Autoplay = false,
-            Beatmap = () => new Beatmap
+            CreateBeatmap = () => new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
@@ -100,7 +100,7 @@ public void TestInputAlternatingAtIntro() => CreateModTest(new ModTestData
             Mod = new OsuModSingleTap(),
             PassCondition = () => Player.ScoreProcessor.Combo.Value == 1,
             Autoplay = false,
-            Beatmap = () => new Beatmap
+            CreateBeatmap = () => new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
@@ -130,7 +130,7 @@ public void TestInputAlternatingWithBreak() => CreateModTest(new ModTestData
             Mod = new OsuModSingleTap(),
             PassCondition = () => Player.ScoreProcessor.Combo.Value == 0 && Player.ScoreProcessor.HighestCombo.Value == 2,
             Autoplay = false,
-            Beatmap = () => new Beatmap
+            CreateBeatmap = () => new Beatmap
             {
                 Breaks =
                 {
diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSpunOut.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSpunOut.cs
index ced69d59deaa..3706b9ac0758 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSpunOut.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSpunOut.cs
@@ -35,7 +35,7 @@ public void TestSpinnerAutoCompleted()
             {
                 Mod = new OsuModSpunOut(),
                 Autoplay = false,
-                Beatmap = singleSpinnerBeatmap,
+                CreateBeatmap = singleSpinnerBeatmap,
                 PassCondition = () =>
                 {
                     // Bind to the first spinner's results for further tracking.
@@ -71,7 +71,7 @@ public void TestSpinRateUnaffectedByMods(Type? additionalModType)
             {
                 Mods = mods,
                 Autoplay = false,
-                Beatmap = singleSpinnerBeatmap,
+                CreateBeatmap = singleSpinnerBeatmap,
                 PassCondition = () =>
                 {
                     var counter = Player.ChildrenOfType<SpinnerSpmCalculator>().SingleOrDefault();
@@ -101,7 +101,7 @@ public void TestSpinnerGetsNoBonusScore()
             {
                 Mod = new OsuModSpunOut(),
                 Autoplay = false,
-                Beatmap = singleSpinnerBeatmap,
+                CreateBeatmap = singleSpinnerBeatmap,
                 PassCondition = () =>
                 {
                     // Bind to the first spinner's results for further tracking.
diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModStrictTracking.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModStrictTracking.cs
index d295b3d891c9..66a60e354273 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModStrictTracking.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModStrictTracking.cs
@@ -20,7 +20,7 @@ public void TestSliderInput() => CreateModTest(new ModTestData
         {
             Mod = new OsuModStrictTracking(),
             Autoplay = false,
-            Beatmap = () => new Beatmap
+            CreateBeatmap = () => new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSuddenDeath.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSuddenDeath.cs
index 25edda34d433..688cf70f7122 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSuddenDeath.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSuddenDeath.cs
@@ -30,7 +30,7 @@ public void TestMissTail() => CreateModTest(new ModTestData
             Mod = new OsuModSuddenDeath(),
             PassCondition = () => ((ModFailConditionTestPlayer)Player).CheckFailed(false),
             Autoplay = false,
-            Beatmap = () => new Beatmap
+            CreateBeatmap = () => new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
@@ -55,7 +55,7 @@ public void TestMissTick() => CreateModTest(new ModTestData
             Mod = new OsuModSuddenDeath(),
             PassCondition = () => ((ModFailConditionTestPlayer)Player).CheckFailed(true),
             Autoplay = false,
-            Beatmap = () => new Beatmap
+            CreateBeatmap = () => new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneMissHitWindowJudgements.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneMissHitWindowJudgements.cs
index 5164d7d01b3c..7a89140fc4c6 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneMissHitWindowJudgements.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneMissHitWindowJudgements.cs
@@ -36,7 +36,7 @@ public void TestMissViaEarlyHit()
             {
                 Autoplay = false,
                 Mod = new TestAutoMod(),
-                Beatmap = () => new Beatmap
+                CreateBeatmap = () => new Beatmap
                 {
                     HitObjects = { new HitCircle { Position = new Vector2(256, 192) } }
                 },
@@ -53,7 +53,7 @@ public void TestMissViaNotHitting()
             CreateModTest(new ModTestData
             {
                 Autoplay = false,
-                Beatmap = () => new Beatmap
+                CreateBeatmap = () => new Beatmap
                 {
                     HitObjects = { new HitCircle { Position = new Vector2(256, 192) } }
                 },
diff --git a/osu.Game.Rulesets.Taiko.Tests/Mods/TestSceneTaikoModHidden.cs b/osu.Game.Rulesets.Taiko.Tests/Mods/TestSceneTaikoModHidden.cs
index cf199f062a5d..e6d5c51902a3 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Mods/TestSceneTaikoModHidden.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Mods/TestSceneTaikoModHidden.cs
@@ -36,7 +36,7 @@ public void TestHitTwoNotesWithinShortPeriod()
                 Mod = new TaikoModHidden(),
                 Autoplay = true,
                 PassCondition = checkAllMaxResultJudgements(2),
-                Beatmap = () =>
+                CreateBeatmap = () =>
                 {
                     var beatmap = new Beatmap<TaikoHitObject>
                     {
diff --git a/osu.Game.Rulesets.Taiko.Tests/Mods/TestSceneTaikoModRelax.cs b/osu.Game.Rulesets.Taiko.Tests/Mods/TestSceneTaikoModRelax.cs
index 6894a19a1f8e..fffe42f1f8b4 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Mods/TestSceneTaikoModRelax.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Mods/TestSceneTaikoModRelax.cs
@@ -28,7 +28,7 @@ public void TestRelax()
             CreateModTest(new ModTestData
             {
                 Mod = new TaikoModRelax(),
-                Beatmap = createBeatmap,
+                CreateBeatmap = createBeatmap,
                 ReplayFrames = replay.Frames,
                 Autoplay = false,
                 PassCondition = () => Player.ScoreProcessor.HasCompleted.Value && Player.ScoreProcessor.Accuracy.Value == 1,
diff --git a/osu.Game.Rulesets.Taiko.Tests/Mods/TestSceneTaikoModSingleTap.cs b/osu.Game.Rulesets.Taiko.Tests/Mods/TestSceneTaikoModSingleTap.cs
index 840bf78ffe60..b12ac10d2dde 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Mods/TestSceneTaikoModSingleTap.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Mods/TestSceneTaikoModSingleTap.cs
@@ -20,7 +20,7 @@ public void TestInputAlternate() => CreateModTest(new ModTestData
         {
             Mod = new TaikoModSingleTap(),
             Autoplay = false,
-            Beatmap = () => new Beatmap
+            CreateBeatmap = () => new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
@@ -65,7 +65,7 @@ public void TestInputSameKey() => CreateModTest(new ModTestData
         {
             Mod = new TaikoModSingleTap(),
             Autoplay = false,
-            Beatmap = () => new Beatmap
+            CreateBeatmap = () => new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
@@ -110,7 +110,7 @@ public void TestInputIntro() => CreateModTest(new ModTestData
         {
             Mod = new TaikoModSingleTap(),
             Autoplay = false,
-            Beatmap = () => new Beatmap
+            CreateBeatmap = () => new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
@@ -136,7 +136,7 @@ public void TestInputStrong() => CreateModTest(new ModTestData
         {
             Mod = new TaikoModSingleTap(),
             Autoplay = false,
-            Beatmap = () => new Beatmap
+            CreateBeatmap = () => new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
@@ -175,7 +175,7 @@ public void TestInputBreaks() => CreateModTest(new ModTestData
         {
             Mod = new TaikoModSingleTap(),
             Autoplay = false,
-            Beatmap = () => new Beatmap
+            CreateBeatmap = () => new Beatmap
             {
                 Breaks =
                 {
diff --git a/osu.Game.Tests/Visual/Mods/TestSceneModAccuracyChallenge.cs b/osu.Game.Tests/Visual/Mods/TestSceneModAccuracyChallenge.cs
index 7011303ccdfd..e1c15863ad25 100644
--- a/osu.Game.Tests/Visual/Mods/TestSceneModAccuracyChallenge.cs
+++ b/osu.Game.Tests/Visual/Mods/TestSceneModAccuracyChallenge.cs
@@ -35,7 +35,7 @@ public void TestMaximumAchievableAccuracy() =>
                     MinimumAccuracy = { Value = 0.6 }
                 },
                 Autoplay = false,
-                Beatmap = () => new Beatmap
+                CreateBeatmap = () => new Beatmap
                 {
                     HitObjects = Enumerable.Range(0, 5).Select(i => new HitCircle
                     {
@@ -56,7 +56,7 @@ public void TestStandardAccuracy() =>
                     AccuracyJudgeMode = { Value = ModAccuracyChallenge.AccuracyMode.Standard }
                 },
                 Autoplay = false,
-                Beatmap = () => new Beatmap
+                CreateBeatmap = () => new Beatmap
                 {
                     HitObjects = Enumerable.Range(0, 5).Select(i => new HitCircle
                     {
diff --git a/osu.Game/Tests/Visual/ModFailConditionTestScene.cs b/osu.Game/Tests/Visual/ModFailConditionTestScene.cs
index 364145160d1b..72bdd54c516d 100644
--- a/osu.Game/Tests/Visual/ModFailConditionTestScene.cs
+++ b/osu.Game/Tests/Visual/ModFailConditionTestScene.cs
@@ -20,7 +20,7 @@ protected ModFailConditionTestScene(ModFailCondition mod)
         protected void CreateHitObjectTest(HitObjectTestData testData, bool shouldMiss) => CreateModTest(new ModTestData
         {
             Mod = mod,
-            Beatmap = () => new Beatmap
+            CreateBeatmap = () => new Beatmap
             {
                 BeatmapInfo = { Ruleset = CreatePlayerRuleset().RulesetInfo },
                 HitObjects = { testData.HitObject }
diff --git a/osu.Game/Tests/Visual/ModTestScene.cs b/osu.Game/Tests/Visual/ModTestScene.cs
index 3265e5c257d5..eb61518d3555 100644
--- a/osu.Game/Tests/Visual/ModTestScene.cs
+++ b/osu.Game/Tests/Visual/ModTestScene.cs
@@ -40,7 +40,7 @@ public override void TearDownSteps()
             base.TearDownSteps();
         }
 
-        protected sealed override IBeatmap CreateBeatmap(RulesetInfo ruleset) => CurrentTestData?.Beatmap?.Invoke() ?? base.CreateBeatmap(ruleset);
+        protected sealed override IBeatmap CreateBeatmap(RulesetInfo ruleset) => CurrentTestData?.CreateBeatmap?.Invoke() ?? base.CreateBeatmap(ruleset);
 
         protected sealed override TestPlayer CreatePlayer(Ruleset ruleset)
         {
@@ -93,7 +93,7 @@ protected override void PrepareReplay()
         protected class ModTestData
         {
             /// <summary>
-            /// Whether to use a replay to simulate an auto-play. True by default.
+            /// Whether to use a replay to simulate an autoplay. True by default.
             /// </summary>
             public bool Autoplay = true;
 
@@ -104,10 +104,11 @@ protected class ModTestData
             public List<ReplayFrame> ReplayFrames;
 
             /// <summary>
-            /// The beatmap for this test case.
+            /// A function which should create a new instance of a beatmap containing relevant
+            /// content to the test.
             /// </summary>
             [CanBeNull]
-            public Func<IBeatmap> Beatmap;
+            public Func<IBeatmap> CreateBeatmap;
 
             /// <summary>
             /// The conditions that cause this test case to pass.