diff --git a/app/medication/edit/controller.js b/app/medication/edit/controller.js
index 9aaa6a6666..21c142449a 100644
--- a/app/medication/edit/controller.js
+++ b/app/medication/edit/controller.js
@@ -35,7 +35,7 @@ export default AbstractEditController.extend(AddNewPatient, FulfillRequest, Inve
   prescriptionClass: function() {
     let quantity = this.get('model.quantity');
     if (Ember.isEmpty(quantity)) {
-      return 'required';
+      return 'required test-medication-prescription';
     }
   }.property('model.quantity'),
 
diff --git a/app/reports/edit/template.hbs b/app/reports/edit/template.hbs
index 1789130db3..c120ceb334 100644
--- a/app/reports/edit/template.hbs
+++ b/app/reports/edit/template.hbs
@@ -32,69 +32,69 @@
         }}
       {{/if}}
 
-      <div class="ps-info-group">
-        <label class="ps-info-label">
+      <div class="ps-info-group test-visit-date">
+        <label class="ps-info-label test-visit-date-label">
           {{#if isOutPatient}}
             {{t 'reports.form.visitDate' }}:
           {{else}}
             {{t 'reports.form.admissionDate' }}:
           {{/if}}
         </label>
-        {{date-format visit.startDate format="DD/MM/YYYY"}}
+        <span class="test-visit-date-data">{{date-format visit.startDate format="DD/MM/YYYY"}}</span>
       </div>
 
       {{#if isOutPatient}}
 
         {{#if visit.procedures}}
-          <div class="ps-info-group">
-            <label class="ps-info-label">{{t 'reports.form.procedures' }}</label>
+          <div class="ps-info-group test-opd-procedure">
+            <label class="ps-info-label test-opd-procedure-label">{{t 'reports.form.procedures' }}</label>
             <ul>
               {{#each visit.procedures as |item|}}
-                <li>{{item.description}}</li>
+                <li class="test-opd-procedure-data">{{item.description}}</li>
               {{/each}}
             </ul>
           </div>
         {{/if}}
 
         {{#if visit.labs}}
-          <div class="ps-info-group">
-            <label class="ps-info-label">{{t 'reports.form.labs' }}</label>
+          <div class="ps-info-group test-labs">
+            <label class="ps-info-label test-labs-label">{{t 'reports.form.labs' }}</label>
             <ul>
               {{#each visit.labs as |item|}}
-                <li>{{item.labType.name}}-{{item.result}} ({{item.status}})</li>
+                <li class="test-labs-data">{{item.labType.name}}-{{item.result}} ({{item.status}})</li>
               {{/each}}
             </ul>
           </div>
         {{/if}}
 
         {{#if visit.imaging}}
-          <div class="ps-info-group">
-            <label class="ps-info-label">{{t 'reports.form.images' }}</label>
+          <div class="ps-info-group test-images">
+            <label class="ps-info-label test-images-label">{{t 'reports.form.images' }}</label>
             <ul>
               {{#each visit.imaging as |item|}}
-                <li>{{item.imagingType.name}}-{{item.result}} ({{item.status}})</li>
+                <li class="test-images-data">{{item.imagingType.name}}-{{item.result}} ({{item.status}})</li>
               {{/each}}
             </ul>
           </div>
         {{/if}}
 
         {{#if visit.medication}}
-          <div class="ps-info-group">
-            <label class="ps-info-label">{{t 'reports.form.medications' }}</label>
+          <div class="ps-info-group test-medication">
+            <label class="ps-info-label test-medication-label">{{t 'reports.form.medications' }}</label>
             <ul>
               {{#each visit.medication as |medication|}}
-                <li>{{medication.medicationName}} - {{medication.prescription}} ({{medication.status}})</li>
+                <li class="test-medication-data">{{medication.medicationName}} - {{medication.prescription}} ({{medication.status}})</li>
               {{/each}}
             </ul>
           </div>
         {{/if}}
 
         {{#if nextAppointments}}
-          <div class="ps-info-group">
-            <label class="ps-info-label">{{t 'reports.form.nextAppointments' }}</label>
+          <div class="ps-info-group test-appointment">
+            <label class="ps-info-label test-appointment-label">{{t 'reports.form.nextAppointments' }}</label>
             <ul>
               {{#each nextAppointments as |appointment|}}
-                <li>
+                <li class="test-appointment-data">
                   {{date-format appointment.startDate format="DD/MM/YYYY hh:mm a"}}
                   {{#if appointment.appointmentType}}
                     (<b>{{appointment.appointmentType}}</b>)
@@ -106,29 +106,29 @@
         {{/if}}
 
         {{#if currentOperativePlan}}
-          <div class="ps-info-group">
-            <label class="ps-info-label">{{t 'reports.form.operativePlan.title' }}</label>
+          <div class="ps-info-group test-operative-plan">
+            <label class="ps-info-label test-operative-plan-label">{{t 'reports.form.operativePlan.title' }}</label>
             <ul>
               {{#if currentOperativePlan.operationDescription}}
                 <li>
-                  <p><b>{{t 'reports.form.operativePlan.description' }}:</b><br>
-                    {{currentOperativePlan.operationDescription}}</p>
+                  <p><b class="test-operative-plan-description-label">{{t 'reports.form.operativePlan.description' }}:</b><br>
+                    <span class="test-operative-plan-description-data">{{currentOperativePlan.operationDescription}}</span></p>
                 </li>
               {{/if}}
 
               <li>
-                <p><b>{{t 'reports.form.operativePlan.procedures' }}:</b></p>
+                <p><b class="test-operative-plan-procedures-label">{{t 'reports.form.operativePlan.procedures' }}:</b></p>
                 <ul>
                   {{#each currentOperativePlan.procedures as |procedure|}}
-                    <li>{{procedure.description}}</li>
+                    <li class="test-operative-plan-procedures-description">{{procedure.description}}</li>
                   {{/each}}
                 </ul>
               </li>
 
               {{#if currentOperativePlan.admissionInstructions}}
                 <li>
-                  <p><b>{{t 'reports.form.operativePlan.instructions' }}:</b><br>
-                    {{currentOperativePlan.admissionInstructions}}</p>
+                  <p><b class="test-operative-plan-instructions-label">{{t 'reports.form.operativePlan.instructions' }}:</b><br>
+                    <span class="test-operative-plan-instructions-data">{{currentOperativePlan.admissionInstructions}}</span></p>
                 </li>
               {{/if}}
             </ul>
@@ -139,9 +139,9 @@
 
       {{else}}
 
-        <div class="ps-info-group">
-          <label class="ps-info-label">{{t 'reports.form.dischargeDate' }}: </label>
-          {{date-format model.reportDate format="DD/MM/YYYY"}}
+        <div class="ps-info-group test-visit-date">
+          <label class="ps-info-label test-visit-discharge-date-label">{{t 'reports.form.dischargeDate' }}: </label>
+          <span class="test-visit-discharge-date-data">{{date-format model.reportDate format="DD/MM/YYYY"}}</span>
         </div>
 
         <div class="row">
diff --git a/app/visits/edit/template.hbs b/app/visits/edit/template.hbs
index 714b9514f0..81409815de 100644
--- a/app/visits/edit/template.hbs
+++ b/app/visits/edit/template.hbs
@@ -201,7 +201,7 @@
             </div>
             <div class="panel-footer">
               {{#if canAddProcedure}}
-                <button class="btn btn-primary align-right" {{action "showAddProcedure" bubbles=false }}><span class="octicon octicon-plus"></span> {{t 'visits.buttons.newProcedure' }}</button>
+                <button class="btn btn-primary align-right" data-test-selector="new-procedure-btn" {{action "showAddProcedure" bubbles=false }}><span class="octicon octicon-plus"></span> {{t 'visits.buttons.newProcedure' }}</button>
               {{/if}}
             </div>
           </div>
@@ -268,7 +268,7 @@
 
               <div class="panel-heading">
                 {{#if canAddReport}}
-                  <button class="btn btn-primary align-right" {{action "newReport"}}>
+                  <button class="btn btn-primary align-right" data-test-selector="report-btn" {{action "newReport"}}>
                     {{#if model.outPatient}}
                       {{t 'patients.buttons.newOPDReport'}}
                     {{else}}
@@ -294,7 +294,7 @@
                     <td>{{report.modifiedBy}}</td>
                     <td>{{report.reportType}}</td>
                     <td>
-                      <button class="btn btn-default neutral" {{action "editReport" report}}>{{t 'labels.edit'}}</button>
+                      <button class="btn btn-default neutral" data-test-selector="edit-report-btn" {{action "editReport" report}}>{{t 'labels.edit'}}</button>
                     </td>
                   </tr>
                 </table>
diff --git a/tests/acceptance/visit-test.js b/tests/acceptance/visit-test.js
index 97edebdb5b..54dd7dee03 100644
--- a/tests/acceptance/visit-test.js
+++ b/tests/acceptance/visit-test.js
@@ -1,7 +1,32 @@
 import Ember from 'ember';
+import moment from 'moment';
 import { module, test } from 'qunit';
 import startApp from 'hospitalrun/tests/helpers/start-app';
 
+const { isEmpty } = Ember;
+
+const visitData = {
+  outPatient: {
+    PRIMARY_DIAGNOSIS: 'ACL deficient knee, right',
+    SECONDARY_DIAGNOSIS: 'ACL deficient knee, left',
+    OPERATION_DESCRIPTION: 'Describe Operation here',
+    PROCEDURE_SPLINT: 'application of long arm post splint',
+    ADMISSION_INSTRUCTIONS: 'Admission Instructions here',
+    OPD_PROCEDURE_DESCRIPTION: 'Bilateral knee Release',
+    OPD_PROCEDURE_PHYSICIAN: 'Sarah Kearney',
+    LAB_TYPE: 'Cholesterol',
+    IMAGING_TYPE: 'Cervical Spine AP-L',
+    MEDICATION_INPUT: 'Cefazolin 500mg vial (Hazolin) - m00001 (999998 available)',
+    MEDICATION_PRESCRIPTION: '4 doses before meals',
+    MEDICATION_QUANTITY: '4',
+    APPOINTMENT_START_DATE: moment().add(7, 'days').format('l h:mm A'),
+    APPOINTMENT_END_DATE: moment().add(8, 'days').format('l h:mm A')
+  },
+  admission: {
+    // admission visit data goes here
+  }
+};
+
 module('Acceptance | visits', {
   beforeEach() {
     this.application = startApp();
@@ -12,27 +37,27 @@ module('Acceptance | visits', {
   }
 });
 
-test('Add visit', function(assert) {
+test('Add admission visit', function(assert) {
   runWithPouchDump('patient', function() {
     authenticateUser();
-    visit('/patients');
-    andThen(function() {
-      assert.equal(currentURL(), '/patients', 'Patient url is correct');
-      click('button:contains(Edit)');
-    });
-    andThen(function() {
-      assert.equal(find('.patient-name .ps-info-data').text(), 'Joe Bagadonuts', 'Joe Bagadonuts patient record displays');
-      click('[data-test-selector=visits-tab]');
-      waitToAppear('#visits button:contains(Edit)'); // Make sure visits have been retrieved.
-    });
-    andThen(function() {
-      click('#visits button:contains(New Visit)');
-      waitToAppear('#visit-info');
-    });
-    andThen(function() {
-      assert.equal(find('.patient-name .ps-info-data').text(), 'Joe Bagadonuts', 'Joe Bagadonuts displays as patient for visit');
-      updateVisit(assert, 'Add');
-    });
+    addVisit(assert);
+    addDischargeData(assert);
+    newReport(assert, 'Discharge');
+    dischargeReport(assert);
+    saveReport(assert, 'Discharge');
+    editReport(assert, 'Discharge');
+  });
+});
+
+test('Add OPD visit', function(assert) {
+  runWithPouchDump('patient', function() {
+    authenticateUser();
+    addVisit(assert, 'Clinic');
+    addOutpatientData(assert);
+    newReport(assert, 'OPD');
+    checkOutpatientData(assert);
+    saveReport(assert, 'OPD');
+    editReport(assert, 'OPD');
   });
 });
 
@@ -179,8 +204,238 @@ test('Delete visit', function(assert) {
   });
 });
 
-function updateVisit(assert, buttonText) {
+function addVisit(assert, type) {
+  visit('/patients');
+  andThen(function() {
+    assert.equal(currentURL(), '/patients', 'Patient url is correct');
+    click('button:contains(Edit)');
+  });
+  andThen(function() {
+    assert.equal(find('.patient-name .ps-info-data').text(), 'Joe Bagadonuts', 'Joe Bagadonuts patient record displays');
+    click('[data-test-selector=visits-tab]');
+    waitToAppear('#visits button:contains(Edit)');
+  });
+  andThen(function() {
+    click('#visits button:contains(New Visit)');
+    waitToAppear('#visit-info');
+  });
+  andThen(function() {
+    assert.equal(find('.patient-name .ps-info-data').text(), 'Joe Bagadonuts', 'Joe Bagadonuts displays as patient for visit');
+    updateVisit(assert, 'Add', type);
+  });
+
+}
+
+function addOutpatientData(assert) {
+  andThen(() =>{
+    click('a:contains(Add Diagnosis)');
+    waitToAppear('.modal-dialog');
+  });
+  andThen(() => {
+    assert.equal(find('.modal-title').text(), 'Add Diagnosis', 'Add Diagnosis dialog displays');
+    fillIn('.diagnosis-text input', visitData.outPatient.PRIMARY_DIAGNOSIS);
+    click('.modal-footer button:contains(Add)');
+    waitToAppear('a.primary-diagnosis');
+  });
+  andThen(() => {
+    click('a:contains(Add Diagnosis)');
+    waitToAppear('.modal-dialog');
+  });
+  andThen(() => {
+    assert.equal(find('.modal-title').text(), 'Add Diagnosis', 'Add Diagnosis dialog displays');
+    fillIn('.diagnosis-text input', visitData.outPatient.SECONDARY_DIAGNOSIS);
+    click('.secondary-diagnosis input');
+    click('.modal-footer button:contains(Add)');
+    waitToAppear('a.secondary-diagnosis');
+  });
+  andThen(() => {
+    click('a:contains(Add Operative Plan)');
+  });
+  andThen(() => {
+    assert.ok(currentURL().indexOf('/patients/operative-plan/new?forVisitId') > -1, 'New operative plan URL is visited');
+    assert.equal(find('.patient-name .ps-info-data').text(), 'Joe Bagadonuts', 'Joe Bagadonuts patient header displays');
+    assert.equal(find('.view-current-title').text(), 'New Operative Plan', 'New operative plan title is correct');
+    fillIn('.operation-description textarea', visitData.outPatient.OPERATION_DESCRIPTION);
+    typeAheadFillIn('.procedure-description', visitData.outPatient.PROCEDURE_SPLINT);
+    click('button:contains(Add Procedure)');
+    waitToAppear('.procedure-listing td.procedure-description');
+    fillIn('.admission-instructions textarea', visitData.outPatient.ADMISSION_INSTRUCTIONS);
+  });
+  updateVisitData(assert, 'Plan Saved');
+  andThen(() => {
+    click('[data-test-selector=procedures-tab]');
+    waitToAppear('[data-test-selector=new-procedure-btn]');
+    assert.equal(find('[data-test-selector=new-procedure-btn]').text().trim(), 'New Procedure', 'New Procedure button displayed');
+    click('[data-test-selector=new-procedure-btn]');
+  });
+  andThen(() => {
+    assert.ok(currentURL().indexOf('visits/procedures/edit/new?forVisitId') > -1, 'New Procedures URL is visited');
+    typeAheadFillIn('.procedure-description', visitData.outPatient.OPD_PROCEDURE_DESCRIPTION);
+    typeAheadFillIn('.procedure-physician', visitData.outPatient.OPD_PROCEDURE_PHYSICIAN);
+  });
+  updateVisitData(assert, 'Procedure Saved');
+  andThen(() => {
+    click('button:contains(New Lab)');
+  });
+  andThen(() => {
+    assert.ok(currentURL().indexOf('/labs/edit/new?forVisitId') > -1, 'New Lab URL is visited');
+    typeAheadFillIn('.test-lab-type', visitData.outPatient.LAB_TYPE);
+  });
+  updateVisitData(assert, 'Lab Request Saved');
+  andThen(() => {
+    click('button:contains(New Imaging)');
+  });
+  andThen(() => {
+    assert.ok(currentURL().indexOf('/imaging/edit/new?forVisitId') > -1, 'New Imaging URL is visited');
+    typeAheadFillIn('.imaging-type-input', visitData.outPatient.IMAGING_TYPE);
+  });
+  updateVisitData(assert, 'Imaging Request Saved');
+  andThen(() => {
+    click('button:contains(New Medication)');
+  });
+  andThen(() => {
+    assert.ok(currentURL().indexOf('/medication/edit/new?forVisitId') > -1, 'New Medication URL is visited');
+    typeAheadFillIn('.test-medication-input', visitData.outPatient.MEDICATION_INPUT);
+    fillIn('.test-medication-prescription textarea', visitData.outPatient.MEDICATION_PRESCRIPTION);
+    fillIn('.test-quantity-input input', visitData.outPatient.MEDICATION_QUANTITY);
+  });
+  updateVisitData(assert, 'Medication Request Saved');
+  andThen(() => {
+    click('button:contains(New Appointment)');
+  });
+  andThen(() => {
+    assert.ok(currentURL().indexOf('/appointments/edit/new?forVisitId') > -1, 'New Appointment URL is visited');
+    click('.appointment-all-day input');
+    fillIn('.test-appointment-start input', visitData.outPatient.APPOINTMENT_START_DATE);
+    fillIn('.test-appointment-end input', visitData.outPatient.APPOINTMENT_END_DATE);
+  });
+  updateVisitData(assert, 'Appointment Saved');
+}
+
+function addDischargeData(assert) {
+  // add discharge report data elements here
+  assert.equal(1, 1);
+}
+
+function newReport(assert, type) {
+  andThen(function() {
+    click('[data-test-selector=reports-tab]');
+    waitToAppear('[data-test-selector=report-btn]');
+    assert.equal(find('[data-test-selector=report-btn]').text().trim(), `New ${type} Report`, 'Discharge report can be created for this type of visit');
+    click('[data-test-selector=report-btn]');
+  });
+  andThen(function() {
+    assert.ok(currentURL().indexOf('visits/reports/edit/new') > -1, 'Report url is correct');
+    assert.equal(find('.view-current-title').text(), `New ${type} Report`, `${type} report title displayed correctly`);
+    assert.equal(find('.patient-name .ps-info-data').text(), 'Joe Bagadonuts', 'Patient record displays');
+  });
+}
+
+function checkOutpatientData(assert) {
+  andThen(() => {
+    assert.equal(find('.patient-id .ps-info-data').text(), 'P00001', 'Patient ID is displayed');
+    assert.equal(find('.patient-name .ps-info-data').text(), 'Joe Bagadonuts', 'Patient First Name & Last Name is displayed');
+    assert.equal(find('.test-visit-date .test-visit-date-label').text().trim(), 'Date of Visit:', 'Visit date label displayed');
+    assert.ok(!isEmpty(find('.test-visit-date .test-visit-date-data').text()), 'Visit date is displayed');
+    findWithAssert(`.primary-diagnosis:contains(${visitData.outPatient.PRIMARY_DIAGNOSIS})`);
+    findWithAssert(`.secondary-diagnosis:contains(${visitData.outPatient.SECONDARY_DIAGNOSIS})`);
+    findWithAssert('.test-opd-procedure .test-opd-procedure-label:contains(Procedures)');
+    assert.ok(find('.test-opd-procedure .test-opd-procedure-data').text().indexOf(visitData.outPatient.OPD_PROCEDURE_DESCRIPTION) > -1, 'OPD Procedure is displayed');
+    findWithAssert('.test-labs .test-labs-label:contains(Labs)');
+    assert.ok(find('.test-labs .test-labs-data').text().indexOf(visitData.outPatient.LAB_TYPE) > -1, 'Lab request is displayed');
+    findWithAssert('.test-images .test-images-label:contains(Images)');
+    assert.ok(find('.test-images .test-images-data').text().indexOf(visitData.outPatient.IMAGING_TYPE) > -1, 'Image request is displayed');
+    findWithAssert('.test-medication .test-medication-label:contains(Medications)');
+    let medicationName = visitData.outPatient.MEDICATION_INPUT.slice(0, 30); // Medication name earlier filled-in contains other info not displayed in test, so only actual medication name is extracted
+    assert.ok(find('.test-medication .test-medication-data').text().indexOf(medicationName) > -1, 'Medication request is displayed');
+    // findWithAssert('.test-appointment .test-appointment-label:contains(Next Appointments)');
+    // assert.ok(find('.test-appointment .test-appointment-data').text().indexOf(visitData.outPatient.APPOINTMENT_START_DATE) > -1, 'Next Appointment is displayed' + visitData.outPatient.APPOINTMENT_START_DATE);
+    findWithAssert('.test-operative-plan .test-operative-plan-label:contains(Operative Plan)');
+    findWithAssert('.test-operative-plan .test-operative-plan-description-label:contains(Operation Description:)');
+    assert.equal(find('.test-operative-plan .test-operative-plan-description-data').text(), visitData.outPatient.OPERATION_DESCRIPTION);
+    findWithAssert('.test-operative-plan .test-operative-plan-procedures-label:contains(Planned Procedures:)');
+    assert.equal(find('.test-operative-plan .test-operative-plan-procedures-description').text(), visitData.outPatient.PROCEDURE_SPLINT);
+    findWithAssert('.test-operative-plan .test-operative-plan-instructions-label:contains(Instructions upon Admission:)');
+    assert.equal(find('.test-operative-plan .test-operative-plan-instructions-data').text(), visitData.outPatient.ADMISSION_INSTRUCTIONS, 'Admission Instruction is displayed');
+  });
+}
+
+function dischargeReport(assert) {
+  andThen(function() {
+    assert.equal(find('.test-visit-date .test-visit-date-label').text().trim(), 'Admission Date:', 'Visit date label displays as admission');
+    assert.equal(find('.test-visit-date .test-visit-discharge-date-label').text().trim(), 'Discharge Date:', 'Discharge date label displays');
+  });
+  andThen(function() {
+    click('.panel-footer button:contains(Add)');
+    waitToAppear('.modal-dialog');
+  });
+  andThen(function() {
+    assert.equal(find('.modal-title').text(), 'Warning!!!!', 'Cant save discharge report without entering doctors name');
+    click('button:contains(Ok)');
+    waitToDisappear('.modal-dialog');
+  });
+  andThen(function() {
+    typeAheadFillIn('.plan-surgeon', 'Dr Test');
+  });
+}
+
+function saveReport(assert, type) {
+  andThen(function() {
+    click('.panel-footer button:contains(Add)');
+    waitToAppear('.modal-dialog');
+  });
+  andThen(function() {
+    assert.equal(find('.modal-title').text(), 'Report saved', `${type} report saved successfully`);
+    click('button:contains(Ok)');
+    waitToDisappear('.modal-dialog');
+  });
+  andThen(function() {
+    assert.equal(find('.view-current-title').text(), `Edit ${type} Report`, 'Report title updated correctly');
+    assert.ok(find('.panel-footer button:contains(Print)').is(':visible'), 'Print button is now visible');
+    click('button:contains(Return)');
+  });
+  andThen(function() {
+    assert.ok(currentURL().indexOf('visits/edit/') > -1, 'Visit url is correct');
+  });
+}
+
+function editReport(assert, type) {
+  andThen(function() {
+    click('[data-test-selector=reports-tab]');
+    waitToAppear('[data-test-selector=edit-report-btn]');
+    click('[data-test-selector=edit-report-btn]');
+  });
+  andThen(function() {
+    assert.ok(currentURL().indexOf('visits/reports/edit') > -1, 'Edit report url is correct');
+    assert.equal(find('.patient-name .ps-info-data').text(), 'Joe Bagadonuts', 'Patient record displays');
+    assert.equal(find('.view-current-title').text(), `Edit ${type} Report`, 'Edit report title displayed correctly');
+    assert.ok(find('.panel-footer button:contains(Print)').is(':visible'), 'Print button is on edit visible');
+  });
+}
+
+function updateVisitData(assert, modalTitle) {
+  andThen(() => {
+    click('.panel-footer button:contains(Add)');
+    waitToAppear('.modal-dialog');
+  });
+  andThen(() => {
+    assert.equal(find('.modal-title').text(), modalTitle, `${modalTitle} modal displays`);
+    click('.modal-footer button:contains(Ok)');
+  });
+  andThen(() => {
+    click('button:contains(Return)');
+  });
+  andThen(() => {
+    assert.ok(currentURL().indexOf('visits/edit/') > -1, 'Returns back to visit URL');
+  });
+}
+
+function updateVisit(assert, buttonText, visitType) {
   andThen(function() {
+    if (visitType) {
+      select('select[id*="visitType"]', visitType);
+      waitToDisappear('label[for*="display_endDate"]');
+    }
     click(`.panel-footer button:contains(${buttonText})`);
     waitToAppear('.modal-dialog');
   });