diff --git a/source/Trek-12/Tests/Base64ConverterTests.cs b/source/Trek-12/Tests/Base64ConverterTests.cs
new file mode 100644
index 0000000..a7218ea
--- /dev/null
+++ b/source/Trek-12/Tests/Base64ConverterTests.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Models.Game;
+using Models.Interfaces;
+using Moq;
+
+namespace Tests
+{
+    public class Base64ConverterTests
+    {
+        private Mock<IImageConverter> _imageConverterMock;
+
+        public Base64ConverterTests()
+        {
+            _imageConverterMock = new Mock<IImageConverter>();
+        }
+
+        [Fact]
+        public void ConvertImage_WithNonExistentPath_ThrowsFileNotFoundException()
+        {
+            var base64Converter = new Base64Converter();
+            Assert.Throws<FileNotFoundException>(() => base64Converter.ConvertImage("nonexistent.jpg"));
+        }
+
+        [Fact]
+        public void RetrieveImage_WithInvalidBase64_ThrowsFormatException()
+        {
+            var base64Converter = new Base64Converter();
+            Assert.Throws<FormatException>(() => base64Converter.RetrieveImage("////invalidBase64//!!///"));
+        }
+    }
+}
diff --git a/source/Trek-12/Tests/GameTests.cs b/source/Trek-12/Tests/GameTests.cs
index bee6693..691a126 100644
--- a/source/Trek-12/Tests/GameTests.cs
+++ b/source/Trek-12/Tests/GameTests.cs
@@ -34,6 +34,17 @@ public class GameTests
         }
     }
 
+    [Fact]
+    public void DefaultConstructor_ShouldInitializeLists()
+    {
+        Assert.NotNull(_game.Players);
+        Assert.NotNull(_game.Games);
+        Assert.NotNull(_game.Maps);
+        Assert.NotNull(_game.BestScores);
+        Assert.NotNull(_game.GameRules);
+        Assert.False(_game.IsRunning);
+    }
+
     [Fact]
     public void AddPlayer_ShouldAddPlayerToList()
     {
@@ -327,4 +338,22 @@ public class GameTests
         Assert.Equal(map, _game.UsedMap);
         Assert.Equal(player, _game.CurrentPlayer);
     }
+
+    [Fact]
+    public void RemovePlayerTest_ShouldRemovePlayer()
+    { 
+        Game game = new Game();
+        Player player = new Player("test", "DefaultProfilePicture");
+        game.AddPlayer(player);
+        Assert.True(game.RemovePlayer("test"));
+    }
+
+    [Fact]
+    public void RemovePlayerTest_ShouldNotRemovePlayer()
+    {
+        Game game = new Game();
+        Player player = new Player("test", "DefaultProfilePicture");
+        game.AddPlayer(player);
+        Assert.False(game.RemovePlayer("otherName"));
+    }
 }