diff --git a/Timetable.csv b/Timetable.csv
index ade118802b85257a09c98107b037d75d21cb885f..23887234e396452ac6c47da5908b81bb51502070 100644
--- a/Timetable.csv
+++ b/Timetable.csv
@@ -1 +1,11 @@
 st,t1,rpl
+null,test,RPL
+null,test,RPL,RPL
+null,test,RPL,RPL,RPL
+null,test,RPL,RPL,RPL,RPL
+null,test,RPL,RPL,RPL,RPL,RPL
+null,test,RPL
+null,test,RPL,RPL
+null,test,RPL,RPL,RPL
+null,test,RPL,RPL,RPL,RPL
+null,test,RPL,RPL,RPL,RPL,RPL
diff --git a/build/classes/java/test/repository/AssignmentListTest.class b/build/classes/java/test/repository/AssignmentListTest.class
index 126c180935a921f2500f8b9bd9f3101196c03136..1c1a174f0b7f19721c80518b27aac6022d84330c 100644
Binary files a/build/classes/java/test/repository/AssignmentListTest.class and b/build/classes/java/test/repository/AssignmentListTest.class differ
diff --git a/src/test/java/repository/AssignmentListTest.java b/src/test/java/repository/AssignmentListTest.java
index dfec70270dc97786bdfdc8d30bc5d2f3570844e4..f5f3911c95754541c4a8e2c26363269806ed0b7e 100644
--- a/src/test/java/repository/AssignmentListTest.java
+++ b/src/test/java/repository/AssignmentListTest.java
@@ -31,12 +31,19 @@ public class AssignmentListTest {
     }
 
     @Test
-    void getAssignmentList(){
+    void getAssignmentListTest(){
         assignmentList.addAssignment("name", assignment);
         List<Assignment> TestList = assignmentList.getAssignmentList();
         assertNotEquals(null, TestList);
     }
 
+    @Test
+    void getAssignmentTest(){
+        assignmentList.addAssignment("name", assignment);
+        String name = assignmentList.getAssignment("name").getAssignmentName();
+        assertEquals("name", name);
+    }
+
     @Test
     void addAssignmentTest(){
         int before = assignmentList.getAssignmentList().size();
diff --git a/src/test/java/repository/TimetableListTest.java b/src/test/java/repository/TimetableListTest.java
index 020cd57556b800dcdba1a9afc86cacaa95d6be58..f905da1602506ad030f77c80ddb13a32cd5265d3 100644
--- a/src/test/java/repository/TimetableListTest.java
+++ b/src/test/java/repository/TimetableListTest.java
@@ -1,16 +1,34 @@
 package repository;
 
+import Softeng.Group3.SiJadwal.Main;
+import Softeng.Group3.SiJadwal.actor.RoleType;
 import Softeng.Group3.SiJadwal.actor.User;
+import Softeng.Group3.SiJadwal.model.Assignment;
 import Softeng.Group3.SiJadwal.model.Timetable;
+import Softeng.Group3.SiJadwal.model.Course;
+import Softeng.Group3.SiJadwal.repository.CourseList;
 import Softeng.Group3.SiJadwal.repository.TimetableList;
+import Softeng.Group3.SiJadwal.repository.UserList;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.sql.Time;
+import java.util.ArrayList;
+import java.util.List;
+
 import static org.junit.jupiter.api.Assertions.*;
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 class TimetableListTest {
 
+    private final PrintStream standardOut = System.out;
+    private final ByteArrayOutputStream outputStreamCaptor = new ByteArrayOutputStream();
+    private static final List<Course> courses = new ArrayList<>();
+
+
     @Test
     void getAllTimetableList() {
         TimetableList timetableList = new TimetableList();
@@ -21,23 +39,75 @@ class TimetableListTest {
     @Test
     void getTimetableList() {
         TimetableList timetableList = new TimetableList();
-        Timetable timetableA = new Timetable();
+        Course rpl = new Course("RPL", "Ade", new Time(500), new Time(1000));
+        courses.add(rpl);
+
         User A = new User();
+        Timetable timetableA = new Timetable("test", courses, A);
+        timetableList.addTimetable("test", timetableA);
+        assertNotEquals(null, timetableList.getTimetableList(A));
+
     }
 
     @Test
     void getTimetable() {
+        TimetableList timetableList = new TimetableList();
+        Course rpl = new Course("RPL", "Ade", new Time(500), new Time(1000));
+        courses.add(rpl);
+
+        User A = new User();
+        Timetable timetableA = new Timetable("test", courses, A);
+        timetableList.addTimetable("test", timetableA);
+
+        assertEquals("test", timetableList.getTimetable("test", A).getTimetableName());
+
     }
 
     @Test
     void addTimetable() {
+        TimetableList timetableList = new TimetableList();
+        Course rpl = new Course("RPL", "Ade", new Time(500), new Time(1000));
+        courses.add(rpl);
+
+        User A = new User();
+        Timetable timetableA = new Timetable("test", courses, A);
+        int before = timetableList.getTimetableList(A).size();
+        timetableList.addTimetable("test", timetableA);
+        int after = timetableList.getTimetableList(A).size();
+
+        assertEquals(before + 1, after);
     }
 
     @Test
     void listToString() {
+        System.setOut(new PrintStream(outputStreamCaptor));
+        TimetableList timetableList = new TimetableList();
+        Course rpl = new Course("RPL", "Ade", new Time(500), new Time(1000));
+        courses.add(rpl);
+
+        User A = new User();
+        Timetable timetableA = new Timetable("test", courses, A);
+        timetableList.addTimetable("test", timetableA);
+
+
+        timetableList.listToString(timetableList.getTimetableList(A));
+        assertEquals("1. test", outputStreamCaptor.toString().trim());
+        System.setOut(standardOut);
     }
 
     @Test
     void deleteTimetable() {
+        TimetableList timetableList = new TimetableList();
+        Course rpl = new Course("RPL", "Ade", new Time(500), new Time(1000));
+        courses.add(rpl);
+
+        User A = new User();
+        Timetable timetableA = new Timetable("test", courses, A);
+        timetableList.addTimetable("test", timetableA);
+        int before = timetableList.getTimetableList(A).size();
+        timetableList.deleteTimetable(timetableA);
+        int after = timetableList.getTimetableList(A).size();
+
+        assertEquals(before - 1, after);
     }
 }
\ No newline at end of file