diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/GamePackage/CurrentState.java b/src/main/java/it/polimi/ingsw/gc14/Model/GamePackage/CurrentState.java
index 068d52c..bc2dcce 100644
--- a/src/main/java/it/polimi/ingsw/gc14/Model/GamePackage/CurrentState.java
+++ b/src/main/java/it/polimi/ingsw/gc14/Model/GamePackage/CurrentState.java
@@ -66,10 +66,12 @@ public class CurrentState {
     // endregion setters
 
     // region Constructors
+    // TODO controllare valori di NUpper, NLower, Round
     public CurrentState(){
         this.player = null;
         this.slot = null;
         this.Era = 1;
+        this.round = 0;
         this.NUpper = 0;
         this.NLower = 0;
         this.GameStage = GameStages.WAITING;
diff --git a/src/test/java/it/polimi/ingsw/gc14/Model/GamePackage/CurrentStateTest.java b/src/test/java/it/polimi/ingsw/gc14/Model/GamePackage/CurrentStateTest.java
new file mode 100644
index 0000000..181dd80
--- /dev/null
+++ b/src/test/java/it/polimi/ingsw/gc14/Model/GamePackage/CurrentStateTest.java
@@ -0,0 +1,142 @@
+package it.polimi.ingsw.gc14.Model.GamePackage;
+
+import it.polimi.ingsw.gc14.Model.Player;
+import it.polimi.ingsw.gc14.Model.Slot;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class CurrentStateTest {
+
+    @Test
+    void getCurrentPlayer() {
+        Player p = new Player("test");
+        Slot s = new Slot('A');
+        CurrentState curr = new CurrentState();
+        curr.PlayerUpdate(p, s);
+        assertEquals(p, curr.getCurrentPlayer());
+    }
+
+    @Test
+    void getSlot() {
+        Player p = new Player("test");
+        Slot s = new Slot('A');
+        CurrentState curr = new CurrentState();
+        curr.PlayerUpdate(p, s);
+        assertEquals(s, curr.getSlot());
+    }
+
+    @Test
+    void getEra() {
+        Player p = new Player("test");
+        Slot s = new Slot('A');
+        CurrentState curr = new CurrentState();
+        curr.PlayerUpdate(p, s);
+        curr.EraUpdate();
+        assertEquals(2, curr.getEra());
+    }
+
+    @Test
+    void getRound() {
+        Player p = new Player("test");
+        Slot s = new Slot('A');
+        CurrentState curr = new CurrentState();
+        curr.PlayerUpdate(p, s);
+        curr.RoundUpdate();
+        assertEquals(1, curr.getRound());
+    }
+
+    @Test
+    void getNUpper() {
+        Player p = new Player("test");
+        Slot s = new Slot('A');
+        CurrentState curr = new CurrentState();
+        curr.PlayerUpdate(p, s);
+        curr.UpperDrawn();
+        assertEquals(-1, curr.getNUpper());
+    }
+
+    @Test
+    void getNLower() {
+        Player p = new Player("test");
+        Slot s = new Slot('A');
+        CurrentState curr = new CurrentState();
+        curr.PlayerUpdate(p, s);
+        curr.LowerDrawn();
+        assertEquals(-1, curr.getNLower());
+    }
+
+    @Test
+    void getGameStage() {
+        Player p = new Player("test");
+        Slot s = new Slot('A');
+        GameStages g = GameStages.RESOLVING_ACTIONS;
+        CurrentState curr = new CurrentState();
+        curr.PlayerUpdate(p, s);
+        curr.GameStageUpdate(g);
+        assertEquals(g, curr.getGameStage());
+    }
+
+    @Test
+    void eraUpdate() {
+        Player p = new Player("test");
+        Slot s = new Slot('A');
+        CurrentState curr = new CurrentState();
+        curr.PlayerUpdate(p, s);
+        curr.EraUpdate();
+        assertEquals(2, curr.getEra());
+    }
+
+    @Test
+    void roundUpdate() {
+        Player p = new Player("test");
+        Slot s = new Slot('A');
+        CurrentState curr = new CurrentState();
+        curr.PlayerUpdate(p, s);
+        curr.RoundUpdate();
+        assertEquals(1, curr.getRound());
+    }
+
+    @Test
+    void upperDrawn() {
+        Player p = new Player("test");
+        Slot s = new Slot('A');
+        CurrentState curr = new CurrentState();
+        curr.PlayerUpdate(p, s);
+        curr.UpperDrawn();
+        assertEquals(-1, curr.getNUpper());
+    }
+
+    @Test
+    void lowerDrawn() {
+        Player p = new Player("test");
+        Slot s = new Slot('A');
+        CurrentState curr = new CurrentState();
+        curr.PlayerUpdate(p, s);
+        curr.LowerDrawn();
+        curr.LowerDrawn();
+        assertEquals(-2, curr.getNLower());
+    }
+
+    @Test
+    void gameStageUpdate() {
+        Player p = new Player("test");
+        Slot s = new Slot('A');
+        GameStages g = GameStages.RESOLVING_ACTIONS;
+        CurrentState curr = new CurrentState();
+        assertEquals(GameStages.WAITING, curr.getGameStage());
+        curr.PlayerUpdate(p, s);
+        curr.GameStageUpdate(g);
+        assertEquals(GameStages.RESOLVING_ACTIONS, curr.getGameStage());
+    }
+
+    @Test
+    void playerUpdate() {
+        Player p = new Player("test");
+        Slot s = new Slot('C');
+        CurrentState curr = new CurrentState();
+        curr.PlayerUpdate(p, s);
+        assertEquals(p, curr.getCurrentPlayer());
+        assertEquals(s, curr.getSlot());
+    }
+}
\ No newline at end of file