diff --git a/src/components/basecamp/OrganizationForm.tsx b/src/components/basecamp/OrganizationForm.tsx
index bfac3dbdd..284ce4e74 100644
--- a/src/components/basecamp/OrganizationForm.tsx
+++ b/src/components/basecamp/OrganizationForm.tsx
@@ -168,7 +168,8 @@ export default function OrganizationForm ({ existingOrg, onClose }: Organization
       </div>
       <div className='basis-2/3 grow'>
         <FormProvider {...form}>
-          <form onSubmit={() => { void handleSubmit(submitHandler) }} className='min-w-[16em]'>
+          {/* eslint-disable-next-line */}
+          <form onSubmit={handleSubmit(submitHandler)} className='min-w-[16em]'>
             <Input
               label='Display Name:'
               name='displayName'
diff --git a/src/components/basecamp/Organizations.tsx b/src/components/basecamp/Organizations.tsx
index 86587f842..75b5e86c4 100644
--- a/src/components/basecamp/Organizations.tsx
+++ b/src/components/basecamp/Organizations.tsx
@@ -109,7 +109,8 @@ const OrganizationTable = (): JSX.Element => {
               <span className='ml-2'>Create</span>
             </button>
             <FormProvider {...form}>
-              <form onSubmit={() => { void handleSubmit(submitHandler) }} className='flex items-center ml-4'>
+              {/* eslint-disable-next-line */}
+              <form onSubmit={handleSubmit(submitHandler)} className='flex items-center ml-4'>
                 <Input
                   name='displayName'
                   placeholder='Search by display name'
diff --git a/src/components/basecamp/UserForm.tsx b/src/components/basecamp/UserForm.tsx
index 7eeb2812f..da15036dd 100644
--- a/src/components/basecamp/UserForm.tsx
+++ b/src/components/basecamp/UserForm.tsx
@@ -101,7 +101,8 @@ export default function UserForm ({ user, onClose }: UserFormProps): JSX.Element
       </div>
       <div className='basis-2/3 grow'>
         <FormProvider {...form}>
-          <form onSubmit={() => { void handleSubmit(submitHandler) }} className='min-w-[16em]'>
+          {/* eslint-disable-next-line */}
+          <form onSubmit={handleSubmit(submitHandler)} className='min-w-[16em]'>
             <MultiSelect
               label='Roles:'
               name='roles'
diff --git a/src/components/basecamp/Users.tsx b/src/components/basecamp/Users.tsx
index a1e9083eb..22d178438 100644
--- a/src/components/basecamp/Users.tsx
+++ b/src/components/basecamp/Users.tsx
@@ -92,7 +92,8 @@ const UserTable = (): JSX.Element => {
         <div className='flex items-center justify-between'>
           <h2 className=''>Users</h2>
           <FormProvider {...form}>
-            <form onSubmit={() => { void handleSubmit(submitHandler) }} className='flex items-center'>
+            {/* eslint-disable-next-line */}
+            <form onSubmit={handleSubmit(submitHandler)} className='flex items-center'>
               <Input
                 name='email'
                 placeholder='Search by email'
diff --git a/src/components/crag/cragSummary.tsx b/src/components/crag/cragSummary.tsx
index ea8fe4bb2..54139a67c 100644
--- a/src/components/crag/cragSummary.tsx
+++ b/src/components/crag/cragSummary.tsx
@@ -385,7 +385,8 @@ export default function CragSummary ({ area, history }: CragSummaryProps): JSX.E
       )}
 
       <FormProvider {...form}>
-        <form onSubmit={() => { void handleSubmit(submitHandler) }}>
+        {/* eslint-disable-next-line */}
+        <form onSubmit={handleSubmit(submitHandler)}>
           <StickyHeader
             ancestors={ancestors}
             pathTokens={pathTokens}
diff --git a/src/components/edit/AddChildAreaForm.tsx b/src/components/edit/AddChildAreaForm.tsx
index bf1854ebb..7d79dbfe6 100644
--- a/src/components/edit/AddChildAreaForm.tsx
+++ b/src/components/edit/AddChildAreaForm.tsx
@@ -107,7 +107,8 @@ const Step1 = (props: ChildAreaBaseProps): JSX.Element => {
 
   return (
     <FormProvider {...form}>
-      <form onSubmit={() => { void handleSubmit(submitHandler) }}>
+      {/* eslint-disable-next-line */}
+      <form onSubmit={handleSubmit(submitHandler)}>
         <Input
           label='Parent:'
           name='parentName'
diff --git a/src/components/edit/DeleteAreaForm.tsx b/src/components/edit/DeleteAreaForm.tsx
index 1988c2d5b..db8ce0a33 100644
--- a/src/components/edit/DeleteAreaForm.tsx
+++ b/src/components/edit/DeleteAreaForm.tsx
@@ -79,7 +79,8 @@ export default function DeleteAreaForm ({ areaUuid, areaName, parentUuid, return
 
   return (
     <FormProvider {...form}>
-      <form onSubmit={() => { void handleSubmit(submitHandler) }} className='dialog-form-default'>
+      {/* eslint-disable-next-line */}
+      <form onSubmit={handleSubmit(submitHandler)} className='dialog-form-default'>
         <div>You're about to delete '<span className='font-semibold'>{areaName}</span>'.  Type <b>DELETE</b> to confirm.</div>
         <Input
           label=''
diff --git a/src/components/edit/EditAreaForm.tsx b/src/components/edit/EditAreaForm.tsx
index 129ad00b7..e39333cd6 100644
--- a/src/components/edit/EditAreaForm.tsx
+++ b/src/components/edit/EditAreaForm.tsx
@@ -128,7 +128,8 @@ export default function AreaEditForm (props: AreaType & { formRef?: any }): JSX.
 
   return (
     <FormProvider {...form}>
-      <form onSubmit={() => { void handleSubmit(submitHandler) }} className='dialog-form-default'>
+      {/* eslint-disable-next-line */}
+      <form onSubmit={handleSubmit(submitHandler)} className='dialog-form-default'>
         <Input
           label='Name:'
           name='areaName'
diff --git a/src/components/users/account/UpdateProfileForm.tsx b/src/components/users/account/UpdateProfileForm.tsx
index 4cb4df7a8..3dd6ba1b7 100644
--- a/src/components/users/account/UpdateProfileForm.tsx
+++ b/src/components/users/account/UpdateProfileForm.tsx
@@ -95,10 +95,8 @@ export const UpdateProfileForm: React.FC = () => {
       <h2 className=''>Edit Profile</h2>
 
       <FormProvider {...form}>
-        <form
-          onSubmit={() => { void handleSubmit(submitHandler) }}
-          className='mt-10 flex flex-col'
-        >
+        {/* eslint-disable-next-line */}
+        <form onSubmit={handleSubmit(submitHandler)} className='mt-10 flex flex-col'>
           <Input
             name='displayName'
             label='Display name'
diff --git a/src/components/users/account/UsernameChangeForm.tsx b/src/components/users/account/UsernameChangeForm.tsx
index 68aaca0a3..5cf47ce61 100644
--- a/src/components/users/account/UsernameChangeForm.tsx
+++ b/src/components/users/account/UsernameChangeForm.tsx
@@ -154,10 +154,8 @@ export const UsernameChangeForm: React.FC = () => {
             <h2>Change username</h2>
           </>)}
       <FormProvider {...form}>
-        <form
-          onSubmit={() => { void handleSubmit(submitHandler) }}
-          className='mt-10 flex flex-col gap-y-6'
-        >
+        {/* eslint-disable-next-line */}
+        <form onSubmit={handleSubmit(submitHandler)} className='mt-10 flex flex-col gap-y-6'>
           {initials != null && <CurrentUsername {...initials} />}
           <Input
             name='username'
diff --git a/src/js/setupTests.ts b/src/js/setupTests.ts
new file mode 100644
index 000000000..f2552f497
--- /dev/null
+++ b/src/js/setupTests.ts
@@ -0,0 +1,3 @@
+import * as ResizeObserverModule from 'resize-observer-polyfill'
+import '@testing-library/jest-dom'
+(global as any).ResizeObserver = ResizeObserverModule.default
diff --git a/src/pages/climbs/[id].tsx b/src/pages/climbs/[id].tsx
index 732eb9c3b..a66e0148b 100644
--- a/src/pages/climbs/[id].tsx
+++ b/src/pages/climbs/[id].tsx
@@ -228,7 +228,8 @@ const Body = ({ climb, leftClimb, rightClimb }: ClimbPageProps): JSX.Element =>
       <PhotoMontage photoList={climb.media} isHero />
 
       <FormProvider {...form}>
-        <form onSubmit={() => { void handleSubmit(submitHandler) }} className='mt-6 first:mt-0'>
+        {/* eslint-disable-next-line */}
+        <form onSubmit={handleSubmit(submitHandler)} className='mt-6 first:mt-0'>
 
           <StickyHeader
             isClimbPage
diff --git a/src/pages/edit/addArea.tsx b/src/pages/edit/addArea.tsx
index 5eb939d48..782a56025 100644
--- a/src/pages/edit/addArea.tsx
+++ b/src/pages/edit/addArea.tsx
@@ -87,7 +87,8 @@ const AddAreaPage: INextPageWithAuth = () => {
           <div className='text-xs mt-4'>Area can be a crag, boulder, or a destination containing other smaller areas.</div>
           <ProgressSteps />
           <FormProvider {...form}>
-            <form onSubmit={() => { void handleSubmit(onSubmit) }}>
+            {/* eslint-disable-next-line */}
+            <form onSubmit={handleSubmit(onSubmit)}>
               <div className='mt-8 text-lg text-content-base font-bold'>Location</div>
               <Step1a />
               <Step1b />