diff --git a/osu.Game.Rulesets.Catch.Tests/CatchDifficultyCalculatorTest.cs b/osu.Game.Rulesets.Catch.Tests/CatchDifficultyCalculatorTest.cs
index 6a70173c4a..2a9c2cee64 100644
--- a/osu.Game.Rulesets.Catch.Tests/CatchDifficultyCalculatorTest.cs
+++ b/osu.Game.Rulesets.Catch.Tests/CatchDifficultyCalculatorTest.cs
@@ -14,11 +14,11 @@ namespace osu.Game.Rulesets.Catch.Tests
     {
         protected override string ResourceAssembly => "osu.Game.Rulesets.Catch.Tests";
 
-        [TestCase(4.0505463516206195d, 127, "diffcalc-test")]
+        [TestCase(4.039861734717169d, 127, "diffcalc-test")]
         public void Test(double expectedStarRating, int expectedMaxCombo, string name)
             => base.Test(expectedStarRating, expectedMaxCombo, name);
 
-        [TestCase(5.1696411260785498d, 127, "diffcalc-test")]
+        [TestCase(5.1527173897800873d, 127, "diffcalc-test")]
         public void TestClockRateAdjusted(double expectedStarRating, int expectedMaxCombo, string name)
             => Test(expectedStarRating, expectedMaxCombo, name, new CatchModDoubleTime());
 
diff --git a/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs b/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
index 94768c15a5..0d648ae2a0 100644
--- a/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
@@ -15,22 +15,22 @@ namespace osu.Game.Rulesets.Osu.Tests
     {
         protected override string ResourceAssembly => "osu.Game.Rulesets.Osu.Tests";
 
-        [TestCase(6.6232533278125061d, 239, "diffcalc-test")]
-        [TestCase(1.5045783545699611d, 54, "zero-length-sliders")]
-        [TestCase(0.43333836671191595d, 4, "very-fast-slider")]
-        [TestCase(0.13841532030395723d, 2, "nan-slider")]
+        [TestCase(6.5243170265483581d, 239, "diffcalc-test")]
+        [TestCase(1.3280410795791415d, 54, "zero-length-sliders")]
+        [TestCase(0.40867325147697559d, 4, "very-fast-slider")]
+        [TestCase(0.87058175794353554d, 6, "nan-slider")]
         public void Test(double expectedStarRating, int expectedMaxCombo, string name)
             => base.Test(expectedStarRating, expectedMaxCombo, name);
 
-        [TestCase(9.6491691624112761d, 239, "diffcalc-test")]
-        [TestCase(1.756936832498702d, 54, "zero-length-sliders")]
-        [TestCase(0.57771197086735004d, 4, "very-fast-slider")]
+        [TestCase(9.4677607900646308d, 239, "diffcalc-test")]
+        [TestCase(1.6856612715618886d, 54, "zero-length-sliders")]
+        [TestCase(0.53588473186572561d, 4, "very-fast-slider")]
         public void TestClockRateAdjusted(double expectedStarRating, int expectedMaxCombo, string name)
             => Test(expectedStarRating, expectedMaxCombo, name, new OsuModDoubleTime());
 
-        [TestCase(6.6232533278125061d, 239, "diffcalc-test")]
-        [TestCase(1.5045783545699611d, 54, "zero-length-sliders")]
-        [TestCase(0.43333836671191595d, 4, "very-fast-slider")]
+        [TestCase(6.5243170265483581d, 239, "diffcalc-test")]
+        [TestCase(1.3280410795791415d, 54, "zero-length-sliders")]
+        [TestCase(0.40867325147697559d, 4, "very-fast-slider")]
         public void TestClassicMod(double expectedStarRating, int expectedMaxCombo, string name)
             => Test(expectedStarRating, expectedMaxCombo, name, new OsuModClassic());
 
diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/nan-slider-expected-conversion.json b/osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/nan-slider-expected-conversion.json
index 86a4a278f1..1ce08dc130 100755
--- a/osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/nan-slider-expected-conversion.json
+++ b/osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/nan-slider-expected-conversion.json
@@ -1 +1 @@
-{"Mappings":[{"StartTime":77497.0,"Objects":[{"StartTime":77497.0,"EndTime":77497.0,"X":298.0,"Y":290.0},{"StartTime":77533.0,"EndTime":77533.0,"X":276.162567,"Y":293.0336}]}]}
\ No newline at end of file
+{"Mappings":[{"StartTime":76911.0,"Objects":[{"StartTime":76911.0,"EndTime":76911.0,"X":283.402,"Y":275.402}]},{"StartTime":77053.0,"Objects":[{"StartTime":77053.0,"EndTime":77053.0,"X":287.0515,"Y":279.0515}]},{"StartTime":77196.0,"Objects":[{"StartTime":77196.0,"EndTime":77196.0,"X":290.701019,"Y":282.701019}]},{"StartTime":77339.0,"Objects":[{"StartTime":77339.0,"EndTime":77339.0,"X":294.3505,"Y":286.3505}]},{"StartTime":77497.0,"Objects":[{"StartTime":77497.0,"EndTime":77497.0,"X":298.0,"Y":290.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":77533.0,"EndTime":77533.0,"X":276.162567,"Y":293.0336,"StackOffset":{"X":0.0,"Y":0.0}}]}]}
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/nan-slider.osu b/osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/nan-slider.osu
index fa545a7614..84200f9c4a 100755
--- a/osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/nan-slider.osu
+++ b/osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/nan-slider.osu
@@ -9,10 +9,15 @@ SliderMultiplier:2
 SliderTickRate:1
 
 [TimingPoints]
+76911,285.7142857142857,4,1,0,100,1,8
 77211,-100,4,3,50,70,0,0
 77497,8.40402703648439,4,3,51,70,1,8
 77497,NaN,4,3,51,70,0,8
 77498,285.714285714286,4,3,51,70,1,0
 
 [HitObjects]
+298,290,76911,5,0,1:0:0:0:
+298,290,77053,1,0,1:0:0:0:
+298,290,77196,1,0,1:0:0:0:
+298,290,77339,1,0,1:0:0:0:
 298,290,77497,6,0,B|234:298|192:279|192:279|180:299|180:299|205:311|238:318|238:318|230:347|217:371|217:371|137:370|80:340|80:340|65:259|73:143|102:68|102:68|149:49|199:34|199:34|213:54|213:54|267:38|324:40|324:40|332:18|332:18|385:20|435:27|435:27|480:93|517:204|521:286|521:286|474:329|396:350|396:350|377:329|363:302|363:302|393:287|415:271|415:271|398:254|398:254|362:282|299:290,1,1723.66345596313,10|0,1:0|3:0,3:0:0:0:
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorSaving.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorSaving.cs
index a50f1cca29..70b6a741fe 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorSaving.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorSaving.cs
@@ -145,7 +145,6 @@ namespace osu.Game.Tests.Visual.Editing
             AddStep("Get working beatmap", () => working = Game.BeatmapManager.GetWorkingBeatmap(EditorBeatmap.BeatmapInfo, true));
 
             AddAssert("Beatmap length is zero", () => working.BeatmapInfo.Length == 0);
-            checkDifficultyIncreased();
 
             AddStep("Move forward", () => InputManager.Key(Key.Right));
             AddStep("Place another hitcircle", () => InputManager.Click(MouseButton.Left));