diff --git a/jest.config.js b/jest.config.js
index 3083bcda4f..d15ec53598 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -10,7 +10,8 @@ export default {
     '!**/index.{js,ts}',
     '!**/*.d.ts',
     '!src/test/**',
-    '!vitest.config.ts',],
+    '!vitest.config.ts',
+  ],
   // setupFiles: ['react-app-polyfill/jsdom'],
   setupFiles: ['whatwg-fetch'],
   setupFilesAfterEnv: ['<rootDir>/src/setupTests.ts'],
diff --git a/package-lock.json b/package-lock.json
index 2404c03835..f07c9e0e22 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11375,6 +11375,7 @@
       "resolved": "https://registry.npmjs.org/identity-obj-proxy/-/identity-obj-proxy-3.0.0.tgz",
       "integrity": "sha512-00n6YnVHKrinT9t0d9+5yZC6UBNJANpYEQvL2LlX6Ab9lnmxzIRcEmTPuyGScvl1+jKuCICX1Z0Ab1pPKKdikA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "harmony-reflect": "^1.4.6"
       },
diff --git a/src/components/OrganizationScreen/OrganizationScreen.test.tsx b/src/components/OrganizationScreen/OrganizationScreen.test.tsx
index cd039cc3ca..0dfb6d7a14 100644
--- a/src/components/OrganizationScreen/OrganizationScreen.test.tsx
+++ b/src/components/OrganizationScreen/OrganizationScreen.test.tsx
@@ -80,16 +80,13 @@ describe('Testing OrganizationScreen', () => {
     const closeButton = screen.getByTestId('closeMenu');
     fireEvent.click(closeButton);
 
-    // Check for contract class after closing
-    expect(screen.getByTestId('mainpageright')).toHaveClass('_expand_ccl5z_8');
+    expect(screen.getByTestId('mainpageright')).toHaveClass(styles.expand);
 
     const openButton = screen.getByTestId('openMenu');
     fireEvent.click(openButton);
 
     // Check for expand class after opening
-    expect(screen.getByTestId('mainpageright')).toHaveClass(
-      '_contract_ccl5z_61',
-    );
+    expect(screen.getByTestId('mainpageright')).toHaveClass(styles.contract);
   });
 
   test('handles window resize', () => {
diff --git a/src/screens/PageNotFound/PageNotFound.test.tsx b/src/screens/PageNotFound/PageNotFound.spec.tsx
similarity index 97%
rename from src/screens/PageNotFound/PageNotFound.test.tsx
rename to src/screens/PageNotFound/PageNotFound.spec.tsx
index 501d9f7ef3..d8f5f1692b 100644
--- a/src/screens/PageNotFound/PageNotFound.test.tsx
+++ b/src/screens/PageNotFound/PageNotFound.spec.tsx
@@ -8,7 +8,7 @@ import { store } from 'state/store';
 import PageNotFound from './PageNotFound';
 import i18nForTest from 'utils/i18nForTest';
 import useLocalStorage from 'utils/useLocalstorage';
-
+import { test, expect, describe } from 'vitest';
 const { setItem } = useLocalStorage();
 
 describe('Testing Page not found component', () => {