diff --git a/app/(main)/league/all/page.test.tsx b/app/(main)/league/all/page.test.tsx
index c38f4503..b1a783c8 100644
--- a/app/(main)/league/all/page.test.tsx
+++ b/app/(main)/league/all/page.test.tsx
@@ -1,107 +1,183 @@
-import { render, screen, waitFor, fireEvent } from '@testing-library/react';
+import {
+  render,
+  screen,
+  waitFor,
+  waitForElementToBeRemoved,
+  fireEvent,
+} from '@testing-library/react';
 import Leagues from './page';
 import { useDataStore } from '@/store/dataStore';
 import { getUserLeagues } from '@/utils/utils';
-import {
-  getGameWeek,
-  getAllLeagues,
-  getUserDocumentId,
-} from '@/api/apiFunctions';
-import { AuthContext } from '@/context/AuthContextProvider';
+import { getAllLeagues, addUserToLeague } from '@/api/apiFunctions';
+import { toast } from 'react-hot-toast';
+import Alert from '@/components/AlertNotification/AlertNotification';
+import { AlertVariants } from '@/components/AlertNotification/Alerts.enum';
 
-jest.mock('@/store/dataStore', () => ({
-  useDataStore: jest.fn(() => ({ user: { id: '123', leagues: [] } })),
-}));
+const mockUseAuthContext = {
+  isSignedIn: false,
+};
 
-jest.mock('@/utils/utils', () => ({
-  getUserLeagues: jest.fn(() => Promise.resolve([])),
+jest.mock('@/context/AuthContextProvider', () => ({
+  useAuthContext() {
+    return {
+      ...mockUseAuthContext,
+    };
+  },
 }));
 
-jest.mock('@/api/apiFunctions', () => ({
-  getGameWeek: jest.fn(() =>
-    Promise.resolve({
-      week: 1,
-    }),
-  ),
-  getAllLeagues: jest.fn(() =>
-    Promise.resolve([
+jest.mock('@/store/dataStore', () => ({
+  useDataStore: jest.fn(() => ({
+    user: {
+      documentId: '123',
+      id: '1234',
+      email: 'test@test.com',
+      leagues: ['league1'],
+    },
+    allLeagues: [
       {
         leagueId: '123',
         leagueName: 'Test League',
-        logo: 'https://example.com/logo.png',
-        participants: ['123456', '78', '9'],
+        logo: 'logo.png',
+        participants: ['123456', '78'],
         survivors: ['123456', '78'],
       },
-    ]),
-  ),
+    ],
+    updateUser: jest.fn(),
+  })),
 }));
 
-jest.mock('@/context/AuthContextProvider', () => ({
-  useAuthContext: jest.fn(() => ({ user: { id: '123' } })),
+jest.mock('@/utils/utils', () => ({
+  getUserLeagues: jest.fn(() => Promise.resolve([])),
+  cn: jest.fn(),
+}));
+
+jest.mock('@/api/apiFunctions', () => ({
+  getAllLeagues: jest.fn(),
+  addUserToLeague: jest.fn(),
+}));
+
+jest.mock('react-hot-toast', () => ({
+  toast: {
+    custom: jest.fn(),
+  },
 }));
 
 describe('Leagues Component', () => {
   const mockUseDataStore = useDataStore as unknown as jest.Mock;
   const mockGetUserLeagues = getUserLeagues as jest.Mock;
-  const mockGetGameWeek = getGameWeek as jest.Mock;
   const mockGetAllLeagues = getAllLeagues as jest.Mock;
+  const mockAddUserToLeague = addUserToLeague as jest.Mock;
 
   beforeEach(() => {
     jest.clearAllMocks();
   });
 
-  xtest('should render "You are not enrolled in any leagues" message when no leagues are found', async () => {
-    mockUseDataStore.mockReturnValueOnce({ user: { id: '123', leagues: [] } });
-    mockGetUserLeagues.mockResolvedValueOnce([]);
-    mockGetGameWeek.mockResolvedValueOnce({ week: 1 });
+  it('should render "You are not enrolled in any leagues" message when no leagues are found', async () => {
+    mockUseAuthContext.isSignedIn = true;
+    mockUseDataStore.mockReturnValue({
+      user: {
+        documentId: '123',
+        email: 'test@test.com',
+        id: '123',
+        leagues: [],
+      },
+      allLeagues: [],
+    });
+
     render(<Leagues />);
 
+    await waitForElementToBeRemoved(() => screen.getByTestId('global-spinner'));
+
     await waitFor(() => {
-      expect(
-        screen.getByText('You are not enrolled in any leagues'),
-      ).toBeInTheDocument();
+      const messageElement = screen.getByTestId('no-leagues-message');
+      expect(messageElement).toBeInTheDocument();
     });
   });
 
-  xtest('should display GlobalSpinner while loading data', async () => {
-    mockUseDataStore.mockReturnValueOnce({ user: { id: '123', leagues: [] } });
-    mockGetUserLeagues.mockResolvedValueOnce([]);
-    mockGetGameWeek.mockResolvedValueOnce({ week: 1 });
-    render(<Leagues />);
+  it('should display GlobalSpinner while loading data', async () => {
+    mockUseAuthContext.isSignedIn = true;
 
-    await waitFor(() => {
-      expect(screen.getByTestId('global-spinner')).toBeInTheDocument();
+    mockUseDataStore.mockReturnValueOnce({
+      user: {
+        documentId: '123',
+        email: 'test@test.com',
+        id: '123',
+        leagues: [],
+      },
+      allLeagues: [],
     });
-  });
-  xtest('should not display GlobalSpinner after loading data', async () => {
-    mockUseDataStore.mockReturnValueOnce({ user: { id: '123', leagues: [] } });
-    mockGetUserLeagues.mockResolvedValueOnce([]);
-    mockGetGameWeek.mockResolvedValueOnce({ week: 1 });
 
     render(<Leagues />);
 
     expect(screen.getByTestId('global-spinner')).toBeInTheDocument();
-
-    await waitFor(() => {
-      expect(screen.queryByTestId('global-spinner')).not.toBeInTheDocument();
-    });
   });
 
-  xtest('should handle form submission to join a league', async () => {
-    mockUseDataStore.mockReturnValueOnce({
-      user: { id: '123', leagues: [] },
+  it('should not display GlobalSpinner after loading data', async () => {
+    mockUseAuthContext.isSignedIn = true;
+
+    mockUseDataStore.mockReturnValue({
+      user: {
+        documentId: '123',
+        email: 'test@test.com',
+        id: '123',
+        leagues: [],
+      },
       allLeagues: [
         {
           leagueId: '123',
           leagueName: 'Test League',
-          logo: 'https://findmylogo.com/logo.png',
+          logo: 'logo.png',
           participants: ['123456', '78'],
-          survivors: ['123456', '78', '9'],
+          survivors: ['123456', '78'],
         },
       ],
     });
+
     mockGetUserLeagues.mockResolvedValueOnce([]);
-    mockGetGameWeek.mockResolvedValueOnce({ week: 1 });
+
+    render(<Leagues />);
+
+    await waitForElementToBeRemoved(() => screen.getByTestId('global-spinner'));
+
+    expect(screen.queryByTestId('global-spinner')).not.toBeInTheDocument();
+  });
+
+  it('should handle form submission to join a league', async () => {
+    mockUseAuthContext.isSignedIn = true;
+
+    const user = {
+      documentId: '123',
+      email: 'test@test.com',
+      id: '123',
+      leagues: [],
+    };
+
+    const league = {
+      leagueId: '123',
+      leagueName: 'Test League',
+      logo: 'logo.png',
+      participants: [],
+      survivors: [],
+    };
+
+    const updateUser = jest.fn();
+
+    mockUseDataStore.mockReturnValue({
+      user,
+      allLeagues: [league],
+      updateUser,
+    });
+
+    mockGetAllLeagues.mockResolvedValueOnce([league]);
+    mockAddUserToLeague.mockResolvedValue(
+      Promise.resolve({
+        userDocumentId: user.documentId,
+        selectedLeague: league.leagueId,
+        selectedLeagues: [league.leagueId],
+        participants: [user.id],
+        survivors: [user.id],
+      }),
+    );
 
     render(<Leagues />);
 
@@ -109,16 +185,93 @@ describe('Leagues Component', () => {
       expect(screen.queryByTestId('global-spinner')).not.toBeInTheDocument();
     });
 
-    const selectElement = screen.getByLabelText(/Select league to join/i);
-    expect(selectElement).toBeInTheDocument();
+    const selectElement = screen.getByTestId('select-available-leagues');
+    fireEvent.change(selectElement, { target: { value: '123' } });
+    fireEvent.click(screen.getByTestId('join-league-button'));
+
+    await waitFor(() => {
+      expect(mockAddUserToLeague).toHaveBeenCalledWith({
+        userDocumentId: user.documentId,
+        selectedLeague: league.leagueId,
+        selectedLeagues: [league.leagueId],
+        participants: [user.id],
+        survivors: [user.id],
+      });
+      expect(updateUser).toHaveBeenCalledWith(
+        user.documentId,
+        user.id,
+        user.email,
+        [...user.leagues, league.leagueId],
+      );
+      expect(toast.custom).toHaveBeenCalledWith(
+        <Alert
+          variant={AlertVariants.Success}
+          message={`Added ${league.leagueName} to your leagues!`}
+        />,
+      );
+    });
+  });
+
+  it('should show error if adding to league fails', async () => {
+    mockUseAuthContext.isSignedIn = true;
+
+    const user = {
+      documentId: '123',
+      email: 'test@test.com',
+      id: '123',
+      leagues: [],
+    };
 
+    const league = {
+      leagueId: '123',
+      leagueName: 'Test League',
+      logo: 'logo.png',
+      participants: [],
+      survivors: [],
+    };
+
+    mockUseDataStore.mockReturnValue({
+      user,
+      allLeagues: [league],
+    });
+
+    mockGetUserLeagues.mockResolvedValueOnce([]);
+    mockGetAllLeagues.mockResolvedValueOnce([league]);
+    mockAddUserToLeague.mockResolvedValue(
+      Promise.resolve({
+        userDocumentId: user.documentId,
+        selectedLeague: league.leagueId,
+        selectedLeagues: [league.leagueId],
+        participants: [user.id],
+        survivors: [user.id],
+      }),
+    );
+
+    render(<Leagues />);
+
+    await waitFor(() => {
+      expect(screen.queryByTestId('global-spinner')).not.toBeInTheDocument();
+    });
+
+    const selectElement = screen.getByTestId('select-available-leagues');
     fireEvent.change(selectElement, { target: { value: '123' } });
-    fireEvent.click(screen.getByText(/Join League/i));
+    fireEvent.click(screen.getByTestId('join-league-button'));
 
     await waitFor(() => {
-      expect(
-        screen.getByText('Added Test League to your leagues!'),
-      ).toBeInTheDocument();
+      expect(mockAddUserToLeague).toHaveBeenCalledWith({
+        userDocumentId: user.documentId,
+        selectedLeague: league.leagueId,
+        selectedLeagues: [league.leagueId],
+        participants: [user.id],
+        survivors: [user.id],
+      });
+
+      expect(toast.custom).toHaveBeenCalledWith(
+        <Alert
+          variant={AlertVariants.Error}
+          message="Failed to add the league. Please try again."
+        />,
+      );
     });
   });
 });
diff --git a/app/(main)/league/all/page.tsx b/app/(main)/league/all/page.tsx
index 3e9e78dd..56c04323 100644
--- a/app/(main)/league/all/page.tsx
+++ b/app/(main)/league/all/page.tsx
@@ -124,13 +124,12 @@ const Leagues = (): JSX.Element => {
   return (
     <div className="Leagues mx-auto max-w-3xl pt-10">
       {loadingData ? (
-        <GlobalSpinner />
+        <GlobalSpinner data-testid="global-spinner" />
       ) : (
         <>
           <h1 className="pb-10 text-center text-3xl font-bold tracking-tight">
             Your Leagues
           </h1>
-
           <section className="grid gap-6 md:grid-cols-2 mb-10">
             {leagues.length > 0 ? (
               leagues.map((league) => (
@@ -145,7 +144,10 @@ const Leagues = (): JSX.Element => {
               ))
             ) : (
               <div className="text-center">
-                <p className="text-lg font-bold">
+                <p
+                  className="text-lg font-bold"
+                  data-testid="no-leagues-message"
+                >
                   You are not enrolled in any leagues
                 </p>
               </div>
@@ -169,6 +171,7 @@ const Leagues = (): JSX.Element => {
                 render={({ field, fieldState }) => (
                   <>
                     <select
+                      data-testid="select-available-leagues"
                       {...field}
                       id="available-leagues"
                       className={`border border-border rounded p-2 w-full text-secondary ${
@@ -198,7 +201,9 @@ const Leagues = (): JSX.Element => {
                 )}
               />
             </div>
-            <Button type="submit">Join League</Button>
+            <Button type="submit" data-testid="join-league-button">
+              Join League
+            </Button>
           </form>
         </>
       )}
diff --git a/store/dataStore.test.ts b/store/dataStore.test.ts
index 515ffa4a..ab4f9acf 100644
--- a/store/dataStore.test.ts
+++ b/store/dataStore.test.ts
@@ -3,8 +3,9 @@ import { useDataStore } from './dataStore';
 
 // test values
 const userData = {
-  userId: '123',
-  userEmail: 'test@email.com',
+  documentId: '123',
+  id: '123',
+  email: 'test@email.com',
   leagues: ['123456'],
 };
 
@@ -44,7 +45,7 @@ const allLeagues = [
 ];
 
 describe('Data Store', () => {
-  xdescribe('User Test', () => {
+  describe('User Test', () => {
     it('Check the default user state', () => {
       const { result } = renderHook(() => useDataStore());
       expect(result.current.user.id).toBe('');
@@ -56,6 +57,7 @@ describe('Data Store', () => {
 
       act(() => {
         result.current.updateUser(
+          userData.documentId,
           userData.userId,
           userData.userEmail,
           userData.leagues,
@@ -70,6 +72,7 @@ describe('Data Store', () => {
 
       act(() => {
         result.current.updateUser(
+          userData.documentId,
           userData.userId,
           userData.userEmail,
           userData.leagues,
@@ -112,18 +115,22 @@ describe('Data Store', () => {
         leagueId: '123',
         gameWeekId: '456',
         userResults: {
-          '66281d5ec5614f76bc91': {
-            team: '66218f22b40deef340f8',
-            correct: false,
-          },
-          '6628077faeeedd272637': {
-            team: '6621b30ea57bd075e9d3',
-            correct: false,
-          },
-          '66174f2362ec891167be': {
-            team: '6621b30ea57bd075e9d3',
-            correct: true,
-          },
+          '123': {
+            '456': {
+            'entry1': {
+              teamName: 'New England Patriots',
+              correct:true
+            },
+            'entry2': {
+              teamName: 'Kansas City Chiefs',
+              correct:false
+            },
+            'entry3': {
+              teamName: 'New England Patriots',
+              correct:false
+            }
+          }
+          }
         },
       };
       act(() => {