diff --git a/src/Blashing.Core.Tests/CommentsWidgetTest.cs b/src/Blashing.Core.Tests/CommentsWidgetTest.cs
index a1e21d0..70cd894 100644
--- a/src/Blashing.Core.Tests/CommentsWidgetTest.cs
+++ b/src/Blashing.Core.Tests/CommentsWidgetTest.cs
@@ -52,9 +52,9 @@ public void CommentsWidgetShouldContainPassedInValues()
                 .Add(p => p.MoreInfo, moreInfo)
             );
 
-        var textWidget = cut.Instance;
-        Assert.Equal(textWidget.Title, title);
-        Assert.Equal(textWidget.Quote, quote);
-        Assert.Equal(textWidget.MoreInfo, moreInfo);
+        var commentsWidget = cut.Instance;
+        Assert.Equal(commentsWidget.Title, title);
+        Assert.Equal(commentsWidget.Quote, quote);
+        Assert.Equal(commentsWidget.MoreInfo, moreInfo);
     }
 }
\ No newline at end of file
diff --git a/src/Blashing.Core.Tests/GraphWidgetTest.cs b/src/Blashing.Core.Tests/GraphWidgetTest.cs
index 82bba73..525b885 100644
--- a/src/Blashing.Core.Tests/GraphWidgetTest.cs
+++ b/src/Blashing.Core.Tests/GraphWidgetTest.cs
@@ -7,7 +7,7 @@ namespace Blashing.Core.Tests;
 public class GraphWidgetTest : BunitContext
 {
     [Fact]
-    public void CommentsWidgetMarkupShouldContainPassedInValues()
+    public void GraphWidgetMarkupShouldContainPassedInValues()
     {
         var title = "Graph 1";
         var moreInfo = "This graph contains lots of useful data";
@@ -30,7 +30,7 @@ public void CommentsWidgetMarkupShouldContainPassedInValues()
     }
 
     [Fact]
-    public void CommentsWidgetShouldContainPassedInValues()
+    public void GraphWidgetShouldContainPassedInValues()
     {
         var title = "Graph 1";
         var moreInfo = "This graph contains lots of useful data";
diff --git a/src/Blashing.Core.Tests/IFrameWidgetTest.cs b/src/Blashing.Core.Tests/IFrameWidgetTest.cs
index aa45cd6..d1b16a7 100644
--- a/src/Blashing.Core.Tests/IFrameWidgetTest.cs
+++ b/src/Blashing.Core.Tests/IFrameWidgetTest.cs
@@ -7,7 +7,7 @@ namespace Blashing.Core.Tests;
 public class IFrameWidgetTest : BunitContext
 {
     [Fact]
-    public void IFramekWidgetMarkupShouldContainPassedInValues()
+    public void IFrameWidgetMarkupShouldContainPassedInValues()
     {
         var url = "https://www.alexhedley.com/";
 
@@ -25,7 +25,7 @@ public void IFramekWidgetMarkupShouldContainPassedInValues()
     }
 
     [Fact]
-    public void IFramekWidgetShouldContainPassedInValues()
+    public void IFrameWidgetShouldContainPassedInValues()
     {
         var url = "https://www.alexhedley.com/";
 
@@ -33,7 +33,7 @@ public void IFramekWidgetShouldContainPassedInValues()
                 .Add(p => p.Url, url)
             );
 
-        var IFrameWidget = cut.Instance;
-        Assert.Equal(IFrameWidget.Url, url);
+        var iFrameWidget = cut.Instance;
+        Assert.Equal(iFrameWidget.Url, url);
     }
 }
\ No newline at end of file
diff --git a/src/Blashing.Core.Tests/ImageWidgetTest.cs b/src/Blashing.Core.Tests/ImageWidgetTest.cs
index bc195ec..c119388 100644
--- a/src/Blashing.Core.Tests/ImageWidgetTest.cs
+++ b/src/Blashing.Core.Tests/ImageWidgetTest.cs
@@ -27,7 +27,7 @@ public void ImageWidgetMarkupShouldContainPassedInValues()
     }
 
     [Fact]
-    public void ClockWidgetShouldContainPassedInValues()
+    public void ImageWidgetShouldContainPassedInValues()
     {
         var src = "https://www.alexhedley.com/images/icon-myapps.png";
         var width = "100px";
diff --git a/src/Blashing.Core.Tests/ListWidgetTest.cs b/src/Blashing.Core.Tests/ListWidgetTest.cs
index 4cd9a79..224bb62 100644
--- a/src/Blashing.Core.Tests/ListWidgetTest.cs
+++ b/src/Blashing.Core.Tests/ListWidgetTest.cs
@@ -7,7 +7,7 @@ namespace Blashing.Core.Tests;
 public class ListWidgetTest : BunitContext
 {
     [Fact]
-    public void TextWidgetMarkupShouldContainPassedInValues()
+    public void ListWidgetMarkupShouldContainPassedInValues()
     {
         var title = "a";
         var moreInfo = "c";
@@ -59,7 +59,7 @@ public void TextWidgetMarkupShouldContainPassedInValues()
     }
 
     [Fact]
-    public void TextWidgetShouldContainPassedInValues()
+    public void ListWidgetShouldContainPassedInValues()
     {
         var title = "a";
         var moreInfo = "c";
@@ -73,10 +73,10 @@ public void TextWidgetShouldContainPassedInValues()
             .Add(p => p.Items, items)
         );
 
-        var textWidget = cut.Instance;
-        Assert.Equal(textWidget.Title, title);
-        Assert.Equal(textWidget.MoreInfo, moreInfo);
-        Assert.Equal(textWidget.UpdatedAtMessage, updatedAtMessage);
-        Assert.Equal(textWidget.Items, items);
+        var listWidget = cut.Instance;
+        Assert.Equal(listWidget.Title, title);
+        Assert.Equal(listWidget.MoreInfo, moreInfo);
+        Assert.Equal(listWidget.UpdatedAtMessage, updatedAtMessage);
+        Assert.Equal(listWidget.Items, items);
     }
 }
\ No newline at end of file
diff --git a/src/Blashing.Core/Components/List/ListWidget.razor b/src/Blashing.Core/Components/List/ListWidget.razor
index fba1ce5..bd2fad4 100644
--- a/src/Blashing.Core/Components/List/ListWidget.razor
+++ b/src/Blashing.Core/Components/List/ListWidget.razor
@@ -5,7 +5,7 @@
     
     @if (Ordered) {
     <ol>
-    @foreach (var item in Items)
+    @foreach (var item in Items ?? Enumerable.Empty<(string label, string value)>())
     {
       <li>
         <span class="label">@item.label</span>
@@ -15,7 +15,7 @@
     </ol>
     } else {
     <ul class="list-nostyle">
-    @foreach (var item in Items)
+    @foreach (var item in Items ?? Enumerable.Empty<(string label, string value)>())
     {
       <li>
         <span class="label">@item.label</span>
diff --git a/src/Blashing.Widgets.Tests/CircleCIBuildStatusWidgetTest.cs b/src/Blashing.Widgets.Tests/CircleCIBuildStatusWidgetTest.cs
index c89ac48..a0bdefc 100644
--- a/src/Blashing.Widgets.Tests/CircleCIBuildStatusWidgetTest.cs
+++ b/src/Blashing.Widgets.Tests/CircleCIBuildStatusWidgetTest.cs
@@ -68,7 +68,7 @@ public void CircleCIBuildStatusWidgetMarkupShouldContainPassedInValues()
         var expectedCommitBodyMarkup = $"<span class=\"label small commit-body\">{commitBody}</span>";
         cut.FindAll("span")[2].MarkupMatches(expectedCommitBodyMarkup);
         
-        var expectedStateMarkup = $"<h2 class=\"state\">{state}</h1>";
+        var expectedStateMarkup = $"<h2 class=\"state\">{state}</h2>";
         cut.FindAll("h2")[0].MarkupMatches(expectedStateMarkup);
         
         var expectedTimeMarkup = $"<span class=\"label small\">{time}</span>";