diff --git a/package.json b/package.json
index 3780af167..e577cada5 100644
--- a/package.json
+++ b/package.json
@@ -124,9 +124,9 @@
         "functions": 36
       },
       "./src/network/": {
-        "lines": 31,
-        "branches": 22,
-        "functions": 27
+        "lines": 30,
+        "branches": 9,
+        "functions": 18
       }
     },
     "moduleNameMapper": {
diff --git a/src/components/AddContentModal/index.tsx b/src/components/AddContentModal/index.tsx
index 5921197be..5bf005f52 100644
--- a/src/components/AddContentModal/index.tsx
+++ b/src/components/AddContentModal/index.tsx
@@ -146,7 +146,7 @@ const handleSubmitForm = async (
 export const AddContentModal = () => {
   const [currentStep, setCurrentStep] = useState(0)
   const { close, visible } = useModal('addContent')
-  const [setBudget] = useUserStore((s) => [s.setBudget])
+  const { setBudget } = useUserStore((s) => s)
   const form = useForm<FormData>({ mode: 'onChange' })
   const { watch, setValue, reset } = form
   const [loading, setLoading] = useState(false)
diff --git a/src/components/AddItemModal/index.tsx b/src/components/AddItemModal/index.tsx
index 03beb41bd..01fedb7ad 100644
--- a/src/components/AddItemModal/index.tsx
+++ b/src/components/AddItemModal/index.tsx
@@ -80,14 +80,14 @@ export const AddItemModal = () => {
   const [stepId, setStepId] = useState<AddItemModalStepID>('sourceType')
   const { close, visible } = useModal('addItem')
   const { open: openTypeModal } = useModal('addType')
-  const [setBudget] = useUserStore((s) => [s.setBudget])
+  const { setBudget } = useUserStore((s) => s)
   const form = useForm<FormData>({ mode: 'onChange' })
   const { watch, setValue, reset } = form
   const [loading, setLoading] = useState(false)
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   const [error, setError] = useState<string>('')
 
-  const [addNewNode] = useDataStore((s) => [s.addNewNode])
+  const { addNewNode } = useDataStore((s) => s)
   const [setSelectedNode] = useGraphStore((s) => [s.setSelectedNode])
 
   useEffect(
diff --git a/src/components/App/MainToolbar/index.tsx b/src/components/App/MainToolbar/index.tsx
index 965ad18f9..93bc08256 100644
--- a/src/components/App/MainToolbar/index.tsx
+++ b/src/components/App/MainToolbar/index.tsx
@@ -32,7 +32,7 @@ export const MainToolbar = () => {
   const { setUniverseQuestionIsOpen, setSidebarOpen, setShowCollapseButton } = useAppStore((s) => s)
   const { customSchemaFeatureFlag, userFeedbackFeatureFlag, chatInterfaceFeatureFlag } = useFeatureFlagStore((s) => s)
 
-  const [isAdmin] = useUserStore((s) => [s.isAdmin])
+  const { isAdmin } = useUserStore((s) => s)
   const sphinxEnabled = isSphinx()
 
   const handleLogoClick = () => {
diff --git a/src/components/App/SideBar/FilterSearch/__tests__/index.tsx b/src/components/App/SideBar/FilterSearch/__tests__/index.tsx
index 2e961f6ee..ef73ba5a7 100644
--- a/src/components/App/SideBar/FilterSearch/__tests__/index.tsx
+++ b/src/components/App/SideBar/FilterSearch/__tests__/index.tsx
@@ -15,13 +15,20 @@ jest.mock('~/stores/useDataStore', () => ({
 
 const mockSetFilters = jest.fn()
 const mockSetShowAllSchemas = jest.fn()
+const mockSetAnchorEl = jest.fn()
+const mockFetchData = jest.fn()
+const mockSetAbortRequests = jest.fn()
 
 const mockSchemaAll = [{ type: 'Type1' }, { type: 'Type2' }, { type: 'Type3' }, { type: 'Type4' }, { type: 'Type5' }]
 
 describe('FilterSearch Component', () => {
   beforeEach(() => {
     jest.clearAllMocks()
-    ;(useDataStore as unknown as jest.Mock).mockReturnValue({ setFilters: mockSetFilters })
+    ;(useDataStore as jest.Mock).mockReturnValue({
+      setFilters: mockSetFilters,
+      fetchData: mockFetchData,
+      setAbortRequests: mockSetAbortRequests,
+    })
   })
 
   const renderComponent = (showAllSchemas = false) =>
@@ -31,6 +38,7 @@ describe('FilterSearch Component', () => {
           <FilterSearch
             anchorEl={document.createElement('div')}
             schemaAll={mockSchemaAll}
+            setAnchorEl={mockSetAnchorEl}
             setShowAllSchemas={mockSetShowAllSchemas}
             showAllSchemas={showAllSchemas}
           />
@@ -167,6 +175,7 @@ describe('FilterSearch Component', () => {
           <FilterSearch
             anchorEl={null}
             schemaAll={mockSchemaAll}
+            setAnchorEl={mockSetAnchorEl}
             setShowAllSchemas={mockSetShowAllSchemas}
             showAllSchemas
           />
diff --git a/src/components/App/SideBar/FilterSearch/index.tsx b/src/components/App/SideBar/FilterSearch/index.tsx
index 429d459a6..44e9e7ae8 100644
--- a/src/components/App/SideBar/FilterSearch/index.tsx
+++ b/src/components/App/SideBar/FilterSearch/index.tsx
@@ -35,7 +35,7 @@ export const FilterSearch = ({ showAllSchemas, setShowAllSchemas, schemaAll, anc
   }
 
   const { setFilters, fetchData, setAbortRequests } = useDataStore((s) => s)
-  const [setBudget] = useUserStore((s) => [s.setBudget])
+  const { setBudget } = useUserStore((s) => s)
   const [selectedTypes, setSelectedTypes] = useState<string[]>(defaultValues.selectedTypes)
   const [hops, setHops] = useState(defaultValues.hops)
   const [sourceNodes, setSourceNodes] = useState<number>(defaultValues.sourceNodes)
diff --git a/src/components/App/index.tsx b/src/components/App/index.tsx
index c572c02cd..8023691f8 100644
--- a/src/components/App/index.tsx
+++ b/src/components/App/index.tsx
@@ -55,7 +55,7 @@ const LazySideBar = lazy(() => import('./SideBar').then(({ SideBar }) => ({ defa
 export const App = () => {
   const [searchParams] = useSearchParams()
   const query = searchParams.get('q')
-  const [setBudget, setNodeCount] = useUserStore((s) => [s.setBudget, s.setNodeCount])
+  const { setBudget, setNodeCount } = useUserStore((s) => s)
 
   const {
     setSidebarOpen,
diff --git a/src/components/Auth/__tests__/index.tsx b/src/components/Auth/__tests__/index.tsx
index 38f615418..dfc808c73 100644
--- a/src/components/Auth/__tests__/index.tsx
+++ b/src/components/Auth/__tests__/index.tsx
@@ -1,20 +1,36 @@
+import { ThemeProvider } from '@mui/material'
 import '@testing-library/jest-dom'
-import { render, screen, waitFor } from '@testing-library/react'
+import { cleanup, render, screen, waitFor } from '@testing-library/react'
+import { setupJestCanvasMock } from 'jest-canvas-mock'
 import React from 'react'
+import { MemoryRouter } from 'react-router-dom'
 import * as sphinx from 'sphinx-bridge'
+import { ThemeProvider as StyleThemeProvider } from 'styled-components'
 import * as network from '../../../network/auth'
+import { useDataStore } from '../../../stores/useDataStore'
 import { useUserStore } from '../../../stores/useUserStore'
 import * as utils from '../../../utils/getSignedMessage'
 import { App } from '../../App'
+import { appTheme } from '../../App/Providers'
 import { AuthGuard } from '../index'
 
 jest.mock('sphinx-bridge')
 jest.mock('~/stores/useUserStore')
 jest.mock('~/stores/useDataStore')
-jest.mock('../../../../src/utils/versionHelper', () => null)
+jest.mock('~/utils/versionHelper', () => null)
 jest.mock('react-toastify/dist/ReactToastify.css', () => null)
 jest.mock('~/components/App/Splash/SpiningSphere', () => jest.fn(() => <div data-testid="spinning sphere" />))
 
+jest.mock('~/components/Universe', () => ({
+  Universe: () => <div>Mocked Universe Component</div>,
+}))
+
+Object.defineProperty(navigator, 'userAgent', {
+  value: 'Sphinx',
+  configurable: true,
+})
+
+const useDataStoreMock = useDataStore as jest.MockedFunction<typeof useDataStore>
 const useUserStoreMock = useUserStore as jest.MockedFunction<typeof useUserStore>
 const getSignedMessageFromRelayMock = jest.spyOn(utils, 'getSignedMessageFromRelay')
 const getIsAdminMock = jest.spyOn(network, 'getIsAdmin')
@@ -22,6 +38,8 @@ const getIsAdminMock = jest.spyOn(network, 'getIsAdmin')
 const message = 'This is a private Graph, Contact Admin'
 
 describe('Auth Component', () => {
+  afterEach(cleanup)
+
   beforeAll(() => {
     jest.clearAllMocks()
     localStorage.clear()
@@ -31,9 +49,26 @@ describe('Auth Component', () => {
   beforeEach(() => {
     localStorage.clear()
     jest.resetAllMocks()
+    setupJestCanvasMock(window)
+
+    useDataStoreMock.mockReturnValue({
+      fetchData: jest.fn(),
+      setCategoryFilter: jest.fn(),
+      setAbortRequests: jest.fn(),
+      addNewNode: jest.fn(),
+      splashDataLoading: false,
+    })
+
+    Object.defineProperty(window, 'matchMedia', {
+      writable: true,
+      value: jest.fn().mockImplementation(() => ({
+        matches: false,
+        removeEventListener: jest.fn(),
+      })),
+    })
   })
 
-  test.skip('should set authenticated state to true upon successful authentication', async () => {
+  test('should set authenticated state to true upon successful authentication', async () => {
     const [setBudget, setIsAdmin, setPubKey, setIsAuthenticated] = [jest.fn(), jest.fn(), jest.fn(), jest.fn()]
 
     useUserStoreMock.mockReturnValue({
@@ -50,18 +85,25 @@ describe('Auth Component', () => {
     getSignedMessageFromRelayMock.mockResolvedValue({ message: 'testMessage', signature: 'testSignature' })
 
     render(
-      <AuthGuard>
-        <App />
-      </AuthGuard>,
+      <MemoryRouter>
+        <ThemeProvider theme={appTheme}>
+          <StyleThemeProvider theme={appTheme}>
+            <AuthGuard>
+              <App />
+            </AuthGuard>
+          </StyleThemeProvider>
+        </ThemeProvider>
+      </MemoryRouter>,
     )
 
     await waitFor(() => expect(setIsAuthenticated).toHaveBeenCalledWith(true))
-  })
+  }, 50000)
 
   test('should update appropriate state and local storage if user is an admin', async () => {
     const [setBudget, setIsAdmin, setPubKey, setIsAuthenticated] = [jest.fn(), jest.fn(), jest.fn(), jest.fn()]
 
     useUserStoreMock.mockReturnValue({
+      isAdmin: true,
       setBudget,
       setIsAdmin,
       setPubKey,
@@ -72,9 +114,15 @@ describe('Auth Component', () => {
     getSignedMessageFromRelayMock.mockResolvedValue({ message: 'testMessage', signature: 'testSignature' })
 
     render(
-      <AuthGuard>
-        <App />
-      </AuthGuard>,
+      <MemoryRouter>
+        <ThemeProvider theme={appTheme}>
+          <StyleThemeProvider theme={appTheme}>
+            <AuthGuard>
+              <App />
+            </AuthGuard>
+          </StyleThemeProvider>
+        </ThemeProvider>
+      </MemoryRouter>,
     )
 
     await waitFor(() => expect(setIsAdmin).toHaveBeenCalledWith(true))
@@ -98,9 +146,15 @@ describe('Auth Component', () => {
     getSignedMessageFromRelayMock.mockResolvedValue({ message: 'testMessage', signature: 'testSignature' })
 
     render(
-      <AuthGuard>
-        <App />
-      </AuthGuard>,
+      <MemoryRouter>
+        <ThemeProvider theme={appTheme}>
+          <StyleThemeProvider theme={appTheme}>
+            <AuthGuard>
+              <App />
+            </AuthGuard>
+          </StyleThemeProvider>
+        </ThemeProvider>
+      </MemoryRouter>,
     )
 
     await waitFor(() => expect(screen.getByText(message)).toBeInTheDocument())
@@ -123,9 +177,15 @@ describe('Auth Component', () => {
     getSignedMessageFromRelayMock.mockResolvedValue({ message: 'testMessage', signature: '' })
 
     render(
-      <AuthGuard>
-        <App />
-      </AuthGuard>,
+      <MemoryRouter>
+        <ThemeProvider theme={appTheme}>
+          <StyleThemeProvider theme={appTheme}>
+            <AuthGuard>
+              <App />
+            </AuthGuard>
+          </StyleThemeProvider>
+        </ThemeProvider>
+      </MemoryRouter>,
     )
 
     await waitFor(() => expect(setIsAuthenticated).toHaveBeenCalledWith(true))
@@ -148,9 +208,15 @@ describe('Auth Component', () => {
     getSignedMessageFromRelayMock.mockResolvedValue({ message: 'testMessage', signature: '' })
 
     render(
-      <AuthGuard>
-        <App />
-      </AuthGuard>,
+      <MemoryRouter>
+        <ThemeProvider theme={appTheme}>
+          <StyleThemeProvider theme={appTheme}>
+            <AuthGuard>
+              <App />
+            </AuthGuard>
+          </StyleThemeProvider>
+        </ThemeProvider>
+      </MemoryRouter>,
     )
 
     await waitFor(() => expect(setPubKey).toHaveBeenCalledWith(undefined))
@@ -174,9 +240,15 @@ describe('Auth Component', () => {
     getSignedMessageFromRelayMock.mockResolvedValue({ message: 'testMessage', signature: '' })
 
     render(
-      <AuthGuard>
-        <App />
-      </AuthGuard>,
+      <MemoryRouter>
+        <ThemeProvider theme={appTheme}>
+          <StyleThemeProvider theme={appTheme}>
+            <AuthGuard>
+              <App />
+            </AuthGuard>
+          </StyleThemeProvider>
+        </ThemeProvider>
+      </MemoryRouter>,
     )
 
     await waitFor(() => expect(setPubKey).toHaveBeenCalledWith('testPubkey'))
@@ -199,9 +271,15 @@ describe('Auth Component', () => {
     getSignedMessageFromRelayMock.mockResolvedValue({ message: 'testMessage', signature: '' })
 
     render(
-      <AuthGuard>
-        <App />
-      </AuthGuard>,
+      <MemoryRouter>
+        <ThemeProvider theme={appTheme}>
+          <StyleThemeProvider theme={appTheme}>
+            <AuthGuard>
+              <App />
+            </AuthGuard>
+          </StyleThemeProvider>
+        </ThemeProvider>
+      </MemoryRouter>,
     )
 
     await waitFor(() => expect(setPubKey).toHaveBeenCalledWith(''))
@@ -224,9 +302,15 @@ describe('Auth Component', () => {
     getSignedMessageFromRelayMock.mockRejectedValue(null)
 
     render(
-      <AuthGuard>
-        <App />
-      </AuthGuard>,
+      <MemoryRouter>
+        <ThemeProvider theme={appTheme}>
+          <StyleThemeProvider theme={appTheme}>
+            <AuthGuard>
+              <App />
+            </AuthGuard>
+          </StyleThemeProvider>
+        </ThemeProvider>
+      </MemoryRouter>,
     )
 
     await waitFor(() => expect(setPubKey).toHaveBeenCalledWith(''))
diff --git a/src/components/ModalsContainer/BlueprintModal/Body/AddEdgeNode/__tests__/index.tsx b/src/components/ModalsContainer/BlueprintModal/Body/AddEdgeNode/__tests__/index.tsx
index 3c7d5b5ba..d856f40c3 100644
--- a/src/components/ModalsContainer/BlueprintModal/Body/AddEdgeNode/__tests__/index.tsx
+++ b/src/components/ModalsContainer/BlueprintModal/Body/AddEdgeNode/__tests__/index.tsx
@@ -30,9 +30,9 @@ describe('AddEdgeToBluePrint Modal', () => {
   it('should render the modal and allow submitting an edge', async () => {
     const { getByText, getByTestId, getByPlaceholderText } = render(<TestComponent />)
 
-    expect(getByText('Add Edge')).toBeInTheDocument()
-
     waitFor(async () => {
+      expect(getByTestId('edge-modal-title')).toHaveTextContent('Add Edge')
+
       const fromAutocomplete = getByTestId('from_node')
       fireEvent.click(fromAutocomplete)
 
@@ -66,7 +66,8 @@ describe('AddEdgeToBluePrint Modal', () => {
       })
     })
   })
-  it.skip('should disable the submit button if required fields are not filled', async () => {
+
+  it('should disable the submit button if required fields are not filled', async () => {
     const { getByText } = render(<TestComponent />)
     const confirmButton = getByText('Confirm')
 
diff --git a/src/components/ModalsContainer/BlueprintModal/Body/AddEdgeNode/index.tsx b/src/components/ModalsContainer/BlueprintModal/Body/AddEdgeNode/index.tsx
index fa2326e31..d91672b23 100644
--- a/src/components/ModalsContainer/BlueprintModal/Body/AddEdgeNode/index.tsx
+++ b/src/components/ModalsContainer/BlueprintModal/Body/AddEdgeNode/index.tsx
@@ -19,7 +19,7 @@ export const AddEdgeNode = ({ setIsAddEdgeNode, edgeData, setGraphLoading }: Pro
   return (
     <Flex>
       <HeaderFlex align="center" direction="row" justify="space-between">
-        <StyledText>{edgeData?.refId ? 'Edit Edge' : 'Add Edge'}</StyledText>
+        <StyledText data-testid="edge-modal-title">{edgeData?.refId ? 'Edit Edge' : 'Add Edge'}</StyledText>
         <CloseButton data-testid="close-sidebar-sub-view" onClick={onCancel}>
           <ClearIcon />
         </CloseButton>
diff --git a/src/components/ModalsContainer/BlueprintModal/Body/Editor/__tests__/index.tsx b/src/components/ModalsContainer/BlueprintModal/Body/Editor/__tests__/index.tsx
index 29267b7d0..51c58271f 100644
--- a/src/components/ModalsContainer/BlueprintModal/Body/Editor/__tests__/index.tsx
+++ b/src/components/ModalsContainer/BlueprintModal/Body/Editor/__tests__/index.tsx
@@ -22,7 +22,7 @@ jest.mock('~/network/api', () => ({
 
 jest.mock('~/network/fetchSourcesData', () => ({
   getNodeSchemaTypes: jest.fn(),
-  getNodeType: jest.fn(),
+  getNodeType: jest.fn().mockResolvedValue(null),
 }))
 
 describe('Editor Component - Delete Node', () => {
@@ -46,7 +46,7 @@ describe('Editor Component - Delete Node', () => {
     onSchemaUpdate: jest.fn(),
   }
 
-  it.skip('should display an error message and not update the UI if the delete operation fails', async () => {
+  it('should display an error message and not update the UI if the delete operation fails', async () => {
     const mockErrorResponse = {
       status: 400,
       json: () =>
@@ -69,7 +69,7 @@ describe('Editor Component - Delete Node', () => {
     expect(mockProps.onDelete).not.toHaveBeenCalled()
   })
 
-  it.skip('should update the UI and not show an error message if the delete operation succeeds', async () => {
+  it('should update the UI and not show an error message if the delete operation succeeds', async () => {
     ;(api.delete as jest.Mock).mockResolvedValue({ status: 200 })
 
     render(<Editor {...mockProps} />)
@@ -84,7 +84,7 @@ describe('Editor Component - Delete Node', () => {
     expect(mockProps.onDelete).toHaveBeenCalled()
   })
 
-  it.skip('should ensure that correct parent is rendered', async () => {
+  it('should ensure that correct parent is rendered', async () => {
     ;(getNodeSchemaTypes as jest.Mock).mockResolvedValue({
       schemas: [
         { type: 'exampleType', is_deleted: false },
diff --git a/src/components/SourcesTableModal/SourcesView/Sources/Table/__tests__/test.tsx b/src/components/SourcesTableModal/SourcesView/Sources/Table/__tests__/test.tsx
index 1ff990279..6610f96b3 100644
--- a/src/components/SourcesTableModal/SourcesView/Sources/Table/__tests__/test.tsx
+++ b/src/components/SourcesTableModal/SourcesView/Sources/Table/__tests__/test.tsx
@@ -1,4 +1,4 @@
-import { fireEvent, render, screen, within } from '@testing-library/react'
+import { fireEvent, render, screen, waitFor, within } from '@testing-library/react'
 import React from 'react'
 import { TWITTER_LINK, sourcesMapper } from '~/components/SourcesTableModal/SourcesView/constants'
 import { RSS, TWITTER_HANDLE, YOUTUBE_CHANNEL } from '~/constants'
@@ -12,6 +12,10 @@ describe('Table Component Tests', () => {
     { ref_id: '3', source: 'https://anchor.fm/s/71a8cc78/podcast/rss', source_type: RSS },
   ]
 
+  beforeEach(() => {
+    jest.clearAllMocks()
+  })
+
   it('should correctly render links for each source type', () => {
     render(<Table canEdit={false} data={mockData} />)
 
@@ -56,7 +60,7 @@ describe('Table Component Tests', () => {
     expect(sourceCell).toBeInTheDocument()
   })
 
-  it.skip('should display loader when clicking on delete icon', async () => {
+  it('should display loader when clicking on delete icon', async () => {
     const isEdit = true
 
     render(<Table canEdit={isEdit} data={mockData} />)
@@ -79,16 +83,18 @@ describe('Table Component Tests', () => {
 
     render(<Table canEdit={isEdit} data={mockData} />)
 
-    const editIcon = screen.getByTestId('edit-icon-1')
+    waitFor(() => {
+      const editIcon = screen.getByTestId('edit-icon-1')
 
-    fireEvent.click(editIcon)
+      fireEvent.click(editIcon)
 
-    const checkIcon = screen.getByTestId('check-icon-1')
+      const checkIcon = screen.getByTestId('check-icon-1')
 
-    fireEvent.click(checkIcon)
+      fireEvent.click(checkIcon)
 
-    const loader = await screen.findByTestId('edit-loader-1')
+      const loader = screen.findByTestId('edit-loader-1')
 
-    expect(loader).toBeInTheDocument()
+      expect(loader).toBeInTheDocument()
+    })
   })
 })
diff --git a/src/components/Stats/__tests__/index.tsx b/src/components/Stats/__tests__/index.tsx
index 739b613aa..d6cdd7d3a 100644
--- a/src/components/Stats/__tests__/index.tsx
+++ b/src/components/Stats/__tests__/index.tsx
@@ -39,7 +39,7 @@ const mockStats = {
   numContributors: '500',
   numDaily: '100',
   numEpisodes: '2,000',
-  numNodes: '5,000',
+  nodeCount: '5,000',
   numTwitterSpace: '300',
   numVideo: '800',
   numDocuments: '1483',
@@ -78,7 +78,7 @@ describe('Component Test Stats', () => {
 
     const { getByText } = render(<Stats />)
 
-    expect(getByText(mockStats.numNodes)).toBeInTheDocument()
+    expect(getByText(mockStats.nodeCount)).toBeInTheDocument()
     expect(getByText(mockStats.numAudio)).toBeInTheDocument()
     expect(getByText(mockStats.numEpisodes)).toBeInTheDocument()
     expect(getByText(mockStats.numVideo)).toBeInTheDocument()
@@ -121,7 +121,7 @@ describe('Component Test Stats', () => {
 
     const { getByText, getByTestId } = render(<Stats />)
 
-    expect(getByText(mockStats.numNodes)).toBeInTheDocument()
+    expect(getByText(mockStats.nodeCount)).toBeInTheDocument()
     expect(getByText(mockStats.numAudio)).toBeInTheDocument()
     expect(getByText(mockStats.numEpisodes)).toBeInTheDocument()
     expect(getByText(mockStats.numVideo)).toBeInTheDocument()
@@ -154,7 +154,7 @@ describe('Component Test Stats', () => {
     })
   })
 
-  it.skip('should render the button only if totalProcessing is present and greater than 0', async () => {
+  it('should render the button only if totalProcessing is present and greater than 0', async () => {
     const mockedGetTotalProcessing = getTotalProcessing as jest.MockedFunction<() => Promise<ProcessingResponse>>
 
     const mockResponse: ProcessingResponse = {