diff --git a/jmaqs-accessibility/src/main/java/com/magenic/jmaqs/accessibility/AccessibilityUtilities.java b/jmaqs-accessibility/src/main/java/com/magenic/jmaqs/accessibility/AccessibilityUtilities.java
index e726df997..3542bda92 100644
--- a/jmaqs-accessibility/src/main/java/com/magenic/jmaqs/accessibility/AccessibilityUtilities.java
+++ b/jmaqs-accessibility/src/main/java/com/magenic/jmaqs/accessibility/AccessibilityUtilities.java
@@ -30,6 +30,7 @@
  * Utilities class for Accessibility Functionality.
  */
 public class AccessibilityUtilities {
+
   /**
    * private class constructor.
    */
@@ -80,7 +81,7 @@ public static void checkAccessibility(WebDriver webDriver, Logger logger, boolea
    * @param logger Where you want the check logged to
    * @param checkType What kind of check is being run
    * @param getResults Function for getting Axe results
-   * @param loggingLevel What level should logging the check take,
+   * @param loggingLevel What level should log check take,
    *                     this gets used if the check doesn't throw an exception
    * @param throwOnResults Throw error if any results are found
    */
@@ -99,7 +100,7 @@ public static void checkAccessibility(WebDriver webDriver, Logger logger, String
    * Run axe accessibility and log the results.
    * @param webDriver The web driver that is on the page you want to run the accessibility check on
    * @param logger Where you want the check logged to
-   * @param loggingLevel What level should logging the check take,
+   * @param loggingLevel What level should log check take,
    *                     this gets used if the check doesn't throw an exception
    */
   public static void checkAccessibilityPasses(WebDriver webDriver, Logger logger, MessageType loggingLevel) {
@@ -111,7 +112,7 @@ public static void checkAccessibilityPasses(WebDriver webDriver, Logger logger,
    * Run axe accessibility and log the results.
    * @param webDriver The web driver that is on the page you want to run the accessibility check on
    * @param logger Where you want the check logged to
-   * @param loggingLevel What level should logging the check take,
+   * @param loggingLevel What level should log check take,
    *                     this gets used if the check doesn't throw an exception
    * @param throwOnInapplicable Should inapplicable cause an exception to be thrown
    */
@@ -125,7 +126,7 @@ public static void checkAccessibilityInapplicable(WebDriver webDriver, Logger lo
    * Run axe accessibility and log the results.
    * @param webDriver The web driver that is on the page you want to run the accessibility check on
    * @param logger Where you want the check logged to
-   * @param loggingLevel What level should logging the check take,
+   * @param loggingLevel What level should log check take,
    *                     this gets used if the check doesn't throw an exception
    * @param throwOnIncomplete Should incomplete cause an exception to be thrown
    */
@@ -139,7 +140,7 @@ public static void checkAccessibilityIncomplete(WebDriver webDriver, Logger logg
    * Run axe accessibility and log the results.
    * @param webDriver The web driver that is on the page you want to run the accessibility check on
    * @param logger Where you want the check logged to
-   * @param loggingLevel What level should logging the check take,
+   * @param loggingLevel What level should log check take,
    *                     this gets used if the check doesn't throw an exception
    * @param throwOnViolation Should violations cause an exception to be thrown
    */
@@ -150,7 +151,7 @@ public static void checkAccessibilityViolations(WebDriver webDriver, Logger logg
   }
 
   /**
-   * Create a HTML accessibility report for an entire web page.
+   * Create an HTML accessibility report for an entire web page.
    * @param testObject The TestObject to associate the report with
    * @param throwOnViolation Should violations cause an exception to be thrown
    */
@@ -161,7 +162,7 @@ public static void createAccessibilityHtmlReport(SeleniumTestObject testObject,
   }
 
   /**
-   * Create a HTML accessibility report for an entire web page.
+   * Create an HTML accessibility report for an entire web page.
    * @param testObject The TestObject to associate the report with
    * @param throwOnViolation Should violations cause an exception to be thrown
    */
@@ -172,7 +173,7 @@ public static void createAccessibilityHtmlReport(SeleniumTestObject testObject,
   }
 
   /**
-   * Create a HTML accessibility report for an entire web page.
+   * Create an HTML accessibility report for an entire web page.
    * @param testObject The TestObject to associate the report with
    * @param throwOnViolation Should violations cause an exception to be thrown
    */
@@ -184,7 +185,7 @@ public static void createAccessibilityHtmlReport(SeleniumTestObject testObject,
   }
 
   /**
-   * Create a HTML accessibility report for an entire web page.
+   * Create an HTML accessibility report for an entire web page.
    * @param testObject The TestObject to associate the report with
    * @param throwOnViolation Should violations cause an exception to be thrown
    */
@@ -206,7 +207,7 @@ public static void createAccessibilityHtmlReport(SeleniumTestObject testObject,
   }
 
   /**
-   * Create a HTML accessibility report.
+   * Create an HTML accessibility report.
    * @param testObject The TestObject to associate the report with
    * @param getResults Function for getting the accessibility scan results
    * @param throwOnViolation Should violations cause an exception to be thrown
@@ -242,7 +243,7 @@ public static void createAccessibilityHtmlReport(SeleniumTestObject testObject,
     testObject.getLogger().logMessage(MessageType.INFORMATION,
         "Ran accessibility check and created HTML report: " + report + " ");
 
-    // Throw exception if we found violations and we want that to cause an error
+    // Throw exception if we found violations when we want that to cause an error
     if (throwOnViolation && !getResults.get().getViolations().isEmpty()) {
       throw new AxeRuntimeException(new Exception(System.lineSeparator()
           + "Accessibility violations, see: " + report + " for more details."));
diff --git a/jmaqs-accessibility/src/main/java/com/magenic/jmaqs/accessibility/HtmlReporter.java b/jmaqs-accessibility/src/main/java/com/magenic/jmaqs/accessibility/HtmlReporter.java
index e319cdc33..28c6c6021 100644
--- a/jmaqs-accessibility/src/main/java/com/magenic/jmaqs/accessibility/HtmlReporter.java
+++ b/jmaqs-accessibility/src/main/java/com/magenic/jmaqs/accessibility/HtmlReporter.java
@@ -34,8 +34,11 @@
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.WrapsElement;
 
+/**
+ * The HTML reporter class.
+ */
 public class HtmlReporter {
-  
+
   private static final String classString = "class";
 
   private static final String resourcesFile = "../jmaqs-accessibility/src/main/resources/";
diff --git a/jmaqs-accessibility/src/test/java/com/magenic/jmaqs/accessibility/AccessibilityHTMLUnitTest.java b/jmaqs-accessibility/src/test/java/com/magenic/jmaqs/accessibility/AccessibilityHTMLUnitTest.java
index 72863e8ef..c5320a1ad 100644
--- a/jmaqs-accessibility/src/test/java/com/magenic/jmaqs/accessibility/AccessibilityHTMLUnitTest.java
+++ b/jmaqs-accessibility/src/test/java/com/magenic/jmaqs/accessibility/AccessibilityHTMLUnitTest.java
@@ -12,7 +12,6 @@
 import com.magenic.jmaqs.selenium.BaseSeleniumTest;
 import com.magenic.jmaqs.selenium.LazyWebElement;
 import com.magenic.jmaqs.selenium.SeleniumConfig;
-import com.magenic.jmaqs.selenium.UIWait;
 import com.magenic.jmaqs.selenium.factories.UIWaitFactory;
 import com.magenic.jmaqs.utilities.helper.TestCategories;
 import com.magenic.jmaqs.utilities.logging.FileLogger;
@@ -29,11 +28,13 @@
 import org.apache.commons.io.IOUtils;
 import org.openqa.selenium.By;
 import org.testng.Assert;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+/**
+ * Accessibility HTML unit tests.
+ */
 public class AccessibilityHTMLUnitTest extends BaseSeleniumTest {
+
   /**
    * The file that has a sample result with an error.
    */
@@ -49,33 +50,20 @@ public class AccessibilityHTMLUnitTest extends BaseSeleniumTest {
    */
   private static final String TestSiteAutomationUrl = TestSiteUrl + "Automation/";
 
-  private UIWait wait;
-
-  @BeforeMethod
-  public void setup() {
-    this.getWebDriver().navigate().to(TestSiteUrl);
-    wait = UIWaitFactory.getWaitDriver(this.getWebDriver());
-    UIWaitFactory.getWaitDriver(this.getWebDriver()).waitForPageLoad();
-  }
-
-  @AfterMethod
-  public void cleanUp() {
-    deleteFiles(Arrays.asList(this.getTestObject().getArrayOfAssociatedFiles()));
-  }
-
-
   /**
    * Verify we can create and associate an accessibility HTML report.
    * @throws IOException if an exception is thrown
    */
   @Test(groups = TestCategories.ACCESSIBILITY)
   public void testAccessibilityHtmlReport() throws IOException, ParseException {
+    setup(TestSiteUrl);
     AccessibilityUtilities.createAccessibilityHtmlReport(this.getTestObject(),
         new AxeBuilder().analyze(this.getWebDriver()), false);
 
     String filePath = Arrays.stream(this.getTestObject().getArrayOfAssociatedFiles())
         .filter(x -> x.contains(".html")).findFirst().map(Object::toString).orElse("");
     Assert.assertTrue(filePath.length() > 0, "Accessibility report is empty");
+    deleteFiles(Arrays.asList(this.getTestObject().getArrayOfAssociatedFiles()));
   }
 
   /**
@@ -84,6 +72,8 @@ public void testAccessibilityHtmlReport() throws IOException, ParseException {
    */
   @Test(groups = TestCategories.ACCESSIBILITY)
   public void accessibilityMultipleHtmlReports() throws IOException, ParseException {
+    setup(TestSiteUrl);
+
     // Create 3 reports
     AccessibilityUtilities.createAccessibilityHtmlReport(this.getTestObject(), false);
     AccessibilityUtilities.createAccessibilityHtmlReport(this.getTestObject(), false);
@@ -93,6 +83,7 @@ public void accessibilityMultipleHtmlReports() throws IOException, ParseExceptio
         .filter(x -> x.contains(".html")).count();
     Assert.assertEquals(count, 3,
         "Expected 3 accessibility reports but see " + count + " instead");
+    deleteFiles(Arrays.asList(this.getTestObject().getArrayOfAssociatedFiles()));
   }
 
   /**
@@ -100,6 +91,7 @@ public void accessibilityMultipleHtmlReports() throws IOException, ParseExceptio
    */
   @Test(groups = TestCategories.ACCESSIBILITY, expectedExceptions = AxeRuntimeException.class)
   public void accessibilityHtmlReportWithError() throws IOException, ParseException {
+    setup(TestSiteUrl);
     String axeResultWithError = FileUtils.readFileToString(axeResultWithErrorFile, StandardCharsets.UTF_8);
     Results results = new ObjectMapper().readValue(axeResultWithError, Results.class);
     AccessibilityUtilities.createAccessibilityHtmlReport(this.getTestObject(), results, false);
@@ -107,6 +99,7 @@ public void accessibilityHtmlReportWithError() throws IOException, ParseExceptio
     String filePath = Arrays.stream(this.getTestObject().getArrayOfAssociatedFiles())
         .filter(x -> x.contains(".html")).findFirst().map(Object::toString).orElse("");
     Assert.assertTrue(filePath.length() > 0, "Accessibility report is empty");
+    deleteFiles(Arrays.asList(this.getTestObject().getArrayOfAssociatedFiles()));
   }
 
   /**
@@ -114,9 +107,7 @@ public void accessibilityHtmlReportWithError() throws IOException, ParseExceptio
    */
   @Test(groups = TestCategories.ACCESSIBILITY, expectedExceptions = AxeRuntimeException.class)
   public void accessibilityHtmlReportWithErrorFromLazyElement() throws IOException, ParseException {
-    this.getWebDriver().navigate().to(TestSiteAutomationUrl);
-    wait.waitForPageLoad();
-
+    setup(TestSiteAutomationUrl);
     String axeResultWithError = FileUtils.readFileToString(axeResultWithErrorFile, StandardCharsets.UTF_8);
     Results error = new ObjectMapper().readValue(axeResultWithError, Results.class);
     AccessibilityUtilities.createAccessibilityHtmlReport(this.getTestObject(), error,false);
@@ -125,26 +116,27 @@ public void accessibilityHtmlReportWithErrorFromLazyElement() throws IOException
         .filter(x -> x.contains(".html")).findFirst().map(Object::toString).orElse("");
 
     Assert.assertTrue(filePath.length() > 0, "Accessibility report is empty");
+    deleteFiles(Arrays.asList(this.getTestObject().getArrayOfAssociatedFiles()));
   }
 
   /**
-   * Verify we throw an exception if there are violations and we choose the throw exception option.
+   * Verify we throw an exception if there are violations, and we choose the throw exception option.
    * @throws IOException if an exception is thrown
    */
   @Test(groups = TestCategories.ACCESSIBILITY, expectedExceptions = RuntimeException.class)
   public void accessibilityHtmlReportWithViolation() throws IOException, ParseException {
+    setup(TestSiteUrl);
     AccessibilityUtilities.createAccessibilityHtmlReport(this.getTestObject(), true);
+    deleteFiles(Arrays.asList(this.getTestObject().getArrayOfAssociatedFiles()));
   }
 
   /**
-   * Verify we can create an accessibility HTML report off a lazy element.
+   * Verify we can create an accessibility HTML report file with a lazy element.
    * @throws IOException if exception is thrown
    */
   @Test(groups = TestCategories.ACCESSIBILITY)
   public void accessibilityHtmlReportWithLazyElement() throws IOException, ParseException {
-    this.getWebDriver().get(TestSiteAutomationUrl);
-    wait.waitForPageLoad();
-
+    setup(TestSiteAutomationUrl);
     LazyWebElement foodTable = new LazyWebElement(this.getTestObject(),
         By.id("FoodTable"), "Food Table");
 
@@ -154,17 +146,16 @@ public void accessibilityHtmlReportWithLazyElement() throws IOException, ParseEx
     String filePath = Arrays.stream(this.getTestObject().getArrayOfAssociatedFiles())
         .filter(x -> x.contains(".html")).findFirst().map(Object::toString).orElse("");
     Assert.assertFalse(filePath.isEmpty(), "Accessibility report is empty");
+    deleteFiles(Arrays.asList(this.getTestObject().getArrayOfAssociatedFiles()));
   }
 
   /**
-   *  Verify we can create an accessibility HTML report off a normal web element.
+   *  Verify we can create an accessibility HTML report file off a normal web element.
    * @throws IOException if exception is thrown
    */
   @Test(groups = TestCategories.ACCESSIBILITY)
   public void accessibilityHtmlReportWithElement() throws IOException, ParseException {
-    this.getWebDriver().navigate().to(TestSiteAutomationUrl);
-    wait.waitForPageLoad();
-
+    setup(TestSiteAutomationUrl);
     AccessibilityUtilities.createAccessibilityHtmlReport(this.getTestObject(),
         this.getWebDriver().findElement(By.id("FoodTable")), false);
 
@@ -172,8 +163,7 @@ public void accessibilityHtmlReportWithElement() throws IOException, ParseExcept
         .filter(x -> x.contains(".html")).findFirst().map(Object::toString).orElse("");
 
     File file = new File(filePath);
-    FileInputStream fis = new FileInputStream(file);
-    String fileString = IOUtils.toString(fis, StandardCharsets.UTF_8);
+    String fileString = IOUtils.toString(new FileInputStream(file), StandardCharsets.UTF_8);
     Assert.assertFalse(fileString.isEmpty(), "Accessibility report is empty");
   }
 
@@ -186,9 +176,7 @@ public void accessibilityHtmlLogSuppression() throws IOException, ParseException
     // Make sure we are not using verbose logging
     this.getLogger().setLoggingLevel(MessageType.INFORMATION);
 
-    this.getWebDriver().navigate().to(TestSiteAutomationUrl);
-    wait.waitForPageLoad();
-
+    setup(TestSiteAutomationUrl);
     AccessibilityUtilities.createAccessibilityHtmlReport(this.getTestObject(), false);
 
     // The script executed message should be suppressed when we run the accessibility check
@@ -196,6 +184,7 @@ public void accessibilityHtmlLogSuppression() throws IOException, ParseException
     String file = IOUtils.toString(fis, StandardCharsets.UTF_8);
 
     Assert.assertFalse(file.contains("Script executed"), "Logging was not suppressed as expected.");
+    deleteFiles(Arrays.asList(this.getTestObject().getArrayOfAssociatedFiles()));
   }
 
   /**
@@ -205,6 +194,8 @@ public void accessibilityHtmlLogSuppression() throws IOException, ParseException
    */
   @Test(groups = TestCategories.ACCESSIBILITY)
   public void accessibilityHtmlReportViolationsOnly() throws IOException, ParseException {
+    setup(TestSiteUrl);
+
     // Make sure we are not using verbose logging
     this.getLogger().setLoggingLevel(MessageType.INFORMATION);
 
@@ -217,17 +208,16 @@ public void accessibilityHtmlReportViolationsOnly() throws IOException, ParseExc
     Assert.assertFalse(fileString.contains("Passes "), "Passes were still in the report");
     Assert.assertFalse(fileString.contains("Inapplicable "), "Inapplicable were still in the report");
     Assert.assertFalse(fileString.contains("Incomplete  "), "Incomplete were still in the report");
+    deleteFiles(Arrays.asList(this.getTestObject().getArrayOfAssociatedFiles()));
   }
 
   /**
-   *  Verify we can create an accessibility HTML report off a normal web element.
+   *  Verify we can create an accessibility HTML report file off a normal web element.
    * @throws IOException if exception is thrown
    */
   @Test(groups = TestCategories.ACCESSIBILITY)
   public void accessibilityHtmlViolationsReportWithElement() throws IOException, ParseException {
-    this.getWebDriver().navigate().to(TestSiteAutomationUrl);
-    wait.waitForPageLoad();
-
+    setup(TestSiteAutomationUrl);
     AccessibilityUtilities.createAccessibilityHtmlReport(this.getTestObject(),
         this.getWebDriver().findElement(By.id("FoodTable")),
         false, EnumSet.of(ResultType.Violations));
@@ -235,13 +225,20 @@ public void accessibilityHtmlViolationsReportWithElement() throws IOException, P
     String filePath = Arrays.stream(this.getTestObject().getArrayOfAssociatedFiles())
         .filter(x -> x.contains(".html")).findFirst().map(Object::toString).orElse("");
     Assert.assertFalse(filePath.isEmpty(), "Accessibility report is empty");
+    deleteFiles(Arrays.asList(this.getTestObject().getArrayOfAssociatedFiles()));
+  }
+
+  public void setup(String url) {
+    this.getWebDriver().navigate().to(url);
+    UIWaitFactory.getWaitDriver(this.getWebDriver()).waitForPageLoad();
   }
 
   private void deleteFiles(List<String> files) {
     for (String file : files) {
       File filePath = new File(file).getAbsoluteFile();
       if (filePath.exists()) {
-        filePath.delete();
+        Assert.assertTrue(filePath.delete(), filePath.getAbsolutePath());
+        Assert.assertFalse(filePath.exists());
       }
     }
   }
diff --git a/jmaqs-accessibility/src/test/java/com/magenic/jmaqs/accessibility/AccessibilityUnitTest.java b/jmaqs-accessibility/src/test/java/com/magenic/jmaqs/accessibility/AccessibilityUnitTest.java
index 8fae9351f..181dc7747 100644
--- a/jmaqs-accessibility/src/test/java/com/magenic/jmaqs/accessibility/AccessibilityUnitTest.java
+++ b/jmaqs-accessibility/src/test/java/com/magenic/jmaqs/accessibility/AccessibilityUnitTest.java
@@ -19,26 +19,24 @@
 import java.nio.file.Paths;
 import java.util.stream.Collectors;
 import org.testng.Assert;
-import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+/**
+ * Accessibility Unit Tests.
+ */
 public class AccessibilityUnitTest extends BaseSeleniumTest {
+
   /**
    * Unit testing site URL - Login page.
    */
   private static final String TestSiteUrl = SeleniumConfig.getWebSiteBase();
 
-  @BeforeMethod
-  public void setup() {
-    this.getWebDriver().navigate().to(TestSiteUrl);
-    UIWaitFactory.getWaitDriver(getWebDriver()).waitForPageLoad();
-  }
-
   /**
    * Verify we get verbose message back.
    */
   @Test(groups = TestCategories.ACCESSIBILITY)
   public void testAccessibilityCheckVerbose() throws IOException {
+    setup();
     String filePath = ((FileLogger)getLogger()).getFilePath();
     AccessibilityUtilities.checkAccessibility(getTestObject(), false);
     String logContent = Files.lines(Paths.get(filePath),
@@ -49,8 +47,7 @@ public void testAccessibilityCheckVerbose() throws IOException {
     Assert.assertTrue(logContent.contains("Found 6 items"), "Expected to find 6 violations matches.");
     Assert.assertTrue(logContent.contains("INCOMPLETE check for"), "Expected to find any incomplete matches.");
 
-    File file = new File(filePath);
-    Assert.assertTrue(file.delete());
+    deleteFile(filePath);
   }
 
   /**
@@ -58,6 +55,7 @@ public void testAccessibilityCheckVerbose() throws IOException {
    */
   @Test(groups = TestCategories.ACCESSIBILITY)
   public void testAccessibilityCheckRespectsMessageLevel() {
+    setup();
     String filePath = ((FileLogger)getLogger()).getFilePath();
     FileLogger fileLogger = new FileLogger(filePath, "LevTest.txt", MessageType.WARNING);
 
@@ -78,9 +76,7 @@ public void testAccessibilityCheckRespectsMessageLevel() {
     } catch (IOException e) {
       e.printStackTrace();
     } finally {
-      File file = new File(filePath);
-      Assert.assertTrue(file.delete(), "File was not deleted");
-      Assert.assertFalse(file.exists(), "File Still exists");
+      deleteFile(filePath);
     }
   }
 
@@ -89,6 +85,7 @@ public void testAccessibilityCheckRespectsMessageLevel() {
    */
   @Test(groups = TestCategories.ACCESSIBILITY)
   public void testAccessibilityInapplicableCheckRespectsMessageLevel() {
+    setup();
     String filePath = ((FileLogger)getLogger()).getFilePath();
     FileLogger fileLogger = new FileLogger(filePath, getTestContext().getName() + ".txt", MessageType.INFORMATION);
 
@@ -105,8 +102,7 @@ public void testAccessibilityInapplicableCheckRespectsMessageLevel() {
     } catch (IOException e) {
       e.printStackTrace();
     } finally {
-      File file = new File(filePath);
-      Assert.assertTrue(file.delete());
+      deleteFile(filePath);
     }
   }
 
@@ -115,6 +111,7 @@ public void testAccessibilityInapplicableCheckRespectsMessageLevel() {
    */
   @Test(groups = TestCategories.ACCESSIBILITY)
   public void testAccessibilityIncompleteCheckRespectsMessageLevel() {
+    setup();
     String filePath = ((FileLogger)getLogger()).getFilePath();
     FileLogger fileLogger = new FileLogger(filePath, getTestContext().getName() + ".txt", MessageType.INFORMATION);
 
@@ -131,8 +128,7 @@ public void testAccessibilityIncompleteCheckRespectsMessageLevel() {
     } catch (IOException e) {
       e.printStackTrace();
     } finally {
-      File file = new File(filePath);
-      Assert.assertTrue(file.delete());
+      deleteFile(filePath);
     }
   }
 
@@ -141,6 +137,7 @@ public void testAccessibilityIncompleteCheckRespectsMessageLevel() {
    */
   @Test(groups = TestCategories.ACCESSIBILITY)
   public void testAccessibilityPassesCheckRespectsMessageLevel() {
+    setup();
     String filePath = ((FileLogger)getLogger()).getFilePath();
     FileLogger fileLogger = new FileLogger(filePath, getTestContext().getName() + ".txt", MessageType.INFORMATION);
 
@@ -157,8 +154,7 @@ public void testAccessibilityPassesCheckRespectsMessageLevel() {
     } catch (IOException e) {
       e.printStackTrace();
     } finally {
-      File file = new File(filePath);
-      Assert.assertTrue(file.delete());
+      deleteFile(filePath);
     }
   }
 
@@ -167,6 +163,7 @@ public void testAccessibilityPassesCheckRespectsMessageLevel() {
    */
   @Test(groups = TestCategories.ACCESSIBILITY)
   public void testAccessibilityViolationsCheckRespectsMessageLevel() {
+    setup();
     String filePath = ((FileLogger)getLogger()).getFilePath();
     FileLogger fileLogger = new FileLogger(filePath, getTestContext().getName() + ".txt", MessageType.INFORMATION);
 
@@ -183,8 +180,7 @@ public void testAccessibilityViolationsCheckRespectsMessageLevel() {
     } catch (IOException e) {
       e.printStackTrace();
     } finally {
-      File file = new File(filePath);
-      Assert.assertTrue(file.delete());
+      deleteFile(filePath);
     }
   }
 
@@ -193,6 +189,7 @@ public void testAccessibilityViolationsCheckRespectsMessageLevel() {
    */
     @Test(groups = TestCategories.ACCESSIBILITY, expectedExceptions = RuntimeException.class)
   public void testAccessibilityCheckThrows() {
+      setup();
       AccessibilityUtilities.checkAccessibility(getTestObject(), true);
   }
 
@@ -201,6 +198,8 @@ public void testAccessibilityCheckThrows() {
    */
   @Test(groups = TestCategories.ACCESSIBILITY)
   public void testAccessibilityCheckNoThrowOnNoResults() {
+    setup();
+
     // There should be 0 incomplete items found
     AccessibilityUtilities.checkAccessibilityIncomplete(getTestObject().getWebDriver(),
         getTestObject().getLogger(), MessageType.WARNING, true);
@@ -211,10 +210,23 @@ public void testAccessibilityCheckNoThrowOnNoResults() {
    */
   @Test(groups = TestCategories.ACCESSIBILITY)
   public void testAccessibilityReadableResults() {
-    AxeReporter.getReadableAxeResults("TEST", getWebDriver(), new AxeBuilder().analyze(getWebDriver()).getViolations());
+    setup();
+    AxeReporter.getReadableAxeResults("TEST", getWebDriver(),
+        new AxeBuilder().analyze(getWebDriver()).getViolations());
     String messages = AxeReporter.getAxeResultString();
 
     Assert.assertTrue(messages.contains("TEST check for"), "Expected header.");
     Assert.assertTrue(messages.contains("Found 6 items"), "Expected to find 6 violations matches.");
   }
+
+  public void setup() {
+    this.getWebDriver().navigate().to(TestSiteUrl);
+    UIWaitFactory.getWaitDriver(getWebDriver()).waitForPageLoad();
+  }
+
+  private void deleteFile(String filePath) {
+    File file = new File(filePath);
+    Assert.assertTrue(file.delete());
+    Assert.assertFalse(file.exists(), "File Still exists");
+  }
 }
\ No newline at end of file
diff --git a/jmaqs-accessibility/src/test/java/com/magenic/jmaqs/accessibility/HTMLReporterUnitTest.java b/jmaqs-accessibility/src/test/java/com/magenic/jmaqs/accessibility/HTMLReporterUnitTest.java
index 17e5f2042..254c512b5 100644
--- a/jmaqs-accessibility/src/test/java/com/magenic/jmaqs/accessibility/HTMLReporterUnitTest.java
+++ b/jmaqs-accessibility/src/test/java/com/magenic/jmaqs/accessibility/HTMLReporterUnitTest.java
@@ -4,7 +4,12 @@
 
 package com.magenic.jmaqs.accessibility;
 
+import com.deque.html.axecore.axeargs.AxeRunOptions;
+import com.deque.html.axecore.results.Check;
+import com.deque.html.axecore.results.CheckedNode;
 import com.deque.html.axecore.results.Results;
+import com.deque.html.axecore.results.Rule;
+import com.deque.html.axecore.selenium.AxeBuilder;
 import com.deque.html.axecore.selenium.ResultType;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.magenic.jmaqs.selenium.BaseSeleniumTest;
@@ -17,6 +22,8 @@
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.text.ParseException;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.EnumSet;
 import java.util.UUID;
 import java.util.stream.Collectors;
@@ -24,98 +31,158 @@
 import org.jsoup.nodes.Document;
 import org.jsoup.select.Elements;
 import org.openqa.selenium.By;
-import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 import org.testng.Assert;
 
+/**
+ * Accessibility HTML Reporter unit tests.
+ */
 public class HTMLReporterUnitTest extends BaseSeleniumTest {
+
   /**
    * The file to be opened in the browser.
    */
-  private static final File integrationTestTargetFile = new File("src/test/resources/testFiles/integration-test-target.html");
+  private static final File integrationTestTargetSimpleFile = new File(
+      "src/test/resources/testFiles/integration-test-target.html");
+
+  /**
+   * The url to be opened in the browser.
+   */
+  private static final String integrationTestTargetSimpleUrl = integrationTestTargetSimpleFile.getAbsolutePath();
 
   /**
    * The file to be opened in the browser.
    */
-  private static final String integrationTestTargetUrl = integrationTestTargetFile.getAbsolutePath();
+  private static final File integrationTestTargetComplexFile = new File(
+      "src/test/resources/testFiles/integration-test-target-complex.html");
+
+  /**
+   * The url to be opened in the browser.
+   */
+  private static final String integrationTestTargetComplexUrl = integrationTestTargetComplexFile.getAbsolutePath();
 
   /**
    * The file to be converted into a result type.
    */
-  private static final File integrationTestJsonResultFile = new File("src/test/resources/testFiles/sampleResults.json");
+  private static final File integrationTestJsonResultFile = new File(
+      "src/test/resources/testFiles/sampleResults.json");
 
   /**
    * The path to the file converted into a result type.
    */
   private static final String integrationTestJsonResultUrl = integrationTestJsonResultFile.getAbsolutePath();
 
-  @BeforeMethod
-  public void setup() {
-    this.getWebDriver().get("file:///" + new File(integrationTestTargetUrl).getAbsolutePath());
-    UIWaitFactory.getWaitDriver(getWebDriver()).waitForPageLoad();
+  /**
+   * String value of main element selector.
+   */
+  private static final String mainElementSelector = "main";
+
+  @Test(groups = TestCategories.ACCESSIBILITY)
+  public void runScanOnPage() {
+    loadTestPage(integrationTestTargetSimpleUrl);
+
+    //var timeBeforeScan = DateTime.Now;
+
+    AxeRunOptions axeRunOptions = new AxeRunOptions();
+    axeRunOptions.setXPath(true);
+
+    AxeBuilder builder = new AxeBuilder();
+        builder.withOptions(axeRunOptions);
+        builder.withTags(Arrays.asList("wcag2a", "wcag2aa"));
+        builder.disableRules(Collections.singletonList("color-contrast"));
+        builder.withOutputFile("./raw-axe-results.json");
+
+    Results results = builder.analyze(this.getWebDriver());
+
+    Assert.assertEquals(results.getViolations().size(), 2);
+
+    for (Rule violations : results.getViolations()) {
+      Assert.assertFalse(violations.getId().contains("color-contrast"));
+
+      // results.Violations.FirstOrDefault(v => !v.Tags.Contains("wcag2a") && !v.Tags.Contains("wcag2aa")).Should().BeNull();
+      Assert.assertTrue(violations.getTags().contains("wcag2a"));
+      // Assert.assertTrue(violations.getTags().contains("wcag2aa"));
+    }
+
+    Assert.assertNotNull(results.getViolations().get(0).getNodes().get(0));
+
+//    File.GetLastWriteTime(@"./raw-axe-results.json").Should().BeOnOrAfter(timeBeforeScan);
   }
 
   @Test(groups = TestCategories.ACCESSIBILITY)
-  public void htmlReportFullPage() throws IOException, ParseException {
+  public void runScanOnGivenElement()
+      throws IOException, ParseException {
+    loadTestPage(integrationTestTargetSimpleUrl);
     String path = createReportPath();
-    HtmlReporter.createAxeHtmlReport(this.getWebDriver(), path);
-    validateReport(path, 5, 42, 0, 63);
+    HtmlReporter.createAxeHtmlReport(this.getWebDriver(),
+        this.getWebDriver().findElement(By.cssSelector(mainElementSelector)), path);
+    validateReport(path, 3, 14, 0, 75);
 
-    File file = new File(path);
+    deleteFile(new File(path));
+  }
 
-    if (file.exists()) {
-      Assert.assertTrue(file.delete(), "File was not deleted");
-    }
+  @Test(groups = TestCategories.ACCESSIBILITY)
+  public void reportFullPage() throws IOException, ParseException {
+    loadTestPage(integrationTestTargetSimpleUrl);
+    String path = createReportPath();
+    HtmlReporter.createAxeHtmlReport(this.getWebDriver(), path);
+    validateReport(path, 4, 26, 0, 69);
+
+    deleteFile(new File(path));
   }
 
   @Test(groups = TestCategories.ACCESSIBILITY)
-  public void htmlViolationsOnlyReportFullPage() throws IOException, ParseException {
+  public void reportFullPageViolationsOnly()
+      throws IOException, ParseException {
+    loadTestPage(integrationTestTargetSimpleUrl);
     String path = createReportPath();
-    HtmlReporter.createAxeHtmlReport(this.getWebDriver(), path,
-        EnumSet.of(ResultType.Violations));
+    HtmlReporter.createAxeHtmlReport(this.getWebDriver(), path, EnumSet.of(ResultType.Violations));
 
     // Check violations
-    validateReport(path, 5, 0, 0, 0);
-    assertResultNotWritten(path,
+    validateReport(path, 4, 0, 0, 0);
+    validateResultNotWritten(path,
         EnumSet.of(ResultType.Passes, ResultType.Inapplicable, ResultType.Incomplete));
 
-    File file = new File(path);
-
-    if (file.exists()) {
-      Assert.assertTrue(file.delete(), "File was not deleted");
-    }
+    deleteFile(new File(path));
   }
 
   @Test(groups = TestCategories.ACCESSIBILITY)
-  public void htmlPassesInapplicableViolationsOnlyReportFullPage() throws IOException, ParseException {
+  public void reportFullPagePassesInapplicableViolationsOnly()
+      throws IOException, ParseException {
+    loadTestPage(integrationTestTargetSimpleUrl);
     String path = createReportPath();
     HtmlReporter.createAxeHtmlReport(this.getWebDriver(), path,
         EnumSet.of(ResultType.Passes, ResultType.Inapplicable, ResultType.Violations));
 
     // Check Passes
-    validateReport(path, 5, 42, 0, 63);
-    assertResultNotWritten(path, EnumSet.of(ResultType.Incomplete));
+    validateReport(path, 4, 26, 0, 69);
+    validateResultNotWritten(path, EnumSet.of(ResultType.Incomplete));
 
+    deleteFile(new File(path));
+  }
 
-    File file = new File(path);
+  @Test(groups = TestCategories.ACCESSIBILITY)
+  public void reportOnElement() throws IOException, ParseException {
+    loadTestPage(integrationTestTargetSimpleUrl);
+    String path = createReportPath();
 
-    if (file.exists()) {
-      Assert.assertTrue(file.delete(), "File was not deleted");
-    }
+    var mainElement = this.getWebDriver().findElement(By.cssSelector(mainElementSelector));
+    HtmlReporter.createAxeHtmlReport(this.getWebDriver(), mainElement, path);
+
+    validateReport(path, 3, 14, 0, 75);
+    deleteFile(new File(path));
   }
 
   @Test(groups = TestCategories.ACCESSIBILITY)
-  public void htmlReportOnElement() throws IOException, ParseException {
+  public void reportRespectRules() throws IOException, ParseException {
+    loadTestPage(integrationTestTargetSimpleUrl);
     String path = createReportPath();
-    HtmlReporter.createAxeHtmlReport(this.getWebDriver(),
-        this.getWebDriver().findElement(By.cssSelector("main")), path);
-    validateReport(path, 3, 14, 0, 75);
 
-    File file = new File(path);
+    var builder = new AxeBuilder().disableRules(Collections.singletonList("color-contrast"));
+    HtmlReporter.createAxeHtmlReport(this.getWebDriver(), builder.analyze(this.getWebDriver()), path);
 
-    if (file.exists()) {
-      Assert.assertTrue(file.delete(), "File was not deleted");
-    }
+    validateReport(path, 3, 21, 0, 69);
+    deleteFile(new File(path));
   }
 
   @Test(groups = TestCategories.ACCESSIBILITY)
@@ -140,10 +207,77 @@ public void reportSampleResults() throws IOException, ParseException {
     Assert.assertTrue(reportContext.contains("User agent: AutoAgent"), "User Agent is not in the document");
     Assert.assertTrue(reportContext.contains("Using: axe-core (3.4.1)"), "Using is not in the document");
 
-    File file = new File(path);
+    deleteFile(new File(path));
+  }
 
-    if (file.exists()) {
-      Assert.assertTrue(file.delete(), "File was not deleted");
+  @Test(groups = TestCategories.ACCESSIBILITY)
+  public void reportRespectsIframeImplicitTrue() throws IOException, ParseException {
+    loadTestPage(integrationTestTargetComplexUrl);
+    String path = createReportPath();
+
+    HtmlReporter.createAxeHtmlReport(this.getWebDriver(), path);
+    validateReport(path, 4, 43, 0, 64);
+
+    deleteFile(new File(path));
+  }
+
+  @Test(groups = TestCategories.ACCESSIBILITY)
+  public void ReportRespectsIframeTrue() throws IOException, ParseException {
+    loadTestPage(integrationTestTargetComplexUrl);
+    String path = createReportPath();
+
+    AxeRunOptions runOptions = new AxeRunOptions();
+    runOptions.setIFrames(true);
+
+    var builder = new AxeBuilder().withOptions(runOptions);
+
+    HtmlReporter.createAxeHtmlReport(this.getWebDriver(), builder.analyze(this.getWebDriver()), path);
+    validateReport(path, 4, 43, 0, 64);
+
+    deleteFile(new File(path));
+  }
+
+  @Test(groups = TestCategories.ACCESSIBILITY)
+  public void reportRespectsIframeFalse() throws IOException, ParseException {
+    loadTestPage(integrationTestTargetComplexUrl);
+    String path = createReportPath();
+
+    AxeRunOptions runOptions = new AxeRunOptions();
+    runOptions.setIFrames(false);
+
+    var builder = new AxeBuilder().withOptions(runOptions);
+    HtmlReporter.createAxeHtmlReport(this.getWebDriver(), builder.analyze(this.getWebDriver()), path);
+    validateReport(path, 4, 43, 0, 64);
+
+    deleteFile(new File(path));
+  }
+
+  @Test(groups = TestCategories.ACCESSIBILITY)
+  public void runSiteThatReturnsMultipleTargets() {
+    loadTestPage(integrationTestTargetComplexUrl);
+
+    Results axeResult = new AxeBuilder()
+        .withOutputFile("./raw-axe-results.json").analyze(this.getWebDriver());
+
+    Rule colorContrast = null;
+
+    for (Rule rule : axeResult.getViolations()) {
+      if (rule.getId().equals("color-contrast")) {
+        colorContrast = rule;
+        break;
+      }
+    }
+
+    Assert.assertNotNull(colorContrast);
+
+    for (CheckedNode checkedNode : colorContrast.getNodes()) {
+      for (Check check : checkedNode.getAny()) {
+        if (check.getId().equals("color-contrast")) {
+          Assert.assertNotNull(checkedNode.getAny());
+          Assert.assertEquals(checkedNode.getAny().size(), 1);
+          break;
+        }
+      }
     }
   }
 
@@ -159,36 +293,37 @@ private void validateReport(String path, int violationCount, int passCount, int
     Document doc = Jsoup.parse(text);
 
     // Check the Element count for each result type
-    assertElementCount(doc, violationCount, ResultType.Violations);
-    assertElementCount(doc, passCount, ResultType.Passes);
-    assertElementCount(doc, inapplicableCount, ResultType.Inapplicable);
-    assertElementCount(doc, incompleteCount, ResultType.Incomplete);
+    validateElementCount(doc, violationCount, ResultType.Violations);
+    validateElementCount(doc, passCount, ResultType.Passes);
+    validateElementCount(doc, inapplicableCount, ResultType.Inapplicable);
+    validateElementCount(doc, incompleteCount, ResultType.Incomplete);
 
     // Check header data
     Assert.assertTrue(text.contains("Using: axe-core"), "Expected to find 'Using: axe-core'");
 
     // Check the result count for each result type
-    assertResultCount(text, violationCount, ResultType.Violations);
-    assertResultCount(text, incompleteCount, ResultType.Incomplete);
-    assertResultCount(text, passCount, ResultType.Passes);
-    assertResultCount(text, inapplicableCount, ResultType.Inapplicable);
+    validateResultCount(text, violationCount, ResultType.Violations);
+    validateResultCount(text, incompleteCount, ResultType.Incomplete);
+    validateResultCount(text, passCount, ResultType.Passes);
+    validateResultCount(text, inapplicableCount, ResultType.Inapplicable);
   }
 
-  private void assertElementCount(Document doc, int count, ResultType resultType) {
+  private void validateElementCount(Document doc, int count, ResultType resultType) {
     String ending = resultType.equals(ResultType.Inapplicable) ? "div.findings" : "div > div.htmlTable";
     String xpath = "#" + resultType + "Section > " + ending;
     Elements liNodes = doc.select(xpath) != null ? doc.select(xpath) : new Elements();
     Assert.assertEquals(liNodes.size(), count, "Expected " + count + " " + resultType);
   }
 
-  private void assertResultCount(String text, int count, ResultType resultType) {
+  private void validateResultCount(String text, int count, ResultType resultType) {
     if (count != 0) {
       Assert.assertTrue(text.contains(resultType + ": " + count),
           "Expected to find '" + resultType + ": " + count);
     }
   }
 
-  private void assertResultNotWritten(String path, EnumSet<ResultType> resultTypeArray) throws IOException {
+  private void validateResultNotWritten(String path, EnumSet<ResultType> resultTypeArray) throws IOException {
+    loadTestPage(integrationTestTargetSimpleUrl);
     String text = Files.lines(Paths.get(path), StandardCharsets.UTF_8)
         .collect(Collectors.joining(System.lineSeparator()));
 
@@ -197,4 +332,17 @@ private void assertResultNotWritten(String path, EnumSet<ResultType> resultTypeA
           "Expected to not find '" + resultType  + ": '");
     }
   }
+
+  private void loadTestPage(String testPage) {
+    this.getWebDriver().get("file:///" + new File(testPage).getAbsolutePath());
+    UIWaitFactory.getWaitDriver(getWebDriver()).waitForPageLoad();
+    UIWaitFactory.getWaitDriver(getWebDriver()).waitUntilVisibleElement(By.cssSelector(mainElementSelector));
+  }
+
+  private void deleteFile(File file) {
+    if (file.exists()) {
+      Assert.assertTrue(file.delete(), "File was not deleted");
+      Assert.assertFalse(file.exists(), "file still exists");
+    }
+  }
 }
\ No newline at end of file
diff --git a/jmaqs-accessibility/src/test/resources/testFiles/integration-test-target-complex.html b/jmaqs-accessibility/src/test/resources/testFiles/integration-test-target-complex.html
new file mode 100644
index 000000000..de2a159e6
--- /dev/null
+++ b/jmaqs-accessibility/src/test/resources/testFiles/integration-test-target-complex.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <title>Failure generates complex target</title>
+</head>
+<body>
+<main role="main">
+    <p style="color: #aaaaaa">low-contrast outer</p>
+    <h1>Example of a shadow root iframe</h1>
+    <div id="container"></div>
+</main>
+<script>
+    let container = document.getElementById('container');
+    if (window.top === window.self) {
+        let iframe = document.createElement('iframe');
+        iframe.title = "wrapper iframe";
+        iframe.src = window.location.href;
+        container.appendChild(iframe);
+    } else {
+        let shadowRoot = container.attachShadow({mode: 'open'});
+        shadowRoot.innerHTML = '<p style="color: #aaaaaa">low-contrast</p>';
+    }
+</script>
+</body>
+</html>
diff --git a/jmaqs-accessibility/src/test/resources/testFiles/integration-test-target.html b/jmaqs-accessibility/src/test/resources/testFiles/integration-test-target.html
index c37e07808..5c50d6481 100644
--- a/jmaqs-accessibility/src/test/resources/testFiles/integration-test-target.html
+++ b/jmaqs-accessibility/src/test/resources/testFiles/integration-test-target.html
@@ -8,13 +8,8 @@
     <ul>
         <li>Example violation 1: <span role="invalid">invalid role attribute</span></li>
         <li>Example violation 2: <span style="color: #aaa">low color contrast</span></li>
-        <li>Example violation 3: <button aria-hidden="true">aria-hidden element is focusable</button></li>
+        <li>Example violation 3:<button aria-hidden="true">aria-hidden element is focusable</button></li>
     </ul>
 </main>
-<div role="contentinfo" id="upside-down"></div>
-<script>
-            var shadow = document.getElementById("upside-down").attachShadow({mode: "open"});
-            shadow.innerHTML = '<h2 id="shadow">SHADOW DOM</h2><ul><p>Not a List Item 1</p></ul>'
-    </script>
 </body>
 </html>
\ No newline at end of file