diff --git a/build.gradle b/build.gradle
index a388517ae1..b7aa1870bf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -28,11 +28,11 @@ test {
 }
 
 application {
-    mainClass.set("seedu.duke.Duke")
+    mainClass.set("Jelly.main.Jelly")
 }
 
 shadowJar {
-    archiveBaseName = "duke"
+    archiveBaseName = "Jelly"
     archiveClassifier = null
     dependsOn("distZip", "distTar")
 }
diff --git a/src/main/java/Jelly/main/Storage.java b/src/main/java/Jelly/main/Storage.java
index c2b0af6cd8..9d0971a6b6 100644
--- a/src/main/java/Jelly/main/Storage.java
+++ b/src/main/java/Jelly/main/Storage.java
@@ -63,7 +63,7 @@ public ArrayList<Task> startUp() throws JellyException {
 
     public void saveAndExit(TaskList taskList) {
         try {
-            FileWriter fileWriter = new FileWriter(FILE_PATH);
+            FileWriter fileWriter = new FileWriter(filePath);
 
             for (int i = 0; i < taskList.size(); i++) {
                 fileWriter.write(taskList.get(i).writeToFile() + "\n");
diff --git a/src/main/java/Jelly/task/ToDoTest.java b/src/main/java/Jelly/task/ToDoTest.java
new file mode 100644
index 0000000000..3b19d1f11f
--- /dev/null
+++ b/src/main/java/Jelly/task/ToDoTest.java
@@ -0,0 +1,4 @@
+package Jelly.task;
+
+public class ToDoTest {
+}
diff --git a/src/test/java/Jelly/main/StorageTest.java b/src/test/java/Jelly/main/StorageTest.java
new file mode 100644
index 0000000000..8b56e14404
--- /dev/null
+++ b/src/test/java/Jelly/main/StorageTest.java
@@ -0,0 +1,44 @@
+package Jelly.main;
+
+import Jelly.exceptions.JellyException;
+import Jelly.task.Deadline;
+import Jelly.task.Task;
+import Jelly.task.Todo;
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
+public class StorageTest {
+    @Test
+    public void startUpTest() throws IOException, JellyException {
+        File tempTasks = File.createTempFile("tempTasks",".txt");
+
+        String filePath = tempTasks.getAbsolutePath();
+        Storage storage = new Storage(filePath);
+
+        ArrayList<Task> taskList = new ArrayList<>();
+        taskList.add(new Todo("Do that"));
+        taskList.get(0).markAsDone();
+        taskList.add(new Deadline("Do this thing", "18/12/2020 1900"));
+
+        TaskList savedList = new TaskList(taskList);
+        storage.saveAndExit(savedList);
+
+        ArrayList<Task> loadedList = storage.startUp();
+        tempTasks.deleteOnExit();
+
+        for (int i = 0; i < taskList.size(); i++) {
+            assertEquals(taskList.get(i).getDescription(),
+                    loadedList.get(i).getDescription());
+            assertEquals(taskList.get(i).getIsDone(),
+                    loadedList.get(i).getIsDone());
+        }
+    }
+
+}
diff --git a/src/test/java/Jelly/main/TaskListTest.java b/src/test/java/Jelly/main/TaskListTest.java
new file mode 100644
index 0000000000..8ee1f3afd8
--- /dev/null
+++ b/src/test/java/Jelly/main/TaskListTest.java
@@ -0,0 +1,29 @@
+package Jelly.main;
+
+
+import Jelly.task.Task;
+import Jelly.task.Todo;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
+public class TaskListTest {
+    @Test
+    public void markTest() {
+        TaskList taskList = new TaskList();
+        Task todo = new Todo("Do this");
+        taskList.add(todo);
+        taskList.markAsDone(0);
+        assertTrue(todo.getIsDone());
+    }
+    @Test
+    public void unmarkTest() {
+        TaskList taskList = new TaskList();
+        Task todo = new Todo("Do this");
+        todo.markAsDone();
+        taskList.add(todo);
+        taskList.markAsUndone(0);
+        assertFalse(todo.getIsDone());
+    }
+}
diff --git a/src/test/java/Jelly/task/ToDoTest.java b/src/test/java/Jelly/task/ToDoTest.java
new file mode 100644
index 0000000000..db131c5fb8
--- /dev/null
+++ b/src/test/java/Jelly/task/ToDoTest.java
@@ -0,0 +1,17 @@
+package Jelly.task;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class ToDoTest {
+    @Test
+    public void dummyTest(){
+        assertEquals(2, 2);
+    }
+
+    @Test
+    public void anotherDummyTest(){
+        assertEquals(4, 4);
+    }
+}
diff --git a/taskData/jelly.txt b/taskData/jelly.txt
index 1ec49cdf9e..7a573c0134 100644
--- a/taskData/jelly.txt
+++ b/taskData/jelly.txt
@@ -1,3 +1,2 @@
-E | 1 | do this  | 12/02/1010 1900 to 13/10/2020 1900
-D | 0 | do this thing  | 12/02/1900 1900
-T | 0 | that thing 
+T | 1 | Do that
+D | 0 | Do this thing | 18/12/2020 1900