diff --git a/api/apiFunctions.ts b/api/apiFunctions.ts
index 2c6880aa..93041dd3 100644
--- a/api/apiFunctions.ts
+++ b/api/apiFunctions.ts
@@ -100,7 +100,6 @@ export async function resetPassword({
   try {
     await account.updatePassword(newPassword, oldPassword);
   } catch (error) {
-    console.error('Password reset failed:', error);
     throw error;
   }
 }
@@ -141,7 +140,6 @@ export async function updateUserEmail({
       },
     );
   } catch (error) {
-    console.error('Error updating user email:', error);
     throw error;
   }
 }
diff --git a/app/(main)/account/settings/page.tsx b/app/(main)/account/settings/page.tsx
index d773babc..29777fe8 100644
--- a/app/(main)/account/settings/page.tsx
+++ b/app/(main)/account/settings/page.tsx
@@ -45,7 +45,7 @@ const AccountSettings = (): JSX.Element => {
               </LinkCustom>
             </div>
             <Heading
-              as="h2"
+              as="h1"
               className="text-4xl font-bold"
               data-testid="entry-page-header-page-name"
             >
diff --git a/components/Nav/Nav.test.tsx b/components/Nav/Nav.test.tsx
index 334c851d..74fc9655 100644
--- a/components/Nav/Nav.test.tsx
+++ b/components/Nav/Nav.test.tsx
@@ -67,11 +67,10 @@ describe('Nav', () => {
   it('renders link to /league/all', async () => {
     render(<Nav />);
 
-    const drawTrigger = screen.getByTestId('drawer-trigger');
-    fireEvent.click(drawTrigger);
+    fireEvent.click(screen.getByTestId('drawer-trigger'));
 
     let linkNav: HTMLElement;
-    linkNav = await screen.getByTestId('league-link');
+    linkNav = screen.getByTestId('league-link');
     expect(linkNav).toBeInTheDocument();
     expect(linkNav).toHaveAttribute('href', '/league/all');
   });
@@ -81,11 +80,9 @@ describe('Nav', () => {
 
     render(<Nav />);
 
-    const navElement = screen.getByTestId('nav');
-    expect(navElement).toBeInTheDocument();
+    expect(screen.getByTestId('nav')).toBeInTheDocument();
 
-    const drawerTrigger = screen.getByTestId('drawer-trigger');
-    fireEvent.click(drawerTrigger);
+    fireEvent.click(screen.getByTestId('drawer-trigger'));
 
     expect(screen.getByTestId('settings-link')).toBeInTheDocument();
     expect(screen.getByTestId('title')).toBeInTheDocument();
@@ -102,9 +99,7 @@ describe('Nav', () => {
     fireEvent.click(drawerTrigger);
 
     const preferencesLink = await screen.findByTestId('settings-link');
-
     expect(preferencesLink).toHaveAttribute('href', '/account/settings');
-
     fireEvent.click(preferencesLink);
 
     await waitFor(() => {
@@ -119,7 +114,6 @@ describe('Nav', () => {
     render(<Nav />);
 
     const navElement = screen.getByTestId('nav');
-
     expect(navElement).toBeInTheDocument();
     expect(navElement).toHaveClass('hidden');
   });
@@ -130,7 +124,6 @@ describe('Nav', () => {
     render(<Nav />);
 
     const navElement = screen.getByTestId('nav');
-
     expect(navElement).toBeInTheDocument();
     expect(navElement).toHaveClass('hidden');
   });
@@ -140,7 +133,6 @@ describe('Nav', () => {
     render(<Nav />);
 
     const navElement = screen.getByTestId('nav');
-
     expect(navElement).toBeInTheDocument();
     expect(navElement).toHaveClass('hidden');
   });
@@ -150,7 +142,6 @@ describe('Nav', () => {
     render(<Nav />);
 
     const navElement = screen.getByTestId('nav');
-
     expect(navElement).toBeInTheDocument();
     expect(navElement).toHaveClass('hidden');
   });
@@ -161,7 +152,6 @@ describe('Nav', () => {
     render(<Nav />);
 
     const navElement = screen.getByTestId('nav');
-
     expect(navElement).toBeInTheDocument();
     expect(navElement).not.toHaveClass('hidden');
   });
@@ -171,12 +161,9 @@ describe('Nav', () => {
 
     render(<Nav />);
 
-    const drawerTrigger = screen.getByTestId('drawer-trigger');
-    fireEvent.click(drawerTrigger);
+    fireEvent.click(screen.getByTestId('drawer-trigger'));
+    fireEvent.click(screen.getByTestId('sign-out-button'));
 
-    const signOutButton = screen.getByTestId('sign-out-button');
-
-    fireEvent.click(signOutButton);
     await waitFor(() => {
       expect(mockLogoutAccount).toHaveBeenCalled();
     });
@@ -194,12 +181,9 @@ describe('Nav', () => {
     render(<Nav />);
 
     const drawerTrigger = screen.getByTestId('drawer-trigger');
-
     fireEvent.click(drawerTrigger);
 
-    const signOutButton = screen.getByTestId('sign-out-button');
-
-    fireEvent.click(signOutButton);
+    fireEvent.click(screen.getByTestId('sign-out-button'));
 
     await waitFor(() => {
       expect(drawerTrigger.getAttribute('data-state')).toBe('closed');
@@ -212,12 +196,8 @@ describe('Nav', () => {
     render(<Nav />);
 
     const drawerTrigger = screen.getByTestId('drawer-trigger');
-
     fireEvent.click(drawerTrigger);
-
-    const linkNav = screen.getByTestId('league-link');
-
-    fireEvent.click(linkNav);
+    fireEvent.click(screen.getByTestId('league-link'));
 
     await waitFor(() => {
       expect(drawerTrigger.getAttribute('data-state')).toBe('closed');
diff --git a/components/RestPasswordForm/ResetPasswordForm.tsx b/components/RestPasswordForm/ResetPasswordForm.tsx
index 092b4e9b..62cc4686 100644
--- a/components/RestPasswordForm/ResetPasswordForm.tsx
+++ b/components/RestPasswordForm/ResetPasswordForm.tsx
@@ -22,6 +22,7 @@ import {
   FormLabel,
   FormMessage,
 } from '../Form/Form';
+import Link from 'next/link';
 
 const ResetPasswordSchema = z.object({
   oldPassword: z.string().min(1, { message: 'Please enter your old password' }),
@@ -83,7 +84,6 @@ const ResetPasswordForm = (): JSX.Element => {
 
       form.reset({ oldPassword: '', newPassword: '' });
     } catch (error) {
-      console.error('Password Update Failed', error);
       toast.custom(
         <Alert
           variant={AlertVariants.Error}
@@ -110,7 +110,7 @@ const ResetPasswordForm = (): JSX.Element => {
             <p className="text-sm">
               This will update the password for your account login. If you
               forgot your password you can{' '}
-              <a
+              <Link
                 href="/recover-password"
                 className="underline underline-offset-4 hover:text-primary-muted transition-colors"
                 data-testid="recover-password-link"
@@ -119,7 +119,7 @@ const ResetPasswordForm = (): JSX.Element => {
                 }}
               >
                 Recover your password
-              </a>
+              </Link>
               .
             </p>
           </div>