diff --git a/services/web/frontend/js/shared/components/switch.tsx b/services/web/frontend/js/shared/components/switch.tsx
index 1b21600dc8..44157b8143 100644
--- a/services/web/frontend/js/shared/components/switch.tsx
+++ b/services/web/frontend/js/shared/components/switch.tsx
@@ -8,6 +8,7 @@ type SwitchProps = {
 
 function Switch({ onChange, checked, disabled = false }: SwitchProps) {
   return (
+    // eslint-disable-next-line jsx-a11y/label-has-associated-control
     <label className={classNames('switch-input', { disabled })}>
       <input
         className="invisible-input"
diff --git a/services/web/modules/full-project-search/frontend/js/components/full-project-match-counts.tsx b/services/web/modules/full-project-search/frontend/js/components/full-project-match-counts.tsx
index 7483488b0c..c20187ae7e 100644
--- a/services/web/modules/full-project-search/frontend/js/components/full-project-match-counts.tsx
+++ b/services/web/modules/full-project-search/frontend/js/components/full-project-match-counts.tsx
@@ -5,7 +5,6 @@ import { useTranslation } from 'react-i18next'
 
 export const FullProjectMatchCounts: FC<{
   loading: boolean
-  totalResults?: number
   matchedFiles?: MatchedFile[]
 }> = ({ loading, matchedFiles }) => {
   const { t } = useTranslation()
diff --git a/services/web/test/frontend/features/project-list/components/sidebar/add-affiliation.test.tsx b/services/web/test/frontend/features/project-list/components/sidebar/add-affiliation.test.tsx
index c49cd38f2c..0d2d39890b 100644
--- a/services/web/test/frontend/features/project-list/components/sidebar/add-affiliation.test.tsx
+++ b/services/web/test/frontend/features/project-list/components/sidebar/add-affiliation.test.tsx
@@ -28,7 +28,9 @@ describe('Add affiliation widget', function () {
     renderWithProjectListContext(<AddAffiliation />)
 
     await fetchMock.callHistory.flush(true)
-    await waitFor(() => expect(fetchMock.callHistory.called('/api/project')))
+    await waitFor(
+      () => expect(fetchMock.callHistory.called('/api/project')).to.be.true
+    )
 
     await screen.findByText(/are you affiliated with an institution/i)
     const addAffiliationLink = screen.getByRole('link', {
@@ -44,7 +46,9 @@ describe('Add affiliation widget', function () {
     renderWithProjectListContext(<AddAffiliation />)
 
     await fetchMock.callHistory.flush(true)
-    await waitFor(() => expect(fetchMock.callHistory.called('/api/project')))
+    await waitFor(
+      () => expect(fetchMock.callHistory.called('/api/project')).to.be.true
+    )
 
     validateNonExistence()
   })
@@ -58,7 +62,9 @@ describe('Add affiliation widget', function () {
     })
 
     await fetchMock.callHistory.flush(true)
-    await waitFor(() => expect(fetchMock.callHistory.called('/api/project')))
+    await waitFor(
+      () => expect(fetchMock.callHistory.called('/api/project')).to.be.true
+    )
 
     validateNonExistence()
   })
@@ -70,7 +76,9 @@ describe('Add affiliation widget', function () {
     renderWithProjectListContext(<AddAffiliation />)
 
     await fetchMock.callHistory.flush(true)
-    await waitFor(() => expect(fetchMock.callHistory.called('/api/project')))
+    await waitFor(
+      () => expect(fetchMock.callHistory.called('/api/project')).to.be.true
+    )
 
     validateNonExistence()
   })
diff --git a/services/web/test/frontend/features/project-list/components/sidebar/tags-list.test.tsx b/services/web/test/frontend/features/project-list/components/sidebar/tags-list.test.tsx
index b066d45244..2b721e373a 100644
--- a/services/web/test/frontend/features/project-list/components/sidebar/tags-list.test.tsx
+++ b/services/web/test/frontend/features/project-list/components/sidebar/tags-list.test.tsx
@@ -34,7 +34,9 @@ describe('<TagsList />', function () {
     renderWithProjectListContext(<TagsList />)
 
     await fetchMock.callHistory.flush(true)
-    await waitFor(() => expect(fetchMock.callHistory.called('/api/project')))
+    await waitFor(
+      () => expect(fetchMock.callHistory.called('/api/project')).to.be.true
+    )
   })
 
   afterEach(function () {
@@ -241,8 +243,10 @@ describe('<TagsList />', function () {
 
       fireEvent.click(saveButton)
 
-      await waitFor(() =>
-        expect(fetchMock.callHistory.called(`/tag/abc123def456/rename`))
+      await waitFor(
+        () =>
+          expect(fetchMock.callHistory.called(`/tag/abc123def456/edit`)).to.be
+            .true
       )
 
       await waitFor(
@@ -286,8 +290,9 @@ describe('<TagsList />', function () {
       const deleteButton = within(modal).getByRole('button', { name: 'Delete' })
       fireEvent.click(deleteButton)
 
-      await waitFor(() =>
-        expect(fetchMock.callHistory.called(`/tag/bcd234efg567`))
+      await waitFor(
+        () =>
+          expect(fetchMock.callHistory.called(`/tag/abc123def456`)).to.be.true
       )
 
       await waitFor(
@@ -307,8 +312,9 @@ describe('<TagsList />', function () {
       const deleteButton = within(modal).getByRole('button', { name: 'Delete' })
       fireEvent.click(deleteButton)
 
-      await waitFor(() =>
-        expect(fetchMock.callHistory.called(`/tag/bcd234efg567`))
+      await waitFor(
+        () =>
+          expect(fetchMock.callHistory.called('/tag/abc123def456')).to.be.true
       )
 
       await within(modal).findByText('Sorry, something went wrong')
diff --git a/services/web/test/frontend/features/project-list/components/table/cells/inline-tags.test.tsx b/services/web/test/frontend/features/project-list/components/table/cells/inline-tags.test.tsx
index 971b2aaa48..ddacc6da5b 100644
--- a/services/web/test/frontend/features/project-list/components/table/cells/inline-tags.test.tsx
+++ b/services/web/test/frontend/features/project-list/components/table/cells/inline-tags.test.tsx
@@ -58,15 +58,16 @@ describe('<InlineTags />', function () {
       name: 'Remove tag My Test Tag',
     })
     fireEvent.click(removeButton)
-    await waitFor(() =>
-      expect(
-        fetchMock.callHistory.called(
-          `/tag/789fff789fff/project/${copyableProject.id}`,
-          {
-            method: 'DELETE',
-          }
-        )
-      )
+    await waitFor(
+      () =>
+        expect(
+          fetchMock.callHistory.called(
+            `/tag/789fff789fff/project/${copyableProject.id}`,
+            {
+              method: 'DELETE',
+            }
+          )
+        ).to.be.true
     )
     expect(screen.queryByText('My Test Tag')).to.not.exist
     screen.getByText('Tag 2')
diff --git a/services/web/test/frontend/features/settings/components/linking/sso-widget.test.tsx b/services/web/test/frontend/features/settings/components/linking/sso-widget.test.tsx
index 2f02b7709b..68c3f35c27 100644
--- a/services/web/test/frontend/features/settings/components/linking/sso-widget.test.tsx
+++ b/services/web/test/frontend/features/settings/components/linking/sso-widget.test.tsx
@@ -100,8 +100,8 @@ describe('<SSOLinkingWidget />', function () {
         })
       )
       fireEvent.click(confirmBtn)
-      await waitFor(() =>
-        expect(screen.getByRole('button', { name: 'Unlinking' }))
+      await waitFor(
+        () => expect(screen.getByRole('button', { name: 'Unlinking' })).to.exist
       )
     })
   })