diff --git a/.env b/.env
index 3d1b53c..9e2ac72 100644
--- a/.env
+++ b/.env
@@ -36,5 +36,5 @@ ODOO_USERNAME=admin
 ODOO_PASSWORD=admin
 
 # OpenELIS test user credentials
-OpenELIS_USERNAME=admin
-OpenELIS_PASSWORD=adminADMIN!
+OPENELIS_USERNAME=admin
+OPENELIS_PASSWORD=adminADMIN!
diff --git a/e2e/tests/bahmni-odoo-flows.spec.ts b/e2e/tests/bahmni-odoo-flows.spec.ts
index e70737b..9e00545 100644
--- a/e2e/tests/bahmni-odoo-flows.spec.ts
+++ b/e2e/tests/bahmni-odoo-flows.spec.ts
@@ -17,12 +17,12 @@ test.beforeEach(async ({ page }) => {
   await expect(page.getByText(/appointment scheduling/i)).toBeVisible();
   await expect(page.getByText(/patient documents/i)).toBeVisible();
   await bahmni.registerPatient();
-  await bahmni.goToHomePage();
+  await bahmni.navigateToPatientDashboard();
 });
 
 test('Ordering a lab test for a Bahmni patient creates the corresponding Odoo customer with a filled quotation.', async ({ page }) => {
   // setup
-  await bahmni.goToLabSamples();
+  await bahmni.navigateToLabSamples();
 
   // replay
   await bahmni.createLabOrder();
@@ -45,7 +45,7 @@ test('Ordering a lab test for a Bahmni patient creates the corresponding Odoo cu
 
 test('Editing the details of a Bahmni patient with a synced lab order edits the corresponding Odoo customer details.', async ({ page }) => {
   // setup
-  await bahmni.goToLabSamples();
+  await bahmni.navigateToLabSamples();
   await bahmni.createLabOrder();
   await odoo.open();
   await expect(page).toHaveURL(/.*web/);
@@ -69,7 +69,7 @@ test('Editing the details of a Bahmni patient with a synced lab order edits the
 
 test('Revising a synced Bahmni lab order edits the corresponding Odoo quotation line.', async ({ page }) => {
   // setup
-  await bahmni.goToLabSamples();
+  await bahmni.navigateToLabSamples();
   await bahmni.createLabOrder();
   await odoo.open();
   await expect(page).toHaveURL(/.*web/);
@@ -84,7 +84,7 @@ test('Revising a synced Bahmni lab order edits the corresponding Odoo quotation
 
   // replay
   await page.goto(`${BAHMNI_URL}`);
-  await bahmni.goToLabSamples();
+  await bahmni.navigateToLabSamples();
   await bahmni.reviseLabOrder();
 
   // verify
@@ -99,7 +99,7 @@ test('Revising a synced Bahmni lab order edits the corresponding Odoo quotation
 
 test('Discontinuing a synced Bahmni lab order edits the corresponding Odoo quotation line.', async ({ page }) => {
   // setup
-  await bahmni.goToLabSamples();
+  await bahmni.navigateToLabSamples();
   await bahmni.createLabOrder();
   await odoo.open();
   await expect(page).toHaveURL(/.*web/);
@@ -114,7 +114,7 @@ test('Discontinuing a synced Bahmni lab order edits the corresponding Odoo quota
 
   // replay
   await page.goto(`${BAHMNI_URL}`);
-  await bahmni.goToLabSamples();
+  await bahmni.navigateToLabSamples();
   await bahmni.discontinueLabOrder();
 
   // verify
diff --git a/e2e/tests/bahmni-openelis-flows.spec.ts b/e2e/tests/bahmni-openelis-flows.spec.ts
new file mode 100644
index 0000000..d765f35
--- /dev/null
+++ b/e2e/tests/bahmni-openelis-flows.spec.ts
@@ -0,0 +1,211 @@
+import { test, expect } from '@playwright/test';
+import { Bahmni, patientName } from '../utils/functions/bahmni';
+import { OpenELIS } from '../utils/functions/openelis';
+import { BAHMNI_URL } from '../utils/configs/globalSetup';
+
+let bahmni: Bahmni;
+let openelis: OpenELIS;
+
+test.beforeEach(async ({ page }) => {
+  bahmni = new Bahmni(page);
+  openelis = new OpenELIS(page);
+
+  await bahmni.login();
+  await expect(page.getByText(/registration/i)).toBeVisible();
+  await expect(page.getByText(/linical/i)).toBeVisible();
+  await expect(page.getByText(/admin/i)).toBeVisible();
+  await expect(page.getByText(/appointment scheduling/i)).toBeVisible();
+  await expect(page.getByText(/patient documents/i)).toBeVisible();
+  await bahmni.registerPatient();
+  await bahmni.navigateToPatientDashboard();
+});
+
+test('Ordering a lab test for a Bahmni patient creates the corresponding OpenElis client with an analysis request.', async ({ page }) => {
+  // setup
+  await bahmni.navigateToLabSamples();
+
+  // replay
+  await bahmni.createLabOrder();
+
+  // verify
+  await openelis.open();
+  await expect(page).toHaveURL(/.*openelis/);
+  await openelis.searchClient();
+
+  const clientSelector = await page.locator("#todaySamplesToCollectListContainer-slick-grid div.slick-cell.l1.r1");
+  await expect(clientSelector).toHaveText(`${patientName.givenName + ' ' + patientName.familyName}`);
+
+  await page.locator('#todaySamplesToCollectListContainer-slick-grid div.slick-viewport div.slick-cell.l6.r6.cell-title a').click();
+  await expect(page.locator('#tests_1')).toHaveValue('Malaria')
+});
+
+
+test('Editing the details of a Bahmni patient with a synced lab order edits the corresponding OpenELIS client details.', async ({ page }) => {
+  // setup
+  await bahmni.navigateToLabSamples();
+  await bahmni.createLabOrder();
+  await openelis.open();
+  await expect(page).toHaveURL(/.*openelis/);
+  await openelis.searchClient();
+  const clientSelector = await page.locator("#todaySamplesToCollectListContainer-slick-grid div.slick-cell.l1.r1");
+  await expect(clientSelector).toHaveText(`${patientName.givenName + ' ' + patientName.familyName}`);
+
+  // replay
+  await page.goto(`${BAHMNI_URL}`);
+  await bahmni.updatePatientDetails();
+
+  // verify
+  await openelis.open();
+  await page.locator('input#refreshButton').click();
+  await openelis.searchClient();
+  await expect(clientSelector).toHaveText(`${patientName.updatedGivenName}` + ' ' + `${patientName.familyName}`);
+});
+
+test('Revising a synced Bahmni lab order edits the corresponding OpenELIS client analysis request.', async ({ page }) => {
+  // setup
+  await bahmni.navigateToLabSamples();
+  await bahmni.createLabOrder();
+  await openelis.open();
+  await expect(page).toHaveURL(/.*openelis/);
+  await openelis.searchClient();
+  const clientSelector = await page.locator("#todaySamplesToCollectListContainer-slick-grid div.slick-cell.l1.r1");
+  await expect(clientSelector).toHaveText(`${patientName.givenName + ' ' + patientName.familyName}`);
+  await page.locator('#todaySamplesToCollectListContainer-slick-grid div.slick-viewport div.slick-cell.l6.r6.cell-title a').click();
+  await expect(page.locator('#tests_1')).toHaveValue('Malaria')
+
+  // replay
+  await bahmni.navigateToPatientDashboard();
+  await bahmni.navigateToLabSamples();
+  await bahmni.reviseLabOrder();
+
+  // verify
+  await openelis.open();
+  await openelis.searchClient();
+  await expect(clientSelector).toHaveText(`${patientName.givenName + ' ' + patientName.familyName}`);
+
+  await page.locator('#todaySamplesToCollectListContainer-slick-grid div.slick-viewport div.slick-cell.l6.r6.cell-title a').click();
+  await expect(page.locator('#tests_1')).toHaveValue('Hematocrite');
+});
+
+test('Voiding a synced OpenMRS lab order cancels the corresponding OpenElis analysis request.', async ({ page }) => {
+  // setup
+  await bahmni.navigateToLabSamples();
+  await bahmni.createLabOrder();
+  await openelis.open();
+  await expect(page).toHaveURL(/.*openelis/);
+  await openelis.searchClient();
+  const clientSelector = await page.locator("#todaySamplesToCollectListContainer-slick-grid div.slick-cell.l1.r1");
+  await expect(clientSelector).toHaveText(`${patientName.givenName + ' ' + patientName.familyName}`);
+  await page.locator('#todaySamplesToCollectListContainer-slick-grid div.slick-viewport div.slick-cell.l6.r6.cell-title a').click();
+  await expect(page.locator('#tests_1')).toHaveValue('Malaria')
+
+  // replay
+  await bahmni.navigateToPatientDashboard();
+  await bahmni.navigateToLabSamples();
+  await bahmni.discontinueLabOrder();
+
+  // verify
+  await openelis.open();
+  await openelis.searchClient();
+  await expect(page.getByText(`${patientName.givenName + ' ' + patientName.familyName}`)).not.toBeVisible();
+});
+
+test('Published coded lab results from OpenELIS are viewable in the Bahmni lab results viewer.', async ({ page }) => {
+  // setup
+  await bahmni.navigateToLabSamples();
+  await bahmni.createLabOrder();
+
+  // replay
+  await openelis.open();
+  await expect(page).toHaveURL(/.*openelis/);
+  await openelis.searchClient();
+
+  const clientSelector = await page.locator("#todaySamplesToCollectListContainer-slick-grid div.slick-cell.l1.r1");
+  await expect(clientSelector).toHaveText(`${patientName.givenName + ' ' + patientName.familyName}`);
+  await openelis.collectSample();
+  await page.locator('a#todaySamplesCollectedListContainerId').click();
+  await page.locator('#todaySamplesCollectedListContainer-slick-grid div.ui-state-default.slick-headerrow-column.l2.r2 input[type=text]').type(`${patientName.familyName}`);
+
+  await openelis.enterLabResults();
+  await page.locator('a#todaySamplesCollectedListContainerId').click();
+  await page.locator('#todaySamplesCollectedListContainer-slick-grid div.ui-state-default.slick-headerrow-column.l2.r2 input[type=text]').type(`${patientName.familyName}`);
+  await openelis.validateLabResults();
+  await page.locator('#todaySamplesCollectedListContainer-slick-grid div.ui-state-default.slick-headerrow-column.l2.r2 input[type=text]').type(`${patientName.familyName}`);
+  const status = await page.locator('#todaySamplesCollectedListContainer-slick-grid div.slick-viewport div div:nth-child(1) div.slick-cell.l8.r8.cell-title');
+  await expect(status).toHaveText('Yes');
+
+  // verify
+  await bahmni.navigateToPatientDashboard();
+  await expect(page.locator('#Lab-Results').getByText('Malaria')).toBeVisible();
+  await expect(page.locator('#Lab-Results span.value')).toHaveText('Negatif');
+});
+
+test('Published numerical lab results from OpenELIS are viewable in the Bahmni lab results viewer.', async ({ page }) => {
+  // setup
+  await bahmni.navigateToLabSamples();
+  await page.getByText('Blood', { exact: true }).click();
+  await page.getByText('Lymphocites').click();
+  await bahmni.saveOrder();
+
+  // replay
+  await openelis.open();
+  await expect(page).toHaveURL(/.*openelis/);
+  await openelis.searchClient();
+
+  const clientSelector = await page.locator("#todaySamplesToCollectListContainer-slick-grid div.slick-cell.l1.r1");
+  await expect(clientSelector).toHaveText(`${patientName.givenName + ' ' + patientName.familyName}`);
+  await openelis.collectSample();
+  await page.locator('a#todaySamplesCollectedListContainerId').click();
+  await page.locator('#todaySamplesCollectedListContainer-slick-grid div.ui-state-default.slick-headerrow-column.l2.r2 input[type=text]').type(`${patientName.familyName}`);
+
+  await openelis.enterNumericalResults();
+  await page.locator('a#todaySamplesCollectedListContainerId').click();
+  await page.locator('#todaySamplesCollectedListContainer-slick-grid div.ui-state-default.slick-headerrow-column.l2.r2 input[type=text]').type(`${patientName.familyName}`);
+  await openelis.validateLabResults();
+  await page.locator('#todaySamplesCollectedListContainer-slick-grid div.ui-state-default.slick-headerrow-column.l2.r2 input[type=text]').type(`${patientName.familyName}`);
+  const status = await page.locator('#todaySamplesCollectedListContainer-slick-grid div.slick-viewport div div:nth-child(1) div.slick-cell.l8.r8.cell-title');
+  await expect(status).toHaveText('Yes');
+
+  // verify
+  await bahmni.navigateToPatientDashboard();
+  await expect(page.locator('#Lab-Results').getByText('Lymphocytes')).toBeVisible();
+  await expect(page.locator('#Lab-Results span.value')).toHaveText('13.7');
+});
+
+test('Published free text lab results from OpenELIS are viewable in the Bahmni lab results viewer.', async ({ page }) => {
+  // setup
+  await bahmni.navigateToLabSamples();
+  await page.getByText('Urine', { exact: true }).click();
+  await page.getByText('Urobilinogen').click();
+  await bahmni.saveOrder();
+
+  // replay
+  await openelis.open();
+  await expect(page).toHaveURL(/.*openelis/);
+  await openelis.searchClient();
+
+  const clientSelector = await page.locator("#todaySamplesToCollectListContainer-slick-grid div.slick-cell.l1.r1");
+  await expect(clientSelector).toHaveText(`${patientName.givenName + ' ' + patientName.familyName}`);
+  await openelis.collectSample();
+  await page.locator('a#todaySamplesCollectedListContainerId').click();
+  await page.locator('#todaySamplesCollectedListContainer-slick-grid div.ui-state-default.slick-headerrow-column.l2.r2 input[type=text]').type(`${patientName.familyName}`);
+
+  await openelis.enterFreeTextResults();
+  await page.locator('a#todaySamplesCollectedListContainerId').click();
+  await page.locator('#todaySamplesCollectedListContainer-slick-grid div.ui-state-default.slick-headerrow-column.l2.r2 input[type=text]').type(`${patientName.familyName}`);
+  await openelis.validateLabResults();
+  await page.locator('#todaySamplesCollectedListContainer-slick-grid div.ui-state-default.slick-headerrow-column.l2.r2 input[type=text]').type(`${patientName.familyName}`);
+  const status = await page.locator('#todaySamplesCollectedListContainer-slick-grid div.slick-viewport div div:nth-child(1) div.slick-cell.l8.r8.cell-title');
+  await expect(status).toHaveText('Yes');
+
+  // verify
+  await bahmni.navigateToPatientDashboard();
+  await expect(page.locator('#Lab-Results').getByText('Urobilinogen')).toBeVisible();
+  await expect(page.locator('#Lab-Results span.value')).toHaveText('Abnormal level');
+});
+
+test.afterEach(async ({ page }) => {
+  await bahmni.voidPatient();
+  await page.close();
+});
+
diff --git a/e2e/tests/diagnosis.spec.ts b/e2e/tests/diagnosis.spec.ts
index 5d0f14d..275dfd5 100644
--- a/e2e/tests/diagnosis.spec.ts
+++ b/e2e/tests/diagnosis.spec.ts
@@ -20,6 +20,7 @@ test('Create and revise a diagnosis.', async ({ page }) => {
   await bahmni.registerPatient();
 
   // replay
+  await bahmni.navigateToPatientDashboard();
   await bahmni.navigateToDiagnosis();
   await page.locator('#name-0').fill('Candidiasis (B37.9)');
   await page.getByText('Candidiasis (B37.9)').click();
diff --git a/e2e/tests/lab-orders.spec.ts b/e2e/tests/lab-orders.spec.ts
index 9de941e..904c022 100644
--- a/e2e/tests/lab-orders.spec.ts
+++ b/e2e/tests/lab-orders.spec.ts
@@ -19,8 +19,8 @@ test('Create, revise and discontinue lab tests.', async ({ page }) => {
   await bahmni.registerPatient();
 
   // replay
-  await bahmni.goToHomePage();
-  await bahmni.goToLabSamples();
+  await bahmni.navigateToPatientDashboard();
+  await bahmni.navigateToLabSamples();
   await page.getByText('Blood', { exact: true }).click();
   await page.getByText('Malaria').click();
   await page.getByText('Urine').click();
diff --git a/e2e/tests/medications.spec.ts b/e2e/tests/medications.spec.ts
index b89af2b..2be2a27 100644
--- a/e2e/tests/medications.spec.ts
+++ b/e2e/tests/medications.spec.ts
@@ -19,7 +19,7 @@ test('Create, revise and discontinue a drug order.', async ({ page }) => {
   await bahmni.registerPatient();
 
   // replay
-  await bahmni.goToHomePage();
+  await bahmni.navigateToPatientDashboard();
   await bahmni.navigateToMedications();
   await bahmni.createMedication();
 
diff --git a/e2e/utils/configs/bahmni.ts b/e2e/utils/configs/bahmni.ts
new file mode 100644
index 0000000..3a5e18b
--- /dev/null
+++ b/e2e/utils/configs/bahmni.ts
@@ -0,0 +1,158 @@
+import { Page, expect } from '@playwright/test';
+import { BAHMNI_URL } from '../configs/globalSetup';
+
+export var patientName = {
+  givenName : '',
+  familyName : '',
+  updatedGivenName: '',
+}
+
+export const delay = (mills) => {
+  let datetime1 = new Date().getTime();
+  let datetime2 = datetime1 + mills;
+  while(datetime1 < datetime2) {
+     datetime1 = new Date().getTime();
+    }
+}
+
+export class Bahmni {
+  constructor(readonly page: Page) {}
+
+  async login() {
+    await this.page.goto(`${BAHMNI_URL}`)
+    await this.page.locator('#locale').selectOption('string:en');
+    await this.page.locator('#username').fill(`${process.env.BAHMNI_USERNAME}`);
+    await this.page.locator('#password').fill(`${process.env.BAHMNI_PASSWORD}`);
+    await this.page.locator('#location').selectOption('object:7');
+    await this.page.getByRole('button', { name: 'Login' }).click();
+  }
+
+  async registerPatient() {
+    patientName = {
+      givenName : `E2e_test_${Array.from({ length: 4 }, () => String.fromCharCode(Math.floor(Math.random() * 26) + 97)).join('')}`,
+      familyName : `${Array.from({ length: 8 }, () => String.fromCharCode(Math.floor(Math.random() * 26) + 97)).join('')}`, 
+      updatedGivenName : `${Array.from({ length: 8 }, () => String.fromCharCode(Math.floor(Math.random() * 26) + 97)).join('')}`,
+    }
+    await this.page.goto(`${BAHMNI_URL}/bahmni/registration`);
+    await this.page.locator('a').filter({ hasText: 'Create New' }).click();
+    await this.page.locator('#givenName').fill(`${patientName.givenName}`);
+    await this.page.locator('#familyName').fill(`${patientName.familyName}`);
+    await this.page.locator('#gender').selectOption('F');
+    await this.page.locator('#ageYears').fill(`${Math.floor(Math.random() * 99)}`);
+    await this.page.locator('#view-content div>ul>li button').click();
+    await expect(this.page.getByRole('button', { name: 'Save' })).toBeEnabled();
+    await this.page.getByRole('button', { name: 'Priority' }).click();
+    await this.page.getByRole('button', { name: 'Save' }).click();
+    await expect(this.page.getByText('error')).not.toBeVisible();
+  }
+
+  async searchPatient() {
+    await this.page.locator('#patientIdentifier').fill(`${patientName.familyName}`);
+    await this.page.getByText(`${patientName.givenName + ' ' + patientName.familyName}`).click();
+  }
+
+  async updatePatientDetails() {
+    await this.page.getByRole('link', { name: 'Registration' }).click();
+    await this.page.locator('#name').fill(`${patientName.familyName}`);
+    await this.page.locator('form[name="searchByNameForm"]').getByRole('button', { name: 'Search' }).click();
+    await this.page.locator('#view-content td:nth-child(1) a').click();
+    await this.page.locator('#givenName').clear();
+    await this.page.locator('#givenName').fill(`${patientName.updatedGivenName}`);
+    await delay(2000);
+    await this.page.getByRole('button', { name: 'Save' }).click();
+    patientName.givenName = `${patientName.updatedGivenName}`;
+    await delay(5000);
+  };
+
+  async voidPatient() {
+    await this.page.goto(`${BAHMNI_URL}/openmrs/admin/patients/index.htm`);
+    await this.page.getByPlaceholder(' ').type(`${patientName.familyName}`);
+    await this.page.locator('#openmrsSearchTable tbody tr.odd td:nth-child(1)').click();
+    await this.page.locator('input[name="voidReason"]').fill('Void patient created by smoke test');
+    await this.page.getByRole('button', { name: 'Delete Patient', exact: true }).click();
+    const message = await this.page.locator('//*[@id="patientFormVoided"]').textContent();
+    await expect(message?.includes('This patient has been deleted')).toBeTruthy();
+  }
+
+  async goToLabSamples() {
+    await this.page.locator('#view-content :nth-child(1).btn--success').click();
+    await this.page.locator('#opd-tabs').getByText('Orders').click();
+    await expect(this.page.getByText('Lab Samples')).toBeVisible();
+  }
+
+  async createLabOrder() {
+    await this.page.getByText('Blood', { exact: true }).click();
+    await this.page.getByText('Malaria').click();
+    await this.saveOrder();
+  }
+
+  async reviseLabOrder() {
+    await this.page.getByText('Blood', { exact: true }).click();
+    await this.page.locator('#selected-orders li').filter({ hasText: 'Malaria' }).locator('i').nth(1).click();
+    await this.page.getByText('Hematocrit').click();
+    await this.saveOrder();
+  }
+
+  async discontinueLabOrder() {
+    await this.page.getByText('Blood', { exact: true }).click();
+    await this.page.locator('#selected-orders li').filter({ hasText: 'Malaria' }).locator('i').nth(1).click();
+    await this.saveOrder();
+  }
+
+  async goToPatientDashboard() {
+    await this.page.goto(`${BAHMNI_URL}/bahmni/home`);
+    await this.page.getByRole('link', { name: 'Clinical' }).click();
+    await this.searchPatient();
+  }
+
+  async goToMedications() {
+    await this.page.locator('#view-content :nth-child(1).btn--success').click();
+    await this.page.locator('#opd-tabs').getByText('Medications').click();
+    await expect(this.page.getByText('Order Drug')).toBeVisible();
+    await expect(this.page.getByText('Order an Order Set')).toBeVisible();
+  }
+
+  async createMedication() {
+    await this.page.locator('#drug-name').type('Aspirine Co 81mg');
+    await this.page.getByText('Aspirine Co 81mg (Comprime)').click();
+    await this.page.locator('#uniform-dose').fill('2');
+    await this.page.locator('#uniform-dose-unit').selectOption('string:Application(s)');
+    await this.page.locator('#frequency').selectOption('string:Q3H');
+    await this.page.locator('#route').selectOption('string:Topique');
+    await this.page.locator('#start-date').fill('2024-08-16');
+    await this.page.locator('#duration').fill('5');
+    await this.page.locator('#duration-unit').selectOption('string:Semaine(s)');
+    await this.page.locator('#total-quantity-unit').selectOption('string:Ampoule(s)');
+    await this.page.locator('#instructions').selectOption('string:Estomac vide');
+    await this.page.locator('#additional-instructions').fill('Take after a meal');
+    await expect(this.page.locator('#quantity')).toHaveValue('560');
+    await this.page.getByRole('button', { name: 'Add' }).click();
+    await this.saveOrder();
+  }
+
+  async editMedicationDetails() {
+    await this.page.locator('i.fa.fa-edit').first().click();
+    await this.page.locator('#uniform-dose').clear();
+    await this.page.locator('#uniform-dose').fill('4');
+    await this.page.locator('#frequency').selectOption('string:Q4H');
+    await this.page.locator('#uniform-dose-unit').selectOption('string:Comprime(s)');
+    await this.page.locator('#route').selectOption('string:Inhalation');
+    await this.page.getByRole('button', { name: 'Add' }).click();
+    await this.saveOrder();
+  }
+
+  async discontinueMedication() {
+    await this.page.getByRole('button', { name: 'Stop' }).first().click();
+    await this.page.getByPlaceholder('Notes').fill('Patient allergic to medicine');
+    await this.saveOrder();
+    await this.page.locator('#dashboard-link span.patient-name').click();
+    const medicationStatus = await this.page.locator('#dashboard-treatments span.discontinued-text').first();
+    await expect(medicationStatus).toContainText('Stopped');
+  }
+
+  async saveOrder() {
+    await this.page.getByRole('button', { name: 'Save' }).click();
+    await expect(this.page.getByText('Saved', {exact: true})).toBeVisible();
+    await delay(5000);
+  }
+}
diff --git a/e2e/utils/configs/globalSetup.ts b/e2e/utils/configs/globalSetup.ts
index 181e0b0..e8770b0 100644
--- a/e2e/utils/configs/globalSetup.ts
+++ b/e2e/utils/configs/globalSetup.ts
@@ -13,6 +13,7 @@ dotenv.config();
 
 export const BAHMNI_URL = `${process.env.TEST_ENVIRONMENT}` == 'uat' ? `${process.env.BAHMNI_URL_UAT}` : `${process.env.BAHMNI_URL_DEV}`;
 export const ODOO_URL = `${process.env.TEST_ENVIRONMENT}` == 'uat' ? `${process.env.ODOO_URL_UAT}` : `${process.env.ODOO_URL_DEV}`;
+export const OPENELIS_URL = `${process.env.TEST_ENVIRONMENT}` == 'uat' ? `${process.env.OPENELIS_URL_UAT}` : `${process.env.OPENELIS_URL_DEV}`;
 
 async function globalSetup() {
   const requestContext = await request.newContext();
diff --git a/e2e/utils/functions/bahmni.ts b/e2e/utils/functions/bahmni.ts
index fe757fc..feb89e2 100644
--- a/e2e/utils/functions/bahmni.ts
+++ b/e2e/utils/functions/bahmni.ts
@@ -20,7 +20,6 @@ export class Bahmni {
 
   async login() {
     await this.page.goto(`${BAHMNI_URL}`)
-    await this.page.locator('#locale').selectOption('string:en');
     await this.page.locator('#username').fill(`${process.env.BAHMNI_USERNAME}`);
     await this.page.locator('#password').fill(`${process.env.BAHMNI_PASSWORD}`);
     await this.page.locator('#location').selectOption('object:7');
@@ -62,7 +61,7 @@ export class Bahmni {
     await this.page.locator('#givenName').fill(`${patientName.updatedGivenName}`);
     await this.page.getByRole('button', { name: 'Save' }).click();
     patientName.givenName = `${patientName.updatedGivenName}`;
-    await delay(3000);
+    await delay(4000);
   };
 
   async voidPatient() {
@@ -75,9 +74,13 @@ export class Bahmni {
     await expect(message?.includes('This patient has been deleted')).toBeTruthy();
   }
 
-  async goToLabSamples() {
+  async navigateToPatientDashboard() {
+    await this.page.goto(`${BAHMNI_URL}/bahmni/home`);
     await this.page.getByRole('link', { name: 'Clinical' }).click();
     await this.searchPatient();
+  }
+
+  async navigateToLabSamples() {
     await this.page.locator('#view-content :nth-child(1).btn--success').click();
     await this.page.locator('#opd-tabs').getByText('Orders').click();
     await expect(this.page.getByText('Lab Samples')).toBeVisible();
@@ -102,22 +105,12 @@ export class Bahmni {
     await this.saveOrder();
   }
 
-  async goToHomePage() {
-    await this.page.goto(`${BAHMNI_URL}/bahmni/home`);
-    await expect(this.page).toHaveURL(/.*home/);
-  }
-
   async navigateToDiagnosis() {
-    await this.page.locator('i.fa.fa-home').click();
-    await this.page.getByRole('link', { name: 'Clinical' }).click();
-    await this.searchPatient();
     await this.page.locator('#view-content :nth-child(1).btn--success').click();
     await this.page.locator('#opd-tabs').getByText('Diagnosis').click();
   }
 
   async navigateToMedications() {
-    await this.page.getByRole('link', { name: 'Clinical' }).click();
-    await this.searchPatient();
     await this.page.locator('#view-content :nth-child(1).btn--success').click();
     await this.page.locator('#opd-tabs').getByText('Medications').click();
     await expect(this.page.getByText('Order Drug')).toBeVisible();
diff --git a/e2e/utils/functions/openelis.ts b/e2e/utils/functions/openelis.ts
new file mode 100644
index 0000000..383d528
--- /dev/null
+++ b/e2e/utils/functions/openelis.ts
@@ -0,0 +1,55 @@
+import { Page } from '@playwright/test';
+import { OPENELIS_URL } from '../configs/globalSetup';
+import { delay, patientName } from './bahmni';
+
+export class OpenELIS {
+  constructor(readonly page: Page) {}
+
+  async open() {
+    await this.page.goto(`${OPENELIS_URL}`);
+    await this.page.locator("input[name='loginName']").fill(`${process.env.OPENELIS_USERNAME}`);
+    await this.page.locator("input[name='password']").fill(`${process.env.OPENELIS_PASSWORD}`);
+    await this.page.locator('#submitButton').click();
+  }
+
+  async searchClient() {
+    await this.page.locator('#menu_labDashboard').click();
+    await delay(6000);
+    await this.page.locator('input#refreshButton').click();
+    await this.page.locator('input[type=text]').nth(1).type(`${patientName.familyName}`);
+  }
+
+  async collectSample() {
+    await this.page.locator('#todaySamplesToCollectListContainer-slick-grid div.slick-viewport div.slick-cell.l6.r6.cell-title a').click();
+    await this.page.locator('#orderDisplay tbody input.textButton').click();
+    await this.page.locator('#saveButtonId').first().click();
+  }
+
+  async enterLabResults() {
+    await this.page.locator('#result').first().click();
+    await this.page.locator('#results_1').selectOption('Negatif');
+    await this.page.locator('#saveButtonId').first().click();
+  }
+
+  async enterNumericalResults() {
+    await this.page.locator('#result').first().click();
+    await this.page.locator('#results_1').click();
+    await this.page.locator('#results_1').fill('13.7');
+    await this.page.locator('#cell_1').click();
+    await this.page.locator('#saveButtonId').first().click();
+  }
+
+  async enterFreeTextResults() {
+    await this.page.locator('#result').first().click();
+    await this.page.locator('#results_1').fill('Abnormal level');
+    await this.page.locator('#abnormalId_1').click();
+    await this.page.locator('#saveButtonId').first().click();
+  }
+
+  async validateLabResults() {
+    await this.page.locator('a#validate').first().click();
+    await this.page.locator('#accepted_0').check();
+    await this.page.locator('#saveButtonId').first().click();
+    await delay(3000);
+  }
+}
diff --git a/package.json b/package.json
index c52ced8..c94e691 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "license": "MPL-2.0",
   "description": "These are end-to-end automated tests covering Bahmni distro C2C workflows",
   "scripts": {
-    "e2e-tests-c2c": "npx playwright test"
+    "e2e-tests-c2c": "npx playwright test odoo openelis"
   },
   "keywords": [],
   "devDependencies": {
diff --git a/playwright.config.ts b/playwright.config.ts
index 2a7aa43..8583cff 100644
--- a/playwright.config.ts
+++ b/playwright.config.ts
@@ -23,6 +23,8 @@ const config: PlaywrightTestConfig = {
       name: 'chromium',
       use: {
         ...devices['Desktop Chromium'],
+        video: 'on',
+        screenshot:'only-on-failure'
       },
     },
   ],