diff --git a/build.gradle b/build.gradle
index 42a865b..a59a458 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,6 +10,8 @@ repositories {
 dependencies {
 	testImplementation(platform('org.junit:junit-bom:5.10.0'))
 	testImplementation('org.junit.jupiter:junit-jupiter')
+	testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.24.2'
+	testImplementation "org.mockito:mockito-core:3.+"
 }
 
 test {
diff --git a/lib/aopalliance-1.0.jar b/lib/aopalliance-1.0.jar
new file mode 100644
index 0000000..578b1a0
Binary files /dev/null and b/lib/aopalliance-1.0.jar differ
diff --git a/lib/apiguardian-api-1.1.2.jar b/lib/apiguardian-api-1.1.2.jar
new file mode 100644
index 0000000..2b678e1
Binary files /dev/null and b/lib/apiguardian-api-1.1.2.jar differ
diff --git a/lib/guava-19.0.jar b/lib/guava-19.0.jar
new file mode 100644
index 0000000..b175ca8
Binary files /dev/null and b/lib/guava-19.0.jar differ
diff --git a/lib/guice-4.1.0-no_aop.jar b/lib/guice-4.1.0-no_aop.jar
new file mode 100644
index 0000000..5d19a30
Binary files /dev/null and b/lib/guice-4.1.0-no_aop.jar differ
diff --git a/lib/javax.inject-1.jar b/lib/javax.inject-1.jar
new file mode 100644
index 0000000..b2a9d0b
Binary files /dev/null and b/lib/javax.inject-1.jar differ
diff --git a/lib/jcommander-1.72.jar b/lib/jcommander-1.72.jar
new file mode 100644
index 0000000..acb8e60
Binary files /dev/null and b/lib/jcommander-1.72.jar differ
diff --git a/lib/junit-jupiter-5.8.1.jar b/lib/junit-jupiter-5.8.1.jar
new file mode 100644
index 0000000..730b9ae
Binary files /dev/null and b/lib/junit-jupiter-5.8.1.jar differ
diff --git a/lib/junit-jupiter-api-5.8.1.jar b/lib/junit-jupiter-api-5.8.1.jar
new file mode 100644
index 0000000..8424eca
Binary files /dev/null and b/lib/junit-jupiter-api-5.8.1.jar differ
diff --git a/lib/junit-jupiter-engine-5.8.1.jar b/lib/junit-jupiter-engine-5.8.1.jar
new file mode 100644
index 0000000..cfa38d2
Binary files /dev/null and b/lib/junit-jupiter-engine-5.8.1.jar differ
diff --git a/lib/junit-jupiter-params-5.8.1.jar b/lib/junit-jupiter-params-5.8.1.jar
new file mode 100644
index 0000000..1e4d0ec
Binary files /dev/null and b/lib/junit-jupiter-params-5.8.1.jar differ
diff --git a/lib/junit-platform-commons-1.8.1.jar b/lib/junit-platform-commons-1.8.1.jar
new file mode 100644
index 0000000..20185cd
Binary files /dev/null and b/lib/junit-platform-commons-1.8.1.jar differ
diff --git a/lib/junit-platform-engine-1.8.1.jar b/lib/junit-platform-engine-1.8.1.jar
new file mode 100644
index 0000000..54ce076
Binary files /dev/null and b/lib/junit-platform-engine-1.8.1.jar differ
diff --git a/lib/opentest4j-1.2.0.jar b/lib/opentest4j-1.2.0.jar
new file mode 100644
index 0000000..d500636
Binary files /dev/null and b/lib/opentest4j-1.2.0.jar differ
diff --git a/lib/snakeyaml-1.21.jar b/lib/snakeyaml-1.21.jar
new file mode 100644
index 0000000..f73f4c9
Binary files /dev/null and b/lib/snakeyaml-1.21.jar differ
diff --git a/lib/testng-7.1.0.jar b/lib/testng-7.1.0.jar
new file mode 100644
index 0000000..5b52392
Binary files /dev/null and b/lib/testng-7.1.0.jar differ
diff --git a/src/test/java/movierental/CustomerTest.java b/src/test/java/movierental/CustomerTest.java
index 3263827..b0f20bf 100644
--- a/src/test/java/movierental/CustomerTest.java
+++ b/src/test/java/movierental/CustomerTest.java
@@ -2,7 +2,9 @@ package movierental;
 
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class CustomerTest {
 
@@ -10,29 +12,22 @@ public class CustomerTest {
     public void test() {
         // Given
         Customer customer = new Customer("Bob");
-        customer.addRental(new Rental(new Movie("Jaws", Movie.REGULAR), 2));
-        customer.addRental(new Rental(new Movie("Golden Eye", Movie.REGULAR), 3));
-        customer.addRental(new Rental(new Movie("Short New", Movie.NEW_RELEASE), 1));
-        customer.addRental(new Rental(new Movie("Long New", Movie.NEW_RELEASE), 2));
-        customer.addRental(new Rental(new Movie("Bambi", Movie.CHILDRENS), 3));
-        customer.addRental(new Rental(new Movie("Toy Story", Movie.CHILDRENS), 4));
+        Movie mockMovie = mock(Movie.class);
+
+        when(mockMovie.getTitle()).thenReturn("Mock Movie");
+        when(mockMovie.getPriceCode()).thenReturn(Movie.REGULAR);
+        customer.addRental(new Rental(mockMovie, 2));
 
         // When
         String statement = customer.statement();
 
-
         // Then
         String expected = "" +
                 "Rental Record for Bob\n" +
-                "\tJaws\t2.0\n" +
-                "\tGolden Eye\t3.5\n" +
-                "\tShort New\t3.0\n" +
-                "\tLong New\t6.0\n" +
-                "\tBambi\t1.5\n" +
-                "\tToy Story\t3.0\n" +
-                "Amount owed is 19.0\n" +
-                "You earned 7 frequent renter points";
+                "\tMock Movie\t2.0\n" +
+                "Amount owed is 2.0\n" +
+                "You earned 1 frequent renter points";
 
-        assertEquals(expected, statement);
+        assertThat(statement).isEqualTo(expected);
     }
 }
\ No newline at end of file