diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index bb9e83a21c..c3e485d56b 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -244,8 +244,12 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             const int total_set_count = 200;
 
-            for (int i = 0; i < total_set_count; i++)
-                sets.Add(TestResources.CreateTestBeatmapSetInfo());
+            AddStep("Populuate beatmap sets", () =>
+            {
+                sets.Clear();
+                for (int i = 0; i < total_set_count; i++)
+                    sets.Add(TestResources.CreateTestBeatmapSetInfo());
+            });
 
             loadBeatmaps(sets);
 
@@ -275,8 +279,12 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             const int total_set_count = 20;
 
-            for (int i = 0; i < total_set_count; i++)
-                sets.Add(TestResources.CreateTestBeatmapSetInfo(3));
+            AddStep("Populuate beatmap sets", () =>
+            {
+                sets.Clear();
+                for (int i = 0; i < total_set_count; i++)
+                    sets.Add(TestResources.CreateTestBeatmapSetInfo(3));
+            });
 
             loadBeatmaps(sets);
 
@@ -493,18 +501,23 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             const string zzz_string = "zzzzz";
 
-            for (int i = 0; i < 20; i++)
+            AddStep("Populuate beatmap sets", () =>
             {
-                var set = TestResources.CreateTestBeatmapSetInfo();
+                sets.Clear();
 
-                if (i == 4)
-                    set.Beatmaps.ForEach(b => b.Metadata.Artist = zzz_string);
+                for (int i = 0; i < 20; i++)
+                {
+                    var set = TestResources.CreateTestBeatmapSetInfo();
 
-                if (i == 16)
-                    set.Beatmaps.ForEach(b => b.Metadata.Author.Username = zzz_string);
+                    if (i == 4)
+                        set.Beatmaps.ForEach(b => b.Metadata.Artist = zzz_string);
 
-                sets.Add(set);
-            }
+                    if (i == 16)
+                        set.Beatmaps.ForEach(b => b.Metadata.Author.Username = zzz_string);
+
+                    sets.Add(set);
+                }
+            });
 
             loadBeatmaps(sets);
 
@@ -521,21 +534,27 @@ namespace osu.Game.Tests.Visual.SongSelect
         public void TestSortingStability()
         {
             var sets = new List<BeatmapSetInfo>();
+            int idOffset = 0;
 
-            for (int i = 0; i < 10; i++)
+            AddStep("Populuate beatmap sets", () =>
             {
-                var set = TestResources.CreateTestBeatmapSetInfo();
+                sets.Clear();
 
-                // only need to set the first as they are a shared reference.
-                var beatmap = set.Beatmaps.First();
+                for (int i = 0; i < 10; i++)
+                {
+                    var set = TestResources.CreateTestBeatmapSetInfo();
 
-                beatmap.Metadata.Artist = $"artist {i / 2}";
-                beatmap.Metadata.Title = $"title {9 - i}";
+                    // only need to set the first as they are a shared reference.
+                    var beatmap = set.Beatmaps.First();
 
-                sets.Add(set);
-            }
+                    beatmap.Metadata.Artist = $"artist {i / 2}";
+                    beatmap.Metadata.Title = $"title {9 - i}";
 
-            int idOffset = sets.First().OnlineID;
+                    sets.Add(set);
+                }
+
+                idOffset = sets.First().OnlineID;
+            });
 
             loadBeatmaps(sets);
 
@@ -556,26 +575,32 @@ namespace osu.Game.Tests.Visual.SongSelect
         public void TestSortingStabilityWithNewItems()
         {
             List<BeatmapSetInfo> sets = new List<BeatmapSetInfo>();
+            int idOffset = 0;
 
-            for (int i = 0; i < 3; i++)
+            AddStep("Populuate beatmap sets", () =>
             {
-                var set = TestResources.CreateTestBeatmapSetInfo(3);
+                sets.Clear();
 
-                // only need to set the first as they are a shared reference.
-                var beatmap = set.Beatmaps.First();
+                for (int i = 0; i < 3; i++)
+                {
+                    var set = TestResources.CreateTestBeatmapSetInfo(3);
 
-                beatmap.Metadata.Artist = "same artist";
-                beatmap.Metadata.Title = "same title";
+                    // only need to set the first as they are a shared reference.
+                    var beatmap = set.Beatmaps.First();
 
-                sets.Add(set);
-            }
+                    beatmap.Metadata.Artist = "same artist";
+                    beatmap.Metadata.Title = "same title";
 
-            int idOffset = sets.First().OnlineID;
+                    sets.Add(set);
+                }
+
+                idOffset = sets.First().OnlineID;
+            });
 
             loadBeatmaps(sets);
 
             AddStep("Sort by artist", () => carousel.Filter(new FilterCriteria { Sort = SortMode.Artist }, false));
-            AddAssert("Items remain in original order", () => carousel.BeatmapSets.Select((set, index) => set.OnlineID == idOffset + index).All(b => b));
+            assertOriginalOrderMaintained();
 
             AddStep("Add new item", () =>
             {
@@ -590,10 +615,16 @@ namespace osu.Game.Tests.Visual.SongSelect
                 carousel.UpdateBeatmapSet(set);
             });
 
-            AddAssert("Items remain in original order", () => carousel.BeatmapSets.Select((set, index) => set.OnlineID == idOffset + index).All(b => b));
+            assertOriginalOrderMaintained();
 
             AddStep("Sort by title", () => carousel.Filter(new FilterCriteria { Sort = SortMode.Title }, false));
-            AddAssert("Items remain in original order", () => carousel.BeatmapSets.Select((set, index) => set.OnlineID == idOffset + index).All(b => b));
+            assertOriginalOrderMaintained();
+
+            void assertOriginalOrderMaintained()
+            {
+                AddAssert("Items remain in original order",
+                    () => carousel.BeatmapSets.Select(s => s.OnlineID), () => Is.EqualTo(carousel.BeatmapSets.Select((set, index) => idOffset + index)));
+            }
         }
 
         [Test]
@@ -601,13 +632,18 @@ namespace osu.Game.Tests.Visual.SongSelect
         {
             List<BeatmapSetInfo> sets = new List<BeatmapSetInfo>();
 
-            for (int i = 0; i < 3; i++)
+            AddStep("Populuate beatmap sets", () =>
             {
-                var set = TestResources.CreateTestBeatmapSetInfo(3);
-                set.Beatmaps[0].StarRating = 3 - i;
-                set.Beatmaps[2].StarRating = 6 + i;
-                sets.Add(set);
-            }
+                sets.Clear();
+
+                for (int i = 0; i < 3; i++)
+                {
+                    var set = TestResources.CreateTestBeatmapSetInfo(3);
+                    set.Beatmaps[0].StarRating = 3 - i;
+                    set.Beatmaps[2].StarRating = 6 + i;
+                    sets.Add(set);
+                }
+            });
 
             loadBeatmaps(sets);
 
@@ -759,8 +795,13 @@ namespace osu.Game.Tests.Visual.SongSelect
         {
             List<BeatmapSetInfo> manySets = new List<BeatmapSetInfo>();
 
-            for (int i = 1; i <= 50; i++)
-                manySets.Add(TestResources.CreateTestBeatmapSetInfo(3));
+            AddStep("Populuate beatmap sets", () =>
+            {
+                manySets.Clear();
+
+                for (int i = 1; i <= 50; i++)
+                    manySets.Add(TestResources.CreateTestBeatmapSetInfo(3));
+            });
 
             loadBeatmaps(manySets);
 
@@ -791,6 +832,8 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddStep("populate maps", () =>
             {
+                manySets.Clear();
+
                 for (int i = 0; i < 10; i++)
                 {
                     manySets.Add(TestResources.CreateTestBeatmapSetInfo(3, new[]