diff --git a/risk-server/src/test/java/org/nominoe/datatypes/player/PlayerTest.java b/risk-server/src/test/java/org/nominoe/datatypes/player/PlayerTest.java
index eadbd1ece285283d9448b6e087fd78df645ec7a1..205fb7a02028f764639b8d74ae5ea35af04c7a01 100644
--- a/risk-server/src/test/java/org/nominoe/datatypes/player/PlayerTest.java
+++ b/risk-server/src/test/java/org/nominoe/datatypes/player/PlayerTest.java
@@ -21,7 +21,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 //@RunWith(MockitoJUnitRunner.class)
-public class PlayerTest {
+class PlayerTest {
 
     private Player playerNamedTest;
     private Player playerNamedOther;
@@ -34,7 +34,7 @@ public class PlayerTest {
     private static final int VALUE10 = 10;
 
     @BeforeEach
-    public void setup() {
+    void setup() {
         playerNamedTest = new Player("Test", Color.yellow, "12345");
         playerNamedOther = new Player("Other", Color.red, "54321");
         territoryNamedTest = Mockito.mock(Territory.class);
@@ -45,13 +45,13 @@ public class PlayerTest {
 
     //addReinforcements
     @Test
-    public void testAddReinforcementsAddValueWithPositiveInteger() throws ExceptionNegativeReinforcements {
+    void testAddReinforcementsAddValueWithPositiveInteger() throws ExceptionNegativeReinforcements {
         playerNamedTest.addReinforcements(VALUE10);
         assertEquals(playerNamedTest.getReinforcementsToPlace(), VALUE0 + VALUE10);
     }
 
     @Test
-    public void testAddReinforcementsDontAddValueWithNegativeInteger() throws ExceptionNegativeReinforcements {
+    void testAddReinforcementsDontAddValueWithNegativeInteger() throws ExceptionNegativeReinforcements {
         assertThrows(ExceptionNegativeReinforcements.class, () -> {
             playerNamedTest.addReinforcements(VALUEMINUS10);
         });
@@ -59,14 +59,14 @@ public class PlayerTest {
 
     //assignMission
     @Test
-    public void testAssignMissionAddMissionToPlayer() {
+    void testAssignMissionAddMissionToPlayer() {
         playerNamedTest.assignMission(missionDestroyOpponentRed);
         Assertions.assertEquals(playerNamedTest.getMission(), missionDestroyOpponentRed);
     }
 
     //assignColor
     @Test
-    public void testAssignColorAddColorToPlayer() {
+    void testAssignColorAddColorToPlayer() {
         playerNamedTest.assignColor(colorNoir);
         assertEquals(playerNamedTest.getColor(), colorNoir);
     }
@@ -74,28 +74,28 @@ public class PlayerTest {
 
     //addTerritory
     @Test
-    public void testAddTerritoryChangePossessorIfTerritoryHasNoPossessor() throws ExceptionTerritoryStillHaveOwner {
+    void testAddTerritoryChangePossessorIfTerritoryHasNoPossessor() throws ExceptionTerritoryStillHaveOwner {
         Territory any = (Territory) DatatypesFactory.createTerritory("Any");
         playerNamedTest.addTerritory(any);
         Assertions.assertEquals(any.getPossessor(), playerNamedTest);
     }
 
     @Test
-    public void testAddTerritoryAddTerritoryIfTerritoryHasNoPossessor() throws ExceptionTerritoryStillHaveOwner {
+    void testAddTerritoryAddTerritoryIfTerritoryHasNoPossessor() throws ExceptionTerritoryStillHaveOwner {
         playerNamedTest.addTerritory(territoryNamedTest);
-        Assertions.assertEquals(playerNamedTest.getPossessedTerritories().size(), 1);
+        Assertions.assertEquals(1, playerNamedTest.getPossessedTerritories().size());
     }
 
 
     @Test
-    public void testAddTerritoryDontAddTerritoryIfTerritoryHasPossessor() throws ExceptionTerritoryStillHaveOwner {
+    void testAddTerritoryDontAddTerritoryIfTerritoryHasPossessor() throws ExceptionTerritoryStillHaveOwner {
         Territory any = (Territory) DatatypesFactory.createTerritory("Any");
         playerNamedTest.addTerritory(any);
         Assertions.assertEquals(any.getPossessor(), playerNamedTest);
     }
 
     @Test
-    public void testAddTerritoryThrowsExceptionTerritoryStillHavePossessorIfTerritoryStillHavePossessor() throws ExceptionTerritoryStillHaveOwner {
+    void testAddTerritoryThrowsExceptionTerritoryStillHavePossessorIfTerritoryStillHavePossessor() throws ExceptionTerritoryStillHaveOwner {
         Territory any = (Territory) DatatypesFactory.createTerritory("Any");
         playerNamedOther.addTerritory(any);
         assertThrows(ExceptionTerritoryStillHaveOwner.class, () -> {
@@ -105,54 +105,43 @@ public class PlayerTest {
 
 
     @Test
-    public void testAddCards() {
-
+    void testPlayerCanAddMultipleCardsToTheirCollection() {
         for (int i = 0; i < 3; i++) {
             cards.add(new ConcreteCard());
         }
-
         for (Card each : cards) {
             Assertions.assertTrue(playerNamedTest.getCards().add(each));
         }
-
         Assertions.assertEquals(3, playerNamedTest.getCards().size());
-
         for (Card each : cards) {
             Assertions.assertTrue(playerNamedTest.getCards().contains(each));
         }
     }
 
     @Test
-    public void testAddMaxCards() {
-
+    void addingMaximumCardsToPlayerShouldFail() {
         Card cardToRejectOnAdd = new ConcreteCard();
-
         for (int i = 0; i < 5; i++) {
             cards.add(new ConcreteCard());
         }
-
         for (Card each : cards) {
             Assertions.assertTrue(playerNamedTest.getCards().add(each));
         }
-
         Assertions.assertEquals(5, playerNamedTest.getCards().size());
         Assertions.assertFalse(playerNamedTest.getCards().add(cardToRejectOnAdd));
         Assertions.assertEquals(5, playerNamedTest.getCards().size());
     }
 
     @Test
-    public void testRemoveCards() {
-
+    void testRemovingCardFromPlayerCards() {
         Card cardToRemove = new ConcreteCard();
         cards.add(cardToRemove);
         for (int i = 0; i < 3; i++) {
             cards.add(new ConcreteCard());
         }
-
         for (Card each : cards) {
             playerNamedTest.getCards().add(each);
         }
-
         Assertions.assertEquals(4, playerNamedTest.getCards().size());
         playerNamedTest.getCards().remove(cardToRemove);
         Assertions.assertEquals(3, playerNamedTest.getCards().size());