diff --git a/apps/testing-forms/.eslintrc.json b/apps/test/forms/.eslintrc.json
similarity index 94%
rename from apps/testing-forms/.eslintrc.json
rename to apps/test/forms/.eslintrc.json
index b428c22..bf8df14 100644
--- a/apps/testing-forms/.eslintrc.json
+++ b/apps/test/forms/.eslintrc.json
@@ -1,5 +1,5 @@
 {
-  "extends": ["../../.eslintrc.json"],
+  "extends": ["../../../.eslintrc.json"],
   "ignorePatterns": ["!**/*"],
   "overrides": [
     {
diff --git a/apps/testing-forms/README.md b/apps/test/forms/README.md
similarity index 69%
rename from apps/testing-forms/README.md
rename to apps/test/forms/README.md
index a996cd0..42eb371 100644
--- a/apps/testing-forms/README.md
+++ b/apps/test/forms/README.md
@@ -8,13 +8,13 @@ NOT IMPLEMENTED YET
 
 <!-- We have a small application that send a title to a fake backend that you type inside a input.
 If the title is correctly typed, you can send the request otherwise you get a nice error and the request is not sent.
-You can play with it by running : `npx nx serve testing-forms`.
+You can play with it by running : `npx nx serve test-forms`.
 
 The goal is to test this behavior with Testing library and Cypress
 
-The file named `child.component.spec.ts` will let test your application using Testing Library. To run the test suits, you need to run `npx nx test testing-forms`. You can also install [Jest Runner](https://marketplace.visualstudio.com/items?itemName=firsttris.vscode-jest-runner) to execute your test by clicking on the `Run` button above each `describe` or `it` blocks.
+The file named `child.component.spec.ts` will let test your application using Testing Library. To run the test suits, you need to run `npx nx test test-forms`. You can also install [Jest Runner](https://marketplace.visualstudio.com/items?itemName=firsttris.vscode-jest-runner) to execute your test by clicking on the `Run` button above each `describe` or `it` blocks.
 
-For testing cypress, you will execute your test inside the `child.component.cy.ts` and run `npx nx component-test testing-forms` to execute your test suits. You can add the `--watch` flag to execute your test in watch mode.
+For testing cypress, you will execute your test inside the `child.component.cy.ts` and run `npx nx component-test test-forms` to execute your test suits. You can add the `--watch` flag to execute your test in watch mode.
 
 I created some `it` blocks but feel free to add more test if you like to. -->
 
@@ -23,9 +23,9 @@ I created some `it` blocks but feel free to add more test if you like to. -->
 1. Fork the project
 2. clone it
 3. npm ci
-4. `npx nx serve testing-forms` to play with the application
-5. `npx nx test testing-forms` to test your application with Testing Library
-6. `npx nx component-test testing-forms --watch` to test your application with Cypress
+4. `npx nx serve test-forms` to play with the application
+5. `npx nx test test-forms` to test your application with Testing Library
+6. `npx nx component-test test-forms --watch` to test your application with Cypress
 7. _...work on it_
 8. Commit your work
 9. Submit a PR with a title beginning with **Answer:20** that I will review and other dev can review.
diff --git a/apps/testing-forms/cypress.config.ts b/apps/test/forms/cypress.config.ts
similarity index 100%
rename from apps/testing-forms/cypress.config.ts
rename to apps/test/forms/cypress.config.ts
diff --git a/apps/testing-forms/cypress/fixtures/example.json b/apps/test/forms/cypress/fixtures/example.json
similarity index 100%
rename from apps/testing-forms/cypress/fixtures/example.json
rename to apps/test/forms/cypress/fixtures/example.json
diff --git a/apps/testing-forms/cypress/support/commands.ts b/apps/test/forms/cypress/support/commands.ts
similarity index 100%
rename from apps/testing-forms/cypress/support/commands.ts
rename to apps/test/forms/cypress/support/commands.ts
diff --git a/apps/test/forms/cypress/support/component-index.html b/apps/test/forms/cypress/support/component-index.html
new file mode 100644
index 0000000..108ce7b
--- /dev/null
+++ b/apps/test/forms/cypress/support/component-index.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <meta name="viewport" content="width=device-width,initial-scale=1.0" />
+    <title>testing-forms Components App</title>
+  </head>
+  <body>
+    <div data-cy-root></div>
+  </body>
+</html>
diff --git a/apps/testing-forms/cypress/support/component.ts b/apps/test/forms/cypress/support/component.ts
similarity index 100%
rename from apps/testing-forms/cypress/support/component.ts
rename to apps/test/forms/cypress/support/component.ts
diff --git a/apps/testing-forms/cypress/tsconfig.json b/apps/test/forms/cypress/tsconfig.json
similarity index 100%
rename from apps/testing-forms/cypress/tsconfig.json
rename to apps/test/forms/cypress/tsconfig.json
diff --git a/apps/testing-forms/jest.config.ts b/apps/test/forms/jest.config.ts
similarity index 89%
rename from apps/testing-forms/jest.config.ts
rename to apps/test/forms/jest.config.ts
index f32c26b..c757ab8 100644
--- a/apps/testing-forms/jest.config.ts
+++ b/apps/test/forms/jest.config.ts
@@ -1,7 +1,7 @@
 /* eslint-disable */
 export default {
-  displayName: 'testing-forms',
-  preset: '../../jest.preset.js',
+  displayName: 'test-forms',
+  preset: '../../../jest.preset.js',
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
   transform: {
     '^.+\\.(ts|mjs|js|html)$': [
diff --git a/apps/testing-forms/project.json b/apps/test/forms/project.json
similarity index 68%
rename from apps/testing-forms/project.json
rename to apps/test/forms/project.json
index 2aad140..6ce0a1b 100644
--- a/apps/testing-forms/project.json
+++ b/apps/test/forms/project.json
@@ -1,25 +1,25 @@
 {
-  "name": "testing-forms",
-  "$schema": "../node_modules/nx/schemas/project-schema.json",
+  "name": "test-forms",
+  "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
-  "sourceRoot": "apps/testing-forms/src",
+  "sourceRoot": "apps/test/forms/src",
   "prefix": "app",
   "targets": {
     "build": {
       "executor": "@angular-devkit/build-angular:browser",
       "outputs": ["{options.outputPath}"],
       "options": {
-        "outputPath": "dist/apps/testing-forms",
-        "index": "apps/testing-forms/src/index.html",
-        "main": "apps/testing-forms/src/main.ts",
+        "outputPath": "dist/apps/test/forms",
+        "index": "apps/test/forms/src/index.html",
+        "main": "apps/test/forms/src/main.ts",
         "polyfills": ["zone.js"],
-        "tsConfig": "apps/testing-forms/tsconfig.app.json",
+        "tsConfig": "apps/test/forms/tsconfig.app.json",
         "inlineStyleLanguage": "scss",
         "assets": [
-          "apps/testing-forms/src/favicon.ico",
-          "apps/testing-forms/src/assets"
+          "apps/test/forms/src/favicon.ico",
+          "apps/test/forms/src/assets"
         ],
-        "styles": ["apps/testing-forms/src/styles.scss"],
+        "styles": ["apps/test/forms/src/styles.scss"],
         "scripts": []
       },
       "configurations": {
@@ -53,10 +53,10 @@
       "executor": "@angular-devkit/build-angular:dev-server",
       "configurations": {
         "production": {
-          "browserTarget": "testing-forms:build:production"
+          "browserTarget": "test-forms:build:production"
         },
         "development": {
-          "browserTarget": "testing-forms:build:development"
+          "browserTarget": "test-forms:build:development"
         }
       },
       "defaultConfiguration": "development"
@@ -64,7 +64,7 @@
     "extract-i18n": {
       "executor": "@angular-devkit/build-angular:extract-i18n",
       "options": {
-        "browserTarget": "testing-forms:build"
+        "browserTarget": "test-forms:build"
       }
     },
     "lint": {
@@ -72,8 +72,8 @@
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": [
-          "apps/testing-forms/**/*.ts",
-          "apps/testing-forms/**/*.html"
+          "apps/test/forms/**/*.ts",
+          "apps/test/forms/**/*.html"
         ]
       }
     },
@@ -81,7 +81,7 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "apps/testing-forms/jest.config.ts",
+        "jestConfig": "apps/test/forms/jest.config.ts",
         "passWithNoTests": true
       },
       "configurations": {
@@ -94,10 +94,10 @@
     "component-test": {
       "executor": "@nx/cypress:cypress",
       "options": {
-        "cypressConfig": "apps/testing-forms/cypress.config.ts",
+        "cypressConfig": "apps/test/forms/cypress.config.ts",
         "testingType": "component",
         "skipServe": true,
-        "devServerTarget": "testing-forms:build"
+        "devServerTarget": "test-forms:build"
       }
     }
   },
diff --git a/apps/testing-forms/src/app/app.component.spec.ts b/apps/test/forms/src/app/app.component.spec.ts
similarity index 100%
rename from apps/testing-forms/src/app/app.component.spec.ts
rename to apps/test/forms/src/app/app.component.spec.ts
diff --git a/apps/testing-forms/src/app/app.component.ts b/apps/test/forms/src/app/app.component.ts
similarity index 100%
rename from apps/testing-forms/src/app/app.component.ts
rename to apps/test/forms/src/app/app.component.ts
diff --git a/apps/testing-forms/src/app/nx-welcome.component.ts b/apps/test/forms/src/app/nx-welcome.component.ts
similarity index 100%
rename from apps/testing-forms/src/app/nx-welcome.component.ts
rename to apps/test/forms/src/app/nx-welcome.component.ts
diff --git a/apps/testing-forms/src/assets/.gitkeep b/apps/test/forms/src/assets/.gitkeep
similarity index 100%
rename from apps/testing-forms/src/assets/.gitkeep
rename to apps/test/forms/src/assets/.gitkeep
diff --git a/apps/testing-forms/src/favicon.ico b/apps/test/forms/src/favicon.ico
similarity index 100%
rename from apps/testing-forms/src/favicon.ico
rename to apps/test/forms/src/favicon.ico
diff --git a/apps/testing-forms/src/index.html b/apps/test/forms/src/index.html
similarity index 100%
rename from apps/testing-forms/src/index.html
rename to apps/test/forms/src/index.html
diff --git a/apps/testing-forms/src/main.ts b/apps/test/forms/src/main.ts
similarity index 100%
rename from apps/testing-forms/src/main.ts
rename to apps/test/forms/src/main.ts
diff --git a/apps/testing-forms/src/styles.scss b/apps/test/forms/src/styles.scss
similarity index 100%
rename from apps/testing-forms/src/styles.scss
rename to apps/test/forms/src/styles.scss
diff --git a/apps/testing-forms/src/test-setup.ts b/apps/test/forms/src/test-setup.ts
similarity index 100%
rename from apps/testing-forms/src/test-setup.ts
rename to apps/test/forms/src/test-setup.ts
diff --git a/apps/testing-forms/tailwind.config.js b/apps/test/forms/tailwind.config.js
similarity index 100%
rename from apps/testing-forms/tailwind.config.js
rename to apps/test/forms/tailwind.config.js
diff --git a/apps/testing-forms/tsconfig.app.json b/apps/test/forms/tsconfig.app.json
similarity index 89%
rename from apps/testing-forms/tsconfig.app.json
rename to apps/test/forms/tsconfig.app.json
index e46d4fc..01a02ed 100644
--- a/apps/testing-forms/tsconfig.app.json
+++ b/apps/test/forms/tsconfig.app.json
@@ -1,7 +1,7 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "outDir": "../../dist/out-tsc",
+    "outDir": "../../../dist/out-tsc",
     "types": []
   },
   "files": ["src/main.ts"],
diff --git a/apps/testing-forms/tsconfig.editor.json b/apps/test/forms/tsconfig.editor.json
similarity index 100%
rename from apps/testing-forms/tsconfig.editor.json
rename to apps/test/forms/tsconfig.editor.json
diff --git a/apps/testing-forms/tsconfig.json b/apps/test/forms/tsconfig.json
similarity index 94%
rename from apps/testing-forms/tsconfig.json
rename to apps/test/forms/tsconfig.json
index 28546c4..3879b94 100644
--- a/apps/testing-forms/tsconfig.json
+++ b/apps/test/forms/tsconfig.json
@@ -25,7 +25,7 @@
       "path": "./cypress/tsconfig.json"
     }
   ],
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../../tsconfig.base.json",
   "angularCompilerOptions": {
     "enableI18nLegacyMessageIdFormat": false,
     "strictInjectionParameters": true,
diff --git a/apps/testing-forms/tsconfig.spec.json b/apps/test/forms/tsconfig.spec.json
similarity index 88%
rename from apps/testing-forms/tsconfig.spec.json
rename to apps/test/forms/tsconfig.spec.json
index 1a4817a..c0c092e 100644
--- a/apps/testing-forms/tsconfig.spec.json
+++ b/apps/test/forms/tsconfig.spec.json
@@ -1,7 +1,7 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "outDir": "../../dist/out-tsc",
+    "outDir": "../../../dist/out-tsc",
     "module": "commonjs",
     "types": ["jest", "node", "@testing-library/jest-dom"]
   },
diff --git a/apps/testing-forms/cypress/support/component-index.html b/apps/testing-forms/cypress/support/component-index.html
deleted file mode 100644
index 1f591ac..0000000
--- a/apps/testing-forms/cypress/support/component-index.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="viewport" content="width=device-width,initial-scale=1.0">
-  <title>testing-forms Components App</title>
-
-</head>
-<body>
-  <div data-cy-root></div>
-</body>
-</html>