diff --git a/cypress/integration/BonnieQDM56/WebInterface/SmokeTests/UploadDifferentMeasureTypes.spec.js b/cypress/integration/BonnieQDM56/WebInterface/SmokeTests/UploadDifferentMeasureTypes.spec.js
index 6d74fb6..7b6a652 100644
--- a/cypress/integration/BonnieQDM56/WebInterface/SmokeTests/UploadDifferentMeasureTypes.spec.js
+++ b/cypress/integration/BonnieQDM56/WebInterface/SmokeTests/UploadDifferentMeasureTypes.spec.js
@@ -31,8 +31,7 @@ describe('Different Measure Types Upload', () => {
   beforeEach('Login', () => {
     bonnieLogin.login()
   })
-
-  afterEach('Log Out', () => {
+  after('Log Out', () => {
     bonnieLogin.logout()
   })
 
diff --git a/cypress/integration/BonnieQDM56/WebInterface/SmokeTests/VirusScan.spec.js b/cypress/integration/BonnieQDM56/WebInterface/SmokeTests/VirusScan.spec.js
index 2cf64a3..b8a8f5f 100644
--- a/cypress/integration/BonnieQDM56/WebInterface/SmokeTests/VirusScan.spec.js
+++ b/cypress/integration/BonnieQDM56/WebInterface/SmokeTests/VirusScan.spec.js
@@ -4,21 +4,16 @@ import * as homePage from '../../../../pom/BonnieQDM/WI/Homepage'
 import * as importMeasureDialog from '../../../../pom/BonnieQDM/WI/ImportMeasureDialog'
 import * as helper from '../../../../support/helpers'
 
-describe('Smoke Test: Virus Scan', () => {
-
+// WAF Issue
+describe.skip('Smoke Test: Virus Scan', () => {
   beforeEach('Login', () => {
-
     bonnieLogin.login()
-
   })
   afterEach('Log Out', () => {
-
     bonnieLogin.logout()
-
   })
 
   it('Verify successful error message when uploading simulated virus', () => {
-
     bonnieUploadMeasure.VirusScanUpload()
 
     // Verify error message
@@ -33,6 +28,5 @@ describe('Smoke Test: Virus Scan', () => {
     cy.get(importMeasureDialog.closeBtn).click()
 
     helper.notVisibleWithTimeout(importMeasureDialog.importMeasureDialog)
-
   })
 })
diff --git a/cypress/support/Bonnie/BonnieUploadMeasure.js b/cypress/support/Bonnie/BonnieUploadMeasure.js
index f722428..36f4501 100644
--- a/cypress/support/Bonnie/BonnieUploadMeasure.js
+++ b/cypress/support/Bonnie/BonnieUploadMeasure.js
@@ -3,7 +3,6 @@ import * as importMeasureDialog from '../../pom/BonnieFHIR/WI/ImportMeasureDialo
 import * as dashboard from '../../pom/BonnieFHIR/WI/Dashboard'
 import * as measureDetailsPage from '../../pom/BonnieFHIR/WI/MeasureDetailsPage'
 
-
 const VsacApiKey = Cypress.env('VSAC_API_KEY')
 
 export const UploadMeasureToBonnie = (fileToUpload, calculation, vsacLoggedIn, includeSDE) => {
@@ -16,13 +15,13 @@ export const UploadMeasureToBonnie = (fileToUpload, calculation, vsacLoggedIn, i
   helper.visibleWithTimeout(dashboard.uploadBtn)
   helper.enabledWithTimeout(dashboard.uploadBtn)
 
-  //setup for grabbing the VSAC call profile_names
+  // setup for grabbing the VSAC call profile_names
   cy.server({ method: 'GET' })
   cy.route('/vsac_util/profile_names').as('vsac')
 
   cy.get(dashboard.uploadBtn).click()
 
-  //waiting for VSAC call return 200
+  // waiting for VSAC call return 200
   cy.wait('@vsac').its('status').should('eq', 200)
 
   if (calculation === 'episode') {
@@ -31,19 +30,16 @@ export const UploadMeasureToBonnie = (fileToUpload, calculation, vsacLoggedIn, i
 
   helper.visibleWithTimeout(importMeasureDialog.importMeasureDialog)
   helper.visibleWithTimeout(importMeasureDialog.importLoadBtn)
-  //helper.visibleWithTimeout(importMeasureDialog.fileImportInput)
+  // helper.visibleWithTimeout(importMeasureDialog.fileImportInput)
 
-  //upload the file to the modal
-  //helper.enabledWithTimeout(importMeasureDialog.fileImportInput)
+  // upload the file to the modal
+  // helper.enabledWithTimeout(importMeasureDialog.fileImportInput)
   cy.get(importMeasureDialog.fileImportInput).attachFile(fileToUpload)
 
   if (vsacLoggedIn === true) {
-
     helper.visibleWithTimeout(importMeasureDialog.vsacLogOut)
-
   } else if (vsacLoggedIn === undefined || vsacLoggedIn === false) {
-
-    //wait for VSAC api key field to display for the user, and enter api key
+    // wait for VSAC api key field to display for the user, and enter api key
     helper.visibleWithTimeout(importMeasureDialog.vsacApiKeyTextBox)
     helper.enabledWithTimeout(importMeasureDialog.vsacApiKeyTextBox)
     helper.enterText(importMeasureDialog.vsacApiKeyTextBox, VsacApiKey)
@@ -54,8 +50,7 @@ export const UploadMeasureToBonnie = (fileToUpload, calculation, vsacLoggedIn, i
     cy.get(importMeasureDialog.includeSDECheckbox).should('be.checked')
   }
 
-
-  //click load button to import the measure
+  // click load button to import the measure
   helper.visibleWithTimeout(importMeasureDialog.importLoadBtn)
   helper.enabled(importMeasureDialog.importLoadBtn)
   helper.click(importMeasureDialog.importLoadBtn)
@@ -71,13 +66,13 @@ export const UpdateMeasure = (fileToUpload) => {
 
   helper.visibleWithTimeout(importMeasureDialog.importMeasureDialog)
   helper.visibleWithTimeout(importMeasureDialog.importLoadBtn)
-  //helper.visibleWithTimeout(importMeasureDialog.fileImportInput)
+  // helper.visibleWithTimeout(importMeasureDialog.fileImportInput)
 
-  //upload the file to the modal
-  //helper.enabledWithTimeout(importMeasureDialog.fileImportInput)
+  // upload the file to the modal
+  // helper.enabledWithTimeout(importMeasureDialog.fileImportInput)
   cy.get(importMeasureDialog.fileImportInput).attachFile(fileToUpload)
 
-  //click load button to import the measure
+  // click load button to import the measure
   helper.visibleWithTimeout(importMeasureDialog.importLoadBtn)
   helper.enabled(importMeasureDialog.importLoadBtn)
   helper.click(importMeasureDialog.importLoadBtn)
@@ -87,7 +82,6 @@ export const UpdateMeasure = (fileToUpload) => {
 }
 
 export const VirusScanUpload = () => {
-
   const virusString = 'X5O!P%@AP[4\\PZX54(P^)7CC)7}$EICAR-STANDARD-ANTIVIRUS-TEST-FILE!$H+H*'
 
   cy.log(VsacApiKey)
@@ -96,13 +90,13 @@ export const VirusScanUpload = () => {
   helper.visibleWithTimeout(dashboard.uploadBtn)
   helper.enabledWithTimeout(dashboard.uploadBtn)
 
-  //setup for grabbing the VSAC call profile_names
+  // setup for grabbing the VSAC call profile_names
   cy.server({ method: 'GET' })
   cy.route('/vsac_util/profile_names').as('vsac')
 
   cy.get(dashboard.uploadBtn).click()
 
-  //waiting for VSAC call return 200
+  // waiting for VSAC call return 200
   cy.wait('@vsac').its('status').should('eq', 200)
 
   helper.visibleWithTimeout(importMeasureDialog.importMeasureDialog)
@@ -110,21 +104,20 @@ export const VirusScanUpload = () => {
 
   cy.get(importMeasureDialog.fileImportInput).attachFile({
     fileContent: virusString,
-    filePath: "VirusScan/VIRUS - Virus-v2-0-004-QDM-5-6.zip",
+    filePath: 'VirusScan/VIRUS - Virus-v2-0-004-QDM-5-6.zip',
     encoding: 'utf-8',
     lastModified: new Date().getTime()
   })
-cy.pause()
-  //wait for VSAC api key field to display for the user, and enter api key
+
+  // wait for VSAC api key field to display for the user, and enter api key
   helper.visibleWithTimeout(importMeasureDialog.vsacApiKeyTextBox)
   helper.enabledWithTimeout(importMeasureDialog.vsacApiKeyTextBox)
   helper.enterText(importMeasureDialog.vsacApiKeyTextBox, VsacApiKey)
 
-  //click load button to import the measure
+  // click load button to import the measure
   helper.visibleWithTimeout(importMeasureDialog.importLoadBtn)
   helper.enabled(importMeasureDialog.importLoadBtn)
   helper.click(importMeasureDialog.importLoadBtn)
-
 }
 
 function changeMeasureCalculation () {