diff --git a/__tests__/assignment/createAssignment.test.tsx b/__tests__/assignment/createAssignment.test.tsx
index bbfe945..1ca299f 100644
--- a/__tests__/assignment/createAssignment.test.tsx
+++ b/__tests__/assignment/createAssignment.test.tsx
@@ -1,7 +1,8 @@
+import UpsertAssignment from "@/app/assignment/upsertAssignment";
+import { CheckSubjectCompletion } from "@/lib/progress";
 import { supabase } from "@/lib/supabase";
 import { fireEvent, render, waitFor } from "@testing-library/react-native";
 import { router } from "expo-router";
-import CreateAssignment from "../../app/assignment/createAssignment";
 
 const mockSingle = jest.fn();
 const mockSelect = jest.fn(() => ({ single: mockSingle, }));
@@ -16,16 +17,17 @@ jest.mock("expo-router", () => ({
     Screen: () => null,
   },
   useLocalSearchParams: () => ({
-    sId: null,
+    sId: "subject-123",
   }),
 }));
 
 jest.mock("@/lib/progress", () => ({
-  CheckAssignmentCompletion: jest.fn(),
+  CheckSubjectCompletion: jest.fn(() => Promise.resolve()),
 }));
 
 jest.mock("@/lib/asyncStorage", () => ({
-  SaveAssignmentNotificationId: jest.fn(),
+  GetAssignmentNotificationId: jest.fn(() => Promise.resolve()),
+  SaveAssignmentNotificationId: jest.fn(() => Promise.resolve()),
 }));
 
 jest.mock("expo-notifications", () => ({
@@ -35,39 +37,46 @@ jest.mock("expo-notifications", () => ({
   },
 }));
 
-jest.mock("@/lib/supabase", () => {
-  return {
-    supabase: {
-      auth: {
-        getUser: jest.fn(() =>
-          Promise.resolve({
-            data: { user: { id: "user-123" } },
-            error: null,
-          })
-        ),
-      },
-      from: jest.fn(() => ({
-        insert: mockInsert,
-      })),
+jest.mock("@/lib/supabase", () => ({
+  supabase: {
+    auth: {
+      getUser: jest.fn(() =>
+        Promise.resolve({
+          data: { user: { id: "user-123" } },
+          error: null,
+        })
+      ),
     },
-  };
-});
+    from: jest.fn(() => ({
+      insert: mockInsert,
+    })),
+  },
+}));
 
 test("creates an assignment and navigates back", async () => {
   mockSingle.mockResolvedValue({ 
     data: { 
-        aId: "assignment-123", title: "create a simple test", deadline: "",
+        aId: "assignment-123", 
+        title: "create a simple test", 
+        deadline: "",
     },
     error: null,
   });
 
-  const screen = render(<CreateAssignment />);
+  const screen = render(<UpsertAssignment />);
   fireEvent.changeText(screen.getByTestId("assignment-title-input"), "create a simple test");
-  fireEvent.press(screen.getByTestId("create-assignment-button"));
+  fireEvent.press(screen.getByTestId("upsert-assignment-button"));
 
   await waitFor(() => {
     expect(supabase.from).toHaveBeenCalledWith("assignments");
-    expect(mockInsert).toHaveBeenCalled();
+    expect(mockInsert).toHaveBeenCalledWith(
+      expect.objectContaining({
+        title: "create a simple test",
+        uId: "user-123",
+        sId: "subject-123",
+      })
+    );
+    expect(CheckSubjectCompletion).toHaveBeenCalledWith("subject-123");
     expect(router.back).toHaveBeenCalled();
   });
 });
\ No newline at end of file
diff --git a/__tests__/assignment/deleteAssignment.test.tsx b/__tests__/assignment/deleteAssignment.test.tsx
index 02de5a3..e16e3bf 100644
--- a/__tests__/assignment/deleteAssignment.test.tsx
+++ b/__tests__/assignment/deleteAssignment.test.tsx
@@ -1,16 +1,22 @@
+import ViewDetailsAssignment from "@/app/assignment/viewDetailsAssignment";
+import { CheckSubjectCompletion } from "@/lib/progress";
 import { supabase } from "@/lib/supabase";
 import { fireEvent, render, waitFor } from "@testing-library/react-native";
 import { router } from "expo-router";
 import { Alert } from "react-native";
-import ViewDetailsAssignment from "../../app/assignment/viewDetailsAssignment";
 
-const mockSingleAssignment = jest.fn();
-const mockSelectAssignmentEq = jest.fn(() => ({ single: mockSingleAssignment, }));
-const mockSelectAssignment = jest.fn(() => ({ eq: mockSelectAssignmentEq, }));
-const mockSelectTasksEq = jest.fn();
-const mockSelectTasks = jest.fn(() => ({ eq: mockSelectTasksEq }));
-const mockDeleteAssignmentEq = jest.fn();
-const mockDeleteAssignment = jest.fn(() => ({ eq: mockDeleteAssignmentEq, }));
+const mockAssignmentSingle = jest.fn();
+const mockAssignmentSelectEq = jest.fn(() => ({ single: mockAssignmentSingle, }));
+const mockAssignmentSelect = jest.fn(() => ({ eq: mockAssignmentSelectEq, }));
+const mockAssignmentDeleteEq = jest.fn();
+const mockAssignmentDelete = jest.fn(() => ({ eq: mockAssignmentDeleteEq, }));
+
+const mockTasksSelectEq = jest.fn();
+const mockTasksSelect = jest.fn(() => ({ eq: mockTasksSelectEq }));
+
+const mockSubjectSingle = jest.fn();
+const mockSubjectSelectEq = jest.fn(() => ({ single: mockSubjectSingle }));
+const mockSubjectSelect = jest.fn(() => ({ eq: mockSubjectSelectEq }));
 
 jest.mock("expo-router", () => ({
   router: {
@@ -23,71 +29,95 @@ jest.mock("expo-router", () => ({
   useLocalSearchParams: () => ({
     aId: "assignment-123",
   }),
-  useFocusEffect: (callback: () => void) => callback(),
+  useFocusEffect: (callback: () => void) => {
+    const React = require("react");
+    React.useEffect(callback, [callback]);
+  },
 }));
 
-jest.mock("@/lib/supabase", () => {
-  return {
-    supabase: {
-      auth: {
-        getUser: jest.fn(() =>
-          Promise.resolve({
-            data: { user: { uId: "user-123" } },
-            error: null,
-          })
-        ),
-        getSession: jest.fn(() =>
-          Promise.resolve({
-            data: {
-              session: {
-                user: { uId: "user-123" },
-              },
-            },
-          })
-        ),
-        onAuthStateChange: jest.fn(() => ({
+jest.mock("@/lib/progress", () => ({
+  CheckSubjectCompletion: jest.fn(() => Promise.resolve()),
+}));
+
+jest.mock("@/lib/supabase", () => ({
+  supabase: {
+    auth: {
+      getUser: jest.fn(() =>
+        Promise.resolve({
+          data: { user: { id: "user-123" } },
+          error: null,
+        })
+      ),
+      getSession: jest.fn(() =>
+        Promise.resolve({
           data: {
-            subscription: {
-              unsubscribe: jest.fn(),
+            session: {
+              user: { id: "user-123" },
             },
           },
-        })),
-      },
-      from: jest.fn((table) => {
-        if (table === "assignments") {
-          return {
-            select: mockSelectAssignment,
-            delete: mockDeleteAssignment,
-          };
-        }
-
-        if (table === "tasks") {
-          return {
-            select: mockSelectTasks,
-          };
-        }
-
-        return {};
-      }),
+        })
+      ),
+      onAuthStateChange: jest.fn(() => ({
+        data: {
+          subscription: {
+            unsubscribe: jest.fn(),
+          },
+        },
+      })),
     },
-  };
-});
+    from: jest.fn((table: string) => {
+      if (table === "assignments") {
+        return {
+          select: mockAssignmentSelect,
+          delete: mockAssignmentDelete,
+        };
+      }
+
+      if (table === "tasks") {
+        return {
+          select: mockTasksSelect,
+        };
+      }
+
+      if (table === "subjects") {
+        return {
+          select: mockSubjectSelect,
+        };
+      }
+
+      return {};
+    }),
+  },
+}));
 
 const alertSpy = jest.spyOn(Alert, "alert");
 
 test("deletes a task and navigates back", async () => {
-  mockSingleAssignment.mockResolvedValue({ 
+  mockAssignmentSingle.mockResolvedValue({ 
     data: { 
       aId: "assignment-123",
       title: "create a simple test",
       uId: "user-123",
+      sId: "subject-123"
     },
     error: null,
   });
-  mockSelectTasksEq.mockResolvedValue({ data: [], error: null, })
-  mockDeleteAssignmentEq.mockResolvedValue({ error: null, });
+  mockTasksSelectEq.mockResolvedValue({ data: [], error: null, })
+  mockSubjectSingle.mockResolvedValue({
+    data: {
+      sId: "subject-123",
+      title: "ikt205g26v",
+      color: "blue",
+    },
+    error: null,
+  });
+  mockAssignmentDeleteEq.mockResolvedValue({ error: null, });
 
   const screen = render(<ViewDetailsAssignment />);
+
+  await screen.findByText("create a simple test");
+  await screen.findByText("ikt205g26v");
+
   fireEvent.press(await screen.findByTestId("delete-assignment-button"));
 
   expect(alertSpy).toHaveBeenCalledWith(
@@ -103,8 +133,9 @@ test("deletes a task and navigates back", async () => {
 
   await waitFor(() => {
     expect(supabase.from).toHaveBeenCalledWith("assignments");
-    expect(mockDeleteAssignment).toHaveBeenCalled();
-    expect(mockDeleteAssignmentEq).toHaveBeenCalledWith("aId", "assignment-123");
+    expect(mockAssignmentDelete).toHaveBeenCalled();
+    expect(mockAssignmentDeleteEq).toHaveBeenCalledWith("aId", "assignment-123");
+    expect(CheckSubjectCompletion).toHaveBeenCalledWith("subject-123");
     expect(router.back).toHaveBeenCalled();
   });
-});
\ No newline at end of file
+});
diff --git a/__tests__/assignment/editAssignment.test.tsx b/__tests__/assignment/editAssignment.test.tsx
index 6a9e577..4b647fe 100644
--- a/__tests__/assignment/editAssignment.test.tsx
+++ b/__tests__/assignment/editAssignment.test.tsx
@@ -1,4 +1,5 @@
-import EditAssignment from "@/app/assignment/editAssignment";
+import UpsertAssignment from "@/app/assignment/upsertAssignment";
+import { CheckSubjectCompletion } from "@/lib/progress";
 import { supabase } from "@/lib/supabase";
 import { fireEvent, render, waitFor } from "@testing-library/react-native";
 import { router } from "expo-router";
@@ -26,7 +27,7 @@ jest.mock("expo-router", () => ({
 }));
 
 jest.mock("@/lib/progress", () => ({
-  CheckAssignmentCompletion: jest.fn(),
+  CheckSubjectCompletion: jest.fn(() => Promise.resolve()),
 }));
 
 jest.mock("@/lib/asyncStorage", () => ({
@@ -40,32 +41,31 @@ jest.mock("expo-notifications", () => ({
   },
 }));
 
-jest.mock("@/lib/supabase", () => {
-  return {
-    supabase: {
-      auth: {
-        getUser: jest.fn(() =>
-          Promise.resolve({
-            data: { user: { id: "user-123" } },
-            error: null,
-          })
-        ),
-      },
-      from: jest.fn(() => ({
-        select: mockSelect,
-        update: mockUpdate,
-      })),
+jest.mock("@/lib/supabase", () => ({
+  supabase: {
+    auth: {
+      getUser: jest.fn(() =>
+        Promise.resolve({
+          data: { user: { id: "user-123" } },
+          error: null,
+        })
+      ),
     },
-  };
-});
+    from: jest.fn(() => ({
+      select: mockSelect,
+      update: mockUpdate,
+    })),
+  },
+}));
 
 test("updates an assignment and navigates back", async () => {
   mockSingle.mockResolvedValue({ 
     data: {
         aId: "assignment-123", 
         title: "create a simple test",
-        uId: "user-123",
         deadline: "2026-04-25",
+        uId: "user-123",
+        sId: "subject-123",
     },
     error: null,
   });
@@ -73,15 +73,15 @@ test("updates an assignment and navigates back", async () => {
     data: {
         aId: "assignment-123", 
         title: "create a harder test",
-        uId: "user-123",
         deadline: "2026-04-25",
+        uId: "user-123",
     },
     error: null,
   });
 
-  const screen = render(<EditAssignment />);
+  const screen = render(<UpsertAssignment />);
   fireEvent.changeText(await screen.findByTestId("assignment-title-input"), "create a harder test");
-  fireEvent.press(screen.getByTestId("edit-assignment-button"));
+  fireEvent.press(screen.getByTestId("upsert-assignment-button"));
 
   await waitFor(() => {
     expect(supabase.from).toHaveBeenCalledWith("assignments");
@@ -94,6 +94,7 @@ test("updates an assignment and navigates back", async () => {
       })
     );
     expect(mockUpdateSingle).toHaveBeenCalled();
+    expect(CheckSubjectCompletion).toHaveBeenCalledWith("subject-123");
     expect(router.back).toHaveBeenCalled();
   });
 });
\ No newline at end of file
diff --git a/__tests__/authGuard.test.tsx b/__tests__/authGuard.test.tsx
new file mode 100644
index 0000000..8796790
--- /dev/null
+++ b/__tests__/authGuard.test.tsx
@@ -0,0 +1,79 @@
+import TabLayout from "@/app/(tabs)/_layout";
+import { supabase } from "@/lib/supabase";
+import { render, waitFor } from "@testing-library/react-native";
+
+jest.mock("expo-router", () => {
+  const React = require("react");
+  const { Text, View } = require("react-native");
+
+  const MockTabs = ({ children }: { children?: React.ReactNode }) => (
+    <View>
+      <Text>tabs</Text>
+      {children}
+    </View>
+  );
+
+  MockTabs.Screen = () => null;
+
+  return {
+    Redirect: ({ href }: { href: string }) => <Text>redirect:{href}</Text>,
+    Tabs: MockTabs,
+    router: {
+      push: jest.fn(),
+    },
+  };
+});
+
+jest.mock("expo-notifications", () => ({
+  getLastNotificationResponse: jest.fn(() => null),
+  addNotificationResponseReceivedListener: jest.fn(() => ({
+    remove: jest.fn(),
+  })),
+}));
+
+jest.mock("@/lib/supabase", () => ({
+  supabase: {
+    auth: {
+      getSession: jest.fn(),
+      onAuthStateChange: jest.fn(() => ({
+        data: {
+          subscription: {
+            unsubscribe: jest.fn(),
+          },
+        },
+      })),
+    },
+  },
+}));
+
+beforeEach(() => {
+  jest.clearAllMocks();
+});
+
+test("redirects to login if there is no session", async () => {
+  (supabase.auth.getSession as jest.Mock).mockResolvedValue({
+    data: { session: null },
+  });
+
+  const screen = render(<TabLayout />);
+
+  await waitFor(() => {
+    expect(screen.getByText("redirect:/login")).toBeTruthy();
+  });
+});
+
+test("renders tabs when session exists", async () => {
+  (supabase.auth.getSession as jest.Mock).mockResolvedValue({
+    data: {
+      session: {
+        user: { id: "user-123" },
+      },
+    },
+  });
+
+  const screen = render(<TabLayout />);
+
+  await waitFor(() => {
+    expect(screen.getByText("tabs")).toBeTruthy();
+  });
+});
\ No newline at end of file
diff --git a/__tests__/subject/createSubject.test.tsx b/__tests__/subject/createSubject.test.tsx
index a375ec5..fd42c2a 100644
--- a/__tests__/subject/createSubject.test.tsx
+++ b/__tests__/subject/createSubject.test.tsx
@@ -1,7 +1,7 @@
+import UpsertSubject from "@/app/subject/upsertSubject";
 import { supabase } from "@/lib/supabase";
 import { fireEvent, render, waitFor } from "@testing-library/react-native";
 import { router } from "expo-router";
-import CreateSubject from "../../app/subject/createSubject";
 
 const mockInsert = jest.fn();
 
@@ -13,36 +13,40 @@ jest.mock("expo-router", () => ({
   Stack: {
     Screen: () => null,
   },
+  useLocalSearchParams: () => ({}),
 }));
 
-jest.mock("@/lib/supabase", () => {
-  return {
-    supabase: {
-      auth: {
-        getUser: jest.fn(() =>
-          Promise.resolve({
-            data: { user: { id: "user-123" } },
-            error: null,
-          })
-        ),
-      },
-      from: jest.fn(() => ({
-        insert: mockInsert,
-      })),
+jest.mock("@/lib/supabase", () => ({
+  supabase: {
+    auth: {
+      getUser: jest.fn(() =>
+        Promise.resolve({
+          data: { user: { id: "user-123" } },
+          error: null,
+        })
+      ),
     },
-  };
-});
+    from: jest.fn(() => ({
+      insert: mockInsert,
+    })),
+  },
+}));
 
 test("creates a subject and navigates back", async () => {
   mockInsert.mockResolvedValue({ error: null });
 
-  const screen = render(<CreateSubject />);
+  const screen = render(<UpsertSubject />);
   fireEvent.changeText(screen.getByTestId("subject-title-input"), "ikt205g26v");
-  fireEvent.press(screen.getByTestId("create-subject-button"));
+  fireEvent.press(screen.getByTestId("upsert-subject-button"));
 
   await waitFor(() => {
     expect(supabase.from).toHaveBeenCalledWith("subjects");
-    expect(mockInsert).toHaveBeenCalled();
+    expect(mockInsert).toHaveBeenCalledWith(
+      expect.objectContaining({
+        title: "ikt205g26v",
+        uId: "user-123",
+      })
+    );
     expect(router.back).toHaveBeenCalled();
   });
 });
\ No newline at end of file
diff --git a/__tests__/subject/deleteSubject.test.tsx b/__tests__/subject/deleteSubject.test.tsx
index a184c76..ceec2ff 100644
--- a/__tests__/subject/deleteSubject.test.tsx
+++ b/__tests__/subject/deleteSubject.test.tsx
@@ -1,17 +1,18 @@
+import ViewDetailsSubject from "@/app/subject/viewDetailsSubject";
 import { supabase } from "@/lib/supabase";
 import { fireEvent, render, waitFor } from "@testing-library/react-native";
 import { router } from "expo-router";
 import { Alert } from "react-native";
-import ViewDetailsSubject from "../../app/subject/viewDetailsSubject";
 
-const mockSingleSubject = jest.fn();
-const mockSelectSubjectEq = jest.fn(() => ({ single: mockSingleSubject, }));
-const mockSelectSubject = jest.fn(() => ({ eq: mockSelectSubjectEq, }));
-const mockOrderAssignments = jest.fn();
-const mockSelectAssignmentsEq = jest.fn(() => ({ order: mockOrderAssignments }));
-const mockSelectAssignments = jest.fn(() => ({ eq: mockSelectAssignmentsEq }));
-const mockDeleteSubjectEq = jest.fn();
-const mockDeleteSubject = jest.fn(() => ({ eq: mockDeleteSubjectEq, }));
+const mockSubjectSingle = jest.fn();
+const mockSubjectSelectEq = jest.fn(() => ({ single: mockSubjectSingle }));
+const mockSubjectSelect = jest.fn(() => ({ eq: mockSubjectSelectEq }));
+const mockSubjectDeleteEq = jest.fn();
+const mockSubjectDelete = jest.fn(() => ({ eq: mockSubjectDeleteEq }));
+
+const mockAssignmentsOrder = jest.fn();
+const mockAssignmentsEq = jest.fn(() => ({ order: mockAssignmentsOrder }));
+const mockAssignmentsSelect = jest.fn(() => ({ eq: mockAssignmentsEq }));
 
 jest.mock("expo-router", () => ({
   router: {
@@ -24,60 +25,61 @@ jest.mock("expo-router", () => ({
   useLocalSearchParams: () => ({
     sId: "subject-123",
   }),
-  useFocusEffect: (callback: () => void) => callback(),
+  useFocusEffect: (callback: () => void) => {
+    const React = require("react");
+    React.useEffect(callback, [callback]);
+  },
 }));
 
-jest.mock("@/lib/supabase", () => {
-  return {
-    supabase: {
-      auth: {
-        getUser: jest.fn(() =>
-          Promise.resolve({
-            data: { user: { uId: "user-123" } },
-            error: null,
-          })
-        ),
-        getSession: jest.fn(() =>
-          Promise.resolve({
-            data: {
-              session: {
-                user: { uId: "user-123" },
-              },
-            },
-          })
-        ),
-        onAuthStateChange: jest.fn(() => ({
+jest.mock("@/lib/supabase", () => ({
+  supabase: {
+    auth: {
+      getUser: jest.fn(() =>
+        Promise.resolve({
+          data: { user: { id: "user-123" } },
+          error: null,
+        })
+      ),
+      getSession: jest.fn(() =>
+        Promise.resolve({
           data: {
-            subscription: {
-              unsubscribe: jest.fn(),
+            session: {
+              user: { id: "user-123" },
             },
           },
-        })),
-      },
-      from: jest.fn((table) => {
-        if (table === "subjects") {
-          return {
-            select: mockSelectSubject,
-            delete: mockDeleteSubject,
-          };
-        }
-
-        if (table === "assignments") {
-          return {
-            select: mockSelectAssignments,
-          };
-        }
-
-        return {};
-      }),
+        })
+      ),
+      onAuthStateChange: jest.fn(() => ({
+        data: {
+          subscription: {
+            unsubscribe: jest.fn(),
+          },
+        },
+      })),
     },
-  };
-});
+    from: jest.fn((table) => {
+      if (table === "subjects") {
+        return {
+          select: mockSubjectSelect,
+          delete: mockSubjectDelete,
+        };
+      }
+
+      if (table === "assignments") {
+        return {
+          select: mockAssignmentsSelect,
+        };
+      }
+
+      return {};
+    }),
+  },
+}));
 
 const alertSpy = jest.spyOn(Alert, "alert");
 
 test("deletes a subject and navigates back", async () => {
-  mockSingleSubject.mockResolvedValue({ 
+  mockSubjectSingle.mockResolvedValue({ 
     data: { 
       sId: "subject-123",
       title: "ikt205g26v",
@@ -85,10 +87,13 @@ test("deletes a subject and navigates back", async () => {
     },
     error: null,
   });
-  mockOrderAssignments.mockResolvedValue({ data: [], error: null, })
-  mockDeleteSubjectEq.mockResolvedValue({ error: null, });
+  mockAssignmentsOrder.mockResolvedValue({ data: [], error: null, })
+  mockSubjectDeleteEq.mockResolvedValue({ error: null, });
 
   const screen = render(<ViewDetailsSubject />);
+
+  await screen.findByText("ikt205g26v");
+
   fireEvent.press(await screen.findByTestId("delete-subject-button"));
 
   expect(alertSpy).toHaveBeenCalledWith(
@@ -104,8 +109,8 @@ test("deletes a subject and navigates back", async () => {
 
   await waitFor(() => {
     expect(supabase.from).toHaveBeenCalledWith("subjects");
-    expect(mockDeleteSubject).toHaveBeenCalled();
-    expect(mockDeleteSubjectEq).toHaveBeenCalledWith("sId", "subject-123");
+    expect(mockSubjectDelete).toHaveBeenCalled();
+    expect(mockSubjectDeleteEq).toHaveBeenCalledWith("sId", "subject-123");
     expect(router.back).toHaveBeenCalled();
   });
-});
\ No newline at end of file
+});
diff --git a/__tests__/subject/editSubject.test.tsx b/__tests__/subject/editSubject.test.tsx
index f1c1790..cac538c 100644
--- a/__tests__/subject/editSubject.test.tsx
+++ b/__tests__/subject/editSubject.test.tsx
@@ -1,7 +1,7 @@
+import UpsertSubject from "@/app/subject/upsertSubject";
 import { supabase } from "@/lib/supabase";
 import { fireEvent, render, waitFor } from "@testing-library/react-native";
 import { router } from "expo-router";
-import EditSubject from "../../app/subject/editSubject";
 
 const mockUpdateEq = jest.fn();
 const mockUpdate = jest.fn(() => ({ eq: mockUpdateEq, }));
@@ -23,24 +23,22 @@ jest.mock("expo-router", () => ({
   useFocusEffect: (callback: () => void) => callback(),
 }));
 
-jest.mock("@/lib/supabase", () => {
-  return {
-    supabase: {
-      auth: {
-        getUser: jest.fn(() =>
-          Promise.resolve({
-            data: { user: { id: "user-123" } },
-            error: null,
-          })
-        ),
-      },
-      from: jest.fn(() => ({
-        select: mockSelect,
-        update: mockUpdate,
-      })),
+jest.mock("@/lib/supabase", () => ({
+  supabase: {
+    auth: {
+      getUser: jest.fn(() =>
+        Promise.resolve({
+          data: { user: { id: "user-123" } },
+          error: null,
+        })
+      ),
     },
-  };
-});
+    from: jest.fn(() => ({
+      select: mockSelect,
+      update: mockUpdate,
+    })),
+  },
+}));
 
 test("updates a subject and navigates back", async () => {
   mockSingle.mockResolvedValue({ 
@@ -53,9 +51,9 @@ test("updates a subject and navigates back", async () => {
   });
   mockUpdateEq.mockResolvedValue({ error: null, });
 
-  const screen = render(<EditSubject />);
+  const screen = render(<UpsertSubject />);
   fireEvent.changeText(await screen.findByTestId("subject-title-input"), "ikt206g26v");
-  fireEvent.press(screen.getByTestId("edit-subject-button"));
+  fireEvent.press(screen.getByTestId("upsert-subject-button"));
 
   await waitFor(() => {
     expect(supabase.from).toHaveBeenCalledWith("subjects");
diff --git a/__tests__/task/createTask.test.tsx b/__tests__/task/createTask.test.tsx
index 61bd198..b83a008 100644
--- a/__tests__/task/createTask.test.tsx
+++ b/__tests__/task/createTask.test.tsx
@@ -1,7 +1,8 @@
+import UpsertTask from "@/app/task/upsertTask";
+import { CheckAssignmentCompletion } from "@/lib/progress";
 import { supabase } from "@/lib/supabase";
 import { fireEvent, render, waitFor } from "@testing-library/react-native";
 import { router } from "expo-router";
-import CreateTask from "../../app/task/createTask";
 
 const mockInsert = jest.fn();
 
@@ -14,42 +15,47 @@ jest.mock("expo-router", () => ({
     Screen: () => null,
   },
   useLocalSearchParams: () => ({
-    aId: null,
+    aId: "assignment-123",
   }),
 }));
 
 jest.mock("@/lib/progress", () => ({
-  CheckAssignmentCompletion: jest.fn(),
+  CheckAssignmentCompletion: jest.fn(() => Promise.resolve()),
 }));
 
-jest.mock("@/lib/supabase", () => {
-  return {
-    supabase: {
-      auth: {
-        getUser: jest.fn(() =>
-          Promise.resolve({
-            data: { user: { id: "user-123" } },
-            error: null,
-          })
-        ),
-      },
-      from: jest.fn(() => ({
-        insert: mockInsert,
-      })),
+jest.mock("@/lib/supabase", () => ({
+  supabase: {
+    auth: {
+      getUser: jest.fn(() =>
+        Promise.resolve({
+          data: { user: { id: "user-123" } },
+          error: null,
+        })
+      ),
     },
-  };
-});
+    from: jest.fn(() => ({
+      insert: mockInsert,
+    })),
+  },
+}));
 
 test("creates a task and navigates back", async () => {
   mockInsert.mockResolvedValue({ error: null });
 
-  const screen = render(<CreateTask />);
+  const screen = render(<UpsertTask />);
   fireEvent.changeText(screen.getByTestId("task-title-input"), "Read chapter 4");
-  fireEvent.press(screen.getByTestId("create-task-button"));
+  fireEvent.press(screen.getByTestId("upsert-task-button"));
 
   await waitFor(() => {
     expect(supabase.from).toHaveBeenCalledWith("tasks");
-    expect(mockInsert).toHaveBeenCalled();
+    expect(mockInsert).toHaveBeenCalledWith(
+      expect.objectContaining({
+        title: "Read chapter 4",
+        uId: "user-123",
+        aId: "assignment-123",
+      })
+    );
+    expect(CheckAssignmentCompletion).toHaveBeenCalledWith("assignment-123");
     expect(router.back).toHaveBeenCalled();
   });
 });
\ No newline at end of file
diff --git a/__tests__/task/deleteTask.test.tsx b/__tests__/task/deleteTask.test.tsx
index dc6d162..0ffd9ef 100644
--- a/__tests__/task/deleteTask.test.tsx
+++ b/__tests__/task/deleteTask.test.tsx
@@ -1,14 +1,23 @@
+import ViewDetailsTask from "@/app/task/viewDetailsTask";
+import { CheckAssignmentCompletion } from "@/lib/progress";
 import { supabase } from "@/lib/supabase";
 import { fireEvent, render, waitFor } from "@testing-library/react-native";
 import { router } from "expo-router";
 import { Alert } from "react-native";
-import ViewDetailsTask from "../../app/task/viewDetailsTask";
 
-const mockSingleTask = jest.fn();
-const mockSelectTaskEq = jest.fn(() => ({ single: mockSingleTask, }));
-const mockSelectTask = jest.fn(() => ({ eq: mockSelectTaskEq, }));
-const mockDeleteTaskEq = jest.fn();
-const mockDeleteTask = jest.fn(() => ({ eq: mockDeleteTaskEq, }));
+const mockTaskSingle = jest.fn();
+const mockTaskSelectEq = jest.fn(() => ({ single: mockTaskSingle }));
+const mockTaskSelect = jest.fn(() => ({ eq: mockTaskSelectEq }));
+const mockTaskDeleteEq = jest.fn();
+const mockTaskDelete = jest.fn(() => ({ eq: mockTaskDeleteEq }));
+
+const mockAssignmentSingle = jest.fn();
+const mockAssignmentSelectEq = jest.fn(() => ({ single: mockAssignmentSingle }));
+const mockAssignmentSelect = jest.fn(() => ({ eq: mockAssignmentSelectEq }));
+
+const mockSubjectSingle = jest.fn();
+const mockSubjectSelectEq = jest.fn(() => ({ single: mockSubjectSingle }));
+const mockSubjectSelect = jest.fn(() => ({ eq: mockSubjectSelectEq }));
 
 jest.mock("expo-router", () => ({
   router: {
@@ -21,60 +30,103 @@ jest.mock("expo-router", () => ({
   useLocalSearchParams: () => ({
     tId: "task-123",
   }),
-  useFocusEffect: (callback: () => void) => callback(),
+  useFocusEffect: (callback: () => void) => {
+    const React = require("react");
+    React.useEffect(callback, [callback]);
+  },
 }));
 
-jest.mock("@/lib/supabase", () => {
-  return {
-    supabase: {
-      auth: {
-        getUser: jest.fn(() =>
-          Promise.resolve({
-            data: { user: { uId: "user-123" } },
-            error: null,
-          })
-        ),
-        getSession: jest.fn(() =>
-          Promise.resolve({
-            data: {
-              session: {
-                user: { uId: "user-123" },
-              },
-            },
-          })
-        ),
-        onAuthStateChange: jest.fn(() => ({
+jest.mock("@/lib/progress", () => ({
+  CheckAssignmentCompletion: jest.fn(() => Promise.resolve()),
+}));
+
+jest.mock("@/lib/supabase", () => ({
+  supabase: {
+    auth: {
+      getUser: jest.fn(() =>
+        Promise.resolve({
+          data: { user: { id: "user-123" } },
+          error: null,
+        })
+      ),
+      getSession: jest.fn(() =>
+        Promise.resolve({
           data: {
-            subscription: {
-              unsubscribe: jest.fn(),
+            session: {
+              user: { id: "user-123" },
             },
           },
-        })),
-      },
-      from: jest.fn(() => {
-        return {
-          select: mockSelectTask,
-          delete: mockDeleteTask,
-        };
-      }),
+        })
+      ),
+      onAuthStateChange: jest.fn(() => ({
+        data: {
+          subscription: {
+            unsubscribe: jest.fn(),
+          },
+        },
+      })),
     },
-  };
-});
+    from: jest.fn((table: string) => {
+      if (table === "tasks") {
+        return {
+          select: mockTaskSelect,
+          delete: mockTaskDelete,
+        };
+      }
+
+      if (table === "assignments") {
+        return {
+          select: mockAssignmentSelect,
+        };
+      }
+
+      if (table === "subjects") {
+        return {
+          select: mockSubjectSelect,
+        };
+      }
+
+      return {};
+    }),
+  },
+}));
 
 const alertSpy = jest.spyOn(Alert, "alert");
 
 test("deletes a task and navigates back", async () => {
-  mockSingleTask.mockResolvedValue({ 
+  mockTaskSingle.mockResolvedValue({ 
     data: { 
       tId: "task-123",
       title: "Read chapter 4",
       uId: "user-123",
+      aId: "assignment-123",
     },
     error: null,
   });
-  mockDeleteTaskEq.mockResolvedValue({ error: null, });
+  mockAssignmentSingle.mockResolvedValue({
+    data: { 
+      aId: "assignment-123",
+      title: "create a simple test",
+      uId: "user-123",
+      sId: "subject-123",
+    },
+    error: null,
+  });
+  mockSubjectSingle.mockResolvedValue({
+    data: {
+      sId: "subject-123",
+      title: "ikt205g26v",
+      color: "blue",
+    },
+    error: null,
+  });
+  mockTaskDeleteEq.mockResolvedValue({ error: null, });
 
   const screen = render(<ViewDetailsTask />);
+
+  await screen.findByText("Read chapter 4");
+  await screen.findByText("ikt205g26v");
+
   fireEvent.press(await screen.findByTestId("delete-task-button"));
 
   expect(alertSpy).toHaveBeenCalledWith(
@@ -90,8 +142,9 @@ test("deletes a task and navigates back", async () => {
 
   await waitFor(() => {
     expect(supabase.from).toHaveBeenCalledWith("tasks");
-    expect(mockDeleteTask).toHaveBeenCalled();
-    expect(mockDeleteTaskEq).toHaveBeenCalledWith("tId", "task-123");
+    expect(mockTaskDelete).toHaveBeenCalled();
+    expect(mockTaskDeleteEq).toHaveBeenCalledWith("tId", "task-123");
+    expect(CheckAssignmentCompletion).toHaveBeenCalledWith("assignment-123");
     expect(router.back).toHaveBeenCalled();
   });
-});
\ No newline at end of file
+});
diff --git a/__tests__/task/editTask.test.tsx b/__tests__/task/editTask.test.tsx
index fcff96c..24fe7cc 100644
--- a/__tests__/task/editTask.test.tsx
+++ b/__tests__/task/editTask.test.tsx
@@ -1,7 +1,8 @@
+import UpsertTask from "@/app/task/upsertTask";
+import { CheckAssignmentCompletion } from "@/lib/progress";
 import { supabase } from "@/lib/supabase";
 import { fireEvent, render, waitFor } from "@testing-library/react-native";
 import { router } from "expo-router";
-import EditTask from "../../app/task/editTask";
 
 const mockUpdateEq = jest.fn();
 const mockUpdate = jest.fn(() => ({ eq: mockUpdateEq, }));
@@ -24,42 +25,41 @@ jest.mock("expo-router", () => ({
 }));
 
 jest.mock("@/lib/progress", () => ({
-  CheckAssignmentCompletion: jest.fn(),
+  CheckAssignmentCompletion: jest.fn(() => Promise.resolve()),
 }));
 
-jest.mock("@/lib/supabase", () => {
-  return {
-    supabase: {
-      auth: {
-        getUser: jest.fn(() =>
-          Promise.resolve({
-            data: { user: { id: "user-123" } },
-            error: null,
-          })
-        ),
-      },
-      from: jest.fn(() => ({
-        select: mockSelect,
-        update: mockUpdate,
-      })),
+jest.mock("@/lib/supabase", () => ({
+  supabase: {
+    auth: {
+      getUser: jest.fn(() =>
+        Promise.resolve({
+          data: { user: { id: "user-123" } },
+          error: null,
+        })
+      ),
     },
-  };
-});
+    from: jest.fn(() => ({
+      select: mockSelect,
+      update: mockUpdate,
+    })),
+  },
+}));
 
 test("updates a task and navigates back", async () => {
   mockSingle.mockResolvedValue({ 
     data: {
-        tId: "task-123", 
-        title: "Read chapter 4",
-        uId: "user-123",
+      tId: "task-123", 
+      title: "Read chapter 4",
+      uId: "user-123",
+      aId: "assignment-123",
     },
     error: null,
   });
   mockUpdateEq.mockResolvedValue({ error: null, });
 
-  const screen = render(<EditTask />);
+  const screen = render(<UpsertTask />);
   fireEvent.changeText(await screen.findByTestId("task-title-input"), "Read chapter 5");
-  fireEvent.press(screen.getByTestId("edit-task-button"));
+  fireEvent.press(screen.getByTestId("upsert-task-button"));
 
   await waitFor(() => {
     expect(supabase.from).toHaveBeenCalledWith("tasks");
@@ -68,9 +68,11 @@ test("updates a task and navigates back", async () => {
       expect.objectContaining({
         title: "Read chapter 5",
         uId: "user-123",
+        aId: "assignment-123",
       })
     );
     expect(mockUpdateEq).toHaveBeenCalledWith("tId", "task-123");
+    expect(CheckAssignmentCompletion).toHaveBeenCalledWith("assignment-123");    
     expect(router.back).toHaveBeenCalled();
   });
 });
\ No newline at end of file
diff --git a/app/(tabs)/_layout.tsx b/app/(tabs)/_layout.tsx
index d9a261e..9f1e134 100644
--- a/app/(tabs)/_layout.tsx
+++ b/app/(tabs)/_layout.tsx
@@ -69,4 +69,4 @@ export default function TabLayout() {
       <Tabs.Screen name="timer" options={{title: "Timer"}} />
     </Tabs>
   );
-}
\ No newline at end of file
+}
diff --git a/app/(tabs)/subjects.tsx b/app/(tabs)/subjects.tsx
index 86564b8..d3a87d7 100644
--- a/app/(tabs)/subjects.tsx
+++ b/app/(tabs)/subjects.tsx
@@ -4,13 +4,14 @@ import { Subject } from '@/lib/types';
 import { Session } from '@supabase/supabase-js';
 import { router, Stack, useFocusEffect } from 'expo-router';
 import { useCallback, useEffect, useState } from 'react';
-import { Alert, Pressable, ScrollView, Text, View } from 'react-native';
+import { ActivityIndicator, Alert, Pressable, ScrollView, Text, View } from 'react-native';
 
 import type { SubjectColor } from '@/lib/subjectColors';
 
 export default function Subjects() {
   const [subjects, SetSubjects] = useState<Subject[]>([]);
   const [session, SetSession] = useState<Session | null>(null);
+  const [isLoading, SetIsLoading] = useState(false);
 
   useEffect(() => {
     supabase.auth.getSession().then(({ data }) => {
@@ -29,12 +30,16 @@ export default function Subjects() {
   const GetSubjects = async () => {
     if (!session?.user.id) return;
 
+    SetIsLoading(true);
+
     const { data, error } = await supabase
       .from('subjects')
       .select('*')
       .eq('uId', session.user.id)
       .order('lastChanged', { ascending: false });
 
+    SetIsLoading(false);  
+
     if (error) {
       Alert.alert('Subjects could not be fetched, please try again');
       return;
@@ -51,6 +56,14 @@ export default function Subjects() {
     }, [session])
   );
 
+  if (isLoading) {
+    return (
+      <View className="flex-1 items-center justify-center bg-app-bg">
+        <ActivityIndicator size="large" />
+      </View>
+    );
+  }
+
   return (
     <View className="flex-1 bg-app-bg">
       <Stack.Screen
diff --git a/app/assignment/upsertAssignment.tsx b/app/assignment/upsertAssignment.tsx
index 14330cf..981c054 100644
--- a/app/assignment/upsertAssignment.tsx
+++ b/app/assignment/upsertAssignment.tsx
@@ -326,7 +326,7 @@ export default function UpsertAssignment() {
               </Pressable>
 
               <Pressable
-                testID = "create-assignment-button"
+                testID = "upsert-assignment-button"
                 className={`h-14 items-center justify-center rounded-2xl ${
                   isSaving ? 'bg-accent-disabled' : 'bg-accent'
                 }`}
@@ -362,4 +362,4 @@ export default function UpsertAssignment() {
       </KeyboardAvoidingView>
     </>
   );
-}
\ No newline at end of file
+}
diff --git a/app/assignment/viewDetailsAssignment.tsx b/app/assignment/viewDetailsAssignment.tsx
index e22cb61..e0a1e40 100644
--- a/app/assignment/viewDetailsAssignment.tsx
+++ b/app/assignment/viewDetailsAssignment.tsx
@@ -6,7 +6,7 @@ import type { Assignment, Task } from '@/lib/types';
 import { Session } from '@supabase/supabase-js';
 import { router, Stack, useFocusEffect, useLocalSearchParams } from 'expo-router';
 import { useCallback, useEffect, useState } from 'react';
-import { Alert, Pressable, SectionList, Text, View } from "react-native";
+import { ActivityIndicator, Alert, Pressable, SectionList, Text, View } from "react-native";
 
 
 export default function ViewDetailsAssignment() {
@@ -14,6 +14,7 @@ export default function ViewDetailsAssignment() {
   const [assignment, SetAssignment] = useState<Assignment | null>(null);
   const [tasks, SetTasks] = useState<Task[]>([]);
   const [session, SetSession] = useState<Session | null>(null);
+  const [isLoading, SetIsLoading] = useState(false);
   const [subjectMeta, setSubjectMeta] = useState({
     title: 'No Subject',
     color: 'slate' as SubjectColor,
@@ -34,11 +35,15 @@ export default function ViewDetailsAssignment() {
   [])
 
   const GetAssignment = async (assignmentId: string) => {
-  const { data, error } = await supabase
-    .from('assignments')
-    .select('*')
-    .eq('aId', assignmentId)
-    .single();
+    SetIsLoading(true);
+
+    const { data, error } = await supabase
+      .from('assignments')
+      .select('*')
+      .eq('aId', assignmentId)
+      .single();
+
+    SetIsLoading(false);  
 
     if (error || !data) {
       Alert.alert('Assignment could not be fetched, please try again');
@@ -48,12 +53,16 @@ export default function ViewDetailsAssignment() {
     SetAssignment(data);
 
     if (data.sId) {
+      SetIsLoading(true);
+
       const { data: subjectData, error: subjectError } = await supabase
         .from('subjects')
         .select('title, color')
         .eq('sId', data.sId)
         .single();
 
+      SetIsLoading(false);
+
       if (subjectError || !subjectData) {
         setSubjectMeta({
           title: 'Unknown Subject',
@@ -70,8 +79,12 @@ export default function ViewDetailsAssignment() {
   };
 
   const GetTasks = async (aId: string) => { 
+    SetIsLoading(true);
+
     const { data, error } = await supabase.from("tasks").select("*").eq("aId", aId);
 
+    SetIsLoading(false);
+
     if (error) {
       Alert.alert("Tasks could not be fetched, please try again");
       return;
@@ -176,6 +189,14 @@ export default function ViewDetailsAssignment() {
       ? 0
       : Math.round((completedTasks / totalTasks) * 100);
 
+  if (isLoading) {
+    return (
+      <View className="flex-1 items-center justify-center bg-app-bg">
+        <ActivityIndicator size="large" />
+      </View>
+    );
+  }
+
   if (!assignment) {
     return (
       <View className="flex-1 bg-app-bg px-5 pt-6">
@@ -330,7 +351,7 @@ export default function ViewDetailsAssignment() {
                   className="mr-3 flex-1 items-center justify-center rounded-2xl border border-app-border bg-app-subtle py-3"
                   onPress={() =>
                     router.push({
-                      pathname: '/assignment/upsertAssignment',
+                      pathname: '../assignment/upsertAssignment',
                       params: { aId: assignment.aId },
                     })
                   }
@@ -339,6 +360,7 @@ export default function ViewDetailsAssignment() {
                 </Pressable>
 
                 <Pressable
+                  testID="delete-assignment-button"
                   className="flex-1 items-center justify-center rounded-2xl border border-app-border bg-app-surface py-3"
                   onPress={() => DeleteAssignment(assignment.aId)}
                 >
@@ -353,7 +375,7 @@ export default function ViewDetailsAssignment() {
               className="mb-6 mt-5 h-14 items-center justify-center rounded-2xl bg-accent"
               onPress={() =>
                 router.push({
-                  pathname: '/task/upsertTask',
+                  pathname: '../task/upsertTask',
                   params: { aId: assignment.aId },
                 })
               }
@@ -434,7 +456,7 @@ export default function ViewDetailsAssignment() {
                     className="mr-3 flex-1 items-center justify-center rounded-2xl border border-app-border bg-app-subtle py-3"
                     onPress={() =>
                       router.push({
-                        pathname: '/task/upsertTask',
+                        pathname: '../task/upsertTask',
                         params: { tId: item.tId },
                       })
                     }
diff --git a/app/subject/upsertSubject.tsx b/app/subject/upsertSubject.tsx
index b3bef3f..89d2e38 100644
--- a/app/subject/upsertSubject.tsx
+++ b/app/subject/upsertSubject.tsx
@@ -161,6 +161,7 @@ export default function UpsertSubject() {
                             <View className="mb-5">
                                 <Text className={labelClassName}>Title</Text>
                                 <TextInput className={inputClassName}
+                                    testID = "subject-title-input"
                                     placeholder="Enter subject title"
                                     placeholderTextColor="#9CA3AF"
                                     value={title}
@@ -311,6 +312,7 @@ export default function UpsertSubject() {
                             </Pressable>
 
                             <Pressable
+                                testID = "upsert-subject-button"
                                 className={`h-14 items-center justify-center rounded-2xl ${
                                     isSaving 
                                         ? 'bg-accent-disabled' 
diff --git a/app/subject/viewDetailsSubject.tsx b/app/subject/viewDetailsSubject.tsx
index 8dee4f8..2be852d 100644
--- a/app/subject/viewDetailsSubject.tsx
+++ b/app/subject/viewDetailsSubject.tsx
@@ -6,7 +6,7 @@ import type { Assignment } from '@/lib/types';
 import { Session } from '@supabase/supabase-js';
 import { router, Stack, useFocusEffect, useLocalSearchParams } from 'expo-router';
 import { useCallback, useEffect, useState } from 'react';
-import { Alert, Pressable, SectionList, Text, View } from 'react-native';
+import { ActivityIndicator, Alert, Pressable, SectionList, Text, View } from 'react-native';
 
 export type Subject = {
   sId: string;
@@ -23,6 +23,7 @@ export default function ViewDetailsSubject() {
   const [subject, SetSubject] = useState<Subject | null>(null);  
   const [assignments, SetAssignments] = useState<Assignment[]>([]);
   const [session, SetSession] = useState<Session | null>(null);
+  const [isLoading, SetIsLoading] = useState(false);
 
   const assignmentSections = [
     {
@@ -48,12 +49,16 @@ export default function ViewDetailsSubject() {
   }, []);
 
   const GetSubject = async (subjectId: string) => {
+    SetIsLoading(true);
+
     const { data, error } = await supabase
       .from('subjects')
       .select('*')
       .eq('sId', subjectId)
       .single();
 
+    SetIsLoading(false);  
+
     if (error) {
       Alert.alert('Subject could not be fetched, please try again');
       return;
@@ -63,12 +68,16 @@ export default function ViewDetailsSubject() {
   };
 
   const GetAssignments = async (subjectId: string) => {
+    SetIsLoading(true);
+
     const { data, error } = await supabase
       .from('assignments')
       .select('*')
       .eq('sId', subjectId)
       .order('deadline', { ascending: true });
 
+    SetIsLoading(false);  
+
     if (error) {
       Alert.alert('Assignments could not be fetched, please try again');
       return;
@@ -167,6 +176,14 @@ export default function ViewDetailsSubject() {
       ? 0
       : Math.round((completedAssignments / totalAssignments) * 100);
 
+  if (isLoading) {
+    return (
+      <View className="flex-1 items-center justify-center bg-app-bg">
+        <ActivityIndicator size="large" />
+      </View>
+    );
+  }
+
   if (!subject) {
     return (
       <View className="flex-1 bg-app-bg px-5 pt-6">
@@ -323,7 +340,7 @@ export default function ViewDetailsSubject() {
                   className="mr-3 flex-1 items-center justify-center rounded-2xl border border-app-border bg-app-subtle py-3"
                   onPress={() =>
                     router.push({
-                      pathname: '/subject/upsertSubject',
+                      pathname: '../subject/upsertSubject',
                       params: { sId: subject.sId },
                     })
                   }
@@ -334,6 +351,7 @@ export default function ViewDetailsSubject() {
                 </Pressable>
 
                 <Pressable
+                  testID="delete-subject-button"
                   className="flex-1 items-center justify-center rounded-2xl border border-app-border bg-app-surface py-3"
                   onPress={() => DeleteSubject(subject.sId)}
                 >
@@ -348,7 +366,7 @@ export default function ViewDetailsSubject() {
               className="mb-6 mt-5 h-14 items-center justify-center rounded-2xl bg-accent"
               onPress={() =>
                 router.push({
-                  pathname: '/assignment/upsertAssignment',
+                  pathname: '../assignment/upsertAssignment',
                   params: { sId: subject.sId },
                 })
               }
@@ -420,7 +438,7 @@ export default function ViewDetailsSubject() {
                     className="mr-3 flex-1 items-center justify-center rounded-2xl border border-app-border bg-app-subtle py-3"
                     onPress={() =>
                       router.push({
-                        pathname: '/assignment/upsertAssignment',
+                        pathname: '../assignment/upsertAssignment',
                         params: { aId: item.aId },
                       })
                     }
diff --git a/app/task/upsertTask.tsx b/app/task/upsertTask.tsx
index cf90b4b..d29292a 100644
--- a/app/task/upsertTask.tsx
+++ b/app/task/upsertTask.tsx
@@ -238,7 +238,7 @@ export default function UpsertTask() {
               </Pressable>
 
               <Pressable
-                testID="create-task-button"
+                testID="upsert-task-button"
                 className={`h-14 items-center justify-center rounded-2xl ${
                   isSaving ? 'bg-accent-disabled' : 'bg-accent'
                 }`}
diff --git a/app/task/viewDetailsTask.tsx b/app/task/viewDetailsTask.tsx
index 605da33..a53d831 100644
--- a/app/task/viewDetailsTask.tsx
+++ b/app/task/viewDetailsTask.tsx
@@ -6,13 +6,14 @@ import type { Task } from '@/lib/types';
 import { Session } from '@supabase/supabase-js';
 import { router, Stack, useFocusEffect, useLocalSearchParams } from 'expo-router';
 import { useCallback, useEffect, useState } from 'react';
-import { Alert, Pressable, Text, View } from 'react-native';
+import { ActivityIndicator, Alert, Pressable, Text, View } from 'react-native';
 
 export default function ViewDetailsTask() {
   const { tId } = useLocalSearchParams<{ tId: string }>();
 
   const [task, SetTask] = useState<Task | null>(null);
   const [session, SetSession] = useState<Session | null>(null);
+  const [isLoading, SetIsLoading] = useState(false);
   const [contextMeta, setContextMeta] = useState({
     subjectTitle: 'No Subject',
     assignmentTitle: 'No Assignment',
@@ -30,11 +31,15 @@ export default function ViewDetailsTask() {
   }, []);
 
   const GetTask = async (taskId: string) => {
+    SetIsLoading(true);
+
     const { data, error } = await supabase
       .from('tasks')
       .select('*')
       .eq('tId', taskId)
       .single();
+    
+    SetIsLoading(false);    
 
     if (error || !data) {
       Alert.alert('Task could not be fetched, please try again');
@@ -44,12 +49,16 @@ export default function ViewDetailsTask() {
     SetTask(data);
 
     if (data.aId) {
+      SetIsLoading(true);
+
       const { data: assignmentData, error: assignmentError } = await supabase
         .from('assignments')
         .select('title, sId')
         .eq('aId', data.aId)
         .single();
 
+      SetIsLoading(false);    
+
       if (assignmentError || !assignmentData) {
         setContextMeta({
           subjectTitle: 'Unknown Subject',
@@ -60,12 +69,16 @@ export default function ViewDetailsTask() {
       }
 
       if (assignmentData.sId) {
+        SetIsLoading(true);
+
         const { data: subjectData, error: subjectError } = await supabase
           .from('subjects')
           .select('title, color')
           .eq('sId', assignmentData.sId)
           .single();
 
+        SetIsLoading(false);  
+
         if (subjectError || !subjectData) {
           setContextMeta({
             subjectTitle: 'Unknown Subject',
@@ -135,6 +148,14 @@ export default function ViewDetailsTask() {
 
   const colorSet = getSubjectColorSet(contextMeta.subjectColor);
 
+  if (isLoading) {
+    return (
+      <View className="flex-1 items-center justify-center bg-app-bg">
+        <ActivityIndicator size="large" />
+      </View>
+    );
+  }
+
   if (!task) {
     return (
       <View className="flex-1 bg-app-bg px-5 pt-6">
@@ -272,7 +293,7 @@ export default function ViewDetailsTask() {
               className="mr-3 flex-1 items-center justify-center rounded-2xl border border-app-border bg-app-subtle py-3"
               onPress={() =>
                 router.push({
-                  pathname: '/task/upsertTask',
+                  pathname: '../task/upsertTask',
                   params: { tId: task.tId },
                 })
               }
@@ -283,6 +304,7 @@ export default function ViewDetailsTask() {
             </Pressable>
 
             <Pressable
+              testID="delete-task-button"
               className="flex-1 items-center justify-center rounded-2xl border border-app-border bg-app-surface py-3"
               onPress={() => DeleteTask(task.tId)}
             >
diff --git a/lib/notifications.ts b/lib/notifications.ts
index 43716ed..c03cb9a 100644
--- a/lib/notifications.ts
+++ b/lib/notifications.ts
@@ -36,4 +36,4 @@ export async function RegisterForLocalNotificationsAsync() {
       HandleRegistrationError('Permission not granted for local notifications');
       return;
   }
-}
\ No newline at end of file
+}