diff --git a/src/test/java/ch/hepia/models/UserTest.java b/src/test/java/ch/hepia/models/UserTest.java
index 45a341af2db5654906b45e26d6f2111f5230909e..b06742b3b3dc7d7f185d2115414f134f23c2b3fc 100644
--- a/src/test/java/ch/hepia/models/UserTest.java
+++ b/src/test/java/ch/hepia/models/UserTest.java
@@ -1,12 +1,8 @@
 package ch.hepia.models;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
 import org.junit.jupiter.api.Test;
-import java.util.*; 
 
 class UserTest {
     @Test 
diff --git a/src/test/java/ch/hepia/mq/MessageTest.java b/src/test/java/ch/hepia/mq/MessageTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..371cc0a12eae483de2b2ccef1d07fddeda5ff7fd
--- /dev/null
+++ b/src/test/java/ch/hepia/mq/MessageTest.java
@@ -0,0 +1,23 @@
+package ch.hepia.mq;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.awt.TrayIcon.MessageType;
+
+import org.junit.jupiter.api.Test;
+
+import ch.hepia.mq.Message.Type;
+import ch.hepia.events.ChatMessage;
+import ch.hepia.models.*;
+class UserTest {
+    User u = new User("Test");
+    ChatMessage cm = new ChatMessage(u, "Bonjour");
+    Message m = new Message(Type.ChatMessage, cm);
+
+    @Test 
+    void ChatMessageTest() {
+        ChatMessage msg = m.getData();
+        assertEquals(u, msg.getUser());
+        assertEquals("Bonjour", msg.getMessage());
+    }
+}
\ No newline at end of file