diff --git a/apps/website/components/footer/footer.spec.tsx b/apps/website/components/footer/footer.spec.tsx
deleted file mode 100644
index 97c820b..0000000
--- a/apps/website/components/footer/footer.spec.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-import { render } from '@testing-library/react';
-
-import Footer from './footer';
-
-describe('Footer', () => {
-  it('should render successfully', () => {
-    const { baseElement } = render(<Footer />);
-    expect(baseElement).toBeTruthy();
-  });
-});
diff --git a/apps/website/components/seo-config/seo-config.spec.tsx b/apps/website/components/seo-config/seo-config.spec.tsx
deleted file mode 100644
index 8a25531..0000000
--- a/apps/website/components/seo-config/seo-config.spec.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-import { render } from '@testing-library/react';
-
-import SeoConfig from './seo-config';
-
-describe('SeoConfig', () => {
-  it('should render successfully', () => {
-    const { baseElement } = render(<SeoConfig />);
-    expect(baseElement).toBeTruthy();
-  });
-});
diff --git a/apps/website/sonar-project.properties b/apps/website/sonar-project.properties
index 88ca6bb..d76dfbc 100644
--- a/apps/website/sonar-project.properties
+++ b/apps/website/sonar-project.properties
@@ -1,10 +1,10 @@
 sonar.host.url=http://192.168.1.33:9000/
 sonar.projectKey=david:guitar-apps
 sonar.sources=./
-sonar.exclusions=.next/,.eslintrc.json,config.ts,index.d.ts,jest.config.ts,next.config.js,postcss.config.js,tailwind.config.js,with-nx.js,**/*.css,**/*.scss
+sonar.exclusions=.next/,.eslintrc.json,config.ts,index.d.ts,jest.config.ts,next.config.js,postcss.config.js,tailwind.config.js,with-nx.js,**/*.css,**/*.scss,**/*.spec.ts,**/*.spec.tsx
 sonar.coverage.exclusions=.next/,.eslintrc.json,config.ts,index.d.ts,jest.config.ts,next.config.js,postcss.config.js,tailwind.config.js,with-nx.js
 sonar.language=ts
-sonar.tests=./
+sonar.tests=./tests
 sonar.javascript.lcov.reportPaths=../../coverage/apps/website/lcov.info
 sonar.testExecutionReportPaths=test-report.xml
 sonar.sourceEncoding=UTF-8
diff --git a/apps/website/components/carousel/carousel.spec.tsx b/apps/website/tests/carousel.spec.tsx
similarity index 79%
rename from apps/website/components/carousel/carousel.spec.tsx
rename to apps/website/tests/carousel.spec.tsx
index 4201b81..d766821 100644
--- a/apps/website/components/carousel/carousel.spec.tsx
+++ b/apps/website/tests/carousel.spec.tsx
@@ -1,6 +1,6 @@
 import { render } from '@testing-library/react';
 
-import Carousel from './carousel';
+import Carousel from '../components/carousel/carousel';
 
 describe('Carousel', () => {
   it('should render successfully', () => {
diff --git a/apps/website/tests/footer.spec.tsx b/apps/website/tests/footer.spec.tsx
new file mode 100644
index 0000000..649ee31
--- /dev/null
+++ b/apps/website/tests/footer.spec.tsx
@@ -0,0 +1,10 @@
+import {render} from '@testing-library/react';
+
+import Footer from '../components/footer/footer';
+
+describe('Footer', () => {
+  it('should render successfully', () => {
+    const {baseElement} = render(<Footer/>);
+    expect(baseElement).toBeTruthy();
+  });
+});
diff --git a/apps/website/components/header/header.spec.tsx b/apps/website/tests/header.spec.tsx
similarity index 83%
rename from apps/website/components/header/header.spec.tsx
rename to apps/website/tests/header.spec.tsx
index 6a63192..fd36c9e 100644
--- a/apps/website/components/header/header.spec.tsx
+++ b/apps/website/tests/header.spec.tsx
@@ -1,13 +1,12 @@
 import {render} from '@testing-library/react';
-import {SessionProvider, useSession} from "next-auth/react";
 
-import Header from './header';
+import Header from '../components/header/header';
 
 jest.mock("next-auth/react", () => {
   const originalModule = jest.requireActual('next-auth/react');
   const mockSession = {
     expires: new Date(Date.now() + 2 * 86400).toISOString(),
-    user: { username: "admin" }
+    user: {username: "admin"}
   };
   return {
     __esModule: true,
diff --git a/apps/website/pages/index.spec.tsx b/apps/website/tests/index.spec.tsx
similarity index 100%
rename from apps/website/pages/index.spec.tsx
rename to apps/website/tests/index.spec.tsx
diff --git a/apps/website/components/layout/layout.spec.tsx b/apps/website/tests/layout.spec.tsx
similarity index 75%
rename from apps/website/components/layout/layout.spec.tsx
rename to apps/website/tests/layout.spec.tsx
index 5bb3c54..3bb4122 100644
--- a/apps/website/components/layout/layout.spec.tsx
+++ b/apps/website/tests/layout.spec.tsx
@@ -1,12 +1,12 @@
-import { render } from '@testing-library/react';
+import {render} from '@testing-library/react';
 
-import Layout from './layout';
+import Layout from '../components/layout/layout';
 
 jest.mock("next-auth/react", () => {
   const originalModule = jest.requireActual('next-auth/react');
   const mockSession = {
     expires: new Date(Date.now() + 2 * 86400).toISOString(),
-    user: { username: "admin" }
+    user: {username: "admin"}
   };
   return {
     __esModule: true,
@@ -19,7 +19,7 @@ jest.mock("next-auth/react", () => {
 
 describe('Layout', () => {
   it('should render successfully', () => {
-    const { baseElement } = render(<Layout />);
+    const {baseElement} = render(<Layout/>);
     expect(baseElement).toBeTruthy();
   });
 });
diff --git a/apps/website/tests/seo-config.spec.tsx b/apps/website/tests/seo-config.spec.tsx
new file mode 100644
index 0000000..86431a1
--- /dev/null
+++ b/apps/website/tests/seo-config.spec.tsx
@@ -0,0 +1,10 @@
+import {render} from '@testing-library/react';
+
+import SeoConfig from '../components/seo-config/seo-config';
+
+describe('SeoConfig', () => {
+  it('should render successfully', () => {
+    const {baseElement} = render(<SeoConfig/>);
+    expect(baseElement).toBeTruthy();
+  });
+});