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 c21475310..a9716c763 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
@@ -74,7 +74,6 @@ public void testAccessibilityHtmlReport() throws IOException, ParseException {
     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()));
   }
 
   /**
@@ -92,7 +91,6 @@ 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()));
   }
 
   /**
@@ -129,10 +127,9 @@ public void accessibilityHtmlReportWithErrorFromLazyElement() throws IOException
    * 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 = AxeRuntimeException.class)
+  @Test(groups = TestCategories.ACCESSIBILITY, expectedExceptions = RuntimeException.class)
   public void accessibilityHtmlReportWithViolation() throws IOException, ParseException {
     AccessibilityUtilities.createAccessibilityHtmlReport(this.getTestObject(), true);
-    deleteFiles(Arrays.asList(this.getTestObject().getArrayOfAssociatedFiles()));
   }
 
   /**
@@ -153,7 +150,6 @@ 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()));
   }
 
   /**
@@ -196,7 +192,6 @@ 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()));
   }
 
   /**
@@ -218,7 +213,6 @@ 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()));
   }
 
   /**
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 1aeaf11cf..22f6ca408 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
@@ -192,7 +192,7 @@ public void testAccessibilityViolationsCheckRespectsMessageLevel() {
   /**
    * Verify accessibility exception will be thrown.
    */
-    @Test(groups = TestCategories.ACCESSIBILITY, expectedExceptions = AxeRuntimeException.class)
+    @Test(groups = TestCategories.ACCESSIBILITY, expectedExceptions = RuntimeException.class)
   public void testAccessibilityCheckThrows() {
       AccessibilityUtilities.checkAccessibility(getTestObject(), true);
   }
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 c2b6dca12..de52948b0 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
@@ -116,7 +116,7 @@ public void reportSampleResults() throws IOException, ParseException {
     Document doc = Jsoup.parse(text);
 
     String errorMessage = doc.selectFirst("#ErrorMessage").text();
-    Assert.assertEquals(errorMessage, "java.lang.Exception: AutomationError");
+    Assert.assertEquals(errorMessage, "AutomationError");
 
     String reportContext = doc.selectFirst("#reportContext").text();
     Assert.assertTrue(reportContext.contains("Url: https://www.google.com/"), "URL is not in the document");
diff --git a/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/helper/TestCategories.java b/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/helper/TestCategories.java
index 7e454360d..16a4a2542 100644
--- a/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/helper/TestCategories.java
+++ b/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/helper/TestCategories.java
@@ -8,35 +8,33 @@
  * Test category type.
  */
 public class TestCategories {
-
-
   private TestCategories() {
   }
 
   /**
-   * String for database unit test category.
+   * String for Accessibility unit test category.
    */
-  public static final String DATABASE = "Database Unit Tests";
+  public static final String ACCESSIBILITY = "Accessibility Unit Tests";
 
   /**
-   * String for email unit test category.
+   * String for Appium unit test category.
    */
-  public static final String EMAIL = "Email Unit Tests";
+  public static final String APPIUM = "Appium Unit Tests";
 
   /**
-   * String for Selenium unit test category.
+   * String for Cucumber unit test category.
    */
-  public static final String SELENIUM = "Selenium Unit Tests";
+  public static final String CUCUMBER = "Cucumber Unit Tests";
 
   /**
-   * String for utilities unit test category.
+   * String for database unit test category.
    */
-  public static final String UTILITIES = "Utilities Unit Tests";
+  public static final String DATABASE = "Database Unit Tests";
 
   /**
-   * String for web service unit test category.
+   * String for email unit test category.
    */
-  public static final String WEB_SERVICE = "Web Service Unit Tests";
+  public static final String EMAIL = "Email Unit Tests";
 
   /**
    * String for base framework unit test category.
@@ -44,12 +42,17 @@ private TestCategories() {
   public static final String FRAMEWORK = "Base Framework Unit Tests";
 
   /**
-   * String for Appium unit test category.
+   * String for Selenium unit test category.
    */
-  public static final String APPIUM = "Appium Unit Tests";
+  public static final String SELENIUM = "Selenium Unit Tests";
 
   /**
-   * String for Cucumber unit test category.
+   * String for utilities unit test category.
    */
-  public static final String CUCUMBER = "Cucumber Unit Tests";
+  public static final String UTILITIES = "Utilities Unit Tests";
+
+  /**
+   * String for web service unit test category.
+   */
+  public static final String WEB_SERVICE = "Web Service Unit Tests";
 }
diff --git a/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/logging/Logger.java b/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/logging/Logger.java
index cf9478be8..685e4a9e7 100644
--- a/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/logging/Logger.java
+++ b/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/logging/Logger.java
@@ -40,6 +40,14 @@ protected Logger(MessageType level) {
     this.logLevel = level;
   }
 
+  /**
+   * Gets the logging level.
+   * @return the Message Type
+   */
+  public MessageType getLoggingLevel() {
+    return this.logLevel;
+  }
+
   /**
    * Set the logging level.
    *