diff --git a/src/StevesBot.Worker.Tests/Unit/ActivityTests.cs b/src/StevesBot.Worker.Tests/Unit/ActivityTests.cs
new file mode 100644
index 0000000..8fc050f
--- /dev/null
+++ b/src/StevesBot.Worker.Tests/Unit/ActivityTests.cs
@@ -0,0 +1,14 @@
+namespace StevesBot.Worker.Tests.Unit;
+
+public class ActivityTests
+{
+  [Fact]
+  public void Constructor_WhenCalled_ItShouldCreateAnInstance()
+  {
+    var activity = new Activity();
+
+    activity.Name.Should().Be(string.Empty);
+    activity.Type.Should().Be(ActivityType.Custom);
+    activity.State.Should().BeNull();
+  }
+}
\ No newline at end of file
diff --git a/src/StevesBot.Worker.Tests/Unit/UpdatePresenceDataTests.cs b/src/StevesBot.Worker.Tests/Unit/UpdatePresenceDataTests.cs
index 706f559..451b2ce 100644
--- a/src/StevesBot.Worker.Tests/Unit/UpdatePresenceDataTests.cs
+++ b/src/StevesBot.Worker.Tests/Unit/UpdatePresenceDataTests.cs
@@ -2,5 +2,36 @@ namespace StevesBot.Worker.Tests.Unit;
 
 public class UpdatePresenceDataTests
 {
+  [Fact]
+  public void Constructor_WhenCalled_ItShouldCreateAnInstance()
+  {
+    var updatePresenceData = new UpdatePresenceData();
 
+    updatePresenceData.Since.Should().BeNull();
+    updatePresenceData.Activities.Should().BeEmpty();
+    updatePresenceData.Status.Should().Be(PresenceStatus.Online);
+    updatePresenceData.Afk.Should().BeFalse();
+  }
+  
+  [Fact]
+  public void Constructor_WhenCalledAndPropertiesAreInitialized_ItShouldCreateAnInstance()
+  {
+    var since = 1;
+    var activities = new List<Activity>();
+    var status = "some_made_up_status";
+    var afk = true;
+    
+    var updatePresenceData = new UpdatePresenceData()
+    {
+      Since = since,
+      Activities = activities,
+      Status = status,
+      Afk = afk,
+    };
+    
+    updatePresenceData.Since.Should().Be(since);
+    updatePresenceData.Activities.Should().BeSameAs(activities);
+    updatePresenceData.Status.Should().Be(status);
+    updatePresenceData.Afk.Should().Be(afk);
+  }
 }
\ No newline at end of file
diff --git a/src/StevesBot.Worker/Handlers/WelcomeMessageHandler.cs b/src/StevesBot.Worker/Handlers/WelcomeMessageHandler.cs
index 9cb5791..7f895dd 100644
--- a/src/StevesBot.Worker/Handlers/WelcomeMessageHandler.cs
+++ b/src/StevesBot.Worker/Handlers/WelcomeMessageHandler.cs
@@ -1,6 +1,4 @@
 using System.Globalization;
-using System.Text;
-
 namespace StevesBot.Worker.Handlers;
 
 internal static class WelcomeMessageHandler