diff --git a/BackendTests/Game/Items/DiceCupTests.cs b/BackendTests/Game/Items/DiceCupTests.cs
index 9f6bb2b..a2a74ae 100644
--- a/BackendTests/Game/Items/DiceCupTests.cs
+++ b/BackendTests/Game/Items/DiceCupTests.cs
@@ -1,6 +1,25 @@
+using pacMan.Game.Items;
+
 namespace BackendTests.Game.Items;
 
 public class DiceCupTests
 {
+    [Test]
+    public void Roll_ReturnsTwoElements()
+    {
+        var diceCup = new DiceCup();
+        var roll = diceCup.Roll;
+        Assert.That(roll, Has.Count.EqualTo(2));
+    }
     
+    [Test]
+    public void Roll_ReturnsNumbersInRange1To6()
+    {
+        var diceCup = new DiceCup();
+        var roll = diceCup.Roll;
+        Assert.That(roll[0], Is.GreaterThanOrEqualTo(1));
+        Assert.That(roll[0], Is.LessThanOrEqualTo(6));
+        Assert.That(roll[1], Is.GreaterThanOrEqualTo(1));
+        Assert.That(roll[1], Is.LessThanOrEqualTo(6));
+    }
 }
diff --git a/BackendTests/Game/Items/DiceTests.cs b/BackendTests/Game/Items/DiceTests.cs
index 9aafb1b..060da91 100644
--- a/BackendTests/Game/Items/DiceTests.cs
+++ b/BackendTests/Game/Items/DiceTests.cs
@@ -1,6 +1,15 @@
+using pacMan.Game.Items;
+
 namespace BackendTests.Game.Items;
 
 public class DiceTests
 {
-    
+    [Test]
+    public void Roll_ReturnsNumberBetween1And6()
+    {
+        var dice = new Dice();
+        var roll = dice.Roll;
+        Assert.That(roll, Is.GreaterThanOrEqualTo(1));
+        Assert.That(roll, Is.LessThanOrEqualTo(6));
+    }
 }
diff --git a/BackendTests/Services/WebSocketServiceTests.cs b/BackendTests/Services/WebSocketServiceTests.cs
index 59b9e4c..d299bef 100644
--- a/BackendTests/Services/WebSocketServiceTests.cs
+++ b/BackendTests/Services/WebSocketServiceTests.cs
@@ -1,3 +1,6 @@
 namespace BackendTests.Services;
 
-public class WebSocketServiceTests { }
+public class WebSocketServiceTests // TODO: Implement
+{
+    
+}
diff --git a/pac-man-board-game/Game/Interfaces/IDice.cs b/pac-man-board-game/Game/Interfaces/IDice.cs
deleted file mode 100644
index 6d28586..0000000
--- a/pac-man-board-game/Game/Interfaces/IDice.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace pacMan.Game.Interfaces;
-
-public interface IDice
-{
-    int Roll();
-}
\ No newline at end of file
diff --git a/pac-man-board-game/Game/Interfaces/IDiceCup.cs b/pac-man-board-game/Game/Interfaces/IDiceCup.cs
deleted file mode 100644
index ef2a280..0000000
--- a/pac-man-board-game/Game/Interfaces/IDiceCup.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace pacMan.Game.Interfaces;
-
-public interface IDiceCup
-{
-    List<int> Roll();
-}
\ No newline at end of file
diff --git a/pac-man-board-game/Game/Items/Dice.cs b/pac-man-board-game/Game/Items/Dice.cs
index 3da4092..e70adf8 100644
--- a/pac-man-board-game/Game/Items/Dice.cs
+++ b/pac-man-board-game/Game/Items/Dice.cs
@@ -1,10 +1,13 @@
-using pacMan.Game.Interfaces;
-
 namespace pacMan.Game.Items;
 
+public interface IDice
+{
+    int Roll { get; }
+}
+
 public class Dice : IDice
 {
     private readonly Random _random = new();
-    
-    public int Roll() => _random.Next(1, 7);
-}
\ No newline at end of file
+
+    public int Roll => _random.Next(1, 7);
+}
diff --git a/pac-man-board-game/Game/Items/DiceCup.cs b/pac-man-board-game/Game/Items/DiceCup.cs
index f611456..cc4e25d 100644
--- a/pac-man-board-game/Game/Items/DiceCup.cs
+++ b/pac-man-board-game/Game/Items/DiceCup.cs
@@ -1,19 +1,20 @@
-using pacMan.Game.Interfaces;
-
 namespace pacMan.Game.Items;
 
+public interface IDiceCup
+{
+    List<int> Roll { get; }
+}
+
 public class DiceCup : IDiceCup
 {
     private readonly List<Dice> _dices;
 
-    public DiceCup()
-    {
+    public DiceCup() =>
         _dices = new List<Dice>
         {
             new(),
             new()
         };
-    }
 
-    public List<int> Roll() => _dices.Select(d => d.Roll()).ToList();
-}
\ No newline at end of file
+    public List<int> Roll => _dices.Select(d => d.Roll).ToList();
+}
diff --git a/pac-man-board-game/Services/ActionService.cs b/pac-man-board-game/Services/ActionService.cs
index 6a7de16..d2ccffa 100644
--- a/pac-man-board-game/Services/ActionService.cs
+++ b/pac-man-board-game/Services/ActionService.cs
@@ -47,7 +47,7 @@ public class ActionService : IActionService
 
     public List<int> RollDice()
     {
-        var rolls = _diceCup.Roll();
+        var rolls = _diceCup.Roll;
         _logger.Log(LogLevel.Information, "Rolled [{}]", string.Join(", ", rolls));
 
         return rolls;