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 80fcf4f..d8cf4e9 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
@@ -98,7 +98,7 @@ class RecoveryPasswordTokenTest {
   }
 
   @Test
-  void set_user() {
+  void test_setUser() {
   RecoveryPasswordToken token = fixture[0];
   assertEquals(usersFixture[0], token.getUser());
 
@@ -108,7 +108,7 @@ class RecoveryPasswordTokenTest {
   }
 
   @Test
-  void get_expiresAt() {
+  void test_getExpiresAt() {
     final HashMap<RecoveryPasswordToken, Date> TESTS = new HashMap<>() {{
       put(fixture[0], new Date(124, Calendar.MARCH, 28));
       put(fixture[1], new Date(124, Calendar.JULY, 14));
@@ -120,7 +120,7 @@ class RecoveryPasswordTokenTest {
   }
 
   @Test
-  void set_expires_at() {
+  void test_setExpiresAt() {
     RecoveryPasswordToken token = fixture[0];
     assertEquals(new Date(124, Calendar.MARCH, 28), token.getExpiresAt());
     Date newDate = new Date(124, Calendar.FEBRUARY, 3);
diff --git a/S2/DevWeb/Projet/src/test/java/uppa/project/pojo/UserTest.java b/S2/DevWeb/Projet/src/test/java/uppa/project/pojo/UserTest.java
index 84fff37..73a23f5 100644
--- a/S2/DevWeb/Projet/src/test/java/uppa/project/pojo/UserTest.java
+++ b/S2/DevWeb/Projet/src/test/java/uppa/project/pojo/UserTest.java
@@ -160,7 +160,7 @@ class UserTest {
 
 
   @Test
-  void setBirth() {
+  void test_setBirth() {
     User user = fixture[0];
     assertEquals(new Date(1996 - 1900, Calendar.FEBRUARY, 20), user.getBirth());
 
@@ -170,7 +170,7 @@ class UserTest {
   }
 
   @Test
-  void getGender() {
+  void test_getGender() {
     final HashMap<User, User.Gender> TESTS = new HashMap<>() {{
       put(fixture[0], User.Gender.MALE);
       put(fixture[1], User.Gender.FEMALE);
@@ -192,7 +192,27 @@ class UserTest {
   }
 
   @Test
-  void verifyPassword() {
+  void test_UserGender() {
+
+    // Expect the right number of genders
+    assertEquals(3, User.Gender.values().length);
+
+    // Expect the right name and ordinal for each gender
+    final String[] EXPECTED_NAMES = new String[]{
+      "MALE", "FEMALE", "OTHER"
+    };
+
+    for (int index = 0; index < EXPECTED_NAMES.length; index++) {
+      String expectedName = EXPECTED_NAMES[index];
+      User.Gender currentValue = User.Gender.values()[index];
+
+      assertEquals(index, currentValue.ordinal());     // Ordinal
+      assertEquals(expectedName, currentValue.name()); // Name
+    }
+  }
+
+  @Test
+  void test_verifyPassword() {
     String [] passwords = {"password1", "password2", "password3"};
     User[] users = {
       new User("username1", "email1", "password1", new Date(), User.Gender.MALE),
@@ -327,7 +347,7 @@ class UserTest {
   }
 
   @Test
-  void testToString() {
+  void test_toString() {
     final HashMap<User, String> TESTS = new HashMap<>() {{
       put(new User(new BigDecimal(1), "username1", "email1", "password1",
         new Date(1996-1900, 1, 4), User.Gender.MALE,null),
@@ -344,24 +364,4 @@ class UserTest {
       assertEquals(TESTS.get(user), user.toString());
     }
   }
-
-  @Test
-  void testGetGender() {
-
-    // Expect the right number of genders
-    assertEquals(3, User.Gender.values().length);
-
-    // Expect the right name and ordinal for each gender
-    final String[] EXPECTED_NAMES = new String[]{
-      "MALE", "FEMALE", "OTHER"
-    };
-
-    for (int index = 0; index < EXPECTED_NAMES.length; index++) {
-      String expectedName = EXPECTED_NAMES[index];
-      User.Gender currentValue = User.Gender.values()[index];
-
-      assertEquals(index, currentValue.ordinal());     // Ordinal
-      assertEquals(expectedName, currentValue.name()); // Name
-    }
-  }
 }