diff --git a/build.gradle b/build.gradle
index 0056f70f00671c765e2c4da22dc105fef5c663a0..224d585465ba1fa42b6f85aecc89c8215d8ba970 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,9 +13,9 @@ repositories {
 }
 
 dependencies {
-    testImplementation('org.junit.jupiter:junit-jupiter-api:5.7.2',
-            'org.hamcrest:hamcrest-library:2.2', 'net.obvj:junit-utils:1.3.1')
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.2'
+    testImplementation('org.junit.jupiter:junit-jupiter-api:5.8.1',
+            'org.assertj:assertj-core:3.21.0')
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'
 }
 
 test {
diff --git a/src/main/java/image/Image.java b/src/main/java/image/Image.java
index 5764c8adb331bdd61e6fe700a2afffcd42bb363e..01dcedce42c677b38517dc500a1b173c58ea61c5 100644
--- a/src/main/java/image/Image.java
+++ b/src/main/java/image/Image.java
@@ -2,9 +2,6 @@ package image;
 
 import javafx.scene.paint.Color;
 
-/**
- * Created by Arnaud Labourel on 09/11/2018.
- */
 public interface Image {
     Color getPixelColor(int x, int y);
     int getWidth();
diff --git a/src/main/java/image/ImageFactory.java b/src/main/java/image/ImageFactory.java
index fa2530dfb945570fd9b379daed91d51656d35676..fb48197dd53b0be85248ad10940a372c6a849938 100644
--- a/src/main/java/image/ImageFactory.java
+++ b/src/main/java/image/ImageFactory.java
@@ -1,8 +1,5 @@
 package image;
 
-/**
- * Created by Arnaud Labourel on 23/11/2018.
- */
 public interface ImageFactory {
     Image makeImage();
 }
diff --git a/src/main/java/image/Pixel.java b/src/main/java/image/Pixel.java
deleted file mode 100644
index adbfdfa58af27cca2cd137ca8fed47de35d54daf..0000000000000000000000000000000000000000
--- a/src/main/java/image/Pixel.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package image;
-
-import javafx.scene.paint.Color;
-
-/**
- * Created by Arnaud Labourel on 09/11/2018.
- */
-public class Pixel extends Point{
-    private Color color;
-
-    Pixel(int x, int y, Color color) {
-        super(x, y);
-        this.color = color;
-    }
-
-    public Color getColor() {
-        return color;
-    }
-}
diff --git a/src/main/java/viewer/Display.java b/src/main/java/viewer/Display.java
index 377b5162a7c21a765bbb1e5c572add36e3a62c75..cbe0d3b3b6753781e847547402311f89f826aa0b 100644
--- a/src/main/java/viewer/Display.java
+++ b/src/main/java/viewer/Display.java
@@ -11,9 +11,6 @@ import javafx.scene.paint.Color;
 import java.net.URL;
 import java.util.ResourceBundle;
 
-/**
- * Created by Arnaud Labourel on 04/10/2018.
- */
 public class Display implements Initializable {
     @FXML
     private Canvas canvas;
diff --git a/src/main/java/viewer/Main.java b/src/main/java/viewer/Main.java
index da5c52b505bbc484ae32dff56641f069ed8c900c..382ee99273c7d9169f8ddd9df5f811e200a06326 100644
--- a/src/main/java/viewer/Main.java
+++ b/src/main/java/viewer/Main.java
@@ -19,7 +19,7 @@ public class Main extends Application
 
     @Override
     public void start(Stage primaryStage) throws IOException {
-        Parent root =FXMLLoader.load(Objects.requireNonNull(getClass().getClassLoader().getResource("fxml/Display.fxml")));
+        Parent root = FXMLLoader.load(Objects.requireNonNull(getClass().getClassLoader().getResource("fxml/Display.fxml")));
         primaryStage.setTitle("Image display");
         primaryStage.setScene(new Scene(root));
         primaryStage.show();
diff --git a/src/test/java/BlankImageTest.java b/src/test/java/BlankImageTest.java
index b7030780d0acc1400103c178df92edb1bbaf050b..b11682464930417695bed8f7e175a81b37b81f3b 100644
--- a/src/test/java/BlankImageTest.java
+++ b/src/test/java/BlankImageTest.java
@@ -1,29 +1,28 @@
 import image.BlankImage;
 import javafx.scene.paint.Color;
-import org.junit.jupiter.api.Test;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.*;
 
+import org.junit.jupiter.api.Test;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class BlankImageTest {
   @Test
   public void testBlankImageGetWidth(){
     BlankImage blankImage = new BlankImage(200, 300);
-    assertThat(blankImage.getWidth(), is(equalTo(200)));
+    assertThat(blankImage.getWidth()).isEqualTo(200);
   }
 
   @Test
   public void testBlankImageGetHeight(){
     BlankImage blankImage = new BlankImage(200, 300);
-    assertThat(blankImage.getHeight(), is(equalTo(300)));
+    assertThat(blankImage.getHeight()).isEqualTo(300);
   }
 
   @Test
   public void testBlankImageGetPixelColor(){
     BlankImage blankImage = new BlankImage(200, 300);
-    assertThat(blankImage.getPixelColor(0,0), is(equalTo(Color.WHITE)));
-    assertThat(blankImage.getPixelColor(100,100), is(equalTo(Color.WHITE)));
-    assertThat(blankImage.getPixelColor(199,299), is(equalTo(Color.WHITE)));
+    assertThat(blankImage.getPixelColor(0,0)).isEqualTo(Color.WHITE);
+    assertThat(blankImage.getPixelColor(100,100)).isEqualTo(Color.WHITE);
+    assertThat(blankImage.getPixelColor(199,299)).isEqualTo(Color.WHITE);
   }
 
 }