diff --git a/Twaddle/CodeTreehouse.Twaddle.Core.Tests/TwaddleTests.cs b/Twaddle/CodeTreehouse.Twaddle.Core.Tests/TwaddleTests.cs
new file mode 100644
index 0000000..c08a3ae
--- /dev/null
+++ b/Twaddle/CodeTreehouse.Twaddle.Core.Tests/TwaddleTests.cs
@@ -0,0 +1,41 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace CodeTreehouse.Twaddle.Core.Tests;
+
+[TestClass]
+public class TwaddleTests
+{
+    [TestMethod]
+    public void WithDefaults_NoArgs_TwaddleReturned()
+    {
+        ITwaddle twaddle = Twaddle.WithDefaults;
+
+        Assert.IsNotNull(twaddle);
+        Assert.IsNotNull(twaddle.Colour);
+        Assert.IsNotNull(twaddle.Date);
+        Assert.IsNotNull(twaddle.Name);
+        Assert.IsNotNull(twaddle.Phone);
+        Assert.IsNotNull(twaddle.Profile);
+        Assert.IsNotNull(twaddle.Word);
+    }
+
+    [TestMethod]
+    public void WithConfiguration_NoArgs_TwaddleReturned()
+    {
+        ITwaddle twaddle = Twaddle.WithConfiguration(
+            null,
+            null,
+            null,
+            null,
+            null,
+            null);
+
+        Assert.IsNotNull(twaddle);
+        Assert.IsNotNull(twaddle.Colour);
+        Assert.IsNotNull(twaddle.Date);
+        Assert.IsNotNull(twaddle.Name);
+        Assert.IsNotNull(twaddle.Phone);
+        Assert.IsNotNull(twaddle.Profile);
+        Assert.IsNotNull(twaddle.Word);
+    }
+}
\ No newline at end of file
diff --git a/Twaddle/Twaddle.sln b/Twaddle/Twaddle.sln
index 1d645ce..b08f9a3 100644
--- a/Twaddle/Twaddle.sln
+++ b/Twaddle/Twaddle.sln
@@ -1,7 +1,7 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
+
+Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.30804.86
-MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodeTreehouse.Twaddle.Core", "CodeTreehouse.Twaddle.Core\CodeTreehouse.Twaddle.Core.csproj", "{4965CD0C-2905-440A-9395-661E3131E7E3}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodeTreehouse.Twaddle.Core.Tests", "CodeTreehouse.Twaddle.Core.Tests\CodeTreehouse.Twaddle.Core.Tests.csproj", "{7A1DCEA8-4438-4AC4-9F18-E7134ED89BD3}"
@@ -17,10 +17,6 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{4965CD0C-2905-440A-9395-661E3131E7E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4965CD0C-2905-440A-9395-661E3131E7E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4965CD0C-2905-440A-9395-661E3131E7E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4965CD0C-2905-440A-9395-661E3131E7E3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7A1DCEA8-4438-4AC4-9F18-E7134ED89BD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7A1DCEA8-4438-4AC4-9F18-E7134ED89BD3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7A1DCEA8-4438-4AC4-9F18-E7134ED89BD3}.Release|Any CPU.ActiveCfg = Release|Any CPU