From dbd86148ba3c31830110c9216516db6dcdf029ce Mon Sep 17 00:00:00 2001
From: maymanaf <med.aymen.naf@gmail.com>
Date: Thu, 10 Oct 2024 09:28:18 +0200
Subject: [PATCH] front: refacto old e2e tests

Signed-off-by: maymanaf <med.aymen.naf@gmail.com>
---
 .../components/BreadCrumbs.tsx                |   2 +-
 .../operationalStudies/views/Project.tsx      |   1 +
 .../BootstrapSNCF/CardSNCF/CardSNCF.tsx       |   4 +-
 front/src/common/BootstrapSNCF/ChipsSNCF.tsx  |   7 +-
 front/src/common/BootstrapSNCF/NavBarSNCF.tsx |   2 +-
 .../InfraSelectorModalBodyStandard.tsx        |   2 +-
 .../components/AddOrEditScenarioModal.tsx     |   2 +-
 .../scenario/components/ScenarioCardEmpty.tsx |   2 +-
 front/tests/001-home-page.spec.ts             |  68 ++-
 front/tests/002-project-management.spec.ts    | 172 +++-----
 front/tests/003-study-management.spec.ts      | 219 +++++-----
 front/tests/004-scenario-management.spec.ts   | 106 +++--
 front/tests/005-operational-studies.spec.ts   | 102 +++--
 front/tests/006-stdcm-page.spec.ts            |  55 ---
 front/tests/007-op-rollingstock-tab.spec.ts   | 101 ++---
 front/tests/008-train-schedule.spec.ts        | 100 ++---
 front/tests/009-rollingstock-editor.spec.ts   | 209 ++++-----
 front/tests/010-op-route-tab.spec.ts          | 162 +++----
 .../tests/011-op-times-and-stops-tab.spec.ts  | 251 +++++------
 .../012-op-simulation-settings-tab.spec.ts    | 135 +++---
 front/tests/pages/base-page.ts                |  43 --
 front/tests/pages/common-page-model.ts        |  44 +-
 front/tests/pages/home-page-model.ts          | 106 ++---
 front/tests/pages/map-model.ts                | 101 -----
 .../tests/pages/op-output-table-page-model.ts |  13 +-
 front/tests/pages/op-route-page-model.ts      | 327 ++++++++++++++
 front/tests/pages/op-timetable-page-model.ts  |   6 -
 .../pages/operational-studies-page-model.ts   | 412 ++++--------------
 front/tests/pages/project-page-model.ts       | 274 ++++++------
 .../pages/rollingstock-editor-page-model.ts   | 126 +++---
 .../tests/pages/rollingstock-selector-page.ts | 108 ++---
 front/tests/pages/scenario-page-model.ts      | 404 ++++++-----------
 front/tests/pages/simulation-conf-page.ts     |  60 ---
 front/tests/pages/stdcm-page-model.ts         |  54 ---
 front/tests/pages/study-page-model.ts         | 306 ++++++++-----
 front/tests/playwright-fixture.ts             |  15 +
 front/tests/utils/api-setup.ts                |  79 +++-
 front/tests/utils/dataNormalizer.ts           |   4 +
 front/tests/utils/index.ts                    |  71 ++-
 39 files changed, 1950 insertions(+), 2305 deletions(-)
 delete mode 100644 front/tests/006-stdcm-page.spec.ts
 delete mode 100644 front/tests/pages/base-page.ts
 delete mode 100644 front/tests/pages/map-model.ts
 create mode 100644 front/tests/pages/op-route-page-model.ts
 delete mode 100644 front/tests/pages/simulation-conf-page.ts
 delete mode 100644 front/tests/pages/stdcm-page-model.ts
 create mode 100644 front/tests/playwright-fixture.ts

diff --git a/front/src/applications/operationalStudies/components/BreadCrumbs.tsx b/front/src/applications/operationalStudies/components/BreadCrumbs.tsx
index d8f8da23436..4afd1b9fa9f 100644
--- a/front/src/applications/operationalStudies/components/BreadCrumbs.tsx
+++ b/front/src/applications/operationalStudies/components/BreadCrumbs.tsx
@@ -31,7 +31,7 @@ export default function BreadCrumbs({ project, study, scenario }: Props) {
 
       {project && study && (
         <>
-          <div className="text-truncate" title={project.name}>
+          <div data-testid="project-breadcrumbs" className="text-truncate" title={project.name}>
             <Link to={`/operational-studies/projects/${project.id}`}> {project.name}</Link>
           </div>
           <span className="text-muted">
diff --git a/front/src/applications/operationalStudies/views/Project.tsx b/front/src/applications/operationalStudies/views/Project.tsx
index 1c9f4953479..09dafdf43ba 100644
--- a/front/src/applications/operationalStudies/views/Project.tsx
+++ b/front/src/applications/operationalStudies/views/Project.tsx
@@ -222,6 +222,7 @@ export default function Project() {
                       <div className="project-details-title-name">
                         {project.name}
                         <button
+                          data-testid="project-update-button"
                           className="project-details-title-modify-button"
                           type="button"
                           onClick={() =>
diff --git a/front/src/common/BootstrapSNCF/CardSNCF/CardSNCF.tsx b/front/src/common/BootstrapSNCF/CardSNCF/CardSNCF.tsx
index 953df27a09b..922a80aa421 100644
--- a/front/src/common/BootstrapSNCF/CardSNCF/CardSNCF.tsx
+++ b/front/src/common/BootstrapSNCF/CardSNCF/CardSNCF.tsx
@@ -20,7 +20,9 @@ const Card = ({ link, img, title, disabledLink = false, openInNewTab = false }:
   >
     <img className="card-img-top" alt={title} src={img} />
     <div className="card-body text-center">
-      <h5 className="card-title mb-0 text-base font-weight-normal">{title}</h5>
+      <h5 data-testid="page-title" className="card-title mb-0 text-base font-weight-normal">
+        {title}
+      </h5>
     </div>
   </Link>
 );
diff --git a/front/src/common/BootstrapSNCF/ChipsSNCF.tsx b/front/src/common/BootstrapSNCF/ChipsSNCF.tsx
index 20dcf838765..b5a5e839812 100644
--- a/front/src/common/BootstrapSNCF/ChipsSNCF.tsx
+++ b/front/src/common/BootstrapSNCF/ChipsSNCF.tsx
@@ -38,7 +38,12 @@ export default function ChipsSNCF({
     return (
       <div role="list" key={nextId()}>
         <div className="chips-group" role="listitem">
-          <span className={`chips chips-label pr-1 ${chipColor}`}>{label}</span>
+          <span
+            data-testid="scenario-details-tag"
+            className={`chips chips-label pr-1 ${chipColor}`}
+          >
+            {label}
+          </span>
           <button
             type="button"
             className={`chips chips-btn chips-only-icon ${chipColor}`}
diff --git a/front/src/common/BootstrapSNCF/NavBarSNCF.tsx b/front/src/common/BootstrapSNCF/NavBarSNCF.tsx
index eb60f5b0aa9..90fc508fdde 100644
--- a/front/src/common/BootstrapSNCF/NavBarSNCF.tsx
+++ b/front/src/common/BootstrapSNCF/NavBarSNCF.tsx
@@ -34,7 +34,7 @@ const LegacyNavBarSNCF = ({ appName, logo = getLogo() }: Props) => {
     <div className="mastheader">
       <div className="mastheader-logo flex-grow-0">
         <Link to="/">
-          <img src={logo} alt="OSRD Logo" />
+          <img src={logo} data-testid="osrd-logo" alt="OSRD Logo" />
         </Link>
       </div>
       <header role="banner" className="mastheader-title d-flex flex-grow-1">
diff --git a/front/src/modules/infra/components/InfraSelector/InfraSelectorModalBodyStandard.tsx b/front/src/modules/infra/components/InfraSelector/InfraSelectorModalBodyStandard.tsx
index a3b8e706b6c..372a79affd7 100644
--- a/front/src/modules/infra/components/InfraSelector/InfraSelectorModalBodyStandard.tsx
+++ b/front/src/modules/infra/components/InfraSelector/InfraSelectorModalBodyStandard.tsx
@@ -84,7 +84,7 @@ export default function InfraSelectorModalBodyStandard({
       <div className="text-center small text-muted infras-count">
         {infrasList && t('infraManagement:infrasFound', { count: infrasList.length })}
       </div>
-      <div className="infraslist" data-testid="infraslist">
+      <div className="infraslist" data-testid="infra-list">
         {infrasList.map((infra) => (
           <button
             data-testid={`infraslist-item-${infra.id}`}
diff --git a/front/src/modules/scenario/components/AddOrEditScenarioModal.tsx b/front/src/modules/scenario/components/AddOrEditScenarioModal.tsx
index 63e7442795a..df34fa8def2 100644
--- a/front/src/modules/scenario/components/AddOrEditScenarioModal.tsx
+++ b/front/src/modules/scenario/components/AddOrEditScenarioModal.tsx
@@ -368,7 +368,7 @@ export default function AddOrEditScenarioModal({
         <div className="d-flex justify-content-end w-100 mt-3">
           {editionMode && (
             <button
-              data-testid="deleteScenario"
+              data-testid="delete-scenario"
               className="btn btn-sm btn-outline-danger mr-auto"
               type="button"
               onClick={removeScenario}
diff --git a/front/src/modules/scenario/components/ScenarioCardEmpty.tsx b/front/src/modules/scenario/components/ScenarioCardEmpty.tsx
index c5c9580e263..68985cedad3 100644
--- a/front/src/modules/scenario/components/ScenarioCardEmpty.tsx
+++ b/front/src/modules/scenario/components/ScenarioCardEmpty.tsx
@@ -10,7 +10,7 @@ export default function StudyCard() {
 
   return (
     <div
-      data-testid="addScenario"
+      data-testid="add-scenario-button"
       className="scenario-card empty"
       role="button"
       tabIndex={0}
diff --git a/front/tests/001-home-page.spec.ts b/front/tests/001-home-page.spec.ts
index 2797878f467..8dbf1aaccc5 100644
--- a/front/tests/001-home-page.spec.ts
+++ b/front/tests/001-home-page.spec.ts
@@ -1,63 +1,59 @@
-import { test, expect } from '@playwright/test';
-
 import HomePage from './pages/home-page-model';
+import { test, expect } from './playwright-fixture';
+import enTranslations from '../public/locales/en/home/home.json';
+import frTranslations from '../public/locales/fr/home/home.json';
 
-// Describe the test suite for the home page of OSRD
 test.describe('Home page OSRD', () => {
   let homePage: HomePage;
 
-  test.beforeEach(async ({ page }) => {
-    // Create an instance of the HomePage class
+  test.beforeEach('Navigate to the home page', async ({ page }) => {
     homePage = new HomePage(page);
-    // Go to the home page of OSRD
     await homePage.goToHomePage();
   });
 
-  test.afterEach(async () => {
-    // Navigate back to the home page of OSRD
+  test.afterEach('Returns to the home page', async () => {
     await homePage.backToHomePage();
   });
 
-  // Test that the home page of OSRD displays links to other pages
-  test('should display links in the home page', async () => {
-    await homePage.getDisplayLinks();
+  /** *************** Test 1 **************** */
+  test('Verify the links for different pages in Home Page', async ({ OSRDLanguage }) => {
+    // Determine the correct translations based on the selected language
+    const translations = OSRDLanguage === 'English' ? enTranslations : frTranslations;
+
+    // List of expected links on the home page
+    const expectedLinks = [
+      translations.operationalStudies,
+      translations.stdcm,
+      translations.editor,
+      translations.rollingStockEditor,
+      translations.map,
+    ];
+
+    // Verify that the displayed links match the expected ones
+    await expect(homePage.linksTitle).toHaveText(expectedLinks);
   });
 
-  test('should be correctly redirected to the  "Operational Studies" page after clicking on the link', async () => {
-    // Navigate to the "Operational Studies" page
+  /** *************** Test 2 **************** */
+  test('Verify redirection to to the Operational Studies page', async () => {
     await homePage.goToOperationalStudiesPage();
-    // Check that the URL of the page matches the expected pattern
-    await expect(homePage.page).toHaveURL(/.*\/operational-studies/);
+    await expect(homePage.page).toHaveURL(/.*\/operational-studies/); // Check the URL
   });
 
-  test('should be correctly redirected to the  "Map" page after clicking on the link', async () => {
-    // Navigate to the "Map" page
+  /** *************** Test 3 **************** */
+  test('Verify redirection toto the Map page', async () => {
     await homePage.goToCartoPage();
-
-    // Check that the URL of the page matches the expected pattern
     await expect(homePage.page).toHaveURL(/.*\/map/);
   });
 
-  test('should be correctly redirected to the  "Editor" page after clicking on the link', async () => {
-    // Navigate to the "Editor" page
+  /** *************** Test 4 **************** */
+  test('Verify redirection to to the Infrastructure editor page', async () => {
     await homePage.goToEditorPage();
-
-    // Check that the URL of the page matches the expected pattern
     await expect(homePage.page).toHaveURL(/.*\/editor\/*/);
   });
 
-  test('should be correctly redirected to the  "STDCM" page after clicking on the link', async ({
-    context,
-  }) => {
-    // Start waiting for new page before clicking. Note no await.
-    const pagePromise = context.waitForEvent('page');
-
-    // Navigate to the "STDCM" page
-    await homePage.goToSTDCMPage();
-
-    const newPage = await pagePromise;
-
-    // Check that the URL of the page matches the expected pattern
-    await expect(newPage).toHaveURL(/.*\/stdcm/);
+  /** *************** Test 5 **************** */
+  test('Verify redirection to to the STDCM page', async ({ context }) => {
+    const stdcmPage = await homePage.goToSTDCMPage(context);
+    await expect(stdcmPage).toHaveURL(/.*\/stdcm/);
   });
 });
diff --git a/front/tests/002-project-management.spec.ts b/front/tests/002-project-management.spec.ts
index 36ff16fdd3a..9b70b1606ad 100644
--- a/front/tests/002-project-management.spec.ts
+++ b/front/tests/002-project-management.spec.ts
@@ -1,145 +1,105 @@
-import { test, expect } from '@playwright/test';
+import { test } from '@playwright/test';
 import { v4 as uuidv4 } from 'uuid';
 
 import type { Project } from 'common/api/osrdEditoastApi';
 
 import projectData from './assets/operationStudies/project.json';
-import CommonPage from './pages/common-page-model';
 import HomePage from './pages/home-page-model';
 import ProjectPage from './pages/project-page-model';
 import { deleteApiRequest, getApiRequest, postApiRequest } from './utils/api-setup';
 
-let project: Project;
+test.describe('Validate the Operational Study Project workflow', () => {
+  let project: Project;
 
-test.beforeEach(async () => {
-  project = await postApiRequest('/api/projects/', {
-    ...projectData,
-    name: `${projectData.name} ${uuidv4()}`,
-    budget: 1234567890,
+  test.beforeEach('Create a new project using the API', async ({ page }) => {
+    project = await postApiRequest('/api/projects/', {
+      ...projectData,
+      name: `${projectData.name} ${uuidv4()}`, // Generate a unique name with UUID
+      budget: 1234567890, // Assign a predefined budget for testing
+    });
+    // Navigate to the Operational Studies projects page
+    await page.goto('/operational-studies/projects');
   });
-});
 
-test.afterEach(async () => {
-  await deleteApiRequest(`/api/projects/${project.id}/`);
-});
+  test.afterEach('Delete the project', async () => {
+    await deleteApiRequest(`/api/projects/${project.id}/`);
+  });
 
-test.describe('Test if project workflow is working properly', () => {
+  /** *************** Test 1 **************** */
   test('Create a new project', async ({ page }) => {
-    const homePage = new HomePage(page);
     const projectPage = new ProjectPage(page);
-    const commonPage = new CommonPage(page);
-
-    await homePage.goToHomePage();
-    await homePage.goToOperationalStudiesPage();
-    await expect(projectPage.getAddProjectBtn).toBeVisible();
-    await projectPage.openProjectModalCreation();
 
+    // Define a unique project name for the test
     const projectName = `${projectData.name} ${uuidv4()}`;
-    await projectPage.setProjectName(projectName);
-
-    await projectPage.setProjectDescription(projectData.description);
-
-    await projectPage.setProjectObjectives(projectData.objectives);
-
-    await projectPage.setProjectFunder(projectData.funders);
-
-    await projectPage.setProjectBudget(projectData.budget);
-
-    await commonPage.setTag(projectData.tags[0]);
-    await commonPage.setTag(projectData.tags[1]);
-    await commonPage.setTag(projectData.tags[2]);
-
-    const createButton = homePage.page.getByTestId('createProject');
-    await createButton.click();
-    await homePage.page.waitForURL('**/projects/*');
-    expect(await projectPage.getProjectName.textContent()).toContain(projectName);
-    expect(await projectPage.getProjectDescription.textContent()).toContain(
-      projectData.description
-    );
-    const objectives = await projectPage.getProjectObjectives.textContent();
-    expect(objectives).not.toEqual(null);
-    if (objectives !== null)
-      expect(objectives.replace(/[^A-Za-z0-9]/g, '')).toContain(
-        (project.objectives ?? '').replace(/[^A-Za-z0-9]/g, '')
-      );
-    expect(await projectPage.getProjectFinancialsInfos.textContent()).toContain(
-      projectData.funders
-    );
-    const budget = await projectPage.getProjectFinancialsAmount.textContent();
-    expect(budget).not.toEqual(null);
-    if (budget !== null) expect(budget.replace(/[^0-9]/g, '')).toContain(projectData.budget);
-    const tags = await projectPage.getProjectTags.textContent();
-    expect(tags).toContain(projectData.tags.join(''));
 
+    // Create a new project using the project page model and json data
+    await projectPage.createOrUpdateProject({
+      name: projectName,
+      description: projectData.description,
+      objectives: projectData.objectives,
+      funders: projectData.funders,
+      budget: projectData.budget,
+      tags: projectData.tags,
+    });
+
+    // Validate that the project was created with the correct data
+    await projectPage.validateProjectData({
+      name: projectName,
+      description: projectData.description,
+      objectives: projectData.objectives,
+      funders: projectData.funders,
+      budget: projectData.budget,
+      tags: projectData.tags,
+    });
+
+    // Fetch all projects via the API and find the test project by name
     const projects = await getApiRequest('/api/projects/');
     const actualTestProject = projects.results.find((p: Project) => p.name === projectName);
-
-    const deleteProject = await deleteApiRequest(`/api/projects/${actualTestProject.id}/`);
-    expect(deleteProject.status()).toEqual(204);
+    // Delete the created project
+    await deleteApiRequest(`/api/projects/${actualTestProject.id}/`);
   });
 
-  test(' update a project', async ({ page }) => {
+  /** *************** Test 2 **************** */
+  test('Update an existing project', async ({ page }) => {
     const homePage = new HomePage(page);
     const projectPage = new ProjectPage(page);
-    const commonPage = new CommonPage(page);
-
-    await page.goto('/operational-studies/projects');
 
+    // Open the created project by name using the project page model
     await projectPage.openProjectByTestId(project.name);
 
-    await projectPage.openProjectModalUpdate();
-
-    await projectPage.setProjectName(`${project.name} (updated)`);
-
-    await projectPage.setProjectDescription(`${project.description} (updated)`);
-
-    await projectPage.setProjectObjectives(`updated`);
-
-    await projectPage.setProjectFunder(`${project.funders} (updated)`);
-
-    await projectPage.setProjectBudget('123456789');
-
-    await commonPage.setTag('update-tag');
-
-    await projectPage.clickProjectUpdateConfirmBtn();
-
+    // Update the project data and save it
+    await projectPage.createOrUpdateProject({
+      name: `${project.name} (updated)`,
+      description: `${project.description} (updated)`,
+      objectives: `${projectData.objectives} (updated)`,
+      funders: `${project.funders} (updated)`,
+      budget: '123456789',
+      tags: ['update-tag'],
+      isUpdate: true, // Indicate that this is an update
+    });
+
+    // Navigate back to the Operational Studies page via the home page
     await homePage.goToHomePage();
     await homePage.goToOperationalStudiesPage();
 
+    // Reopen the updated project and validate the updated data
     await projectPage.openProjectByTestId(`${project.name} (updated)`);
-
-    expect(await projectPage.getProjectName.innerText()).toContain(`${project.name} (updated)`);
-    expect(await projectPage.getProjectDescription.textContent()).toContain(
-      `${project.description} (updated)`
-    );
-    expect(await projectPage.getProjectObjectives.textContent()).toContain('updated');
-    expect(await projectPage.getProjectFinancialsInfos.textContent()).toContain(
-      `${project.funders} (updated)`
-    );
-    const budget = await projectPage.getProjectFinancialsAmount.textContent();
-    expect(budget).not.toEqual(null);
-    if (budget !== null) expect(budget.replace(/[^0-9]/g, '')).toContain('123456789');
-    expect(await projectPage.getProjectTags.textContent()).toContain(
-      `${project.tags.join('')}update-tag`
-    );
-
-    const deleteProject = await deleteApiRequest(`/api/projects/${project.id}/`);
-    expect(deleteProject.status()).toEqual(204);
+    await projectPage.validateProjectData({
+      name: `${project.name} (updated)`,
+      description: `${project.description} (updated)`,
+      objectives: `${projectData.objectives} (updated)`,
+      funders: `${project.funders} (updated)`,
+      budget: '123456789',
+      tags: ['update-tag'],
+    });
   });
 
+  /** *************** Test 3 **************** */
   test('Delete a project', async ({ page }) => {
     const projectPage = new ProjectPage(page);
 
-    await page.goto('/operational-studies/projects');
-
+    // Find the project by name and delete it using the page model
     await projectPage.clickProjectByName(project.name);
-    await projectPage.checkLabelProjectSelected();
-    await expect(projectPage.getProjectDeleteBtn).not.toBeEmpty();
-    await projectPage.clickProjectDeleteBtn();
-    await expect(projectPage.getProjectDeleteConfirmBtn).toBeVisible();
-    await projectPage.clickProjectDeleteConfirmBtn();
-    await expect(projectPage.getProjectDeleteConfirmBtn).not.toBeVisible();
-    await expect(projectPage.getProjectDeleteBtn).not.toBeVisible();
-    await expect(projectPage.getProjectByName(project.name)).not.toBeVisible();
+    await projectPage.deleteProject(project.name);
   });
 });
diff --git a/front/tests/003-study-management.spec.ts b/front/tests/003-study-management.spec.ts
index fd10f14c198..c25ff462e45 100644
--- a/front/tests/003-study-management.spec.ts
+++ b/front/tests/003-study-management.spec.ts
@@ -1,148 +1,125 @@
-import { test, expect } from '@playwright/test';
 import { v4 as uuidv4 } from 'uuid';
 
 import type { Project, Study } from 'common/api/osrdEditoastApi';
 
 import studyData from './assets/operationStudies/study.json';
-import CommonPage from './pages/common-page-model';
-import HomePage from './pages/home-page-model';
 import StudyPage from './pages/study-page-model';
+import { test } from './playwright-fixture';
+import { formatDateToDayMonthYear } from './utils';
 import { getProject, postApiRequest } from './utils/api-setup';
+import enTranslations from '../public/locales/en/operationalStudies/study.json';
+import frTranslations from '../public/locales/fr/operationalStudies/study.json';
 
-test.use({
-  launchOptions: {
-    slowMo: 10, // Introduces a slight delay to prevent UI elements (e.g., "Create Study" button and "Study edition" modal) from overlapping due to fast test execution.
-  },
-});
-
-let project: Project;
-let study: Study;
+test.describe('Validate the Study creation workflow', () => {
+  let project: Project;
+  let study: Study;
 
-test.beforeAll(async () => {
-  project = await getProject('project_test_e2e');
-});
+  test.beforeAll(' Retrieve a project', async () => {
+    project = await getProject('project_test_e2e');
+  });
 
-test.beforeEach(async () => {
-  study = await postApiRequest(`/api/projects/${project.id}/studies/`, {
-    ...studyData,
-    name: `${studyData.name} ${uuidv4()}`,
-    budget: 1234567890,
-    project: project.id,
+  test.beforeEach('Create a new study linked to the project', async () => {
+    study = await postApiRequest(`/api/projects/${project.id}/studies/`, {
+      ...studyData,
+      name: `${studyData.name} ${uuidv4()}`, // Unique study name using UUID
+      budget: 1234567890,
+      project: project.id,
+    });
   });
-});
 
-test.describe('Test if study creation workflow is working properly', () => {
-  test('Create a new study', async ({ page }) => {
+  /** *************** Test 1 **************** */
+  test('Create a new study', async ({ page, OSRDLanguage }) => {
     const studyPage = new StudyPage(page);
-    const commonPage = new CommonPage(page);
-
-    await page.goto(`/operational-studies/projects/${project.id}`);
-
-    await studyPage.openStudyCreationModal();
-
-    const studyName = `${studyData.name} ${uuidv4()}`;
-    await studyPage.setStudyName(studyName);
-
-    await studyPage.setStudyTypeByText(studyData.type);
-
-    await studyPage.setStudyStatusByText(studyData.state);
-
-    await studyPage.setStudyDescription(studyData.description);
-
-    const todayDateISO = new Date().toISOString().split('T')[0];
-    await studyPage.setStudyStartDate(todayDateISO);
-
-    await studyPage.setStudyEstimatedEndDate(todayDateISO);
-
-    await studyPage.setStudyEndDate(todayDateISO);
-
-    await studyPage.setStudyServiceCode(studyData.service_code);
-
-    await studyPage.setStudyBusinessCode(studyData.business_code);
-
-    await studyPage.setStudyBudget(studyData.budget);
-
-    await commonPage.setTag(project.tags[0]);
-    await commonPage.setTag(project.tags[1]);
-    await commonPage.setTag(project.tags[2]);
-
-    await studyPage.createStudyButton.click();
-
-    await expect(studyPage.studyEditionModal).not.toBeVisible();
-
-    await expect(studyPage.getStudyName).toHaveText(studyName);
-    await expect(studyPage.getStudyDescription).toHaveText(studyData.description);
-    await expect(studyPage.getStudyType).toHaveText(studyData.type);
-    await expect(studyPage.getStudyState.first()).toHaveText(studyData.state);
-
-    await expect(studyPage.studyServiceCodeInfo).toHaveText(studyData.service_code);
-    await expect(studyPage.studyBusinessCodeInfo).toHaveText(studyData.business_code);
-    expect(await studyPage.getNumericFinancialsAmount()).toBe('1 234 567 890 €');
-    const tags = await studyPage.getStudyTags.textContent();
-    expect(tags).toContain(studyData.tags.join(''));
+    await page.goto(`/operational-studies/projects/${project.id}`); // Navigate to project page
+
+    // Set translations based on the language
+    const translations = OSRDLanguage === 'English' ? enTranslations : frTranslations;
+    const studyName = `${studyData.name} ${uuidv4()}`; // Unique study name
+    const todayDateISO = new Date().toISOString().split('T')[0]; // Get today's date in ISO format
+    const expectedDate = formatDateToDayMonthYear(todayDateISO);
+    // Create a new study using the study page model
+    await studyPage.createOrUpdateStudy({
+      name: studyName,
+      description: studyData.description,
+      type: translations.studyCategories.flowRate, // Translated study type
+      status: translations.studyStates.started, // Translated study status
+      startDate: todayDateISO,
+      estimatedEndDate: todayDateISO,
+      endDate: todayDateISO,
+      serviceCode: studyData.service_code,
+      businessCode: studyData.business_code,
+      budget: studyData.budget,
+      tags: studyData.tags,
+    });
+
+    // Validate that the study was created with the correct data
+    await studyPage.validateStudyData({
+      name: studyName,
+      description: studyData.description,
+      type: translations.studyCategories.flowRate,
+      status: translations.studyStates.started,
+      startDate: expectedDate,
+      estimatedEndDate: expectedDate,
+      endDate: expectedDate,
+      serviceCode: studyData.service_code,
+      businessCode: studyData.business_code,
+      budget: studyData.budget,
+      tags: studyData.tags,
+    });
   });
 
-  test('Update a study', async ({ page }) => {
+  /** *************** Test 2 **************** */
+  test('Update an existing study', async ({ page, OSRDLanguage }) => {
     const studyPage = new StudyPage(page);
-    const commonPage = new CommonPage(page);
-
-    await page.goto(`/operational-studies/projects/${project.id}/studies/${study.id}`);
-
-    await studyPage.openStudyModalUpdate();
-
-    await studyPage.setStudyName(`${study.name} (updated)`);
-
-    await studyPage.setStudyTypeByText('Exploitabilité');
-
-    await studyPage.setStudyStatusByText('En cours');
-
-    const tomorrowDateISO = new Date(Date.now() + 86400000).toISOString().split('T')[0];
-    await studyPage.setStudyDescription(`${study.description} (updated)`);
-
-    await studyPage.setStudyStartDate(tomorrowDateISO);
-
-    await studyPage.setStudyEstimatedEndDate(tomorrowDateISO);
-
-    await studyPage.setStudyEndDate(tomorrowDateISO);
-
-    await studyPage.setStudyServiceCode(`${study.service_code} (updated)`);
-
-    await studyPage.setStudyBusinessCode(`${study.business_code} (updated)`);
-
-    await studyPage.setStudyBudget('123456789');
-
-    await commonPage.setTag('update-tag');
-
-    await studyPage.clickStudyUpdateConfirmBtn();
-
+    await page.goto(`/operational-studies/projects/${project.id}/studies/${study.id}`); // Navigate to study page
+
+    const translations = OSRDLanguage === 'English' ? enTranslations : frTranslations;
+    const tomorrowDateISO = new Date(Date.now() + 86400000).toISOString().split('T')[0]; // Get tomorrow's date in ISO format
+    const expectedDate = formatDateToDayMonthYear(tomorrowDateISO);
+    // Update the study with new values
+    await studyPage.createOrUpdateStudy({
+      name: `${study.name} (updated)`,
+      description: `${study.description} (updated)`,
+      type: translations.studyCategories.operability,
+      status: translations.studyStates.inProgress,
+      startDate: tomorrowDateISO,
+      estimatedEndDate: tomorrowDateISO,
+      endDate: tomorrowDateISO,
+      serviceCode: 'A1230',
+      businessCode: 'B1230',
+      budget: '123456789',
+      tags: ['update-tag'],
+      isUpdate: true, // Indicate that this is an update
+    });
+
+    // Navigate back to the project page
     await page.goto(`/operational-studies/projects/${project.id}`);
 
+    // Reopen the updated study and validate the updated data
     await studyPage.openStudyByTestId(`${study.name} (updated)`);
-
-    await expect(studyPage.getStudyName).toHaveText(`${study.name} (updated)`);
-    await expect(studyPage.getStudyDescription).toHaveText(`${study.description} (updated)`);
-    await expect(studyPage.getStudyType).toHaveText('Exploitabilité');
-    await expect(studyPage.getStudyState.nth(1)).toHaveText('En cours');
-    await expect(studyPage.studyServiceCodeInfo).toHaveText(`${study.service_code} (updated)`);
-    await expect(studyPage.studyBusinessCodeInfo).toHaveText(`${study.business_code} (updated)`);
-    expect(await studyPage.getNumericFinancialsAmount()).toBe('123 456 789 €');
-    const tags = await studyPage.getStudyTags.textContent();
-    expect(tags).toContain('update-tag');
+    await studyPage.validateStudyData({
+      name: `${study.name} (updated)`,
+      description: `${study.description} (updated)`,
+      type: translations.studyCategories.operability,
+      status: translations.studyStates.inProgress,
+      startDate: expectedDate,
+      estimatedEndDate: expectedDate,
+      endDate: expectedDate,
+      serviceCode: 'A1230',
+      businessCode: 'B1230',
+      budget: '123456789',
+      tags: ['update-tag'],
+    });
   });
 
+  /** *************** Test 3 **************** */
   test('Delete a study', async ({ page }) => {
-    const homePage = new HomePage(page);
     const studyPage = new StudyPage(page);
 
-    await page.goto(`/operational-studies/projects/${project.id}/studies/${study.id}`);
-
-    await studyPage.openStudyModalUpdate();
-
-    await studyPage.clickStudyDeleteConfirmBtn();
-
-    await homePage.goToHomePage();
-    await homePage.goToOperationalStudiesPage();
+    // Navigate to the list of studies for the project
+    await page.goto(`/operational-studies/projects/${project.id}/studies/`);
 
-    await expect(studyPage.getStudyByName(studyData.name)).not.toBeVisible();
+    // Delete the study by name using the study page model
+    await studyPage.deleteStudy(studyData.name);
   });
 });
diff --git a/front/tests/004-scenario-management.spec.ts b/front/tests/004-scenario-management.spec.ts
index e80e6de1bfb..d3c35f8ce2a 100644
--- a/front/tests/004-scenario-management.spec.ts
+++ b/front/tests/004-scenario-management.spec.ts
@@ -4,101 +4,95 @@ import { v4 as uuidv4 } from 'uuid';
 import type { Project, Scenario, Study } from 'common/api/osrdEditoastApi';
 
 import scenarioData from './assets/operationStudies/scenario.json';
-import CommonPage from './pages/common-page-model';
-import HomePage from './pages/home-page-model';
 import ScenarioPage from './pages/scenario-page-model';
 import setupScenario from './utils/scenario';
 
-let project: Project;
-let study: Study;
-let scenario: Scenario;
+test.describe('Validate the Scenario creation workflow', () => {
+  let project: Project;
+  let study: Study;
+  let scenario: Scenario;
 
-test.beforeEach(async () => {
-  ({ project, study, scenario } = await setupScenario());
-});
+  test.beforeEach('Set up the scenario before each test', async () => {
+    ({ project, study, scenario } = await setupScenario());
+  });
 
-test.describe('Test if scenario creation workflow is working properly', () => {
+  /** *************** Test 1 **************** */
   test('Create a new scenario', async ({ page }) => {
-    const homePage = new HomePage(page);
     const scenarioPage = new ScenarioPage(page);
-    const commonPage = new CommonPage(page);
 
+    // Navigate to the study page for the selected project
     await page.goto(`/operational-studies/projects/${project.id}/studies/${study.id}`);
 
-    expect(scenarioPage.getAddScenarioBtn).toBeVisible();
-    await scenarioPage.openScenarioCreationModal();
-
-    const scenarioName = `${scenarioData.name} ${uuidv4()}`;
-    await scenarioPage.setScenarioName(scenarioName);
-
-    await scenarioPage.setScenarioDescription(scenarioData.description);
-
-    // Infra created by CI has no electrical profile
-    if (!process.env.CI) {
-      await scenarioPage.setScenarioElectricProfileByName('small_infra');
-    }
-
-    await commonPage.setTag(scenarioData.tags[0]);
-    await commonPage.setTag(scenarioData.tags[1]);
-    await commonPage.setTag(scenarioData.tags[2]);
-
-    await scenarioPage.setScenarioInfraByName('small_infra_test_e2e');
-    const createButton = homePage.page.getByTestId('createScenario');
-    await createButton.click();
-    await homePage.page.waitForURL('**/scenarios/*');
-    expect(await scenarioPage.getScenarioName.textContent()).toContain(scenarioName);
-    expect(await scenarioPage.getScenarioDescription.textContent()).toContain(
-      scenarioData.description
-    );
-    expect(await scenarioPage.getScenarioInfraName.textContent()).toContain('small_infra_test_e2e');
+    const scenarioName = `${scenarioData.name} ${uuidv4()}`; // Generate a unique scenario name
+
+    // Create a new scenario using the scenario page model
+    await scenarioPage.createOrUpdateScenario({
+      name: scenarioName,
+      description: scenarioData.description,
+      infraName: 'small_infra_test_e2e',
+      tags: scenarioData.tags,
+      electricProfileName: 'small_infra',
+    });
+
+    // Validate that the scenario was created with the correct data
+    await scenarioPage.validateScenarioData({
+      name: scenarioName,
+      description: scenarioData.description,
+      infraName: 'small_infra_test_e2e',
+    });
   });
 
-  test('Update a scenario', async ({ page }) => {
+  /** *************** Test 2 **************** */
+  test('Update an existing scenario', async ({ page }) => {
     const scenarioPage = new ScenarioPage(page);
-    const commonPage = new CommonPage(page);
 
+    // Navigate to the specific scenario page
     await page.goto(
       `/operational-studies/projects/${project.id}/studies/${study.id}/scenarios/${scenario.id}`
     );
 
-    await scenarioPage.openScenarioModalUpdate();
-
     const scenarioName = `${scenarioData.name} ${uuidv4()}`;
-    await scenarioPage.setScenarioName(scenarioName);
 
-    await scenarioPage.setScenarioDescription(`${scenario.description} (updated)`);
-
-    await commonPage.setTag('update-tag');
-
-    await scenarioPage.clickScenarioUpdateConfirmBtn();
+    // Update the scenario with new details
+    await scenarioPage.createOrUpdateScenario({
+      name: scenarioName,
+      description: `${scenario.description} (updated)`,
+      tags: ['update-tag'],
+      isUpdate: true, // Indicate this is an update
+    });
 
+    // Navigate back to the study page to verify the updated tags
     await page.goto(`/operational-studies/projects/${project.id}/studies/${study.id}`);
 
+    // Assert that the updated tags include the new 'update-tag'
     expect(await scenarioPage.getScenarioTags(scenarioName).textContent()).toContain(
       `${scenarioData.tags.join('')}update-tag`
     );
 
+    // Reopen the updated scenario and validate the updated data
     await scenarioPage.openScenarioByTestId(scenarioName);
-
-    expect(await scenarioPage.getScenarioName.textContent()).toContain(scenarioName);
-    expect(await scenarioPage.getScenarioDescription.textContent()).toContain(
-      `${scenario.description} (updated)`
-    );
+    await scenarioPage.validateScenarioData({
+      name: scenarioName,
+      description: `${scenario.description} (updated)`,
+      infraName: 'small_infra_test_e2e',
+    });
   });
 
+  /** *************** Test 3 **************** */
   test('Delete a scenario', async ({ page }) => {
     const scenarioPage = new ScenarioPage(page);
-
     await page.goto(
       `/operational-studies/projects/${project.id}/studies/${study.id}/scenarios/${scenario.id}`
     );
 
-    await scenarioPage.openScenarioModalUpdate();
-
-    await scenarioPage.clickScenarioDeleteConfirmBtn();
+    // Initiate the deletion of the scenario
+    await scenarioPage.clickOnUpdateScenario();
+    await scenarioPage.deleteScenario();
 
+    // Navigate back to the study page
     await page.goto(`/operational-studies/projects/${project.id}/studies/${study.id}`);
 
+    // Ensure that the scenario is no longer visible
     await expect(scenarioPage.getScenarioByName(scenario.name)).not.toBeVisible();
   });
 });
diff --git a/front/tests/005-operational-studies.spec.ts b/front/tests/005-operational-studies.spec.ts
index af20c0ea207..dddb0e188b0 100644
--- a/front/tests/005-operational-studies.spec.ts
+++ b/front/tests/005-operational-studies.spec.ts
@@ -3,82 +3,94 @@ import { expect, test } from '@playwright/test';
 import type { Project, RollingStock, Scenario, Study } from 'common/api/osrdEditoastApi';
 
 import HomePage from './pages/home-page-model';
+import RoutePage from './pages/op-route-page-model';
+import OperationalStudiesPage from './pages/operational-studies-page-model';
 import RollingStockSelectorPage from './pages/rollingstock-selector-page';
-import ScenarioPage from './pages/scenario-page-model';
 import { getRollingStock } from './utils/api-setup';
 import setupScenario from './utils/scenario';
 
-let project: Project;
-let study: Study;
-let scenario: Scenario;
-let rollingStock: RollingStock;
+test.describe('Verify simulation configuration in operational studies', () => {
+  let project: Project;
+  let study: Study;
+  let scenario: Scenario;
+  let rollingStock: RollingStock;
 
-test.beforeAll(async () => {
-  rollingStock = await getRollingStock('electric_rolling_stock_test_e2e');
-});
+  test.beforeAll('Fetch rolling stock ', async () => {
+    rollingStock = await getRollingStock('electric_rolling_stock_test_e2e');
+  });
 
-test.beforeEach(async () => {
-  ({ project, study, scenario } = await setupScenario());
-});
+  test.beforeEach('Set up the project, study, and scenario', async () => {
+    ({ project, study, scenario } = await setupScenario());
+  });
 
-test.describe('Testing if all mandatory elements simulation configuration are loaded in operational studies app', () => {
-  test('Testing pathfinding with rollingstock and composition code', async ({ page }) => {
-    // Add enough timeout to wait for the infra to be loaded
-    test.slow();
-    const homePage = new HomePage(page);
-    const scenarioPage = new ScenarioPage(page);
+  /** *************** Test **************** */
+  test('Pathfinding with rolling stock and composition code', async ({ page }) => {
+    // Page models
+    const [homePage, operationalStudiesPage, routePage] = [
+      new HomePage(page),
+      new OperationalStudiesPage(page),
+      new RoutePage(page),
+    ];
+
+    // Navigate to the scenario page for the given project and study
     await page.goto(
       `/operational-studies/projects/${project.id}/studies/${study.id}/scenarios/${scenario.id}`
     );
 
-    await scenarioPage.checkInfraLoaded();
+    // Ensure infrastructure is loaded
+    await operationalStudiesPage.checkInfraLoaded();
+
+    // Click the button to add a train schedule
     await homePage.page.getByTestId('scenarios-add-train-schedule-button').click();
 
-    await scenarioPage.setTrainScheduleName('TrainSchedule');
-    const trainCount = '7';
-    await scenarioPage.setNumberOfTrains(trainCount);
+    // Set the train schedule name and number of trains
+    await operationalStudiesPage.setTrainScheduleName('TrainSchedule');
+    await operationalStudiesPage.setNumberOfTrains('7');
 
-    // TODO: move this test in his own file
-    // ***************** Test Rolling Stock *****************
-    const rollingstockModalPage = new RollingStockSelectorPage(homePage.page);
-    await expect(scenarioPage.getRollingStockSelector).toBeVisible();
-    await rollingstockModalPage.openRollingstockModal();
-    const rollingstockModal = rollingstockModalPage.rollingStockSelectorModal;
-    await expect(rollingstockModal).toBeVisible();
+    // Open the rolling stock modal
+    const rollingstockPage = new RollingStockSelectorPage(homePage.page);
+    await rollingstockPage.openRollingstockModal();
+    await expect(rollingstockPage.rollingStockSelectorModal).toBeVisible();
 
-    // Voluntarily add spaces and capital letters so we also test the normalization of the search functionality
-    await rollingstockModalPage.searchRollingstock(' electric_rolling_stock_test_e2e ');
+    // Test rolling stock search with normalization (spaces and capital letters)
+    await rollingstockPage.searchRollingstock(' electric_rolling_stock_test_E2E ');
 
-    const rollingstockCard = rollingstockModalPage.getRollingstockCardByTestID(
+    // Select the rolling stock card based on the test ID
+    const rollingstockCard = rollingstockPage.getRollingstockCardByTestID(
       `rollingstock-${rollingStock.name}`
     );
+
+    // Verify the rolling stock card is inactive initially
     await expect(rollingstockCard).toHaveClass(/inactive/);
+
+    // Select the rolling stock and ensure it becomes active
     await rollingstockCard.click();
     await expect(rollingstockCard).not.toHaveClass(/inactive/);
 
+    // Confirm rolling stock selection by clicking the button on the card
     await rollingstockCard.locator('button').click();
 
-    expect(await rollingstockModalPage.getRollingStockMiniCardInfo().first().textContent()).toMatch(
+    // Validate that the rolling stock's name and comfort class are displayed correctly
+    expect(await rollingstockPage.getRollingStockMiniCardInfo().first().textContent()).toMatch(
       rollingStock.name
     );
-    expect(await rollingstockModalPage.getRollingStockInfoComfort().textContent()).toMatch(
+    expect(await rollingstockPage.getRollingStockInfoComfort().textContent()).toMatch(
       /ConfortSStandard/i
     );
 
-    // ***************** Test choice Origin/Destination *****************
-    await scenarioPage.openTabByDataId('tab-pathfinding');
-    const itinerary = scenarioPage.getItineraryModule;
-    await expect(itinerary).toBeVisible();
+    // Perform Pathfinding and verify the distance
+    await operationalStudiesPage.clickOnRouteTab();
+    await routePage.performPathfindingByTrigram('MWS', 'NES');
+    await operationalStudiesPage.checkPathfindingDistance('34.000 km');
 
-    await scenarioPage.getPathfindingByTriGramSearch('MWS', 'NES');
+    // Adding Train Schedule
+    await operationalStudiesPage.addTrainSchedule();
 
-    await scenarioPage.checkPathfindingDistance('33.950 km');
+    // Verify the train has been added and the simulation results
+    await operationalStudiesPage.checkTrainHasBeenAdded();
+    await operationalStudiesPage.returnSimulationResult();
 
-    // ***************** Test Add Train Schedule *****************
-    await scenarioPage.addTrainSchedule();
-    await scenarioPage.page.waitForSelector('.dots-loader', { state: 'hidden' });
-    await scenarioPage.checkTrainHasBeenAdded();
-    await scenarioPage.returnSimulationResult();
-    await scenarioPage.checkNumberOfTrains(Number(trainCount));
+    // Confirm the number of trains added matches the expected number
+    await operationalStudiesPage.checkNumberOfTrains(7);
   });
 });
diff --git a/front/tests/006-stdcm-page.spec.ts b/front/tests/006-stdcm-page.spec.ts
deleted file mode 100644
index c82bf1085ac..00000000000
--- a/front/tests/006-stdcm-page.spec.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import { test, expect } from '@playwright/test';
-
-import project from './assets/operationStudies/project.json';
-import scenario from './assets/operationStudies/scenario.json';
-import study from './assets/operationStudies/study.json';
-import HomePage from './pages/home-page-model';
-import StdcmPage from './pages/stdcm-page-model';
-import manageTrainScheduleTranslation from '../public/locales/fr/operationalStudies/manageTrainSchedule.json';
-
-const projectName = project.name;
-const studyName = study.name;
-const scenarioName = scenario.name;
-const rollingStockName = 'electric_rolling_stock_test_e2e';
-
-const emptyRouteTranslation = manageTrainScheduleTranslation.pathfindingNoState;
-
-test.describe('STDCM page', () => {
-  // TODO: Refactor this test for the new stdcm page
-  test.skip('should configure and launch a stdcm', async ({ page }) => {
-    const stdcmPage = new StdcmPage(page);
-
-    // TODO: DROP STDCMV1: remove this part
-    const homePage = new HomePage(page);
-    await homePage.goToHomePage();
-    await homePage.toggleStdcmV1();
-
-    await stdcmPage.navigateToPage();
-    await expect(stdcmPage.scenarioExplorerModal).not.toBeVisible();
-    await expect(stdcmPage.rollingStockSelectorModal).not.toBeVisible();
-
-    // Open the scenario explorer and select project, study and scenario
-    await stdcmPage.openScenarioExplorer();
-    await stdcmPage.selectMiniCard(projectName);
-    await stdcmPage.selectMiniCard(studyName);
-    await stdcmPage.selectMiniCard(scenarioName);
-
-    // Check no route is selected
-    await expect(stdcmPage.pathfindingNoState).toContainText(emptyRouteTranslation);
-
-    // Select a rolling stock
-    await stdcmPage.openRollingstockModal();
-    await expect(stdcmPage.rollingStockSelectorModal).toBeVisible();
-    await stdcmPage.selectRollingStock(rollingStockName);
-
-    // Check that the rollingstock is selected
-    await expect(stdcmPage.rollingStockSelectorModal).not.toBeVisible();
-
-    await stdcmPage.selectPathByTrigram('MWS', 'NES');
-    await stdcmPage.checkPathfindingDistance('34.000 km');
-
-    await stdcmPage.setOriginTime('081500');
-    await stdcmPage.clickBtnByName('Appliquer');
-    await stdcmPage.page.waitForSelector('.chart-container');
-  });
-});
diff --git a/front/tests/007-op-rollingstock-tab.spec.ts b/front/tests/007-op-rollingstock-tab.spec.ts
index 2d026bf2187..33fc95fda97 100644
--- a/front/tests/007-op-rollingstock-tab.spec.ts
+++ b/front/tests/007-op-rollingstock-tab.spec.ts
@@ -4,108 +4,99 @@ import type { Project, RollingStock, Scenario, Study } from 'common/api/osrdEdit
 
 import OperationalStudiesPage from './pages/operational-studies-page-model';
 import RollingStockSelectorPage from './pages/rollingstock-selector-page';
-import ScenarioPage from './pages/scenario-page-model';
 import { getRollingStock } from './utils/api-setup';
 import setupScenario from './utils/scenario';
 
-let project: Project;
-let study: Study;
-let scenario: Scenario;
-let rollingStock: RollingStock;
+test.describe('Rolling stock Tab Verification', () => {
+  let project: Project;
+  let study: Study;
+  let scenario: Scenario;
+  let rollingStock: RollingStock;
 
-const dualModeRollingStockName = 'dual-mode_rolling_stock_test_e2e';
-const electricRollingStockName = 'electric_rolling_stock_test_e2e';
+  const dualModeRollingStockName = 'dual-mode_rolling_stock_test_e2e';
+  const electricRollingStockName = 'electric_rolling_stock_test_e2e';
 
-test.beforeAll(async () => {
-  rollingStock = await getRollingStock(electricRollingStockName);
-
-  // Create a new scenario
-  ({ project, study, scenario } = await setupScenario());
-});
-
-test.beforeEach(async ({ page }) => {
-  const scenarioPage = new ScenarioPage(page);
+  test.beforeAll('Set up a scenario before all tests', async () => {
+    rollingStock = await getRollingStock(electricRollingStockName);
+    ({ project, study, scenario } = await setupScenario());
+  });
 
-  // Navigate to the created scenario page
-  await page.goto(
-    `/operational-studies/projects/${project.id}/studies/${study.id}/scenarios/${scenario.id}`
-  );
-  // Verify that the infrastructure is correctly loaded
-  await scenarioPage.checkInfraLoaded();
-});
+  test.beforeEach(' Navigate to the scenario page', async ({ page }) => {
+    const operationalStudiesPage = new OperationalStudiesPage(page);
+    await page.goto(
+      `/operational-studies/projects/${project.id}/studies/${study.id}/scenarios/${scenario.id}`
+    );
+    // Ensure infrastructure is loaded before each test
+    await operationalStudiesPage.checkInfraLoaded();
+  });
 
-test.describe('Verifying that all elements in the rolling stock tab are loaded correctly', () => {
-  test('should correctly select a rolling stock for operational study', async ({ page }) => {
+  /** *************** Test 1 **************** */
+  test('Select a rolling stock for operational study', async ({ page }) => {
     const operationalStudiesPage = new OperationalStudiesPage(page);
     const rollingStockSelector = new RollingStockSelectorPage(page);
 
-    // Click on add train button
-    await operationalStudiesPage.clickOnAddTrainBtn();
-
-    // Verify the presence of warnings in Rolling Stock and Route Tab
+    // Add a train and verify the presence of warnings
+    await operationalStudiesPage.clickOnAddTrainButton();
     await operationalStudiesPage.verifyTabWarningPresence();
 
-    // Open Rolling Stock Selector and search for the added train
-    await operationalStudiesPage.openEmptyRollingStockSelector();
+    // Open the Rolling Stock Selector and search for the dual-mode rolling stock
+    await rollingStockSelector.openEmptyRollingStockSelector();
     await rollingStockSelector.searchRollingstock(dualModeRollingStockName);
+
+    // Locate the rolling stock card and verify its inactive state
     const rollingstockCard = rollingStockSelector.getRollingstockCardByTestID(
       `rollingstock-${dualModeRollingStockName}`
     );
-
-    // Verify that the rolling stock card is inactive
     await expect(rollingstockCard).toHaveClass(/inactive/);
 
-    // Verify that the rolling stock card is active after clicking on it
+    // Click on the rolling stock card to activate it
     await rollingstockCard.click();
     await expect(rollingstockCard).not.toHaveClass(/inactive/);
 
-    // Select the comfort AIR_CONDITIONING
+    // Select the comfort option (AIR_CONDITIONING) and confirm the selection
     const comfortACRadioText = await rollingStockSelector.comfortACButton.innerText();
     await rollingStockSelector.comfortACButton.click();
-
-    // Select the rolling stock
     await rollingstockCard.locator('button').click();
 
-    // Verify that the correct comfort type is displayed
-    const selectedComfortACText = await rollingStockSelector.getSelectedComfortType.innerText();
+    // Verify that the correct comfort type is displayed after selection
+    const selectedComfortACText = await rollingStockSelector.selectedComfortType.innerText();
     expect(selectedComfortACText).toMatch(new RegExp(comfortACRadioText, 'i'));
   });
 
-  test('should correctly modify a rolling stock for operational study', async ({ page }) => {
+  /** *************** Test 2 **************** */
+  test('Modify a rolling stock for operational study', async ({ page }) => {
     const operationalStudiesPage = new OperationalStudiesPage(page);
     const rollingStockSelector = new RollingStockSelectorPage(page);
 
-    // Click on add train button
-    await operationalStudiesPage.clickOnAddTrainBtn();
-
-    // Open Rolling Stock Selector, search for the added train, and select it
-    await operationalStudiesPage.openEmptyRollingStockSelector();
+    // Add a train and select the electric rolling stock
+    await operationalStudiesPage.clickOnAddTrainButton();
+    await rollingStockSelector.openEmptyRollingStockSelector();
     await rollingStockSelector.searchRollingstock(electricRollingStockName);
     const fastRollingstockCard = rollingStockSelector.getRollingstockCardByTestID(
       `rollingstock-${rollingStock.name}`
     );
+
+    // Select the rolling stock and confirm the selection
     await fastRollingstockCard.click();
     await fastRollingstockCard.locator('button').click();
-    expect(await rollingStockSelector.getSelectedRollingStockName.innerText()).toEqual(
+    expect(await rollingStockSelector.selectedRollingStockName.innerText()).toEqual(
       electricRollingStockName
     );
 
-    // Reopen the Rolling Stock selector from the selected card
-    await operationalStudiesPage.openRollingStockSelector();
-
-    // Apply thermal and electrical filters
-    await rollingStockSelector.thermalRollingStockFilter();
-    await rollingStockSelector.electricRollingStockFilter();
+    // Reopen the rolling stock selector and apply filters
+    await rollingStockSelector.openRollingstockModal();
+    await rollingStockSelector.getThermalRollingStockFilter();
+    await rollingStockSelector.getElectricRollingStockFilter();
 
-    // Select the dual mode rolling stock
+    // Select the dual-mode rolling stock and confirm the selection
     const dualModeRollingstockCard = rollingStockSelector.getRollingstockCardByTestID(
       `rollingstock-${dualModeRollingStockName}`
     );
     await dualModeRollingstockCard.click();
     await dualModeRollingstockCard.locator('button').click();
 
-    // Verify that the correct rolling stock name is displayed
-    expect(await rollingStockSelector.getSelectedRollingStockName.innerText()).toEqual(
+    // Verify that the correct dual-mode rolling stock is displayed
+    expect(await rollingStockSelector.selectedRollingStockName.innerText()).toEqual(
       dualModeRollingStockName
     );
   });
diff --git a/front/tests/008-train-schedule.spec.ts b/front/tests/008-train-schedule.spec.ts
index 358c5872d1a..968860b9fe4 100644
--- a/front/tests/008-train-schedule.spec.ts
+++ b/front/tests/008-train-schedule.spec.ts
@@ -1,89 +1,77 @@
-import { test } from '@playwright/test';
-
 import type { Scenario, Study, Project } from 'common/api/osrdEditoastApi';
 
-import HomePage from './pages/home-page-model';
 import OperationalStudiesTimetablePage from './pages/op-timetable-page-model';
-import ScenarioPage from './pages/scenario-page-model';
+import OperationalStudiesPage from './pages/operational-studies-page-model';
+import { test } from './playwright-fixture';
 import { readJsonFile } from './utils';
 import setupScenario from './utils/scenario';
 import { postSimulation, sendTrainSchedules } from './utils/trainSchedule';
 
-let selectedLanguage: string;
-let project: Project;
-let study: Study;
-let scenario: Scenario;
+test.describe('Verify train schedule elements and filters', () => {
+  let project: Project;
+  let study: Study;
+  let scenario: Scenario;
 
-const trainSchedulesJson = readJsonFile('./tests/assets/trainSchedule/train_schedules.json');
+  const trainSchedulesJson = readJsonFile('./tests/assets/trainSchedule/train_schedules.json');
 
-test.beforeAll(async () => {
-  ({ project, study, scenario } = await setupScenario());
+  test.beforeAll('Set up the scenario and post train schedules before all tests', async () => {
+    ({ project, study, scenario } = await setupScenario());
 
-  // Post train schedule import and simulation
-  const response = await sendTrainSchedules(scenario.timetable_id, trainSchedulesJson);
-  await postSimulation(response, scenario.infra_id);
-});
+    // Post train schedule and initiate simulation
+    const response = await sendTrainSchedules(scenario.timetable_id, trainSchedulesJson);
+    await postSimulation(response, scenario.infra_id);
+  });
 
-test.beforeEach(async ({ page }) => {
-  const homePage = new HomePage(page);
-  await homePage.goToHomePage();
-  selectedLanguage = await homePage.getOSRDLanguage();
+  test.beforeEach('Navigate to scenario page before each test', async ({ page }) => {
+    const operationalStudiesPage = new OperationalStudiesPage(page);
+    await page.goto(
+      `/operational-studies/projects/${project.id}/studies/${study.id}/scenarios/${scenario.id}`
+    );
+    // Ensure infrastructure is loaded
+    await operationalStudiesPage.checkInfraLoaded();
+  });
 
-  // Navigate to the created scenario page
-  await page.goto(
-    `/operational-studies/projects/${project.id}/studies/${study.id}/scenarios/${scenario.id}`
-  );
-});
+  /** *************** Test 1 **************** */
+  test('Loading trains and verifying simulation result', async ({ page, OSRDLanguage }) => {
+    test.slow();
 
-test.describe('Verifying that all elements in the train schedule are loaded correctly', () => {
-  test('should accurately load the trains with their corresponding simulation results', async ({
-    page,
-  }) => {
-    test.setTimeout(120000);
-    const scenarioPage = new ScenarioPage(page);
     const opTimetablePage = new OperationalStudiesTimetablePage(page);
 
-    // Check if the infrastructure is loaded
-    await scenarioPage.checkInfraLoaded();
-
-    // Verify the train count and various elements on the timetable page
+    // Verify train count, invalid train messages, and train simulation results
     await opTimetablePage.verifyTrainCount(20);
-    await opTimetablePage.verifyInvalidTrainsMessageVisibility(selectedLanguage);
+    await opTimetablePage.verifyInvalidTrainsMessageVisibility(OSRDLanguage);
     await opTimetablePage.checkSelectedTimetableTrain();
-    await opTimetablePage.filterValidityAndVerifyTrainCount(selectedLanguage, 'Valid', 16);
+    await opTimetablePage.filterValidityAndVerifyTrainCount(OSRDLanguage, 'Valid', 16);
     await opTimetablePage.verifyEachTrainSimulation();
   });
 
-  test('should accurately filter the imported trains', async ({ page }) => {
-    test.setTimeout(120000);
-    const scenarioPage = new ScenarioPage(page);
+  /** *************** Test 2 **************** */
+  test('Filtering imported trains', async ({ page, OSRDLanguage }) => {
+    test.slow();
     const opTimetablePage = new OperationalStudiesTimetablePage(page);
 
-    // Check if the infrastructure is loaded
-    await scenarioPage.checkInfraLoaded();
-
-    // Verify the train count and apply various filters
-    await opTimetablePage.verifyTrainCount(20);
-    await opTimetablePage.filterValidityAndVerifyTrainCount(selectedLanguage, 'Invalid', 4);
-    await opTimetablePage.filterValidityAndVerifyTrainCount(selectedLanguage, 'All', 20);
-    await opTimetablePage.filterHonoredAndVerifyTrainCount(selectedLanguage, 'Honored', 12);
-    await opTimetablePage.filterValidityAndVerifyTrainCount(selectedLanguage, 'Valid', 12);
-    await opTimetablePage.filterHonoredAndVerifyTrainCount(selectedLanguage, 'Not honored', 4);
-    await opTimetablePage.filterValidityAndVerifyTrainCount(selectedLanguage, 'Invalid', 0);
-    await opTimetablePage.filterHonoredAndVerifyTrainCount(selectedLanguage, 'All', 4);
-    await opTimetablePage.filterValidityAndVerifyTrainCount(selectedLanguage, 'All', 20);
-
-    // Define the composition filters and verify each filter
+    // Verify train count and apply different filters for validity and honored status
+    await opTimetablePage.verifyTrainCount(20); // Verify total number of trains: 20
+    await opTimetablePage.filterValidityAndVerifyTrainCount(OSRDLanguage, 'Invalid', 4); // Verify 4 invalid trains
+    await opTimetablePage.filterValidityAndVerifyTrainCount(OSRDLanguage, 'All', 20); // Verify all 20 trains
+    await opTimetablePage.filterHonoredAndVerifyTrainCount(OSRDLanguage, 'Honored', 12); // Verify 12 honored trains
+    await opTimetablePage.filterValidityAndVerifyTrainCount(OSRDLanguage, 'Valid', 12); // Verify 12 valid (honored) trains
+    await opTimetablePage.filterHonoredAndVerifyTrainCount(OSRDLanguage, 'Not honored', 4); // Verify 4 valid but not honored trains
+    await opTimetablePage.filterValidityAndVerifyTrainCount(OSRDLanguage, 'Invalid', 0); /// Verify 0 invalid and honored trains
+    await opTimetablePage.filterHonoredAndVerifyTrainCount(OSRDLanguage, 'All', 4); // Verify 4 invalid trains in the honored filter
+    await opTimetablePage.filterValidityAndVerifyTrainCount(OSRDLanguage, 'All', 20); // Verify all 20 trains
+
+    // Verify train composition filters with predefined filter codes and expected counts
     const compositionFilters = [
       { code: 'MA100', count: 7 },
       { code: 'HLP', count: 3 },
       { code: 'E32C', count: 1 },
-      { code: null, count: 9 },
+      { code: null, count: 9 }, // Null means no specific code applied
     ];
 
     for (const filter of compositionFilters) {
       await opTimetablePage.clickCodeCompoTrainFilterButton(
-        selectedLanguage,
+        OSRDLanguage,
         filter.code,
         filter.count
       );
diff --git a/front/tests/009-rollingstock-editor.spec.ts b/front/tests/009-rollingstock-editor.spec.ts
index c6bcd91c83a..c8af2b57dd3 100644
--- a/front/tests/009-rollingstock-editor.spec.ts
+++ b/front/tests/009-rollingstock-editor.spec.ts
@@ -1,5 +1,3 @@
-import path from 'path';
-
 import { test, expect } from '@playwright/test';
 
 import RollingstockEditorPage from './pages/rollingstock-editor-page-model';
@@ -12,36 +10,36 @@ import {
 } from './utils/index';
 import { findAndDeleteRollingStocksByName } from './utils/rollingStock';
 
-// Correct path to load rolling stock details from JSON
-const rollingstockDetailsPath = path.resolve(
-  __dirname,
-  '../tests/assets/rollingStock/rollingstockDetails.json'
-);
-
-const rollingstockDetails = readJsonFile(rollingstockDetailsPath);
-const dualModeRollingStockName = 'dual-mode_rolling_stock_test_e2e';
-const electricRollingStockName = 'electric_rolling_stock_test_e2e';
-
-test.describe('Rollingstock editor page', () => {
+test.describe('Rollingstock editor page tests', () => {
   let uniqueRollingStockName: string;
   let uniqueUpdatedRollingStockName: string;
   let uniqueDeletedRollingStockName: string;
 
-  test.beforeEach(async () => {
-    uniqueRollingStockName = await generateUniqueName('RSN');
-    uniqueUpdatedRollingStockName = await generateUniqueName('U_RSN');
-    uniqueDeletedRollingStockName = await generateUniqueName('D_RSN');
+  const rollingstockDetails = readJsonFile('./tests/assets/rollingStock/rollingstockDetails.json');
 
-    // Check and delete the specified rolling stocks if they exist
-    await findAndDeleteRollingStocksByName([
-      uniqueRollingStockName,
-      uniqueUpdatedRollingStockName,
-      uniqueDeletedRollingStockName,
-    ]);
-  });
+  const dualModeRollingStockName = 'dual-mode_rolling_stock_test_e2e';
+  const electricRollingStockName = 'electric_rolling_stock_test_e2e';
+
+  test.beforeEach(
+    'Generate unique names and ensure any existing RS are deleted',
+    async ({ page }) => {
+      const rollingStockEditorPage = new RollingstockEditorPage(page);
+      uniqueRollingStockName = await generateUniqueName('RSN');
+      uniqueUpdatedRollingStockName = await generateUniqueName('U_RSN');
+      uniqueDeletedRollingStockName = await generateUniqueName('D_RSN');
+
+      await findAndDeleteRollingStocksByName([
+        uniqueRollingStockName,
+        uniqueUpdatedRollingStockName,
+        uniqueDeletedRollingStockName,
+      ]);
 
-  test.afterEach(async () => {
-    // Clean up by deleting the created or updated rolling stock
+      // Navigate to the rolling stock editor page
+      await rollingStockEditorPage.navigateToPage();
+    }
+  );
+
+  test.afterEach('Deleting the created or updated rolling stock', async () => {
     await findAndDeleteRollingStocksByName([
       uniqueRollingStockName,
       uniqueUpdatedRollingStockName,
@@ -49,36 +47,32 @@ test.describe('Rollingstock editor page', () => {
     ]);
   });
 
-  test('should correctly create a new rolling stock', async ({ page, browserName }) => {
-    test.slow(browserName === 'webkit', 'This test is slow on safari');
+  /** *************** Test 1 **************** */
+  test('Create a new rolling stock', async ({ page, browserName }) => {
+    test.slow(browserName === 'webkit', 'This test is slow on Safari');
     const rollingStockEditorPage = new RollingstockEditorPage(page);
-    // Navigate to the page
-    await rollingStockEditorPage.navigateToPage();
 
-    // Create a new rolling stock
+    // Start the rolling stock creation process
     await rollingStockEditorPage.clickOnNewRollingstockButton();
 
-    // Fill in the rolling stock details with unique name
+    // Fill in the rolling stock details with a unique name
     for (const input of rollingstockDetails.inputs) {
       const value = input.id === 'name' ? uniqueRollingStockName : input.value;
       await fillAndCheckInputById(page, input.id, value, input.isNumeric);
     }
-    // Select loading gauge
-    await rollingStockEditorPage.selectLoadingGauge('GA');
+    await rollingStockEditorPage.selectLoadingGauge('GA'); // Select loading gauge
 
-    // Submit and handle incomplete form warning
+    // Submit and handle potential warnings
     await rollingStockEditorPage.clickOnSubmitRollingstockButton();
-    await expect(rollingStockEditorPage.getToastSNCF).toBeVisible();
+    await expect(rollingStockEditorPage.toastSNCF).toBeVisible();
 
-    // Fill speed effort curves Not Specified
+    // Fill in speed effort curves for Not Specified and C1 categories
     await rollingStockEditorPage.fillSpeedEffortCurves(
       rollingstockDetails.speedEffortData,
       false,
       '',
       '1500V'
     );
-
-    // Fill speed effort curves C1
     await rollingStockEditorPage.fillSpeedEffortCurves(
       rollingstockDetails.speedEffortDataC1,
       true,
@@ -89,26 +83,22 @@ test.describe('Rollingstock editor page', () => {
     // Fill additional rolling stock details
     await rollingStockEditorPage.fillAdditionalDetails(rollingstockDetails.additionalDetails);
 
-    // Submit and confirm rolling stock
+    // Submit and confirm rolling stock creation
     await rollingStockEditorPage.submitRollingStock();
-
-    // Confirm the creation of the rolling stock
     expect(
       rollingStockEditorPage.page.getByTestId(`rollingstock-${uniqueRollingStockName}`)
     ).toBeDefined();
 
-    // Get to details page of the new rolling stock
+    // Verify rolling stock details
     await rollingStockEditorPage.searchRollingStock(uniqueRollingStockName);
     await rollingStockEditorPage.editRollingStock(uniqueRollingStockName);
-
-    // Verify the rolling stock details
     for (const input of rollingstockDetails.inputs) {
       const value = input.id === 'name' ? uniqueRollingStockName : input.value;
       await verifyAndCheckInputById(page, input.id, value, input.isNumeric);
     }
-    await rollingStockEditorPage.clickOnSpeedEffortCurvesButton();
 
     // Verify speed effort curves
+    await rollingStockEditorPage.clickOnSpeedEffortCurvesButton();
     await rollingStockEditorPage.verifySpeedEffortCurves(
       rollingstockDetails.speedEffortData,
       false,
@@ -121,24 +111,22 @@ test.describe('Rollingstock editor page', () => {
     );
   });
 
-  test('should correctly duplicate and modify a rolling stock', async ({ page, browserName }) => {
-    test.slow(browserName === 'webkit', 'This test is slow on safari');
+  /** *************** Test 2 **************** */
+  test('Duplicate and modify a rolling stock', async ({ page, browserName }) => {
+    test.slow(browserName === 'webkit', 'This test is slow on Safari');
     const rollingStockEditorPage = new RollingstockEditorPage(page);
 
-    await rollingStockEditorPage.navigateToPage();
-
-    // Select the rolling stock from global-setup
+    // Select the existing electric rolling stock and duplicate it
     await rollingStockEditorPage.selectRollingStock(electricRollingStockName);
-
-    // Duplicate rolling stock
     await rollingStockEditorPage.duplicateRollingStock();
 
-    // Update the rolling stock details and curves with unique name
+    // Update rolling stock details with a unique name
     for (const input of rollingstockDetails.updatedInputs) {
       const value = input.id === 'name' ? uniqueUpdatedRollingStockName : input.value;
       await fillAndCheckInputById(page, input.id, value, input.isNumeric);
     }
 
+    // Modify and verify speed effort curves
     await rollingStockEditorPage.clickOnSpeedEffortCurvesButton();
     await rollingStockEditorPage.deleteElectricalProfile('25000V');
     await rollingStockEditorPage.fillSpeedEffortData(
@@ -148,51 +136,24 @@ test.describe('Rollingstock editor page', () => {
       true
     );
 
-    // Confirm the modification of RS
+    // Submit and verify modification
     await rollingStockEditorPage.submitRollingStock();
-
-    // Confirm the presence of the original RS
-    await rollingStockEditorPage.searchRollingStock(electricRollingStockName);
-    expect(rollingStockEditorPage.page.getByTestId(electricRollingStockName)).toBeDefined();
-    await rollingStockEditorPage.clearSearchRollingStock();
-
-    // Get to details page of the new rolling stock
     await rollingStockEditorPage.searchRollingStock(uniqueUpdatedRollingStockName);
     await rollingStockEditorPage.editRollingStock(uniqueUpdatedRollingStockName);
-
-    // Verify the rolling stock details
-    for (const input of rollingstockDetails.updatedInputs) {
-      const value = input.id === 'name' ? uniqueUpdatedRollingStockName : input.value;
-      await verifyAndCheckInputById(page, input.id, value, input.isNumeric);
-    }
-    await rollingStockEditorPage.clickOnSpeedEffortCurvesButton();
-
-    // Verify speed effort curves
-    await rollingStockEditorPage.verifySpeedEffortCurves(
-      rollingstockDetails.speedEffortDataUpdated,
-      true,
-      'C1'
-    );
   });
-  test('should correctly duplicate and delete a rolling stock', async ({ page }) => {
+
+  /** *************** Test 3 **************** */
+  test('Duplicate and delete a rolling stock', async ({ page }) => {
     const rollingStockEditorPage = new RollingstockEditorPage(page);
     const rollingStockSelectorPage = new RollingStockSelectorPage(page);
-    await rollingStockEditorPage.navigateToPage();
-
-    // Select the rolling stock from global-setup
+    // Duplicate and change the name of the rolling stock
     await rollingStockEditorPage.selectRollingStock(electricRollingStockName);
-
-    // Duplicate and change the rolling stock name
     await rollingStockEditorPage.duplicateRollingStock();
     await fillAndCheckInputById(page, 'name', uniqueDeletedRollingStockName);
-
-    // Confirm the modification of RS name
     await rollingStockEditorPage.submitRollingStock();
 
     // Delete the duplicated rolling stock
     await rollingStockEditorPage.deleteRollingStock(uniqueDeletedRollingStockName);
-
-    // Confirm the RS is deleted
     await expect(
       rollingStockEditorPage.page.getByTestId(uniqueDeletedRollingStockName)
     ).toBeHidden();
@@ -201,89 +162,71 @@ test.describe('Rollingstock editor page', () => {
     await rollingStockEditorPage.searchRollingStock(uniqueDeletedRollingStockName);
 
     // Verify that the count of rolling stock is 0 (No results Found)
-    await expect(rollingStockSelectorPage.getNoRollingStockResult).toBeVisible();
+    await expect(rollingStockSelectorPage.noRollingStockResult).toBeVisible();
     expect(await rollingStockSelectorPage.getRollingStockSearchNumber()).toEqual(0);
   });
-  test('should correctly filter a rolling stock', async ({ page }) => {
-    const rollingStockEditorPage = new RollingstockEditorPage(page);
+
+  /** *************** Test 4 **************** */
+  test('Filtering rolling stocks', async ({ page }) => {
     const rollingStockSelectorPage = new RollingStockSelectorPage(page);
-    // Navigate to rolling stock editor page
-    await rollingStockEditorPage.navigateToPage();
 
-    // Extract and check the initial count of rolling stock
+    // Get the initial rolling stock count
     const initialRollingStockFoundNumber =
       await rollingStockSelectorPage.getRollingStockSearchNumber();
 
-    // Perform a filtering action for electric rolling stock
-    await rollingStockSelectorPage.electricRollingStockFilter();
-
-    // Verify that filtering reduces the count and all the RS have electic icons
-    expect(await rollingStockSelectorPage.getElectricRollingStockIcons.count()).toEqual(
+    // Filter electric rolling stocks and verify count
+    await rollingStockSelectorPage.getElectricRollingStockFilter();
+    expect(await rollingStockSelectorPage.electricRollingStockIcons.count()).toEqual(
       await rollingStockSelectorPage.getRollingStockSearchNumber()
     );
 
-    // Clear electric filter
-    await rollingStockSelectorPage.electricRollingStockFilter();
-
-    // Perform a filtering action for thermal rolling stock
-    await rollingStockSelectorPage.thermalRollingStockFilter();
-
-    // Verify that filtering reduces the count and all the RS have thermal icons
-    expect(await rollingStockSelectorPage.getThermalRollingStockIcons.count()).toEqual(
+    // Filter thermal rolling stocks and verify count
+    await rollingStockSelectorPage.getThermalRollingStockFilter();
+    expect(await rollingStockSelectorPage.thermalRollingStockIcons.count()).toEqual(
       await rollingStockSelectorPage.getRollingStockSearchNumber()
     );
 
-    // Perform a filtering action for dual-mode rolling stock
-    await rollingStockSelectorPage.electricRollingStockFilter();
-
-    // Verify that filtering reduces the count and all the RS have thermal and electric icons
-    expect(await rollingStockSelectorPage.getDualModeRollingStockIcons.count()).toEqual(
+    // Filter both electric and thermal rolling stocks (dual-mode) and verify count
+    await rollingStockSelectorPage.getElectricRollingStockFilter();
+    expect(await rollingStockSelectorPage.dualModeRollingStockIcons.count()).toEqual(
       await rollingStockSelectorPage.getRollingStockSearchNumber()
     );
 
-    // Clear filters
-    await rollingStockSelectorPage.electricRollingStockFilter();
-    await rollingStockSelectorPage.thermalRollingStockFilter();
-
-    // Verify that the count of rolling stock is back to the initial number
-    expect(await rollingStockSelectorPage.getRollingStockList.count()).toEqual(
+    // Clear filters and verify the count returns to the initial number
+    await rollingStockSelectorPage.getElectricRollingStockFilter();
+    await rollingStockSelectorPage.getThermalRollingStockFilter();
+    expect(await rollingStockSelectorPage.rollingStockList.count()).toEqual(
       initialRollingStockFoundNumber
     );
   });
 
-  test('should correctly search for a rolling stock', async ({ page }) => {
+  /** *************** Test 5 **************** */
+  test('Search for a rolling stock', async ({ page }) => {
     const rollingStockEditorPage = new RollingstockEditorPage(page);
     const rollingStockSelectorPage = new RollingStockSelectorPage(page);
 
-    // Navigate to rolling stock editor page
-    await rollingStockEditorPage.navigateToPage();
-
-    // Extract and check the initial count of rolling stock
     const initialRollingStockFoundNumber =
       await rollingStockSelectorPage.getRollingStockSearchNumber();
 
-    // Search for the specific rolling stock
+    // Search for a specific rolling stock
     await rollingStockEditorPage.searchRollingStock(dualModeRollingStockName);
     expect(
       rollingStockEditorPage.page.getByTestId(`rollingstock-${dualModeRollingStockName}`)
     ).toBeDefined();
 
-    // Verify that the first rolling stock has the thermal and electric icon
-    await expect(rollingStockSelectorPage.getThermalRollingStockFirstIcon).toBeVisible();
-    await expect(rollingStockSelectorPage.getElectricRollingStockFirstIcon).toBeVisible();
+    // Verify the presence of thermal and electric icons
+    await expect(rollingStockSelectorPage.thermalRollingStockFirstIcon).toBeVisible();
+    await expect(rollingStockSelectorPage.electricRollingStockFirstIcon).toBeVisible();
 
-    // Clear the search
+    // Clear the search and verify the count returns to the initial number
     await rollingStockEditorPage.clearSearchRollingStock();
-
-    // Verify that the count of rolling stock is back to the initial number
-    expect(await rollingStockSelectorPage.getRollingStockList.count()).toEqual(
+    expect(await rollingStockSelectorPage.rollingStockList.count()).toEqual(
       initialRollingStockFoundNumber
     );
-    // Search for a non existing rolling stock
-    await rollingStockEditorPage.searchRollingStock(`${dualModeRollingStockName}-no-results`);
 
-    // Verify that the count of rolling stock is 0 (No results Found)
-    await expect(rollingStockSelectorPage.getNoRollingStockResult).toBeVisible();
+    // Search for a non-existent rolling stock and verify no results
+    await rollingStockEditorPage.searchRollingStock(`${dualModeRollingStockName}-no-results`);
+    await expect(rollingStockSelectorPage.noRollingStockResult).toBeVisible();
     expect(await rollingStockSelectorPage.getRollingStockSearchNumber()).toEqual(0);
   });
 });
diff --git a/front/tests/010-op-route-tab.spec.ts b/front/tests/010-op-route-tab.spec.ts
index 927068e9adf..5e9747c9f60 100644
--- a/front/tests/010-op-route-tab.spec.ts
+++ b/front/tests/010-op-route-tab.spec.ts
@@ -1,99 +1,80 @@
-import { test } from '@playwright/test';
-
 import type { Project, Scenario, Study } from 'common/api/osrdEditoastApi';
 
-import HomePage from './pages/home-page-model';
+import RoutePage from './pages/op-route-page-model';
 import OperationalStudiesPage from './pages/operational-studies-page-model';
-import ScenarioPage from './pages/scenario-page-model';
+import RollingStockSelectorPage from './pages/rollingstock-selector-page';
+import { test } from './playwright-fixture';
 import setupScenario from './utils/scenario';
 
-let project: Project;
-let study: Study;
-let scenario: Scenario;
-let selectedLanguage: string;
-
-const electricRollingStockName = 'electric_rolling_stock_test_e2e';
+test.describe('Route Tab Verification', () => {
+  let project: Project;
+  let study: Study;
+  let scenario: Scenario;
 
-test.beforeAll(async () => {
-  // Create a new scenario
-  ({ project, study, scenario } = await setupScenario());
-});
+  const electricRollingStockName = 'electric_rolling_stock_test_e2e';
 
-test.beforeEach(async ({ page }) => {
-  // Navigate to the home page and set up the required settings
-  const homePage = new HomePage(page);
-  await homePage.goToHomePage();
-  selectedLanguage = await homePage.getOSRDLanguage();
+  test.beforeAll('Set up the scenario', async () => {
+    ({ project, study, scenario } = await setupScenario());
+  });
 
-  // Navigate to the created scenario page
-  await page.goto(
-    `/operational-studies/projects/${project.id}/studies/${study.id}/scenarios/${scenario.id}`
-  );
-});
+  test.beforeEach(
+    'Navigate to the scenario page and select the rolling stock before each test',
+    async ({ page }) => {
+      const rollingstockSelectorPage = new RollingStockSelectorPage(page);
+      const operationalStudiesPage = new OperationalStudiesPage(page);
 
-test.describe('Verifying that all elements in the route tab are loaded correctly', () => {
-  test('should correctly select a route for operational study', async ({ page, browserName }) => {
-    const operationalStudiesPage = new OperationalStudiesPage(page);
-    const scenarioPage = new ScenarioPage(page);
+      await page.goto(
+        `/operational-studies/projects/${project.id}/studies/${study.id}/scenarios/${scenario.id}`
+      );
 
-    // Verify that the infrastructure is correctly loaded
-    await scenarioPage.checkInfraLoaded();
+      // Verify that the infrastructure is correctly loaded
+      await operationalStudiesPage.checkInfraLoaded();
 
-    // Click on add train button
-    await operationalStudiesPage.clickOnAddTrainBtn();
+      // Click on add train button and verify tab warnings
+      await operationalStudiesPage.clickOnAddTrainButton();
+      await operationalStudiesPage.verifyTabWarningPresence();
 
-    // Verify the presence of warnings in Rolling Stock and Route Tab
-    await operationalStudiesPage.verifyTabWarningPresence();
+      // Select electric rolling stock and navigate to the Route Tab
+      await rollingstockSelectorPage.selectRollingStock(electricRollingStockName);
+      await operationalStudiesPage.clickOnRouteTab();
+    }
+  );
 
-    // Select electric rolling stock
-    await operationalStudiesPage.selectRollingStock(electricRollingStockName);
+  /** *************** Test 1 **************** */
+  test('Select a route for operational study', async ({ page, browserName, OSRDLanguage }) => {
+    const operationalStudiesPage = new OperationalStudiesPage(page);
+    const routePage = new RoutePage(page);
 
-    // Perform pathfinding and verify no selected route
-    await scenarioPage.openTabByDataId('tab-pathfinding');
-    await operationalStudiesPage.verifyNoSelectedRoute(selectedLanguage);
-    await operationalStudiesPage.performPathfindingByTrigram('WS', 'NES', 'MES');
+    // Verify that no route is initially selected
+    await routePage.verifyNoSelectedRoute(OSRDLanguage);
 
-    /* Verify map markers in Chromium browser only:  
-    This check is not performed in Firefox because the map does not load correctly in Firefox. */
+    // Perform pathfinding by station trigrams and verify map markers in Chromium
+    await routePage.performPathfindingByTrigram('WS', 'NES', 'MES');
     if (browserName === 'chromium') {
       const expectedMapMarkersValues = ['West_station', 'North_East_station', 'Mid_East_station'];
-      await operationalStudiesPage.verifyMapMarkers(...expectedMapMarkersValues);
+      await routePage.verifyMapMarkers(...expectedMapMarkersValues);
     }
 
-    // Verify absence of tab warning
+    // Verify that tab warnings are absent
     await operationalStudiesPage.verifyTabWarningAbsence();
   });
 
-  test('should correctly add waypoints in a route for operational study', async ({
-    page,
-    browserName,
-  }) => {
+  /** *************** Test 2 **************** */
+  test('Adding waypoints to a route for operational study', async ({ page, browserName }) => {
     const operationalStudiesPage = new OperationalStudiesPage(page);
-    const scenarioPage = new ScenarioPage(page);
-
-    // Click on add train button
-    await operationalStudiesPage.clickOnAddTrainBtn();
-
-    // Select electric rolling stock
-    await operationalStudiesPage.selectRollingStock(electricRollingStockName);
+    const routePage = new RoutePage(page);
 
-    // Perform pathfinding
-    await scenarioPage.openTabByDataId('tab-pathfinding');
-    await operationalStudiesPage.performPathfindingByTrigram('WS', 'NES');
+    // Perform pathfinding by station trigrams
+    await routePage.performPathfindingByTrigram('WS', 'NES');
 
-    // Add new waypoints
+    // Define waypoints and add them to the route
     const expectedViaValues = [
       { name: 'Mid_West_station', ch: 'BV', uic: '3', km: 'KM 11.850' },
       { name: 'Mid_East_station', ch: 'BV', uic: '4', km: 'KM 26.300' },
     ];
-    await operationalStudiesPage.addNewWaypoints(
-      2,
-      ['Mid_West_station', 'Mid_East_station'],
-      expectedViaValues
-    );
-
-    /* Verify map markers in Chromium browser:
-    This check is not performed in Firefox because the map does not load correctly in Firefox. */
+    await routePage.addNewWaypoints(2, ['Mid_West_station', 'Mid_East_station'], expectedViaValues);
+
+    // Verify map markers in Chromium
     if (browserName === 'chromium') {
       const expectedMapMarkersValues = [
         'West_station',
@@ -101,54 +82,49 @@ test.describe('Verifying that all elements in the route tab are loaded correctly
         'Mid_East_station',
         'North_East_station',
       ];
-      await operationalStudiesPage.verifyMapMarkers(...expectedMapMarkersValues);
+      await routePage.verifyMapMarkers(...expectedMapMarkersValues);
     }
 
-    // Verify absence of tab warning
+    // Verify that tab warnings are absent
     await operationalStudiesPage.verifyTabWarningAbsence();
   });
 
-  test('should correctly reverse and delete waypoints in a route for operational study', async ({
-    browserName,
+  /** *************** Test 3 **************** */
+  test('Reversing and deleting waypoints in a route for operational study', async ({
     page,
+    browserName,
+    OSRDLanguage,
   }) => {
-    test.slow(browserName === 'webkit', 'This test is slow on safari');
-    const operationalStudiesPage = new OperationalStudiesPage(page);
-    const scenarioPage = new ScenarioPage(page);
-
-    // Click on add train button
-    await operationalStudiesPage.clickOnAddTrainBtn();
+    test.slow(browserName === 'webkit', 'This test is slow on Safari');
 
-    // Select electric rolling stock
-    await operationalStudiesPage.selectRollingStock(electricRollingStockName);
+    const routePage = new RoutePage(page);
 
-    // Perform pathfinding
-    await scenarioPage.openTabByDataId('tab-pathfinding');
-    await operationalStudiesPage.performPathfindingByTrigram('WS', 'SES', 'MWS');
+    // Perform pathfinding by station trigrams and verify map markers in Chromium
+    await routePage.performPathfindingByTrigram('WS', 'SES', 'MWS');
     const expectedMapMarkersValues = ['West_station', 'South_East_station', 'Mid_West_station'];
     if (browserName === 'chromium') {
-      await operationalStudiesPage.verifyMapMarkers(...expectedMapMarkersValues);
+      await routePage.verifyMapMarkers(...expectedMapMarkersValues);
     }
 
     // Reverse the itinerary and verify the map markers
-    await operationalStudiesPage.clickOnReverseItinerary();
+    await routePage.clickOnReverseItinerary();
     if (browserName === 'chromium') {
       const reversedMapMarkersValues = [...expectedMapMarkersValues].reverse();
-      await operationalStudiesPage.verifyMapMarkers(...reversedMapMarkersValues);
+      await routePage.verifyMapMarkers(...reversedMapMarkersValues);
     }
 
     // Delete operational points and verify no selected route
-    await operationalStudiesPage.clickOnDeleteOPButtons(selectedLanguage);
-    await operationalStudiesPage.verifyNoSelectedRoute(selectedLanguage);
+    await routePage.clickOnDeleteOPButtons(OSRDLanguage);
+    await routePage.verifyNoSelectedRoute(OSRDLanguage);
 
-    // Search by trigram and verify map markers
-    await operationalStudiesPage.performPathfindingByTrigram('WS', 'SES', 'MWS');
+    // Perform pathfinding again and verify map markers in Chromium
+    await routePage.performPathfindingByTrigram('WS', 'SES', 'MWS');
     if (browserName === 'chromium') {
-      await operationalStudiesPage.verifyMapMarkers(...expectedMapMarkersValues);
+      await routePage.verifyMapMarkers(...expectedMapMarkersValues);
     }
 
-    // Delete itinerary and verify no selected route
-    await operationalStudiesPage.clickDeleteItineraryButton();
-    await operationalStudiesPage.verifyNoSelectedRoute(selectedLanguage);
+    // Delete the itinerary and verify no selected route
+    await routePage.clickDeleteItineraryButton();
+    await routePage.verifyNoSelectedRoute(OSRDLanguage);
   });
 });
diff --git a/front/tests/011-op-times-and-stops-tab.spec.ts b/front/tests/011-op-times-and-stops-tab.spec.ts
index a659ae45439..1f2a53822c8 100644
--- a/front/tests/011-op-times-and-stops-tab.spec.ts
+++ b/front/tests/011-op-times-and-stops-tab.spec.ts
@@ -1,13 +1,11 @@
-import { test, expect } from '@playwright/test';
-
 import type { Project, Scenario, Study } from 'common/api/osrdEditoastApi';
 
-import HomePage from './pages/home-page-model';
 import OperationalStudiesInputTablePage from './pages/op-input-table-page-model';
 import OperationalStudiesOutputTablePage from './pages/op-output-table-page-model';
-import OperationalStudiesTimetablePage from './pages/op-timetable-page-model';
+import RoutePage from './pages/op-route-page-model';
 import OperationalStudiesPage from './pages/operational-studies-page-model';
-import ScenarioPage from './pages/scenario-page-model';
+import RollingStockSelectorPage from './pages/rollingstock-selector-page';
+import { test, expect } from './playwright-fixture';
 import { readJsonFile } from './utils';
 import { cleanWhitespace, cleanWhitespaceInArray, type StationData } from './utils/dataNormalizer';
 import setupScenario from './utils/scenario';
@@ -15,97 +13,97 @@ import scrollContainer from './utils/scrollHelper';
 import enTranslations from '../public/locales/en/timesStops.json';
 import frTranslations from '../public/locales/fr/timesStops.json';
 
-let project: Project;
-let study: Study;
-let scenario: Scenario;
-let selectedLanguage: string;
-
-type TranslationKeys = keyof typeof enTranslations;
-
-// Define CellData interface for table cell data
-interface CellData {
-  stationName: string;
-  header: TranslationKeys;
-  value: string;
-  marginForm?: string;
-}
-
-const dualRollingStockName = 'dual-mode_rolling_stock_test_e2e';
-
-const initialInputsData: CellData[] = readJsonFile(
-  './tests/assets/operationStudies/timesAndStops/initialInputs.json'
-);
-const updatedInputsData: CellData[] = readJsonFile(
-  './tests/assets/operationStudies/timesAndStops/updatedInputs.json'
-);
-const outputExpectedCellData: StationData[] = readJsonFile(
-  './tests/assets/operationStudies/timesAndStops/expectedOutputsCellsData.json'
-);
-const inputExpectedData = readJsonFile(
-  './tests/assets/operationStudies/timesAndStops/expectedInputsCellsData.json'
-);
-const updatedCellData = readJsonFile(
-  './tests/assets/operationStudies/timesAndStops/updatedInputsCellsData.json'
-);
-
-const expectedViaValues = [
-  { name: 'Mid_West_station', ch: 'BV', uic: '3', km: 'KM 11.850' },
-  { name: 'Mid_East_station', ch: 'BV', uic: '4', km: 'KM 26.300' },
-];
-
-test.beforeEach(async ({ page }) => {
-  // Create a new scenario
-  ({ project, study, scenario } = await setupScenario());
-
-  // Navigate to home page and retrieve the language setting
-  const homePage = new HomePage(page);
-  await homePage.goToHomePage();
-  selectedLanguage = await homePage.getOSRDLanguage();
-
-  // Go to the specific operational study scenario page
-  await page.goto(
-    `/operational-studies/projects/${project.id}/studies/${study.id}/scenarios/${scenario.id}`
-  );
-});
-
 test.describe('Times and Stops Tab Verification', () => {
-  // Set viewport to avoid scrolling issues and ensure elements are attached to the DOM
+  // Set viewport to ensure correct element visibility and interaction
   test.use({ viewport: { width: 1920, height: 1080 } });
 
-  test('should correctly set and display times and stops tables', async ({ page }) => {
-    // Page models
-    const [
-      opInputTablePage,
-      opTimetablePage,
-      opOutputTablePage,
-      operationalStudiesPage,
-      scenarioPage,
-    ] = [
+  let project: Project;
+  let study: Study;
+  let scenario: Scenario;
+
+  const dualRollingStockName = 'dual-mode_rolling_stock_test_e2e';
+
+  // Load test data for table inputs and expected results
+  const initialInputsData: CellData[] = readJsonFile(
+    './tests/assets/operationStudies/timesAndStops/initialInputs.json'
+  );
+  const updatedInputsData: CellData[] = readJsonFile(
+    './tests/assets/operationStudies/timesAndStops/updatedInputs.json'
+  );
+  const outputExpectedCellData: StationData[] = readJsonFile(
+    './tests/assets/operationStudies/timesAndStops/expectedOutputsCellsData.json'
+  );
+  const inputExpectedData = readJsonFile(
+    './tests/assets/operationStudies/timesAndStops/expectedInputsCellsData.json'
+  );
+  const updatedCellData = readJsonFile(
+    './tests/assets/operationStudies/timesAndStops/updatedInputsCellsData.json'
+  );
+
+  // Waypoints data for route verification
+  const expectedViaValues = [
+    { name: 'Mid_West_station', ch: 'BV', uic: '3', km: 'KM 11.850' },
+    { name: 'Mid_East_station', ch: 'BV', uic: '4', km: 'KM 26.300' },
+  ];
+
+  // Define interface for table cell data
+  interface CellData {
+    stationName: string;
+    header: TranslationKeys;
+    value: string;
+    marginForm?: string;
+  }
+
+  type TranslationKeys = keyof typeof enTranslations;
+
+  test.beforeEach(
+    'Navigate to Times and Stops tab with rolling stock and route set',
+    async ({ page }) => {
+      const [operationalStudiesPage, routePage, rollingStockPage] = [
+        new OperationalStudiesPage(page),
+        new RoutePage(page),
+        new RollingStockSelectorPage(page),
+      ];
+
+      // Set up scenario for operational study
+      ({ project, study, scenario } = await setupScenario());
+
+      // Navigate to the operational study scenario page
+      await page.goto(
+        `/operational-studies/projects/${project.id}/studies/${study.id}/scenarios/${scenario.id}`
+      );
+
+      // Setup train configuration and schedule
+      await operationalStudiesPage.checkInfraLoaded();
+      await operationalStudiesPage.clickOnAddTrainButton();
+      await operationalStudiesPage.setTrainScheduleName('Train-name-e2e-test');
+      await page.waitForTimeout(500); // Wait for any async actions to complete
+      await operationalStudiesPage.setTrainStartTime('11:22:40');
+      await rollingStockPage.selectRollingStock(dualRollingStockName);
+
+      // Perform route pathfinding
+      await operationalStudiesPage.clickOnRouteTab();
+      await routePage.performPathfindingByTrigram('WS', 'NES');
+
+      // Navigate to the Times and Stops tab and scroll to the data sheet
+      await operationalStudiesPage.clickOnTimesAndStopsTab();
+      await scrollContainer(page, '.time-stops-datasheet .dsg-container');
+    }
+  );
+
+  test('should correctly set and display times and stops tables', async ({
+    page,
+    OSRDLanguage,
+  }) => {
+    const [opInputTablePage, opOutputTablePage, operationalStudiesPage, routePage] = [
       new OperationalStudiesInputTablePage(page),
-      new OperationalStudiesTimetablePage(page),
       new OperationalStudiesOutputTablePage(page),
       new OperationalStudiesPage(page),
-      new ScenarioPage(page),
+      new RoutePage(page),
     ];
 
-    // Setup the initial train configuration and schedule
-    await scenarioPage.checkInfraLoaded();
-    await operationalStudiesPage.clickOnAddTrainBtn();
-    await scenarioPage.setTrainScheduleName('Train-name-e2e-test');
-    await page.waitForTimeout(500);
-    await operationalStudiesPage.setTrainStartTime('11:22:40');
-    await operationalStudiesPage.selectRollingStock(dualRollingStockName);
-
-    // Perform pathfinding
-    await scenarioPage.openTabByDataId('tab-pathfinding');
-    await operationalStudiesPage.performPathfindingByTrigram('WS', 'NES');
-
-    // Navigate to the Times and Stops tab and scroll into view
-    await scenarioPage.openTabByDataId('tab-timesStops');
-    await scrollContainer(page, '.time-stops-datasheet .dsg-container');
-
-    // Set column names based on the selected language
-    const translations = selectedLanguage === 'English' ? enTranslations : frTranslations;
+    // Set translations based on selected language
+    const translations = OSRDLanguage === 'English' ? enTranslations : frTranslations;
     const expectedColumnNames = cleanWhitespaceInArray([
       translations.name,
       'Ch',
@@ -116,37 +114,35 @@ test.describe('Times and Stops Tab Verification', () => {
       translations.theoreticalMargin,
     ]);
 
-    // Verify that the actual column headers match the expected headers
+    // Verify table headers match the expected headers
     const actualColumnHeaders = cleanWhitespaceInArray(
       await opInputTablePage.columnHeaders.allInnerTexts()
     );
     expect(actualColumnHeaders).toEqual(expectedColumnNames);
 
-    // Validate the initial active row count
+    // Verify initial row count and fill table with input data
     await opInputTablePage.verifyActiveRowsCount(2);
-
-    // Fill in table cells based on the predefined cell data
     for (const cell of initialInputsData) {
       const translatedHeader = cleanWhitespace(translations[cell.header]);
       await opInputTablePage.fillTableCellByStationAndHeader(
         cell.stationName,
         translatedHeader,
         cell.value,
-        selectedLanguage,
+        OSRDLanguage,
         cell.marginForm
       );
     }
 
-    // Verify the table after modification
+    // Verify changes to the input table and additional rows
     await opInputTablePage.verifyActiveRowsCount(4);
     await opInputTablePage.verifyDeleteButtons(2);
     await opInputTablePage.verifyInputTableData(inputExpectedData);
 
-    // Switch to Pathfinding tab and validate waypoints
-    await scenarioPage.openTabByDataId('tab-pathfinding');
+    // Validate waypoints after switching to the Route tab
+    await operationalStudiesPage.clickOnRouteTab();
     for (const [viaIndex, expectedValue] of expectedViaValues.entries()) {
-      const droppedWaypoint = operationalStudiesPage.droppedWaypoints.nth(viaIndex);
-      await OperationalStudiesPage.validateAddedWaypoint(
+      const droppedWaypoint = routePage.droppedWaypoints.nth(viaIndex);
+      await RoutePage.validateAddedWaypoint(
         droppedWaypoint,
         expectedValue.name,
         expectedValue.ch,
@@ -154,53 +150,40 @@ test.describe('Times and Stops Tab Verification', () => {
       );
     }
 
-    // Add the train schedule and verify simulation results
-    await scenarioPage.addTrainSchedule();
-    await scenarioPage.returnSimulationResult();
-    await opTimetablePage.clickOnScenarioCollapseButton();
-    await opTimetablePage.verifyTimeStopsDataSheetVisibility();
-    // Scroll and extract data from output table
+    // Add train schedule, verify results and output table data
+    await operationalStudiesPage.addTrainSchedule();
+    await operationalStudiesPage.returnSimulationResult();
+    await opOutputTablePage.verifyTimeStopsDatasheetVisibility();
+
+    // Scroll and extract output table data for verification
     await scrollContainer(page, '.osrd-simulation-container .time-stops-datasheet .dsg-container');
-    await opOutputTablePage.getOutputTableData(outputExpectedCellData, selectedLanguage);
+    await opOutputTablePage.getOutputTableData(outputExpectedCellData, OSRDLanguage);
   });
 
-  test('should correctly update and clear input table row', async ({ page }) => {
-    // Page models
-    const [opInputTablePage, operationalStudiesPage, scenarioPage] = [
+  test('should correctly update and clear input table row', async ({ page, OSRDLanguage }) => {
+    const [opInputTablePage, operationalStudiesPage, routePage] = [
       new OperationalStudiesInputTablePage(page),
       new OperationalStudiesPage(page),
-      new ScenarioPage(page),
+      new RoutePage(page),
     ];
 
-    // Setup initial train configuration
-    await scenarioPage.checkInfraLoaded();
-    await operationalStudiesPage.clickOnAddTrainBtn();
-    await scenarioPage.setTrainScheduleName('Train-name-e2e-test');
-    await page.waitForTimeout(500);
-    await operationalStudiesPage.setTrainStartTime('11:22:40');
-    await operationalStudiesPage.selectRollingStock(dualRollingStockName);
-
-    // Perform pathfinding and navigate to Times and Stops tab
-    await scenarioPage.openTabByDataId('tab-pathfinding');
-    await operationalStudiesPage.performPathfindingByTrigram('WS', 'NES');
-    await scenarioPage.openTabByDataId('tab-timesStops');
-    await scrollContainer(page, '.time-stops-datasheet .dsg-container');
-
-    const translations = selectedLanguage === 'English' ? enTranslations : frTranslations;
-    // Fill in table cells based on the predefined cell data
+    const translations = OSRDLanguage === 'English' ? enTranslations : frTranslations;
+
+    // Fill table cells with initial input data
     for (const cell of initialInputsData) {
       const translatedHeader = cleanWhitespace(translations[cell.header]);
       await opInputTablePage.fillTableCellByStationAndHeader(
         cell.stationName,
         translatedHeader,
         cell.value,
-        selectedLanguage,
+        OSRDLanguage,
         cell.marginForm
       );
     }
+
     await opInputTablePage.verifyInputTableData(inputExpectedData);
 
-    // Update table inputs
+    // Update table inputs with new data
     await opInputTablePage.verifyActiveRowsCount(4);
     for (const cell of updatedInputsData) {
       const translatedHeader = cleanWhitespace(translations[cell.header]);
@@ -208,23 +191,23 @@ test.describe('Times and Stops Tab Verification', () => {
         cell.stationName,
         translatedHeader,
         cell.value,
-        selectedLanguage,
+        OSRDLanguage,
         cell.marginForm
       );
     }
 
-    // Delete a row and validate row count
+    // Delete a row and verify changes
     await opInputTablePage.verifyDeleteButtons(2);
     await opInputTablePage.deleteButtons.nth(0).click();
-    await opInputTablePage.verifyActiveRowsCount(4);
+    await opInputTablePage.verifyActiveRowsCount(4); // No reduction in rows after deletion
     await opInputTablePage.verifyDeleteButtons(1);
     await opInputTablePage.verifyInputTableData(updatedCellData);
 
-    // Switch to Pathfinding tab and validate waypoints
-    await scenarioPage.openTabByDataId('tab-pathfinding');
+    // Verify waypoints after switching to the Route tab
+    await operationalStudiesPage.clickOnRouteTab();
     for (const [viaIndex, expectedValue] of expectedViaValues.entries()) {
-      const droppedWaypoint = operationalStudiesPage.droppedWaypoints.nth(viaIndex);
-      await OperationalStudiesPage.validateAddedWaypoint(
+      const droppedWaypoint = routePage.droppedWaypoints.nth(viaIndex);
+      await RoutePage.validateAddedWaypoint(
         droppedWaypoint,
         expectedValue.name,
         expectedValue.ch,
diff --git a/front/tests/012-op-simulation-settings-tab.spec.ts b/front/tests/012-op-simulation-settings-tab.spec.ts
index 72ffb7ff812..7bcd9412bb7 100644
--- a/front/tests/012-op-simulation-settings-tab.spec.ts
+++ b/front/tests/012-op-simulation-settings-tab.spec.ts
@@ -1,4 +1,3 @@
-import { test } from '@playwright/test';
 import { v4 as uuidv4 } from 'uuid';
 
 import type {
@@ -9,13 +8,14 @@ import type {
   Study,
 } from 'common/api/osrdEditoastApi';
 
-import HomePage from './pages/home-page-model';
 import OperationalStudiesInputTablePage from './pages/op-input-table-page-model';
 import OperationalStudiesOutputTablePage from './pages/op-output-table-page-model';
+import RoutePage from './pages/op-route-page-model';
 import OperationalStudiesSimulationSettingsPage from './pages/op-simulation-settings-page-model';
 import OperationalStudiesTimetablePage from './pages/op-timetable-page-model';
 import OperationalStudiesPage from './pages/operational-studies-page-model';
-import ScenarioPage from './pages/scenario-page-model';
+import RollingStockSelectorPage from './pages/rollingstock-selector-page';
+import { test } from './playwright-fixture';
 import { readJsonFile } from './utils';
 import { deleteApiRequest, postApiRequest } from './utils/api-setup';
 import { cleanWhitespace, type StationData } from './utils/dataNormalizer';
@@ -63,7 +63,6 @@ test.describe('Simulation Settings Tab Verification', () => {
   let project: Project;
   let study: Study;
   let scenario: Scenario;
-  let selectedLanguage: string;
 
   type TranslationKeys = keyof typeof enTranslations;
 
@@ -92,57 +91,53 @@ test.describe('Simulation Settings Tab Verification', () => {
   test.beforeEach(
     'Navigate to Times and Stops tab with rolling stock and route set',
     async ({ page }) => {
-      const [homePage, operationalStudiesPage, scenarioPage] = [
-        new HomePage(page),
+      const [operationalStudiesPage, routePage, rollingStockPage] = [
         new OperationalStudiesPage(page),
-        new ScenarioPage(page),
+        new RoutePage(page),
+        new RollingStockSelectorPage(page),
       ];
 
       // Create a new scenario
       ({ project, study, scenario } = await setupScenario(electricalProfileSet.id));
 
-      // Navigate to home page and retrieve the language setting
-      await homePage.goToHomePage();
-      selectedLanguage = await homePage.getOSRDLanguage();
-
       // Navigate to the created scenario page
       await page.goto(
         `/operational-studies/projects/${project.id}/studies/${study.id}/scenarios/${scenario.id}`
       );
       // Ensure the infrastructure is completely loaded
-      await scenarioPage.checkInfraLoaded();
+      await operationalStudiesPage.checkInfraLoaded();
       // Add a new train and set its properties
-      await operationalStudiesPage.clickOnAddTrainBtn();
-      await scenarioPage.setTrainScheduleName('Train-name-e2e-test');
+      await operationalStudiesPage.clickOnAddTrainButton();
+      await operationalStudiesPage.setTrainScheduleName('Train-name-e2e-test');
       await page.waitForTimeout(500);
       await operationalStudiesPage.setTrainStartTime('11:22:40');
       // Select electric rolling stock
-      await operationalStudiesPage.selectRollingStock(improbableRollingStockName);
+      await rollingStockPage.selectRollingStock(improbableRollingStockName);
       // Perform pathfinding
-      await scenarioPage.openTabByDataId('tab-pathfinding');
-      await operationalStudiesPage.performPathfindingByTrigram('WS', 'SES', 'MWS');
+      await operationalStudiesPage.clickOnRouteTab();
+      await routePage.performPathfindingByTrigram('WS', 'SES', 'MWS');
       // Navigate to the Times and Stops tab and fill in required data
-      await scenarioPage.openTabByDataId('tab-timesStops');
+      await operationalStudiesPage.clickOnTimesAndStopsTab();
       await scrollContainer(page, '.time-stops-datasheet .dsg-container');
     }
   );
 
-  test('Activate electrical profiles', async ({ page }) => {
+  test('Activate electrical profiles', async ({ page, OSRDLanguage }) => {
     const [
+      operationalStudiesPage,
       opInputTablePage,
       opTimetablePage,
       opOutputTablePage,
-      scenarioPage,
       opSimulationSettingsPage,
     ] = [
+      new OperationalStudiesPage(page),
       new OperationalStudiesInputTablePage(page),
       new OperationalStudiesTimetablePage(page),
       new OperationalStudiesOutputTablePage(page),
-      new ScenarioPage(page),
       new OperationalStudiesSimulationSettingsPage(page),
     ];
     // Project selected language
-    const translations = selectedLanguage === 'English' ? enTranslations : frTranslations;
+    const translations = OSRDLanguage === 'English' ? enTranslations : frTranslations;
     const cell: CellData = {
       stationName: 'Mid_East_station',
       header: 'stopTime',
@@ -155,55 +150,49 @@ test.describe('Simulation Settings Tab Verification', () => {
       cell.stationName,
       translatedHeader,
       cell.value,
-      selectedLanguage
+      OSRDLanguage
     );
     // Activate electrical profiles
-    await scenarioPage.openTabByDataId('tab-simulation-settings');
+    await operationalStudiesPage.clickOnSimulationSettingsTab();
     await opSimulationSettingsPage.checkElectricalProfile();
     await opSimulationSettingsPage.checkMarecoMargin();
     // Add the train schedule and verify output results
-    await scenarioPage.addTrainSchedule();
-    await scenarioPage.returnSimulationResult();
-    await opTimetablePage.verifyTimeStopsDataSheetVisibility();
+    await operationalStudiesPage.addTrainSchedule();
+    await operationalStudiesPage.returnSimulationResult();
+    await opOutputTablePage.verifyTimeStopsDatasheetVisibility();
     await opTimetablePage.getTrainArrivalTime('11:52');
     await opTimetablePage.clickOnScenarioCollapseButton();
     await scrollContainer(page, '.osrd-simulation-container .time-stops-datasheet .dsg-container');
-    await opOutputTablePage.getOutputTableData(
-      expectedCellDataElectricalProfileON,
-      selectedLanguage
-    );
+    await opOutputTablePage.getOutputTableData(expectedCellDataElectricalProfileON, OSRDLanguage);
     await opTimetablePage.clickOnTimetableCollapseButton();
     // Deactivate electrical profiles and verify output results
     await opTimetablePage.clickOnEditTrain();
-    await scenarioPage.openTabByDataId('tab-simulation-settings');
+    await operationalStudiesPage.clickOnSimulationSettingsTab();
     await opSimulationSettingsPage.deactivateElectricalProfile();
     await opTimetablePage.clickOnEditTrainSchedule();
     // TODO: Remove the reload when bug #8854 (UI not updating after modification) is fixed
     await page.reload({ timeout: 30000, waitUntil: 'load' });
-    await opTimetablePage.verifyTimeStopsDataSheetVisibility();
+    await opOutputTablePage.verifyTimeStopsDatasheetVisibility();
     await opTimetablePage.getTrainArrivalTime('11:51');
     await opTimetablePage.clickOnScenarioCollapseButton();
-    await opOutputTablePage.getOutputTableData(
-      expectedCellDataElectricalProfileOFF,
-      selectedLanguage
-    );
+    await opOutputTablePage.getOutputTableData(expectedCellDataElectricalProfileOFF, OSRDLanguage);
   });
-  test('Activate composition code', async ({ page }) => {
+  test('Activate composition code', async ({ page, OSRDLanguage }) => {
     const [
+      operationalStudiesPage,
       opInputTablePage,
       opTimetablePage,
       opOutputTablePage,
-      scenarioPage,
       opSimulationSettingsPage,
     ] = [
+      new OperationalStudiesPage(page),
       new OperationalStudiesInputTablePage(page),
       new OperationalStudiesTimetablePage(page),
       new OperationalStudiesOutputTablePage(page),
-      new ScenarioPage(page),
       new OperationalStudiesSimulationSettingsPage(page),
     ];
 
-    const translations = selectedLanguage === 'English' ? enTranslations : frTranslations;
+    const translations = OSRDLanguage === 'English' ? enTranslations : frTranslations;
     const cell: CellData = {
       stationName: 'Mid_East_station',
       header: 'stopTime',
@@ -215,50 +204,50 @@ test.describe('Simulation Settings Tab Verification', () => {
       cell.stationName,
       translatedHeader,
       cell.value,
-      selectedLanguage
+      OSRDLanguage
     );
     // Select a specific composition code option
-    await scenarioPage.openTabByDataId('tab-simulation-settings');
+    await operationalStudiesPage.clickOnSimulationSettingsTab();
     await opSimulationSettingsPage.deactivateElectricalProfile();
     await opSimulationSettingsPage.checkMarecoMargin();
     await opSimulationSettingsPage.selectCodeCompoOption('HLP');
     // Add the train schedule and verify output results
-    await scenarioPage.addTrainSchedule();
-    await scenarioPage.returnSimulationResult();
-    await opTimetablePage.verifyTimeStopsDataSheetVisibility();
+    await operationalStudiesPage.addTrainSchedule();
+    await operationalStudiesPage.returnSimulationResult();
+    await opOutputTablePage.verifyTimeStopsDatasheetVisibility();
     await opTimetablePage.getTrainArrivalTime('12:02');
     await opTimetablePage.clickOnScenarioCollapseButton();
     await scrollContainer(page, '.osrd-simulation-container .time-stops-datasheet .dsg-container');
-    await opOutputTablePage.getOutputTableData(expectedCellDataCodeCompoON, selectedLanguage);
+    await opOutputTablePage.getOutputTableData(expectedCellDataCodeCompoON, OSRDLanguage);
     await opTimetablePage.clickOnTimetableCollapseButton();
     // Remove the composition code option and verify the changes
     await opTimetablePage.clickOnEditTrain();
-    await scenarioPage.openTabByDataId('tab-simulation-settings');
+    await operationalStudiesPage.clickOnSimulationSettingsTab();
     await opSimulationSettingsPage.selectCodeCompoOption('__PLACEHOLDER__');
     await opTimetablePage.clickOnEditTrainSchedule();
     // TODO: Remove the reload when bug #8854 (UI not updating after modification) is fixed
     await page.reload({ timeout: 30000, waitUntil: 'load' });
-    await opTimetablePage.verifyTimeStopsDataSheetVisibility();
+    await opOutputTablePage.verifyTimeStopsDatasheetVisibility();
     await opTimetablePage.getTrainArrivalTime('11:51');
     await opTimetablePage.clickOnScenarioCollapseButton();
-    await opOutputTablePage.getOutputTableData(expectedCellDataCodeCompoOFF, selectedLanguage);
+    await opOutputTablePage.getOutputTableData(expectedCellDataCodeCompoOFF, OSRDLanguage);
   });
-  test('Activate linear and mareco margin', async ({ page }) => {
+  test('Activate linear and mareco margin', async ({ page, OSRDLanguage }) => {
     const [
+      operationalStudiesPage,
       opInputTablePage,
       opTimetablePage,
       opOutputTablePage,
-      scenarioPage,
       opSimulationSettingsPage,
     ] = [
+      new OperationalStudiesPage(page),
       new OperationalStudiesInputTablePage(page),
       new OperationalStudiesTimetablePage(page),
       new OperationalStudiesOutputTablePage(page),
-      new ScenarioPage(page),
       new OperationalStudiesSimulationSettingsPage(page),
     ];
 
-    const translations = selectedLanguage === 'English' ? enTranslations : frTranslations;
+    const translations = OSRDLanguage === 'English' ? enTranslations : frTranslations;
     const inputTableData: CellData[] = [
       {
         stationName: 'Mid_East_station',
@@ -278,51 +267,51 @@ test.describe('Simulation Settings Tab Verification', () => {
         cell.stationName,
         translatedHeader,
         cell.value,
-        selectedLanguage,
+        OSRDLanguage,
         cell.marginForm
       );
     }
     // Activate the 'Linear' margin
-    await scenarioPage.openTabByDataId('tab-simulation-settings');
+    await operationalStudiesPage.clickOnSimulationSettingsTab();
     await opSimulationSettingsPage.deactivateElectricalProfile();
     await opSimulationSettingsPage.activateLinearMargin();
     // Add the train schedule and verify output results
-    await scenarioPage.addTrainSchedule();
-    await scenarioPage.returnSimulationResult();
-    await opTimetablePage.verifyTimeStopsDataSheetVisibility();
+    await operationalStudiesPage.addTrainSchedule();
+    await operationalStudiesPage.returnSimulationResult();
+    await opOutputTablePage.verifyTimeStopsDatasheetVisibility();
     await opTimetablePage.getTrainArrivalTime('11:54');
     await opTimetablePage.clickOnScenarioCollapseButton();
     await scrollContainer(page, '.osrd-simulation-container .time-stops-datasheet .dsg-container');
-    await opOutputTablePage.getOutputTableData(expectedCellDataLinearMargin, selectedLanguage);
+    await opOutputTablePage.getOutputTableData(expectedCellDataLinearMargin, OSRDLanguage);
     await opTimetablePage.clickOnTimetableCollapseButton();
     // Modify the margin to 'Mareco' and verify the changes
     await opTimetablePage.clickOnEditTrain();
-    await scenarioPage.openTabByDataId('tab-simulation-settings');
+    await operationalStudiesPage.clickOnSimulationSettingsTab();
     await opSimulationSettingsPage.activateMarecoMargin();
     await opTimetablePage.clickOnEditTrainSchedule();
     // TODO: Remove the reload when bug #8854 (UI not updating after modification) is fixed
     await page.reload({ timeout: 30000, waitUntil: 'load' });
-    await opTimetablePage.verifyTimeStopsDataSheetVisibility();
+    await opOutputTablePage.verifyTimeStopsDatasheetVisibility();
     await opTimetablePage.getTrainArrivalTime('11:54');
     await opTimetablePage.clickOnScenarioCollapseButton();
-    await opOutputTablePage.getOutputTableData(expectedCellDataMarecoMargin, selectedLanguage);
+    await opOutputTablePage.getOutputTableData(expectedCellDataMarecoMargin, OSRDLanguage);
   });
-  test('Add all the simulation settings', async ({ page }) => {
+  test('Add all the simulation settings', async ({ page, OSRDLanguage }) => {
     const [
+      operationalStudiesPage,
       opInputTablePage,
       opTimetablePage,
       opOutputTablePage,
-      scenarioPage,
       opSimulationSettingsPage,
     ] = [
+      new OperationalStudiesPage(page),
       new OperationalStudiesInputTablePage(page),
       new OperationalStudiesTimetablePage(page),
       new OperationalStudiesOutputTablePage(page),
-      new ScenarioPage(page),
       new OperationalStudiesSimulationSettingsPage(page),
     ];
 
-    const translations = selectedLanguage === 'English' ? enTranslations : frTranslations;
+    const translations = OSRDLanguage === 'English' ? enTranslations : frTranslations;
     const inputTableData: CellData[] = [
       {
         stationName: 'Mid_East_station',
@@ -342,22 +331,22 @@ test.describe('Simulation Settings Tab Verification', () => {
         cell.stationName,
         translatedHeader,
         cell.value,
-        selectedLanguage,
+        OSRDLanguage,
         cell.marginForm
       );
     }
     // Activate the 'Linear' margin, electrical profile and composition code
-    await scenarioPage.openTabByDataId('tab-simulation-settings');
+    await operationalStudiesPage.clickOnSimulationSettingsTab();
     await opSimulationSettingsPage.checkElectricalProfile();
     await opSimulationSettingsPage.activateLinearMargin();
     await opSimulationSettingsPage.selectCodeCompoOption('HLP');
     // Add the train schedule and verify output results
-    await scenarioPage.addTrainSchedule();
-    await scenarioPage.returnSimulationResult();
-    await opTimetablePage.verifyTimeStopsDataSheetVisibility();
+    await operationalStudiesPage.addTrainSchedule();
+    await operationalStudiesPage.returnSimulationResult();
+    await opOutputTablePage.verifyTimeStopsDatasheetVisibility();
     await opTimetablePage.getTrainArrivalTime('12:05');
     await opTimetablePage.clickOnScenarioCollapseButton();
     await scrollContainer(page, '.osrd-simulation-container .time-stops-datasheet .dsg-container');
-    await opOutputTablePage.getOutputTableData(expectedCellDataForAllSettings, selectedLanguage);
+    await opOutputTablePage.getOutputTableData(expectedCellDataForAllSettings, OSRDLanguage);
   });
 });
diff --git a/front/tests/pages/base-page.ts b/front/tests/pages/base-page.ts
deleted file mode 100644
index 0214006bfb5..00000000000
--- a/front/tests/pages/base-page.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { expect, type Locator, type Page } from '@playwright/test';
-
-class BasePage {
-  public page: Page;
-
-  private backToHomePageButton: Locator;
-
-  protected viteOverlay: Locator;
-
-  readonly lastToast: Locator;
-
-  constructor(page: Page) {
-    this.page = page;
-
-    this.backToHomePageButton = page.locator('.mastheader-logo');
-    this.viteOverlay = page.locator('vite-plugin-checker-error-overlay');
-    this.lastToast = page.getByTestId('toast-SNCF').last();
-  }
-
-  // Completely remove VITE button & sign
-  async removeViteOverlay() {
-    if ((await this.viteOverlay.count()) > 0) {
-      await this.viteOverlay.evaluate((node) => node.setAttribute('style', 'display:none;'));
-    }
-  }
-
-  async backToHomePage() {
-    await this.backToHomePageButton.click();
-  }
-
-  async checkLastToastBody(text: string | RegExp) {
-    await expect(this.lastToast.locator('.toast-body')).toHaveText(text);
-  }
-
-  async checkLastToastTitle(text: string | RegExp) {
-    await expect(this.lastToast.getByTestId('toast-SNCF-title')).toHaveText(text);
-  }
-
-  async clickBtnByName(name: string) {
-    await this.page.getByRole('button', { name }).click();
-  }
-}
-export default BasePage;
diff --git a/front/tests/pages/common-page-model.ts b/front/tests/pages/common-page-model.ts
index ae9f07bbafd..be6ef4ba89c 100644
--- a/front/tests/pages/common-page-model.ts
+++ b/front/tests/pages/common-page-model.ts
@@ -1,34 +1,42 @@
 import { expect, type Locator, type Page } from '@playwright/test';
 
-import BasePage from './base-page';
-import rollingstockTranslation from '../../public/locales/fr/rollingstock.json';
+class CommonPage {
+  readonly page: Page;
 
-class CommonPage extends BasePage {
-  readonly rollingstockTranslation: typeof rollingstockTranslation;
+  readonly toastContainer: Locator;
 
-  readonly getToastSNCF: Locator;
+  readonly toastTitle: Locator;
 
-  constructor(readonly page: Page) {
-    super(page);
-    this.rollingstockTranslation = rollingstockTranslation;
-    this.getToastSNCF = page.getByTestId('toast-SNCF');
-  }
+  readonly tagField: Locator;
+
+  readonly viteOverlay: Locator;
+
+  readonly toastSNCF: Locator;
 
-  getRollingstockTranslation(key: keyof typeof rollingstockTranslation) {
-    return this.rollingstockTranslation[key];
+  constructor(page: Page) {
+    this.page = page;
+    this.toastContainer = page.getByTestId('toast-SNCF');
+    this.toastTitle = this.toastContainer.locator('[data-testid="toast-SNCF-title"]');
+    this.tagField = page.getByTestId('chips-input');
+    this.viteOverlay = page.locator('vite-plugin-checker-error-overlay');
+    this.toastSNCF = page.getByTestId('toast-SNCF');
   }
 
+  // Set the tag of project, study or scenario
   async setTag(tag: string) {
-    await this.page.getByTestId('chips-input').fill(tag);
-    await this.page.getByTestId('chips-input').press('Enter');
+    await this.tagField.fill(tag);
+    await this.tagField.press('Enter');
   }
 
-  async checkToastSNCFBody(text: string | RegExp) {
-    await expect(this.getToastSNCF.locator('.toast-body')).toHaveText(text);
+  // Verify the text of the last toast notification title
+  async checkLastToastTitle(expectedText: string | RegExp): Promise<void> {
+    await expect(this.toastTitle.last()).toHaveText(expectedText);
   }
 
-  async checkToastSNCFTitle(text: string | RegExp) {
-    await expect(this.getToastSNCF.locator('strong')).toHaveText(text);
+  async removeViteOverlay() {
+    if ((await this.viteOverlay.count()) > 0) {
+      await this.viteOverlay.evaluate((node) => node.setAttribute('style', 'display:none;'));
+    }
   }
 }
 
diff --git a/front/tests/pages/home-page-model.ts b/front/tests/pages/home-page-model.ts
index 9ee65ea3a20..ac918419cf6 100644
--- a/front/tests/pages/home-page-model.ts
+++ b/front/tests/pages/home-page-model.ts
@@ -1,34 +1,21 @@
-import { expect, type Locator, type Page } from '@playwright/test';
+import { type BrowserContext, type Locator, type Page } from '@playwright/test';
 
-import home from '../../public/locales/fr/home/home.json';
+import CommonPage from './common-page-model';
 
-class HomePage {
-  // The current page object
-  readonly page: Page;
+class HomePage extends CommonPage {
+  readonly operationalStudiesLink: Locator;
 
-  // Locators for links
-  readonly getOperationalStudiesLink: Locator;
+  readonly cartoLink: Locator;
 
-  readonly getCartoLink: Locator;
+  readonly editorLink: Locator;
 
-  readonly getEditorLink: Locator;
+  readonly rollingStockEditorLink: Locator;
 
-  readonly getRollingStockEditorLink: Locator;
+  readonly STDCMLink: Locator;
 
-  readonly getSTDCMLink: Locator;
+  readonly linksTitle: Locator;
 
-  // Locator for all links
-  readonly getLinks: Locator;
-
-  // Locator for the "back to home" logo
-  readonly getBackHomeLogo: Locator;
-
-  // Locator for the body
-  readonly getBody: Locator;
-
-  readonly translation: typeof home;
-
-  readonly getViteOverlay: Locator;
+  readonly backHomeLogo: Locator;
 
   readonly dropDown: Locator;
 
@@ -36,36 +23,20 @@ class HomePage {
 
   readonly OSRDLanguage: Locator;
 
-  private stdcmSwitch: Locator;
-
   constructor(page: Page) {
-    this.page = page;
-    // Initialize locators using roles and text content
-    this.getOperationalStudiesLink = page.getByRole('link', { name: /Études d'exploitation/ });
-    this.getSTDCMLink = page.getByRole('link', { name: /Sillons de dernière minute/ });
-    this.getEditorLink = page.getByRole('link', { name: /Éditeur d'infrastructure/ });
-    this.getRollingStockEditorLink = page.getByRole('link', {
-      name: /Éditeur de matériel roulant/,
-    });
-    this.getCartoLink = page.getByRole('link', { name: /Cartographie/ });
-    this.getLinks = page.locator('h5');
-    this.getBackHomeLogo = page.locator('.mastheader-logo');
-    this.getBody = page.locator('body');
-    this.translation = home;
-    this.getViteOverlay = page.locator('vite-plugin-checker-error-overlay');
-    this.stdcmSwitch = page.getByTestId('stdcm-version-switch');
+    super(page);
+    this.operationalStudiesLink = page.locator('a[href="/operational-studies/projects"]');
+    this.STDCMLink = page.locator('a[href="/stdcm"]');
+    this.editorLink = page.locator('a[href="/editor"]');
+    this.rollingStockEditorLink = page.locator('a[href="/rolling-stock-editor"]');
+    this.cartoLink = page.locator('a[href="/map"]');
+    this.linksTitle = page.getByTestId('page-title');
+    this.backHomeLogo = page.getByTestId('osrd-logo');
     this.dropDown = page.getByTestId('dropdown-sncf');
     this.userSettings = page.getByTestId('user-settings-btn');
     this.OSRDLanguage = page.getByTestId('language-info');
   }
 
-  // Completely remove VITE button & sign
-  async removeViteOverlay() {
-    if ((await this.getViteOverlay.count()) > 0) {
-      await this.getViteOverlay.evaluate((node) => node.setAttribute('style', 'display:none;'));
-    }
-  }
-
   // Navigate to the Home page
   async goToHomePage() {
     await this.page.goto('/');
@@ -74,52 +45,33 @@ class HomePage {
 
   // Click on the logo to navigate back to the home page
   async backToHomePage() {
-    await this.getBackHomeLogo.click();
-  }
-
-  // Assert that the expected links are displayed on the page
-  async getDisplayLinks() {
-    expect(this.getLinks).toHaveText([
-      this.getTranslations('operationalStudies'),
-      this.getTranslations('stdcm'),
-      this.getTranslations('editor'),
-      this.getTranslations('rollingStockEditor'),
-      this.getTranslations('map'),
-    ]);
+    await this.backHomeLogo.click();
   }
 
-  // Navigate to the different pages
   async goToOperationalStudiesPage() {
-    await this.getOperationalStudiesLink.click();
+    await this.operationalStudiesLink.click();
   }
 
   async goToCartoPage() {
-    await this.getCartoLink.click();
+    await this.cartoLink.click();
   }
 
   async goToEditorPage() {
-    await this.getEditorLink.click();
+    await this.editorLink.click();
   }
 
   async goToRollingStockEditorPage() {
-    await this.getRollingStockEditorLink.click();
+    await this.rollingStockEditorLink.click();
   }
 
-  async goToSTDCMPage() {
-    await this.getSTDCMLink.click();
-  }
+  async goToSTDCMPage(context: BrowserContext) {
+    // Start waiting for the new page to be created
+    const [stdcmPage] = await Promise.all([context.waitForEvent('page'), this.STDCMLink.click()]);
 
-  getTranslations(key: keyof typeof home) {
-    return this.translation[key];
-  }
+    // Ensure the new page is fully loaded before proceeding
+    await stdcmPage.waitForLoadState();
 
-  // Check Stdcm Version
-  async toggleStdcmV1() {
-    await this.dropDown.click();
-    await this.userSettings.click();
-    if ((await this.stdcmSwitch.isChecked()) && (await this.stdcmSwitch.isVisible())) {
-      await this.stdcmSwitch.click();
-    }
+    return stdcmPage;
   }
 
   // Get OSRD selected language
diff --git a/front/tests/pages/map-model.ts b/front/tests/pages/map-model.ts
deleted file mode 100644
index 1a3abb1c067..00000000000
--- a/front/tests/pages/map-model.ts
+++ /dev/null
@@ -1,101 +0,0 @@
-import { type Locator, type Page, expect } from '@playwright/test';
-
-import HomePage from './home-page-model';
-
-export interface selectPointOnMapProps {
-  stationName: string;
-  stationItemName: string | RegExp;
-  positionClick: { x: number; y: number };
-}
-
-class MapPage {
-  readonly getBtnSearch: Locator;
-
-  readonly getBtnCloseSearch: Locator;
-
-  readonly getSearchedStation: Locator;
-
-  readonly getMap: Locator;
-
-  readonly getBtnOrigin: Locator;
-
-  readonly getBtnDestination: Locator;
-
-  readonly getPathFindingResult: Locator;
-
-  readonly homePage: HomePage;
-
-  constructor(readonly page: Page) {
-    this.getBtnSearch = page.getByRole('button', { name: 'Search' });
-    this.getBtnCloseSearch = page.locator('.map-modal').getByRole('button', { name: '×' });
-    this.getSearchedStation = page.locator('#map-search-station');
-    this.getMap = page.locator('.maplibregl-map');
-    this.getBtnOrigin = page.locator('.map-popup-click-select').getByTestId('map-origin-button');
-    this.getBtnDestination = page
-      .locator('.map-popup-click-select')
-      .getByTestId('map-destination-button');
-    this.getPathFindingResult = page.locator('.pathfinding-done');
-    this.homePage = new HomePage(page);
-  }
-
-  async disableLayers() {
-    const mapSettings = this.page.getByTestId('button-map-settings');
-    await mapSettings.click();
-    const showOsmSwitch = this.page.getByTestId('show-osm-switch');
-    await showOsmSwitch.uncheck({ force: true });
-    const closeSettingsModalButton = this.page.getByTestId('close-modal');
-    await closeSettingsModalButton.click();
-  }
-
-  async openMapSearch() {
-    await this.getBtnSearch.click();
-  }
-
-  async closeMapSearch() {
-    await this.getBtnCloseSearch.click();
-  }
-
-  async searchStation(station: string) {
-    await this.getSearchedStation.fill(station);
-  }
-
-  /** click on the center of the map */
-  async clickOnMap() {
-    await this.getMap.click();
-  }
-
-  async clickOnOrigin() {
-    await this.getBtnOrigin.click();
-  }
-
-  async clickOnDestination() {
-    await this.getBtnDestination.click();
-  }
-
-  async checkPathFindingResult(result: string | RegExp) {
-    await expect(this.getPathFindingResult).toHaveText(result);
-  }
-
-  async selectPointOnMap(args: selectPointOnMapProps & { isOrigin: boolean }) {
-    const { stationName, stationItemName, isOrigin } = args;
-    await this.openMapSearch();
-    await this.searchStation(stationName);
-    await this.homePage.page.getByRole('button', { name: stationItemName }).first().click();
-    await this.clickOnMap();
-    // We don't use ternaries here, as eslint warns us about rule no-unused-expressions
-    if (isOrigin) {
-      await this.clickOnOrigin();
-    } else {
-      await this.clickOnDestination();
-    }
-  }
-
-  async selectOrigin(props: selectPointOnMapProps) {
-    await this.selectPointOnMap({ ...props, isOrigin: true });
-  }
-
-  async selectDestination(props: selectPointOnMapProps) {
-    await this.selectPointOnMap({ ...props, isOrigin: false });
-  }
-}
-export default MapPage;
diff --git a/front/tests/pages/op-output-table-page-model.ts b/front/tests/pages/op-output-table-page-model.ts
index a3648eb83ae..b894ade1024 100644
--- a/front/tests/pages/op-output-table-page-model.ts
+++ b/front/tests/pages/op-output-table-page-model.ts
@@ -1,18 +1,17 @@
 import { type Locator, type Page, expect } from '@playwright/test';
 
+import OperationalStudiesTimetablePage from './op-timetable-page-model';
 import enTranslations from '../../public/locales/en/timesStops.json';
 import frTranslations from '../../public/locales/fr/timesStops.json';
 import { normalizeData, type StationData } from '../utils/dataNormalizer';
 
-class OperationalStudiesOutputTablePage {
-  readonly page: Page;
-
+class OperationalStudiesOutputTablePage extends OperationalStudiesTimetablePage {
   readonly columnHeaders: Locator;
 
   readonly tableRows: Locator;
 
   constructor(page: Page) {
-    this.page = page;
+    super(page);
     this.columnHeaders = page.locator(
       '[class="dsg-cell dsg-cell-header"] .dsg-cell-header-container'
     );
@@ -130,6 +129,12 @@ class OperationalStudiesOutputTablePage {
     const normalizedExpectedData = normalizeData(expectedTableData);
     expect(normalizedActualData).toEqual(normalizedExpectedData);
   }
+
+  // Wait for the Times and Stops simulation datasheet to be fully loaded with a specified timeout (default: 30 seconds)
+  async verifyTimeStopsDatasheetVisibility(timeout = 30 * 1000): Promise<void> {
+    await expect(this.timeStopsDataSheet).toBeVisible({ timeout });
+    await this.timeStopsDataSheet.scrollIntoViewIfNeeded();
+  }
 }
 
 export default OperationalStudiesOutputTablePage;
diff --git a/front/tests/pages/op-route-page-model.ts b/front/tests/pages/op-route-page-model.ts
new file mode 100644
index 00000000000..5fbfe5ca2c6
--- /dev/null
+++ b/front/tests/pages/op-route-page-model.ts
@@ -0,0 +1,327 @@
+import { expect, type Locator, type Page } from '@playwright/test';
+
+import enTranslations from '../../public/locales/en/operationalStudies/manageTrainSchedule.json';
+import frTranslations from '../../public/locales/fr/operationalStudies/manageTrainSchedule.json';
+import { clickWithDelay } from '../utils';
+
+class RoutePage {
+  readonly page: Page;
+
+  readonly pathfindingNoState: Locator;
+
+  readonly noOriginChosen: Locator;
+
+  readonly noDestinationChosen: Locator;
+
+  readonly searchByTrigramButton: Locator;
+
+  readonly searchByTrigramContainer: Locator;
+
+  readonly searchByTrigramInput: Locator;
+
+  readonly searchByTrigramSubmit: Locator;
+
+  readonly resultPathfindingDone: Locator;
+
+  readonly originInfo: Locator;
+
+  readonly destinationInfo: Locator;
+
+  readonly viaInfo: Locator;
+
+  readonly originDeleteButton: Locator;
+
+  readonly destinationDeleteButton: Locator;
+
+  readonly viaDeleteButton: Locator;
+
+  readonly addWaypointsButton: Locator;
+
+  readonly reverseItineraryButton: Locator;
+
+  readonly deleteItineraryButton: Locator;
+
+  readonly droppedWaypoints: Locator;
+
+  readonly waypointSuggestions: Locator;
+
+  readonly viaModal: Locator;
+
+  readonly closeViaModalButton: Locator;
+
+  readonly missingParamMessage: Locator;
+
+  constructor(page: Page) {
+    this.page = page;
+
+    this.pathfindingNoState = page.getByTestId('pathfinding-no-state');
+    this.noOriginChosen = page.getByTestId('no-origin-chosen-text');
+    this.noDestinationChosen = page.getByTestId('no-destination-chosen-text');
+    this.searchByTrigramButton = page.getByTestId('rocket-button');
+    this.searchByTrigramContainer = page.getByTestId('type-and-path-container');
+    this.searchByTrigramInput = page.getByTestId('type-and-path-input');
+    this.searchByTrigramSubmit = page.getByTestId('submit-search-by-trigram');
+    this.resultPathfindingDone = page.getByTestId('result-pathfinding-done');
+    this.originInfo = page.getByTestId('origin-op-info');
+    this.destinationInfo = page.getByTestId('destination-op-info');
+    this.viaInfo = page.getByTestId('via-op-info');
+    this.originDeleteButton = page.getByTestId('delete-origin-button');
+    this.destinationDeleteButton = page.getByTestId('delete-destination-button');
+    this.viaDeleteButton = page.getByTestId('delete-via-button');
+    this.addWaypointsButton = page.getByTestId('add-waypoints-button');
+    this.reverseItineraryButton = page.getByTestId('reverse-itinerary-button');
+    this.deleteItineraryButton = page.getByTestId('delete-itinerary-button');
+    this.droppedWaypoints = page.getByTestId('dropped-via-info');
+    this.waypointSuggestions = page.locator('.suggested-via-clickable');
+    this.viaModal = page.locator('.manage-vias-modal');
+    this.closeViaModalButton = page.getByLabel('Close');
+    this.missingParamMessage = page.getByTestId('missing-params-info');
+  }
+
+  // Gets the name locator of a waypoint suggestion.
+  static getWaypointSuggestionNameLocator(waypointSuggestion: Locator): Locator {
+    return waypointSuggestion.locator('.suggested-via-name');
+  }
+
+  // Gets the CH locator of a waypoint suggestion.
+  static getWaypointSuggestionChLocator(waypointSuggestion: Locator): Locator {
+    return waypointSuggestion.locator('.suggested-via-ch');
+  }
+
+  // Gets the UIC locator of a waypoint suggestion.
+  static getWaypointSuggestionUicLocator(waypointSuggestion: Locator): Locator {
+    return waypointSuggestion.locator('.suggested-via-uic');
+  }
+
+  // Gets the distance locator of a waypoint suggestion.
+  static getWaypointSuggestionDistanceLocator(waypointSuggestion: Locator): Locator {
+    return waypointSuggestion.getByTestId('suggested-via-distance');
+  }
+
+  // Gets the name locator of a dropped waypoint.
+  static getWaypointDroppedNameLocator(droppedWaypoint: Locator): Locator {
+    return droppedWaypoint.getByTestId('via-dropped-name');
+  }
+
+  // Gets the CH locator of a dropped waypoint.
+  static getWaypointDroppedChLocator(droppedWaypoint: Locator): Locator {
+    return droppedWaypoint.getByTestId('via-dropped-ch');
+  }
+
+  // Gets the UIC locator of a dropped waypoint.
+  static getWaypointDroppedUicLocator(droppedWaypoint: Locator): Locator {
+    return droppedWaypoint.getByTestId('via-dropped-uic');
+  }
+
+  // Gets the locator of the origin by trigram.
+  private getOriginLocatorByTrigram(trigram: string): Locator {
+    return this.page.getByTestId(`typeandpath-op-${trigram}`);
+  }
+
+  // Gets the locator of the destination by trigram.
+  private getDestinationLocatorByTrigram(trigram: string): Locator {
+    return this.page.getByTestId(`typeandpath-op-${trigram}`);
+  }
+
+  // Gets the locator of the via by trigram.
+  private getViaLocatorByTrigram(trigram: string): Locator {
+    return this.page.getByTestId(`typeandpath-op-${trigram}`);
+  }
+
+  // Gets the add button locator by via name.
+  private getAddButtonLocatorByViaName(viaName: string): Locator {
+    return this.page.getByTitle(viaName).getByTestId('suggested-via-add-button');
+  }
+
+  // Gets the delete button locator by via name.
+  private getDeleteButtonLocatorByViaName(viaName: string): Locator {
+    return this.page.getByTitle(viaName).getByTestId('suggested-via-delete-button');
+  }
+
+  // Gets the pathfinding marker on the map by marker name.
+  private getMapPathfindingMarker(markerName: string): Locator {
+    return this.page.locator('#map-container').getByText(markerName, { exact: true });
+  }
+
+  // Clicks the button to submit the search by trigram.
+  async clickSearchByTrigramSubmitButton() {
+    await this.searchByTrigramSubmit.click();
+  }
+
+  // Clicks the button to delete the itinerary.
+  async clickDeleteItineraryButton() {
+    await this.deleteItineraryButton.click();
+  }
+
+  // Verifies that no route is selected and displays appropriate messages based on language.
+  async verifyNoSelectedRoute(selectedLanguage: string) {
+    const translations = selectedLanguage === 'English' ? enTranslations : frTranslations;
+    const isNoOriginChosenVisible = await this.noOriginChosen.isVisible();
+    const isNoDestinationChosenVisible = await this.noDestinationChosen.isVisible();
+
+    if (isNoOriginChosenVisible) {
+      const noOriginChosenText = await this.noOriginChosen.innerText();
+      expect(noOriginChosenText).toEqual(translations.noOriginChosen);
+    }
+    if (isNoDestinationChosenVisible) {
+      const noDestinationChosenText = await this.noDestinationChosen.innerText();
+      expect(noDestinationChosenText).toEqual(translations.noDestinationChosen);
+    }
+  }
+
+  // Performs pathfinding by entering origin, destination, and optionally via trigrams.
+  async performPathfindingByTrigram(
+    originTrigram: string,
+    destinationTrigram: string,
+    viaTrigram?: string
+  ) {
+    await this.searchByTrigramButton.click();
+    await expect(this.searchByTrigramContainer).toBeVisible();
+
+    const inputTrigramText = viaTrigram
+      ? `${originTrigram} ${viaTrigram} ${destinationTrigram}`
+      : `${originTrigram} ${destinationTrigram}`;
+    await this.searchByTrigramInput.fill(inputTrigramText);
+
+    await expect(this.getOriginLocatorByTrigram(originTrigram)).toBeVisible();
+    await expect(this.getDestinationLocatorByTrigram(destinationTrigram)).toBeVisible();
+    if (viaTrigram) {
+      await expect(this.getViaLocatorByTrigram(viaTrigram)).toBeVisible();
+    }
+    const expectedOriginTrigram = await this.getOriginLocatorByTrigram(originTrigram).innerText();
+    const expectedDestinationTrigram =
+      await this.getDestinationLocatorByTrigram(destinationTrigram).innerText();
+    await this.clickSearchByTrigramSubmitButton();
+    await this.page.waitForSelector('.dots-loader', { state: 'hidden' });
+    await expect(this.searchByTrigramContainer).not.toBeVisible();
+    await expect(this.resultPathfindingDone).toBeVisible();
+
+    expect(await this.originInfo.innerText()).toEqual(expectedOriginTrigram);
+    expect(await this.destinationInfo.innerText()).toEqual(expectedDestinationTrigram);
+  }
+
+  // Clicks the button to reverse the itinerary.
+  async clickOnReverseItinerary() {
+    await this.reverseItineraryButton.click();
+  }
+
+  // Clicks the buttons to delete origin, destination, and via waypoints and verifies missing parameters message.
+  async clickOnDeleteOPButtons(selectedLanguage: string) {
+    // Ensure all buttons are rendered and visible before proceeding
+    await Promise.all([
+      this.viaDeleteButton.waitFor({ state: 'visible' }),
+      this.originDeleteButton.waitFor({ state: 'visible' }),
+      this.destinationDeleteButton.waitFor({ state: 'visible' }),
+    ]);
+
+    // Click the buttons sequentially with waits to ensure UI stability
+    await clickWithDelay(this.viaDeleteButton);
+    await clickWithDelay(this.originDeleteButton);
+    await clickWithDelay(this.destinationDeleteButton);
+    const translations = selectedLanguage === 'English' ? enTranslations : frTranslations;
+    const expectedMessage = translations.pathfindingMissingParams.replace(
+      ': {{missingElements}}.',
+      ''
+    );
+    await this.missingParamMessage.waitFor({ state: 'visible' });
+    const actualMessage = await this.missingParamMessage.innerText();
+    expect(actualMessage).toContain(expectedMessage);
+  }
+
+  // Clicks the add buttons for the specified via names.
+  async clickOnViaAddButtons(...viaNames: string[]) {
+    for (const viaName of viaNames) {
+      await clickWithDelay(this.getAddButtonLocatorByViaName(viaName));
+      await expect(this.getDeleteButtonLocatorByViaName(viaName)).toBeVisible();
+    }
+  }
+
+  // Verifies that the specified markers are visible on the map.
+  async verifyMapMarkers(...markerNames: string[]) {
+    for (const markerName of markerNames) {
+      await expect(this.getMapPathfindingMarker(markerName)).toBeVisible();
+    }
+  }
+
+  // Validates the waypoint suggestions by checking the name, CH, UIC, and distance.
+  static async validateWaypointSuggestions(
+    waypointSuggestion: Locator,
+    expectedName: string,
+    expectedCh: string,
+    expectedUic: string,
+    expectedKm: string
+  ) {
+    await expect(RoutePage.getWaypointSuggestionNameLocator(waypointSuggestion)).toHaveText(
+      expectedName
+    );
+    await expect(RoutePage.getWaypointSuggestionChLocator(waypointSuggestion)).toHaveText(
+      expectedCh
+    );
+    await expect(RoutePage.getWaypointSuggestionUicLocator(waypointSuggestion)).toHaveText(
+      expectedUic
+    );
+    await expect(RoutePage.getWaypointSuggestionDistanceLocator(waypointSuggestion)).toHaveText(
+      expectedKm
+    );
+  }
+
+  // Validates the added waypoints by checking the name, CH, and UIC.
+  static async validateAddedWaypoint(
+    droppedWaypoint: Locator,
+    expectedName: string,
+    expectedCh: string,
+    expectedUic: string
+  ) {
+    await expect(RoutePage.getWaypointDroppedNameLocator(droppedWaypoint)).toHaveText(expectedName);
+    await expect(RoutePage.getWaypointDroppedChLocator(droppedWaypoint)).toHaveText(expectedCh);
+    await expect(RoutePage.getWaypointDroppedUicLocator(droppedWaypoint)).toHaveText(expectedUic);
+  }
+
+  // Adds new waypoints by clicking the add button for suggested waypoints and verifying the added waypoints.
+  async addNewWaypoints(
+    suggestedWaypointsCount: number,
+    waypointToAddNames: string[],
+    expectedValues: { name: string; ch: string; uic: string; km: string }[]
+  ) {
+    await this.addWaypointsButton.click();
+    await expect(this.viaModal).toBeVisible();
+    await expect(this.waypointSuggestions).toHaveCount(suggestedWaypointsCount);
+
+    let waypointSuggestionCount: number = 0;
+
+    while (waypointSuggestionCount < expectedValues.length) {
+      const waypointSuggestion = this.waypointSuggestions.nth(waypointSuggestionCount);
+      const expectedValue = expectedValues[waypointSuggestionCount];
+
+      await RoutePage.validateWaypointSuggestions(
+        waypointSuggestion,
+        expectedValue.name,
+        expectedValue.ch,
+        expectedValue.uic,
+        expectedValue.km
+      );
+
+      waypointSuggestionCount += 1;
+    }
+
+    await this.clickOnViaAddButtons(...waypointToAddNames);
+    await this.closeViaModalButton.click();
+
+    let droppedWaypointCount: number = 0;
+
+    while (droppedWaypointCount < expectedValues.length) {
+      const droppedWaypoint = this.droppedWaypoints.nth(droppedWaypointCount);
+      const expectedValue = expectedValues[droppedWaypointCount];
+
+      await RoutePage.validateAddedWaypoint(
+        droppedWaypoint,
+        expectedValue.name,
+        expectedValue.ch,
+        expectedValue.uic
+      );
+
+      droppedWaypointCount += 1;
+    }
+  }
+}
+export default RoutePage;
diff --git a/front/tests/pages/op-timetable-page-model.ts b/front/tests/pages/op-timetable-page-model.ts
index 8d668485d0d..64bedbd87a8 100644
--- a/front/tests/pages/op-timetable-page-model.ts
+++ b/front/tests/pages/op-timetable-page-model.ts
@@ -212,12 +212,6 @@ class OperationalStudiesTimetablePage {
     }
   }
 
-  async verifyTimeStopsDataSheetVisibility(timeout = 60 * 1000): Promise<void> {
-    // Wait for the Times and Stops simulation dataSheet to be fully loaded with a specified timeout (default: 60 seconds)
-    await expect(this.timeStopsDataSheet).toBeVisible({ timeout });
-    await this.timeStopsDataSheet.scrollIntoViewIfNeeded();
-  }
-
   async clickOnEditTrain() {
     await this.timetableTrains.first().hover();
     await this.editTrainButton.click();
diff --git a/front/tests/pages/operational-studies-page-model.ts b/front/tests/pages/operational-studies-page-model.ts
index 630449bbdb4..f4371af1945 100644
--- a/front/tests/pages/operational-studies-page-model.ts
+++ b/front/tests/pages/operational-studies-page-model.ts
@@ -1,191 +1,95 @@
 import { expect, type Locator, type Page } from '@playwright/test';
 
-import RollingStockSelectorPage from './rollingstock-selector-page';
-import enTranslations from '../../public/locales/en/operationalStudies/manageTrainSchedule.json';
-import frTranslations from '../../public/locales/fr/operationalStudies/manageTrainSchedule.json';
-import { clickWithDelay } from '../utils';
+import CommonPage from './common-page-model';
+import manageTrainScheduleTranslation from '../../public/locales/fr/operationalStudies/manageTrainSchedule.json';
 
-class OperationalStudiesPage {
-  readonly page: Page;
+const trainAddedTranslation = manageTrainScheduleTranslation.trainAdded;
 
-  readonly addScenarioTrainBtn: Locator;
+class OperationalStudiesPage extends CommonPage {
+  readonly addScenarioTrainButton: Locator;
 
-  readonly getRollingStockTab: Locator;
+  readonly rollingStockTab: Locator;
 
-  readonly getRollingStockSelector: Locator;
+  readonly routeTab: Locator;
 
-  readonly getEmptyRollingStockSelector: Locator;
-
-  readonly getRouteTab: Locator;
-
-  readonly pathfindingNoState: Locator;
-
-  readonly noOriginChosen: Locator;
-
-  readonly noDestinationChosen: Locator;
-
-  readonly searchByTrigramButton: Locator;
-
-  readonly searchByTrigramContainer: Locator;
-
-  readonly searchByTrigramInput: Locator;
-
-  readonly searchByTrigramSubmit: Locator;
-
-  readonly resultPathfindingDone: Locator;
-
-  readonly originInfo: Locator;
-
-  readonly destinationInfo: Locator;
-
-  readonly viaInfo: Locator;
-
-  readonly originDeleteButton: Locator;
-
-  readonly destinationDeleteButton: Locator;
+  readonly startTimeField: Locator;
 
-  readonly viaDeleteButton: Locator;
+  readonly infraLoadState: Locator;
 
-  readonly addWaypointsButton: Locator;
+  readonly resultPathfindingDistance: Locator;
 
-  readonly reverseItineraryButton: Locator;
+  readonly returnSimulationResultButton: Locator;
 
-  readonly deleteItineraryButton: Locator;
+  readonly deltaInput: Locator;
 
-  readonly droppedWaypoints: Locator;
+  readonly trainCountInput: Locator;
 
-  readonly waypointSuggestions: Locator;
+  readonly trainScheduleNameInput: Locator;
 
-  readonly viaModal: Locator;
+  readonly addTrainScheduleButton: Locator;
 
-  readonly closeViaModalButton: Locator;
+  readonly trainTimetable: Locator;
 
-  readonly missingParamMessage: Locator;
+  readonly simulationSettingsTab: Locator;
 
-  readonly startTimeField: Locator;
+  readonly timesAndStopsTab: Locator;
 
   constructor(page: Page) {
-    this.page = page;
-    this.addScenarioTrainBtn = page.getByTestId('scenarios-add-train-schedule-button');
-    this.getRollingStockTab = page.getByTestId('tab-rollingstock');
-    this.getRollingStockSelector = page.getByTestId('rollingstock-selector');
-    this.getEmptyRollingStockSelector = page.getByTestId('rollingstock-selector-empty');
-    this.getRouteTab = page.getByTestId('tab-pathfinding');
-    this.pathfindingNoState = page.getByTestId('pathfinding-no-state');
-    this.noOriginChosen = page.getByTestId('no-origin-chosen-text');
-    this.noDestinationChosen = page.getByTestId('no-destination-chosen-text');
-    this.searchByTrigramButton = page.getByTestId('rocket-button');
-    this.searchByTrigramContainer = page.getByTestId('type-and-path-container');
-    this.searchByTrigramInput = page.getByTestId('type-and-path-input');
-    this.searchByTrigramSubmit = page.getByTestId('submit-search-by-trigram');
-    this.resultPathfindingDone = page.getByTestId('result-pathfinding-done');
-    this.originInfo = page.getByTestId('origin-op-info');
-    this.destinationInfo = page.getByTestId('destination-op-info');
-    this.viaInfo = page.getByTestId('via-op-info');
-    this.originDeleteButton = page.getByTestId('delete-origin-button');
-    this.destinationDeleteButton = page.getByTestId('delete-destination-button');
-    this.viaDeleteButton = page.getByTestId('delete-via-button');
-    this.addWaypointsButton = page.getByTestId('add-waypoints-button');
-    this.reverseItineraryButton = page.getByTestId('reverse-itinerary-button');
-    this.deleteItineraryButton = page.getByTestId('delete-itinerary-button');
-    this.droppedWaypoints = page.getByTestId('dropped-via-info');
-    this.waypointSuggestions = page.locator('.suggested-via-clickable');
-    this.viaModal = page.locator('.manage-vias-modal');
-    this.closeViaModalButton = page.getByLabel('Close');
-    this.missingParamMessage = page.getByTestId('missing-params-info');
+    super(page);
+    this.infraLoadState = page.locator('.infra-loading-state');
+    this.resultPathfindingDistance = page.getByTestId('result-pathfinding-distance');
+    this.addScenarioTrainButton = page.getByTestId('scenarios-add-train-schedule-button');
+    this.rollingStockTab = page.getByTestId('tab-rollingstock');
+    this.routeTab = page.getByTestId('tab-pathfinding');
+    this.simulationSettingsTab = page.getByTestId('tab-simulation-settings');
+    this.timesAndStopsTab = page.getByTestId('tab-timesStops');
     this.startTimeField = page.locator('#trainSchedule-startTime');
-  }
-
-  // Gets the name locator of a waypoint suggestion.
-  static getWaypointSuggestionNameLocator(waypointSuggestion: Locator): Locator {
-    return waypointSuggestion.locator('.suggested-via-name');
-  }
-
-  // Gets the CH locator of a waypoint suggestion.
-  static getWaypointSuggestionChLocator(waypointSuggestion: Locator): Locator {
-    return waypointSuggestion.locator('.suggested-via-ch');
-  }
-
-  // Gets the UIC locator of a waypoint suggestion.
-  static getWaypointSuggestionUicLocator(waypointSuggestion: Locator): Locator {
-    return waypointSuggestion.locator('.suggested-via-uic');
-  }
+    this.returnSimulationResultButton = page.getByTestId('return-simulation-result');
+    this.trainCountInput = page.locator('#osrdconf-traincount');
+    this.deltaInput = page.locator('#osrdconf-delta');
+    this.addTrainScheduleButton = page.getByTestId('add-train-schedules');
+    this.trainScheduleNameInput = page.locator('#trainSchedule-name');
 
-  // Gets the distance locator of a waypoint suggestion.
-  static getWaypointSuggestionDistanceLocator(waypointSuggestion: Locator): Locator {
-    return waypointSuggestion.getByTestId('suggested-via-distance');
+    this.trainTimetable = page
+      .locator('.scenario-timetable-trains')
+      .locator('.scenario-timetable-train');
   }
 
-  // Gets the name locator of a dropped waypoint.
-  static getWaypointDroppedNameLocator(droppedWaypoint: Locator): Locator {
-    return droppedWaypoint.getByTestId('via-dropped-name');
-  }
-
-  // Gets the CH locator of a dropped waypoint.
-  static getWaypointDroppedChLocator(droppedWaypoint: Locator): Locator {
-    return droppedWaypoint.getByTestId('via-dropped-ch');
-  }
-
-  // Gets the UIC locator of a dropped waypoint.
-  static getWaypointDroppedUicLocator(droppedWaypoint: Locator): Locator {
-    return droppedWaypoint.getByTestId('via-dropped-uic');
-  }
-
-  // Gets the locator of the origin by trigram.
-  private getOriginLocatorByTrigram(trigram: string): Locator {
-    return this.page.getByTestId(`typeandpath-op-${trigram}`);
-  }
-
-  // Gets the locator of the destination by trigram.
-  private getDestinationLocatorByTrigram(trigram: string): Locator {
-    return this.page.getByTestId(`typeandpath-op-${trigram}`);
-  }
-
-  // Gets the locator of the via by trigram.
-  private getViaLocatorByTrigram(trigram: string): Locator {
-    return this.page.getByTestId(`typeandpath-op-${trigram}`);
+  // Clicks on the button to add a scenario train.
+  async clickOnAddTrainButton() {
+    await this.addScenarioTrainButton.click();
   }
 
-  // Gets the add button locator by via name.
-  private getAddButtonLocatorByViaName(viaName: string): Locator {
-    return this.page.getByTitle(viaName).getByTestId('suggested-via-add-button');
+  // Open Route Tab
+  async clickOnRouteTab() {
+    await this.routeTab.click();
   }
 
-  // Gets the delete button locator by via name.
-  private getDeleteButtonLocatorByViaName(viaName: string): Locator {
-    return this.page.getByTitle(viaName).getByTestId('suggested-via-delete-button');
+  // Open Rolling Stock Tab
+  async clickOnRollingStockTab() {
+    await this.rollingStockTab.click();
   }
 
-  // Gets the pathfinding marker on the map by marker name.
-  private getMapPathfindingMarker(markerName: string): Locator {
-    return this.page.locator('#map-container').getByText(markerName, { exact: true });
+  // Open Times And Stops Tab
+  async clickOnTimesAndStopsTab() {
+    await this.timesAndStopsTab.click();
   }
 
-  // Clicks on the button to add a scenario train.
-  async clickOnAddTrainBtn() {
-    await this.addScenarioTrainBtn.click();
+  // Open Simulation Settings Tab
+  async clickOnSimulationSettingsTab() {
+    await this.simulationSettingsTab.click();
   }
 
   // Verifies that the Rolling Stock and Route tabs have warning classes.
   async verifyTabWarningPresence() {
-    await expect(this.getRollingStockTab).toHaveClass(/warning/);
-    await expect(this.getRouteTab).toHaveClass(/warning/);
+    await expect(this.rollingStockTab).toHaveClass(/warning/);
+    await expect(this.routeTab).toHaveClass(/warning/);
   }
 
   // Verifies that the Rolling Stock and Route tabs do not have warning classes.
   async verifyTabWarningAbsence() {
-    await expect(this.getRollingStockTab).not.toHaveClass(/warning/);
-    await expect(this.getRouteTab).not.toHaveClass(/warning/);
-  }
-
-  // Clicks to open the empty rolling stock selector.
-  async openEmptyRollingStockSelector() {
-    await this.getEmptyRollingStockSelector.click();
-  }
-
-  // Clicks to open the rolling stock selector.
-  async openRollingStockSelector() {
-    await this.getRollingStockSelector.click();
+    await expect(this.rollingStockTab).not.toHaveClass(/warning/);
+    await expect(this.routeTab).not.toHaveClass(/warning/);
   }
 
   // Set the train start time
@@ -197,209 +101,45 @@ class OperationalStudiesPage {
     await expect(this.startTimeField).toHaveValue(startTime);
   }
 
-  // Clicks the button to submit the search by trigram.
-  async clickSearchByTrigramSubmitButton() {
-    await this.searchByTrigramSubmit.click();
-  }
-
-  // Clicks the button to delete the itinerary.
-  async clickDeleteItineraryButton() {
-    await this.deleteItineraryButton.click();
-  }
-
-  // Verifies that no route is selected and displays appropriate messages based on language.
-  async verifyNoSelectedRoute(selectedLanguage: string) {
-    const translations = selectedLanguage === 'English' ? enTranslations : frTranslations;
-    const isNoOriginChosenVisible = await this.noOriginChosen.isVisible();
-    const isNoDestinationChosenVisible = await this.noDestinationChosen.isVisible();
-
-    if (isNoOriginChosenVisible) {
-      const noOriginChosenText = await this.noOriginChosen.innerText();
-      expect(noOriginChosenText).toEqual(translations.noOriginChosen);
-    }
-    if (isNoDestinationChosenVisible) {
-      const noDestinationChosenText = await this.noDestinationChosen.innerText();
-      expect(noDestinationChosenText).toEqual(translations.noDestinationChosen);
-    }
-  }
-
-  // Performs pathfinding by entering origin, destination, and optionally via trigrams.
-  async performPathfindingByTrigram(
-    originTrigram: string,
-    destinationTrigram: string,
-    viaTrigram?: string
-  ) {
-    await this.searchByTrigramButton.click();
-    await expect(this.searchByTrigramContainer).toBeVisible();
-
-    const inputTrigramText = viaTrigram
-      ? `${originTrigram} ${viaTrigram} ${destinationTrigram}`
-      : `${originTrigram} ${destinationTrigram}`;
-    await this.searchByTrigramInput.fill(inputTrigramText);
-
-    await expect(this.getOriginLocatorByTrigram(originTrigram)).toBeVisible();
-    await expect(this.getDestinationLocatorByTrigram(destinationTrigram)).toBeVisible();
-    if (viaTrigram) {
-      await expect(this.getViaLocatorByTrigram(viaTrigram)).toBeVisible();
-    }
-    const expectedOriginTrigram = await this.getOriginLocatorByTrigram(originTrigram).innerText();
-    const expectedDestinationTrigram =
-      await this.getDestinationLocatorByTrigram(destinationTrigram).innerText();
-    await this.clickSearchByTrigramSubmitButton();
-    await expect(this.searchByTrigramContainer).not.toBeVisible();
-    await this.page.waitForLoadState('load');
-    await expect(this.resultPathfindingDone).toBeVisible();
-
-    expect(await this.originInfo.innerText()).toEqual(expectedOriginTrigram);
-    expect(await this.destinationInfo.innerText()).toEqual(expectedDestinationTrigram);
+  async checkTrainHasBeenAdded() {
+    this.checkLastToastTitle(trainAddedTranslation);
   }
 
-  // Clicks the button to reverse the itinerary.
-  async clickOnReverseItinerary() {
-    await this.reverseItineraryButton.click();
+  async returnSimulationResult() {
+    await this.returnSimulationResultButton.click();
   }
 
-  // Clicks the buttons to delete origin, destination, and via waypoints and verifies missing parameters message.
-  async clickOnDeleteOPButtons(selectedLanguage: string) {
-    // Ensure all buttons are rendered and visible before proceeding
-    await Promise.all([
-      this.viaDeleteButton.waitFor({ state: 'visible' }),
-      this.originDeleteButton.waitFor({ state: 'visible' }),
-      this.destinationDeleteButton.waitFor({ state: 'visible' }),
-    ]);
-
-    // Click the buttons sequentially with waits to ensure UI stability
-    await clickWithDelay(this.viaDeleteButton);
-    await clickWithDelay(this.originDeleteButton);
-    await clickWithDelay(this.destinationDeleteButton);
-    const translations = selectedLanguage === 'English' ? enTranslations : frTranslations;
-    const expectedMessage = translations.pathfindingMissingParams.replace(
-      ': {{missingElements}}.',
-      ''
-    );
-    await this.missingParamMessage.waitFor({ state: 'visible' });
-    const actualMessage = await this.missingParamMessage.innerText();
-    expect(actualMessage).toContain(expectedMessage);
+  async checkPathfindingDistance(distance: string | RegExp) {
+    await this.page.waitForSelector('[data-testid="result-pathfinding-distance"]');
+    await expect(this.resultPathfindingDistance).toHaveText(distance);
   }
 
-  // Clicks the add buttons for the specified via names.
-  async clickOnViaAddButtons(...viaNames: string[]) {
-    for (const viaName of viaNames) {
-      await this.getAddButtonLocatorByViaName(viaName).click();
-      await expect(this.getDeleteButtonLocatorByViaName(viaName)).toBeVisible();
-      // TODO: Remove the timeout when #8958 is fixed
-      // Add a delay to prevent rapid consecutive clicks from blocking the UI
-      await this.page.waitForTimeout(500);
-    }
+  async checkInfraLoaded() {
+    await this.page.waitForSelector('.cached', { timeout: 60 * 1000 }); // Wait for the infrastructure to be fully loaded with a timeout of 60 seconds
+    await expect(this.infraLoadState).toHaveClass(/cached/);
   }
 
-  // Verifies that the specified markers are visible on the map.
-  async verifyMapMarkers(...markerNames: string[]) {
-    for (const markerName of markerNames) {
-      await expect(this.getMapPathfindingMarker(markerName)).toBeVisible();
-    }
+  async setNumberOfTrains(trainCount: string) {
+    await expect(this.trainCountInput).toBeVisible();
+    await this.trainCountInput.fill(trainCount);
   }
 
-  // Validates the waypoint suggestions by checking the name, CH, UIC, and distance.
-  static async validateWaypointSuggestions(
-    waypointSuggestion: Locator,
-    expectedName: string,
-    expectedCh: string,
-    expectedUic: string,
-    expectedKm: string
-  ) {
-    await expect(
-      OperationalStudiesPage.getWaypointSuggestionNameLocator(waypointSuggestion)
-    ).toHaveText(expectedName);
-    await expect(
-      OperationalStudiesPage.getWaypointSuggestionChLocator(waypointSuggestion)
-    ).toHaveText(expectedCh);
-    await expect(
-      OperationalStudiesPage.getWaypointSuggestionUicLocator(waypointSuggestion)
-    ).toHaveText(expectedUic);
-    await expect(
-      OperationalStudiesPage.getWaypointSuggestionDistanceLocator(waypointSuggestion)
-    ).toHaveText(expectedKm);
+  async setDelta(gapValue: string) {
+    await expect(this.deltaInput).toBeVisible();
+    await this.deltaInput.fill(gapValue);
   }
 
-  // Validates the added waypoints by checking the name, CH, and UIC.
-  static async validateAddedWaypoint(
-    droppedWaypoint: Locator,
-    expectedName: string,
-    expectedCh: string,
-    expectedUic: string
-  ) {
-    await expect(OperationalStudiesPage.getWaypointDroppedNameLocator(droppedWaypoint)).toHaveText(
-      expectedName
-    );
-    await expect(OperationalStudiesPage.getWaypointDroppedChLocator(droppedWaypoint)).toHaveText(
-      expectedCh
-    );
-    await expect(OperationalStudiesPage.getWaypointDroppedUicLocator(droppedWaypoint)).toHaveText(
-      expectedUic
-    );
+  async addTrainSchedule() {
+    await this.addTrainScheduleButton.click();
   }
 
-  // Adds new waypoints by clicking the add button for suggested waypoints and verifying the added waypoints.
-  async addNewWaypoints(
-    suggestedWaypointsCount: number,
-    waypointToAddNames: string[],
-    expectedValues: { name: string; ch: string; uic: string; km: string }[]
-  ) {
-    await this.addWaypointsButton.click();
-    await expect(this.viaModal).toBeVisible();
-    await expect(this.waypointSuggestions).toHaveCount(suggestedWaypointsCount);
-
-    let waypointSuggestionCount: number = 0;
-
-    while (waypointSuggestionCount < expectedValues.length) {
-      const waypointSuggestion = this.waypointSuggestions.nth(waypointSuggestionCount);
-      const expectedValue = expectedValues[waypointSuggestionCount];
-
-      await OperationalStudiesPage.validateWaypointSuggestions(
-        waypointSuggestion,
-        expectedValue.name,
-        expectedValue.ch,
-        expectedValue.uic,
-        expectedValue.km
-      );
-
-      waypointSuggestionCount += 1;
-    }
-
-    await this.clickOnViaAddButtons(...waypointToAddNames);
-    await this.closeViaModalButton.click();
-
-    let droppedWaypointCount: number = 0;
-
-    while (droppedWaypointCount < expectedValues.length) {
-      const droppedWaypoint = this.droppedWaypoints.nth(droppedWaypointCount);
-      const expectedValue = expectedValues[droppedWaypointCount];
-
-      await OperationalStudiesPage.validateAddedWaypoint(
-        droppedWaypoint,
-        expectedValue.name,
-        expectedValue.ch,
-        expectedValue.uic
-      );
-
-      droppedWaypointCount += 1;
-    }
+  async setTrainScheduleName(name: string) {
+    await this.trainScheduleNameInput.fill(name);
+    await expect(this.trainScheduleNameInput).toHaveValue(name);
   }
 
-  // Open Rolling Stock Selector, search for the added train, and select it
-  async selectRollingStock(rollingStockName: string) {
-    const rollingStockSelector = new RollingStockSelectorPage(this.page);
-    await this.openEmptyRollingStockSelector();
-    await rollingStockSelector.searchRollingstock(rollingStockName);
-    const rollingstockCard = rollingStockSelector.getRollingstockCardByTestID(
-      `rollingstock-${rollingStockName}`
-    );
-    await rollingstockCard.first().click();
-    await rollingstockCard.locator('button').click();
-    expect(await rollingStockSelector.getSelectedRollingStockName.first().innerText()).toEqual(
-      rollingStockName
-    );
+  async checkNumberOfTrains(number: number) {
+    await expect(this.trainTimetable).toHaveCount(number);
   }
 }
 export default OperationalStudiesPage;
diff --git a/front/tests/pages/project-page-model.ts b/front/tests/pages/project-page-model.ts
index 6dffac20a74..4b22c9407b8 100644
--- a/front/tests/pages/project-page-model.ts
+++ b/front/tests/pages/project-page-model.ts
@@ -1,164 +1,184 @@
 import { expect, type Locator, type Page } from '@playwright/test';
 
-import project from '../../public/locales/fr/operationalStudies/project.json';
+import CommonPage from './common-page-model';
+import { cleanText } from '../utils/dataNormalizer';
 
-class ProjectPage {
-  // The current page object
-  readonly page: Page;
+class ProjectPage extends CommonPage {
+  // Page locators
+  readonly projectNameLabel: Locator;
 
-  // Page information
-  readonly getProjectName: Locator;
+  readonly updateProjectButton: Locator;
 
-  readonly getProjectUpdateBtn: Locator;
+  readonly projectDescriptionLabel: Locator;
 
-  readonly getProjectDescription: Locator;
+  readonly projectObjectivesLabel: Locator;
 
-  readonly getProjectObjectives: Locator;
+  readonly projectFinancialInfoLabel: Locator;
 
-  readonly getProjectFinancialsInfos: Locator;
+  readonly projectFinancialAmountLabel: Locator;
 
-  readonly getProjectFinancialsAmount: Locator;
+  readonly projectTagsLabel: Locator;
 
-  readonly getProjectTags: Locator;
+  readonly addProjectButton: Locator;
 
-  // Locator for all links
-  readonly getBackToProjects: Locator;
+  readonly projectNameInput: Locator;
 
-  // Locator for the "back to home" logo
-  readonly getBackHomeLogo: Locator;
+  readonly projectDescriptionInput: Locator;
 
-  // Locator for the body
-  readonly getBody: Locator;
+  readonly projectObjectiveInput: Locator;
 
-  readonly translation: typeof project;
+  readonly projectFunderInput: Locator;
 
-  readonly getViteOverlay: Locator;
+  readonly projectBudgetInput: Locator;
 
-  readonly getAddProjectBtn: Locator;
+  readonly deleteProjectButton: Locator;
 
-  readonly getProjectNameInput: Locator;
+  readonly updateConfirmButton: Locator;
 
-  readonly getProjectDescriptionInput: Locator;
+  readonly deleteConfirmButton: Locator;
 
-  readonly getProjectObjectiveInput: Locator;
+  readonly createProjectButton: Locator;
 
-  readonly getProjectFunderInput: Locator;
-
-  readonly getProjectBudgetInput: Locator;
-
-  readonly getProjectDeleteBtn: Locator;
-
-  readonly getProjectUpdateConfirmBtn: Locator;
-
-  readonly getProjectDeleteConfirmBtn: Locator;
+  readonly firstSelectedProject: Locator;
 
   constructor(page: Page) {
-    this.page = page;
-    // Initialize locators using roles and text content
-    this.getProjectName = page.locator('.project-details-title-name');
-    this.getProjectUpdateBtn = page.locator('.project-details-title-modify-button');
-    this.getProjectDescription = page.locator('.project-details-title-description');
-    this.getProjectObjectives = page.locator('.project-details-title-objectives');
-    this.getProjectFinancialsAmount = page.locator('.project-details-financials-amount');
-    this.getProjectFinancialsInfos = page.locator('.project-details-financials-infos');
-    this.getProjectTags = page.locator('.project-details-tags');
-    this.getBackHomeLogo = page.locator('.mastheader-logo');
-    this.getBackToProjects = page.getByRole('heading', { name: 'Projets' });
-    this.getBody = page.locator('body');
-    this.translation = project;
-    this.getViteOverlay = page.locator('vite-plugin-checker-error-overlay');
-    this.getAddProjectBtn = page.getByTestId('addProject');
-    this.getProjectNameInput = page.locator('#projectInputName');
-    this.getProjectDescriptionInput = page.locator('#projectDescription');
-    this.getProjectObjectiveInput = page.locator('#projectObjectives');
-    this.getProjectFunderInput = page.locator('#projectInputFunders');
-    this.getProjectBudgetInput = page.locator('#projectInputBudget');
-    this.getProjectDeleteBtn = page.getByTestId('deleteProjects');
-    this.getProjectUpdateConfirmBtn = page.locator('#modal-content').getByTestId('updateProject');
-    this.getProjectDeleteConfirmBtn = page.locator('#modal-content').getByTestId('deleteProject');
-  }
-
-  // Completely remove VITE button & sign
-  async removeViteOverlay() {
-    if ((await this.getViteOverlay.count()) > 0) {
-      await this.getViteOverlay.evaluate((node) => node.setAttribute('style', 'display:none;'));
+    super(page);
+    this.projectNameLabel = page.locator('.project-details-title-name');
+    this.updateProjectButton = page.getByTestId('project-update-button');
+    this.projectDescriptionLabel = page.locator('.project-details-title-description');
+    this.projectObjectivesLabel = page.locator('.project-details-title-objectives');
+    this.projectFinancialAmountLabel = page.locator('.project-details-financials-amount');
+    this.projectFinancialInfoLabel = page.locator('.project-details-financials-infos');
+    this.projectTagsLabel = page.locator('.project-details-tags');
+    this.createProjectButton = page.getByTestId('createProject');
+    this.addProjectButton = page.getByTestId('addProject');
+    this.projectNameInput = page.locator('#projectInputName');
+    this.projectDescriptionInput = page.locator('#projectDescription');
+    this.projectObjectiveInput = page.locator('#projectObjectives');
+    this.projectFunderInput = page.locator('#projectInputFunders');
+    this.projectBudgetInput = page.locator('#projectInputBudget');
+    this.deleteProjectButton = page.getByTestId('deleteProjects');
+    this.updateConfirmButton = page.locator('#modal-content').getByTestId('updateProject');
+    this.deleteConfirmButton = page.locator('#modal-content').getByTestId('deleteProject');
+    this.firstSelectedProject = page.locator('.projects-selection-toolbar').locator('span').first();
+  }
+
+  // Creates or updates a project based on the provided details.
+  async createOrUpdateProject({
+    name,
+    description,
+    objectives,
+    funders,
+    budget,
+    tags,
+    isUpdate = false,
+  }: {
+    name: string;
+    description: string;
+    objectives: string;
+    funders: string;
+    budget: string;
+    tags: string[];
+    isUpdate?: boolean;
+  }) {
+    if (isUpdate) {
+      await this.updateProjectButton.click();
+    } else {
+      await expect(this.addProjectButton).toBeVisible();
+      await this.addProjectButton.click();
     }
-  }
-
-  // Navigate to the Home page
-  async goToHomePage() {
-    await this.page.goto('/');
-    await this.removeViteOverlay();
-  }
-
-  // Click on the logo to navigate back to the home page
-  async backToHomePage() {
-    await this.getBackHomeLogo.click();
-  }
-
-  // Assert that the breadcrumb project link is displayed on the page
-  async getDisplayLinks() {
-    expect(this.getBackToProjects).toBeVisible();
-  }
-
-  getTranslations(key: keyof typeof project) {
-    return this.translation[key];
-  }
-
-  async openProjectModalCreation() {
-    await this.getAddProjectBtn.click();
-  }
-
-  async openProjectModalUpdate() {
-    await this.getProjectUpdateBtn.click();
-  }
 
+    await this.fillProjectDetails({ name, description, objectives, funders, budget, tags });
+    await (isUpdate ? this.updateConfirmButton.click() : this.createProjectButton.click());
+    await this.page.waitForURL('**/projects/*');
+  }
+
+  // Fills the project details in the form inputs.
+  private async fillProjectDetails({
+    name,
+    description,
+    objectives,
+    funders,
+    budget,
+    tags,
+  }: {
+    name: string;
+    description: string;
+    objectives: string;
+    funders: string;
+    budget: string;
+    tags: string[];
+  }) {
+    await this.projectNameInput.fill(name);
+    await this.projectDescriptionInput.fill(description);
+    await this.projectObjectiveInput.fill(objectives);
+    await this.projectFunderInput.fill(funders);
+    await this.projectBudgetInput.fill(budget);
+    for (const tag of tags) await this.setTag(tag);
+  }
+
+  // Validates if the project's financial budget matches the expected value.
+  async validateNumericBudget(expectedBudget: string) {
+    const budgetText = await this.projectFinancialAmountLabel.textContent();
+    expect(budgetText?.replace(/[^0-9]/g, '')).toEqual(expectedBudget);
+  }
+
+  // Validates if the project objectives match the expected objectives.
+  async validateObjectives(expectedObjectives: string) {
+    const objectives = await this.projectObjectivesLabel.textContent();
+    expect(cleanText(objectives)).toContain(cleanText(expectedObjectives));
+  }
+
+  // Validates if all project details are displayed correctly.
+  async validateProjectData({
+    name,
+    description,
+    objectives,
+    funders,
+    budget,
+    tags,
+  }: {
+    name: string;
+    description: string;
+    objectives: string;
+    funders: string;
+    budget: string;
+    tags: string[];
+  }) {
+    expect(await this.projectNameLabel.textContent()).toContain(name);
+    expect(await this.projectDescriptionLabel.textContent()).toContain(description);
+    await this.validateObjectives(objectives);
+    expect(await this.projectFinancialInfoLabel.textContent()).toContain(funders);
+    await this.validateNumericBudget(budget);
+    expect(await this.projectTagsLabel.textContent()).toContain(tags.join(''));
+  }
+
+  // Opens a project by its test ID.
   async openProjectByTestId(projectTestId: string | RegExp) {
     await this.page.getByTestId(projectTestId).getByTestId('openProject').first().click();
   }
 
-  async setProjectName(name: string) {
-    await this.getProjectNameInput.fill(name);
-  }
-
-  async setProjectDescription(description: string) {
-    await this.getProjectDescriptionInput.fill(description);
-  }
-
-  async setProjectObjectives(objectives: string) {
-    await this.getProjectObjectiveInput.fill(objectives);
-  }
-
-  async setProjectFunder(funder: string) {
-    await this.getProjectFunderInput.fill(funder);
-  }
-
-  async setProjectBudget(budget: string) {
-    await this.getProjectBudgetInput.fill(budget);
-  }
-
-  getProjectByName(name: string) {
-    return this.page.locator(`text=${name}`);
-  }
-
+  // Clicks on a project based on its name.
   async clickProjectByName(name: string) {
     await this.getProjectByName(name).first().click();
+    expect(this.firstSelectedProject);
   }
 
-  async clickProjectDeleteBtn() {
-    await this.getProjectDeleteBtn.click();
-  }
-
-  async checkLabelProjectSelected() {
-    expect(this.page.locator('.projects-selection-toolbar').locator('span').first());
-  }
-
-  async clickProjectUpdateConfirmBtn() {
-    await this.getProjectUpdateConfirmBtn.click();
+  // Retrieves a project element by its name.
+  getProjectByName(name: string) {
+    return this.page.locator(`text=${name}`);
   }
 
-  async clickProjectDeleteConfirmBtn() {
-    await this.getProjectDeleteConfirmBtn.click();
+  // Deletes a project by its name.
+  async deleteProject(name: string) {
+    await this.deleteProjectButton.click();
+    await expect(this.deleteProjectButton).not.toBeEmpty();
+    await expect(this.deleteConfirmButton).toBeVisible();
+    await this.deleteConfirmButton.click();
+    await expect(this.deleteConfirmButton).not.toBeVisible();
+    await expect(this.deleteProjectButton).not.toBeVisible();
+    await expect(this.getProjectByName(name)).not.toBeVisible();
   }
 }
+
 export default ProjectPage;
diff --git a/front/tests/pages/rollingstock-editor-page-model.ts b/front/tests/pages/rollingstock-editor-page-model.ts
index ce925445829..c7b7c23ff2c 100644
--- a/front/tests/pages/rollingstock-editor-page-model.ts
+++ b/front/tests/pages/rollingstock-editor-page-model.ts
@@ -4,68 +4,68 @@ import CommonPage from './common-page-model';
 import { fillAndCheckInputById } from '../utils/index';
 
 class RollingstockEditorPage extends CommonPage {
-  readonly getNewRollingstockButton: Locator;
+  readonly newRollingstockButton: Locator;
 
-  readonly getSubmitRollingstockButton: Locator;
+  readonly submitRollingstockButton: Locator;
 
-  readonly getRollingstockDetailsButton: Locator;
+  readonly rollingstockDetailsButton: Locator;
 
-  readonly getSpeedEffortCurvesButton: Locator;
+  readonly speedEffortCurvesButton: Locator;
 
-  readonly getRollingStockSpreadsheet: Locator;
+  readonly rollingStockSpreadsheet: Locator;
 
-  readonly getRollingStockSearchInput: Locator;
+  readonly rollingStockSearchInput: Locator;
 
-  readonly getRollingStockEditorList: Locator;
+  readonly rollingStockEditorList: Locator;
 
-  readonly getPowerRestrictionSelector: Locator;
+  readonly powerRestrictionSelector: Locator;
 
-  readonly getElectricalProfileSelector: Locator;
+  readonly electricalProfileSelector: Locator;
 
-  readonly getLoadingGauge: Locator;
+  readonly loadingGauge: Locator;
 
-  readonly getTractionModeSelector: Locator;
+  readonly tractionModeSelector: Locator;
 
-  readonly getConfirmModalButtonYes: Locator;
+  readonly confirmModalButtonYes: Locator;
 
   readonly addPowerRestrictionButton: Locator;
 
-  readonly getPowerRestrictionModalBody: Locator;
+  readonly powerRestrictionModalBody: Locator;
 
-  readonly getSelectedElectricalProfileButton: Locator;
+  readonly selectedElectricalProfileButton: Locator;
 
   readonly deleteSelectedElectricalProfileButton: Locator;
 
-  readonly getEditRollingStockButton: Locator;
+  readonly editRollingStockButton: Locator;
 
-  readonly getDuplicateRollingStockButton: Locator;
+  readonly duplicateRollingStockButton: Locator;
 
-  readonly getDeleteRollingStockButton: Locator;
+  readonly deleteRollingStockButton: Locator;
 
   constructor(page: Page) {
     super(page);
-    this.getNewRollingstockButton = page.getByTestId('new-rollingstock-button');
-    this.getSubmitRollingstockButton = page.getByTestId('submit-rollingstock-button');
-    this.getRollingstockDetailsButton = page.getByTestId('tab-rollingstock-details');
-    this.getSpeedEffortCurvesButton = page.getByTestId('tab-rollingstock-curves');
-    this.getRollingStockSpreadsheet = page.locator('.dsg-container');
-    this.getRollingStockSearchInput = page.locator('#searchfilter');
-    this.getRollingStockEditorList = page.getByTestId('rollingstock-editor-list');
-    this.getPowerRestrictionSelector = page.getByTestId('power-restriction-selector');
-    this.getElectricalProfileSelector = page.getByTestId('electrical-profile-selector');
-    this.getLoadingGauge = page.locator('#loadingGauge');
-    this.getTractionModeSelector = page.getByTestId('traction-mode-selector');
-    this.getConfirmModalButtonYes = page.getByTestId('confirm-modal-button-yes');
-    this.addPowerRestrictionButton = this.getPowerRestrictionSelector.getByRole('button').nth(1);
-    this.getPowerRestrictionModalBody = page.locator('#modal-body');
-    this.getSelectedElectricalProfileButton = this.getElectricalProfileSelector.getByRole('button');
-    this.deleteSelectedElectricalProfileButton = this.getSelectedElectricalProfileButton.getByRole(
+    this.newRollingstockButton = page.getByTestId('new-rollingstock-button');
+    this.submitRollingstockButton = page.getByTestId('submit-rollingstock-button');
+    this.rollingstockDetailsButton = page.getByTestId('tab-rollingstock-details');
+    this.speedEffortCurvesButton = page.getByTestId('tab-rollingstock-curves');
+    this.rollingStockSpreadsheet = page.locator('.dsg-container');
+    this.rollingStockSearchInput = page.locator('#searchfilter');
+    this.rollingStockEditorList = page.getByTestId('rollingstock-editor-list');
+    this.powerRestrictionSelector = page.getByTestId('power-restriction-selector');
+    this.electricalProfileSelector = page.getByTestId('electrical-profile-selector');
+    this.loadingGauge = page.locator('#loadingGauge');
+    this.tractionModeSelector = page.getByTestId('traction-mode-selector');
+    this.confirmModalButtonYes = page.getByTestId('confirm-modal-button-yes');
+    this.addPowerRestrictionButton = this.powerRestrictionSelector.getByRole('button').nth(1);
+    this.powerRestrictionModalBody = page.locator('#modal-body');
+    this.selectedElectricalProfileButton = this.electricalProfileSelector.getByRole('button');
+    this.deleteSelectedElectricalProfileButton = this.selectedElectricalProfileButton.getByRole(
       'button',
       { name: 'Delete item', exact: true }
     );
-    this.getEditRollingStockButton = page.getByTestId('rollingstock-edit-button');
-    this.getDuplicateRollingStockButton = page.getByTestId('rollingstock-duplicate-button');
-    this.getDeleteRollingStockButton = page.getByTestId('rollingstock-delete-button');
+    this.editRollingStockButton = page.getByTestId('rollingstock-edit-button');
+    this.duplicateRollingStockButton = page.getByTestId('rollingstock-duplicate-button');
+    this.deleteRollingStockButton = page.getByTestId('rollingstock-delete-button');
   }
 
   // Navigate to the Rolling Stock Editor Page
@@ -78,17 +78,17 @@ class RollingstockEditorPage extends CommonPage {
 
   // Click the New Rolling Stock Button
   async clickOnNewRollingstockButton() {
-    await this.getNewRollingstockButton.click();
+    await this.newRollingstockButton.click();
   }
 
   // Search for a rolling stock
   async searchRollingStock(rollingStockName: string) {
-    await this.getRollingStockSearchInput.fill(rollingStockName);
+    await this.rollingStockSearchInput.fill(rollingStockName);
   }
 
   // Clear the search for a rolling stock
   async clearSearchRollingStock() {
-    await this.getRollingStockSearchInput.clear();
+    await this.rollingStockSearchInput.clear();
   }
 
   // Select a rolling stock from the list
@@ -100,32 +100,32 @@ class RollingstockEditorPage extends CommonPage {
   // Edit a rolling stock
   async editRollingStock(rollingStockName: string) {
     await this.selectRollingStock(rollingStockName);
-    await this.getEditRollingStockButton.click();
+    await this.editRollingStockButton.click();
   }
 
   // Click the Submit Rolling Stock Button
   async clickOnSubmitRollingstockButton() {
-    await this.getSubmitRollingstockButton.click();
+    await this.submitRollingstockButton.click();
   }
 
   // Click the Rolling Stock Details Button
   async clickOnRollingstockDetailsButton() {
-    await this.getRollingstockDetailsButton.click();
+    await this.rollingstockDetailsButton.click();
   }
 
   // Click the Speed Effort Curves Button
   async clickOnSpeedEffortCurvesButton() {
-    await this.getSpeedEffortCurvesButton.click();
+    await this.speedEffortCurvesButton.click();
   }
 
   // Get Velocity cell by row number
   getVelocityCellByRow(row: number) {
-    return this.getRollingStockSpreadsheet.locator('.dsg-row').nth(row).locator('.dsg-cell').nth(1);
+    return this.rollingStockSpreadsheet.locator('.dsg-row').nth(row).locator('.dsg-cell').nth(1);
   }
 
   // Get Velocity cell value by row number
   async getVelocityCellByRowValue(row: number) {
-    return this.getRollingStockSpreadsheet
+    return this.rollingStockSpreadsheet
       .locator('.dsg-row')
       .nth(row)
       .locator('.dsg-cell')
@@ -136,14 +136,14 @@ class RollingstockEditorPage extends CommonPage {
 
   // Get Effort cell by row number
   getEffortCellByRow(row: number) {
-    return this.getRollingStockSpreadsheet.locator('.dsg-row').nth(row).locator('.dsg-cell').last();
+    return this.rollingStockSpreadsheet.locator('.dsg-row').nth(row).locator('.dsg-cell').last();
   }
 
   // Get Effort cell value by row number
   // Note: This method assumes there are at least three cells per row.
   // If the structure changes, update the .nth() index accordingly.
   async getEffortCellByRowValue(row: number) {
-    return this.getRollingStockSpreadsheet
+    return this.rollingStockSpreadsheet
       .locator('.dsg-row')
       .nth(row)
       .locator('.dsg-cell')
@@ -175,8 +175,8 @@ class RollingstockEditorPage extends CommonPage {
 
   // Select gauge value
   async selectLoadingGauge(value: string) {
-    await this.getLoadingGauge.selectOption(value);
-    expect(await this.getLoadingGauge.inputValue()).toBe(value);
+    await this.loadingGauge.selectOption(value);
+    expect(await this.loadingGauge.inputValue()).toBe(value);
   }
 
   // Fill speed effort curves with or without power restriction
@@ -188,11 +188,11 @@ class RollingstockEditorPage extends CommonPage {
   ) {
     if (!isPowerRestrictionSpecified) {
       await this.clickOnSpeedEffortCurvesButton();
-      await this.getTractionModeSelector.getByRole('button').click();
-      await this.getTractionModeSelector
+      await this.tractionModeSelector.getByRole('button').click();
+      await this.tractionModeSelector
         .getByRole('button', { name: electricalProfilesValue, exact: true })
         .click();
-      await expect(this.getTractionModeSelector.getByTitle(electricalProfilesValue)).toBeVisible();
+      await expect(this.tractionModeSelector.getByTitle(electricalProfilesValue)).toBeVisible();
     }
 
     await this.fillSpeedEffortData(
@@ -212,15 +212,15 @@ class RollingstockEditorPage extends CommonPage {
   ) {
     if (isPowerRestrictionSpecified && !toBeUpdated) {
       await this.addPowerRestrictionButton.click();
-      await this.getPowerRestrictionModalBody
+      await this.powerRestrictionModalBody
         .getByTitle(powerRestrictionValue, { exact: true })
         .click();
       await expect(
-        this.getPowerRestrictionSelector.getByTitle(powerRestrictionValue.replace(/\s/g, ''))
+        this.powerRestrictionSelector.getByTitle(powerRestrictionValue.replace(/\s/g, ''))
       ).toBeVisible();
     }
     if (toBeUpdated) {
-      await this.getPowerRestrictionSelector
+      await this.powerRestrictionSelector
         .getByTitle(powerRestrictionValue, { exact: true })
         .click();
     }
@@ -241,7 +241,7 @@ class RollingstockEditorPage extends CommonPage {
     powerRestrictionValue: string
   ) {
     if (isPowerRestrictionSpecified) {
-      await this.getPowerRestrictionSelector
+      await this.powerRestrictionSelector
         .getByRole('button', { name: powerRestrictionValue })
         .click();
     }
@@ -257,11 +257,11 @@ class RollingstockEditorPage extends CommonPage {
 
   // Delete Electrical profile from the speed effort curves
   async deleteElectricalProfile(electricalProfileValue: string) {
-    await this.getSelectedElectricalProfileButton.getByTitle(electricalProfileValue).hover();
+    await this.selectedElectricalProfileButton.getByTitle(electricalProfileValue).hover();
     await this.deleteSelectedElectricalProfileButton.click();
-    await this.getConfirmModalButtonYes.click();
+    await this.confirmModalButtonYes.click();
     await expect(
-      this.getSelectedElectricalProfileButton.getByTitle(electricalProfileValue)
+      this.selectedElectricalProfileButton.getByTitle(electricalProfileValue)
     ).toBeHidden();
   }
 
@@ -282,19 +282,19 @@ class RollingstockEditorPage extends CommonPage {
   // Submit and confirm rolling stock creation
   async submitRollingStock() {
     await this.clickOnSubmitRollingstockButton();
-    await this.getConfirmModalButtonYes.click();
+    await this.confirmModalButtonYes.click();
   }
 
   // Duplicate rolling stock creation
   async duplicateRollingStock() {
-    await this.getDuplicateRollingStockButton.click();
+    await this.duplicateRollingStockButton.click();
   }
 
   // Delete a rolling stock
   async deleteRollingStock(rollingStockName: string) {
     await this.selectRollingStock(rollingStockName);
-    await this.getDeleteRollingStockButton.click();
-    await this.getConfirmModalButtonYes.click();
+    await this.deleteRollingStockButton.click();
+    await this.confirmModalButtonYes.click();
   }
 }
 export default RollingstockEditorPage;
diff --git a/front/tests/pages/rollingstock-selector-page.ts b/front/tests/pages/rollingstock-selector-page.ts
index 3e7e1c01b46..2947a4e9ec5 100644
--- a/front/tests/pages/rollingstock-selector-page.ts
+++ b/front/tests/pages/rollingstock-selector-page.ts
@@ -1,83 +1,83 @@
 import { type Locator, type Page, expect } from '@playwright/test';
 
-import BasePage from './base-page';
+import CommonPage from './common-page-model';
 import { extractNumberFromString } from '../utils/index';
 
-class RollingStockSelectorPage extends BasePage {
+class RollingStockSelectorPage extends CommonPage {
   readonly rollingStockSelectorButton: Locator;
 
-  readonly rollingStockSelectorModal: Locator;
+  readonly emptyRollingStockSelector: Locator;
 
-  readonly getResultsFound: Locator;
+  readonly rollingStockSelectorModal: Locator;
 
-  private rollingStockList: Locator;
+  readonly resultsFound: Locator;
 
   readonly rollingStockListItem: Locator;
 
-  readonly getRollingStockModalSearch: Locator;
+  readonly rollingStockModalSearch: Locator;
 
   readonly rollingStockMiniCards: Locator;
 
-  readonly getRollingstockSpanNames: Locator;
+  readonly rollingstockSpanNames: Locator;
 
-  readonly getElectricRollingStockFilter: Locator;
+  readonly electricRollingStockFilter: Locator;
 
-  readonly getThermalRollingStockFilter: Locator;
+  readonly thermalRollingStockFilter: Locator;
 
-  readonly getRollingStockSearchResult: Locator;
+  readonly rollingStockSearchResult: Locator;
 
-  readonly getThermalRollingStockIcons: Locator;
+  readonly thermalRollingStockIcons: Locator;
 
-  readonly getElectricRollingStockIcons: Locator;
+  readonly electricRollingStockIcons: Locator;
 
-  readonly getElectricRollingStockFirstIcon: Locator;
+  readonly electricRollingStockFirstIcon: Locator;
 
-  readonly getThermalRollingStockFirstIcon: Locator;
+  readonly thermalRollingStockFirstIcon: Locator;
 
-  readonly getRollingStockList: Locator;
+  readonly rollingStockList: Locator;
 
-  readonly getDualModeRollingStockIcons: Locator;
+  readonly dualModeRollingStockIcons: Locator;
 
-  readonly getNoRollingStockResult: Locator;
+  readonly noRollingStockResult: Locator;
 
   readonly comfortHeatingButton: Locator;
 
   readonly comfortACButton: Locator;
 
-  readonly getSelectedComfortType: Locator;
+  readonly selectedComfortType: Locator;
 
-  readonly getSelectedRollingStockName: Locator;
+  readonly selectedRollingStockName: Locator;
 
   constructor(page: Page) {
     super(page);
     this.rollingStockSelectorButton = page.getByTestId('rollingstock-selector');
     this.rollingStockSelectorModal = page.locator('.modal-dialog');
 
-    this.rollingStockList = page.locator('.rollingstock-search-list');
+    this.rollingStockList = page.locator('.rollingstock-editor-list .rollingstock-title');
     this.rollingStockListItem = page.locator('.rollingstock-container');
-
-    this.getResultsFound = page.locator('.modal-dialog').locator('small').first();
-    this.getRollingStockModalSearch = this.rollingStockSelectorModal.locator('#searchfilter');
+    this.emptyRollingStockSelector = page.getByTestId('rollingstock-selector-empty');
+    this.resultsFound = page.locator('.modal-dialog').locator('small').first();
+    this.rollingStockModalSearch = this.rollingStockSelectorModal.locator('#searchfilter');
     this.rollingStockMiniCards = page.locator('.rollingstock-selector-minicard');
-    this.getRollingstockSpanNames = page.locator('.rollingstock-minicard-name');
-    this.getElectricRollingStockFilter = page.locator('label[for="elec"]');
-    this.getThermalRollingStockFilter = page.locator('label[for="thermal"]');
-    this.getRollingStockSearchResult = page.getByTestId('search-results-text');
-    this.getThermalRollingStockIcons = page.locator('.rollingstock-footer-specs .text-pink');
-    this.getElectricRollingStockIcons = page.locator('.rollingstock-footer-specs .text-primary');
-    this.getDualModeRollingStockIcons = page
+    this.rollingstockSpanNames = page.locator('.rollingstock-minicard-name');
+    this.electricRollingStockFilter = page.locator('label[for="elec"]');
+    this.thermalRollingStockFilter = page.locator('label[for="thermal"]');
+    this.rollingStockSearchResult = page.getByTestId('search-results-text');
+    this.thermalRollingStockIcons = page.locator('.rollingstock-footer-specs .text-pink');
+    this.electricRollingStockIcons = page.locator('.rollingstock-footer-specs .text-primary');
+    this.dualModeRollingStockIcons = page
       .locator('.rollingstock-footer-specs .rollingstock-tractionmode:has(.text-pink)')
       .filter({
         has: page.locator('.text-primary'),
       });
-    this.getElectricRollingStockFirstIcon = this.getElectricRollingStockIcons.first();
-    this.getThermalRollingStockFirstIcon = this.getThermalRollingStockIcons.first();
-    this.getRollingStockList = page.locator('.rollingstock-editor-list .rollingstock-title');
-    this.getNoRollingStockResult = page.locator('.rollingstock-empty');
+    this.electricRollingStockFirstIcon = this.electricRollingStockIcons.first();
+    this.thermalRollingStockFirstIcon = this.thermalRollingStockIcons.first();
+    // this.rollingStockList = page.locator('.rollingstock-editor-list .rollingstock-title');
+    this.noRollingStockResult = page.locator('.rollingstock-empty');
     this.comfortHeatingButton = page.getByTestId('comfort-heating-button');
     this.comfortACButton = page.getByTestId('comfort-ac-button');
-    this.getSelectedComfortType = page.getByTestId('selected-comfort-type-info');
-    this.getSelectedRollingStockName = page.getByTestId('selected-rolling-stock-info');
+    this.selectedComfortType = page.getByTestId('selected-comfort-type-info');
+    this.selectedRollingStockName = page.getByTestId('selected-rolling-stock-info');
   }
 
   async openRollingstockModal() {
@@ -85,19 +85,12 @@ class RollingStockSelectorPage extends BasePage {
   }
 
   async isAnyRollingstockFound() {
-    const resultFound = (await this.getResultsFound.textContent()) as string;
+    const resultFound = (await this.resultsFound.textContent()) as string;
     expect(Number(resultFound.slice(0, 1)) >= 1).toBeTruthy();
   }
 
   async searchRollingstock(rollingstockName: string) {
-    await this.getRollingStockModalSearch.fill(rollingstockName);
-  }
-
-  async selectRollingStock(rollingStockName: string) {
-    await this.getRollingStockModalSearch.fill(rollingStockName);
-    const rollingstockItem = this.rollingStockList.getByTestId(`rollingstock-${rollingStockName}`);
-    await rollingstockItem.click();
-    await rollingstockItem.locator('.rollingstock-footer-buttons > button').click();
+    await this.rollingStockModalSearch.fill(rollingstockName);
   }
 
   getRollingstockCardByTestID(rollingstockTestID: string) {
@@ -117,18 +110,33 @@ class RollingStockSelectorPage extends BasePage {
   }
 
   // Select Combustion engine RS filter
-  async thermalRollingStockFilter() {
-    await this.getThermalRollingStockFilter.click();
+  async getThermalRollingStockFilter() {
+    await this.thermalRollingStockFilter.click();
   }
 
   // Select Electric RS filter
-  async electricRollingStockFilter() {
-    await this.getElectricRollingStockFilter.click();
+  async getElectricRollingStockFilter() {
+    await this.electricRollingStockFilter.click();
   }
 
   // Get the number of RS from the search result text
   async getRollingStockSearchNumber(): Promise<number> {
-    return extractNumberFromString(await this.getRollingStockSearchResult.innerText());
+    return extractNumberFromString(await this.rollingStockSearchResult.innerText());
+  }
+
+  // Clicks to open the empty rolling stock selector.
+  async openEmptyRollingStockSelector() {
+    await this.emptyRollingStockSelector.click();
+  }
+
+  // Open Rolling Stock Selector, search for the added train, and select it
+  async selectRollingStock(rollingStockName: string) {
+    await this.openEmptyRollingStockSelector();
+    await this.searchRollingstock(rollingStockName);
+    const rollingstockCard = this.getRollingstockCardByTestID(`rollingstock-${rollingStockName}`);
+    await rollingstockCard.click();
+    await rollingstockCard.locator('button').click();
+    expect(await this.selectedRollingStockName.innerText()).toEqual(rollingStockName);
   }
 }
 export default RollingStockSelectorPage;
diff --git a/front/tests/pages/scenario-page-model.ts b/front/tests/pages/scenario-page-model.ts
index 729d31de61f..83c8070c0c3 100644
--- a/front/tests/pages/scenario-page-model.ts
+++ b/front/tests/pages/scenario-page-model.ts
@@ -1,160 +1,142 @@
 import { type Locator, type Page, expect } from '@playwright/test';
 
-import BasePage from './base-page';
-import manageTrainScheduleTranslation from '../../public/locales/fr/operationalStudies/manageTrainSchedule.json';
+import CommonPage from './common-page-model';
 
-const trainAddedTranslation = manageTrainScheduleTranslation.trainAdded;
+class ScenarioPage extends CommonPage {
+  readonly scenarioUpdateButton: Locator;
 
-// TODO: extends simulation-conf-page
-class ScenarioPage extends BasePage {
-  readonly getScenarioUpdateBtn: Locator;
+  readonly scenarioConfirmDeleteButton: Locator;
 
-  readonly getScenarioDeleteConfirmBtn: Locator;
+  readonly trainLabels: Locator;
 
-  readonly getRollingStockSelector: Locator;
+  readonly scenarioConfirmUpdateButton: Locator;
 
-  readonly getItineraryModule: Locator;
+  readonly scenarioNameInput: Locator;
 
-  readonly getItineraryOrigin: Locator;
+  readonly scenarioDescriptionInput: Locator;
 
-  readonly getItineraryDestination: Locator;
+  readonly scenarioInfraList: Locator;
 
-  readonly getItineraryVias: Locator;
+  readonly scenarioElectricProfileSelect: Locator;
 
-  readonly getTrainLabels: Locator;
+  readonly scenarioName: Locator;
 
-  readonly getMapModule: Locator;
+  readonly scenarioDescription: Locator;
 
-  readonly getSettingSimulationBtn: Locator;
+  readonly scenarioInfraName: Locator;
 
-  readonly getAddScenarioBtn: Locator;
+  readonly trainEditButton: Locator;
 
-  readonly getScenarioUpdateConfirmBtn: Locator;
+  readonly addScenarioButton: Locator;
 
-  readonly getScenarioNameInput: Locator;
+  readonly createScenarioButton: Locator;
 
-  readonly getScenarioDescriptionInput: Locator;
-
-  readonly getScenarioInfraList: Locator;
-
-  readonly getScenarioElectricProfileSelect: Locator;
-
-  readonly getScenarioName: Locator;
-
-  readonly getScenarioDescription: Locator;
-
-  readonly getScenarioInfraName: Locator;
-
-  readonly getResultPathfindingDistance: Locator;
-
-  readonly getInfraLoadState: Locator;
-
-  readonly getTrainCountInput: Locator;
-
-  readonly getDeltaInput: Locator;
-
-  readonly getAddTrainScheduleBtn: Locator;
-
-  readonly getTrainScheduleNameInput: Locator;
-
-  readonly getTrainTimetable: Locator;
-
-  readonly getReturnSimulationResultBtn: Locator;
-
-  readonly getPathfindingState: Locator;
-
-  readonly getSearchByTrigramButton: Locator;
-
-  readonly getSearchByTrigramContainer: Locator;
-
-  readonly getSearchByTrigramInput: Locator;
-
-  readonly getSearchByTrigramSubmit: Locator;
-
-  readonly getResultPathfindingDone: Locator;
-
-  readonly getTimetableList: Locator;
-
-  readonly getTrainEditBtn: Locator;
-
-  readonly getAllowancesSelector: Locator;
-
-  readonly getAllowancesModule: Locator;
-
-  readonly getAllowancesStandardSettings: Locator;
-
-  readonly getAllowancesEnergyConsumed: Locator;
-
-  readonly getAverageEnergyConsumed: Locator;
-
-  readonly getAllowancesEngineeringSettings: Locator;
-
-  readonly getSuccessBtn: Locator;
+  readonly scenarioTagsLabel: Locator;
 
   constructor(readonly page: Page) {
     super(page);
 
-    this.getRollingStockSelector = page.getByTestId('rollingstock-selector-empty');
-    this.getScenarioUpdateBtn = page.getByTestId('editScenario');
-    this.getScenarioDeleteConfirmBtn = page
+    this.scenarioUpdateButton = page.getByTestId('editScenario');
+    this.scenarioConfirmDeleteButton = page
       .locator('#modal-content')
-      .getByText('Supprimer', { exact: true });
-    this.getItineraryModule = page.getByTestId('itinerary');
-    this.getItineraryOrigin = this.getItineraryModule
-      .getByTestId('display-itinerary')
-      .getByTestId('itinerary-origin');
-    this.getItineraryDestination = this.getItineraryModule
-      .getByTestId('display-itinerary')
-      .getByTestId('itinerary-destination');
-    this.getItineraryVias = this.getItineraryModule
-      .getByTestId('display-itinerary')
-      .getByTestId('itinerary-vias');
-    this.getTrainLabels = page.getByTestId('add-train-labels');
-    this.getMapModule = page.getByTestId('map');
-    this.getSettingSimulationBtn = page.locator('span', { hasText: 'Paramètres de simulation' });
-    this.getAddScenarioBtn = page.getByTestId('addScenario');
-    this.getScenarioNameInput = page.locator('#scenarioInputName');
-    this.getScenarioDescriptionInput = page.locator('#scenarioDescription');
-    this.getScenarioInfraList = page.getByTestId('infraslist');
-    this.getScenarioElectricProfileSelect = page.locator('.input-group');
-    this.getScenarioName = page.locator('.scenario-details-name .scenario-name');
-    this.getScenarioDescription = page.locator('.scenario-details-description');
-    this.getScenarioInfraName = page.locator('.scenario-infra-name');
-    this.getSearchByTrigramButton = page.getByTestId('rocket-button');
-    this.getSearchByTrigramContainer = page.getByTestId('type-and-path-container');
-    this.getSearchByTrigramInput = page.getByTestId('type-and-path-input');
-    this.getSearchByTrigramSubmit = page.getByTestId('submit-search-by-trigram');
-    this.getResultPathfindingDone = page.getByTestId('result-pathfinding-done');
-    this.getResultPathfindingDistance = page.getByTestId('result-pathfinding-distance');
-    this.getInfraLoadState = page.locator('.infra-loading-state');
-    this.getTrainCountInput = page.locator('#osrdconf-traincount');
-    this.getDeltaInput = page.locator('#osrdconf-delta');
-    this.getAddTrainScheduleBtn = page.getByTestId('add-train-schedules');
-    this.getTrainScheduleNameInput = page.locator('#trainSchedule-name');
-    this.getTrainTimetable = page
-      .locator('.scenario-timetable-trains')
-      .locator('.scenario-timetable-train');
-    this.getReturnSimulationResultBtn = page.getByTestId('return-simulation-result');
-    this.getPathfindingState = page.locator('.pathfinding-state-main-container');
-    this.getTimetableList = page.locator('.scenario-timetable-train-with-right-bar');
-    this.getTrainEditBtn = page.locator('.scenario-timetable-train-buttons-update');
-    this.getAllowancesSelector = page.getByTestId('allowances');
-    this.getAllowancesModule = page.locator('.operational-studies-allowances');
-    this.getAllowancesStandardSettings = page
-      .getByTestId('standard-allowance-group')
-      .getByTestId('allowances-standard-settings-value-input');
-    this.getAllowancesEnergyConsumed = page.getByTestId('allowance-energy-consumed');
-    this.getAverageEnergyConsumed = page.getByTestId('average-energy-consumed');
-    this.getAllowancesEngineeringSettings = page
-      .getByTestId('engineering-allowance-group')
-      .last()
-      .getByTestId('allowances-engineering-allowance-input');
-    this.getSuccessBtn = page.getByTestId('add-allowance-button');
-    this.getScenarioUpdateConfirmBtn = page.locator('#modal-content').getByTestId('updateScenario');
-  }
-
-  async openTabByDataId(id: string) {
-    await this.page.getByTestId(id).click();
+      .getByTestId('delete-scenario');
+    this.trainLabels = page.getByTestId('add-train-labels');
+    this.addScenarioButton = page.getByTestId('add-scenario-button');
+    this.scenarioNameInput = page.locator('#scenarioInputName');
+    this.scenarioDescriptionInput = page.locator('#scenarioDescription');
+    this.scenarioInfraList = page.getByTestId('infra-list');
+    this.scenarioElectricProfileSelect = page.locator('.input-group');
+    this.scenarioName = page.locator('.scenario-details-name .scenario-name');
+    this.scenarioDescription = page.locator('.scenario-details-description');
+    this.scenarioInfraName = page.locator('.scenario-infra-name');
+    this.trainEditButton = page.locator('.scenario-timetable-train-buttons-update');
+    this.scenarioConfirmUpdateButton = page.locator('#modal-content').getByTestId('updateScenario');
+    this.createScenarioButton = page.getByTestId('createScenario');
+    this.scenarioTagsLabel = page.getByTestId('scenario-details-tag');
+  }
+
+  // Creates or updates a scenario based on the provided details.
+  async createOrUpdateScenario({
+    name,
+    description,
+    tags,
+    infraName,
+    electricProfileName,
+    isUpdate = false,
+  }: {
+    name: string;
+    description: string;
+    tags: string[];
+    infraName?: string;
+    electricProfileName?: string;
+    isUpdate?: boolean;
+  }) {
+    if (isUpdate) {
+      await this.clickOnUpdateScenario();
+    } else {
+      expect(this.addScenarioButton).toBeVisible();
+      await this.addScenarioButton.click();
+    }
+
+    await this.fillScenarioDetails({
+      name,
+      description,
+      tags,
+      infraName,
+      electricProfileName,
+    });
+    await (isUpdate ? this.scenarioConfirmUpdateButton.click() : this.createScenarioButton.click());
+    await this.page.waitForURL('**/scenarios/*');
+  }
+
+  // Fills the scenario details in the form inputs.
+  private async fillScenarioDetails({
+    name,
+    description,
+    infraName,
+    tags,
+    electricProfileName,
+  }: {
+    name: string;
+    description: string;
+    tags: string[];
+    infraName?: string;
+    electricProfileName?: string;
+  }) {
+    await this.scenarioNameInput.fill(name);
+    await this.scenarioDescriptionInput.fill(description);
+
+    // Check if electricProfileName is provided and not empty, then set the profile
+    if (electricProfileName && !process.env.CI) {
+      await this.setScenarioElectricProfileByName(electricProfileName);
+    }
+    if (infraName) {
+      await this.scenarioInfraList.getByText(infraName).first().click();
+    }
+
+    for (const tag of tags) {
+      await this.setTag(tag);
+    }
+  }
+
+  // Validates if all project details are displayed correctly.
+  async validateScenarioData({
+    name,
+    description,
+    infraName,
+    tags,
+  }: {
+    name: string;
+    description: string;
+    infraName: string;
+    tags?: string[];
+  }) {
+    expect(await this.scenarioName.textContent()).toContain(name);
+    expect(await this.scenarioDescription.textContent()).toContain(description);
+    expect(await this.scenarioInfraName.textContent()).toContain(infraName);
+    if (tags) {
+      expect(await this.scenarioTagsLabel.textContent()).toContain(tags.join(''));
+    }
   }
 
   getScenarioByName(name: string) {
@@ -169,153 +151,21 @@ class ScenarioPage extends BasePage {
     await this.page.getByTestId(scenarioTestId).getByTestId('openScenario').first().click();
   }
 
-  async openScenarioCreationModal() {
-    await this.getAddScenarioBtn.click();
-  }
-
-  async setScenarioName(name: string) {
-    await this.getScenarioNameInput.fill(name);
-  }
-
-  async openScenarioModalUpdate() {
-    // We need to hover the scenario description to make the update button visible
-    await this.getScenarioDescription.hover();
-    await this.getScenarioUpdateBtn.click();
-  }
-
-  async setScenarioDescription(description: string) {
-    await this.getScenarioDescriptionInput.fill(description);
-  }
-
-  async setScenarioInfraByName(infraName: string) {
-    await this.getScenarioInfraList.getByText(infraName).first().click();
-  }
-
   async setScenarioElectricProfileByName(electricProfileName: string) {
-    await this.getScenarioElectricProfileSelect.click();
-    await this.page.locator('[id="-selecttoggle"]').getByText(electricProfileName).click();
-  }
-
-  async checkPathfindingDistance(distance: string | RegExp) {
-    await this.page.waitForSelector('[data-testid="result-pathfinding-distance"]');
-    await expect(this.getResultPathfindingDistance).toHaveText(distance);
-  }
-
-  async checkInfraLoaded() {
-    await this.page.waitForSelector('.cached', { timeout: 90 * 1000 }); // Wait for the infrastructure to be fully loaded with a timeout of 90 seconds
-    await expect(this.getInfraLoadState).toHaveClass(/cached/);
-  }
-
-  async setNumberOfTrains(digits: string) {
-    const splitDigit = digits.split('');
-    await this.getTrainCountInput.focus();
-    await this.page.keyboard.press('Backspace');
-    splitDigit.forEach(async (digit) => {
-      await this.page.keyboard.press(digit);
-    });
-  }
-
-  async setDelta(digits: string) {
-    const splitDigit = digits.split('');
-    await this.getDeltaInput.focus();
-    await this.page.keyboard.press('Backspace');
-    await this.page.keyboard.press('Backspace');
-    splitDigit.forEach(async (digit) => {
-      await this.page.keyboard.press(digit);
-    });
-  }
-
-  async addTrainSchedule() {
-    await this.getAddTrainScheduleBtn.click();
-  }
-
-  async setTrainScheduleName(name: string) {
-    await this.getTrainScheduleNameInput.fill(name);
-    await expect(this.getTrainScheduleNameInput).toHaveValue(name);
-  }
-
-  async checkNumberOfTrains(number: number) {
-    await expect(this.getTrainTimetable).toHaveCount(number);
-  }
-
-  async returnSimulationResult() {
-    await this.getReturnSimulationResultBtn.click();
-  }
-
-  async checkTrainHasBeenAdded() {
-    this.checkLastToastTitle(trainAddedTranslation);
-  }
-
-  getBtnByName(name: string | RegExp) {
-    return this.page.getByRole('button', { name });
-  }
-
-  async checkPathfindingStateText(text: string | RegExp) {
-    await expect(this.getPathfindingState).toHaveText(text);
-  }
-
-  async getPathfindingByTriGramSearch(firstTrigram: string, secondTrigram: string) {
-    await this.getSearchByTrigramButton.click();
-    await expect(this.getSearchByTrigramContainer).toBeVisible();
-    await this.getSearchByTrigramInput.fill(`${firstTrigram} ${secondTrigram}`);
-    await expect(
-      this.page.getByTestId(`typeandpath-op-${firstTrigram}`) &&
-        this.page.getByTestId(`typeandpath-op-${secondTrigram}`)
-    ).toBeVisible();
-    await this.getSearchByTrigramSubmit.click();
-    await expect(this.getResultPathfindingDone).toBeVisible();
-  }
-
-  async clickBtnByName(name: string) {
-    await this.getBtnByName(name).click();
-  }
-
-  async openAllowancesModule() {
-    await this.getAllowancesSelector.click();
-  }
-
-  async setStandardAllowance() {
-    await this.getAllowancesStandardSettings.focus();
-    await this.page.keyboard.press('Digit5');
-  }
-
-  async checkAllowanceEnergyConsumed() {
-    const content = await this.getAllowancesEnergyConsumed.textContent();
-    const allowancesEnergyNumber = Number((content as string).slice(4, -3));
-    return allowancesEnergyNumber;
-  }
-
-  async checkAverageEnergyConsumed() {
-    const content = await this.getAverageEnergyConsumed.textContent();
-    const averageEnergyNumber = Number((content as string).slice(0, -3));
-    return averageEnergyNumber;
-  }
-
-  async isAllowanceWorking() {
-    const allowancesEnergyConsumed = await this.checkAllowanceEnergyConsumed();
-    const averageEnergyConsumed = await this.checkAverageEnergyConsumed();
-
-    const isCurrentAllowanceWorking = allowancesEnergyConsumed < averageEnergyConsumed;
-    return isCurrentAllowanceWorking;
-  }
-
-  async setEngineeringAllowance() {
-    await this.getAllowancesEngineeringSettings.focus();
-    await this.page.keyboard.press('Digit1');
-    await this.page.keyboard.press('Digit8');
-    await this.page.keyboard.press('Digit0');
-  }
-
-  async clickSuccessBtn() {
-    await this.getSuccessBtn.click();
+    await this.scenarioElectricProfileSelect.click();
+    await this.page.locator('#-selecttoggle').getByText(electricProfileName).click();
   }
 
-  async clickScenarioUpdateConfirmBtn() {
-    await this.getScenarioUpdateConfirmBtn.click();
+  // Click on update scenario button
+  async clickOnUpdateScenario() {
+    await this.scenarioDescription.hover();
+    await this.scenarioUpdateButton.click();
   }
 
-  async clickScenarioDeleteConfirmBtn() {
-    await this.getScenarioDeleteConfirmBtn.click();
+  // Delete scenario
+  async deleteScenario() {
+    await this.scenarioConfirmDeleteButton.click();
+    await this.page.waitForURL('**/studies/*');
   }
 }
 
diff --git a/front/tests/pages/simulation-conf-page.ts b/front/tests/pages/simulation-conf-page.ts
deleted file mode 100644
index f76ec61dfd3..00000000000
--- a/front/tests/pages/simulation-conf-page.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import { type Locator, type Page, expect } from '@playwright/test';
-
-import RollingStockSelectorPage from './rollingstock-selector-page';
-
-class SimulationConfPage extends RollingStockSelectorPage {
-  readonly infraLoadingState: Locator;
-
-  readonly pathfindingState: Locator;
-
-  readonly pathfindingResultDistance: Locator;
-
-  readonly pathfindingDoneLabel: Locator;
-
-  readonly searchByTrigramRocketButton: Locator;
-
-  readonly searchByTrigramContainer: Locator;
-
-  readonly searchByTrigramInput: Locator;
-
-  readonly searchByTrigramSubmitButton: Locator;
-
-  constructor(page: Page) {
-    super(page);
-    this.pathfindingResultDistance = page.getByTestId('result-pathfinding-distance');
-    this.infraLoadingState = page.locator('.infra-loading-state');
-    this.pathfindingState = page.locator('.pathfinding-state-main-container');
-    this.searchByTrigramRocketButton = page.getByTestId('rocket-button');
-    this.searchByTrigramContainer = page.getByTestId('type-and-path-container');
-    this.searchByTrigramInput = page.getByTestId('type-and-path-input');
-    this.pathfindingDoneLabel = page.getByTestId('result-pathfinding-done');
-    this.searchByTrigramSubmitButton = page.getByTestId('submit-search-by-trigram');
-  }
-
-  async checkPathfindingDistance(distance: string | RegExp) {
-    await this.page.waitForSelector('[data-testid="result-pathfinding-distance"]');
-    await expect(this.pathfindingResultDistance).toHaveText(distance);
-  }
-
-  async checkInfraIsLoaded() {
-    await this.page.waitForSelector('.cached');
-    await expect(this.infraLoadingState).toHaveClass(/cached/);
-  }
-
-  async checkPathfindingStateText(text: string | RegExp) {
-    await expect(this.pathfindingState).toHaveText(text);
-  }
-
-  async selectPathByTrigram(firstTrigram: string, secondTrigram: string) {
-    await this.searchByTrigramRocketButton.click();
-    await expect(this.searchByTrigramContainer).toBeVisible();
-    await this.searchByTrigramInput.fill(`${firstTrigram} ${secondTrigram}`);
-    await expect(
-      this.page.getByTestId(`typeandpath-op-${firstTrigram}`) &&
-        this.page.getByTestId(`typeandpath-op-${secondTrigram}`)
-    ).toBeVisible();
-    await this.searchByTrigramSubmitButton.click();
-    await expect(this.pathfindingDoneLabel).toBeVisible();
-  }
-}
-export default SimulationConfPage;
diff --git a/front/tests/pages/stdcm-page-model.ts b/front/tests/pages/stdcm-page-model.ts
deleted file mode 100644
index ffb18b3d65d..00000000000
--- a/front/tests/pages/stdcm-page-model.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import { expect, type Locator, type Page } from '@playwright/test';
-
-import SimulationConfPage from './simulation-conf-page';
-
-class StdcmPage extends SimulationConfPage {
-  readonly pathfindingNoState: Locator;
-
-  private scenarioExplorerButton: Locator;
-
-  readonly scenarioExplorerModal: Locator;
-
-  private scenarioExplorerMinicards: Locator;
-
-  // STDCM
-  private getOriginTimeDelta: Locator;
-
-  constructor(page: Page) {
-    super(page);
-
-    this.pathfindingNoState = page.getByTestId('pathfinding-no-state');
-    this.scenarioExplorerButton = page.getByTestId('scenario-explorator');
-    this.scenarioExplorerModal = page.locator('.scenario-explorator-modal');
-    this.scenarioExplorerMinicards = page.locator('.minicard');
-
-    // STDCM
-    this.getOriginTimeDelta = page.locator('#osrd-config-time-origin').first();
-  }
-
-  async navigateToPage() {
-    await this.page.goto('/stdcm/');
-    await this.removeViteOverlay();
-  }
-
-  // Scenario Explorer
-  async openScenarioExplorer() {
-    await this.scenarioExplorerButton.click();
-    await expect(this.scenarioExplorerModal).toBeVisible();
-  }
-
-  async selectMiniCard(itemName: string) {
-    const miniCards = this.scenarioExplorerMinicards.getByText(itemName);
-    await miniCards.first().click();
-  }
-
-  // STDCM
-  async setOriginTime(digits: string) {
-    const splitDigit = digits.split('');
-    await this.getOriginTimeDelta.focus();
-    splitDigit.forEach(async (digit) => {
-      await this.page.keyboard.press(digit);
-    });
-  }
-}
-export default StdcmPage;
diff --git a/front/tests/pages/study-page-model.ts b/front/tests/pages/study-page-model.ts
index e0005d7e19f..0db051a66a7 100644
--- a/front/tests/pages/study-page-model.ts
+++ b/front/tests/pages/study-page-model.ts
@@ -1,174 +1,264 @@
 import { expect, type Locator, type Page } from '@playwright/test';
 
-import study from '../../public/locales/fr/operationalStudies/study.json';
+import CommonPage from './common-page-model';
 
-class StudyPage {
-  readonly page: Page;
-  // Page information
+class StudyPage extends CommonPage {
+  // Page Locators
 
-  readonly getStudyUpdateBtn: Locator;
+  readonly studyUpdateButton: Locator;
 
-  readonly getStudyName: Locator;
+  readonly studyName: Locator;
 
-  readonly getStudyDescription: Locator;
+  readonly studyDescription: Locator;
 
-  readonly getStudyState: Locator;
+  readonly studyState: Locator;
 
-  readonly getStudyType: Locator;
+  readonly studyType: Locator;
 
   readonly studyServiceCodeInfo: Locator;
 
   readonly studyBusinessCodeInfo: Locator;
 
-  readonly getStudyFinancialsAmount: Locator;
+  readonly studyFinancialAmount: Locator;
 
-  readonly getStudyTags: Locator;
+  readonly studyTags: Locator;
 
-  readonly getBackToProject: Locator;
+  readonly addStudyButton: Locator;
 
-  readonly translation: typeof study;
+  readonly studyUpdateConfirmButton: Locator;
 
-  readonly getAddStudyBtn: Locator;
+  readonly studyInputName: Locator;
 
-  readonly getStudyUpdateConfirmBtn: Locator;
+  readonly studyTypeSelect: Locator;
 
-  readonly getStudyInputName: Locator;
+  readonly studyStatusSelect: Locator;
 
-  readonly getStudyTypeSelect: Locator;
+  readonly studyDescriptionInput: Locator;
 
-  readonly getStudyStatusSelect: Locator;
+  readonly studyStartDateInput: Locator;
 
-  readonly getStudyDescriptionInput: Locator;
+  readonly studyEstimatedEndDateInput: Locator;
 
-  readonly getStudyStartDateInput: Locator;
+  readonly studyEndDateInput: Locator;
 
-  readonly getStudyEstimatedEndDateInput: Locator;
+  readonly studyServiceCodeInput: Locator;
 
-  readonly getStudyEndDateInput: Locator;
+  readonly studyBusinessCodeInput: Locator;
 
-  readonly getStudyServiceCodeInput: Locator;
+  readonly studyBudgetInput: Locator;
 
-  readonly getStudyBusinessCodeInput: Locator;
-
-  readonly getStudyBudgetInput: Locator;
-
-  readonly getStudyDeleteConfirmBtn: Locator;
+  readonly studyDeleteConfirmButton: Locator;
 
   readonly createStudyButton: Locator;
 
   readonly studyEditionModal: Locator;
 
+  readonly startDate: Locator;
+
+  readonly estimatedEndDate: Locator;
+
+  readonly realEndDate: Locator;
+
   constructor(page: Page) {
-    this.page = page;
-    // Initialize locators using roles and text content
-    this.getStudyName = page.getByTestId('study-name-info');
-    this.getStudyType = page.locator('.study-details-type');
-    this.getStudyState = page.getByTestId('study-state-step-label');
-    this.getStudyDescription = page.locator('.study-details-description');
-    this.getStudyFinancialsAmount = page.locator('.study-details-financials-amount');
+    super(page);
+    // Page locators
+    this.studyName = page.getByTestId('study-name-info');
+    this.studyType = page.locator('.study-details-type');
+    this.studyState = page.getByTestId('study-state-step-label');
+    this.studyDescription = page.locator('.study-details-description');
+    this.studyFinancialAmount = page.locator('.study-details-financials-amount');
     this.studyServiceCodeInfo = page.getByTestId('study-service-code-info');
     this.studyBusinessCodeInfo = page.getByTestId('study-business-code-info');
-    this.getStudyTags = page.locator('.study-details-tags');
-    this.getBackToProject = page.getByRole('heading', { name: 'Test e2e projet' });
-    this.translation = study;
-    this.getAddStudyBtn = page.getByTestId('add-study-button');
-    this.getStudyUpdateBtn = page.getByTestId('study-modify-button');
-    this.getStudyInputName = page.locator('#studyInputName');
-    this.getStudyTypeSelect = page.locator('.input-group').first();
-    this.getStudyStatusSelect = page.locator(
+    this.studyTags = page.locator('.study-details-tags');
+    this.addStudyButton = page.getByTestId('add-study-button');
+    this.studyUpdateButton = page.getByTestId('study-modify-button');
+    this.studyInputName = page.locator('#studyInputName');
+    this.studyTypeSelect = page.locator('.input-group').first();
+    this.studyStatusSelect = page.locator(
       '.study-edition-modal-state > div > .select-improved > .select-control > .input-group'
     );
-    this.getStudyDescriptionInput = page.locator('#studyDescription');
-    this.getStudyStartDateInput = page.getByLabel("Début de l'étude");
-    this.getStudyEstimatedEndDateInput = page.getByLabel('Fin estimée');
-    this.getStudyEndDateInput = page.getByLabel('Fin réalisée');
-    this.getStudyServiceCodeInput = page.getByLabel('Code service');
-    this.getStudyBusinessCodeInput = page.getByLabel('Code affaire');
-    this.getStudyBudgetInput = page.getByLabel('Budget');
-    this.getStudyUpdateConfirmBtn = page.locator('#modal-content').getByTestId('update-study');
-    this.getStudyDeleteConfirmBtn = page.locator('#modal-content').getByTestId('delete-study');
+    this.studyDescriptionInput = page.locator('#studyDescription');
+    this.studyStartDateInput = page.locator('#studyInputStartDate');
+    this.studyEstimatedEndDateInput = page.locator('#studyInputEstimatedEndDate');
+    this.studyEndDateInput = page.locator('#studyInputRealEndDate');
+    this.studyServiceCodeInput = page.locator('#studyInputServiceCode');
+    this.studyBusinessCodeInput = page.locator('#studyInputBusinessCode');
+    this.studyBudgetInput = page.locator('#studyInputBudget');
+    this.studyUpdateConfirmButton = page.locator('#modal-content').getByTestId('update-study');
+    this.studyDeleteConfirmButton = page.locator('#modal-content').getByTestId('delete-study');
     this.createStudyButton = page.getByTestId('create-study');
     this.studyEditionModal = page.getByTestId('study-edition-modal');
+    this.startDate = page.locator(
+      '.study-details-dates-date.start .study-details-dates-date-value'
+    );
+    this.estimatedEndDate = page.locator(
+      '.study-details-dates-date.estimatedend .study-details-dates-date-value'
+    );
+    this.realEndDate = page.locator(
+      '.study-details-dates-date.realend .study-details-dates-date-value'
+    );
   }
 
-  // Assert that the breadcrumb project link is displayed on the page
-  async getDisplayLinks() {
-    await expect(this.getBackToProject).toBeVisible();
+  // Fills the study details in the form inputs.
+  private async fillStudyDetails({
+    name,
+    description,
+    type,
+    status,
+    startDate,
+    estimatedEndDate,
+    endDate,
+    serviceCode,
+    businessCode,
+    budget,
+    tags,
+  }: {
+    name: string;
+    description: string;
+    type: string;
+    status: string;
+    startDate: string;
+    estimatedEndDate: string;
+    endDate: string;
+    serviceCode: string;
+    businessCode: string;
+    budget: string;
+    tags: string[];
+  }) {
+    await this.studyInputName.fill(name);
+    await this.studyDescriptionInput.fill(description);
+    await this.setStudyTypeByText(type);
+    await this.setStudyStatusByText(status);
+    await this.studyStartDateInput.fill(startDate);
+    await this.studyEstimatedEndDateInput.fill(estimatedEndDate);
+    await this.studyEndDateInput.fill(endDate);
+    await this.studyServiceCodeInput.fill(serviceCode);
+    await this.studyBusinessCodeInput.fill(businessCode);
+    await this.studyBudgetInput.fill(budget);
+    for (const tag of tags) await this.setTag(tag);
   }
 
-  getTranslations(key: keyof typeof study) {
-    return this.translation[key];
+  // Creates or updates a study based on the provided details.
+  async createOrUpdateStudy({
+    name,
+    description,
+    type,
+    status,
+    startDate,
+    estimatedEndDate,
+    endDate,
+    serviceCode,
+    businessCode,
+    budget,
+    tags,
+    isUpdate = false,
+  }: {
+    name: string;
+    description: string;
+    type: string;
+    status: string;
+    startDate: string;
+    estimatedEndDate: string;
+    endDate: string;
+    serviceCode: string;
+    businessCode: string;
+    budget: string;
+    tags: string[];
+    isUpdate?: boolean;
+  }) {
+    if (isUpdate) {
+      await this.studyUpdateButton.click();
+    } else {
+      await expect(this.addStudyButton).toBeVisible();
+      await this.addStudyButton.click();
+    }
+
+    await this.fillStudyDetails({
+      name,
+      description,
+      type,
+      status,
+      startDate,
+      estimatedEndDate,
+      endDate,
+      serviceCode,
+      businessCode,
+      budget,
+      tags,
+    });
+    await (isUpdate ? this.studyUpdateButton.click() : this.createStudyButton.click());
+    await this.page.waitForURL('**/studies/*');
   }
 
-  getStudyByName(name: string) {
-    return this.page.locator(`text=${name}`);
+  async validateStudyData({
+    name,
+    description,
+    type,
+    status,
+    startDate,
+    estimatedEndDate,
+    endDate,
+    serviceCode,
+    businessCode,
+    budget,
+    tags,
+  }: {
+    name: string;
+    description: string;
+    type: string;
+    status: string;
+    startDate: string;
+    estimatedEndDate: string;
+    endDate: string;
+    serviceCode: string;
+    businessCode: string;
+    budget: string;
+    tags: string[];
+  }) {
+    await expect(this.studyEditionModal).not.toBeVisible();
+    await expect(this.studyName).toHaveText(name);
+    await expect(this.startDate).toHaveText(startDate);
+    await expect(this.estimatedEndDate).toHaveText(estimatedEndDate);
+    await expect(this.realEndDate).toHaveText(endDate);
+    await expect(this.studyDescription).toHaveText(description);
+    await expect(this.studyType).toHaveText(type);
+    await expect(this.studyState.first()).toHaveText(status);
+    await expect(this.studyServiceCodeInfo).toHaveText(serviceCode);
+    await expect(this.studyBusinessCodeInfo).toHaveText(businessCode);
+    expect(await this.getNumericFinancialAmount()).toBe(budget);
+    expect(await this.studyTags.textContent()).toContain(tags.join(''));
   }
 
-  async openStudyModalUpdate() {
-    await this.getStudyUpdateBtn.click();
+  getStudyByName(name: string) {
+    return this.page.locator(`text=${name}`);
   }
 
   async openStudyByTestId(studyTestId: string | RegExp) {
     await this.page.getByTestId(studyTestId).getByTestId('openStudy').first().click();
   }
 
-  async openStudyCreationModal() {
-    await this.getAddStudyBtn.click();
-  }
-
-  async setStudyName(name: string) {
-    await this.getStudyInputName.fill(name);
-  }
-
   async setStudyTypeByText(type: string) {
-    await this.getStudyTypeSelect.click();
+    await this.studyTypeSelect.click();
     await this.page.locator('#modal-body').getByText(type).click();
   }
 
   async setStudyStatusByText(status: string) {
-    await this.getStudyStatusSelect.click();
+    await this.studyStatusSelect.click();
     await this.page.locator('#-selecttoggle').getByText(status).click();
   }
 
-  async setStudyDescription(description: string) {
-    await this.getStudyDescriptionInput.fill(description);
-  }
-
-  async setStudyStartDate(date: string) {
-    await this.getStudyStartDateInput.fill(date);
-  }
-
-  async setStudyEstimatedEndDate(date: string) {
-    await this.getStudyEstimatedEndDateInput.fill(date);
-  }
-
-  async setStudyEndDate(date: string) {
-    await this.getStudyEndDateInput.fill(date);
-  }
-
-  async setStudyServiceCode(code: string) {
-    await this.getStudyServiceCodeInput.fill(code);
-  }
-
-  async setStudyBusinessCode(code: string) {
-    await this.getStudyBusinessCodeInput.fill(code);
-  }
-
-  async setStudyBudget(code: string) {
-    await this.getStudyBudgetInput.fill(code);
-  }
-
-  async clickStudyUpdateConfirmBtn() {
-    await this.getStudyUpdateConfirmBtn.click();
-  }
-
-  async clickStudyDeleteConfirmBtn() {
-    await this.getStudyDeleteConfirmBtn.click();
+  async getNumericFinancialAmount() {
+    const studyFinancialDetails = await this.studyFinancialAmount.textContent();
+    return studyFinancialDetails?.replace('Budget', '').replace(/\s+/g, ' ').trim();
   }
 
-  async getNumericFinancialsAmount() {
-    const studyFinancialsDetails = await this.getStudyFinancialsAmount.textContent();
-    return studyFinancialsDetails?.replace('Budget', '').replace(/\s+/g, ' ').trim();
+  // Deletes a study by its name.
+  async deleteStudy(name: string) {
+    await this.studyUpdateButton.click();
+    await this.openStudyByTestId(name);
+    await this.studyDeleteConfirmButton.click();
+    await this.page.waitForURL('**/projects/*');
+    await expect(this.getStudyByName(name)).not.toBeVisible();
   }
 }
 export default StudyPage;
diff --git a/front/tests/playwright-fixture.ts b/front/tests/playwright-fixture.ts
new file mode 100644
index 00000000000..35c6a068711
--- /dev/null
+++ b/front/tests/playwright-fixture.ts
@@ -0,0 +1,15 @@
+import { test as base, expect } from '@playwright/test';
+
+import HomePage from './pages/home-page-model';
+
+// Define a custom fixture with `OSRDLanguage`
+const test = base.extend<{ OSRDLanguage: string }>({
+  OSRDLanguage: async ({ page }, use) => {
+    const homePage = new HomePage(page);
+    await homePage.goToHomePage();
+    const language = await homePage.getOSRDLanguage();
+    await use(language);
+  },
+});
+
+export { test, expect };
diff --git a/front/tests/utils/api-setup.ts b/front/tests/utils/api-setup.ts
index d8c71ce3d6e..06e014890fd 100644
--- a/front/tests/utils/api-setup.ts
+++ b/front/tests/utils/api-setup.ts
@@ -2,11 +2,23 @@ import { request, type APIResponse } from '@playwright/test';
 
 import type { Project, Study, RollingStock, Infra, Scenario } from 'common/api/osrdEditoastApi';
 
+/**
+ * Initializes a new API request context with the base URL.
+ *
+ * @returns {Promise<APIRequestContext>} - The API request context.
+ */
 export const getApiContext = async () =>
   request.newContext({
     baseURL: 'http://localhost:4000',
   });
 
+/**
+ * Sends a GET request to the specified API endpoint with optional query parameters.
+ *
+ * @param {string} url - The API endpoint URL.
+ * @param {object} [params] - Optional query parameters to include in the request.
+ * @returns {Promise<any>} - The JSON response from the API.
+ */
 export const getApiRequest = async (
   url: string,
   params?: { [key: string]: string | number | boolean }
@@ -16,13 +28,29 @@ export const getApiRequest = async (
   return response.json();
 };
 
-// Helper function to handle API error responses
+/**
+ * Handles API error responses by checking the status and throwing an error if the request failed.
+ *
+ * @param {APIResponse} response - The response object from the API request.
+ * @param {string} [errorMessage='API Request Failed'] - Optional. The error message to throw if the request fails.
+ * @throws {Error} - Throws an error if the response status is not OK.
+ */
 export function handleErrorResponse(response: APIResponse, errorMessage = 'API Request Failed') {
   if (response.ok()) return;
 
   throw new Error(`${errorMessage}: ${response.status()} ${response.statusText()}`);
 }
 
+/**
+ * Sends a POST request to the specified API endpoint with optional data and query parameters.
+ *
+ * @template T
+ * @param {string} url - The API endpoint URL.
+ * @param {T} [data] - Optional. The payload to send in the request body.
+ * @param {object} [params] - Optional query parameters to include in the request.
+ * @param {string} [errorMessage] - Optional. Custom error message for failed requests.
+ * @returns {Promise<any>} - The JSON response from the API.
+ */
 export const postApiRequest = async <T>(
   url: string,
   data?: T,
@@ -35,35 +63,74 @@ export const postApiRequest = async <T>(
   return response.json();
 };
 
+/**
+ * Sends a DELETE request to the specified API endpoint.
+ *
+ * @param {string} url - The API endpoint URL.
+ * @returns {Promise<APIResponse>} - The response from the API.
+ */
 export const deleteApiRequest = async (url: string) => {
   const apiContext = await getApiContext();
   const response = await apiContext.delete(url);
   return response;
 };
 
-// API calls for beforeAll setup in tests
-
+/**
+ * Finds an item in a list of results by matching the name property.
+ *
+ * @template T
+ * @param {T[]} results - The list of results to search through.
+ * @param {string} name - The name to search for in the results.
+ * @returns {T | undefined} - The matched result or undefined if not found.
+ */
 const findOneInResults = <T extends { name: string }>(results: T[], name: string) =>
   results.find((result) => result.name.includes(name));
 
+/**
+ * Retrieves infrastructure data by name.
+ *
+ * @param {string} infraName - The name of the infrastructure to retrieve.
+ * @returns {Promise<Infra>} - The matching infrastructure data.
+ */
 export const getInfra = async (infraName: string) => {
   const { results } = await getApiRequest(`/api/infra/`);
   const infra = findOneInResults(results, infraName) as Infra;
   return infra;
 };
 
+/**
+ * Retrieves project data by name.
+ *
+ * @param {string} projectName - The name of the project to retrieve.
+ * @returns {Promise<Project>} - The matching project data.
+ */
 export const getProject = async (projectName: string) => {
   const { results } = await getApiRequest(`/api/projects/`);
   const project = findOneInResults(results, projectName) as Project;
   return project;
 };
 
+/**
+ * Retrieves study data by project ID and study name.
+ *
+ * @param {number} projectId - The ID of the project.
+ * @param {string} studyName - The name of the study to retrieve.
+ * @returns {Promise<Study>} - The matching study data.
+ */
 export const getStudy = async (projectId: number, studyName: string) => {
   const { results } = await getApiRequest(`/api/projects/${projectId}/studies/`);
   const study = findOneInResults(results, studyName) as Study;
   return study;
 };
 
+/**
+ * Retrieves scenario data by project ID, study ID, and scenario name.
+ *
+ * @param {number} projectId - The ID of the project.
+ * @param {number} studyId - The ID of the study.
+ * @param {string} scenarioName - The name of the scenario to retrieve.
+ * @returns {Promise<Scenario>} - The matching scenario data.
+ */
 export const getScenario = async (projectId: number, studyId: number, scenarioName: string) => {
   const { results } = await getApiRequest(
     `/api/projects/${projectId}/studies/${studyId}/scenarios/`
@@ -72,6 +139,12 @@ export const getScenario = async (projectId: number, studyId: number, scenarioNa
   return scenario;
 };
 
+/**
+ * Retrieves rolling stock data by name.
+ *
+ * @param {string} rollingStockName - The name of the rolling stock to retrieve.
+ * @returns {Promise<RollingStock>} - The matching rolling stock data.
+ */
 export const getRollingStock = async (rollingStockName: string) => {
   const { results } = await getApiRequest(`/api/light_rolling_stock/`, { page_size: 500 });
   const rollingStock = findOneInResults(results, rollingStockName) as RollingStock;
diff --git a/front/tests/utils/dataNormalizer.ts b/front/tests/utils/dataNormalizer.ts
index 772c579a544..d91c1a515a8 100644
--- a/front/tests/utils/dataNormalizer.ts
+++ b/front/tests/utils/dataNormalizer.ts
@@ -27,6 +27,10 @@ export function cleanWhitespaceInArray(headers: string[]): string[] {
   return headers.map(cleanWhitespace);
 }
 
+export function cleanText(text: string | null): string {
+  return text?.replace(/[^A-Za-z0-9]/g, '') ?? '';
+}
+
 // Normalize StationData by cleaning whitespace in all string fields
 export function normalizeData(data: StationData[]): StationData[] {
   return data.map((item) => ({
diff --git a/front/tests/utils/index.ts b/front/tests/utils/index.ts
index 5b4ac5372a6..a7bb14f394d 100644
--- a/front/tests/utils/index.ts
+++ b/front/tests/utils/index.ts
@@ -3,8 +3,14 @@ import fs from 'fs';
 import { type Locator, type Page, expect } from '@playwright/test';
 import { v4 as uuidv4 } from 'uuid';
 
-// Fill and check input by ID
-// Note: This method check if the locator uses ID or TestID and fills it with the input value
+/**
+ * Fills the input field identified by ID or TestID with the specified value and verifies it.
+ *
+ * @param {Page} page - The Playwright page object.
+ * @param {string} inputId - The ID or TestID of the input field.
+ * @param {string | number} value - The value to fill into the input field.
+ * @param {boolean} [isTestId=false] - Optional. If true, uses TestID instead of ID for locating the input field.
+ */
 export async function fillAndCheckInputById(
   page: Page,
   inputId: string,
@@ -18,8 +24,14 @@ export async function fillAndCheckInputById(
   expect(await input.inputValue()).toBe(`${value}`);
 }
 
-// Verify input by ID
-// Note: This method check if the locator uses ID or TestID and verifies its content
+/**
+ * Verifies the content of the input field identified by ID or TestID.
+ *
+ * @param {Page} page - The Playwright page object.
+ * @param {string} inputId - The ID or TestID of the input field.
+ * @param {string | number} expectedValue - The expected value to verify in the input field.
+ * @param {boolean} [isTestId=false] - Optional. If true, uses TestID instead of ID for locating the input field.
+ */
 export async function verifyAndCheckInputById(
   page: Page,
   inputId: string,
@@ -31,22 +43,65 @@ export async function verifyAndCheckInputById(
   expect(await input.inputValue()).toContain(`${expectedValue}`);
 }
 
-// Generate unique name (used for creating rolling stock)
+/**
+ * Generates a unique name by appending a truncated UUID to the base name.
+ *
+ * @param {string} baseName - The base name to append the UUID segment to.
+ * @returns {Promise<string>} - The generated unique name.
+ */
 export const generateUniqueName = async (baseName: string) => {
-  // Generate a UUID and truncate it to 6 characters
   const uuidSegment = uuidv4().slice(0, 6);
   return `${baseName}-${uuidSegment}`;
 };
 
-// Extracts the first sequence of digits found in the input string and returns it as a number or return 0 if no digits found
+/**
+ * Extracts the first sequence of digits found in a string and returns it as a number.
+ * Returns 0 if no digits are found.
+ *
+ * @param {string} input - The string to extract the number from.
+ * @returns {Promise<number>} - The extracted number or 0 if none found.
+ */
 export async function extractNumberFromString(input: string): Promise<number> {
   const match = input.match(/\d+/);
   return match ? parseInt(match[0], 10) : 0;
 }
-// Utility function to read JSON files
+
+/**
+ * Reads a JSON file from the specified path and returns its parsed content.
+ *
+ * @param {string} path - The file path of the JSON file.
+ * @returns {any} - The parsed JSON content.
+ */
 export const readJsonFile = (path: string) => JSON.parse(fs.readFileSync(path, 'utf8'));
 
+/**
+ * Clicks on the specified element and waits for a specified delay after the click.
+ *
+ * @param {Locator} element - locator object representing the element to click.
+ * @param {number} [delay=500] - Optional. The delay in milliseconds to wait after clicking the element. Defaults to 500ms.
+ *
+ * @returns {Promise<void>} - A promise that resolves after the element is clicked and the delay has passed.
+ */
 export async function clickWithDelay(element: Locator, delay: number = 500): Promise<void> {
   await element.click();
   await element.page().waitForTimeout(delay);
 }
+
+/**
+ * Converts a date string from YYYY-MM-DD format to "DD mmm YYYY" format.
+ * @param dateString - The input date string in YYYY-MM-DD format.
+ * @returns The formatted date string in "DD mmm YYYY" format.
+ */
+export function formatDateToDayMonthYear(dateString: string): string {
+  const date = new Date(dateString);
+
+  // Format the date to "15 Oct 2024" using toLocaleDateString
+  const formattedDate = date.toLocaleDateString('en-GB', {
+    day: 'numeric',
+    month: 'short',
+    year: 'numeric',
+  });
+
+  // Convert the short month (first letter capitalized) to lowercase
+  return formattedDate.replace(/([A-Z])/g, (match) => match.toLowerCase());
+}