diff --git a/__tests__/assignment/createAssignment.test.tsx b/__tests__/assignment/createAssignment.test.tsx
index 1ca299f..425a1db 100644
--- a/__tests__/assignment/createAssignment.test.tsx
+++ b/__tests__/assignment/createAssignment.test.tsx
@@ -1,5 +1,4 @@
 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";
@@ -21,13 +20,10 @@ jest.mock("expo-router", () => ({
   }),
 }));
 
-jest.mock("@/lib/progress", () => ({
-  CheckSubjectCompletion: jest.fn(() => Promise.resolve()),
-}));
-
 jest.mock("@/lib/asyncStorage", () => ({
   GetAssignmentNotificationId: jest.fn(() => Promise.resolve()),
   SaveAssignmentNotificationId: jest.fn(() => Promise.resolve()),
+  RemoveAssignmentNotificationId: jest.fn(() => Promise.resolve()),
 }));
 
 jest.mock("expo-notifications", () => ({
@@ -76,7 +72,6 @@ test("creates an assignment and navigates back", async () => {
         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 e16e3bf..44069d4 100644
--- a/__tests__/assignment/deleteAssignment.test.tsx
+++ b/__tests__/assignment/deleteAssignment.test.tsx
@@ -1,5 +1,4 @@
 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";
@@ -35,10 +34,6 @@ jest.mock("expo-router", () => ({
   },
 }));
 
-jest.mock("@/lib/progress", () => ({
-  CheckSubjectCompletion: jest.fn(() => Promise.resolve()),
-}));
-
 jest.mock("@/lib/supabase", () => ({
   supabase: {
     auth: {
@@ -92,7 +87,7 @@ jest.mock("@/lib/supabase", () => ({
 
 const alertSpy = jest.spyOn(Alert, "alert");
 
-test("deletes a task and navigates back", async () => {
+test("deletes an assignment and navigates back", async () => {
   mockAssignmentSingle.mockResolvedValue({ 
     data: { 
       aId: "assignment-123",
@@ -126,16 +121,21 @@ test("deletes a task and navigates back", async () => {
     expect.any(Array),
   );
 
-  const alertButtons = alertSpy.mock.calls[0][2];
-  const confirmDeleteButton = alertButtons[1];
+  const alertButtons = alertSpy.mock.calls[0]?.[2];
+  expect(alertButtons).toBeDefined();
+  const confirmDeleteButton = alertButtons?.[1];
+  expect(confirmDeleteButton?.onPress).toBeDefined();
 
-  await confirmDeleteButton.onPress();    
+  if (!confirmDeleteButton?.onPress) {
+    throw new Error("Delete confirmation button missing");
+  }
+
+  await confirmDeleteButton.onPress();
 
   await waitFor(() => {
     expect(supabase.from).toHaveBeenCalledWith("assignments");
     expect(mockAssignmentDelete).toHaveBeenCalled();
     expect(mockAssignmentDeleteEq).toHaveBeenCalledWith("aId", "assignment-123");
-    expect(CheckSubjectCompletion).toHaveBeenCalledWith("subject-123");
     expect(router.back).toHaveBeenCalled();
   });
 });
diff --git a/__tests__/assignment/editAssignment.test.tsx b/__tests__/assignment/editAssignment.test.tsx
index 4b647fe..8561bba 100644
--- a/__tests__/assignment/editAssignment.test.tsx
+++ b/__tests__/assignment/editAssignment.test.tsx
@@ -1,5 +1,4 @@
 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,12 +25,10 @@ jest.mock("expo-router", () => ({
   useFocusEffect: (callback: () => void) => callback(),
 }));
 
-jest.mock("@/lib/progress", () => ({
-  CheckSubjectCompletion: jest.fn(() => Promise.resolve()),
-}));
-
 jest.mock("@/lib/asyncStorage", () => ({
   GetAssignmentNotificationId: jest.fn(() => Promise.resolve(null)),
+  SaveAssignmentNotificationId: jest.fn(() => Promise.resolve()),
+  RemoveAssignmentNotificationId: jest.fn(() => Promise.resolve()),
 }));
 
 jest.mock("expo-notifications", () => ({
@@ -94,7 +91,6 @@ 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
index 8796790..4738b5c 100644
--- a/__tests__/authGuard.test.tsx
+++ b/__tests__/authGuard.test.tsx
@@ -1,4 +1,5 @@
 import TabLayout from "@/app/(tabs)/_layout";
+import { getSetupStatus } from "@/lib/setupStatus";
 import { supabase } from "@/lib/supabase";
 import { render, waitFor } from "@testing-library/react-native";
 
@@ -31,6 +32,10 @@ jest.mock("expo-notifications", () => ({
   })),
 }));
 
+jest.mock("@/lib/setupStatus", () => ({
+  getSetupStatus: jest.fn(),
+}));
+
 jest.mock("@/lib/supabase", () => ({
   supabase: {
     auth: {
@@ -48,6 +53,14 @@ jest.mock("@/lib/supabase", () => ({
 
 beforeEach(() => {
   jest.clearAllMocks();
+  (getSetupStatus as jest.Mock).mockResolvedValue({
+    subjectId: "subject-123",
+    assignmentId: "assignment-123",
+    taskId: "task-123",
+    completedFocusSessions: 1,
+    currentStep: "sprint",
+    isSetupComplete: true,
+  });
 });
 
 test("redirects to login if there is no session", async () => {
@@ -76,4 +89,4 @@ test("renders tabs when session exists", async () => {
   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 fd42c2a..22d1d47 100644
--- a/__tests__/subject/createSubject.test.tsx
+++ b/__tests__/subject/createSubject.test.tsx
@@ -3,7 +3,9 @@ import { supabase } from "@/lib/supabase";
 import { fireEvent, render, waitFor } from "@testing-library/react-native";
 import { router } from "expo-router";
 
-const mockInsert = jest.fn();
+const mockSingle = jest.fn();
+const mockSelect = jest.fn(() => ({ single: mockSingle }));
+const mockInsert = jest.fn(() => ({ select: mockSelect }));
 
 jest.mock("expo-router", () => ({
   router: {
@@ -33,7 +35,14 @@ jest.mock("@/lib/supabase", () => ({
 }));
 
 test("creates a subject and navigates back", async () => {
-  mockInsert.mockResolvedValue({ error: null });
+  mockSingle.mockResolvedValue({
+    data: {
+      sId: "subject-123",
+      title: "ikt205g26v",
+      uId: "user-123",
+    },
+    error: null,
+  });
 
   const screen = render(<UpsertSubject />);
   fireEvent.changeText(screen.getByTestId("subject-title-input"), "ikt205g26v");
@@ -47,6 +56,8 @@ test("creates a subject and navigates back", async () => {
         uId: "user-123",
       })
     );
+    expect(mockSelect).toHaveBeenCalled();
+    expect(mockSingle).toHaveBeenCalled();
     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 ceec2ff..909a44b 100644
--- a/__tests__/subject/deleteSubject.test.tsx
+++ b/__tests__/subject/deleteSubject.test.tsx
@@ -102,10 +102,16 @@ test("deletes a subject and navigates back", async () => {
     expect.any(Array),
   );
 
-  const alertButtons = alertSpy.mock.calls[0][2];
-  const confirmDeleteButton = alertButtons[1];
+  const alertButtons = alertSpy.mock.calls[0]?.[2];
+  expect(alertButtons).toBeDefined();
+  const confirmDeleteButton = alertButtons?.[1];
+  expect(confirmDeleteButton?.onPress).toBeDefined();
 
-  await confirmDeleteButton.onPress();    
+  if (!confirmDeleteButton?.onPress) {
+    throw new Error("Delete confirmation button missing");
+  }
+
+  await confirmDeleteButton.onPress();
 
   await waitFor(() => {
     expect(supabase.from).toHaveBeenCalledWith("subjects");
diff --git a/__tests__/task/createTask.test.tsx b/__tests__/task/createTask.test.tsx
index b83a008..f75f111 100644
--- a/__tests__/task/createTask.test.tsx
+++ b/__tests__/task/createTask.test.tsx
@@ -4,7 +4,9 @@ import { supabase } from "@/lib/supabase";
 import { fireEvent, render, waitFor } from "@testing-library/react-native";
 import { router } from "expo-router";
 
-const mockInsert = jest.fn();
+const mockSingle = jest.fn();
+const mockSelect = jest.fn(() => ({ single: mockSingle }));
+const mockInsert = jest.fn(() => ({ select: mockSelect }));
 
 jest.mock("expo-router", () => ({
   router: {
@@ -40,7 +42,15 @@ jest.mock("@/lib/supabase", () => ({
 }));
 
 test("creates a task and navigates back", async () => {
-  mockInsert.mockResolvedValue({ error: null });
+  mockSingle.mockResolvedValue({
+    data: {
+      tId: "task-123",
+      title: "Read chapter 4",
+      uId: "user-123",
+      aId: "assignment-123",
+    },
+    error: null,
+  });
 
   const screen = render(<UpsertTask />);
   fireEvent.changeText(screen.getByTestId("task-title-input"), "Read chapter 4");
@@ -55,7 +65,9 @@ test("creates a task and navigates back", async () => {
         aId: "assignment-123",
       })
     );
+    expect(mockSelect).toHaveBeenCalled();
+    expect(mockSingle).toHaveBeenCalled();
     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 0ffd9ef..caac2bc 100644
--- a/__tests__/task/deleteTask.test.tsx
+++ b/__tests__/task/deleteTask.test.tsx
@@ -19,6 +19,12 @@ const mockSubjectSingle = jest.fn();
 const mockSubjectSelectEq = jest.fn(() => ({ single: mockSubjectSingle }));
 const mockSubjectSelect = jest.fn(() => ({ eq: mockSubjectSelectEq }));
 
+const mockSprintSessionsEqCompleted = jest.fn();
+const mockSprintSessionsEqSessionType = jest.fn(() => ({ eq: mockSprintSessionsEqCompleted }));
+const mockSprintSessionsEqUser = jest.fn(() => ({ eq: mockSprintSessionsEqSessionType }));
+const mockSprintSessionsEqTask = jest.fn(() => ({ eq: mockSprintSessionsEqUser }));
+const mockSprintSessionsSelect = jest.fn(() => ({ eq: mockSprintSessionsEqTask }));
+
 jest.mock("expo-router", () => ({
   router: {
     back: jest.fn(),
@@ -86,6 +92,12 @@ jest.mock("@/lib/supabase", () => ({
         };
       }
 
+      if (table === "sprint_sessions") {
+        return {
+          select: mockSprintSessionsSelect,
+        };
+      }
+
       return {};
     }),
   },
@@ -120,6 +132,7 @@ test("deletes a task and navigates back", async () => {
     },
     error: null,
   });
+  mockSprintSessionsEqCompleted.mockResolvedValue({ count: 0, error: null });
   mockTaskDeleteEq.mockResolvedValue({ error: null, });
 
   const screen = render(<ViewDetailsTask />);
@@ -127,7 +140,7 @@ test("deletes a task and navigates back", async () => {
   await screen.findByText("Read chapter 4");
   await screen.findByText("ikt205g26v");
 
-  fireEvent.press(await screen.findByTestId("delete-task-button"));
+  fireEvent.press(await screen.findByText("Delete"));
 
   expect(alertSpy).toHaveBeenCalledWith(
     "Delete Task",
@@ -135,10 +148,16 @@ test("deletes a task and navigates back", async () => {
     expect.any(Array),
   );
 
-  const alertButtons = alertSpy.mock.calls[0][2];
-  const confirmDeleteButton = alertButtons[1];
+  const alertButtons = alertSpy.mock.calls[0]?.[2];
+  expect(alertButtons).toBeDefined();
+  const confirmDeleteButton = alertButtons?.[1];
+  expect(confirmDeleteButton?.onPress).toBeDefined();
 
-  await confirmDeleteButton.onPress();    
+  if (!confirmDeleteButton?.onPress) {
+    throw new Error("Delete confirmation button missing");
+  }
+
+  await confirmDeleteButton.onPress();
 
   await waitFor(() => {
     expect(supabase.from).toHaveBeenCalledWith("tasks");
diff --git a/jest.setup.js b/jest.setup.js
new file mode 100644
index 0000000..649c550
--- /dev/null
+++ b/jest.setup.js
@@ -0,0 +1,4 @@
+jest.mock(
+  "@react-native-async-storage/async-storage",
+  () => require("@react-native-async-storage/async-storage/jest/async-storage-mock")
+);
diff --git a/package-lock.json b/package-lock.json
index ec283ad..ad00d4a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4924,6 +4924,7 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz",
       "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==",
+      "dev": true,
       "license": "BSD-2-Clause"
     },
     "node_modules/abab": {
@@ -8438,6 +8439,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz",
       "integrity": "sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ==",
+      "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
         "micromatch": "^4.0.2"
@@ -8530,6 +8532,7 @@
       "version": "10.1.0",
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
       "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "graceful-fs": "^4.2.0",
@@ -9815,6 +9818,7 @@
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
       "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/isexe": {
@@ -11302,6 +11306,7 @@
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.3.0.tgz",
       "integrity": "sha512-qtYiSSFlwot9XHtF9bD9c7rwKjr+RecWT//ZnPvSmEjpV5mmPOCN4j8UjY5hbjNkOwZ/jQv3J6R1/pL7RwgMsg==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.8",
@@ -11340,6 +11345,7 @@
       "version": "6.2.1",
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.1.tgz",
       "integrity": "sha512-zwOTdL3rFQ/lRdBnntKVOX6k5cKJwEc1HdilT71BWEu7J41gXIB2MRp+vxduPSwZJPWBxEzv4yH1wYLJGUHX4Q==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "universalify": "^2.0.0"
@@ -11352,6 +11358,7 @@
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.1.tgz",
       "integrity": "sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==",
+      "dev": true,
       "license": "Public Domain",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -11387,6 +11394,7 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/klaw-sync/-/klaw-sync-6.0.0.tgz",
       "integrity": "sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "graceful-fs": "^4.1.11"
@@ -13057,6 +13065,7 @@
       "version": "8.0.1",
       "resolved": "https://registry.npmjs.org/patch-package/-/patch-package-8.0.1.tgz",
       "integrity": "sha512-VsKRIA8f5uqHQ7NGhwIna6Bx6D9s/1iXlA1hthBVBEbkq+t4kXD0HHt+rJhf/Z+Ci0F/HCB2hvn0qLdLG+Qxlw==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@yarnpkg/lockfile": "^1.1.0",
@@ -13086,6 +13095,7 @@
       "version": "3.9.0",
       "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
       "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
+      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -13101,6 +13111,7 @@
       "version": "7.7.4",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
       "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+      "dev": true,
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
@@ -13113,6 +13124,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
       "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6"
@@ -15953,6 +15965,7 @@
       "version": "0.2.5",
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.5.tgz",
       "integrity": "sha512-voyz6MApa1rQGUxT3E+BK7/ROe8itEx7vD8/HEvt4xwXucvQ5G5oeEiHkmHZJuBO21RpOf+YYm9MOivj709jow==",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=14.14"
@@ -16295,6 +16308,7 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
       "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 10.0.0"
diff --git a/package.json b/package.json
index 62fa3aa..f3dabf0 100644
--- a/package.json
+++ b/package.json
@@ -63,6 +63,9 @@
   },
   "private": true,
   "jest": {
-    "preset": "jest-expo"
+    "preset": "jest-expo",
+    "setupFiles": [
+      "<rootDir>/jest.setup.js"
+    ]
   }
-}
\ No newline at end of file
+}