Resolve merge conflicts

osu.Desktop/Updater/SquirrelUpdateManager.cs

@@ -2,8 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.IO;
-using System.Reflection;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -169,23 +167,19 @@ namespace osu.Desktop.Updater
 
         private class SquirrelLogger : Splat.ILogger, IDisposable
         {
-            private readonly string path;
-            private readonly object locker = new object();
             public LogLevel Level { get; set; } = LogLevel.Info;
 
-            public SquirrelLogger()
-            {
-                var file = Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly()?.Location ?? Directory.GetCurrentDirectory()), "SquirrelSetupUpdater.log");
-                if (File.Exists(file)) File.Delete(file);
-                path = file;
-            }
+            private Logger logger;
 
             public void Write(string message, LogLevel logLevel)
             {
                 if (logLevel < Level)
                     return;
 
-                lock (locker) File.AppendAllText(path, message + "\r\n");
+                if (logger == null)
+                    logger = Logger.GetLogger("updater");
+
+                logger.Add(message);
             }
 
             public void Dispose()

osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs

@@ -13,9 +13,9 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Tests
 {
-    public class TestCaseAutoJuiceStream : PlayerTestCase
+    public class TestSceneAutoJuiceStream : PlayerTestScene
     {
-        public TestCaseAutoJuiceStream()
+        public TestSceneAutoJuiceStream()
             : base(new CatchRuleset())
         {
         }

osu.Game.Rulesets.Catch.Tests/TestSceneBananaShower.cs

@@ -13,7 +13,7 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Rulesets.Catch.Tests
 {
     [TestFixture]
-    public class TestCaseBananaShower : PlayerTestCase
+    public class TestSceneBananaShower : PlayerTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Catch.Tests
             typeof(DrawableCatchRuleset),
         };
 
-        public TestCaseBananaShower()
+        public TestSceneBananaShower()
             : base(new CatchRuleset())
         {
         }

osu.Game.Rulesets.Catch.Tests/TestSceneCatchPlayer.cs

@@ -7,9 +7,9 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Rulesets.Catch.Tests
 {
     [TestFixture]
-    public class TestCaseCatchPlayer : PlayerTestCase
+    public class TestSceneCatchPlayer : PlayerTestScene
     {
-        public TestCaseCatchPlayer()
+        public TestSceneCatchPlayer()
             : base(new CatchRuleset())
         {
         }

osu.Game.Rulesets.Catch.Tests/TestSceneCatchStacker.cs

@@ -9,9 +9,9 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Rulesets.Catch.Tests
 {
     [TestFixture]
-    public class TestCaseCatchStacker : PlayerTestCase
+    public class TestSceneCatchStacker : PlayerTestScene
     {
-        public TestCaseCatchStacker()
+        public TestSceneCatchStacker()
             : base(new CatchRuleset())
         {
         }

osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs

@@ -13,7 +13,7 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Rulesets.Catch.Tests
 {
     [TestFixture]
-    public class TestCaseCatcherArea : OsuTestCase
+    public class TestSceneCatcherArea : OsuTestScene
     {
         private RulesetInfo catchRuleset;
         private TestCatcherArea catcherArea;
@@ -23,7 +23,7 @@ namespace osu.Game.Rulesets.Catch.Tests
             typeof(CatcherArea),
         };
 
-        public TestCaseCatcherArea()
+        public TestSceneCatcherArea()
         {
             AddSliderStep<float>("CircleSize", 0, 8, 5, createCatcher);
             AddToggleStep("Hyperdash", t => catcherArea.ToggleHyperDash(t));

osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs

@@ -15,7 +15,7 @@ using osuTK;
 namespace osu.Game.Rulesets.Catch.Tests
 {
     [TestFixture]
-    public class TestCaseFruitObjects : OsuTestCase
+    public class TestSceneFruitObjects : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
@@ -29,7 +29,7 @@ namespace osu.Game.Rulesets.Catch.Tests
             typeof(Pulp),
         };
 
-        public TestCaseFruitObjects()
+        public TestSceneFruitObjects()
         {
             Add(new GridContainer
             {

osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs

@@ -10,9 +10,9 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Rulesets.Catch.Tests
 {
     [TestFixture]
-    public class TestCaseHyperDash : PlayerTestCase
+    public class TestSceneHyperDash : PlayerTestScene
     {
-        public TestCaseHyperDash()
+        public TestSceneHyperDash()
             : base(new CatchRuleset())
         {
         }

osu.Game.Rulesets.Mania.Tests/ManiaInputTestScene.cs

@@ -8,12 +8,12 @@ using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Mania.Tests
 {
-    public abstract class ManiaInputTestCase : OsuTestCase
+    public abstract class ManiaInputTestScene : OsuTestScene
     {
         private readonly Container<Drawable> content;
         protected override Container<Drawable> Content => content ?? base.Content;
 
-        protected ManiaInputTestCase(int keys)
+        protected ManiaInputTestScene(int keys)
         {
             base.Content.Add(content = new LocalInputManager(keys));
         }

osu.Game.Rulesets.Mania.Tests/ManiaPlacementBlueprintTestScene.cs

@@ -20,14 +20,14 @@ using osuTK.Graphics;
 namespace osu.Game.Rulesets.Mania.Tests
 {
     [Cached(Type = typeof(IManiaHitObjectComposer))]
-    public abstract class ManiaPlacementBlueprintTestCase : PlacementBlueprintTestCase, IManiaHitObjectComposer
+    public abstract class ManiaPlacementBlueprintTestScene : PlacementBlueprintTestScene, IManiaHitObjectComposer
     {
         private readonly Column column;
 
         [Cached(typeof(IReadOnlyList<Mod>))]
         private IReadOnlyList<Mod> mods { get; set; } = Array.Empty<Mod>();
 
-        protected ManiaPlacementBlueprintTestCase()
+        protected ManiaPlacementBlueprintTestScene()
         {
             Add(column = new Column(0)
             {

osu.Game.Rulesets.Mania.Tests/ManiaSelectionBlueprintTestScene.cs

@@ -13,14 +13,14 @@ using osuTK.Graphics;
 namespace osu.Game.Rulesets.Mania.Tests
 {
     [Cached(Type = typeof(IManiaHitObjectComposer))]
-    public abstract class ManiaSelectionBlueprintTestCase : SelectionBlueprintTestCase, IManiaHitObjectComposer
+    public abstract class ManiaSelectionBlueprintTestScene : SelectionBlueprintTestScene, IManiaHitObjectComposer
     {
         [Cached(Type = typeof(IAdjustableClock))]
         private readonly IAdjustableClock clock = new StopwatchClock();
 
         private readonly Column column;
 
-        protected ManiaSelectionBlueprintTestCase()
+        protected ManiaSelectionBlueprintTestScene()
         {
             Add(column = new Column(0)
             {

osu.Game.Rulesets.Mania.Tests/TestSceneAutoGeneration.cs

@@ -12,7 +12,7 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Rulesets.Mania.Tests
 {
     [TestFixture]
-    public class TestCaseAutoGeneration : OsuTestCase
+    public class TestSceneAutoGeneration : OsuTestScene
     {
         [Test]
         public void TestSingleNote()

osu.Game.Rulesets.Mania.Tests/TestSceneColumn.cs

@@ -22,7 +22,7 @@ using osuTK.Graphics;
 namespace osu.Game.Rulesets.Mania.Tests
 {
     [TestFixture]
-    public class TestCaseColumn : ManiaInputTestCase
+    public class TestSceneColumn : ManiaInputTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Mania.Tests
 
         private readonly List<Column> columns = new List<Column>();
 
-        public TestCaseColumn()
+        public TestSceneColumn()
             : base(2)
         {
         }

osu.Game.Rulesets.Mania.Tests/TestSceneEditor.cs

@@ -11,11 +11,11 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Rulesets.Mania.Tests
 {
     [TestFixture]
-    public class TestCaseEditor : EditorTestCase
+    public class TestSceneEditor : EditorTestScene
     {
         private readonly Bindable<ManiaScrollingDirection> direction = new Bindable<ManiaScrollingDirection>();
 
-        public TestCaseEditor()
+        public TestSceneEditor()
             : base(new ManiaRuleset())
         {
             AddStep("upwards scroll", () => direction.Value = ManiaScrollingDirection.Up);

osu.Game.Rulesets.Mania.Tests/TestSceneHoldNotePlacementBlueprint.cs

@@ -10,7 +10,7 @@ using osu.Game.Rulesets.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Mania.Tests
 {
-    public class TestCaseHoldNotePlacementBlueprint : ManiaPlacementBlueprintTestCase
+    public class TestSceneHoldNotePlacementBlueprint : ManiaPlacementBlueprintTestScene
     {
         protected override DrawableHitObject CreateHitObject(HitObject hitObject) => new DrawableHoldNote((HoldNote)hitObject);
         protected override PlacementBlueprint CreateBlueprint() => new HoldNotePlacementBlueprint();

osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteSelectionBlueprint.cs

@@ -15,14 +15,14 @@ using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Mania.Tests
 {
-    public class TestCaseHoldNoteSelectionBlueprint : ManiaSelectionBlueprintTestCase
+    public class TestSceneHoldNoteSelectionBlueprint : ManiaSelectionBlueprintTestScene
     {
         private readonly DrawableHoldNote drawableObject;
 
         protected override Container<Drawable> Content => content ?? base.Content;
         private readonly Container content;
 
-        public TestCaseHoldNoteSelectionBlueprint()
+        public TestSceneHoldNoteSelectionBlueprint()
         {
             var holdNote = new HoldNote { Column = 0, Duration = 1000 };
             holdNote.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());

osu.Game.Rulesets.Mania.Tests/TestSceneNotePlacementBlueprint.cs

@@ -10,7 +10,7 @@ using osu.Game.Rulesets.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Mania.Tests
 {
-    public class TestCaseNotePlacementBlueprint : ManiaPlacementBlueprintTestCase
+    public class TestSceneNotePlacementBlueprint : ManiaPlacementBlueprintTestScene
     {
         protected override DrawableHitObject CreateHitObject(HitObject hitObject) => new DrawableNote((Note)hitObject);
         protected override PlacementBlueprint CreateBlueprint() => new NotePlacementBlueprint();

osu.Game.Rulesets.Mania.Tests/TestSceneNoteSelectionBlueprint.cs

@@ -15,14 +15,14 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Mania.Tests
 {
-    public class TestCaseNoteSelectionBlueprint : ManiaSelectionBlueprintTestCase
+    public class TestSceneNoteSelectionBlueprint : ManiaSelectionBlueprintTestScene
     {
         private readonly DrawableNote drawableObject;
 
         protected override Container<Drawable> Content => content ?? base.Content;
         private readonly Container content;
 
-        public TestCaseNoteSelectionBlueprint()
+        public TestSceneNoteSelectionBlueprint()
         {
             var note = new Note { Column = 0 };
             note.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());

osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs

@@ -27,7 +27,7 @@ using osuTK.Graphics;
 namespace osu.Game.Rulesets.Mania.Tests
 {
     [TestFixture]
-    public class TestCaseNotes : OsuTestCase
+    public class TestSceneNotes : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {

osu.Game.Rulesets.Mania.Tests/TestSceneStage.cs

@@ -22,7 +22,7 @@ using osuTK;
 namespace osu.Game.Rulesets.Mania.Tests
 {
     [TestFixture]
-    public class TestCaseStage : ManiaInputTestCase
+    public class TestSceneStage : ManiaInputTestScene
     {
         private const int columns = 4;
 
@@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Mania.Tests
 
         private FillFlowContainer<ScrollingTestContainer> fill;
 
-        public TestCaseStage()
+        public TestSceneStage()
             : base(columns)
         {
         }

osu.Game.Rulesets.Osu.Tests/TestSceneEditor.cs

@@ -7,9 +7,9 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Rulesets.Osu.Tests
 {
     [TestFixture]
-    public class TestCaseEditor : EditorTestCase
+    public class TestSceneEditor : EditorTestScene
     {
-        public TestCaseEditor()
+        public TestSceneEditor()
             : base(new OsuRuleset())
         {
         }

osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs

@@ -15,7 +15,7 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Rulesets.Osu.Tests
 {
     [TestFixture]
-    public class TestCaseGameplayCursor : OsuTestCase, IProvideCursor
+    public class TestSceneGameplayCursor : OsuTestScene, IProvideCursor
     {
         private GameplayCursorContainer cursorContainer;
 

osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs

@@ -19,7 +19,7 @@ using osu.Game.Rulesets.Scoring;
 namespace osu.Game.Rulesets.Osu.Tests
 {
     [TestFixture]
-    public class TestCaseHitCircle : OsuTestCase
+    public class TestSceneHitCircle : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private int depthIndex;
 
-        public TestCaseHitCircle()
+        public TestSceneHitCircle()
         {
             base.Content.Add(content = new OsuInputManager(new RulesetInfo { ID = 0 }));
 

osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleHidden.cs

@@ -10,11 +10,11 @@ using osu.Game.Rulesets.Osu.Mods;
 namespace osu.Game.Rulesets.Osu.Tests
 {
     [TestFixture]
-    public class TestCaseHitCircleHidden : TestCaseHitCircle
+    public class TestSceneHitCircleHidden : TestSceneHitCircle
     {
         public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Concat(new[] { typeof(OsuModHidden) }).ToList();
 
-        public TestCaseHitCircleHidden()
+        public TestSceneHitCircleHidden()
         {
             Mods.Value = new[] { new OsuModHidden() };
         }

osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleLongCombo.cs

@@ -10,9 +10,9 @@ using osuTK;
 namespace osu.Game.Rulesets.Osu.Tests
 {
     [TestFixture]
-    public class TestCaseHitCircleLongCombo : PlayerTestCase
+    public class TestSceneHitCircleLongCombo : PlayerTestScene
     {
-        public TestCaseHitCircleLongCombo()
+        public TestSceneHitCircleLongCombo()
             : base(new OsuRuleset())
         {
         }

osu.Game.Rulesets.Osu.Tests/TestSceneHitCirclePlacementBlueprint.cs

@@ -11,7 +11,7 @@ using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
-    public class TestCaseHitCirclePlacementBlueprint : PlacementBlueprintTestCase
+    public class TestSceneHitCirclePlacementBlueprint : PlacementBlueprintTestScene
     {
         protected override DrawableHitObject CreateHitObject(HitObject hitObject) => new DrawableHitCircle((HitCircle)hitObject);
         protected override PlacementBlueprint CreateBlueprint() => new HitCirclePlacementBlueprint();

osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleSelectionBlueprint.cs

@@ -12,11 +12,11 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
-    public class TestCaseHitCircleSelectionBlueprint : SelectionBlueprintTestCase
+    public class TestSceneHitCircleSelectionBlueprint : SelectionBlueprintTestScene
     {
         private readonly DrawableHitCircle drawableObject;
 
-        public TestCaseHitCircleSelectionBlueprint()
+        public TestSceneHitCircleSelectionBlueprint()
         {
             var hitCircle = new HitCircle { Position = new Vector2(256, 192) };
             hitCircle.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty { CircleSize = 2 });

osu.Game.Rulesets.Osu.Tests/TestSceneOsuFlashlight.cs

@@ -7,7 +7,7 @@ using osu.Game.Screens.Play;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
-    public class TestCaseOsuFlashlight : TestCaseOsuPlayer
+    public class TestSceneOsuFlashlight : TestSceneOsuPlayer
     {
         protected override Player CreatePlayer(Ruleset ruleset)
         {

osu.Game.Rulesets.Osu.Tests/TestSceneOsuPlayer.cs

@@ -7,9 +7,9 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Rulesets.Osu.Tests
 {
     [TestFixture]
-    public class TestCaseOsuPlayer : PlayerTestCase
+    public class TestSceneOsuPlayer : PlayerTestScene
     {
-        public TestCaseOsuPlayer()
+        public TestSceneOsuPlayer()
             : base(new OsuRuleset())
         {
         }

osu.Game.Rulesets.Osu.Tests/TestSceneResumeOverlay.cs

@@ -12,14 +12,14 @@ using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
-    public class TestCaseResumeOverlay : ManualInputManagerTestCase
+    public class TestSceneResumeOverlay : ManualInputManagerTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
             typeof(OsuResumeOverlay),
         };
 
-        public TestCaseResumeOverlay()
+        public TestSceneResumeOverlay()
         {
             ManualOsuInputManager osuInputManager;
             CursorContainer cursor;

osu.Game.Rulesets.Osu.Tests/TestSceneShaking.cs

@@ -7,7 +7,7 @@ using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
-    public class TestCaseShaking : TestCaseHitCircle
+    public class TestSceneShaking : TestSceneHitCircle
     {
         public override void Add(Drawable drawable)
         {

osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs

@@ -27,7 +27,7 @@ using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
 namespace osu.Game.Rulesets.Osu.Tests
 {
     [TestFixture]
-    public class TestCaseSlider : OsuTestCase
+    public class TestSceneSlider : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
@@ -45,7 +45,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private int depthIndex;
 
-        public TestCaseSlider()
+        public TestSceneSlider()
         {
             base.Content.Add(content = new OsuInputManager(new RulesetInfo { ID = 0 }));
 

osu.Game.Rulesets.Osu.Tests/TestSceneSliderHidden.cs

@@ -10,11 +10,11 @@ using osu.Game.Rulesets.Osu.Mods;
 namespace osu.Game.Rulesets.Osu.Tests
 {
     [TestFixture]
-    public class TestCaseSliderHidden : TestCaseSlider
+    public class TestSceneSliderHidden : TestSceneSlider
     {
         public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Concat(new[] { typeof(OsuModHidden) }).ToList();
 
-        public TestCaseSliderHidden()
+        public TestSceneSliderHidden()
         {
             Mods.Value = new[] { new OsuModHidden() };
         }

osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs

@@ -26,7 +26,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
-    public class TestCaseSliderInput : RateAdjustedBeatmapTestCase
+    public class TestSceneSliderInput : RateAdjustedBeatmapTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {

osu.Game.Rulesets.Osu.Tests/TestSceneSliderPlacementBlueprint.cs

@@ -11,7 +11,7 @@ using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
-    public class TestCaseSliderPlacementBlueprint : PlacementBlueprintTestCase
+    public class TestSceneSliderPlacementBlueprint : PlacementBlueprintTestScene
     {
         protected override DrawableHitObject CreateHitObject(HitObject hitObject) => new DrawableSlider((Slider)hitObject);
         protected override PlacementBlueprint CreateBlueprint() => new SliderPlacementBlueprint();

osu.Game.Rulesets.Osu.Tests/TestSceneSliderSelectionBlueprint.cs

@@ -17,7 +17,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
-    public class TestCaseSliderSelectionBlueprint : SelectionBlueprintTestCase
+    public class TestSceneSliderSelectionBlueprint : SelectionBlueprintTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private readonly DrawableSlider drawableObject;
 
-        public TestCaseSliderSelectionBlueprint()
+        public TestSceneSliderSelectionBlueprint()
         {
             var slider = new Slider
             {

osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs

@@ -18,7 +18,7 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Rulesets.Osu.Tests
 {
     [TestFixture]
-    public class TestCaseSpinner : OsuTestCase
+    public class TestSceneSpinner : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
@@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private int depthIndex;
 
-        public TestCaseSpinner()
+        public TestSceneSpinner()
         {
             base.Content.Add(content = new OsuInputManager(new RulesetInfo { ID = 0 }));
 

osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerHidden.cs

@@ -10,11 +10,11 @@ using osu.Game.Rulesets.Osu.Mods;
 namespace osu.Game.Rulesets.Osu.Tests
 {
     [TestFixture]
-    public class TestCaseSpinnerHidden : TestCaseSpinner
+    public class TestSceneSpinnerHidden : TestSceneSpinner
     {
         public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Concat(new[] { typeof(OsuModHidden) }).ToList();
 
-        public TestCaseSpinnerHidden()
+        public TestSceneSpinnerHidden()
         {
             Mods.Value = new[] { new OsuModHidden() };
         }

osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerPlacementBlueprint.cs

@@ -11,7 +11,7 @@ using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
-    public class TestCaseSpinnerPlacementBlueprint : PlacementBlueprintTestCase
+    public class TestSceneSpinnerPlacementBlueprint : PlacementBlueprintTestScene
     {
         protected override DrawableHitObject CreateHitObject(HitObject hitObject) => new DrawableSpinner((Spinner)hitObject);
 

osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerSelectionBlueprint.cs

@@ -17,7 +17,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
-    public class TestCaseSpinnerSelectionBlueprint : SelectionBlueprintTestCase
+    public class TestSceneSpinnerSelectionBlueprint : SelectionBlueprintTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
@@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private readonly DrawableSpinner drawableSpinner;
 
-        public TestCaseSpinnerSelectionBlueprint()
+        public TestSceneSpinnerSelectionBlueprint()
         {
             var spinner = new Spinner
             {

osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs

@@ -63,8 +63,10 @@ namespace osu.Game.Rulesets.Osu.UI
         {
             get
             {
-                var first = (OsuHitObject)Objects.First();
-                return first.StartTime - Math.Max(2000, first.TimePreempt);
+                if (Objects.FirstOrDefault() is OsuHitObject first)
+                    return first.StartTime - Math.Max(2000, first.TimePreempt);
+
+                return 0;
             }
         }
     }

osu.Game.Rulesets.Taiko.Tests/TestSceneInputDrum.cs

@@ -16,7 +16,7 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Rulesets.Taiko.Tests
 {
     [TestFixture]
-    public class TestCaseInputDrum : OsuTestCase
+    public class TestSceneInputDrum : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
             typeof(SampleControlPoint)
         };
 
-        public TestCaseInputDrum()
+        public TestSceneInputDrum()
         {
             Add(new TaikoInputManager(new RulesetInfo { ID = 1 })
             {

osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoPlayfield.cs

@@ -26,7 +26,7 @@ using osu.Game.Rulesets.Scoring;
 namespace osu.Game.Rulesets.Taiko.Tests
 {
     [TestFixture]
-    public class TestCaseTaikoPlayfield : OsuTestCase
+    public class TestSceneTaikoPlayfield : OsuTestScene
     {
         private const double default_duration = 1000;
         private const float scroll_time = 1000;

osu.Game.Tests/Chat/MessageFormatterTests.cs

@@ -65,7 +65,7 @@ namespace osu.Game.Tests.Chat
         }
 
         [Test]
-        public void TestCaseInsensitiveLinks()
+        public void TestInsensitiveLinks()
         {
             Message result = MessageFormatter.FormatMessage(new Message { Content = "look: http://puu.sh/7Ggh8xcC6/asf0asd9876.NEF" });
 

osu.Game.Tests/Visual/Background/TestSceneBackgroundScreenBeatmap.cs

@@ -35,7 +35,7 @@ using osuTK.Graphics;
 namespace osu.Game.Tests.Visual.Background
 {
     [TestFixture]
-    public class TestCaseBackgroundScreenBeatmap : ManualInputManagerTestCase
+    public class TestSceneBackgroundScreenBeatmap : ManualInputManagerTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {

osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs

@@ -12,14 +12,14 @@ using osuTK.Graphics;
 namespace osu.Game.Tests.Visual.Components
 {
     [TestFixture]
-    public class TestCaseIdleTracker : ManualInputManagerTestCase
+    public class TestSceneIdleTracker : ManualInputManagerTestScene
     {
         private readonly IdleTrackingBox box1;
         private readonly IdleTrackingBox box2;
         private readonly IdleTrackingBox box3;
         private readonly IdleTrackingBox box4;
 
-        public TestCaseIdleTracker()
+        public TestSceneIdleTracker()
         {
             Children = new Drawable[]
             {

osu.Game.Tests/Visual/Components/TestScenePollingComponent.cs

@@ -15,7 +15,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Tests.Visual.Components
 {
-    public class TestCasePollingComponent : OsuTestCase
+    public class TestScenePollingComponent : OsuTestScene
     {
         private Container pollBox;
         private TestPoller poller;

osu.Game.Tests/Visual/Components/TestScenePreviewTrackManager.cs

@@ -10,7 +10,7 @@ using osu.Game.Beatmaps;
 
 namespace osu.Game.Tests.Visual.Components
 {
-    public class TestCasePreviewTrackManager : OsuTestCase, IPreviewTrackOwner
+    public class TestScenePreviewTrackManager : OsuTestScene, IPreviewTrackOwner
     {
         private readonly PreviewTrackManager trackManager = new TestPreviewTrackManager();
 

osu.Game.Tests/Visual/Editor/TestSceneBeatDivisorControl.cs

@@ -11,7 +11,7 @@ using osuTK;
 
 namespace osu.Game.Tests.Visual.Editor
 {
-    public class TestCaseBeatDivisorControl : OsuTestCase
+    public class TestSceneBeatDivisorControl : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(BindableBeatDivisor) };
 

osu.Game.Tests/Visual/Editor/TestSceneEditorCompose.cs

@@ -12,7 +12,7 @@ using osu.Game.Tests.Beatmaps;
 namespace osu.Game.Tests.Visual.Editor
 {
     [TestFixture]
-    public class TestCaseEditorCompose : EditorClockTestCase
+    public class TestSceneEditorCompose : EditorClockTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(ComposeScreen) };
 

osu.Game.Tests/Visual/Editor/TestSceneEditorComposeRadioButtons.cs

@@ -10,11 +10,11 @@ using osu.Game.Screens.Edit.Components.RadioButtons;
 namespace osu.Game.Tests.Visual.Editor
 {
     [TestFixture]
-    public class TestCaseEditorComposeRadioButtons : OsuTestCase
+    public class TestSceneEditorComposeRadioButtons : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(DrawableRadioButton) };
 
-        public TestCaseEditorComposeRadioButtons()
+        public TestSceneEditorComposeRadioButtons()
         {
             RadioButtonCollection collection;
             Add(collection = new RadioButtonCollection

osu.Game.Tests/Visual/Editor/TestSceneEditorComposeTimeline.cs

@@ -19,7 +19,7 @@ using osuTK.Graphics;
 namespace osu.Game.Tests.Visual.Editor
 {
     [TestFixture]
-    public class TestCaseEditorComposeTimeline : EditorClockTestCase
+    public class TestSceneEditorComposeTimeline : EditorClockTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {

osu.Game.Tests/Visual/Editor/TestSceneEditorMenuBar.cs

@@ -13,11 +13,11 @@ using osu.Game.Screens.Edit.Components.Menus;
 namespace osu.Game.Tests.Visual.Editor
 {
     [TestFixture]
-    public class TestCaseEditorMenuBar : OsuTestCase
+    public class TestSceneEditorMenuBar : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(EditorMenuBar), typeof(ScreenSelectionTabControl) };
 
-        public TestCaseEditorMenuBar()
+        public TestSceneEditorMenuBar()
         {
             Add(new Container
             {

osu.Game.Tests/Visual/Editor/TestSceneEditorSeekSnapping.cs

@@ -17,9 +17,9 @@ using osuTK.Graphics;
 namespace osu.Game.Tests.Visual.Editor
 {
     [TestFixture]
-    public class TestCaseEditorSeekSnapping : EditorClockTestCase
+    public class TestSceneEditorSeekSnapping : EditorClockTestScene
     {
-        public TestCaseEditorSeekSnapping()
+        public TestSceneEditorSeekSnapping()
         {
             BeatDivisor.Value = 4;
         }

osu.Game.Tests/Visual/Editor/TestSceneEditorSummaryTimeline.cs

@@ -14,7 +14,7 @@ using osuTK;
 namespace osu.Game.Tests.Visual.Editor
 {
     [TestFixture]
-    public class TestCaseEditorSummaryTimeline : EditorClockTestCase
+    public class TestSceneEditorSummaryTimeline : EditorClockTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(SummaryTimeline) };
 

osu.Game.Tests/Visual/Editor/TestSceneHitObjectComposer.cs

@@ -25,7 +25,7 @@ namespace osu.Game.Tests.Visual.Editor
 {
     [TestFixture]
     [Cached(Type = typeof(IPlacementHandler))]
-    public class TestCaseHitObjectComposer : OsuTestCase, IPlacementHandler
+    public class TestSceneHitObjectComposer : OsuTestScene, IPlacementHandler
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {

osu.Game.Tests/Visual/Editor/TestScenePlaybackControl.cs

@@ -13,7 +13,7 @@ using osuTK;
 namespace osu.Game.Tests.Visual.Editor
 {
     [TestFixture]
-    public class TestCasePlaybackControl : OsuTestCase
+    public class TestScenePlaybackControl : OsuTestScene
     {
         [BackgroundDependencyLoader]
         private void load()

osu.Game.Tests/Visual/Editor/TestSceneWaveContainer.cs

@@ -15,7 +15,7 @@ using osuTK.Graphics;
 namespace osu.Game.Tests.Visual.Editor
 {
     [TestFixture]
-    public class TestCaseWaveContainer : OsuTestCase
+    public class TestSceneWaveContainer : OsuTestScene
     {
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)

osu.Game.Tests/Visual/Editor/TestSceneWaveform.cs

@@ -15,7 +15,7 @@ using osuTK.Graphics;
 namespace osu.Game.Tests.Visual.Editor
 {
     [TestFixture]
-    public class TestCaseWaveform : OsuTestCase
+    public class TestSceneWaveform : OsuTestScene
     {
         private WorkingBeatmap waveformBeatmap;
 

osu.Game.Tests/Visual/Editor/TestSceneZoomableScrollContainer.cs

@@ -17,7 +17,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Tests.Visual.Editor
 {
-    public class TestCaseZoomableScrollContainer : ManualInputManagerTestCase
+    public class TestSceneZoomableScrollContainer : ManualInputManagerTestScene
     {
         private ZoomableScrollContainer scrollContainer;
         private Drawable innerBox;

osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs

@@ -10,7 +10,7 @@ using osu.Game.Screens.Play;
 namespace osu.Game.Tests.Visual.Gameplay
 {
     [Description("Player instantiated with an autoplay mod.")]
-    public class TestCaseAutoplay : AllPlayersTestCase
+    public class TestSceneAutoplay : AllPlayersTestScene
     {
         protected override Player CreatePlayer(Ruleset ruleset)
         {

osu.Game.Tests/Visual/Gameplay/TestSceneBreakOverlay.cs

@@ -9,11 +9,11 @@ using osu.Game.Screens.Play;
 namespace osu.Game.Tests.Visual.Gameplay
 {
     [TestFixture]
-    public class TestCaseBreakOverlay : OsuTestCase
+    public class TestSceneBreakOverlay : OsuTestScene
     {
         private readonly BreakOverlay breakOverlay;
 
-        public TestCaseBreakOverlay()
+        public TestSceneBreakOverlay()
         {
             Child = breakOverlay = new BreakOverlay(true);
 

osu.Game.Tests/Visual/Gameplay/TestSceneFrameStabilityContainer.cs

@@ -10,7 +10,7 @@ using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
-    public class TestCaseFrameStabilityContainer : OsuTestCase
+    public class TestSceneFrameStabilityContainer : OsuTestScene
     {
         private readonly ManualClock manualClock;
 
@@ -18,7 +18,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private ClockConsumingChild consumer;
 
-        public TestCaseFrameStabilityContainer()
+        public TestSceneFrameStabilityContainer()
         {
             Child = mainContainer = new Container
             {

osu.Game.Tests/Visual/Gameplay/TestSceneGameplayMenuOverlay.cs

@@ -17,7 +17,7 @@ using osuTK.Input;
 namespace osu.Game.Tests.Visual.Gameplay
 {
     [Description("player pause/fail screens")]
-    public class TestCaseGameplayMenuOverlay : ManualInputManagerTestCase
+    public class TestSceneGameplayMenuOverlay : ManualInputManagerTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(FailOverlay), typeof(PauseOverlay) };
 

osu.Game.Tests/Visual/Gameplay/TestSceneHoldForMenuButton.cs

@@ -13,7 +13,7 @@ using osuTK.Input;
 namespace osu.Game.Tests.Visual.Gameplay
 {
     [Description("'Hold to Quit' UI element")]
-    public class TestCaseHoldForMenuButton : ManualInputManagerTestCase
+    public class TestSceneHoldForMenuButton : ManualInputManagerTestScene
     {
         private bool exitAction;
 

osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs

@@ -14,7 +14,7 @@ using osuTK.Input;
 namespace osu.Game.Tests.Visual.Gameplay
 {
     [TestFixture]
-    public class TestCaseKeyCounter : ManualInputManagerTestCase
+    public class TestSceneKeyCounter : ManualInputManagerTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
@@ -23,7 +23,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             typeof(KeyCounterDisplay)
         };
 
-        public TestCaseKeyCounter()
+        public TestSceneKeyCounter()
         {
             KeyCounterKeyboard rewindTestKeyCounterKeyboard;
             KeyCounterDisplay kc = new KeyCounterDisplay

osu.Game.Tests/Visual/Gameplay/TestSceneMedalOverlay.cs

@@ -11,7 +11,7 @@ using osu.Game.Users;
 namespace osu.Game.Tests.Visual.Gameplay
 {
     [TestFixture]
-    public class TestCaseMedalOverlay : OsuTestCase
+    public class TestSceneMedalOverlay : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
@@ -19,7 +19,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             typeof(DrawableMedal),
         };
 
-        public TestCaseMedalOverlay()
+        public TestSceneMedalOverlay()
         {
             AddStep(@"display", () =>
             {

osu.Game.Tests/Visual/Gameplay/TestScenePause.cs

@@ -18,7 +18,7 @@ using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
-    public class TestCasePause : PlayerTestCase
+    public class TestScenePause : PlayerTestScene
     {
         protected new PausePlayer Player => (PausePlayer)base.Player;
 
@@ -26,7 +26,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         protected override Container<Drawable> Content => content;
 
-        public TestCasePause()
+        public TestScenePause()
             : base(new OsuRuleset())
         {
             base.Content.Add(content = new MenuCursorContainer { RelativeSizeAxes = Axes.Both });

osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs

@@ -20,7 +20,7 @@ using osu.Game.Tests.Beatmaps;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
-    public class TestCasePlayerLoader : ManualInputManagerTestCase
+    public class TestScenePlayerLoader : ManualInputManagerTestScene
     {
         private PlayerLoader loader;
         private OsuScreenStack stack;

osu.Game.Tests/Visual/Gameplay/TestScenePlayerReferenceLeaking.cs

@@ -10,7 +10,7 @@ using osu.Game.Screens.Play;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
-    public class TestCasePlayerReferenceLeaking : AllPlayersTestCase
+    public class TestScenePlayerReferenceLeaking : AllPlayersTestScene
     {
         private readonly WeakList<WorkingBeatmap> workingWeakReferences = new WeakList<WorkingBeatmap>();
 

osu.Game.Tests/Visual/Gameplay/TestSceneReplay.cs

@@ -13,7 +13,7 @@ using osu.Game.Screens.Play;
 namespace osu.Game.Tests.Visual.Gameplay
 {
     [Description("Player instantiated with a replay.")]
-    public class TestCaseReplay : AllPlayersTestCase
+    public class TestSceneReplay : AllPlayersTestScene
     {
         protected override Player CreatePlayer(Ruleset ruleset)
         {

osu.Game.Tests/Visual/Gameplay/TestSceneReplaySettingsOverlay.cs

@@ -10,9 +10,9 @@ using osu.Game.Screens.Play.PlayerSettings;
 namespace osu.Game.Tests.Visual.Gameplay
 {
     [TestFixture]
-    public class TestCaseReplaySettingsOverlay : OsuTestCase
+    public class TestSceneReplaySettingsOverlay : OsuTestScene
     {
-        public TestCaseReplaySettingsOverlay()
+        public TestSceneReplaySettingsOverlay()
         {
             ExampleContainer container;
 

osu.Game.Tests/Visual/Gameplay/TestSceneResults.cs

@@ -16,7 +16,7 @@ using osu.Game.Users;
 namespace osu.Game.Tests.Visual.Gameplay
 {
     [TestFixture]
-    public class TestCaseResults : ScreenTestCase
+    public class TestSceneResults : ScreenTestScene
     {
         private BeatmapManager beatmaps;
 

osu.Game.Tests/Visual/Gameplay/TestSceneScoreCounter.cs

@@ -12,9 +12,9 @@ using osuTK;
 namespace osu.Game.Tests.Visual.Gameplay
 {
     [TestFixture]
-    public class TestCaseScoreCounter : OsuTestCase
+    public class TestSceneScoreCounter : OsuTestScene
     {
-        public TestCaseScoreCounter()
+        public TestSceneScoreCounter()
         {
             int numerator = 0, denominator = 0;
 

osu.Game.Tests/Visual/Gameplay/TestSceneScrollingHitObjects.cs

@@ -21,7 +21,7 @@ using osuTK;
 namespace osu.Game.Tests.Visual.Gameplay
 {
     [TestFixture]
-    public class TestCaseScrollingHitObjects : OsuTestCase
+    public class TestSceneScrollingHitObjects : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(Playfield) };
 
@@ -31,7 +31,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         private readonly ScrollingTestContainer[] scrollContainers = new ScrollingTestContainer[4];
         private readonly TestPlayfield[] playfields = new TestPlayfield[4];
 
-        public TestCaseScrollingHitObjects()
+        public TestSceneScrollingHitObjects()
         {
             Add(new GridContainer
             {

osu.Game.Tests/Visual/Gameplay/TestSceneSkinReloadable.cs

@@ -15,7 +15,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
-    public class TestCaseSkinReloadable : OsuTestCase
+    public class TestSceneSkinReloadable : OsuTestScene
     {
         [Test]
         public void TestInitialLoad()

osu.Game.Tests/Visual/Gameplay/TestSceneSkipOverlay.cs

@@ -7,7 +7,7 @@ using osu.Game.Screens.Play;
 namespace osu.Game.Tests.Visual.Gameplay
 {
     [TestFixture]
-    public class TestCaseSkipOverlay : OsuTestCase
+    public class TestSceneSkipOverlay : OsuTestScene
     {
         protected override void LoadComplete()
         {

osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs

@@ -13,7 +13,7 @@ using osu.Game.Screens.Play;
 namespace osu.Game.Tests.Visual.Gameplay
 {
     [TestFixture]
-    public class TestCaseSongProgress : OsuTestCase
+    public class TestSceneSongProgress : OsuTestScene
     {
         private readonly SongProgress progress;
         private readonly TestSongProgressGraph graph;
@@ -25,7 +25,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private readonly FramedClock framedClock;
 
-        public TestCaseSongProgress()
+        public TestSceneSongProgress()
         {
             clock = new StopwatchClock(true);
 

osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs

@@ -16,12 +16,12 @@ using osuTK.Graphics;
 namespace osu.Game.Tests.Visual.Gameplay
 {
     [TestFixture]
-    public class TestCaseStoryboard : OsuTestCase
+    public class TestSceneStoryboard : OsuTestScene
     {
         private readonly Container<DrawableStoryboard> storyboardContainer;
         private DrawableStoryboard storyboard;
 
-        public TestCaseStoryboard()
+        public TestSceneStoryboard()
         {
             Clock = new FramedClock();
 

osu.Game.Tests/Visual/Menus/TestSceneDisclaimer.cs

@@ -8,7 +8,7 @@ using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Menus
 {
-    public class TestCaseDisclaimer : ScreenTestCase
+    public class TestSceneDisclaimer : ScreenTestScene
     {
         [Cached(typeof(IAPIProvider))]
         private readonly DummyAPIAccess api = new DummyAPIAccess();

osu.Game.Tests/Visual/Menus/TestSceneIntroSequence.cs

@@ -14,14 +14,14 @@ using osuTK.Graphics;
 namespace osu.Game.Tests.Visual.Menus
 {
     [TestFixture]
-    public class TestCaseIntroSequence : OsuTestCase
+    public class TestSceneIntroSequence : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
             typeof(OsuLogo),
         };
 
-        public TestCaseIntroSequence()
+        public TestSceneIntroSequence()
         {
             OsuLogo logo;
 

osu.Game.Tests/Visual/Menus/TestSceneLoaderAnimation.cs

@@ -14,14 +14,14 @@ using osuTK.Graphics;
 namespace osu.Game.Tests.Visual.Menus
 {
     [TestFixture]
-    public class TestCaseLoaderAnimation : ScreenTestCase
+    public class TestSceneLoaderAnimation : ScreenTestScene
     {
         private TestLoader loader;
 
         [Cached]
         private OsuLogo logo;
 
-        public TestCaseLoaderAnimation()
+        public TestSceneLoaderAnimation()
         {
             Child = logo = new OsuLogo
             {

osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs

@@ -11,7 +11,7 @@ using osu.Game.Overlays.Toolbar;
 namespace osu.Game.Tests.Visual.Menus
 {
     [TestFixture]
-    public class TestCaseToolbar : OsuTestCase
+    public class TestSceneToolbar : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
@@ -21,7 +21,7 @@ namespace osu.Game.Tests.Visual.Menus
             typeof(ToolbarNotificationButton),
         };
 
-        public TestCaseToolbar()
+        public TestSceneToolbar()
         {
             var toolbar = new Toolbar { State = Visibility.Visible };
             ToolbarNotificationButton notificationButton = null;

osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs

@@ -16,7 +16,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestCaseLoungeRoomsContainer : MultiplayerTestCase
+    public class TestSceneLoungeRoomsContainer : MultiplayerTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {

osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs

@@ -12,14 +12,14 @@ using osu.Game.Screens.Multi.Match.Components;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestCaseMatchHeader : MultiplayerTestCase
+    public class TestSceneMatchHeader : MultiplayerTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
             typeof(Header)
         };
 
-        public TestCaseMatchHeader()
+        public TestSceneMatchHeader()
         {
             Room.Playlist.Add(new PlaylistItem
             {

osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHostInfo.cs

@@ -10,7 +10,7 @@ using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestCaseMatchHostInfo : OsuTestCase
+    public class TestSceneMatchHostInfo : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
@@ -19,7 +19,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         private readonly Bindable<User> host = new Bindable<User>(new User { Username = "SomeHost" });
 
-        public TestCaseMatchHostInfo()
+        public TestSceneMatchHostInfo()
         {
             HostInfo hostInfo;
 

osu.Game.Tests/Visual/Multiplayer/TestSceneMatchInfo.cs

@@ -14,7 +14,7 @@ using osu.Game.Screens.Multi.Match.Components;
 namespace osu.Game.Tests.Visual.Multiplayer
 {
     [TestFixture]
-    public class TestCaseMatchInfo : MultiplayerTestCase
+    public class TestSceneMatchInfo : MultiplayerTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {

osu.Game.Tests/Visual/Multiplayer/TestSceneMatchLeaderboard.cs

@@ -12,9 +12,9 @@ using osuTK;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestCaseMatchLeaderboard : MultiplayerTestCase
+    public class TestSceneMatchLeaderboard : MultiplayerTestScene
     {
-        public TestCaseMatchLeaderboard()
+        public TestSceneMatchLeaderboard()
         {
             Room.RoomID.Value = 3;
 

osu.Game.Tests/Visual/Multiplayer/TestSceneMatchParticipants.cs

@@ -9,9 +9,9 @@ using osu.Game.Users;
 namespace osu.Game.Tests.Visual.Multiplayer
 {
     [TestFixture]
-    public class TestCaseMatchParticipants : MultiplayerTestCase
+    public class TestSceneMatchParticipants : MultiplayerTestScene
     {
-        public TestCaseMatchParticipants()
+        public TestSceneMatchParticipants()
         {
             Add(new Participants { RelativeSizeAxes = Axes.Both });
 

osu.Game.Tests/Visual/Multiplayer/TestSceneMatchResults.cs

@@ -18,7 +18,7 @@ using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestCaseMatchResults : MultiplayerTestCase
+    public class TestSceneMatchResults : MultiplayerTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {

osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs

@@ -17,7 +17,7 @@ using osu.Game.Screens.Multi.Match.Components;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestCaseMatchSettingsOverlay : MultiplayerTestCase
+    public class TestSceneMatchSettingsOverlay : MultiplayerTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {

osu.Game.Tests/Visual/Multiplayer/TestSceneMultiHeader.cs

@@ -10,9 +10,9 @@ using osu.Game.Screens.Multi;
 namespace osu.Game.Tests.Visual.Multiplayer
 {
     [TestFixture]
-    public class TestCaseMultiHeader : OsuTestCase
+    public class TestSceneMultiHeader : OsuTestScene
     {
-        public TestCaseMultiHeader()
+        public TestSceneMultiHeader()
         {
             int index = 0;
 

osu.Game.Tests/Visual/Multiplayer/TestSceneMultiScreen.cs

@@ -10,7 +10,7 @@ using osu.Game.Screens.Multi.Lounge.Components;
 namespace osu.Game.Tests.Visual.Multiplayer
 {
     [TestFixture]
-    public class TestCaseMultiScreen : ScreenTestCase
+    public class TestSceneMultiScreen : ScreenTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
@@ -19,7 +19,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             typeof(FilterControl)
         };
 
-        public TestCaseMultiScreen()
+        public TestSceneMultiScreen()
         {
             Screens.Multi.Multiplayer multi = new Screens.Multi.Multiplayer();
 

osu.Game.Tests/Visual/Multiplayer/TestSceneRoomStatus.cs

@@ -11,7 +11,7 @@ using osu.Game.Screens.Multi.Lounge.Components;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestCaseRoomStatus : OsuTestCase
+    public class TestSceneRoomStatus : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
@@ -20,7 +20,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             typeof(RoomStatusPlaying)
         };
 
-        public TestCaseRoomStatus()
+        public TestSceneRoomStatus()
         {
             Child = new FillFlowContainer
             {

osu.Game.Tests/Visual/Online/TestSceneAccountCreationOverlay.cs

@@ -13,7 +13,7 @@ using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Online
 {
-    public class TestCaseAccountCreationOverlay : OsuTestCase
+    public class TestSceneAccountCreationOverlay : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
@@ -28,7 +28,7 @@ namespace osu.Game.Tests.Visual.Online
         [Cached(typeof(IAPIProvider))]
         private DummyAPIAccess api = new DummyAPIAccess();
 
-        public TestCaseAccountCreationOverlay()
+        public TestSceneAccountCreationOverlay()
         {
             Container userPanelArea;
             AccountCreationOverlay accountCreation;

osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs

@@ -17,7 +17,7 @@ using System.Linq;
 namespace osu.Game.Tests.Visual.Online
 {
     [TestFixture]
-    public class TestCaseBeatmapSetOverlay : OsuTestCase
+    public class TestSceneBeatmapSetOverlay : OsuTestScene
     {
         private readonly BeatmapSetOverlay overlay;
 
@@ -41,7 +41,7 @@ namespace osu.Game.Tests.Visual.Online
             typeof(SuccessRate),
         };
 
-        public TestCaseBeatmapSetOverlay()
+        public TestSceneBeatmapSetOverlay()
         {
             Add(overlay = new BeatmapSetOverlay());
         }

osu.Game.Tests/Visual/Online/TestSceneChannelTabControl.cs

@@ -17,7 +17,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Tests.Visual.Online
 {
-    public class TestCaseChannelTabControl : OsuTestCase
+    public class TestSceneChannelTabControl : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
@@ -26,7 +26,7 @@ namespace osu.Game.Tests.Visual.Online
 
         private readonly ChannelTabControl channelTabControl;
 
-        public TestCaseChannelTabControl()
+        public TestSceneChannelTabControl()
         {
             SpriteText currentText;
             Add(new Container

osu.Game.Tests/Visual/Online/TestSceneChatDisplay.cs

@@ -15,7 +15,7 @@ using osu.Game.Overlays.Chat.Tabs;
 namespace osu.Game.Tests.Visual.Online
 {
     [Description("Testing chat api and overlay")]
-    public class TestCaseChatDisplay : OsuTestCase
+    public class TestSceneChatDisplay : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {

osu.Game.Tests/Visual/Online/TestSceneChatLink.cs

@@ -21,7 +21,7 @@ using osuTK.Graphics;
 namespace osu.Game.Tests.Visual.Online
 {
     [TestFixture]
-    public class TestCaseChatLink : OsuTestCase
+    public class TestSceneChatLink : OsuTestScene
     {
         private readonly TestChatLineContainer textContainer;
         private readonly DialogOverlay dialogOverlay;
@@ -37,7 +37,7 @@ namespace osu.Game.Tests.Visual.Online
             typeof(MessageFormatter)
         };
 
-        public TestCaseChatLink()
+        public TestSceneChatLink()
         {
             Add(dialogOverlay = new DialogOverlay { Depth = float.MinValue });
             Add(textContainer = new TestChatLineContainer

osu.Game.Tests/Visual/Online/TestSceneDirectOverlay.cs

@@ -11,7 +11,7 @@ using osu.Game.Rulesets;
 namespace osu.Game.Tests.Visual.Online
 {
     [TestFixture]
-    public class TestCaseDirectOverlay : OsuTestCase
+    public class TestSceneDirectOverlay : OsuTestScene
     {
         private DirectOverlay direct;
         private RulesetStore rulesets;