diff --git a/ProjectLighthouse.Tests/Tests/AuthenticationTest.cs b/ProjectLighthouse.Tests/Tests/AuthenticationTests.cs
similarity index 97%
rename from ProjectLighthouse.Tests/Tests/AuthenticationTest.cs
rename to ProjectLighthouse.Tests/Tests/AuthenticationTests.cs
index 42a3ffca..e79bf903 100644
--- a/ProjectLighthouse.Tests/Tests/AuthenticationTest.cs
+++ b/ProjectLighthouse.Tests/Tests/AuthenticationTests.cs
@@ -5,7 +5,7 @@ using ProjectLighthouse.Types;
 using Xunit;
 
 namespace ProjectLighthouse.Tests {
-    public class AuthenticationTest : LighthouseTest {
+    public class AuthenticationTests : LighthouseTest {
         [Fact]
         public async Task ShouldReturnErrorOnNoPostData() {
             HttpResponseMessage response = await this.Client.PostAsync("/LITTLEBIGPLANETPS3_XML/login", null!);
diff --git a/ProjectLighthouse.Tests/Tests/SerializerTests.cs b/ProjectLighthouse.Tests/Tests/SerializerTests.cs
new file mode 100644
index 00000000..1f89c2f1
--- /dev/null
+++ b/ProjectLighthouse.Tests/Tests/SerializerTests.cs
@@ -0,0 +1,31 @@
+using System.Collections.Generic;
+using ProjectLighthouse.Serialization;
+using Xunit;
+
+namespace ProjectLighthouse.Tests {
+    public class SerializerTests : LighthouseTest {
+        [Fact]
+        public void BlankElementWorks() {
+            Assert.Equal("<test></test>", LbpSerializer.BlankElement("test"));
+        }
+
+        [Fact]
+        public void StringElementWorks() {
+            Assert.Equal("<test>asd</test>", LbpSerializer.StringElement("test", "asd"));
+            Assert.Equal("<test>asd</test>", LbpSerializer.StringElement(new KeyValuePair<string, object>("test", "asd")));
+        }
+
+        [Fact]
+        public void TaggedStringElementWorks() {
+            Assert.Equal("<test foo=\"bar\">asd</test>", LbpSerializer.TaggedStringElement("test", "asd", "foo", "bar"));
+            Assert.Equal("<test foo=\"bar\">asd</test>", LbpSerializer.TaggedStringElement(new KeyValuePair<string, object>("test", "asd"),
+                new KeyValuePair<string, object>("foo", "bar")));
+        }
+
+        [Fact]
+        public void ElementsWorks() {
+            Assert.Equal("<test>asd</test><foo>bar</foo>", LbpSerializer.Elements(new KeyValuePair<string, object>("test", "asd"),
+                new KeyValuePair<string, object>("foo", "bar")));
+        }
+    }
+}
\ No newline at end of file