diff --git a/Terminal.Gui/Views/ScrollView.cs b/Terminal.Gui/Views/ScrollView.cs
index 4a3790082..bc78a8ef7 100644
--- a/Terminal.Gui/Views/ScrollView.cs
+++ b/Terminal.Gui/Views/ScrollView.cs
@@ -383,9 +383,8 @@ namespace Terminal.Gui {
 				}
 			}
 
-			// Fill in the bottom left corner
-			// BUGBUG: ScrollBarView should be responsible for this via contentBottomRightCorner
-			// this is only true if this is hosted by the ScrollBarView and it isn't
+			// Fill in the bottom left corner. Note we don't rely on ScrollBarView.contentBottomRightCorner here
+			// because that only applies when ScrollBarView is hosted.
 			if (ShowVerticalScrollIndicator && ShowHorizontalScrollIndicator) {
 				AddRune (Bounds.Width - 1, Bounds.Height - 1, ' ');
 			}
diff --git a/UnitTests/View/Layout/DimTests.cs b/UnitTests/View/Layout/DimTests.cs
index 7c398f9b3..1a1a2823d 100644
--- a/UnitTests/View/Layout/DimTests.cs
+++ b/UnitTests/View/Layout/DimTests.cs
@@ -1309,7 +1309,7 @@ namespace Terminal.Gui.ViewTests {
 		}
 
 		[Fact]
-		public void Dim_Referencing_SuperView_Does_Not_Throws ()
+		public void Dim_Referencing_SuperView_Does_Not_Throw ()
 		{
 			var super = new View ("super") {
 				Width = 10,
diff --git a/UnitTests/View/Layout/LayoutTests.cs b/UnitTests/View/Layout/LayoutTests.cs
index f920b4d7c..4d80b5187 100644
--- a/UnitTests/View/Layout/LayoutTests.cs
+++ b/UnitTests/View/Layout/LayoutTests.cs
@@ -1810,7 +1810,7 @@ Y
 		}
 
 		[Fact, AutoInitShutdown]
-		public void PosConbine_DimCombine_View_With_SubViews ()
+		public void PosCombine_DimCombine_View_With_SubViews ()
 		{
 			var clicked = false;
 			var top = Application.Top;
diff --git a/UnitTests/Views/ScrollViewTests.cs b/UnitTests/Views/ScrollViewTests.cs
index 58a6db007..27037dcab 100644
--- a/UnitTests/Views/ScrollViewTests.cs
+++ b/UnitTests/Views/ScrollViewTests.cs
@@ -617,13 +617,13 @@ namespace Terminal.Gui.ViewsTests {
 				ShowVerticalScrollIndicator = true
 			};
 			scrollView.Add (view);
-			var win = new Window (new Rect (1, 1, 20, 14), "Test");
+			var win = new Window (new Rect (1, 1, 20, 14), "");
 			win.Add (scrollView);
 			Application.Top.Add (win);
 			Application.Begin (Application.Top);
 
 			var expected = @"
- ┌┤Test├────────────┐
+ ┌──────────────────┐
  │                  │
  │ 01234567890123▲  │
  │ 1[ Press me! ]┬  │
@@ -647,7 +647,7 @@ namespace Terminal.Gui.ViewsTests {
 			Application.Top.Redraw (Application.Top.Bounds);
 
 			expected = @"
- ┌┤Test├────────────┐
+ ┌──────────────────┐
  │                  │
  │ 12345678901234▲  │
  │ [ Press me! ] ┬  │
@@ -671,7 +671,7 @@ namespace Terminal.Gui.ViewsTests {
 			Application.Top.Redraw (Application.Top.Bounds);
 
 			expected = @"
- ┌┤Test├────────────┐
+ ┌──────────────────┐
  │                  │
  │ 23456789012345▲  │
  │  Press me! ]  ┬  │
@@ -695,7 +695,7 @@ namespace Terminal.Gui.ViewsTests {
 			Application.Top.Redraw (Application.Top.Bounds);
 
 			expected = @"
- ┌┤Test├────────────┐
+ ┌──────────────────┐
  │                  │
  │ 34567890123456▲  │
  │ Press me! ]   ┬  │
@@ -719,7 +719,7 @@ namespace Terminal.Gui.ViewsTests {
 			Application.Top.Redraw (Application.Top.Bounds);
 
 			expected = @"
- ┌┤Test├────────────┐
+ ┌──────────────────┐
  │                  │
  │ 45678901234567▲  │
  │ ress me! ]    ┬  │
@@ -743,7 +743,7 @@ namespace Terminal.Gui.ViewsTests {
 			Application.Top.Redraw (Application.Top.Bounds);
 
 			expected = @"
- ┌┤Test├────────────┐
+ ┌──────────────────┐
  │                  │
  │ 56789012345678▲  │
  │ ess me! ]     ┬  │
@@ -767,7 +767,7 @@ namespace Terminal.Gui.ViewsTests {
 			Application.Top.Redraw (Application.Top.Bounds);
 
 			expected = @"
- ┌┤Test├────────────┐
+ ┌──────────────────┐
  │                  │
  │ 67890123456789▲  │
  │ ss me! ]      ┬  │
@@ -791,7 +791,7 @@ namespace Terminal.Gui.ViewsTests {
 			Application.Top.Redraw (Application.Top.Bounds);
 
 			expected = @"
- ┌┤Test├────────────┐
+ ┌──────────────────┐
  │                  │
  │ 78901234567890▲  │
  │ s me! ]       ┬  │
@@ -814,7 +814,7 @@ namespace Terminal.Gui.ViewsTests {
 			Application.Top.Redraw (Application.Top.Bounds);
 
 			expected = @"
- ┌┤Test├────────────┐
+ ┌──────────────────┐
  │                  │
  │ 67890123456789▲  │
  │               ┬  │
@@ -838,7 +838,7 @@ namespace Terminal.Gui.ViewsTests {
 			Application.Top.Redraw (Application.Top.Bounds);
 
 			expected = @"
- ┌┤Test├────────────┐
+ ┌──────────────────┐
  │                  │
  │ 1[ Press me! ]▲  │
  │ 2             ┬  │
@@ -861,7 +861,7 @@ namespace Terminal.Gui.ViewsTests {
 			Application.Top.Redraw (Application.Top.Bounds);
 
 			expected = @"
- ┌┤Test├────────────┐
+ ┌──────────────────┐
  │                  │
  │ 2             ▲  │
  │ 3             ┬  │
@@ -884,7 +884,7 @@ namespace Terminal.Gui.ViewsTests {
 			Application.Top.Redraw (Application.Top.Bounds);
 
 			expected = @"
- ┌┤Test├────────────┐
+ ┌──────────────────┐
  │                  │
  │ 3             ▲  │
  │ 4             ┬  │
@@ -907,7 +907,7 @@ namespace Terminal.Gui.ViewsTests {
 			Application.Top.Redraw (Application.Top.Bounds);
 
 			expected = @"
- ┌┤Test├────────────┐
+ ┌──────────────────┐
  │                  │
  │ 1             ▲  │
  │ 2             ░  │