diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4cc8846e..8fb196fc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -33,6 +33,8 @@ jobs:
         with:
           path: ./package.json
 
+      - uses: pnpm/action-setup@v4
+
       - name: Cache PNPM modules
         uses: actions/cache@v4
         id: cache-modules
@@ -43,13 +45,11 @@ jobs:
           key: ${{ runner.os }}-node-${{ hashFiles('**/pnpm-lock.yaml') }}
           restore-keys: ${{ runner.os }}-node-
 
-      - uses: pnpm/action-setup@v4
-
       - uses: actions/setup-node@v4
         with:
           # use the version found in `.nvmrc`
           node-version-file: '.nvmrc'
-          cache: 'pnpm'
+          # cache: 'pnpm'
 
       - name: Install `node_modules`
         if: steps.cache-modules.outputs.cache-hit != 'true'
diff --git a/components/blocks/ResendConfirmationBar/ResendConfirmationBar.vue b/components/blocks/ResendConfirmationBar/ResendConfirmationBar.vue
index beebe576..4dc4d029 100644
--- a/components/blocks/ResendConfirmationBar/ResendConfirmationBar.vue
+++ b/components/blocks/ResendConfirmationBar/ResendConfirmationBar.vue
@@ -1,6 +1,8 @@
 <script setup lang="ts">
 import { ref, computed } from 'vue'
 import BaseButton from 'elements/buttons/BaseButton/BaseButton.vue'
+import { useResendAccountConfirmation } from '~/composables/api'
+import { useCurrentUser, useI18n, useModalAlert } from '#imports'
 
 const currentUser = await useCurrentUser()
 const errorText = ref('')
diff --git a/components/blocks/SiteFooter/LanguageSelector/LanguageSelector.vue b/components/blocks/SiteFooter/LanguageSelector/LanguageSelector.vue
index 23046140..f701bf3d 100644
--- a/components/blocks/SiteFooter/LanguageSelector/LanguageSelector.vue
+++ b/components/blocks/SiteFooter/LanguageSelector/LanguageSelector.vue
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { useI18n } from '#imports'
 import type { ComputedRef } from 'vue'
 // import { type LocaleObject } from '#imports'
 
diff --git a/components/blocks/cards/BasicAlert/BasicAlert.test.ts b/components/blocks/cards/BasicAlert/BasicAlert.test.ts
index 84cae064..a9919635 100644
--- a/components/blocks/cards/BasicAlert/BasicAlert.test.ts
+++ b/components/blocks/cards/BasicAlert/BasicAlert.test.ts
@@ -1,6 +1,7 @@
 import { mountSuspended } from '@nuxt/test-utils/runtime'
 import { getByClass, getByTestId, getHTMLElement } from 'root/testUtils'
 import BasicAlert from './BasicAlert.vue'
+import { useModalAlert } from '#imports'
 
 beforeEach(() => {
   const { state: modalAlertState } = useModalAlert()
diff --git a/components/blocks/cards/BasicAlert/BasicAlert.vue b/components/blocks/cards/BasicAlert/BasicAlert.vue
index ee4efbb7..edfa8d43 100644
--- a/components/blocks/cards/BasicAlert/BasicAlert.vue
+++ b/components/blocks/cards/BasicAlert/BasicAlert.vue
@@ -4,6 +4,7 @@ import CloseButton from 'elements/buttons/CloseButton/CloseButton.vue'
 import Card from 'elements/cards/Card/Card.vue'
 import CardHeader from 'elements/cards/CardHeader/CardHeader.vue'
 import CardBody from 'elements/cards/CardBody/CardBody.vue'
+import { useModalAlert } from '#imports'
 
 const { closeAlert, state } = useModalAlert()
 </script>
diff --git a/components/blocks/cards/ForgotPasswordCard/ForgotPasswordCard.test.ts b/components/blocks/cards/ForgotPasswordCard/ForgotPasswordCard.test.ts
index 8bdad174..8721d5f0 100644
--- a/components/blocks/cards/ForgotPasswordCard/ForgotPasswordCard.test.ts
+++ b/components/blocks/cards/ForgotPasswordCard/ForgotPasswordCard.test.ts
@@ -1,21 +1,12 @@
-import { mockNuxtImport, mountSuspended } from '@nuxt/test-utils/runtime'
+import { mountSuspended } from '@nuxt/test-utils/runtime'
 import { getByTestId } from 'root/testUtils'
 import ForgotPasswordCard from './ForgotPasswordCard.vue'
-import type { RecoverAccountRequest } from 'lib/api/data-contracts'
-
-mockNuxtImport('useRecoverAccount', () => {
-  return async (
-    _requestData: RecoverAccountRequest,
-    opts: optionalParameters<void> = {},
-  ) => {
-    const { onOkay } = opts
-    if (onOkay) {
-      await onOkay()
-    }
-  }
-})
 
-afterAll(() => {
+const mockSuccessAccountRecoverCreate = vi.fn(() =>
+  Promise.resolve({ ok: true }),
+)
+
+afterEach(() => {
   vi.restoreAllMocks()
 })
 
@@ -52,6 +43,14 @@ describe('<ForgotPasswordCard />', () => {
       const username = 'strongbad'
       const emailAddress = `strongbad@homestarrunner.com`
 
+      beforeEach(() => {
+        vi.mock('lib/api/Account', () => ({
+          Account: function Account() {
+            this.recoverCreate = mockSuccessAccountRecoverCreate
+          },
+        }))
+      })
+
       it('should emit the close event', async () => {
         const wrapper = await mountSuspended(ForgotPasswordCard)
 
@@ -63,6 +62,7 @@ describe('<ForgotPasswordCard />', () => {
 
         await getByTestId(wrapper, 'reset-password-button').trigger('click')
 
+        expect(mockSuccessAccountRecoverCreate).toHaveBeenCalled()
         expect(wrapper.emitted().close).toBeTruthy()
       })
     })
diff --git a/components/blocks/cards/ForgotPasswordCard/ForgotPasswordCard.vue b/components/blocks/cards/ForgotPasswordCard/ForgotPasswordCard.vue
index b4d07bd3..55377900 100644
--- a/components/blocks/cards/ForgotPasswordCard/ForgotPasswordCard.vue
+++ b/components/blocks/cards/ForgotPasswordCard/ForgotPasswordCard.vue
@@ -7,6 +7,8 @@ import CardBody from 'elements/cards/CardBody/CardBody.vue'
 import CardHeader from 'elements/cards/CardHeader/CardHeader.vue'
 import BaseInput from 'elements/inputs/BaseInput/BaseInput.vue'
 import { isEmailValid, isUsernameValid } from 'lib/form_helpers'
+import { useModalAlert } from '#imports'
+import { useRecoverAccount } from '~/composables/api'
 
 interface ForgotPasswordCardPops {
   modal?: boolean
@@ -21,7 +23,7 @@ const emit = defineEmits<{
   (event: 'close' | 'cancelClick'): void
 }>()
 
-const props = withDefaults(defineProps<ForgotPasswordCardPops>(), {
+withDefaults(defineProps<ForgotPasswordCardPops>(), {
   modal: false,
 })
 
@@ -76,7 +78,7 @@ function resetPassword() {
     <CardHeader class="forgot-password-card__header">
       <div class="forgot-password-card__title">Forgot Password</div>
       <CloseButton
-        v-show="props.modal"
+        v-show="modal"
         data-testid="close-button"
         @click.prevent="emit('close')"
       />
diff --git a/components/blocks/cards/LogInCard/LogInCard.test.ts b/components/blocks/cards/LogInCard/LogInCard.test.ts
index 43cfba74..e4fd859c 100644
--- a/components/blocks/cards/LogInCard/LogInCard.test.ts
+++ b/components/blocks/cards/LogInCard/LogInCard.test.ts
@@ -1,10 +1,10 @@
 import { mountSuspended } from '@nuxt/test-utils/runtime'
-import { getByTestId, getHTMLElement } from 'root/testUtils'
+import { getById, getByTestId, getHTMLElement } from 'root/testUtils'
 import LogInCard from './LogInCard.vue'
 import * as apiComposables from 'composables/api'
 
 const token = 'jwt-token'
-const mockSuccessUsersLoginCreate = vi.fn(() =>
+const mockSuccessAccountLoginCreate = vi.fn(() =>
   Promise.resolve({ data: { token }, ok: true }),
 )
 const mockSuccessUsersMeList = vi.fn(() =>
@@ -20,9 +20,13 @@ afterEach(() => {
 
 describe('<LogInCard />', () => {
   beforeEach(() => {
+    vi.mock('lib/api/Account', () => ({
+      Account: function Account() {
+        this.loginCreate = mockSuccessAccountLoginCreate
+      },
+    }))
     vi.mock('lib/api/Users', () => ({
       Users: function Users() {
-        this.usersLoginCreate = mockSuccessUsersLoginCreate
         this.usersMeList = mockSuccessUsersMeList
       },
     }))
@@ -46,8 +50,7 @@ describe('<LogInCard />', () => {
     })
   })
 
-  // TODO: skip this for now
-  describe.skip('when enter key is released on the password input field', () => {
+  describe('when enter key is released on the password input field', () => {
     it('emits the close event', async () => {
       const wrapper = await mountSuspended(LogInCard)
 
@@ -57,8 +60,7 @@ describe('<LogInCard />', () => {
     })
   })
 
-  // TODO: skip this for now
-  describe.skip('when the login button is clicked', () => {
+  describe('when the login button is clicked', () => {
     const emailAddress = 'strongbad@homestarrunner.com'
     const password = 'homestarsux'
 
@@ -66,7 +68,7 @@ describe('<LogInCard />', () => {
       const wrapper = await mountSuspended(LogInCard)
 
       const emailInput = getByTestId(wrapper, 'email-input')
-      const passwordInput = getByTestId(wrapper, 'password-input')
+      const passwordInput = getById(wrapper, 'password')
 
       await emailInput.setValue(emailAddress)
       await passwordInput.setValue(password)
@@ -80,7 +82,7 @@ describe('<LogInCard />', () => {
       const wrapper = await mountSuspended(LogInCard)
 
       const emailInput = getByTestId(wrapper, 'email-input')
-      const passwordInput = getByTestId(wrapper, 'password-input')
+      const passwordInput = getById(wrapper, 'password')
 
       await emailInput.setValue(emailAddress)
       await passwordInput.setValue(password)
@@ -99,14 +101,13 @@ describe('<LogInCard />', () => {
       expect(passwordInputElement.value).toBe('')
     })
 
-    // this test is still failing
     it('calls the api', async () => {
       const useLoginUserSpy = vi.spyOn(apiComposables, 'useLoginUser')
 
       const wrapper = await mountSuspended(LogInCard)
 
       const emailInput = getByTestId(wrapper, 'email-input')
-      const passwordInput = getByTestId(wrapper, 'password-input')
+      const passwordInput = getById(wrapper, 'password')
 
       await emailInput.setValue(emailAddress)
       await passwordInput.setValue(password)
@@ -114,6 +115,7 @@ describe('<LogInCard />', () => {
       await getByTestId(wrapper, 'login-button').trigger('click')
 
       expect(useLoginUserSpy).toBeCalledTimes(1)
+      expect(mockSuccessAccountLoginCreate).toBeCalledTimes(1)
     })
   })
 
diff --git a/components/blocks/cards/LogInCard/LogInCard.vue b/components/blocks/cards/LogInCard/LogInCard.vue
index 3878bebc..d40af3d8 100644
--- a/components/blocks/cards/LogInCard/LogInCard.vue
+++ b/components/blocks/cards/LogInCard/LogInCard.vue
@@ -8,6 +8,7 @@ import CardBody from 'elements/cards/CardBody/CardBody.vue'
 import CardHeader from 'elements/cards/CardHeader/CardHeader.vue'
 import Card from 'elements/cards/Card/Card.vue'
 import HideShowPassword from 'elements/buttons/HideShowPassword/HideShowPassword.vue'
+import { useLoginUser } from '~/composables/api'
 
 interface LogInCardProps {
   modal?: boolean
@@ -23,7 +24,7 @@ const emit = defineEmits<{
   (event: 'close' | 'forgotPasswordClick' | 'signUpClick'): void
 }>()
 
-const props = withDefaults(defineProps<LogInCardProps>(), {
+withDefaults(defineProps<LogInCardProps>(), {
   modal: false,
 })
 
@@ -51,6 +52,7 @@ async function login() {
         state.email.value = ''
         state.password.value = ''
         state.showPassword.value = false
+        emit('close')
       },
     },
   )
@@ -72,7 +74,7 @@ async function login() {
       </BaseButton>
 
       <CloseButton
-        v-show="props.modal"
+        v-show="modal"
         data-testid="close-button"
         @click.prevent="emit('close')"
       />
diff --git a/components/blocks/cards/SignUpCard/SignUpCard.test.ts b/components/blocks/cards/SignUpCard/SignUpCard.test.ts
index 5eee1b79..ba9cd4b1 100644
--- a/components/blocks/cards/SignUpCard/SignUpCard.test.ts
+++ b/components/blocks/cards/SignUpCard/SignUpCard.test.ts
@@ -1,6 +1,7 @@
 import { mountSuspended } from '@nuxt/test-utils/runtime'
-import { getByTestId, getHTMLElement } from 'root/testUtils'
+import { getByQuery, getByTestId, getHTMLElement } from 'root/testUtils'
 import SignUpCard from './SignUpCard.vue'
+import { useRuntimeConfig } from '#imports'
 
 afterEach(() => {
   fetchMock.resetMocks()
@@ -24,16 +25,15 @@ describe('<SignUpCard />', () => {
     })
   })
 
-  // TODO: Update this test once the inputs can be controlled together
-  describe.skip('when the hide/show button is clicked', () => {
+  describe('when the hide/show button is clicked', () => {
     it('changes the password input type to be text', async () => {
       const wrapper = await mountSuspended(SignUpCard)
 
       const passwordInputElement = getHTMLElement(
-        getByTestId(wrapper, 'password-input'),
+        getByQuery(wrapper, '[data-testid="password-input"] #password'),
       ) as HTMLInputElement
       const passwordConfirmInputElement = getHTMLElement(
-        getByTestId(wrapper, 'password-confirm-input'),
+        getByQuery(wrapper, '[data-testid="password-confirm-input"] #password'),
       ) as HTMLInputElement
 
       expect(passwordInputElement.type).toBe('password')
diff --git a/components/blocks/cards/SignUpCard/SignUpCard.vue b/components/blocks/cards/SignUpCard/SignUpCard.vue
index 1badfbf8..5b2b0649 100644
--- a/components/blocks/cards/SignUpCard/SignUpCard.vue
+++ b/components/blocks/cards/SignUpCard/SignUpCard.vue
@@ -15,6 +15,7 @@ import CloseButton from 'elements/buttons/CloseButton/CloseButton.vue'
 import Card from 'elements/cards/Card/Card.vue'
 import CardHeader from 'elements/cards/CardHeader/CardHeader.vue'
 import CardBody from 'elements/cards/CardBody/CardBody.vue'
+import { useLoginUser, useRegisterUser } from '~/composables/api'
 
 interface SignUpCardProps {
   modal?: boolean
@@ -31,7 +32,7 @@ const emit = defineEmits<{
   (event: 'close' | 'logInClick' | 'signUpClick'): void
 }>()
 
-const props = withDefaults(defineProps<SignUpCardProps>(), {
+withDefaults(defineProps<SignUpCardProps>(), {
   modal: false,
 })
 
@@ -124,7 +125,7 @@ function validatePasswordInputs() {
       <div class="signup-card__title">Sign Up</div>
 
       <CloseButton
-        v-show="props.modal"
+        v-show="modal"
         data-testid="close-button"
         @click.prevent="emit('close')"
       />
diff --git a/components/blocks/nav/SiteNavbar/SiteNavbar.test.ts b/components/blocks/nav/SiteNavbar/SiteNavbar.test.ts
index 9ade2086..c468539a 100644
--- a/components/blocks/nav/SiteNavbar/SiteNavbar.test.ts
+++ b/components/blocks/nav/SiteNavbar/SiteNavbar.test.ts
@@ -2,6 +2,7 @@ import { mountSuspended } from '@nuxt/test-utils/runtime'
 import * as apiComposables from 'composables/api'
 import { getByTestId } from 'root/testUtils'
 import SiteNavbar from './SiteNavbar.vue'
+import { useSessionToken } from '#imports'
 
 afterEach(() => {
   vi.restoreAllMocks()
diff --git a/components/blocks/nav/SiteNavbar/SiteNavbar.vue b/components/blocks/nav/SiteNavbar/SiteNavbar.vue
index 99f63503..4d0fd643 100644
--- a/components/blocks/nav/SiteNavbar/SiteNavbar.vue
+++ b/components/blocks/nav/SiteNavbar/SiteNavbar.vue
@@ -9,6 +9,8 @@ import LogInCard from 'blocks/cards/LogInCard/LogInCard.vue'
 import SignUpCard from 'blocks/cards/SignUpCard/SignUpCard.vue'
 import BaseModal from 'elements/modals/BaseModal/BaseModal.vue'
 import SearchBar from 'blocks/SearchBar/SearchBar.vue'
+import { useSessionToken } from '#imports'
+import { useLogoutUser } from '~/composables/api'
 
 interface NavbarState {
   mobileNavIsActive: boolean
diff --git a/components/elements/buttons/Dropdown/Dropdown.vue b/components/elements/buttons/Dropdown/Dropdown.vue
index 991f9a3b..84522298 100644
--- a/components/elements/buttons/Dropdown/Dropdown.vue
+++ b/components/elements/buttons/Dropdown/Dropdown.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { provide, ref } from 'vue'
+import { provide, ref, type Ref } from 'vue'
 import BaseButton from '../BaseButton/BaseButton.vue'
 
 export interface SharedState {
diff --git a/components/elements/buttons/Dropdown/DropdownItem.vue b/components/elements/buttons/Dropdown/DropdownItem.vue
index 3963e45e..8d29c83b 100644
--- a/components/elements/buttons/Dropdown/DropdownItem.vue
+++ b/components/elements/buttons/Dropdown/DropdownItem.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { inject } from 'vue'
+import { inject, ref } from 'vue'
 import type { SharedState } from './Dropdown.vue'
 
 const emit = defineEmits<{
diff --git a/composables/api/useChangePassword/index.ts b/composables/api/useChangePassword/index.ts
index b8a6f1e1..e39b4338 100644
--- a/composables/api/useChangePassword/index.ts
+++ b/composables/api/useChangePassword/index.ts
@@ -1,3 +1,4 @@
+import { useRuntimeConfig } from '#imports'
 import {
   type ApiResponse,
   type optionalParameters,
diff --git a/composables/api/useChangePassword/useChangePassword.test.ts b/composables/api/useChangePassword/useChangePassword.test.ts
index e02898f2..bd007757 100644
--- a/composables/api/useChangePassword/useChangePassword.test.ts
+++ b/composables/api/useChangePassword/useChangePassword.test.ts
@@ -1,3 +1,5 @@
+import useChangePassword from '.'
+
 const mockSuccessRecoverCreate2 = vi.fn(() => Promise.resolve({ ok: true }))
 
 describe('useChangePassword', () => {
diff --git a/composables/api/useConfirmAccount/index.ts b/composables/api/useConfirmAccount/index.ts
index 91edaf74..c0eafa15 100644
--- a/composables/api/useConfirmAccount/index.ts
+++ b/composables/api/useConfirmAccount/index.ts
@@ -1,3 +1,4 @@
+import { useRuntimeConfig } from '#imports'
 import {
   type ApiResponse,
   type optionalParameters,
diff --git a/composables/api/useConfirmAccount/useConfirmAccount.test.ts b/composables/api/useConfirmAccount/useConfirmAccount.test.ts
index 8aed4c8f..a91a8d55 100644
--- a/composables/api/useConfirmAccount/useConfirmAccount.test.ts
+++ b/composables/api/useConfirmAccount/useConfirmAccount.test.ts
@@ -1,3 +1,5 @@
+import useConfirmAccount from '.'
+
 const mockSuccessAccountConfirmation = vi.fn(() =>
   Promise.resolve({ ok: true }),
 )
diff --git a/composables/api/useGetLeaderboardDetail/index.ts b/composables/api/useGetLeaderboardDetail/index.ts
index bfd05aec..52ad8d5a 100644
--- a/composables/api/useGetLeaderboardDetail/index.ts
+++ b/composables/api/useGetLeaderboardDetail/index.ts
@@ -6,6 +6,7 @@ import {
 } from 'composables/useApi'
 import { Leaderboards } from 'lib/api/Leaderboards'
 import type { LeaderboardViewModel } from 'lib/api/data-contracts'
+import { useRuntimeConfig } from '#imports'
 
 export async function useGetLeaderboardDetail(
   leaderboardSlug: string,
diff --git a/composables/api/useGetLeaderboardDetail/useGetLeaderboardDetail.test.ts b/composables/api/useGetLeaderboardDetail/useGetLeaderboardDetail.test.ts
index d1d3592d..e3821c3e 100644
--- a/composables/api/useGetLeaderboardDetail/useGetLeaderboardDetail.test.ts
+++ b/composables/api/useGetLeaderboardDetail/useGetLeaderboardDetail.test.ts
@@ -1,3 +1,5 @@
+import useGetLeaderboardDetail from '.'
+
 const mockSuccessLeaderboardsDetail = vi.fn(() => Promise.resolve({ ok: true }))
 
 describe('useGetLeaderboardDetail', () => {
diff --git a/composables/api/useGetUserDetail/index.ts b/composables/api/useGetUserDetail/index.ts
index ba3a075c..71c09391 100644
--- a/composables/api/useGetUserDetail/index.ts
+++ b/composables/api/useGetUserDetail/index.ts
@@ -1,4 +1,9 @@
-import type { ApiResponse, optionalParameters } from 'composables/useApi'
+import { useRuntimeConfig } from '#imports'
+import {
+  useApi,
+  type ApiResponse,
+  type optionalParameters,
+} from 'composables/useApi'
 import { Users } from 'lib/api/Users'
 import type { UserViewModel } from 'lib/api/data-contracts'
 
diff --git a/composables/api/useGetUserDetail/useGetUserDetail.test.ts b/composables/api/useGetUserDetail/useGetUserDetail.test.ts
index e11c6ee4..6792ecd0 100644
--- a/composables/api/useGetUserDetail/useGetUserDetail.test.ts
+++ b/composables/api/useGetUserDetail/useGetUserDetail.test.ts
@@ -1,3 +1,5 @@
+import useGetUserDetail from '.'
+
 const mockSuccessUsersDetail = vi.fn(() => Promise.resolve({ ok: true }))
 
 describe('useGetUserDetail', () => {
diff --git a/composables/api/useLoginUser/index.ts b/composables/api/useLoginUser/index.ts
index ed70b21f..eb5afec3 100644
--- a/composables/api/useLoginUser/index.ts
+++ b/composables/api/useLoginUser/index.ts
@@ -1,3 +1,4 @@
+import { useSessionToken, useRuntimeConfig } from '#imports'
 import {
   type ApiResponse,
   type optionalParameters,
diff --git a/composables/api/useLoginUser/useLoginUser.test.ts b/composables/api/useLoginUser/useLoginUser.test.ts
index 7a69cc18..6ffa6da9 100644
--- a/composables/api/useLoginUser/useLoginUser.test.ts
+++ b/composables/api/useLoginUser/useLoginUser.test.ts
@@ -1,3 +1,6 @@
+import { useSessionToken } from '#imports'
+import useLoginUser from '.'
+
 // const mockFailureUsersLoginCreate = vi.fn(() => Promise.resolve({ ok: false }))
 const mockSuccessAccountLoginCreate = vi.fn(() =>
   Promise.resolve({ data: { token: 'token' }, ok: true }),
diff --git a/composables/api/useLogoutUser/index.ts b/composables/api/useLogoutUser/index.ts
index b46efc47..852fde51 100644
--- a/composables/api/useLogoutUser/index.ts
+++ b/composables/api/useLogoutUser/index.ts
@@ -1,3 +1,5 @@
+import { useSessionToken } from '#imports'
+
 export default function useLogoutUser() {
   useSessionToken().value = ''
 }
diff --git a/composables/api/useLogoutUser/useLogoutUser.test.ts b/composables/api/useLogoutUser/useLogoutUser.test.ts
index 6beca90f..736779b1 100644
--- a/composables/api/useLogoutUser/useLogoutUser.test.ts
+++ b/composables/api/useLogoutUser/useLogoutUser.test.ts
@@ -1,4 +1,6 @@
+import { useCurrentUser, useSessionToken } from '#imports'
 import type { UserViewModel } from 'lib/api/data-contracts'
+import useLogoutUser from '.'
 
 const token = 'auth-token'
 const user: UserViewModel = {
diff --git a/composables/api/useRecoverAccount/index.ts b/composables/api/useRecoverAccount/index.ts
index 6cd3bfe9..6470e7c3 100644
--- a/composables/api/useRecoverAccount/index.ts
+++ b/composables/api/useRecoverAccount/index.ts
@@ -1,6 +1,11 @@
 import { Account } from 'lib/api/Account'
-import type { ApiResponse, optionalParameters } from 'composables/useApi'
+import {
+  useApi,
+  type ApiResponse,
+  type optionalParameters,
+} from 'composables/useApi'
 import type { RecoverAccountRequest } from 'lib/api/data-contracts'
+import { useRuntimeConfig } from '#imports'
 
 export async function useRecoverAccount(
   requestData: RecoverAccountRequest,
diff --git a/composables/api/useRecoverAccount/useRecoverAccount.test.ts b/composables/api/useRecoverAccount/useRecoverAccount.test.ts
index c4aa0791..b77cb164 100644
--- a/composables/api/useRecoverAccount/useRecoverAccount.test.ts
+++ b/composables/api/useRecoverAccount/useRecoverAccount.test.ts
@@ -1,3 +1,5 @@
+import useRecoverAccount from '.'
+
 const mockSuccessRecoverCreate = vi.fn(() => Promise.resolve({ ok: true }))
 
 describe('useRecoverAccount', () => {
diff --git a/composables/api/useRegisterUser/index.ts b/composables/api/useRegisterUser/index.ts
index 3dddcbe8..0cfdce14 100644
--- a/composables/api/useRegisterUser/index.ts
+++ b/composables/api/useRegisterUser/index.ts
@@ -1,3 +1,4 @@
+import { useRuntimeConfig } from '#imports'
 import {
   type ApiResponse,
   type optionalParameters,
diff --git a/composables/api/useRegisterUser/useRegisterUser.test.ts b/composables/api/useRegisterUser/useRegisterUser.test.ts
index b2806e46..98959b8f 100644
--- a/composables/api/useRegisterUser/useRegisterUser.test.ts
+++ b/composables/api/useRegisterUser/useRegisterUser.test.ts
@@ -1,3 +1,5 @@
+import useRegisterUser from '.'
+
 const mockSuccessRegisterCreate = vi.fn(() => Promise.resolve({ ok: true }))
 
 describe('useRegisterUser', () => {
diff --git a/composables/api/useResendAccountConfirmation/index.ts b/composables/api/useResendAccountConfirmation/index.ts
index 58328fa3..86432807 100644
--- a/composables/api/useResendAccountConfirmation/index.ts
+++ b/composables/api/useResendAccountConfirmation/index.ts
@@ -1,3 +1,4 @@
+import { useRuntimeConfig, useSessionToken } from '#imports'
 import {
   useApi,
   type ApiResponse,
diff --git a/composables/api/useResendAccountConfirmation/useResendAccountConfirmation.test.ts b/composables/api/useResendAccountConfirmation/useResendAccountConfirmation.test.ts
index c534cd92..d941131f 100644
--- a/composables/api/useResendAccountConfirmation/useResendAccountConfirmation.test.ts
+++ b/composables/api/useResendAccountConfirmation/useResendAccountConfirmation.test.ts
@@ -1,3 +1,6 @@
+import useResendAccountConfirmation from '.'
+import useLoginUser from '../useLoginUser'
+
 const mockSuccessLogin = vi.fn(() =>
   Promise.resolve({ data: { token: 'token' }, ok: true }),
 )
diff --git a/composables/api/useValidateRecoveryToken/index.ts b/composables/api/useValidateRecoveryToken/index.ts
index 4b01ac66..be5c0a3d 100644
--- a/composables/api/useValidateRecoveryToken/index.ts
+++ b/composables/api/useValidateRecoveryToken/index.ts
@@ -1,4 +1,9 @@
-import type { ApiResponse, optionalParameters } from 'composables/useApi'
+import { useRuntimeConfig } from '#app'
+import {
+  useApi,
+  type ApiResponse,
+  type optionalParameters,
+} from 'composables/useApi'
 import { Account } from 'lib/api/Account'
 
 export async function useValidateRecoveryToken(
diff --git a/composables/api/useValidateRecoveryToken/useValidateRecoveryToken.test.ts b/composables/api/useValidateRecoveryToken/useValidateRecoveryToken.test.ts
index f7312ea2..5f127c11 100644
--- a/composables/api/useValidateRecoveryToken/useValidateRecoveryToken.test.ts
+++ b/composables/api/useValidateRecoveryToken/useValidateRecoveryToken.test.ts
@@ -1,3 +1,5 @@
+import useValidateRecoveryToken from '.'
+
 const mockSuccessRecoverDetail = vi.fn(() => Promise.resolve({ ok: true }))
 
 describe('useValidateRecoveryToken', () => {
diff --git a/composables/useApi/useApi.test.ts b/composables/useApi/useApi.test.ts
index 65e91670..d59779c4 100644
--- a/composables/useApi/useApi.test.ts
+++ b/composables/useApi/useApi.test.ts
@@ -1,6 +1,7 @@
 import { ref } from 'vue'
 import type { ProblemDetails } from 'lib/api/data-contracts'
 import type { HttpResponse } from 'lib/api/http-client'
+import useApi from '.'
 
 interface Opts {
   data?: object
diff --git a/composables/useCurrentUser.ts b/composables/useCurrentUser.ts
index 758c1656..284d2816 100644
--- a/composables/useCurrentUser.ts
+++ b/composables/useCurrentUser.ts
@@ -1,5 +1,7 @@
+import { useAsyncData, useRuntimeConfig, useSessionToken } from '#imports'
 import { Users } from 'lib/api/Users'
 import type { UserViewModel } from 'lib/api/data-contracts'
+import useApi from './useApi'
 
 export default function useCurrentUser() {
   return useAsyncData<Partial<UserViewModel>>(
diff --git a/composables/useModalAlert.ts b/composables/useModalAlert.ts
index acbb01e8..dc0aac33 100644
--- a/composables/useModalAlert.ts
+++ b/composables/useModalAlert.ts
@@ -1,3 +1,5 @@
+import { useState } from '#imports'
+
 interface ModalAlertState {
   body: string
   show: boolean
diff --git a/composables/useSessionToken.ts b/composables/useSessionToken.ts
index 57493fc3..d9b7e6c4 100644
--- a/composables/useSessionToken.ts
+++ b/composables/useSessionToken.ts
@@ -1,3 +1,5 @@
+import { useCookie } from '#imports'
+
 export default function useSessionToken() {
   return useCookie('session_token', {
     default: () => '',
diff --git a/i18n.config.ts b/i18n.config.ts
index 951f984e..2c57d653 100644
--- a/i18n.config.ts
+++ b/i18n.config.ts
@@ -1,4 +1,5 @@
 // TODO: This should be uncommented after 8.0.0-beta.11
+import { defineI18nConfig } from '#imports'
 import { localeMessages, supportedLocales } from './configUtils'
 
 export default defineI18nConfig(() => ({
diff --git a/middleware/confirm-account.ts b/middleware/confirm-account.ts
index 77fc1f16..9929fe5c 100644
--- a/middleware/confirm-account.ts
+++ b/middleware/confirm-account.ts
@@ -1,3 +1,7 @@
+import { defineNuxtRouteMiddleware, useRoute, navigateTo } from '#app'
+import { useModalAlert } from '#imports'
+import { useConfirmAccount } from '~/composables/api'
+
 export default defineNuxtRouteMiddleware((_to, from) => {
   const route = useRoute()
   const confirmationCode = route.query?.code as string
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 3b05afda..0c19f45c 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -7,7 +7,6 @@ import Icons from 'unplugin-icons/vite'
 import { FileSystemIconLoader } from 'unplugin-icons/loaders'
 import IconResolver from 'unplugin-icons/resolver'
 import Components from 'unplugin-vue-components/vite'
-import topLevelAwait from 'vite-plugin-top-level-await'
 import { supportedLocales } from './configUtils'
 import type { ViteConfig } from 'nuxt/schema'
 
@@ -41,16 +40,6 @@ export const viteConfig: ViteConfig = {
         }),
       ],
     }),
-    // eslintPlugin({ cache: true, failOnWarning: true, fix: true }),
-    // Needed this on my machine to prevent this erroneous error of
-    // ✘ [ERROR] Top-level await is not available in the configured
-    // target environment ("chrome87", "edge88", "es2020", "firefox78", "safari13" + 2 overrides)
-    topLevelAwait({
-      // The export name of top-level await promise for each chunk module
-      promiseExportName: '__tla',
-      // The function to generate import names of top-level await promise in each chunk module
-      promiseImportName: (i) => `__tla_${i}`,
-    }),
   ],
   resolve: {
     alias: nuxtAliases,
@@ -59,6 +48,7 @@ export const viteConfig: ViteConfig = {
 
 export default defineNuxtConfig({
   alias: nuxtAliases,
+
   app: {
     // Global page headers: https://v3.nuxtjs.org/api/configuration/nuxt.config#head
     head: {
@@ -78,46 +68,25 @@ export default defineNuxtConfig({
       title: 'leaderboards.gg',
     },
   },
-  devServerHandlers: [],
-
-  // https://v3.nuxtjs.org/api/configuration/nuxt.config#components
-  // https://v3.nuxtjs.org/guide/directory-structure/components/
-
-  // https://v8.i18n.nuxtjs.org/getting-started/setup
 
-  // TODO: someone who's brain lets them, figure out more proper setup with lazy loading
-  // i tried and couldn't figure it out unfortunately
+  devServerHandlers: [],
 
-  // https://v3.nuxtjs.org/api/configuration/nuxt.config#ignore
   i18n: {
     defaultLocale: 'en',
     locales: supportedLocales,
     vueI18n: './i18n.config.ts',
-    // vueI18n: {
-    //   fallbackLocale: 'en',
-    //   legacy: false,
-    //   locale: 'en',
-    //   // TODO: can this be cleaner via some sort of iteration? (not sure)
-    //   messages: localeMessages,
-    // },
   },
 
   ignore: ['**/*.test.ts', '**/node_modules', '.output', '.dist'],
+
   imports: {
-    dirs: [
-      './composables',
-      './utils',
-      './composables/api',
-      './composables/useApi',
-    ],
+    autoImport: false,
   },
+
   // Modules: https://v3.nuxtjs.org/api/configuration/nuxt.config#modules
   modules: [
-    // https://tailwindcss.com
     [
       '@nuxtjs/tailwindcss',
-      // Global CSS: https://v3.nuxtjs.org/api/configuration/nuxt.config#css
-      // css: ['assets/css/tailwind.css'],
       {
         configPath: 'tailwind.config.js',
         cssPath: './assets/css/tailwind.css',
@@ -137,4 +106,5 @@ export default defineNuxtConfig({
 
   ssr: false,
   vite: viteConfig,
+  compatibilityDate: '2024-08-17',
 })
diff --git a/package.json b/package.json
index e5a6f1fe..7bfad17b 100644
--- a/package.json
+++ b/package.json
@@ -70,7 +70,6 @@
     "unplugin-vue-components": "^0.27.3",
     "vite": "^5.4.0",
     "vite-plugin-eslint": "^1.8.1",
-    "vite-plugin-top-level-await": "^1.4.3",
     "vitest": "^2.0.5",
     "vitest-fetch-mock": "^0.3.0",
     "vue": "^3.4.37"
diff --git a/pages/reset-password.vue b/pages/reset-password.vue
index 073ebe7a..717a59d5 100644
--- a/pages/reset-password.vue
+++ b/pages/reset-password.vue
@@ -1,9 +1,12 @@
 <script setup lang="ts">
-import { type Ref, ref } from 'vue'
+import { computed, type Ref, ref } from 'vue'
 import { isPasswordValid, renderErrors } from 'lib/form_helpers'
 import { toggleState } from 'lib/helpers'
 import PasswordInput from 'elements/inputs/PasswordInput/PasswordInput.vue'
 import BaseButton from 'elements/buttons/BaseButton/BaseButton.vue'
+import { useRoute, navigateTo } from '#app'
+import { definePageMeta, useModalAlert } from '#imports'
+import { useChangePassword } from '~/composables/api'
 
 definePageMeta({
   middleware: 'reset-password',
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f7d10346..612e177f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -135,9 +135,6 @@ importers:
       vite-plugin-eslint:
         specifier: ^1.8.1
         version: 1.8.1(eslint@9.8.0)(vite@5.4.0(@types/node@22.1.0)(terser@5.31.5))
-      vite-plugin-top-level-await:
-        specifier: ^1.4.3
-        version: 1.4.3(rollup@4.20.0)(vite@5.4.0(@types/node@22.1.0)(terser@5.31.5))
       vitest:
         specifier: ^2.0.5
         version: 2.0.5(@types/node@22.1.0)(happy-dom@14.12.3)(terser@5.31.5)
@@ -1236,15 +1233,6 @@ packages:
       rollup:
         optional: true
 
-  '@rollup/plugin-virtual@3.0.2':
-    resolution: {integrity: sha512-10monEYsBp3scM4/ND4LNH5Rxvh3e/cVeL3jWTgZ2SrQ+BmUoQcopVQvnaMcOnykb1VkxUFuDAN+0FnpTFRy2A==}
-    engines: {node: '>=14.0.0'}
-    peerDependencies:
-      rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0
-    peerDependenciesMeta:
-      rollup:
-        optional: true
-
   '@rollup/plugin-yaml@4.1.2':
     resolution: {integrity: sha512-RpupciIeZMUqhgFE97ba0s98mOFS7CWzN3EJNhJkqSv9XLlWYtwVdtE6cDw6ASOF/sZVFS7kRJXftaqM2Vakdw==}
     engines: {node: '>=14.0.0'}
@@ -1387,81 +1375,6 @@ packages:
     peerDependencies:
       eslint: '>=8.40.0'
 
-  '@swc/core-darwin-arm64@1.7.6':
-    resolution: {integrity: sha512-6lYHey84ZzsdtC7UuPheM4Rm0Inzxm6Sb8U6dmKc4eCx8JL0LfWG4LC5RsdsrTxnjTsbriWlnhZBffh8ijUHIQ==}
-    engines: {node: '>=10'}
-    cpu: [arm64]
-    os: [darwin]
-
-  '@swc/core-darwin-x64@1.7.6':
-    resolution: {integrity: sha512-Fyl+8aH9O5rpx4O7r2KnsPpoi32iWoKOYKiipeTbGjQ/E95tNPxbmsz4yqE8Ovldcga60IPJ5OKQA3HWRiuzdw==}
-    engines: {node: '>=10'}
-    cpu: [x64]
-    os: [darwin]
-
-  '@swc/core-linux-arm-gnueabihf@1.7.6':
-    resolution: {integrity: sha512-2WxYTqFaOx48GKC2cbO1/IntA+w+kfCFy436Ij7qRqqtV/WAvTM9TC1OmiFbqq436rSot52qYmX8fkwdB5UcLQ==}
-    engines: {node: '>=10'}
-    cpu: [arm]
-    os: [linux]
-
-  '@swc/core-linux-arm64-gnu@1.7.6':
-    resolution: {integrity: sha512-TBEGMSe0LhvPe4S7E68c7VzgT3OMu4VTmBLS7B2aHv4v8uZO92Khpp7L0WqgYU1y5eMjk+XLDLi4kokiNHv/Hg==}
-    engines: {node: '>=10'}
-    cpu: [arm64]
-    os: [linux]
-
-  '@swc/core-linux-arm64-musl@1.7.6':
-    resolution: {integrity: sha512-QI8QGL0HGT42tj7F1A+YAzhGkJjUcvvTfI1e2m704W0Enl2/UIK9v5D1zvQzYwusRyKuaQfbeBRYDh0NcLOGLg==}
-    engines: {node: '>=10'}
-    cpu: [arm64]
-    os: [linux]
-
-  '@swc/core-linux-x64-gnu@1.7.6':
-    resolution: {integrity: sha512-61AYVzhjuNQAVIKKWOJu3H0/pFD28RYJGxnGg3YMhvRLRyuWNyY5Nyyj2WkKcz/ON+g38Arlz00NT1LDIViRLg==}
-    engines: {node: '>=10'}
-    cpu: [x64]
-    os: [linux]
-
-  '@swc/core-linux-x64-musl@1.7.6':
-    resolution: {integrity: sha512-hQFznpfLK8XajfAAN9Cjs0w/aVmO7iu9VZvInyrTCRcPqxV5O+rvrhRxKvC1LRMZXr5M6JRSRtepp5w+TK4kAw==}
-    engines: {node: '>=10'}
-    cpu: [x64]
-    os: [linux]
-
-  '@swc/core-win32-arm64-msvc@1.7.6':
-    resolution: {integrity: sha512-Aqsd9afykVMuekzjm4X4TDqwxmG4CrzoOSFe0hZrn9SMio72l5eAPnMtYoe5LsIqtjV8MNprLfXaNbjHjTegmA==}
-    engines: {node: '>=10'}
-    cpu: [arm64]
-    os: [win32]
-
-  '@swc/core-win32-ia32-msvc@1.7.6':
-    resolution: {integrity: sha512-9h0hYnOeRVNeQgHQTvD1Im67faNSSzBZ7Adtxyu9urNLfBTJilMllFd2QuGHlKW5+uaT6ZH7ZWDb+c/enx7Lcg==}
-    engines: {node: '>=10'}
-    cpu: [ia32]
-    os: [win32]
-
-  '@swc/core-win32-x64-msvc@1.7.6':
-    resolution: {integrity: sha512-izeoB8glCSe6IIDQmrVm6bvR9muk9TeKgmtY7b6l1BwL4BFnTUk4dMmpbntT90bEVQn3JPCaPtUG4HfL8VuyuA==}
-    engines: {node: '>=10'}
-    cpu: [x64]
-    os: [win32]
-
-  '@swc/core@1.7.6':
-    resolution: {integrity: sha512-FZxyao9eQks1MRmUshgsZTmlg/HB2oXK5fghkoWJm/1CU2q2kaJlVDll2as5j+rmWiwkp0Gidlq8wlXcEEAO+g==}
-    engines: {node: '>=10'}
-    peerDependencies:
-      '@swc/helpers': '*'
-    peerDependenciesMeta:
-      '@swc/helpers':
-        optional: true
-
-  '@swc/counter@0.1.3':
-    resolution: {integrity: sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==}
-
-  '@swc/types@0.1.12':
-    resolution: {integrity: sha512-wBJA+SdtkbFhHjTMYH+dEH1y4VpfGdAc2Kw/LK09i9bXd/K6j6PkDcFCEzb6iVfZMkPRrl/q0e3toqTAJdkIVA==}
-
   '@trysound/sax@0.2.0':
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -5239,10 +5152,6 @@ packages:
   util-deprecate@1.0.2:
     resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
 
-  uuid@10.0.0:
-    resolution: {integrity: sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==}
-    hasBin: true
-
   validate-npm-package-license@3.0.4:
     resolution: {integrity: sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==}
 
@@ -5310,11 +5219,6 @@ packages:
       '@nuxt/kit':
         optional: true
 
-  vite-plugin-top-level-await@1.4.3:
-    resolution: {integrity: sha512-iMynzfuuBkVMtmtCgwCicJpGWFu4o1jGDXC8jC5rvGFY+dSCCYPYAtwqVGQwihpFUIBvMlrYge+JOkFgiGP7Aw==}
-    peerDependencies:
-      vite: '>=2.8'
-
   vite-plugin-vue-inspector@5.1.3:
     resolution: {integrity: sha512-pMrseXIDP1Gb38mOevY+BvtNGNqiqmqa2pKB99lnLsADQww9w9xMbAfT4GB6RUoaOkSPrtlXqpq2Fq+Dj2AgFg==}
     peerDependencies:
@@ -6812,10 +6716,6 @@ snapshots:
     optionalDependencies:
       rollup: 4.20.0
 
-  '@rollup/plugin-virtual@3.0.2(rollup@4.20.0)':
-    optionalDependencies:
-      rollup: 4.20.0
-
   '@rollup/plugin-yaml@4.1.2(rollup@4.20.0)':
     dependencies:
       '@rollup/pluginutils': 5.1.0(rollup@4.20.0)
@@ -6938,58 +6838,6 @@ snapshots:
       - supports-color
       - typescript
 
-  '@swc/core-darwin-arm64@1.7.6':
-    optional: true
-
-  '@swc/core-darwin-x64@1.7.6':
-    optional: true
-
-  '@swc/core-linux-arm-gnueabihf@1.7.6':
-    optional: true
-
-  '@swc/core-linux-arm64-gnu@1.7.6':
-    optional: true
-
-  '@swc/core-linux-arm64-musl@1.7.6':
-    optional: true
-
-  '@swc/core-linux-x64-gnu@1.7.6':
-    optional: true
-
-  '@swc/core-linux-x64-musl@1.7.6':
-    optional: true
-
-  '@swc/core-win32-arm64-msvc@1.7.6':
-    optional: true
-
-  '@swc/core-win32-ia32-msvc@1.7.6':
-    optional: true
-
-  '@swc/core-win32-x64-msvc@1.7.6':
-    optional: true
-
-  '@swc/core@1.7.6':
-    dependencies:
-      '@swc/counter': 0.1.3
-      '@swc/types': 0.1.12
-    optionalDependencies:
-      '@swc/core-darwin-arm64': 1.7.6
-      '@swc/core-darwin-x64': 1.7.6
-      '@swc/core-linux-arm-gnueabihf': 1.7.6
-      '@swc/core-linux-arm64-gnu': 1.7.6
-      '@swc/core-linux-arm64-musl': 1.7.6
-      '@swc/core-linux-x64-gnu': 1.7.6
-      '@swc/core-linux-x64-musl': 1.7.6
-      '@swc/core-win32-arm64-msvc': 1.7.6
-      '@swc/core-win32-ia32-msvc': 1.7.6
-      '@swc/core-win32-x64-msvc': 1.7.6
-
-  '@swc/counter@0.1.3': {}
-
-  '@swc/types@0.1.12':
-    dependencies:
-      '@swc/counter': 0.1.3
-
   '@trysound/sax@0.2.0': {}
 
   '@types/dotenv-safe@8.1.6':
@@ -11455,8 +11303,6 @@ snapshots:
 
   util-deprecate@1.0.2: {}
 
-  uuid@10.0.0: {}
-
   validate-npm-package-license@3.0.4:
     dependencies:
       spdx-correct: 3.2.0
@@ -11534,16 +11380,6 @@ snapshots:
       - rollup
       - supports-color
 
-  vite-plugin-top-level-await@1.4.3(rollup@4.20.0)(vite@5.4.0(@types/node@22.1.0)(terser@5.31.5)):
-    dependencies:
-      '@rollup/plugin-virtual': 3.0.2(rollup@4.20.0)
-      '@swc/core': 1.7.6
-      uuid: 10.0.0
-      vite: 5.4.0(@types/node@22.1.0)(terser@5.31.5)
-    transitivePeerDependencies:
-      - '@swc/helpers'
-      - rollup
-
   vite-plugin-vue-inspector@5.1.3(vite@5.4.0(@types/node@22.1.0)(terser@5.31.5)):
     dependencies:
       '@babel/core': 7.25.2
diff --git a/testUtils.ts b/testUtils.ts
index 1fe1c347..901a6cc8 100644
--- a/testUtils.ts
+++ b/testUtils.ts
@@ -8,6 +8,20 @@ export function getByClass(
   return wrapper.get(`.${className}`)
 }
 
+export function getById(
+  wrapper: VueWrapper<any>,
+  testId: string,
+): WrappedElement {
+  return wrapper.get(`#${testId}`)
+}
+
+export function getByQuery(
+  wrapper: VueWrapper<any>,
+  query: string,
+): WrappedElement {
+  return wrapper.get(query)
+}
+
 export function getByTestId(
   wrapper: VueWrapper<any>,
   testId: string,
diff --git a/vitest.setup.ts b/vitest.setup.ts
index a9eda52b..5ef2d3a9 100644
--- a/vitest.setup.ts
+++ b/vitest.setup.ts
@@ -2,7 +2,8 @@ import createFetchMock from 'vitest-fetch-mock'
 import { vi } from 'vitest'
 import { localeMessages } from './configUtils'
 import { mockNuxtImport } from '@nuxt/test-utils/runtime'
-import type { CookieOptions } from 'nuxt/app'
+import { useState, type CookieOptions } from 'nuxt/app'
+import { ref } from 'vue'
 
 const fetchMock = createFetchMock(vi)