diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java
index 621a470..0b7a1b4 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java
@@ -49,11 +49,11 @@ public class MockController {
         // user part
 
 
-        User herobrine = new User("brine","hero","admin@admin.com","in your WalLs","ShadowsLand",new Date(0), null,Role.Admin,passwordEncoder.encode("admin"));
-        User joe = new User("Mama","Joe","student@student.com","roundabout","DaWarudo",new Date(0), null,Role.Student,passwordEncoder.encode("student"));
-        User meh = new User("Inspiration","lackOf","secretary@secretary.com","a Box","the street",new Date(0), null,Role.Secretary,passwordEncoder.encode("secretary"));
-        User joke = new User("CthemBalls","Lemme","teacher@teacher.com","lab","faculty",new Date(0), null,Role.Teacher,passwordEncoder.encode("teacher"));
-        User jojo = new User("hhoo","yeay","teacher2@teacher2.com","lab","faculty",new Date(0), null,Role.Teacher,passwordEncoder.encode("teacher"));
+        User herobrine = new User("brine","hero","admin@admin.com","behind","ShadowsLand",new Date(0), null,Role.Admin,passwordEncoder.encode("admin"));
+        User joe = new User("Mama","Joe","student@student.com","roundabout","England",new Date(0), null,Role.Student,passwordEncoder.encode("student"));
+        User meh = new User("Polo","Marco","secretary@secretary.com","a Box","Monaco",new Date(0), null,Role.Secretary,passwordEncoder.encode("secretary"));
+        User joke = new User("Gaillard","Corentin","teacher@teacher.com","lab","faculty",new Date(0), null,Role.Teacher,passwordEncoder.encode("teacher"));
+        User jojo = new User("Bridoux","Justin","teacher2@teacher2.com","lab","faculty",new Date(0), null,Role.Teacher,passwordEncoder.encode("teacher"));
         User lena = new User("Louille","Lena","inscriptionService@InscriptionService.com","no","yes",new Date(0), null,Role.InscriptionService,passwordEncoder.encode("inscriptionService"));
         mockUsers = new ArrayList<>(Arrays.asList(herobrine,joe,meh,joke,lena,jojo));
 
@@ -72,7 +72,7 @@ public class MockController {
 
         Course progra1 = new Course(5,"Programmation et algorithmique 1",joke);
         Course chemistry1 = new Course(12, "Thermochimie",joke);
-        Course psycho1 = new Course(21, "rien faire t'as cru c'est psycho",joke);
+        Course psycho1 = new Course(21, "Neuroreaction of isolated brain cells",joke);
         Course commun = new Course(2, "cours commun",joke);
 
         courseService.save(progra1);
diff --git a/backend/src/test/java/ovh/herisson/Clyde/Endpoints/UserControllerTest.java b/backend/src/test/java/ovh/herisson/Clyde/Endpoints/UserControllerTest.java
index 8349a74..0d1322c 100644
--- a/backend/src/test/java/ovh/herisson/Clyde/Endpoints/UserControllerTest.java
+++ b/backend/src/test/java/ovh/herisson/Clyde/Endpoints/UserControllerTest.java
@@ -88,14 +88,14 @@ public class UserControllerTest {
         tokenService.saveToken(godToken);
 
         //Can god post herobrine himself ?
-        User herobrine = new User("brine","hero","herobrine@admin.com","in your WalLs","ShadowsLand",new Date(0), null,Role.Student,"test");
+        User herobrine = new User("brine","hero","herobrine@student.com","in your WalLs","ShadowsLand",new Date(0), null,Role.Student,"test");
 
         with().body(herobrine).contentType(ContentType.JSON).header("Authorization", godToken.getToken()).when().request("POST", "/user").then().statusCode(201);
 
         userRepository.delete(herobrine);
 
         //Can noob post herobrine without authorizations (no)
-        User noob = new User("boon","noob","noob@admintkt.com","everywhere","every",new Date(0), null, Role.Student,"noob");
+        User noob = new User("boon","noob","noob@student.com","everywhere","every",new Date(0), null, Role.Student,"noob");
         Token noobToken = new Token(noob, tokenService.generateNewToken(), new Date());
         userRepository.save(noob);
         tokenService.saveToken(noobToken);
@@ -105,7 +105,7 @@ public class UserControllerTest {
 
     @Test
     public void userGetTest(){
-        User herobrine = new User("brine","hero","herobrine@admin.com","in your WalLs","ShadowsLand",new Date(0), null,Role.Student,"test");
+        User herobrine = new User("brine","hero","herobrine@student.com","in your WalLs","ShadowsLand",new Date(0), null,Role.Student,"test");
         userRepository.save(herobrine);
 
         Token t = new Token(herobrine, tokenService.generateNewToken(), new Date());
diff --git a/backend/src/test/java/ovh/herisson/Clyde/Services/TokenServiceTest.java b/backend/src/test/java/ovh/herisson/Clyde/Services/TokenServiceTest.java
index c0314ea..0e9a81a 100644
--- a/backend/src/test/java/ovh/herisson/Clyde/Services/TokenServiceTest.java
+++ b/backend/src/test/java/ovh/herisson/Clyde/Services/TokenServiceTest.java
@@ -70,7 +70,7 @@ class TokenServiceTest {
         ArrayList<Token> tokenList = new ArrayList<>();
         GregorianCalendar gc = new GregorianCalendar();
 
-        User malveillant = new User("mechant", "veutdestoken", "donnezmoidestoken@mail.com", "secret", "secret", null, null, null, "secret");
+        User malveillant = new User("Cargo", "John", "CargoJ@mail.com", "secret", "secret", null, null, null, "secret");
         userRepository.save(malveillant);
 
         for (int i = 0; i < 20; i++){