diff --git a/src/__tests__/labs/Labs.test.tsx b/src/__tests__/labs/Labs.test.tsx
index 8d6cc9a2fe..b03d986944 100644
--- a/src/__tests__/labs/Labs.test.tsx
+++ b/src/__tests__/labs/Labs.test.tsx
@@ -1,62 +1,147 @@
-import { render, screen } from '@testing-library/react'
+import { render, screen, waitFor } from '@testing-library/react'
+import { createMemoryHistory } from 'history'
 import React from 'react'
 import { Provider } from 'react-redux'
-import { MemoryRouter } from 'react-router-dom'
+import { Router, Route } from 'react-router-dom'
 import createMockStore from 'redux-mock-store'
 import thunk from 'redux-thunk'
 
 import Labs from '../../labs/Labs'
 import * as titleUtil from '../../page-header/title/TitleContext'
+import LabRepository from '../../shared/db/LabRepository'
+import PatientRepository from '../../shared/db/PatientRepository'
+import Lab from '../../shared/model/Lab'
+import Patient from '../../shared/model/Patient'
 import Permissions from '../../shared/model/Permissions'
 import { RootState } from '../../shared/store'
 
-const { TitleProvider } = titleUtil
+const { TitleProvider, useTitle } = titleUtil
 const mockStore = createMockStore<RootState, any>([thunk])
 
-describe('Labs', () => {
-  const setup = (initialEntry: string, permissions: Permissions[] = []) => {
-    const store = mockStore({
-      user: { permissions },
-    } as any)
-
-    return render(
-      <Provider store={store}>
-        <MemoryRouter initialEntries={[initialEntry]}>
-          <TitleProvider>
-            <Labs />
-          </TitleProvider>
-        </MemoryRouter>
-      </Provider>,
-    )
+const Title = () => {
+  const { title } = useTitle()
+
+  return <h1>{title}</h1>
+}
+
+const LabsWithTitle = () => (
+  <TitleProvider>
+    <Title />
+    <Labs />
+  </TitleProvider>
+)
+
+const setup = (ui: React.ReactElement, intialPath: string, permissions: Permissions[]) => {
+  const store = mockStore({ user: { permissions } } as any)
+  const history = createMemoryHistory({ initialEntries: [intialPath] })
+
+  // eslint-disable-next-line react/prop-types
+  const Wrapper: React.FC = ({ children }) => (
+    <Provider store={store}>
+      <Router history={history}>{children}</Router>
+    </Provider>
+  )
+
+  return {
+    history,
+    ...render(ui, { wrapper: Wrapper }),
   }
+}
 
+describe('Labs', () => {
   describe('routing', () => {
+    describe('/labs', () => {
+      it('should render the view labs screen when /labs is accessed', async () => {
+        const { history } = setup(<LabsWithTitle />, '/labs', [Permissions.ViewLabs])
+
+        await waitFor(() => {
+          expect(history.location.pathname).toBe('/labs')
+        })
+        await waitFor(() => {
+          expect(screen.getByRole('heading', { name: /labs\.label/i })).toBeInTheDocument()
+        })
+      })
+
+      it('should not navigate to /labs if the user does not have ViewLabs permissions', async () => {
+        const { history } = setup(<LabsWithTitle />, '/labs', [])
+
+        await waitFor(() => {
+          expect(history.location.pathname).toBe('/')
+        })
+      })
+    })
+
     describe('/labs/new', () => {
       it('should render the new lab request screen when /labs/new is accessed', async () => {
-        const { container } = setup('/labs/new', [Permissions.RequestLab])
+        const { history } = setup(<LabsWithTitle />, '/labs/new', [Permissions.RequestLab])
 
-        expect(container.querySelector('form')).toBeInTheDocument()
+        await waitFor(() => {
+          expect(history.location.pathname).toBe('/labs/new')
+        })
+        await waitFor(() => {
+          expect(screen.getByRole('heading', { name: /labs\.requests\.new/i })).toBeInTheDocument()
+        })
       })
 
       it('should not navigate to /labs/new if the user does not have RequestLab permissions', async () => {
-        const { container } = setup('/labs/new')
+        const { history } = setup(<LabsWithTitle />, '/labs/new', [])
 
-        expect(container.querySelector('form')).not.toBeInTheDocument()
+        await waitFor(() => {
+          expect(history.location.pathname).toBe('/')
+        })
       })
     })
 
     describe('/labs/:id', () => {
       it('should render the view lab screen when /labs/:id is accessed', async () => {
-        setup('/labs/1234', [Permissions.ViewLab])
+        const expectedLab = {
+          code: 'L-code',
+          id: '1234',
+          patient: '1234',
+          type: 'Type',
+          requestedOn: new Date().toISOString(),
+        } as Lab
+        const expectedPatient = {
+          fullName: 'fullName',
+          id: '1234',
+        } as Patient
 
-        expect(screen.getByText(/loading/i)).toBeInTheDocument()
+        jest.spyOn(LabRepository, 'find').mockResolvedValue(expectedLab)
+        jest.spyOn(PatientRepository, 'find').mockResolvedValue(expectedPatient)
+
+        const { history } = setup(
+          <Route path="/labs/:id">
+            <LabsWithTitle />
+          </Route>,
+          '/labs/1234',
+          [Permissions.ViewLab],
+        )
+
+        await waitFor(() => {
+          expect(history.location.pathname).toBe('/labs/1234')
+        })
+        await waitFor(() => {
+          expect(
+            screen.getByRole('heading', {
+              name: `${expectedLab.type} for ${expectedPatient.fullName}(${expectedLab.code})`,
+            }),
+          ).toBeInTheDocument()
+        })
       })
-    })
 
-    it('should not navigate to /labs/:id if the user does not have ViewLab permissions', async () => {
-      setup('/labs/1234')
+      it('should not navigate to /labs/:id if the user does not have ViewLab permissions', async () => {
+        const { history } = setup(
+          <Route path="/labs/:id">
+            <LabsWithTitle />
+          </Route>,
+          '/labs/1234',
+          [],
+        )
 
-      expect(screen.queryByText(/loading/i)).not.toBeInTheDocument()
+        await waitFor(() => {
+          expect(history.location.pathname).toBe('/')
+        })
+      })
     })
   })
 })
diff --git a/src/__tests__/scheduling/appointments/new/NewAppointment.test.tsx b/src/__tests__/scheduling/appointments/new/NewAppointment.test.tsx
index ebe4bc5f51..4df86bad2c 100644
--- a/src/__tests__/scheduling/appointments/new/NewAppointment.test.tsx
+++ b/src/__tests__/scheduling/appointments/new/NewAppointment.test.tsx
@@ -1,4 +1,4 @@
-import * as components from '@hospitalrun/components'
+import { Toaster } from '@hospitalrun/components'
 import { render, screen, waitFor, fireEvent } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import addMinutes from 'date-fns/addMinutes'
@@ -58,6 +58,7 @@ describe('New Appointment', () => {
         <Router history={history}>
           <TitleProvider>{children}</TitleProvider>
         </Router>
+        <Toaster draggable hideProgressBar />
       </Provider>
     )
 
@@ -219,8 +220,6 @@ describe('New Appointment', () => {
     }, 25000)
 
     it('should navigate to /appointments/:id when a new appointment is created', async () => {
-      jest.spyOn(components, 'Toast')
-
       const { history, expectedAppointment } = setup()
 
       userEvent.type(
@@ -235,11 +234,7 @@ describe('New Appointment', () => {
         expect(history.location.pathname).toEqual(`/appointments/${expectedAppointment.id}`)
       })
       await waitFor(() => {
-        expect(components.Toast).toHaveBeenCalledWith(
-          'success',
-          'states.success',
-          `scheduling.appointment.successfullyCreated`,
-        )
+        expect(screen.getByText(`scheduling.appointment.successfullyCreated`)).toBeInTheDocument()
       })
     })
   })