diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/pojo/RecoveryPasswordToken.java b/S2/DevWeb/Projet/src/main/java/uppa/project/pojo/RecoveryPasswordToken.java
index 5c71fc4..b623e1e 100644
--- a/S2/DevWeb/Projet/src/main/java/uppa/project/pojo/RecoveryPasswordToken.java
+++ b/S2/DevWeb/Projet/src/main/java/uppa/project/pojo/RecoveryPasswordToken.java
@@ -10,6 +10,7 @@ import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
 import jakarta.persistence.Temporal;
 import jakarta.persistence.TemporalType;
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -25,7 +26,7 @@ public class RecoveryPasswordToken {
   @Id
   @Column(name = "id")
   @GeneratedValue(strategy = GenerationType.IDENTITY)
-  private int id;
+  private BigDecimal id;
 
   @Column(name = "token")
   private String token;
@@ -60,7 +61,7 @@ public class RecoveryPasswordToken {
    * @param token
    * @param user
    */
-  public RecoveryPasswordToken(int id, String token, User user, Date expiresAt) {
+  public RecoveryPasswordToken(BigDecimal id, String token, User user, Date expiresAt) {
     this.id = id;
     this.token = token;
     this.user = user;
@@ -72,7 +73,7 @@ public class RecoveryPasswordToken {
    *
    * @return l'id
    */
-  public int getId() {
+  public BigDecimal getId() {
     return id;
   }
 
diff --git a/S2/DevWeb/Projet/src/test/java/uppa/project/pojo/RecoveryPasswordTokenTest.java b/S2/DevWeb/Projet/src/test/java/uppa/project/pojo/RecoveryPasswordTokenTest.java
index 5005984..417387f 100644
--- a/S2/DevWeb/Projet/src/test/java/uppa/project/pojo/RecoveryPasswordTokenTest.java
+++ b/S2/DevWeb/Projet/src/test/java/uppa/project/pojo/RecoveryPasswordTokenTest.java
@@ -1,114 +1,151 @@
 package uppa.project.pojo;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Date;
-import org.junit.jupiter.api.BeforeAll;
+import java.util.HashMap;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 class RecoveryPasswordTokenTest {
 
-  static RecoveryPasswordToken[] FIXTURE;
-  @BeforeAll
-  static void setUp() {
-    FIXTURE = new RecoveryPasswordToken[] {
-      new RecoveryPasswordToken(1, "token1", new User(new BigDecimal(1), "username1", "password1", "email1", new Date(1996, 1,4), User.Gender.MALE, new ArrayList<Player>()),new Date(2024,1,2)),
-      new RecoveryPasswordToken(2, "token2", new User(new BigDecimal(2), "username2", "password2", "email2", new Date(1996, 2,5), User.Gender.FEMALE, new ArrayList<Player>()),new Date(2024,3,4)),
-      new RecoveryPasswordToken(3, "token3", new User(new BigDecimal(3), "username3", "password3", "email3", new Date(1996, 3,6), User.Gender.OTHER, new ArrayList<Player>()), new Date(2024,5,6))
-    };
-   }
+//  static RecoveryPasswordToken[] FIXTURE;
+
+//  @BeforeAll
+//  static void setUp() {
+//    FIXTURE = new RecoveryPasswordToken[]{new RecoveryPasswordToken(1, "token1", new User(new BigDecimal(1), "username1", "password1",
+//      "email1", new Date(1996, 1, 4), User.Gender.MALE, new ArrayList<Player>()), new Date(2024, 1, 2)), new RecoveryPasswordToken(2,
+//      "token2", new User(new BigDecimal(2), "username2", "password2", "email2", new Date(1996, 2, 5), User.Gender.FEMALE,
+//      new ArrayList<Player>()), new Date(2024, 3, 4)), new RecoveryPasswordToken(3, "token3", new User(new BigDecimal(3), "username3",
+//      "password3", "email3", new Date(1996, 3, 6), User.Gender.OTHER, new ArrayList<Player>()), new Date(2024, 5, 6))};
+//  }
+
   @Test
-  void get_id() {
-    assertEquals(1, FIXTURE[0].getId());
-    assertEquals(2, FIXTURE[1].getId());
-    assertEquals(3, FIXTURE[2].getId());
+  void test_constructor() {
+    new RecoveryPasswordToken(new BigDecimal(1), "token1", new User(), new Date(124, Calendar.FEBRUARY, 2));
+    new RecoveryPasswordToken(new BigDecimal(2), "token2", new User(), new Date(124, Calendar.APRIL, 4));
+    new RecoveryPasswordToken(new BigDecimal(3), "token3", new User(), new Date(124, Calendar.JUNE, 6));
   }
 
   @Test
-  void get_token() {
-    assertEquals("token1", FIXTURE[0].getToken());
-    assertEquals("token2", FIXTURE[1].getToken());
-    assertEquals("token3", FIXTURE[2].getToken());
+  void test_getId() {
+    HashMap<RecoveryPasswordToken, BigDecimal> TESTS = new HashMap<>() {{
+      put(new RecoveryPasswordToken(new BigDecimal(1), "token1", new User(), new Date()), new BigDecimal(1));
+      put(new RecoveryPasswordToken(new BigDecimal(2), "token2", new User(), new Date()), new BigDecimal(2));
+      put(new RecoveryPasswordToken(new BigDecimal(3), "token3", new User(), new Date()), new BigDecimal(3));
+    }};
+
+    for (RecoveryPasswordToken token : TESTS.keySet())
+      assertEquals(TESTS.get(token), token.getId());
   }
 
   @Test
-  void set_token() {
-    String[] expected = new String[]{"token1", "token2", "token3"};
-    for (int i = 0; i < FIXTURE.length; i++) {
-      FIXTURE[i].setToken(expected[i]);
-      assertEquals(expected[i], FIXTURE[i].getToken());
-    }
+  void test_getToken() {
+    HashMap<RecoveryPasswordToken, String> TESTS = new HashMap<>() {
+      {
+        put(new RecoveryPasswordToken(new BigDecimal(1), "token1", new User(), new Date()), "token1");
+        put(new RecoveryPasswordToken(new BigDecimal(2), "token2", new User(), new Date()), "token2");
+        put(new RecoveryPasswordToken(new BigDecimal(3), "token3", new User(), new Date()), "token3");
+      }};
+
+    for (RecoveryPasswordToken token : TESTS.keySet())
+      assertEquals(TESTS.get(token), token.getToken());
   }
 
   @Test
-  void get_user() {
-    User[] expected = new User[]{
-      new User(new BigDecimal(1), "username1", "password1", "email1", new Date(1996, 1, 4), User.Gender.MALE, new ArrayList<Player>()),
-      new User(new BigDecimal(2), "username2", "password2", "email2", new Date(1996, 2, 5), User.Gender.FEMALE, new ArrayList<Player>()),
-      new User(new BigDecimal(3), "username3", "password3", "email3", new Date(1996, 3, 6), User.Gender.OTHER, new ArrayList<Player>())};
-    for (int i = 0; i < FIXTURE.length; i++) {
-      assertEquals(expected[i].getId(), FIXTURE[i].getUser().getId());
-      assertEquals(expected[i].getUsername(), FIXTURE[i].getUser().getUsername());
-      assertEquals(expected[i].getPassword(), FIXTURE[i].getUser().getPassword());
-      assertEquals(expected[i].getEmail(), FIXTURE[i].getUser().getEmail());
-      assertEquals(expected[i].getBirth(), FIXTURE[i].getUser().getBirth());
-      assertEquals(expected[i].getGender(), FIXTURE[i].getUser().getGender());
-      assertEquals(expected[i].getPlayedGames(), FIXTURE[i].getUser().getPlayedGames());
-    }
+  void test_setToken() {
+    final String EXPECTED = "new-token";
+    final RecoveryPasswordToken TOKEN = new RecoveryPasswordToken(new BigDecimal(1), "token", new User(), new Date());
+
+    TOKEN.setToken(EXPECTED);
+    assertEquals(EXPECTED, TOKEN.getToken());
+  }
+
+  @Test
+  void test_getUser() {
+    final HashMap<RecoveryPasswordToken, User> TESTS = new HashMap<>() {{
+      put(
+        new RecoveryPasswordToken(
+          new BigDecimal(1),
+          "token1",
+          new User(
+            new BigDecimal(1),
+            "username1",
+            "password1",
+            "email1",
+            new Date(196, Calendar.FEBRUARY, 4),
+            User.Gender.MALE,
+            null
+          ),
+          new Date()),
+        new User(
+          new BigDecimal(1),
+          "username1",
+          "password1",
+          "email1",
+          new Date(196, Calendar.FEBRUARY, 4),
+          User.Gender.MALE,
+          null
+        )
+      );
+      // TODO Add more tests
+    }};
+
+    for (RecoveryPasswordToken token : TESTS.keySet())
+      assertEquals(TESTS.get(token), token.getUser());
   }
 
   @Test
   void set_user() {
-    User[] expected = new User[]{
-      new User(new BigDecimal(4), "username4", "password4", "email4", new Date(1996, 4, 7), User.Gender.MALE, new ArrayList<Player>()),
-      new User(new BigDecimal(5), "username5", "password5", "email5", new Date(1996, 5, 8), User.Gender.FEMALE, new ArrayList<Player>()),
-      new User(new BigDecimal(6), "username6", "password6", "email6", new Date(1996, 6, 9), User.Gender.OTHER, new ArrayList<Player>())};
-    for (int i = 0; i < FIXTURE.length; i++) {
-      FIXTURE[i].setUser(expected[i]);
-      assertEquals(expected[i].getId(), FIXTURE[i].getUser().getId());
-      assertEquals(expected[i].getUsername(), FIXTURE[i].getUser().getUsername());
-      assertEquals(expected[i].getPassword(), FIXTURE[i].getUser().getPassword());
-      assertEquals(expected[i].getEmail(), FIXTURE[i].getUser().getEmail());
-      assertEquals(expected[i].getBirth(), FIXTURE[i].getUser().getBirth());
-      assertEquals(expected[i].getGender(), FIXTURE[i].getUser().getGender());
-      assertEquals(expected[i].getPlayedGames(), FIXTURE[i].getUser().getPlayedGames());
-    }
+//    User[] expected = new User[]{new User(new BigDecimal(4), "username4", "password4", "email4", new Date(1996, 4, 7), User.Gender.MALE,
+//      new ArrayList<Player>()), new User(new BigDecimal(5), "username5", "password5", "email5", new Date(1996, 5, 8), User.Gender.FEMALE,
+//      new ArrayList<Player>()), new User(new BigDecimal(6), "username6", "password6", "email6", new Date(1996, 6, 9), User.Gender.OTHER,
+//      new ArrayList<Player>())};
+//    for (int i = 0; i < FIXTURE.length; i++) {
+//      FIXTURE[i].setUser(expected[i]);
+//      assertEquals(expected[i].getId(), FIXTURE[i].getUser().getId());
+//      assertEquals(expected[i].getUsername(), FIXTURE[i].getUser().getUsername());
+//      assertEquals(expected[i].getPassword(), FIXTURE[i].getUser().getPassword());
+//      assertEquals(expected[i].getEmail(), FIXTURE[i].getUser().getEmail());
+//      assertEquals(expected[i].getBirth(), FIXTURE[i].getUser().getBirth());
+//      assertEquals(expected[i].getGender(), FIXTURE[i].getUser().getGender());
+//      assertEquals(expected[i].getPlayedGames(), FIXTURE[i].getUser().getPlayedGames());
+//    }
+    // TODO Implement this method
+    fail();
   }
 
   @Test
   void get_expires_at() {
-    Date[] expected = new Date[]{
-      new Date(2024, 1, 2),
-      new Date(2024, 3, 4),
-      new Date(2024, 5, 6)};
-    for (int i = 0; i < FIXTURE.length; i++) {
-      assertEquals(expected[i], FIXTURE[i].getExpiresAt());
-    }
+//    Date[] expected = new Date[]{new Date(2024, 1, 2), new Date(2024, 3, 4), new Date(2024, 5, 6)};
+//    for (int i = 0; i < FIXTURE.length; i++) {
+//      assertEquals(expected[i], FIXTURE[i].getExpiresAt());
+//    }
+    // TODO Implement this method
+    fail();
   }
 
   @Test
   void set_expires_at() {
-    Date[] expected = new Date[]{
-      new Date(2024, 2, 3),
-      new Date(2024, 4, 5),
-      new Date(2024, 6, 7)};
-    for (int i = 0; i < FIXTURE.length; i++) {
-      FIXTURE[i].setExpiresAt(expected[i]);
-      assertEquals(expected[i], FIXTURE[i].getExpiresAt());
-    }
+//    Date[] expected = new Date[]{new Date(2024, 2, 3), new Date(2024, 4, 5), new Date(2024, 6, 7)};
+//    for (int i = 0; i < FIXTURE.length; i++) {
+//      FIXTURE[i].setExpiresAt(expected[i]);
+//      assertEquals(expected[i], FIXTURE[i].getExpiresAt());
+//    }
+    // TODO Implement this method
+    fail();
   }
 
   @Test
   void get_expiration_date() {
-    Date[] expected = new Date[]{
-      new Date(2024, 1, 2),
-      new Date(2024, 3, 4),
-      new Date(2024, 5, 6)};
-    for (int i = 0; i < FIXTURE.length; i++) {
-      assertEquals(expected[i], FIXTURE[i].getExpirationDate());
-    }
+//    Date[] expected = new Date[]{new Date(2024, 1, 2), new Date(2024, 3, 4), new Date(2024, 5, 6)};
+//    for (int i = 0; i < FIXTURE.length; i++) {
+//      assertEquals(expected[i], FIXTURE[i].getExpirationDate());
+//    }
+    // TODO Implement this method
+    fail();
   }
 
   @Test